[gnome-panel] wncklet: Do not setup applet menu since we have no item anymore

[Vincent Untz <vuntz src gnome org>]

commit 6c6c3def3a049971faaf95a0e0b634d5aaf376d0
Author: Vincent Untz <vuntz gnome org>
Date:   Tue Feb 22 15:05:36 2011 +0100

    wncklet: Do not setup applet menu since we have no item anymore
    
    Also remove unused wncklet_display_about().

 applets/wncklet/Makefile.am          |    2 -
 applets/wncklet/showdesktop-menu.xml |    1 -
 applets/wncklet/showdesktop.c        |   17 ------------
 applets/wncklet/window-list.c        |    2 +-
 applets/wncklet/window-menu-menu.xml |    1 -
 applets/wncklet/window-menu.c        |   17 ------------
 applets/wncklet/wncklet.c            |   48 ----------------------------------
 applets/wncklet/wncklet.h            |   12 --------
 applets/wncklet/workspace-switcher.c |    2 +-
 9 files changed, 2 insertions(+), 100 deletions(-)
---
diff --git a/applets/wncklet/Makefile.am b/applets/wncklet/Makefile.am
index b3f0c1d..45f8809 100644
--- a/applets/wncklet/Makefile.am
+++ b/applets/wncklet/Makefile.am
@@ -80,9 +80,7 @@ ui_DATA = workspace-switcher.ui window-list.ui
 
 xmluidir    = $(datadir)/gnome-panel/ui
 xmlui_DATA  = \
-	window-menu-menu.xml \
 	workspace-switcher-menu.xml \
-	showdesktop-menu.xml \
 	window-list-menu.xml
 
 schemasdir       = $(GCONF_SCHEMA_FILE_DIR)
diff --git a/applets/wncklet/showdesktop.c b/applets/wncklet/showdesktop.c
index ff506d0..b52e2b8 100644
--- a/applets/wncklet/showdesktop.c
+++ b/applets/wncklet/showdesktop.c
@@ -220,9 +220,6 @@ update_icon (ShowDesktopData *sdd)
         g_object_unref (icon);
 }
 
-static const GtkActionEntry show_desktop_menu_actions [] = {
-};
-
 /* This updates things that should be consistent with the button's appearance,
  * and update_button_state updates the button appearance itself
  */
@@ -403,8 +400,6 @@ gboolean
 show_desktop_applet_fill (PanelApplet *applet)
 {
         ShowDesktopData *sdd;
-	GtkActionGroup  *action_group;
-	gchar           *ui_path;
 	AtkObject       *atk_obj;
         GtkCssProvider  *provider;
 
@@ -477,18 +472,6 @@ show_desktop_applet_fill (PanelApplet *applet)
 	panel_applet_set_background_widget (PANEL_APPLET (sdd->applet),
 					    GTK_WIDGET (sdd->applet));
 
-	action_group = gtk_action_group_new ("ShowDesktop Applet Actions");
-	gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE);
-	gtk_action_group_add_actions (action_group,
-				      show_desktop_menu_actions,
-				      G_N_ELEMENTS (show_desktop_menu_actions),
-				      sdd);
-	ui_path = g_build_filename (WNCK_MENU_UI_DIR, "showdesktop-menu.xml", NULL);
-	panel_applet_setup_menu_from_file (PANEL_APPLET (sdd->applet),
-					   ui_path, action_group);
-	g_free (ui_path);
-	g_object_unref (action_group);
-
         g_signal_connect (G_OBJECT (sdd->applet),
                           "destroy",
                           G_CALLBACK (applet_destroyed),
diff --git a/applets/wncklet/window-list.c b/applets/wncklet/window-list.c
index e0e2026..f835fb3 100644
--- a/applets/wncklet/window-list.c
+++ b/applets/wncklet/window-list.c
@@ -175,7 +175,7 @@ destroy_tasklist(GtkWidget * widget, TasklistData *tasklist)
 static const GtkActionEntry tasklist_menu_actions [] = {
 	{ "TasklistPreferences", GTK_STOCK_PROPERTIES, N_("_Preferences"),
 	  NULL, NULL,
-	  G_CALLBACK (display_properties_dialog) },
+	  G_CALLBACK (display_properties_dialog) }
 };
 
 static void
diff --git a/applets/wncklet/window-menu.c b/applets/wncklet/window-menu.c
index 180b78f..a04a631 100644
--- a/applets/wncklet/window-menu.c
+++ b/applets/wncklet/window-menu.c
@@ -50,10 +50,6 @@ typedef struct {
 	PanelAppletOrient orient;
 } WindowMenu;
 
-static const GtkActionEntry window_menu_actions [] =
-{
-};
-
 static void
 window_menu_destroy (GtkWidget  *widget,
                      WindowMenu *window_menu)
