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

[Diego Ongaro]

Author: ongardie
Date: 2007-09-08 02:41:22 +0000 (Sat, 08 Sep 2007)
New Revision: 3170

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

* view.c: places_load_thunar_wrapper() should load thunar, not
terminal (context menu "Open" action)
* view.c: improve how icon theme changes and screen changes are
handled


Modified: xfce4-places-plugin/trunk/ChangeLog
===================================================================
--- xfce4-places-plugin/trunk/ChangeLog	2007-09-08 02:41:10 UTC (rev 3169)
+++ xfce4-places-plugin/trunk/ChangeLog	2007-09-08 02:41:22 UTC (rev 3170)
@@ -2,6 +2,8 @@
 
 	* view.c: places_load_thunar_wrapper() should load thunar, not
 	terminal (context menu "Open" action)
+	* view.c: improve how icon theme changes and screen changes are
+	handled
 
 2007-08-23	Diego Ongaro <ongardie at gmail.com>
 

Modified: xfce4-places-plugin/trunk/panel-plugin/places.h
===================================================================
--- xfce4-places-plugin/trunk/panel-plugin/places.h	2007-09-08 02:41:10 UTC (rev 3169)
+++ xfce4-places-plugin/trunk/panel-plugin/places.h	2007-09-08 02:41:22 UTC (rev 3170)
@@ -43,7 +43,6 @@
   GtkWidget         *view_button_label;
   GtkWidget         *view_menu;
   GtkTooltips       *view_tooltips;
-  gulong             view_theme_timeout_id;
   gboolean           view_needs_separator;
 
   // model

Modified: xfce4-places-plugin/trunk/panel-plugin/view.c
===================================================================
--- xfce4-places-plugin/trunk/panel-plugin/view.c	2007-09-08 02:41:10 UTC (rev 3169)
+++ xfce4-places-plugin/trunk/panel-plugin/view.c	2007-09-08 02:41:22 UTC (rev 3170)
@@ -58,7 +58,7 @@
 static void     places_view_cb_orientation_changed(PlacesData *pd, GtkOrientation orientation,
                                                    XfcePanelPlugin *panel);
 
-static void     places_view_cb_theme_changed(GtkIconTheme *icon_theme, PlacesData *pd);
+static void     places_view_cb_theme_changed(PlacesData *pd);
 
 //  - Menu
 static void     places_view_cb_menu_position(GtkMenu*, 
@@ -130,9 +130,12 @@
     }
 
 
-    // signal for icon theme changes
-    g_signal_connect(gtk_icon_theme_get_default(), "changed",
-                     G_CALLBACK(places_view_cb_theme_changed), pd);
+    // signals for icon theme/screen changes
+    pd->view_theme_changed_signal_id = g_signal_connect_swapped(pd->view_button, "style-set",
+                                                                G_CALLBACK(places_view_cb_theme_changed), pd);
+    pd->view_screen_changed_signal_id = g_signal_connect_swapped(pd->view_button, "screen-changed",
+                                                                 G_CALLBACK(places_view_cb_theme_changed), pd);
+
     
     // connect the signals
     g_signal_connect_swapped(pd->view_button, "button-press-event",
@@ -152,8 +155,7 @@
 places_view_finalize(PlacesData *pd)
 {
     places_view_destroy_menu(pd);
-    g_signal_remove_emission_hook(g_signal_lookup("changed", GTK_TYPE_ICON_THEME),
-                                  pd->view_theme_timeout_id);
+    
     if(pd->view_button_image != NULL)
         g_object_unref(pd->view_button_image);
     if(pd->view_button_label != NULL)
@@ -438,7 +440,7 @@
 }
 
 static void
-places_view_cb_theme_changed(GtkIconTheme *icon_theme, PlacesData *pd)
+places_view_cb_theme_changed(PlacesData *pd)
 {
     DBG("theme changed");