--- a/patches/gnome-panel-03-menu-changes.diff Fri Aug 01 17:32:21 2003 +0000
+++ b/patches/gnome-panel-03-menu-changes.diff Sat Aug 02 11:10:01 2003 +0000
@@ -1,7 +1,7 @@
-diff -urNp ../gnome-panel-2.3.4.1.old/gnome-panel/menu-util.c ./gnome-panel/menu-util.c
---- ../gnome-panel-2.3.4.1.old/gnome-panel/menu-util.c 2003-07-24 14:05:32.000000000 +0100
-+++ ./gnome-panel/menu-util.c 2003-07-24 14:24:16.000000000 +0100
-@@ -184,16 +184,7 @@ panel_position_applet_menu (GtkMenu *m
+diff -urN ../gnome-panel-2.3.4.1/gnome-panel/menu-util.c gnome-panel/menu-util.c
+--- ../gnome-panel-2.3.4.1/gnome-panel/menu-util.c 2003-07-24 03:14:33.000000000 -0700
++++ gnome-panel/menu-util.c 2003-08-01 11:57:36.000000000 -0700
+@@ -184,16 +184,7 @@
int
get_default_menu_flags (void)
{
@@ -19,10 +19,81 @@
}
gboolean
-diff -urNp ../gnome-panel-2.3.4.1.old/gnome-panel/menu.c ./gnome-panel/menu.c
---- ../gnome-panel-2.3.4.1.old/gnome-panel/menu.c 2003-07-24 14:05:32.000000000 +0100
-+++ ./gnome-panel/menu.c 2003-07-24 14:45:29.000000000 +0100
-@@ -2851,11 +2851,6 @@ create_add_launcher_menu (GtkWidget *men
+diff -urN ../gnome-panel-2.3.4.1/gnome-panel/panel-menu-bar.c gnome-panel/panel-menu-bar.c
+--- ../gnome-panel-2.3.4.1/gnome-panel/panel-menu-bar.c 2003-07-24 03:10:10.000000000 -0700
++++ gnome-panel/panel-menu-bar.c 2003-08-01 11:57:36.000000000 -0700
+@@ -39,7 +39,7 @@
+ #include "panel-globals.h"
+ #include "panel-profile.h"
+
+-#define MENU_FLAGS (MAIN_MENU_SYSTEM | MAIN_MENU_DISTRIBUTION_SUB)
++#define MENU_FLAGS (MAIN_MENU_SYSTEM)
+
+ enum {
+ PROP_0,
+@@ -121,32 +121,18 @@
+ item = gtk_separator_menu_item_new ();
+ gtk_menu_shell_append (GTK_MENU_SHELL (menubar->priv->actions_menu), item);
+
++ panel_recent_append_documents_menu (menubar->priv->actions_menu);
++
+ if (panel_is_program_in_path ("gnome-search-tool"))
+ panel_menu_bar_append_action_item (
+ menubar,
+ menubar->priv->actions_menu,
+- _("Search for Files..."),
++ _("Find Files..."),
+ PANEL_STOCK_SEARCHTOOL,
+ _("Find files, folders, and documents on your computer"),
+ "ACTION:search:NEW",
+ G_CALLBACK (panel_action_search));
+
+- panel_recent_append_documents_menu (menubar->priv->actions_menu);
+-
+- if (panel_is_program_in_path ("gnome-panel-screenshot")) {
+- item = gtk_separator_menu_item_new ();
+- gtk_menu_shell_append (GTK_MENU_SHELL (menubar->priv->actions_menu), item);
+-
+- panel_menu_bar_append_action_item (
+- menubar,
+- menubar->priv->actions_menu,
+- _("Take Screenshot..."),
+- PANEL_STOCK_SCREENSHOT,
+- _("Take a screenshot of your desktop"),
+- "ACTION:screenshot:NEW",
+- G_CALLBACK (panel_action_screenshot));
+- }
+-
+ item = gtk_separator_menu_item_new ();
+ gtk_menu_shell_append (GTK_MENU_SHELL (menubar->priv->actions_menu), item);
+
+diff -urN ../gnome-panel-2.3.4.1/gnome-panel/panel-stock-icons.c gnome-panel/panel-stock-icons.c
+--- ../gnome-panel-2.3.4.1/gnome-panel/panel-stock-icons.c 2003-07-21 05:28:31.000000000 -0700
++++ gnome-panel/panel-stock-icons.c 2003-08-01 11:57:36.000000000 -0700
+@@ -87,6 +87,8 @@
+ { PANEL_STOCK_DRAWER, "panel-drawer" },
+ { PANEL_STOCK_APPLETS, "gnome-applets" },
+ { PANEL_STOCK_DESKTOP, "gnome-ccdesktop" },
++ { PANEL_STOCK_FAVORITES, "gnome-favorites" },
++ { PANEL_STOCK_CONTROL_PANEL, "gnome-desktop-config" },
+ };
+
+ static void
+diff -urN ../gnome-panel-2.3.4.1/gnome-panel/panel-stock-icons.h gnome-panel/panel-stock-icons.h
+--- ../gnome-panel-2.3.4.1/gnome-panel/panel-stock-icons.h 2003-07-21 05:28:31.000000000 -0700
++++ gnome-panel/panel-stock-icons.h 2003-08-01 11:57:36.000000000 -0700
+@@ -61,6 +61,8 @@
+ #define PANEL_STOCK_DRAWER "panel-drawer"
+ #define PANEL_STOCK_APPLETS "panel-applet"
+ #define PANEL_STOCK_DESKTOP "panel-desktop"
++#define PANEL_STOCK_FAVORITES "panel-favorites"
++#define PANEL_STOCK_CONTROL_PANEL "panel-control-panel"
+
+ /* stock items - no point in theme the icons one these,
+ * they use stock gtk icons and just modify the text
+--- ../gnome-panel-2.3.4.1/gnome-panel/menu.c 2003-07-24 03:12:28.000000000 -0700
++++ gnome-panel/menu.c 2003-08-02 05:00:54.000000000 -0700
+@@ -2850,11 +2850,6 @@
FALSE /* fake */,
TRUE /* launcher_add */);
@@ -34,7 +105,7 @@
return menu;
}
-@@ -3235,105 +3230,83 @@ add_distribution_submenu (GtkWidget *roo
+@@ -3234,105 +3229,85 @@
NULL);
}
@@ -68,6 +139,9 @@
- has_inline |= (flags & (MAIN_MENU_DISTRIBUTION));
- has_subs |= (flags & (MAIN_MENU_DISTRIBUTION_SUB));
- }
+-
+- if (!root_menu)
+- root_menu = menu_new ();
+ GdkScreen *screen;
+ char *argv[2] = {"yelp", NULL};
+
@@ -81,57 +155,60 @@
+ argv [0]);
+}
-- if (!root_menu)
-- root_menu = menu_new ();
+- g_object_set_data (G_OBJECT (root_menu), "menu_panel", panel);
+static void
-+add_favorites_submenu (GtkWidget *menu)
++add_uri_submenu (GtkWidget *menu, const char *uri, const char *description, const char *stock_id)
+{
-+ GtkWidget *submenu;
-+ GtkWidget *menuitem;
-
-- g_object_set_data (G_OBJECT (root_menu), "menu_panel", panel);
-+ submenu = create_menu_at (NULL,
-+ "favorites:///",
-+ FALSE,
-+ _("Favorites"),
-+ TRUE,
-+ FALSE);
++ GtkWidget *submenu;
++ GtkWidget *menuitem;
++
++ submenu = create_menu_at (NULL,
++ uri,
++ FALSE,
++ description,
++ TRUE,
++ FALSE);
++
++ menuitem = gtk_image_menu_item_new ();
++
++ panel_load_menu_image_deferred (
++ menuitem, panel_menu_icon_get_size (), stock_id, NULL, NULL, FALSE);
++
++ setup_menuitem (menuitem, panel_menu_icon_get_size (), NULL, description, TRUE);
++ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
++ gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu);
++ g_signal_connect (G_OBJECT(submenu),"show",
++ G_CALLBACK (submenu_to_display), NULL);
++}
- if (flags & MAIN_MENU_SYSTEM)
- create_system_menu(root_menu, fake_submenus,
- FALSE /* fake */,
- FALSE /* launcher_add */);
-+ menuitem = gtk_image_menu_item_new ();
-
-- if (flags & MAIN_MENU_DISTRIBUTION &&
-- distribution_info != NULL) {
-- if (distribution_info->menu_show_func)
-- distribution_info->menu_show_func(NULL,NULL);
-+ panel_load_menu_image_deferred (
-+ menuitem, panel_menu_icon_get_size (), PANEL_STOCK_FAVORITES, NULL, NULL, FALSE);
-
-- create_distribution_menu(root_menu, fake_submenus, FALSE,
-- FALSE /* launcher_add */);
-- }
-+ setup_menuitem (menuitem, panel_menu_icon_get_size (), NULL, _("Favorites"), TRUE);
-+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-+ gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu);
-+ g_signal_connect (G_OBJECT(submenu),"show",
-+ G_CALLBACK (submenu_to_display), NULL);
-+}
+static void
+append_random_unrelated_items (GtkWidget *menu)
+{
+ GtkWidget *submenu;
+ GtkWidget *menuitem;
+- if (flags & MAIN_MENU_DISTRIBUTION &&
+- distribution_info != NULL) {
+- if (distribution_info->menu_show_func)
+- distribution_info->menu_show_func(NULL,NULL);
++ /* Settings Sub-menu */
+
+- create_distribution_menu(root_menu, fake_submenus, FALSE,
+- FALSE /* launcher_add */);
+- }
++ add_uri_submenu (menu, "extras:///", _("Extras"), GTK_STOCK_DIALOG_ERROR);
++ add_uri_submenu (menu, "favorites:///", _("Favorites"), PANEL_STOCK_FAVORITES);
+
- /*others here*/
-+ /* Settings Sub-menu */
++ /* Run Application */
- if (has_subs && has_inline)
- add_menu_separator (root_menu);
-+ add_favorites_submenu (menu);
-
+-
-
- if (flags & MAIN_MENU_SYSTEM_SUB) {
- menu = create_system_menu(NULL, fake_submenus, TRUE,
@@ -149,12 +226,6 @@
- NULL);
- }
- }
-+ /* Run Application */
-
-- if (flags & MAIN_MENU_DISTRIBUTION_SUB) {
-- add_distribution_submenu (root_menu, fake_submenus,
-- FALSE /*launcher_add */);
-- }
+ menuitem = gtk_image_menu_item_new ();
+ setup_stock_menu_item (
+ menuitem, panel_menu_icon_get_size (),
@@ -167,6 +238,12 @@
+ gtk_tooltips_set_tip (panel_tooltips, menuitem,
+ _("Run an Application by entering a command"), NULL);
+- if (flags & MAIN_MENU_DISTRIBUTION_SUB) {
+- add_distribution_submenu (root_menu, fake_submenus,
+- FALSE /*launcher_add */);
+- }
++ add_menu_separator (menu);
+
- if ( ! no_run_box && extra_items) {
- add_menu_separator (root_menu);
- menuitem = gtk_image_menu_item_new ();
@@ -181,8 +258,6 @@
- gtk_tooltips_set_tip (panel_tooltips, menuitem,
- _("Run an Application by entering a command"), NULL);
- }
-+ add_menu_separator (menu);
-+
+ /* Open Recent Files */
+ panel_recent_append_documents_menu (menu);
@@ -201,7 +276,7 @@
gtk_tooltips_set_tip (panel_tooltips, menuitem,
_("Find files, folders, and documents "
"on your computer"),
-@@ -3341,41 +3314,101 @@ create_root_menu (GtkWidget *root_menu
+@@ -3340,41 +3315,101 @@
g_signal_connect (menuitem, "activate",
G_CALLBACK (panel_action_search), NULL);
setup_internal_applet_drag (menuitem, "ACTION:search:NEW");
@@ -321,73 +396,3 @@
return root_menu;
}
-diff -urNp ../gnome-panel-2.3.4.1.old/gnome-panel/panel-menu-bar.c ./gnome-panel/panel-menu-bar.c
---- ../gnome-panel-2.3.4.1.old/gnome-panel/panel-menu-bar.c 2003-07-24 14:05:32.000000000 +0100
-+++ ./gnome-panel/panel-menu-bar.c 2003-07-24 14:29:44.000000000 +0100
-@@ -40,7 +40,7 @@
- #include "panel-profile.h"
- #include "panel-menu.h"
-
--#define MENU_FLAGS (MAIN_MENU_SYSTEM | MAIN_MENU_DISTRIBUTION_SUB)
-+#define MENU_FLAGS (MAIN_MENU_SYSTEM)
-
- enum {
- PROP_0,
-@@ -122,32 +122,18 @@ panel_menu_bar_append_actions_menu (Pane
- item = gtk_separator_menu_item_new ();
- gtk_menu_shell_append (GTK_MENU_SHELL (menubar->priv->actions_menu), item);
-
-+ panel_recent_append_documents_menu (menubar->priv->actions_menu);
-+
- if (panel_is_program_in_path ("gnome-search-tool"))
- panel_menu_bar_append_action_item (
- menubar,
- menubar->priv->actions_menu,
-- _("Search for Files..."),
-+ _("Find Files..."),
- PANEL_STOCK_SEARCHTOOL,
- _("Find files, folders, and documents on your computer"),
- "ACTION:search:NEW",
- G_CALLBACK (panel_action_search));
-
-- panel_recent_append_documents_menu (menubar->priv->actions_menu);
--
-- if (panel_is_program_in_path ("gnome-panel-screenshot")) {
-- item = gtk_separator_menu_item_new ();
-- gtk_menu_shell_append (GTK_MENU_SHELL (menubar->priv->actions_menu), item);
--
-- panel_menu_bar_append_action_item (
-- menubar,
-- menubar->priv->actions_menu,
-- _("Take Screenshot..."),
-- PANEL_STOCK_SCREENSHOT,
-- _("Take a screenshot of your desktop"),
-- "ACTION:screenshot:NEW",
-- G_CALLBACK (panel_action_screenshot));
-- }
--
- item = gtk_separator_menu_item_new ();
- gtk_menu_shell_append (GTK_MENU_SHELL (menubar->priv->actions_menu), item);
-
---- ../gnome-panel-2.3.4.1/gnome-panel/panel-stock-icons.h 2003-07-21 12:28:31.000000000 +0000
-+++ gnome-panel/panel-stock-icons.h 2003-07-24 18:47:49.000000000 +0000
-@@ -61,6 +61,8 @@
- #define PANEL_STOCK_DRAWER "panel-drawer"
- #define PANEL_STOCK_APPLETS "panel-applet"
- #define PANEL_STOCK_DESKTOP "panel-desktop"
-+#define PANEL_STOCK_FAVORITES "panel-favorites"
-+#define PANEL_STOCK_CONTROL_PANEL "panel-control-panel"
-
- /* stock items - no point in theme the icons one these,
- * they use stock gtk icons and just modify the text
---- ../gnome-panel-2.3.4.1/gnome-panel/panel-stock-icons.c 2003-07-21 12:28:31.000000000 +0000
-+++ gnome-panel/panel-stock-icons.c 2003-07-24 18:48:21.000000000 +0000
-@@ -87,6 +87,8 @@
- { PANEL_STOCK_DRAWER, "panel-drawer" },
- { PANEL_STOCK_APPLETS, "gnome-applets" },
- { PANEL_STOCK_DESKTOP, "gnome-ccdesktop" },
-+ { PANEL_STOCK_FAVORITES, "gnome-favorites" },
-+ { PANEL_STOCK_CONTROL_PANEL, "gnome-desktop-config" },
- };
-
- static void