@@ -206,8 +202,6 @@ gboolean
 window_menu_applet_fill (PanelApplet *applet)
 {
 	WindowMenu *window_menu;
-	GtkActionGroup *action_group;
-	gchar *ui_path;
 
 	window_menu = g_new0 (WindowMenu, 1);
 
@@ -222,17 +216,6 @@ window_menu_applet_fill (PanelApplet *applet)
 	g_signal_connect (window_menu->applet, "destroy",
 			  G_CALLBACK (window_menu_destroy), window_menu);
 
-	action_group = gtk_action_group_new ("WindowMenu Applet Actions");
-	gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE);
-	gtk_action_group_add_actions (action_group,
-				      window_menu_actions,
-				      G_N_ELEMENTS (window_menu_actions),
-				      window_menu);
-	ui_path = g_build_filename (WNCK_MENU_UI_DIR, "window-menu-menu.xml", NULL);
-	panel_applet_setup_menu_from_file (applet, ui_path, action_group);
-	g_free (ui_path);
-	g_object_unref (action_group);
-
 	window_menu->selector = wnck_selector_new ();
 	gtk_container_add (GTK_CONTAINER (window_menu->applet), 
 			   window_menu->selector);
diff --git a/applets/wncklet/wncklet.c b/applets/wncklet/wncklet.c
index 6eb0f72..5d8abfd 100644
--- a/applets/wncklet/wncklet.c
+++ b/applets/wncklet/wncklet.c
@@ -39,54 +39,6 @@
 #include "showdesktop.h"
 
 void
-wncklet_display_about (GtkWidget   *applet,
-		       GtkWidget  **dialog,
-		       const char  *name,
-		       const char  *copyright,
-		       const char  *comments,
-		       const char **authors,
-		       const char **documenters,
-		       const char  *translator_credits,
-		       const char  *icon_name,
-		       const char  *wmclass_name,
-		       const char  *wmclass_class)
-{
-	if (*dialog) {
-		gtk_window_set_screen (GTK_WINDOW (*dialog),
-				       gtk_widget_get_screen (applet));
-		gtk_window_present (GTK_WINDOW (*dialog));
-		return;
-	}
-
-	*dialog = gtk_about_dialog_new ();
-	g_object_set (*dialog,
-		      "program-name",  name,
-		      "version", VERSION,
-		      "copyright", copyright,
-		      "comments", comments,
-		      "authors", authors,
-		      "documenters", documenters,
-		      "translator-credits", translator_credits,
-		      "logo-icon-name", icon_name,
-		      NULL);
-
-	gtk_window_set_wmclass (GTK_WINDOW (*dialog),
-				wmclass_name, wmclass_class);
-	gtk_window_set_screen (GTK_WINDOW (*dialog),
-			       gtk_widget_get_screen (applet));
-
-	gtk_window_set_icon_name (GTK_WINDOW (*dialog), icon_name); 
-	g_signal_connect (*dialog, "destroy",
-			  (GCallback) gtk_widget_destroyed, dialog);
-	
-	g_signal_connect (*dialog, "response",
-			  G_CALLBACK (gtk_widget_destroy),
-			  NULL);
-
-	gtk_widget_show (*dialog);
-}
-
-void
 wncklet_display_help (GtkWidget  *widget,
 		      const char *doc_id,
 		      const char *link_id,
diff --git a/applets/wncklet/wncklet.h b/applets/wncklet/wncklet.h
index 32817d8..154741d 100644
--- a/applets/wncklet/wncklet.h
+++ b/applets/wncklet/wncklet.h
@@ -32,18 +32,6 @@
 
 G_BEGIN_DECLS
 
-void        wncklet_display_about       (GtkWidget   *applet,
-					 GtkWidget  **dialog,
-					 const char  *name,
-					 const char  *copyright,
-					 const char  *comments,
-					 const char **authors,
-					 const char **documenters,
-					 const char  *translator_credits,
-					 const char  *icon_name,
-					 const char  *wmclass_name,
-					 const char  *wmclass_class);
-
 void        wncklet_display_help        (GtkWidget  *widget,
 					 const char *doc_id,
 					 const char *link_id,
diff --git a/applets/wncklet/workspace-switcher.c b/applets/wncklet/workspace-switcher.c
index 8a0bd73..a118b09 100644
--- a/applets/wncklet/workspace-switcher.c
+++ b/applets/wncklet/workspace-switcher.c
@@ -241,7 +241,7 @@ destroy_pager(GtkWidget * widget, PagerData *pager)
 static const GtkActionEntry pager_menu_actions [] = {
         { "PagerPreferences", GTK_STOCK_PROPERTIES, N_("_Preferences"),
           NULL, NULL,
-          G_CALLBACK (display_properties_dialog) },
+          G_CALLBACK (display_properties_dialog) }
 };
 
 static void