GNOME.org
 

[gnome-panel] Remove help and about from wncklet applets

commit 58e5485b67d94cc303245274a1845418291dca97
Author: William Jon McCann <jmccann redhat com>
Date:   Wed Feb 16 14:55:30 2011 -0500

    Remove help and about from wncklet applets
    
    https://bugzilla.gnome.org/show_bug.cgi?id=631553

 applets/wncklet/showdesktop-menu.xml        |    2 -
 applets/wncklet/showdesktop.c               |   47 --------------------------
 applets/wncklet/window-list-menu.xml        |    2 -
 applets/wncklet/window-list.c               |   46 -------------------------
 applets/wncklet/window-menu-menu.xml        |    2 -
 applets/wncklet/window-menu.c               |   44 ------------------------
 applets/wncklet/workspace-switcher-menu.xml |    2 -
 applets/wncklet/workspace-switcher.c        |   48 ---------------------------
 8 files changed, 0 insertions(+), 193 deletions(-)
---
diff --git a/applets/wncklet/showdesktop-menu.xml b/applets/wncklet/showdesktop-menu.xml
index 3770f27..8b13789 100644
--- a/applets/wncklet/showdesktop-menu.xml
+++ b/applets/wncklet/showdesktop-menu.xml
@@ -1,3 +1 @@
-<menuitem name="Show Desktop Help Item" action="ShowDesktopHelp"/>
-<menuitem name="Show Desktop About Item" action="ShowDesktopAbout"/>
 
diff --git a/applets/wncklet/showdesktop.c b/applets/wncklet/showdesktop.c
index 9bd0444..ff506d0 100644
--- a/applets/wncklet/showdesktop.c
+++ b/applets/wncklet/showdesktop.c
@@ -59,11 +59,6 @@ typedef struct {
 	GtkIconTheme *icon_theme;
 } ShowDesktopData;
 
-static void display_help_dialog  (GtkAction       *action,
-                                  ShowDesktopData *sdd);
-static void display_about_dialog (GtkAction       *action,
-                                  ShowDesktopData *sdd);
-
 static void update_icon           (ShowDesktopData *sdd);
 static void update_button_state   (ShowDesktopData *sdd);
 static void update_button_display (ShowDesktopData *sdd);
