[Xfce4-commits] r25126 - in xfce4-panel/trunk: . libxfce4panel
Nick Schermer
nick at xfce.org
Wed Mar 7 19:36:26 CET 2007
Author: nick
Date: 2007-03-07 18:36:25 +0000 (Wed, 07 Mar 2007)
New Revision: 25126
Modified:
xfce4-panel/trunk/ChangeLog
xfce4-panel/trunk/libxfce4panel/xfce-panel-plugin-iface.c
Log:
* libxfce4panel/xfce-panel-plugin-iface.c: Don't show the right-click menu
when the user is not allowed to customize the panel. This way the
xfce_panel_plugin_menu_insert_item items are never show (also the
'save' ones), but they are hardly used (bad excuse, I know).
Modified: xfce4-panel/trunk/ChangeLog
===================================================================
--- xfce4-panel/trunk/ChangeLog 2007-03-07 18:25:07 UTC (rev 25125)
+++ xfce4-panel/trunk/ChangeLog 2007-03-07 18:36:25 UTC (rev 25126)
@@ -1,3 +1,10 @@
+2007-03-07 19:35 nick
+
+ * libxfce4panel/xfce-panel-plugin-iface.c: Don't show the right-click menu
+ when the user is not allowed to customize the panel. This way the
+ xfce_panel_plugin_menu_insert_item items are never show (also the
+ 'save' ones), but they are hardly used (bad excuse, I know).
+
2007-03-05 21:55 nick
* panel/panel-dialogs.c: Set Full Height or Full Width based on the panel position.
Modified: xfce4-panel/trunk/libxfce4panel/xfce-panel-plugin-iface.c
===================================================================
--- xfce4-panel/trunk/libxfce4panel/xfce-panel-plugin-iface.c 2007-03-07 18:25:07 UTC (rev 25125)
+++ xfce4-panel/trunk/libxfce4panel/xfce-panel-plugin-iface.c 2007-03-07 18:36:25 UTC (rev 25126)
@@ -809,14 +809,15 @@
gint insert_position;
gint configure_position;
gchar *name;
- gboolean allow_customization;
g_return_if_fail (XFCE_IS_PANEL_PLUGIN (plugin));
+
+ /* leave when the user is not allowed to edit the panel */
+ if (G_UNLIKELY (xfce_allow_panel_customization () == FALSE))
+ return;
xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
- allow_customization = xfce_allow_panel_customization ();
-
menu = gtk_menu_new ();
/* title */
@@ -862,71 +863,63 @@
plugin);
/* move */
- if (G_LIKELY (allow_customization))
- {
- mi = gtk_image_menu_item_new_with_label (_("Move"));
- gtk_widget_show (mi);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+ mi = gtk_image_menu_item_new_with_label (_("Move"));
+ gtk_widget_show (mi);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
- img = gtk_image_new_from_stock (GTK_STOCK_GO_FORWARD, GTK_ICON_SIZE_MENU);
- gtk_widget_show (img);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), img);
+ img = gtk_image_new_from_stock (GTK_STOCK_GO_FORWARD, GTK_ICON_SIZE_MENU);
+ gtk_widget_show (img);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), img);
- g_signal_connect_swapped (G_OBJECT (mi), "activate",
- G_CALLBACK (xfce_panel_plugin_move), plugin);
+ g_signal_connect_swapped (G_OBJECT (mi), "activate",
+ G_CALLBACK (xfce_panel_plugin_move), plugin);
- /* insert custom items after move */
- insert_position = 5;
+ /* insert custom items after move */
+ insert_position = 5;
- /* remove */
- mi = gtk_separator_menu_item_new();
- gtk_widget_show (mi);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+ /* remove */
+ mi = gtk_separator_menu_item_new();
+ gtk_widget_show (mi);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
- mi = gtk_image_menu_item_new_with_label (_("Remove"));
- gtk_widget_show (mi);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+ mi = gtk_image_menu_item_new_with_label (_("Remove"));
+ gtk_widget_show (mi);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
- img = gtk_image_new_from_stock (GTK_STOCK_REMOVE, GTK_ICON_SIZE_MENU);
- gtk_widget_show (img);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), img);
+ img = gtk_image_new_from_stock (GTK_STOCK_REMOVE, GTK_ICON_SIZE_MENU);
+ gtk_widget_show (img);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), img);
- g_signal_connect_swapped (G_OBJECT (mi), "activate",
- G_CALLBACK (xfce_panel_plugin_remove_confirm),
- plugin);
+ g_signal_connect_swapped (G_OBJECT (mi), "activate",
+ G_CALLBACK (xfce_panel_plugin_remove_confirm),
+ plugin);
- /* panel section */
- mi = gtk_separator_menu_item_new();
- gtk_widget_show (mi);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+ /* panel section */
+ mi = gtk_separator_menu_item_new();
+ gtk_widget_show (mi);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
- mi = gtk_image_menu_item_new_with_label (_("Add New Item"));
- gtk_widget_show (mi);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+ mi = gtk_image_menu_item_new_with_label (_("Add New Item"));
+ gtk_widget_show (mi);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
- img = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_MENU);
- gtk_widget_show (img);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), img);
+ img = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_MENU);
+ gtk_widget_show (img);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), img);
- g_signal_connect_swapped (G_OBJECT (mi), "activate",
- G_CALLBACK (xfce_panel_plugin_customize_items), plugin);
+ g_signal_connect_swapped (G_OBJECT (mi), "activate",
+ G_CALLBACK (xfce_panel_plugin_customize_items), plugin);
- mi = gtk_image_menu_item_new_with_label (_("Customize Panel"));
- gtk_widget_show (mi);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+ mi = gtk_image_menu_item_new_with_label (_("Customize Panel"));
+ gtk_widget_show (mi);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
- img = gtk_image_new_from_stock (GTK_STOCK_PREFERENCES, GTK_ICON_SIZE_MENU);
- gtk_widget_show (img);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), img);
+ img = gtk_image_new_from_stock (GTK_STOCK_PREFERENCES, GTK_ICON_SIZE_MENU);
+ gtk_widget_show (img);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), img);
- g_signal_connect_swapped (G_OBJECT (mi), "activate",
- G_CALLBACK (xfce_panel_plugin_customize_panel), plugin);
- }
- else
- {
- /* insert custom items after about */
- insert_position = 4;
- }
+ g_signal_connect_swapped (G_OBJECT (mi), "activate",
+ G_CALLBACK (xfce_panel_plugin_customize_panel), plugin);
g_object_set_data (G_OBJECT (plugin),
I_("xfce-panel-plugin-insert-position"),
@@ -1120,7 +1113,7 @@
gint position;
GList *l;
- if (!xfce_allow_panel_customization())
+ if (G_UNLIKELY (xfce_allow_panel_customization() == FALSE))
return;
menu = g_object_get_data (G_OBJECT (plugin), I_("xfce-panel-plugin-menu"));
More information about the Xfce4-commits
mailing list