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

[Diego Ongaro]

Author: ongardie
Date: 2007-12-09 05:25:01 +0000 (Sun, 09 Dec 2007)
New Revision: 3680

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

* model_user.c: Bug #3728: bookmarks may become (un)reachable


Modified: xfce4-places-plugin/trunk/ChangeLog
===================================================================
--- xfce4-places-plugin/trunk/ChangeLog	2007-12-09 00:05:09 UTC (rev 3679)
+++ xfce4-places-plugin/trunk/ChangeLog	2007-12-09 05:25:01 UTC (rev 3680)
@@ -1,3 +1,7 @@
+2007-12-08	Diego Ongaro <ongardie at gmail.com>
+
+	* model_user.c: Bug #3728: bookmarks may become (un)reachable
+
 2007-10-31	Diego Ongaro <ongardie at gmail.com>
 
 	* cfg.c: Bug #3637: Make options for recent documents transient

Modified: xfce4-places-plugin/trunk/panel-plugin/model_user.c
===================================================================
--- xfce4-places-plugin/trunk/panel-plugin/model_user.c	2007-12-09 00:05:09 UTC (rev 3679)
+++ xfce4-places-plugin/trunk/panel-plugin/model_user.c	2007-12-09 05:25:01 UTC (rev 3680)
@@ -199,19 +199,22 @@
 
         orig = (PlacesBookmark*) orig_ls->data;
 
-        clone                 = places_bookmark_create(g_strdup(orig->label));
-        clone->uri            = g_strdup(orig->uri);
-        clone->uri_scheme     = orig->uri_scheme;
-        clone->icon           = orig->icon;
-        clone->free           = pbuser_free_bookmark;
+        if(show_bookmark(orig)){
 
-        terminal              = places_create_open_terminal_action(clone);
-        clone->actions        = g_list_prepend(clone->actions, terminal);
-        open                  = places_create_open_action(clone);
-        clone->actions        = g_list_prepend(clone->actions, open);
-        clone->primary_action = open;
-
-        clone_ls = g_list_prepend(clone_ls, clone);
+            clone                 = places_bookmark_create(g_strdup(orig->label));
+            clone->uri            = g_strdup(orig->uri);
+            clone->uri_scheme     = orig->uri_scheme;
+            clone->icon           = orig->icon;
+            clone->free           = pbuser_free_bookmark;
+    
+            terminal              = places_create_open_terminal_action(clone);
+            clone->actions        = g_list_prepend(clone->actions, terminal);
+            open                  = places_create_open_action(clone);
+            clone->actions        = g_list_prepend(clone->actions, open);
+            clone->primary_action = open;
+    
+            clone_ls = g_list_prepend(clone_ls, clone);
+        }
         orig_ls  = orig_ls->prev;
     }
 
@@ -244,8 +247,8 @@
         }
         bookmarks = bookmarks->next;
     }
-    if(ret == TRUE)
-        goto pbuser_did_change;
+    if(ret)
+        return TRUE;
 
     /* if we're still here, assume nothing changed */
     return FALSE;