@@ -226,12 +221,6 @@ update_icon (ShowDesktopData *sdd)
 }
 
 static const GtkActionEntry show_desktop_menu_actions [] = {
-	{ "ShowDesktopHelp", GTK_STOCK_HELP, N_("_Help"),
-	  NULL, NULL,
-	  G_CALLBACK (display_help_dialog) },
-	{ "ShowDesktopAbout", GTK_STOCK_ABOUT, N_("_About"),
-	  NULL, NULL,
-	  G_CALLBACK (display_about_dialog) }
 };
 
 /* This updates things that should be consistent with the button's appearance,
@@ -520,42 +509,6 @@ show_desktop_applet_fill (PanelApplet *applet)
 }
 
 static void
-display_help_dialog (GtkAction       *action,
-                     ShowDesktopData *sdd)
-{
-	wncklet_display_help (sdd->applet, "user-guide",
-			      "gospanel-564", SHOW_DESKTOP_ICON);
-}
-
-static void
-display_about_dialog (GtkAction       *action,
-                      ShowDesktopData *sdd)
-{
-        static const gchar *authors[] = {
-                "Havoc Pennington <hp redhat com>",
-                NULL
-        };
-        static const char *documenters[] = {
-                "Sun GNOME Documentation Team <gdocteam sun com>",
-                NULL
-        };
-
-        /* Translator credits */
-        const char *translator_credits = _("translator-credits");
-
-	wncklet_display_about (sdd->applet, &sdd->about_dialog,
-			       _("Show Desktop Button"),
-			       "Copyright \xc2\xa9 2002 Red Hat, Inc.",
-			       _("This button lets you hide all windows and show the desktop."),
-			       authors,
-			       documenters,
-			       translator_credits,
-			       SHOW_DESKTOP_ICON,
-			       "show-desktop",
-			       "show-desktop");
-}
-
-static void
 button_toggled_callback (GtkWidget       *button,
                          ShowDesktopData *sdd)
 {
diff --git a/applets/wncklet/window-list-menu.xml b/applets/wncklet/window-list-menu.xml
index 008d382..17109ec 100644
--- a/applets/wncklet/window-list-menu.xml
+++ b/applets/wncklet/window-list-menu.xml
@@ -1,4 +1,2 @@
 <menuitem name="Tasklist Preferences Item" action="TasklistPreferences" />
-<menuitem name="Tasklist Help Item" action="TasklistHelp" />
-<menuitem name="Tasklist About Item" action="TasklistAbout" />
 
diff --git a/applets/wncklet/window-list.c b/applets/wncklet/window-list.c
index 77e0b07..e0e2026 100644
--- a/applets/wncklet/window-list.c
+++ b/applets/wncklet/window-list.c
@@ -59,10 +59,6 @@ typedef struct {
 
 static void display_properties_dialog (GtkAction    *action,
 				       TasklistData *tasklist);
-static void display_help_dialog       (GtkAction    *action,
-				       TasklistData *tasklist);
-static void display_about_dialog      (GtkAction    *action,
-				       TasklistData *tasklist);
 
 static void
 tasklist_update (TasklistData *tasklist)
@@ -180,12 +176,6 @@ static const GtkActionEntry tasklist_menu_actions [] = {
 	{ "TasklistPreferences", GTK_STOCK_PROPERTIES, N_("_Preferences"),
 	  NULL, NULL,
 	  G_CALLBACK (display_properties_dialog) },
-	{ "TasklistHelp", GTK_STOCK_HELP, N_("_Help"),
-	  NULL, NULL,
-	  G_CALLBACK (display_help_dialog) },
-	{ "TasklistAbout", GTK_STOCK_ABOUT, N_("_About"),
-	  NULL, NULL,
-	  G_CALLBACK (display_about_dialog) }
 };
 
 static void
@@ -567,42 +557,6 @@ window_list_applet_fill (PanelApplet *applet)
 	return TRUE;
 }
 
-
-static void
-display_help_dialog (GtkAction    *action,
-		     TasklistData *tasklist)
-{
-	wncklet_display_help (tasklist->applet, "user-guide",
-			      "windowlist", WINDOW_LIST_ICON);
-}
-
-static void
-display_about_dialog (GtkAction    *action,
-		      TasklistData *tasklist)
-{
-	static const gchar *authors[] =
-	{
-		"Alexander Larsson <alla lysator liu se>",
-		NULL
-	};
-	const char *documenters [] = {
-		"Sun GNOME Documentation Team <gdocteam sun com>",
-		NULL
-	};
-	const char *translator_credits = _("translator-credits");
-
-	wncklet_display_about (tasklist->applet, &tasklist->about,
-			       _("Window List"),
-			       "Copyright \xc2\xa9 2001-2002 Red Hat, Inc.",
-			       _("The Window List shows a list of all windows in a set of buttons and lets you browse them."),
-			       authors,
-			       documenters,
-			       translator_credits,
-			       WINDOW_LIST_ICON,
-			       "tasklist",
-			       "Tasklist");
-}
-
 static void
 group_windows_toggled (GtkToggleButton *button,
 		       TasklistData    *tasklist)
diff --git a/applets/wncklet/window-menu-menu.xml b/applets/wncklet/window-menu-menu.xml
index 2646b2d..8b13789 100644
--- a/applets/wncklet/window-menu-menu.xml
+++ b/applets/wncklet/window-menu-menu.xml
@@ -1,3 +1 @@
-<menuitem name="WindowMenu Help Item" action="WindowMenuHelp" />
-<menuitem name="WindowMenu About Item" action="WindowMenuAbout" />
 
diff --git a/applets/wncklet/window-menu.c b/applets/wncklet/window-menu.c
index 66fbc6c..180b78f 100644
--- a/applets/wncklet/window-menu.c
+++ b/applets/wncklet/window-menu.c
@@ -50,52 +50,8 @@ typedef struct {
 	PanelAppletOrient orient;
 } WindowMenu;
 
-static void
-window_menu_help (GtkAction  *action,
-                  WindowMenu *window_menu)
-{
-	wncklet_display_help (window_menu->applet, "user-guide",
-			      "panel-windowselector", WINDOW_MENU_ICON);
-}
-
-static void
-window_menu_about (GtkAction  *action,
-                   WindowMenu *window_menu)
-{
-	static const char *authors[] = {
-		"Mark McLoughlin <mark skynet ie>",
-		"George Lebl <jirka 5z com>",
-		"Jacob Berkman <jacob helixcode com>",
-		NULL
-	};
-	const char *documenters [] = { 
-                "Sun GNOME Documentation Team <gdocteam sun com>",
-                NULL 
-        };
-	const char *translator_credits = _("translator-credits");
-
-	wncklet_display_about (window_menu->applet, &window_menu->about_dialog,
-			       _("Window Selector"),
-			       "Copyright \xc2\xa9 2003 Sun Microsystems, Inc.\n"
-			       "Copyright \xc2\xa9 2001 Free Software Foundation, Inc.\n"
-			       "Copyright \xc2\xa9 2000 Helix Code, Inc.",
-			       _("The Window Selector shows a list of all windows in a menu and lets you browse them."),
-			       authors,
-			       documenters,
-			       translator_credits,
-			       WINDOW_MENU_ICON,
-			       "window-menu",
-			       "WindowMenu");
-}
-
 static const GtkActionEntry window_menu_actions [] =
 {
-	{ "WindowMenuHelp", GTK_STOCK_HELP, N_("_Help"),
-	  NULL, NULL,
-	  G_CALLBACK (window_menu_help) },
-	{ "WindowMenuAbout", GTK_STOCK_ABOUT, N_("_About"),
-	  NULL, NULL,
-	  G_CALLBACK (window_menu_about) }
 };
 
 static void
diff --git a/applets/wncklet/workspace-switcher-menu.xml b/applets/wncklet/workspace-switcher-menu.xml
index d7354eb..c500c22 100644
--- a/applets/wncklet/workspace-switcher-menu.xml
+++ b/applets/wncklet/workspace-switcher-menu.xml
@@ -1,6 +1,4 @@
 <menuitem name="Pager Preferences Item" action="PagerPreferences" />
-<menuitem name="Pager Help Item" action="PagerHelp" />
-<menuitem name="Pager About Item" action="PagerAbout" />
 
 
 
diff --git a/applets/wncklet/workspace-switcher.c b/applets/wncklet/workspace-switcher.c
index eef294f..8a0bd73 100644
--- a/applets/wncklet/workspace-switcher.c
+++ b/applets/wncklet/workspace-switcher.c
@@ -79,10 +79,6 @@ typedef struct {
 
 static void display_properties_dialog (GtkAction *action,
 				       PagerData *pager);
-static void display_help_dialog       (GtkAction *action,
-                                       PagerData *pager);
-static void display_about_dialog      (GtkAction *action,
-                                       PagerData *pager);
 
 static void
 pager_update (PagerData *pager)
@@ -246,12 +242,6 @@ static const GtkActionEntry pager_menu_actions [] = {
         { "PagerPreferences", GTK_STOCK_PROPERTIES, N_("_Preferences"),
           NULL, NULL,
           G_CALLBACK (display_properties_dialog) },
-        { "PagerHelp", GTK_STOCK_HELP, N_("_Help"),
-          NULL, NULL,
-          G_CALLBACK (display_help_dialog) },
-        { "PagerAbout", GTK_STOCK_ABOUT, N_("_About"),
-          NULL, NULL,
-          G_CALLBACK (display_about_dialog) }
 };
 
 static void
@@ -496,44 +486,6 @@ workspace_switcher_applet_fill (PanelApplet *applet)
 	return TRUE;
 }
 
-
-static void
-display_help_dialog (GtkAction *action,
-		     PagerData *pager)
-{
-	wncklet_display_help (pager->applet, "user-guide",
-			      "overview-workspaces", WORKSPACE_SWITCHER_ICON);
-}
-
-static void
-display_about_dialog (GtkAction *action,
-		      PagerData *pager)
-{
-	static const gchar *authors[] =
-	{
-		"Alexander Larsson <alla lysator liu se>",
-		NULL
-	};
-	const char *documenters [] = {
-                "John Fleck <jfleck inkstain net>",
-                "Sun GNOME Documentation Team <gdocteam sun com>",
-                NULL
-	};
-	const char *translator_credits = _("translator-credits");
-
-	wncklet_display_about (pager->applet, &pager->about,
-			       _("Workspace Switcher"),
-			       "Copyright \xc2\xa9 2001-2002 Red Hat, Inc.",
-			       _("The Workspace Switcher shows you a small version of your workspaces that lets you manage your windows."),
-			       authors,
-			       documenters,
-			       translator_credits,
-			       WORKSPACE_SWITCHER_ICON,
-			       "pager",
-			       "Pager");
-}
-
-
 static void
 display_workspace_names_toggled (GtkToggleButton *button,
 				 PagerData       *pager)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]