--- a/ChangeLog Thu Jan 13 16:26:55 2005 +0000
+++ b/ChangeLog Thu Jan 13 17:16:45 2005 +0000
@@ -1,3 +1,8 @@
+2005-01-13 Laszlo Kovacs <[email protected]>
+ * gnome-panel-04-menu-changes.diff,
+ gnome-panel-08-lockdown.diff,
+ gnome-panel-27-g11n-potfiles.diff: changed these to fix 6216717
+
2005-01-13 Johan Steyn <[email protected]>
* patches/gnome-vfs-28-network-places.diff:
--- a/patches/gnome-panel-04-menu-changes.diff Thu Jan 13 16:26:55 2005 +0000
+++ b/patches/gnome-panel-04-menu-changes.diff Thu Jan 13 17:16:45 2005 +0000
@@ -311,43 +311,6 @@
int fr_compare (FileRec *fra, FileRec *frb);
void free_mfile (MFile *mfile);
---- gnome-panel-2.6.1/gnome-panel/Makefile.am 2004-10-21 12:17:07.000000000 +0100
-+++ gnome-panel-2.6.1-work/gnome-panel/Makefile.am 2004-10-21 17:02:51.145532056 +0100
-@@ -238,6 +238,9 @@ glade_DATA = \
- EXTRA_DIST = \
- GNOME_Panel.server.in \
- gnome-panel-preferences.desktop.in \
-+ gnome-panel-search.desktop.in \
-+ gnome-panel-computer.desktop.in \
-+ gnome-panel-help.desktop.in \
- $(glade_DATA) \
- nothing.cP \
- nothing.h \
-@@ -250,9 +253,13 @@ EXTRA_DIST = \
- panel-default-setup.entries
-
- sysdir = $(datadir)/control-center-2.0/capplets
--sys_in_files = gnome-panel-preferences.desktop.in
-+sys_in_files = gnome-panel-preferences.desktop.in
- sys_DATA = $(sys_in_files:.desktop.in=.desktop)
-
-+sys_extdir = $(datadir)/applications/
-+sys_in_ext_files= gnome-panel-search.desktop.in gnome-panel-computer.desktop.in gnome-panel-help.desktop.in
-+sys_ext_DATA = $(sys_in_ext_files:.desktop.in=.desktop)
-+
- @INTLTOOL_DESKTOP_RULE@
-
- panel_enum_headers = \
-@@ -337,7 +344,8 @@ CLEANFILES = \
- $(BUILT_SOURCES) \
- $(schemas_in_files:.schemas.in=.schemas) \
- $(server_DATA) \
-- $(sys_DATA)
-+ $(sys_DATA) \
-+ $(sys_ext_DATA)
-
- dist-hook:
- cd $(distdir) ; rm -f $(CLEANFILES)
--- /dev/null 2004-04-06 14:27:52.000000000 +0100
+++ gnome-panel-2.6.1-work/gnome-panel/gnome-panel-search.desktop.in 2004-10-21 13:23:55.000000000 +0100
@@ -0,0 +1,15 @@
@@ -382,25 +345,45 @@
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-panel
+X-GNOME-Bugzilla-Component=general
---- /dev/null 2004-04-06 14:27:52.000000000 +0100
-+++ gnome-panel-2.6.1-work/gnome-panel/gnome-panel-help.desktop.in 2004-10-21 16:40:58.395100456 +0100
-@@ -0,0 +1,13 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+_Name=Help
-+_Comment=Look at help documentation
-+Exec=jds-help %F
-+Icon=gnome-help
-+Terminal=false
-+Type=Application
-+StartupNotify=true
-+OnlyShowIn=GNOME;
-+X-GNOME-Bugzilla-Bugzilla=GNOME
-+X-GNOME-Bugzilla-Product=gnome-panel
-+X-GNOME-Bugzilla-Component=general
---- gnome-panel-2.6.1/gnome-panel/menu.c 2004-10-29 12:40:51.736014176 +0530
-+++ gnome-panel-2.6.1-new/gnome-panel/menu.c 2004-10-29 12:24:16.302343096 +0530
-@@ -149,7 +149,7 @@ static AppletMenuInfo action_buttons_inf
+--- gnome-panel-2.6.1/gnome-panel/Makefile.am 2005-01-13 16:39:22.430542952 +0000
++++ gnome-panel-2.6.1.mod/gnome-panel/Makefile.am 2005-01-13 16:38:31.501285376 +0000
+@@ -236,6 +236,8 @@
+ EXTRA_DIST = \
+ GNOME_Panel.server.in \
+ gnome-panel-preferences.desktop.in \
++ gnome-panel-search.desktop.in \
++ gnome-panel-computer.desktop.in \
+ $(glade_DATA) \
+ nothing.cP \
+ nothing.h \
+@@ -248,9 +250,13 @@
+ panel-default-setup.entries
+
+ sysdir = $(datadir)/control-center-2.0/capplets
+-sys_in_files = gnome-panel-preferences.desktop.in
++sys_in_files = gnome-panel-preferences.desktop.in
+ sys_DATA = $(sys_in_files:.desktop.in=.desktop)
+
++sys_extdir = $(datadir)/applications/
++sys_in_ext_files= gnome-panel-search.desktop.in gnome-panel-computer.desktop.in
++sys_ext_DATA = $(sys_in_ext_files:.desktop.in=.desktop)
++
+ @INTLTOOL_DESKTOP_RULE@
+
+ panel_enum_headers = \
+@@ -335,7 +341,8 @@
+ $(BUILT_SOURCES) \
+ $(schemas_in_files:.schemas.in=.schemas) \
+ $(server_DATA) \
+- $(sys_DATA)
++ $(sys_DATA) \
++ $(sys_ext_DATA)
+
+ dist-hook:
+ cd $(distdir) ; rm -f $(CLEANFILES)
+--- gnome-panel-2.6.1/gnome-panel/menu.c 2005-01-13 16:39:22.432542648 +0000
++++ gnome-panel-2.6.1.mod/gnome-panel/menu.c 2005-01-13 16:38:48.373720376 +0000
+@@ -149,7 +149,7 @@
"ACTION:screenshot:NEW",
TRUE },
@@ -409,7 +392,7 @@
N_("Actions"),
"Actions",
N_("Find files, folders, and documents on your computer"),
-@@ -2288,6 +2288,22 @@ create_menuitem (GtkWidget *menu,
+@@ -2288,6 +2288,22 @@
return TRUE;
}
@@ -432,7 +415,7 @@
GtkWidget *
create_menu_at (GtkWidget *menu,
const char *menudir,
-@@ -2303,7 +2319,6 @@ create_menu_at (GtkWidget *menu,
+@@ -2303,7 +2319,6 @@
fake_submenus,
force);
}
@@ -440,7 +423,7 @@
static GtkWidget *
create_menu_at_fr (GtkWidget *menu,
FileRec *fr,
-@@ -2893,11 +2908,6 @@ create_add_launcher_menu (GtkWidget *men
+@@ -2893,11 +2908,6 @@
FALSE /* fake */,
TRUE /* launcher_add */);
@@ -452,7 +435,7 @@
return menu;
}
-@@ -3221,21 +3231,35 @@ static void
+@@ -3221,21 +3231,35 @@
append_log_out (GtkWidget *menu)
{
GtkWidget *menuitem;
@@ -491,7 +474,7 @@
}
static GtkWidget *
-@@ -3285,84 +3309,38 @@ add_distribution_submenu (GtkWidget *roo
+@@ -3285,84 +3309,38 @@
NULL);
}
@@ -601,7 +584,7 @@
menuitem = gtk_image_menu_item_new ();
setup_stock_menu_item (
menuitem, panel_menu_icon_get_size (),
-@@ -3371,61 +3349,93 @@ create_root_menu (GtkWidget *root_menu
+@@ -3371,61 +3349,93 @@
G_CALLBACK (panel_action_run_program),
NULL);
setup_internal_applet_drag (menuitem, "ACTION:run:NEW");
@@ -660,7 +643,7 @@
+
+ /* Help */
+ if (panel_is_program_in_path ("jds-help")) {
-+ create_menuitem_from_file (menu, DATADIR"/applications/gnome-panel-help.desktop");
++ create_menuitem_from_file (menu, DATADIR"/applications/jdshelp.desktop");
}
+}
@@ -733,3 +716,4 @@
return root_menu;
}
+
--- a/patches/gnome-panel-08-lockdown.diff Thu Jan 13 16:26:55 2005 +0000
+++ b/patches/gnome-panel-08-lockdown.diff Thu Jan 13 17:16:45 2005 +0000
@@ -491,10 +491,10 @@
+ }
}
}
-
---- gnome-panel-2.6.1/gnome-panel/menu.c 2004-10-29 14:58:20.291043208 +0530
-+++ gnome-panel-2.6.1-new/gnome-panel/menu.c 2004-10-29 15:02:25.399781016 +0530
-@@ -201,6 +201,9 @@ static void make_add_submenu (
+
+--- gnome-panel-2.6.1/gnome-panel/menu.c 2005-01-13 17:02:06.938106272 +0000
++++ gnome-panel-2.6.1.mod/gnome-panel/menu.c 2005-01-13 16:57:23.184243416 +0000
+@@ -201,6 +201,9 @@
Bonobo_ServerInfoList *applet_list);
static PanelWidget *menu_get_panel (GtkWidget *menu);
static GdkScreen *menuitem_to_screen (GtkWidget *menuitem);
@@ -504,7 +504,7 @@
static inline gboolean
panel_menu_have_icons (void)
-@@ -347,16 +350,22 @@ activate_app_def (GtkWidget *menuitem,
+@@ -347,16 +350,22 @@
&error);
if (item) {
@@ -537,7 +537,7 @@
}
gnome_desktop_item_unref (item);
} else {
-@@ -431,6 +440,26 @@ menuitem_to_screen (GtkWidget *menuitem)
+@@ -431,6 +440,26 @@
}
static void
@@ -564,7 +564,7 @@
menus_have_icons_changed (GConfClient *client,
guint cnxn_id,
GConfEntry *entry,
-@@ -1800,6 +1829,49 @@ setup_invisible_mnemonic (GtkWidget *men
+@@ -1800,6 +1829,49 @@
setup_mnemonic (menuitem, NULL, GUINT_TO_POINTER (accel_key));
}
@@ -614,7 +614,7 @@
static void
setup_full_menuitem (GtkWidget *menuitem,
GtkIconSize icon_size,
-@@ -1871,7 +1943,7 @@ setup_full_menuitem (GtkWidget *menuit
+@@ -1871,7 +1943,7 @@
}
}
@@ -623,7 +623,7 @@
}
void
-@@ -2678,7 +2750,8 @@ append_internal_applets (GSList *list)
+@@ -2678,7 +2750,8 @@
int i;
for (i = 0; i < G_N_ELEMENTS (action_buttons_info); i++) {
@@ -633,7 +633,7 @@
action_buttons_info [i].action_type == PANEL_ACTION_RUN)
continue;
-@@ -2694,6 +2767,16 @@ append_internal_applets (GSList *list)
+@@ -2694,6 +2767,16 @@
action_buttons_info [i].action_type == PANEL_ACTION_LOGOUT)
continue;
@@ -650,7 +650,7 @@
if (!translated) {
action_buttons_info [i].name = _(action_buttons_info [i].name);
action_buttons_info [i].category = _(action_buttons_info [i].category);
-@@ -2757,6 +2840,11 @@ create_applets_menu (GtkWidget
+@@ -2757,6 +2840,11 @@
continue;
name = bonobo_server_info_prop_lookup (info, "name", langs_gslist);
@@ -662,7 +662,7 @@
category = bonobo_server_info_prop_lookup (info, "panel:category", langs_gslist);
description = bonobo_server_info_prop_lookup (info, "description", langs_gslist);
icon = bonobo_server_info_prop_lookup (info, "panel:icon", NULL);
-@@ -3340,7 +3428,8 @@ append_random_unrelated_items (GtkWidget
+@@ -3340,7 +3428,8 @@
GtkWidget *menuitem;
/* Run Application */
@@ -672,7 +672,7 @@
menuitem = gtk_image_menu_item_new ();
setup_stock_menu_item (
menuitem, panel_menu_icon_get_size (),
-@@ -3363,7 +3452,10 @@ append_random_unrelated_items (GtkWidget
+@@ -3363,7 +3452,10 @@
create_menuitem_from_file (menu, DATADIR"/applications/gnome-panel-computer.desktop");
/* Find Files */
@@ -684,7 +684,7 @@
create_menuitem_from_file (menu, DATADIR"/applications/gnome-panel-search.desktop");
}
-@@ -3372,7 +3464,10 @@ append_random_unrelated_items (GtkWidget
+@@ -3372,7 +3464,10 @@
add_uri_submenu (menu, "preferences:///", _("Preferences"), PANEL_STOCK_PREFERENCES);
/* Help */
@@ -693,10 +693,10 @@
+ ((panel_lockdown_get_restrict_application_launching () &&
+ panel_lockdown_is_allowed_application ("/usr/bin/jds-help")) ||
+ (!panel_lockdown_get_restrict_application_launching ()))) {
- create_menuitem_from_file (menu, DATADIR"/applications/gnome-panel-help.desktop");
+ create_menuitem_from_file (menu, DATADIR"/applications/jdshelp.desktop");
}
}
-@@ -3429,7 +3524,11 @@ create_root_menu (GtkWidget *root_menu
+@@ -3429,7 +3524,11 @@
append_random_unrelated_items (root_menu);
@@ -709,3 +709,6 @@
create_desktop_menu (root_menu);
+
+
+
--- a/patches/gnome-panel-27-g11n-potfiles.diff Thu Jan 13 16:26:55 2005 +0000
+++ b/patches/gnome-panel-27-g11n-potfiles.diff Thu Jan 13 17:16:45 2005 +0000
@@ -1,12 +1,10 @@
-diff -urN gnome-panel-2.6.1.bak/po/POTFILES.in gnome-panel-2.6.1/po/POTFILES.in
---- gnome-panel-2.6.1.bak/po/POTFILES.in 2004-11-05 09:32:59.553961352 +0000
-+++ gnome-panel-2.6.1/po/POTFILES.in 2004-11-05 09:38:52.578293496 +0000
-@@ -43,12 +43,15 @@
+--- gnome-panel-2.6.1/po/POTFILES.in 2005-01-13 17:10:56.052668632 +0000
++++ gnome-panel-2.6.1.mod/po/POTFILES.in 2005-01-13 17:10:38.914274064 +0000
+@@ -43,12 +43,14 @@
gnome-panel/distribution.c
gnome-panel/drawer.c
gnome-panel/gnome-desktop-item-edit.c
+gnome-panel/gnome-panel-computer.desktop.in
-+gnome-panel/gnome-panel-help.desktop.in
gnome-panel/gnome-panel-preferences.c
gnome-panel/gnome-panel-preferences.desktop.in
gnome-panel/gnome-panel-preferences.glade