Yasumichi Akahoshi
yasum****@users*****
2005年 5月 19日 (木) 08:16:16 JST
Index: cxplorer/src/cxplorer-window.c
diff -u cxplorer/src/cxplorer-window.c:1.55 cxplorer/src/cxplorer-window.c:1.56
--- cxplorer/src/cxplorer-window.c:1.55 Thu May 19 02:29:42 2005
+++ cxplorer/src/cxplorer-window.c Thu May 19 08:16:16 2005
@@ -316,16 +316,21 @@
GSList *sendto_list;
GSList *node;
GConfEntry *entry;
+ GConfValue *value;
sendto_list = gconf_client_all_entries (private->client, SENDTO_GCONF_DIR, NULL);
node = sendto_list;
while (node != NULL)
{
entry = node->data;
- cxplorer_window_menu_item_new_from_sendto (
- gconf_value_get_string(gconf_value_get_car(gconf_entry_get_value(entry))),
- gconf_value_get_string(gconf_value_get_cdr(gconf_entry_get_value(entry))),
- self);
+ value = gconf_entry_get_value (entry);
+ if (value && value->type == GCONF_VALUE_PAIR)
+ {
+ cxplorer_window_menu_item_new_from_sendto (
+ gconf_value_get_string(gconf_value_get_car(value)),
+ gconf_value_get_string(gconf_value_get_cdr(value)),
+ self);
+ }
gconf_entry_free (entry);
node = g_slist_next(node);
}
@@ -380,16 +385,21 @@
GSList *bookmark_list;
GSList *node;
GConfEntry *entry;
+ GConfValue *value;
bookmark_list = gconf_client_all_entries (private->client, BOOKMARK_GCONF_DIR, NULL);
node = bookmark_list;
while (node != NULL)
{
entry = node->data;
- cxplorer_window_menu_item_new_from_bookmark (
- gconf_value_get_string(gconf_value_get_car(gconf_entry_get_value(entry))),
- gconf_value_get_string(gconf_value_get_cdr(gconf_entry_get_value(entry))),
- self);
+ value = gconf_entry_get_value (entry);
+ if (value && value->type == GCONF_VALUE_PAIR)
+ {
+ cxplorer_window_menu_item_new_from_bookmark (
+ gconf_value_get_string(gconf_value_get_car(value)),
+ gconf_value_get_string(gconf_value_get_cdr(value)),
+ self);
+ }
gconf_entry_free (entry);
node = g_slist_next(node);
}