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

Nick Schermer nick at xfce.org
Mon Jan 1 19:30:40 CET 2007


Author: nick
Date: 2007-01-01 18:30:40 +0000 (Mon, 01 Jan 2007)
New Revision: 24232

Modified:
   xfce4-panel/branches/4_5_nick/libxfce4panel/xfce-panel-plugin-iface.c
Log:
* Small fix for remove dialog poping up on the wrong screen.


Modified: xfce4-panel/branches/4_5_nick/libxfce4panel/xfce-panel-plugin-iface.c
===================================================================
--- xfce4-panel/branches/4_5_nick/libxfce4panel/xfce-panel-plugin-iface.c	2007-01-01 16:41:33 UTC (rev 24231)
+++ xfce4-panel/branches/4_5_nick/libxfce4panel/xfce-panel-plugin-iface.c	2007-01-01 18:30:40 UTC (rev 24232)
@@ -275,9 +275,9 @@
         initialized = TRUE;
     }
 }
-
-
 
+
+
 GType
 xfce_panel_plugin_get_type (void)
 {
@@ -325,9 +325,9 @@
     g_signal_emit (G_OBJECT (plugin), xfce_panel_plugin_signals[SCREEN_POSITION_CHANGED],
                    0, position);
 }
-
-
 
+
+
 /**
  * xfce_panel_plugin_signal_orientation
  * @plugin      : an #XfcePanelPlugin
@@ -344,9 +344,9 @@
     g_signal_emit (G_OBJECT (plugin), xfce_panel_plugin_signals[ORIENTATION_CHANGED], 0,
                    orientation);
 }
-
-
 
+
+
 /**
  * xfce_panel_plugin_signal_orientation
  * @plugin      : an #XfcePanelPlugin
@@ -368,9 +368,9 @@
     if (!handled)
         gtk_widget_set_size_request (GTK_WIDGET (plugin), size, size);
 }
-
-
 
+
+
 /**
  * xfce_panel_plugin_signal_free_data
  * @plugin      : an #XfcePanelPlugin
@@ -384,9 +384,9 @@
 
     g_signal_emit (G_OBJECT (plugin), xfce_panel_plugin_signals[FREE_DATA], 0);
 }
-
-
 
+
+
 /**
  * xfce_panel_plugin_signal_save
  * @plugin      : an #XfcePanelPlugin
@@ -400,9 +400,9 @@
 
     g_signal_emit (G_OBJECT (plugin), xfce_panel_plugin_signals[SAVE], 0);
 }
-
-
 
+
+
 /**
  * xfce_panel_plugin_signal_about
  * @plugin      : an #XfcePanelPlugin
@@ -416,9 +416,9 @@
 
     g_signal_emit (G_OBJECT (plugin), xfce_panel_plugin_signals[ABOUT], 0);
 }
-
-
 
+
+
 /**
  * xfce_panel_plugin_signal_configure
  * @plugin      : an #XfcePanelPlugin
@@ -454,9 +454,9 @@
 
     return name;
 }
-
-
 
+
+
 /**
  * xfce_panel_plugin_get_id
  * @plugin : an #XfcePanelPlugin
@@ -477,9 +477,9 @@
 
     return id;
 }
-
-
 
+
+
 /**
  * xfce_panel_plugin_get_display_name
  * @plugin : an #XfcePanelPlugin
@@ -500,9 +500,9 @@
 
     return name;
 }
-
-
 
+
+
 /**
  * xfce_panel_plugin_get_size
  * @plugin : an #XfcePanelPlugin
@@ -520,9 +520,9 @@
 
     return size;
 }
-
-
 
+
+
 /**
  * xfce_panel_plugin_get_screen_position
  * @plugin : an #XfcePanelPlugin
@@ -542,9 +542,9 @@
 
     return screen_position;
 }
-
-
 
+
+
 /**
  * xfce_panel_plugin_get_expand
  * @plugin : an #XfcePanelPlugin
@@ -584,9 +584,9 @@
 
     return xfce_screen_position_get_orientation (screen_position);
 }
-
-
 
+
+
 /**
  * xfce_panel_plugin_remove_confirm
  * @plugin : an #XfcePanelPlugin
@@ -609,6 +609,9 @@
                                      _("Remove \"%s\"?"), name);
 
     g_free (name);
+    
+    gtk_window_set_screen (GTK_WINDOW (dialog),
+                           gtk_widget_get_screen (GTK_WIDGET (plugin)));
 
     gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES);
 
@@ -637,9 +640,9 @@
 {
     XFCE_PANEL_PLUGIN_GET_INTERFACE (plugin)->remove (plugin);
 }
-
-
 
+
+
 /**
  * xfce_panel_plugin_set_expand
  * @plugin : an #XfcePanelPlugin
@@ -653,9 +656,9 @@
 {
     XFCE_PANEL_PLUGIN_GET_INTERFACE (plugin)->set_expand (plugin, expand);
 }
-
-
 
+
+
 /**
  * xfce_panel_plugin_customize_panel
  * @plugin : an #XfcePanelPlugin
@@ -667,9 +670,9 @@
 {
     XFCE_PANEL_PLUGIN_GET_INTERFACE (plugin)->customize_panel (plugin);
 }
-
-
 
+
+
 /**
  * xfce_panel_plugin_customize_items
  * @plugin : an #XfcePanelPlugin
@@ -681,9 +684,9 @@
 {
     XFCE_PANEL_PLUGIN_GET_INTERFACE (plugin)->customize_items (plugin);
 }
-
-
 
+
+
 /**
  * xfce_panel_plugin_move
  * @plugin : an #XfcePanelPlugin
@@ -695,9 +698,9 @@
 {
     XFCE_PANEL_PLUGIN_GET_INTERFACE (plugin)->move (plugin);
 }
-
-
 
+
+
 /**
  * xfce_panel_plugin_register_menu
  * @plugin : an #XfcePanelPlugin
@@ -712,9 +715,9 @@
 {
     XFCE_PANEL_PLUGIN_GET_INTERFACE (plugin)->register_menu (plugin, menu);
 }
-
-
 
+
+
 /**
  * xfce_panel_plugin_focus_widget
  * @plugin : an #XfcePanelPlugin
@@ -731,9 +734,9 @@
 
     gtk_widget_grab_focus (widget);
 }
-
-
 
+
+
 /**
  * xfce_panel_plugin_set_panel_hidden
  * @plugin : an #XfcePanelPlugin
@@ -765,9 +768,9 @@
                            NULL);
     }
 }
-
-
 
+
+
 static gboolean
 _plugin_menu_button_released (GtkWidget       *menu,
                               GdkEventButton  *ev,
@@ -787,9 +790,9 @@
 
     return FALSE;
 }
-
-
 
+
+
 /**
  * xfce_panel_plugin_create_menu
  * @plugin          : an #XfcePanelPlugin
@@ -807,8 +810,8 @@
 
     g_return_if_fail (XFCE_IS_PANEL_PLUGIN (plugin));
 
-    xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
-
+    xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
+
     allow_customization = xfce_allow_panel_customization ();
 
     menu = gtk_menu_new ();
@@ -933,9 +936,9 @@
     g_object_set_data_full (G_OBJECT (plugin), I_("xfce-panel-plugin-menu"),
                             menu, (GDestroyNotify) gtk_widget_destroy);
 }
-
-
 
+
+
 /**
  * xfce_panel_plugin_popup_menu
  * @plugin : an #XfcePanelPlugin
@@ -973,9 +976,9 @@
         gtk_menu_popup (menu, NULL, NULL, NULL, NULL, 0, GDK_CURRENT_TIME);
     }
 }
-
-
 
+
+
 static gboolean
 _plugin_popup_menu (GtkWidget       *widget,
                     GdkEventButton  *ev,
@@ -1009,9 +1012,9 @@
 
     return FALSE;
 }
-
-
 
+
+
 /**
  * xfce_panel_plugin_add_action_widget
  * @plugin : an #XfcePanelPlugin
@@ -1035,9 +1038,9 @@
                           G_CALLBACK (_plugin_popup_menu), plugin);
     }
 }
-
-
 
+
+
 /**
  * xfce_panel_plugin_menu_insert_item
  * @plugin   : an #XfcePanelPlugin
@@ -1068,9 +1071,9 @@
                            GINT_TO_POINTER (position));
     }
 }
-
-
 
+
+
 /**
  * xfce_panel_plugin_menu_show_about
  * @plugin : an #XfcePanelPlugin
@@ -1097,9 +1100,9 @@
             gtk_widget_show (GTK_WIDGET (l->data));
     }
 }
-
-
 
+
+
 /**
  * xfce_panel_plugin_menu_show_configure
  * @plugin : an #XfcePanelPlugin
@@ -1130,9 +1133,9 @@
             gtk_widget_show (GTK_WIDGET (l->data));
     }
 }
-
-
 
+
+
 /**
  * xfce_panel_plugin_block_menu
  * @plugin : an #XfcePanelPlugin
@@ -1150,9 +1153,9 @@
     g_object_set_data (G_OBJECT (plugin), I_("xfce-panel-plugin-block"),
                        GINT_TO_POINTER (n));
 }
-
-
 
+
+
 /**
  * xfce_panel_plugin_unblock_menu
  * @plugin : an #XfcePanelPlugin
@@ -1199,9 +1202,9 @@
 
     return xfce_resource_lookup (XFCE_RESOURCE_CONFIG, path);
 }
-
-
 
+
+
 /**
  * xfce_panel_plugin_save_location
  * @plugin    : an #XfcePanelPlugin
@@ -1234,9 +1237,9 @@
 
     return xfce_resource_save_location (XFCE_RESOURCE_CONFIG, path, create);
 }
-
-
 
+
+
 /**
  * xfce_panel_plugin_set_sensitive
  * @plugin    : an #XfcePanelPlugin



More information about the Xfce4-commits mailing list