Revision: 3062
http://skim-app.svn.sourceforge.net/skim-app/?rev=3062&view=rev
Author: hofman
Date: 2007-10-23 09:36:39 -0700 (Tue, 23 Oct 2007)
Log Message:
-----------
Make sure we don't pass a nil title to menuitem.
Modified Paths:
--------------
trunk/SKApplicationController.m
Modified: trunk/SKApplicationController.m
===================================================================
--- trunk/SKApplicationController.m 2007-10-23 16:14:09 UTC (rev 3061)
+++ trunk/SKApplicationController.m 2007-10-23 16:36:39 UTC (rev 3062)
@@ -251,15 +251,17 @@
for (i = 0; i < iMax; i++) {
SKBookmark *bm = [bookmarks objectAtIndex:i];
if ([bm bookmarkType] == SKBookmarkTypeFolder) {
+ NSString *label = [bm label];
NSMenu *submenu = [[[NSMenu allocWithZone:[NSMenu menuZone]]
initWithTitle:[bm label]] autorelease];
- NSMenuItem *item = [menu addItemWithTitle:[bm label] action:NULL
keyEquivalent:@""];
+ NSMenuItem *item = [menu addItemWithTitle:label ? label : @""
action:NULL keyEquivalent:@""];
[item setImage:[bm icon]];
[item setSubmenu:submenu];
[self addMenuItemsForBookmarks:[bm children] toMenu:submenu];
} else if ([bm bookmarkType] == SKBookmarkTypeSeparator) {
[menu addItem:[NSMenuItem separatorItem]];
} else {
- NSMenuItem *item = [menu addItemWithTitle:[bm label]
action:@selector(openBookmark:) keyEquivalent:@""];
+ NSString *label = [bm label];
+ NSMenuItem *item = [menu addItemWithTitle:label ? label : @""
action:@selector(openBookmark:) keyEquivalent:@""];
[item setTarget:self];
[item setRepresentedObject:bm];
[item setImage:[bm icon]];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
