[Xfce4-commits] r25119 - in xfce4-panel/trunk: . plugins/launcher

[Nick Schermer]

Author: nick
Date: 2007-03-05 20:24:01 +0000 (Mon, 05 Mar 2007)
New Revision: 25119

Modified:
   xfce4-panel/trunk/ChangeLog
   xfce4-panel/trunk/plugins/launcher/launcher.c
Log:
	* plugins/launcher/launcher.c: Replace the enter/leave signals since there are
	  deprecated. If someone knows a property to sync this with an exo_mutual_binding
	  I'd like to hear it.

Modified: xfce4-panel/trunk/ChangeLog
===================================================================
--- xfce4-panel/trunk/ChangeLog	2007-03-05 19:44:17 UTC (rev 25118)
+++ xfce4-panel/trunk/ChangeLog	2007-03-05 20:24:01 UTC (rev 25119)
@@ -1,3 +1,9 @@
+2007-03-05 21:21  nick
+
+	* plugins/launcher/launcher.c: Replace the enter/leave signals since there are
+	  deprecated. If someone knows a property to sync this with an exo_mutual_binding
+	  I'd like to hear it.
+
 2007-03-05 10:39  nick
 
 	* libxfce4panel/xfce-panel-macros.c: Replace the g_type_register_static_simple

Modified: xfce4-panel/trunk/plugins/launcher/launcher.c
===================================================================
--- xfce4-panel/trunk/plugins/launcher/launcher.c	2007-03-05 19:44:17 UTC (rev 25118)
+++ xfce4-panel/trunk/plugins/launcher/launcher.c	2007-03-05 20:24:01 UTC (rev 25119)
@@ -64,6 +64,7 @@
 static void             launcher_button_clicked              (GtkWidget             *button,
                                                               LauncherPlugin        *launcher);
 static void             launcher_button_pointer              (GtkWidget             *button_a,
+                                                              GtkStateType           state,
                                                               GtkWidget             *button_b);
 static gboolean         launcher_button_pressed              (LauncherPlugin        *launcher,
                                                               GdkEventButton        *ev);
@@ -386,8 +387,9 @@
 
 
 static void
-launcher_button_pointer (GtkWidget *button_a,
-                             GtkWidget *button_b)
+launcher_button_pointer (GtkWidget    *button_a,
+                         GtkStateType  state,
+                         GtkWidget    *button_b)
 {
     /* sync the button states */
     gtk_widget_set_state (button_b, GTK_WIDGET_STATE (button_a));
@@ -1004,14 +1006,10 @@
                        GDK_ACTION_COPY);
 
     /* signals for button state sync */
-    g_signal_connect (G_OBJECT (launcher->iconbutton), "enter",
+    g_signal_connect (G_OBJECT (launcher->iconbutton), "state-changed",
                       G_CALLBACK (launcher_button_pointer), launcher->arrowbutton);
-    g_signal_connect (G_OBJECT (launcher->iconbutton), "leave",
-                      G_CALLBACK (launcher_button_pointer), launcher->arrowbutton);
-    g_signal_connect (G_OBJECT (launcher->arrowbutton), "enter",
+    g_signal_connect (G_OBJECT (launcher->arrowbutton), "state-changed",
                       G_CALLBACK (launcher_button_pointer), launcher->iconbutton);
-    g_signal_connect (G_OBJECT (launcher->arrowbutton), "leave",
-                      G_CALLBACK (launcher_button_pointer), launcher->iconbutton);
 
     /* hook for icon themes changes */
     klass = g_type_class_ref (GTK_TYPE_ICON_THEME);
@@ -1239,7 +1237,7 @@
                               G_CALLBACK (launcher_set_size), launcher);
 
     g_signal_connect_swapped (G_OBJECT (plugin), "free-data",
-		              G_CALLBACK (launcher_free), launcher);
+                      G_CALLBACK (launcher_free), launcher);
 
     g_signal_connect_swapped (G_OBJECT (plugin), "save",
                               G_CALLBACK (launcher_write), launcher);