Added @mdbraber's second patches

dkaluta · Oct 14, 2019 · 0f930f2 · 0f930f2
1 parent 4e84cf9
commit 0f930f2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -81,7 +81,7 @@ testRunner: $(SOURCE_FILES)
 	@echo
 	@echo ---- Compiling test runner:
 	@echo ======================================
-	$(COMPILER) $(ARG_DEBUG) -O3 -Wall -std=c99 -force_cpusubtype_ALL -mmacosx-version-min=10.5  -arch ppc -arch x86_64 -DUSE_MOCKED_CALENDARSTORE -framework Cocoa -framework CalendarStore -framework AppKit -framework AddressBook -o $@ testRunner.m $(SOURCE_FILES) calendarStoreMock/*.m tests/unit/*.m
+	$(COMPILER) $(ARG_DEBUG) -O3 -Wall -std=c99 -force_cpusubtype_ALL -mmacosx-version-min=10.5 -arch x86_64 -DUSE_MOCKED_CALENDARSTORE -framework Cocoa -framework CalendarStore -framework AppKit -framework AddressBook -o $@ testRunner.m $(SOURCE_FILES) calendarStoreMock/*.m tests/unit/*.m
 
 
 

diff --git a/icalBuddy.m b/icalBuddy.m
@@ -53,7 +53,7 @@ of this software and associated documentation files (the "Software"), to deal
     int major;
     int minor;
     int build;
-} version = {1,10,0};
+} version = {1,10,1};
 
 NSString* versionNumberStr()
 {

diff --git a/icalBuddyPrettyPrint.m b/icalBuddyPrettyPrint.m
@@ -1060,6 +1060,7 @@ void printItemSections(NSArray *sections, CalItemPrintOption printOptions)
             && prettyPrintOptions.useCalendarColorsForTitles
             && ![[[thisOutput attributesAtIndex:0 effectiveRange:NULL] allKeys] containsObject:NSForegroundColorAttributeName]
             && section.items != nil && [section.items count] > 0
+            && [[((CalCalendarItem *)[section.items objectAtIndex:0]) calendar] color] != nil
             )
         {
             [thisOutput