svnno****@sourc*****
svnno****@sourc*****
Mon Feb 16 09:56:30 JST 2009
Revision: 3709
http://svn.sourceforge.jp/view?root=kazehakase&view=rev&rev=3709
Author: ikezoe
Date: 2009-02-16 09:56:30 +0900 (Mon, 16 Feb 2009)
Log Message:
-----------
* src/actions/kz-actions.c (set_popup_menu_sensitive): Invoke
kz_bookmark_folder_has_children only if the bookmark is a
KzBookmarkFolder.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/src/actions/kz-actions.c
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2009-02-16 00:25:54 UTC (rev 3708)
+++ kazehakase/trunk/ChangeLog 2009-02-16 00:56:30 UTC (rev 3709)
@@ -7,6 +7,9 @@
* src/bookmarks/kz-bookmark-item.c src/bookmarks/kz-bookmark-bar.c,
src/kz-navi.c, src/actions/kz-actions.c: Remove kz_bookmark_file_save.
* src/kz-embed.c (kz_embed_ensure_title): Check length of title too.
+ * src/actions/kz-actions.c (set_popup_menu_sensitive): Invoke
+ kz_bookmark_folder_has_children only if the bookmark is a
+ KzBookmarkFolder.
2009-02-15 Hiroyuki Ikezoe <poinc****@ikezo*****>
Modified: kazehakase/trunk/src/actions/kz-actions.c
===================================================================
--- kazehakase/trunk/src/actions/kz-actions.c 2009-02-16 00:25:54 UTC (rev 3708)
+++ kazehakase/trunk/src/actions/kz-actions.c 2009-02-16 00:56:30 UTC (rev 3709)
@@ -1917,7 +1917,7 @@
KzBookmark *bookmark_file;
KzEmbed *kzembed;
GtkAction *action;
- gboolean has_link, is_folder, is_file, has_children;
+ gboolean has_link, is_folder, is_file, has_children = FALSE;
gboolean children_is_editable, is_editable, has_feed;
g_return_if_fail(kz && bookmark);
@@ -1927,7 +1927,8 @@
has_link = kz_bookmark_get_link(bookmark) ? TRUE : FALSE;
is_folder = kz_bookmark_is_folder(bookmark);
is_file = KZ_IS_BOOKMARK_FILE(bookmark);
- has_children = kz_bookmark_folder_has_children(KZ_BOOKMARK_FOLDER(bookmark));
+ if (is_folder)
+ has_children = kz_bookmark_folder_has_children(KZ_BOOKMARK_FOLDER(bookmark));
is_editable = kz_bookmark_is_editable(bookmark);
if (is_file)
children_is_editable = kz_bookmark_file_is_editable(KZ_BOOKMARK_FILE(bookmark));