r7141 - in bigboard/trunk: . applet

[commits mugshot org]

Author: walters
Date: 2008-01-07 15:47:15 -0600 (Mon, 07 Jan 2008)
New Revision: 7141

Modified:
   bigboard/trunk/applet/bigboard-button.c
   bigboard/trunk/main.py
Log:
Suppress recursive modification of popout state.



Modified: bigboard/trunk/applet/bigboard-button.c
===================================================================
--- bigboard/trunk/applet/bigboard-button.c	2008-01-07 21:25:40 UTC (rev 7140)
+++ bigboard/trunk/applet/bigboard-button.c	2008-01-07 21:47:15 UTC (rev 7141)
@@ -167,6 +167,7 @@
         PanelAppletOrient orient;
         int size;
 
+        gboolean suppress_popout_set;
         guint showing_bigboard : 2; /* Represents "unknown" basically */
         guint button_activate;
 
@@ -217,7 +218,9 @@
         }
 
         g_debug ("got bb PoppedOutChanged: %d\n", is_expanded);
+        button_data->suppress_popout_set = TRUE;
         update_showing_bigboard (button_data, is_expanded);
+        button_data->suppress_popout_set = FALSE;
 }
 
 static void
@@ -642,7 +645,9 @@
                                      button_data,
                                      button_data->applet);
 
+        button_data->suppress_popout_set = TRUE;
         update_button_state (button_data);
+        button_data->suppress_popout_set = FALSE;
 }
 
 static void
@@ -967,6 +972,8 @@
 button_toggled_callback (GtkWidget       *button,
                          ButtonData      *button_data)
 {
+        if (button_data->suppress_popout_set)
+        	return;
         if (button_data->bb_proxy) {
                 if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) {
                         hippo_dbus_proxy_VOID__UINT32 (button_data->bb_proxy, "Popout",

Modified: bigboard/trunk/main.py
===================================================================
--- bigboard/trunk/main.py	2008-01-07 21:25:40 UTC (rev 7140)
+++ bigboard/trunk/main.py	2008-01-07 21:47:15 UTC (rev 7141)
@@ -689,8 +689,6 @@
     ## syncs our current state to a change in the gconf setting for visible mode
     @log_except()
     def __sync_visible_mode(self, *args):
-        vis = gconf.client_get_default().get_bool(GCONF_PREFIX + 'visible')
-
         ## unpopout button is only visible if unpopout is allowed
         vis = gconf.client_get_default().get_bool(GCONF_PREFIX + 'visible')
         self.__unpopout_button.set_visible(not vis)