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

[Diego Ongaro]

Author: ongardie
Date: 2007-04-27 04:16:57 +0000 (Fri, 27 Apr 2007)
New Revision: 2704

Modified:
   xfce4-places-plugin/trunk/ChangeLog
   xfce4-places-plugin/trunk/panel-plugin/places.h
   xfce4-places-plugin/trunk/panel-plugin/view.c
Log:
2007-04-26	Diego Ongaro <ongardie at gmail.com>

* view.c, places.h: Never draw two consecutive menu separators.



Modified: xfce4-places-plugin/trunk/ChangeLog
===================================================================
--- xfce4-places-plugin/trunk/ChangeLog	2007-04-24 15:03:29 UTC (rev 2703)
+++ xfce4-places-plugin/trunk/ChangeLog	2007-04-27 04:16:57 UTC (rev 2704)
@@ -1,3 +1,7 @@
+2007-04-26	Diego Ongaro <ongardie at gmail.com>
+
+	* view.c, places.h: Never draw two consecutive menu separators.
+
 2007-04-22	Diego Ongaro <ongardie at gmail.com>
 
 	* Released v0.2

Modified: xfce4-places-plugin/trunk/panel-plugin/places.h
===================================================================
--- xfce4-places-plugin/trunk/panel-plugin/places.h	2007-04-24 15:03:29 UTC (rev 2703)
+++ xfce4-places-plugin/trunk/panel-plugin/places.h	2007-04-27 04:16:57 UTC (rev 2704)
@@ -36,6 +36,7 @@
   GtkWidget         *view_menu;
   GtkTooltips       *view_tooltips;
   gulong             view_theme_timeout_id;
+  gboolean           view_just_separated;
 
   // model
   gpointer           bookmarks;

Modified: xfce4-places-plugin/trunk/panel-plugin/view.c
===================================================================
--- xfce4-places-plugin/trunk/panel-plugin/view.c	2007-04-24 15:03:29 UTC (rev 2703)
+++ xfce4-places-plugin/trunk/panel-plugin/view.c	2007-04-27 04:16:57 UTC (rev 2704)
@@ -92,6 +92,7 @@
     
     gpointer icon_theme_class;
 
+    pd->view_just_separated = TRUE;
     pd->view_menu = NULL;
 
     pd->view_tooltips = g_object_ref_sink(gtk_tooltips_new());
@@ -430,6 +431,8 @@
     g_signal_connect(item, "activate",
                      G_CALLBACK(places_view_cb_menu_item_open), (gchar*) uri);
     gtk_menu_shell_append(GTK_MENU_SHELL(pd->view_menu), item);
+
+    pd->view_just_separated = FALSE;
 }
 
 static void
@@ -438,8 +441,11 @@
     g_assert(_pd != NULL);
     PlacesData *pd = (PlacesData*) _pd;
 
-    gtk_menu_shell_append(GTK_MENU_SHELL(pd->view_menu),
-                          gtk_separator_menu_item_new());
+    if(!pd->view_just_separated){
+        gtk_menu_shell_append(GTK_MENU_SHELL(pd->view_menu),
+                              gtk_separator_menu_item_new());
+        pd->view_just_separated = TRUE;
+    }
 }
 
 // vim: ai et tabstop=4