[Goodies-commits] r2951 - in xfce4-places-plugin/trunk: . panel-plugin

[Diego Ongaro]

Author: ongardie
Date: 2007-08-05 22:51:26 +0000 (Sun, 05 Aug 2007)
New Revision: 2951

Modified:
   xfce4-places-plugin/trunk/ChangeLog
   xfce4-places-plugin/trunk/panel-plugin/cfg.c
   xfce4-places-plugin/trunk/panel-plugin/view.c
Log:
2007-08-05	Diego Ongaro <ongardie at gmail.com>

* Avoid failing xfce_rc_write_entry assertion when cfg->search_cmd is NULL




Modified: xfce4-places-plugin/trunk/ChangeLog
===================================================================
--- xfce4-places-plugin/trunk/ChangeLog	2007-08-05 22:30:33 UTC (rev 2950)
+++ xfce4-places-plugin/trunk/ChangeLog	2007-08-05 22:51:26 UTC (rev 2951)
@@ -2,6 +2,8 @@
 
 	* Improved BookmarkAction concept.
 	* Fixed bad mount points bug.
+	* Avoid failing xfce_rc_write_entry assertion when
+	cfg->search_cmd is NULL
 
 2007-07-28	Diego Ongaro <ongardie at gmail.com>
 

Modified: xfce4-places-plugin/trunk/panel-plugin/cfg.c
===================================================================
--- xfce4-places-plugin/trunk/panel-plugin/cfg.c	2007-08-05 22:30:33 UTC (rev 2950)
+++ xfce4-places-plugin/trunk/panel-plugin/cfg.c	2007-08-05 22:51:26 UTC (rev 2951)
@@ -72,8 +72,11 @@
     cfg->show_recent_clear  = TRUE;
     cfg->show_recent_number = 10;
 #endif
-    cfg->search_cmd         = NULL;
 
+    if(cfg->search_cmd != NULL)
+        g_free(cfg->search_cmd);
+    cfg->search_cmd         = g_strdup("");
+
     if(cfg->label != NULL)
         g_free(cfg->label);
     cfg->label = g_strdup(_("Places"));
@@ -143,7 +146,10 @@
         cfg->label = _("Places");
     cfg->label = g_strdup(cfg->label);
 
-    cfg->search_cmd = g_strdup(xfce_rc_read_entry(rcfile, "search_cmd", NULL));
+    cfg->search_cmd = (gchar*) xfce_rc_read_entry(rcfile, "search_cmd", NULL); /* TODO: why gchar*? */
+    if(cfg->search_cmd == NULL)
+        cfg->search_cmd = "";
+    cfg->search_cmd = g_strdup(cfg->search_cmd);
 
 #if USE_RECENT_DOCUMENTS
     cfg->show_recent    = xfce_rc_read_bool_entry(rcfile, "show_recent", TRUE);
@@ -283,10 +289,6 @@
         g_free(pd->cfg->search_cmd);
     
     pd->cfg->search_cmd = g_strstrip(g_strdup(gtk_entry_get_text(GTK_ENTRY(label_entry))));
-    if(*(pd->cfg->search_cmd) == '\0'){
-        g_free(pd->cfg->search_cmd);
-        pd->cfg->search_cmd = NULL;
-    }
 
     places_view_destroy_menu(pd);
 

Modified: xfce4-places-plugin/trunk/panel-plugin/view.c
===================================================================
--- xfce4-places-plugin/trunk/panel-plugin/view.c	2007-08-05 22:30:33 UTC (rev 2950)
+++ xfce4-places-plugin/trunk/panel-plugin/view.c	2007-08-05 22:51:26 UTC (rev 2951)
@@ -213,15 +213,15 @@
 
     // Recent Documents
 #if USE_RECENT_DOCUMENTS
-    if(pd->cfg->show_recent || pd->cfg->search_cmd != NULL){
+    if(pd->cfg->show_recent || (pd->cfg->search_cmd != NULL && strlen(pd->cfg->search_cmd))){
 #else
-    if(pd->cfg->search_cmd != NULL){
+    if(pd->cfg->search_cmd != NULL && strlen(pd->cfg->search_cmd)){
 #endif
         gtk_menu_shell_append(GTK_MENU_SHELL(pd->view_menu),
                               gtk_separator_menu_item_new());
     }
 
-    if(pd->cfg->search_cmd != NULL){
+    if(pd->cfg->search_cmd != NULL && strlen(pd->cfg->search_cmd)){
         GtkWidget *search_item = gtk_image_menu_item_new_with_mnemonic(_("Search for Files"));
         if(pd->cfg->show_icons){
             GtkWidget *search_image = gtk_image_new_from_icon_name("system-search", GTK_ICON_SIZE_MENU);