[Xfce4-commits] r24268 - xfce4-panel/branches/4_5_nick/libxfce4panel

[Nick Schermer]

Author: nick
Date: 2007-01-04 17:55:49 +0000 (Thu, 04 Jan 2007)
New Revision: 24268

Modified:
   xfce4-panel/branches/4_5_nick/libxfce4panel/xfce-panel-external-item.c
Log:
Prevent warning when removing a plugin.
Cleanup some unused privates.


Modified: xfce4-panel/branches/4_5_nick/libxfce4panel/xfce-panel-external-item.c
===================================================================
--- xfce4-panel/branches/4_5_nick/libxfce4panel/xfce-panel-external-item.c	2007-01-04 17:51:35 UTC (rev 24267)
+++ xfce4-panel/branches/4_5_nick/libxfce4panel/xfce-panel-external-item.c	2007-01-04 17:55:49 UTC (rev 24268)
@@ -368,13 +368,8 @@
 xfce_external_panel_item_set_sensitive (XfcePanelItem *item,
                                         gboolean       sensitive)
 {
-    XfceExternalPanelItemPrivate *priv;
-
     g_return_if_fail (XFCE_IS_EXTERNAL_PANEL_ITEM (item));
 
-    priv =
-        XFCE_EXTERNAL_PANEL_ITEM_GET_PRIVATE (XFCE_EXTERNAL_PANEL_ITEM (item));
-
     if (GDK_IS_WINDOW (GTK_SOCKET (item)->plug_window))
     {
         xfce_panel_plugin_message_send (GTK_WIDGET (item)->window,
@@ -396,16 +391,10 @@
 static void
 xfce_external_panel_item_remove (XfcePanelItem *item)
 {
-    XfceExternalPanelItemPrivate *priv;
-
     g_return_if_fail (XFCE_IS_EXTERNAL_PANEL_ITEM (item));
-
-    priv =
-        XFCE_EXTERNAL_PANEL_ITEM_GET_PRIVATE (XFCE_EXTERNAL_PANEL_ITEM (item));
-
+    
     xfce_panel_plugin_message_send (GTK_WIDGET (item)->window,
-                                    GDK_WINDOW_XID (GTK_SOCKET (item)->
-                                                    plug_window),
+                                    GDK_WINDOW_XID (GTK_SOCKET (item)->plug_window),
                                     XFCE_PANEL_PLUGIN_REMOVE, 0);
 }
 
@@ -425,13 +414,8 @@
 static void
 xfce_external_panel_item_configure (XfcePanelItem * item)
 {
-    XfceExternalPanelItemPrivate *priv;
-
     g_return_if_fail (XFCE_IS_EXTERNAL_PANEL_ITEM (item));
 
-    priv =
-        XFCE_EXTERNAL_PANEL_ITEM_GET_PRIVATE (XFCE_EXTERNAL_PANEL_ITEM (item));
-
     if (GDK_IS_WINDOW (GTK_SOCKET (item)->plug_window))
     {
         xfce_panel_plugin_message_send (GTK_WIDGET (item)->window,
@@ -523,8 +507,12 @@
                       GdkScreen             *screen)
 {
     XfceExternalPanelItemPrivate *priv;
-
+    
     priv = XFCE_EXTERNAL_PANEL_ITEM_GET_PRIVATE (XFCE_EXTERNAL_PANEL_ITEM (item));
+    
+    /* quit when we're going to close the plugin */
+    if (priv->to_be_removed == TRUE)
+        return;
 
     screen = gtk_widget_get_screen (GTK_WIDGET (item));
     g_message ("%s: screen changed: %d\n",