* base-specs/gnome-panel.spec : Bump 2.23.6
* patches/gnome-panel-07-restrict-app-launching.diff : Re-Apply
* patches/gnome-panel-08-launch-menu.diff : Re-Apply
* patches/gnome-panel-11-trusted-extensions.diff : Re-Apply
* patches/gnome-panel-15-double-func.diff : Re-Apply
* patches/gnome-panel-16-disable-lock-screen.diff : Remove
* base-specs/libgweather.spec : Bump 2.23.6
--- a/ChangeLog Wed Aug 06 15:28:54 2008 +0000
+++ b/ChangeLog Wed Aug 06 16:14:59 2008 +0000
@@ -1,3 +1,13 @@
+2008-08-06 Matt Keenan <[email protected]>
+
+ * base-specs/gnome-panel.spec : Bump 2.23.6
+ * patches/gnome-panel-07-restrict-app-launching.diff : Re-Apply
+ * patches/gnome-panel-08-launch-menu.diff : Re-Apply
+ * patches/gnome-panel-11-trusted-extensions.diff : Re-Apply
+ * patches/gnome-panel-15-double-func.diff : Re-Apply
+ * patches/gnome-panel-16-disable-lock-screen.diff : Remove
+ * base-specs/libgweather.spec : Bump 2.23.6
+
2008-08-06 Ghee Teo <[email protected]>
Bum up to 2.23.6 and reworked some of the patches.
--- a/base-specs/gnome-panel.spec Wed Aug 06 15:28:54 2008 +0000
+++ b/base-specs/gnome-panel.spec Wed Aug 06 16:14:59 2008 +0000
@@ -11,7 +11,7 @@
Name: gnome-panel
License: GPL
Group: System/GUI/GNOME
-Version: 2.23.5
+Version: 2.23.6
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
@@ -68,8 +68,6 @@
Patch14: gnome-panel-14-logout-keyboard-navigation.diff
# date:2008-02-13 type:bug owner:dcarbery bugzilla:543291
Patch15: gnome-panel-15-double-func.diff
-# date:2008-03-14 type:bug owner:mattman bugster:6675507 bugzilla:522453
-Patch16: gnome-panel-16-disable-lock-screen.diff
# date:2008-05-14 type:bug owner:davelam bugzilla:532098
Patch19: gnome-panel-19-add-libsocket.diff
URL: http://www.gnome.org
@@ -150,7 +148,6 @@
# %patch12 -p1 MAY NOT NEED ANYMORE as panel-logout.[ch] have been removed
# %patch14 -p1 MAY NOT NEED ANYMORE as panel-logout.[ch] have been removed
%patch15 -p1
-%patch16 -p1
%patch19 -p1
cp %SOURCE3 icons
@@ -264,6 +261,9 @@
%{_mandir}/man3/*
%changelog
+* Wed Aug 06 2008 - [email protected]
+- Bump to 2.23.6
+- Remove gnome-panel-16-disable-lock-screen.diff : upstreamed
* Thu Jul 24 2008 - [email protected]
- Bump to 2.23.5
- Remove upstreaam patch-17-launcher-name-crash.diff
--- a/base-specs/libgweather.spec Wed Aug 06 15:28:54 2008 +0000
+++ b/base-specs/libgweather.spec Wed Aug 06 16:14:59 2008 +0000
@@ -11,7 +11,7 @@
Name: libgweather
License: GPL
Group: System/GUI/GNOME
-Version: 2.23.5
+Version: 2.23.6
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
@@ -72,6 +72,8 @@
%changelog
+* Wed Aug 06 2008 - [email protected]
+- Bump to 2.23.6.
* Wed Jul 22 2008 - [email protected]
- Bump to 2.23.5.
* Tue Jun 17 2008 - [email protected]
--- a/patches/gnome-panel-07-restrict-app-launching.diff Wed Aug 06 15:28:54 2008 +0000
+++ b/patches/gnome-panel-07-restrict-app-launching.diff Wed Aug 06 16:14:59 2008 +0000
@@ -1,116 +1,3 @@
---- gnome-panel-2.23.5.old/gnome-panel/Makefile.am Thu Jul 24 11:30:14 2008
-+++ gnome-panel-2.23.5/gnome-panel/Makefile.am Thu Jul 24 11:31:38 2008
-@@ -167,6 +167,8 @@
- panel-ditem-editor.c \
- panel-marshal.c \
- panel-util.c \
-+ panel-lockdown.c \
-+ panel-gconf.c \
- xstuff.c
-
- gnome_desktop_item_edit_LDFLAGS = -export-dynamic
---- gnome-panel-2.23.5.old/gnome-panel/gnome-desktop-item-edit.c Thu Jul 24 11:30:14 2008
-+++ gnome-panel-2.23.5/gnome-panel/gnome-desktop-item-edit.c Thu Jul 24 11:33:25 2008
-@@ -8,6 +8,7 @@
- #include <libpanel-util/panel-keyfile.h>
-
- #include "panel-ditem-editor.h"
-+#include "panel-lockdown.h"
- #include "panel-icon-names.h"
-
- #include "nothing.cP"
-@@ -104,6 +105,8 @@
- bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
- textdomain (GETTEXT_PACKAGE);
-
-+ panel_lockdown_init ();
-+
- context = g_option_context_new (N_("- Edit .desktop files"));
- g_option_context_set_translation_domain (context, GETTEXT_PACKAGE);
- g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);
-@@ -223,5 +226,7 @@
-
- g_object_unref (program);
-
-+ panel_lockdown_finalize ();
-+
- return 0;
- }
---- gnome-panel-2.23.5.old/gnome-panel/launcher.c Thu Jul 24 11:30:14 2008
-+++ gnome-panel-2.23.5/gnome-panel/launcher.c Thu Jul 24 11:38:44 2008
-@@ -160,6 +160,9 @@
- g_return_if_fail (launcher != NULL);
- g_return_if_fail (launcher->key_file != NULL);
-
-+ if (!panel_lockdown_is_forbidden_launcher (launcher))
-+ return;
-+
- /* FIXME panel_ditem_launch() should be enough for this! */
- url = panel_key_file_get_string (launcher->key_file, "URL");
-
-@@ -205,6 +208,9 @@
- g_return_if_fail (launcher != NULL);
- g_return_if_fail (launcher->key_file != NULL);
-
-+ if (panel_lockdown_is_forbidden_launcher (launcher))
-+ return;
-+
- if (panel_global_config_get_enable_animations ())
- xstuff_zoom_animate (widget,
- button_widget_get_pixbuf (BUTTON_WIDGET (widget)),
-@@ -573,7 +579,11 @@
- FALSE,
- PANEL_ORIENTATION_TOP);
-
-- gtk_widget_show (launcher->button);
-+ if (panel_lockdown_is_forbidden_launcher (launcher)) {
-+ gtk_widget_hide (launcher->button);
-+ } else {
-+ gtk_widget_show (launcher->button);
-+ }
-
- /*gtk_drag_dest_set (GTK_WIDGET (launcher->button),
- GTK_DEST_DEFAULT_ALL,
-@@ -986,6 +996,10 @@
- if (file != NULL)
- panel_key_file_set_string (key_file, "Exec", file);
- panel_key_file_set_string (key_file, "Type", "Application");
-+
-+ if (!panel_lockdown_is_forbidden_key_file (key_file))
-+ return; /* Application being dragged is forbidden so just return */
-+
- panel_ditem_editor_sync_display (PANEL_DITEM_EDITOR (dialog));
-
- panel_ditem_register_save_uri_func (PANEL_DITEM_EDITOR (dialog),
-@@ -1040,16 +1054,18 @@
- }
-
- location = panel_make_unique_desktop_uri (NULL, exec_or_uri);
-- if (panel_key_file_to_file (key_file, location, &error)) {
-- panel_launcher_create (toplevel, position, location);
-- } else {
-- panel_error_dialog (GTK_WINDOW (toplevel),
-- gtk_window_get_screen (GTK_WINDOW (toplevel)),
-- "cannot_save_launcher", TRUE,
-- _("Could not save launcher"),
-- error->message);
-- g_error_free (error);
-- }
-+ if (!panel_lockdown_is_forbidden_key_file (key_file)) {
-+ if (panel_key_file_to_file (key_file, location, &error)) {
-+ panel_launcher_create (toplevel, position, location);
-+ } else {
-+ panel_error_dialog (GTK_WINDOW (toplevel),
-+ gtk_window_get_screen (GTK_WINDOW (toplevel)),
-+ "cannot_save_launcher", TRUE,
-+ _("Could not save launcher"),
-+ error->message);
-+ g_error_free (error);
-+ }
-+ }
-
- g_key_file_free (key_file);
- }
--- gnome-panel-2.23.5.old/gnome-panel/menu.c Thu Jul 24 11:30:14 2008
+++ gnome-panel-2.23.5/gnome-panel/menu.c Thu Jul 24 11:53:24 2008
@@ -71,7 +71,8 @@
@@ -330,22 +217,6 @@
}
g_slist_free (items);
---- gnome-panel-2.23.5.old/gnome-panel/panel-action-button.c Thu Jul 24 11:30:14 2008
-+++ gnome-panel-2.23.5/gnome-panel/panel-action-button.c Thu Jul 24 11:54:08 2008
-@@ -205,8 +205,11 @@
- static void
- panel_action_run_program (GtkWidget *widget)
- {
-- panel_run_dialog_present (gtk_widget_get_screen (widget),
-- gtk_get_current_event_time ());
-+ if (!panel_lockdown_get_restrict_application_launching () &&
-+ !panel_lockdown_get_disable_command_line ()) {
-+ panel_run_dialog_present (gtk_widget_get_screen (widget),
-+ gtk_get_current_event_time ());
-+ }
- }
-
- /* Search For Files
--- gnome-panel-2.23.5.old/gnome-panel/panel-addto.c Thu Jul 24 11:30:14 2008
+++ gnome-panel-2.23.5/gnome-panel/panel-addto.c Thu Jul 24 12:01:52 2008
@@ -568,9 +568,10 @@
@@ -911,9 +782,123 @@
G_END_DECLS
#endif /* __PANEL_LOCKDOWN_H__ */
---- gnome-panel-2.23.5.old/gnome-panel/panel-menu-bar.c Thu Jul 24 11:30:14 2008
-+++ gnome-panel-2.23.5/gnome-panel/panel-menu-bar.c Thu Jul 24 12:25:21 2008
-@@ -123,6 +123,32 @@
+--- gnome-panel-2.23.5.old/gnome-panel/panel-menu-items.h Thu Jul 24 11:30:14 2008
++++ gnome-panel-2.23.5/gnome-panel/panel-menu-items.h Thu Jul 24 12:29:37 2008
+@@ -90,6 +90,8 @@
+ void panel_menu_items_append_lock_logout (GtkWidget *menu);
+ void panel_menu_item_activate_desktop_file (GtkWidget *menuitem,
+ const char *path);
++void panel_place_menu_item_recreate_menu (GtkWidget *widget);
++void panel_desktop_menu_item_recreate_menu (PanelDesktopMenuItem *desktop_item);
+
+ G_END_DECLS
+
+--- gnome-panel-2.23.6.old/gnome-panel/Makefile.am 2008-08-06 12:53:26.767943000 +0100
++++ gnome-panel-2.23.6/gnome-panel/Makefile.am 2008-08-06 12:54:03.949234000 +0100
+@@ -165,6 +165,8 @@
+ panel-ditem-editor.c \
+ panel-marshal.c \
+ panel-util.c \
++ panel-lockdown.c \
++ panel-gconf.c \
+ xstuff.c
+
+ gnome_desktop_item_edit_LDFLAGS = -export-dynamic
+--- gnome-panel-2.23.6.old/gnome-panel/launcher.c 2008-08-06 12:53:26.767710000 +0100
++++ gnome-panel-2.23.6/gnome-panel/launcher.c 2008-08-06 13:03:03.773802000 +0100
+@@ -160,6 +160,9 @@
+ g_return_if_fail (launcher != NULL);
+ g_return_if_fail (launcher->key_file != NULL);
+
++ if (!panel_lockdown_is_forbidden_launcher (launcher))
++ return;
++
+ /* FIXME panel_ditem_launch() should be enough for this! */
+ url = panel_key_file_get_string (launcher->key_file, "URL");
+
+@@ -191,6 +194,9 @@
+ g_return_if_fail (launcher != NULL);
+ g_return_if_fail (launcher->key_file != NULL);
+
++ if (panel_lockdown_is_forbidden_launcher (launcher))
++ return;
++
+ if (panel_global_config_get_enable_animations ())
+ xstuff_zoom_animate (widget,
+ button_widget_get_pixbuf (BUTTON_WIDGET (widget)),
+@@ -555,7 +561,11 @@
+ FALSE,
+ PANEL_ORIENTATION_TOP);
+
+- gtk_widget_show (launcher->button);
++ if (panel_lockdown_is_forbidden_launcher (launcher)) {
++ gtk_widget_hide (launcher->button);
++ } else {
++ gtk_widget_show (launcher->button);
++ }
+
+ /*gtk_drag_dest_set (GTK_WIDGET (launcher->button),
+ GTK_DEST_DEFAULT_ALL,
+@@ -968,6 +978,10 @@
+ if (file != NULL)
+ panel_key_file_set_string (key_file, "Exec", file);
+ panel_key_file_set_string (key_file, "Type", "Application");
++
++ if (!panel_lockdown_is_forbidden_key_file (key_file))
++ return; /* Application being dragged is forbidden so just return */
++
+ panel_ditem_editor_sync_display (PANEL_DITEM_EDITOR (dialog));
+
+ panel_ditem_register_save_uri_func (PANEL_DITEM_EDITOR (dialog),
+@@ -1022,17 +1036,19 @@
+ }
+
+ location = panel_make_unique_desktop_uri (NULL, exec_or_uri);
+- if (panel_key_file_to_file (key_file, location, &error)) {
+- panel_launcher_create (toplevel, position, location);
+- } else {
+- panel_error_dialog (GTK_WINDOW (toplevel),
+- gtk_window_get_screen (GTK_WINDOW (toplevel)),
+- "cannot_save_launcher", TRUE,
+- _("Could not save launcher"),
+- error->message);
+- g_error_free (error);
+- }
+
++ if (!panel_lockdown_is_forbidden_key_file (key_file)) {
++ if (panel_key_file_to_file (key_file, location, &error)) {
++ panel_launcher_create (toplevel, position, location);
++ } else {
++ panel_error_dialog (GTK_WINDOW (toplevel),
++ gtk_window_get_screen (GTK_WINDOW (toplevel)),
++ "cannot_save_launcher", TRUE,
++ _("Could not save launcher"),
++ error->message);
++ g_error_free (error);
++ }
++ }
+ g_key_file_free (key_file);
+ }
+
+--- gnome-panel-2.23.6.old/gnome-panel/panel-action-button.c 2008-08-06 12:53:26.760030000 +0100
++++ gnome-panel-2.23.6/gnome-panel/panel-action-button.c 2008-08-06 14:02:31.985241000 +0100
+@@ -206,8 +206,11 @@
+ static void
+ panel_action_run_program (GtkWidget *widget)
+ {
+- panel_run_dialog_present (gtk_widget_get_screen (widget),
+- gtk_get_current_event_time ());
++ if (!panel_lockdown_get_restrict_application_launching () &&
++ !panel_lockdown_get_disable_command_line ()) {
++ panel_run_dialog_present (gtk_widget_get_screen (widget),
++ gtk_get_current_event_time ());
++ }
+ }
+
+ /* Search For Files
+--- gnome-panel-2.23.6.old/gnome-panel/panel-menu-bar.c 2008-08-06 12:53:26.765387000 +0100
++++ gnome-panel-2.23.6/gnome-panel/panel-menu-bar.c 2008-08-06 14:12:49.113236000 +0100
+@@ -130,6 +130,32 @@
}
static void
@@ -946,18 +931,18 @@
panel_menu_bar_init (PanelMenuBar *menubar)
{
GtkWidget *image;
-@@ -153,6 +179,8 @@
+@@ -160,6 +186,8 @@
menubar->priv->desktop_item);
panel_menu_bar_setup_tooltip (menubar);
+ panel_lockdown_notify_add (G_CALLBACK (panel_menubar_recreate_menus),
-+ menubar);
++ menubar);
panel_menu_bar_update_text_gravity (menubar);
g_signal_connect (menubar, "screen-changed",
---- gnome-panel-2.23.5.old/gnome-panel/panel-menu-items.c Thu Jul 24 11:30:14 2008
-+++ gnome-panel-2.23.5/gnome-panel/panel-menu-items.c Thu Jul 24 12:28:49 2008
-@@ -181,7 +181,22 @@
+--- gnome-panel-2.23.6.old/gnome-panel/panel-menu-items.c 2008-08-06 12:53:26.949399000 +0100
++++ gnome-panel-2.23.6/gnome-panel/panel-menu-items.c 2008-08-06 14:15:53.239714000 +0100
+@@ -151,6 +151,21 @@
char *icon;
char *name;
char *comment;
@@ -972,15 +957,14 @@
+ gnome_desktop_item_unref (ditem);
+ return;
+ }
-
++
+ if (ditem != NULL) {
+ gnome_desktop_item_unref (ditem);
+ }
-+
+
path_freeme = NULL;
- key_file = g_key_file_new ();
-@@ -1048,7 +1063,7 @@
+@@ -1018,7 +1033,7 @@
return places_menu;
}
@@ -989,7 +973,7 @@
panel_place_menu_item_recreate_menu (GtkWidget *widget)
{
PanelPlaceMenuItem *place_item;
-@@ -1156,7 +1171,7 @@
+@@ -1126,7 +1141,7 @@
return desktop_menu;
}
@@ -998,7 +982,7 @@
panel_desktop_menu_item_recreate_menu (PanelDesktopMenuItem *desktop_item)
{
if (desktop_item->priv->menu) {
-@@ -1519,8 +1534,11 @@
+@@ -1493,8 +1508,11 @@
tooltip = NULL;
}
@@ -1012,7 +996,7 @@
g_free (label);
g_free (tooltip);
-@@ -1545,7 +1563,22 @@
+@@ -1521,6 +1539,21 @@
const char *path)
{
GError *error;
@@ -1022,7 +1006,7 @@
+ ditem = gnome_desktop_item_new_from_file (path, 0, NULL);
+ else
+ ditem = gnome_desktop_item_new_from_basename (path, 0, NULL);
-
++
+ if (ditem != NULL && panel_lockdown_is_forbidden_ditem (ditem)) {
+ gnome_desktop_item_unref (ditem);
+ return; /* Don't launch as it's a forbidden desktop file */
@@ -1031,32 +1015,12 @@
+ if (ditem != NULL) {
+ gnome_desktop_item_unref (ditem);
+ }
-+
+
error = NULL;
panel_launch_desktop_file (path, NULL,
- menuitem_to_screen (menuitem), &error);
---- gnome-panel-2.23.5.old/gnome-panel/panel-menu-items.h Thu Jul 24 11:30:14 2008
-+++ gnome-panel-2.23.5/gnome-panel/panel-menu-items.h Thu Jul 24 12:29:37 2008
-@@ -90,6 +90,8 @@
- void panel_menu_items_append_lock_logout (GtkWidget *menu);
- void panel_menu_item_activate_desktop_file (GtkWidget *menuitem,
- const char *path);
-+void panel_place_menu_item_recreate_menu (GtkWidget *widget);
-+void panel_desktop_menu_item_recreate_menu (PanelDesktopMenuItem *desktop_item);
-
- G_END_DECLS
-
---- gnome-panel-2.23.5.old/gnome-panel/panel-util.c Thu Jul 24 11:30:14 2008
-+++ gnome-panel-2.23.5/gnome-panel/panel-util.c Thu Jul 24 12:31:31 2008
-@@ -39,6 +39,7 @@
- #include "panel-globals.h"
- #include "launcher.h"
- #include "panel-icon-names.h"
-+#include "panel-lockdown.h"
-
- static int
- panel_ditem_launch (GnomeDesktopItem *item,
-@@ -127,6 +128,10 @@
+--- gnome-panel-2.23.6.old/gnome-panel/panel-util.c 2008-08-06 12:53:26.765816000 +0100
++++ gnome-panel-2.23.6/gnome-panel/panel-util.c 2008-08-06 14:19:56.007739000 +0100
+@@ -132,6 +132,10 @@
ditem = gnome_desktop_item_new_from_basename (desktop_file, 0,
error);
@@ -1067,13 +1031,30 @@
if (ditem != NULL) {
panel_ditem_launch (ditem, NULL, screen, error);
gnome_desktop_item_unref (ditem);
-@@ -684,6 +689,9 @@
- char *command = NULL;
- gboolean use_gscreensaver = FALSE;
+--- gnome-panel-2.23.6.old/gnome-panel/gnome-desktop-item-edit.c 2008-08-06 16:59:16.769405000 +0100
++++ gnome-panel-2.23.6/gnome-panel/gnome-desktop-item-edit.c 2008-08-06 17:02:30.650110000 +0100
+@@ -21,7 +21,6 @@
+ #include "panel-config-global.h"
+ gboolean panel_global_config_get_tooltips_enabled (void) { return FALSE; }
+ #include "panel-lockdown.h"
+-gboolean panel_lockdown_get_disable_lock_screen (void) { return FALSE; }
+
+ static int dialogs = 0;
+ static gboolean create_new = FALSE;
+@@ -107,6 +106,8 @@
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ textdomain (GETTEXT_PACKAGE);
-+ if (panel_lockdown_get_disable_lock_screen ())
-+ return NULL;
++ panel_lockdown_init ();
+
- if (panel_is_program_in_path ("gnome-screensaver-command")
- && panel_is_program_in_path ("gnome-screensaver-preferences"))
- use_gscreensaver = TRUE;
+ context = g_option_context_new (N_("- Edit .desktop files"));
+ g_option_context_set_translation_domain (context, GETTEXT_PACKAGE);
+ g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);
+@@ -226,5 +227,7 @@
+
+ g_object_unref (program);
+
++ panel_lockdown_finalize ();
++
+ return 0;
+ }
--- a/patches/gnome-panel-08-launch-menu.diff Wed Aug 06 15:28:54 2008 +0000
+++ b/patches/gnome-panel-08-launch-menu.diff Wed Aug 06 16:14:59 2008 +0000
@@ -1,7 +1,29 @@
-diff -urN gnome-panel-2.17.92/gnome-panel/menu.c gnome-panel-2.17.92-hacked/gnome-panel/menu.c
---- gnome-panel-2.17.92/gnome-panel/menu.c 2007-03-07 13:19:42.271056000 +1300
-+++ gnome-panel-2.17.92-hacked/gnome-panel/menu.c 2007-03-15 16:02:59.607633000 +1300
-@@ -1802,39 +1802,125 @@
+diff -urN gnome-panel-2.17.92/gnome-panel/menu.h gnome-panel-2.17.92-hacked/gnome-panel/menu.h
+--- gnome-panel-2.17.92/gnome-panel/menu.h 2007-03-07 13:19:42.386037000 +1300
++++ gnome-panel-2.17.92-hacked/gnome-panel/menu.h 2007-03-15 12:20:07.021275000 +1300
+@@ -66,6 +66,8 @@
+
+ gboolean menu_dummy_button_press_event (GtkWidget *menuitem,
+ GdkEventButton *event);
++void run_applications (GtkWidget *widget, gpointer user_data);
++void applications_menu_append (GtkWidget *main_menu);
+
+
+ G_END_DECLS
+diff -urN gnome-panel-2.17.92/gnome-panel/panel-menu-items.h gnome-panel-2.17.92-hacked/gnome-panel/panel-menu-items.h
+--- gnome-panel-2.17.92/gnome-panel/panel-menu-items.h 2007-03-07 13:19:42.389906000 +1300
++++ gnome-panel-2.17.92-hacked/gnome-panel/panel-menu-items.h 2007-03-15 12:20:07.292055000 +1300
+@@ -92,6 +92,7 @@
+ const char *path);
+ void panel_place_menu_item_recreate_menu (GtkWidget *widget);
+ void panel_desktop_menu_item_recreate_menu (PanelDesktopMenuItem *desktop_item);
++void panel_menu_items_append_from_desktop (GtkWidget *menu, char *path, char *force_name);
+
+ G_END_DECLS
+
+--- gnome-panel-2.23.6.old/gnome-panel/menu.c 2008-08-06 14:25:24.868159000 +0100
++++ gnome-panel-2.23.6/gnome-panel/menu.c 2008-08-06 14:31:08.223682000 +0100
+@@ -1844,39 +1844,125 @@
setup_menuitem (item, icon_size, NULL, title);
}
@@ -94,7 +116,7 @@
- gboolean add_separator;
- GList *children;
- GList *last;
-+ GtkRecentManager *recent_view;
++ GtkRecentManager *recent_view;
panel = PANEL_WIDGET (data);
@@ -105,13 +127,13 @@
- add_separator = !GTK_IS_SEPARATOR (GTK_WIDGET (last->data));
- }
- g_list_free (children);
-+ item = add_xdg_menu (_("All Applications"), "applications.menu", "gnome-applications");
-+ gtk_menu_shell_append (GTK_MENU_SHELL (main_menu), item);
-+ gtk_widget_show (item);
++ item = add_xdg_menu (_("All Applications"), "applications.menu", "gnome-applications");
++ gtk_menu_shell_append (GTK_MENU_SHELL (main_menu), item);
++ gtk_widget_show (item);
- if (add_separator)
- add_menu_separator (main_menu);
-+ add_menu_separator (main_menu);
++ add_menu_separator (main_menu);
item = panel_place_menu_item_new (TRUE);
panel_place_menu_item_set_panel (item, panel);
@@ -120,28 +142,28 @@
- item = panel_desktop_menu_item_new (TRUE, FALSE);
- panel_desktop_menu_item_set_panel (item, panel);
-+ recent_view = gtk_recent_manager_get_default ();
-+ panel_recent_append_documents_menu (main_menu, recent_view);
-+ panel_menu_items_append_from_desktop (main_menu, "gnome-search-tool.desktop", NULL);
++ recent_view = gtk_recent_manager_get_default ();
++ panel_recent_append_documents_menu (main_menu, recent_view);
++ panel_menu_items_append_from_desktop (main_menu, "gnome-search-tool.desktop", NULL);
+
-+ add_menu_separator (main_menu);
++ add_menu_separator (main_menu);
+
-+ /* SUN_BRANDING */
-+ item = add_xdg_menu (_("Preferences"), "preferences.menu", "gnome-settings");
++ /* SUN_BRANDING */
++ item = add_xdg_menu (_("Preferences"), "preferences.menu", "gnome-settings");
gtk_menu_shell_append (GTK_MENU_SHELL (main_menu), item);
gtk_widget_show (item);
-+ /* SUN_BRANDING */
-+ item = add_xdg_menu (_("Administration"), "settings.menu", "gnome-system");
-+ gtk_menu_shell_append (GTK_MENU_SHELL (main_menu), item);
-+ gtk_widget_show (item);
-+
-+ panel_menu_items_append_from_desktop (main_menu, "yelp.desktop", NULL);
++ /* SUN_BRANDING */
++ item = add_xdg_menu (_("Administration"), "settings.menu", "gnome-system");
++ gtk_menu_shell_append (GTK_MENU_SHELL (main_menu), item);
++ gtk_widget_show (item);
++
++ panel_menu_items_append_from_desktop (main_menu, "yelp.desktop", NULL);
+
panel_menu_items_append_lock_logout (main_menu);
}
-@@ -1843,7 +1929,7 @@
+@@ -1885,7 +1971,7 @@
{
GtkWidget *main_menu;
@@ -150,22 +172,9 @@
g_object_set_data (G_OBJECT (main_menu), "menu_panel", panel);
/* FIXME need to update the panel on parent_set */
-diff -urN gnome-panel-2.17.92/gnome-panel/menu.h gnome-panel-2.17.92-hacked/gnome-panel/menu.h
---- gnome-panel-2.17.92/gnome-panel/menu.h 2007-03-07 13:19:42.386037000 +1300
-+++ gnome-panel-2.17.92-hacked/gnome-panel/menu.h 2007-03-15 12:20:07.021275000 +1300
-@@ -66,6 +66,8 @@
-
- gboolean menu_dummy_button_press_event (GtkWidget *menuitem,
- GdkEventButton *event);
-+void run_applications (GtkWidget *widget, gpointer user_data);
-+void applications_menu_append (GtkWidget *main_menu);
-
-
- G_END_DECLS
-diff -urN gnome-panel-2.19.3/gnome-panel/panel-menu-bar.c gnome-panel-2.19.3-hacked/gnome-panel/panel-menu-bar.c
---- gnome-panel-2.19.3/gnome-panel/panel-menu-bar.c 2007-03-07 13:19:42.331555000 +1300
-+++ gnome-panel-2.19.3-hacked/gnome-panel/panel-menu-bar.c 2007-03-15 12:20:04.647817000 +1300
-@@ -209,6 +209,8 @@
+--- gnome-panel-2.23.6.old/gnome-panel/panel-menu-bar.c 2008-08-06 14:25:24.859802000 +0100
++++ gnome-panel-2.23.6/gnome-panel/panel-menu-bar.c 2008-08-06 14:32:12.220184000 +0100
+@@ -165,6 +165,8 @@
menubar->priv->info = NULL;
menubar->priv->applications_menu = create_applications_menu ("applications.menu", NULL);
@@ -174,30 +183,28 @@
menubar->priv->applications_item = gtk_image_menu_item_new_with_label (_("Applications"));
image = gtk_image_new_from_icon_name (PANEL_ICON_MAIN_MENU,
-diff -urN gnome-panel-2.17.92/gnome-panel/panel-menu-button.c gnome-panel-2.17.92-hacked/gnome-panel/panel-menu-button.c
---- gnome-panel-2.17.92/gnome-panel/panel-menu-button.c 2007-03-07 13:19:42.333065000 +1300
-+++ gnome-panel-2.17.92-hacked/gnome-panel/panel-menu-button.c 2007-03-15 12:20:04.707354000 +1300
-@@ -58,6 +58,7 @@
+--- gnome-panel-2.23.6.old/gnome-panel/panel-menu-button.c 2008-08-06 14:25:24.862786000 +0100
++++ gnome-panel-2.23.6/gnome-panel/panel-menu-button.c 2008-08-06 14:32:50.656932000 +0100
+@@ -61,6 +61,7 @@
FIRST_MENU,
APPLICATIONS_MENU,
#define DEFAULT_MENU APPLICATIONS_MENU
-+ PREFERENCES_MENU,
++ PREFERENCES_MENU,
SETTINGS_MENU,
LAST_MENU
} MenuPathRoot;
-@@ -70,6 +71,7 @@
+@@ -73,6 +74,7 @@
static MenuPathRootItem root_items [] = {
{ APPLICATIONS_MENU, "applications", "applications.menu" },
-+ { PREFERENCES_MENU, "preferences", "preferences.menu" },
++ { PREFERENCES_MENU, "preferences", "preferences.menu" },
{ SETTINGS_MENU, "settings", "settings.menu" }
};
-diff -urN gnome-panel-2.19.5/gnome-panel/panel-menu-items.c gnome-panel-2.19.5-hacked/gnome-panel/panel-menu-items.c
---- gnome-panel-2.19.5/gnome-panel/panel-menu-items.c 2007-03-07 13:19:42.334056000 +1300
-+++ gnome-panel-2.19.5-hacked/gnome-panel/panel-menu-items.c 2007-03-15 16:02:44.193686000 +1300
-@@ -136,7 +136,7 @@
- g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP));
+--- gnome-panel-2.23.6.old/gnome-panel/panel-menu-items.c 2008-08-06 14:25:24.865221000 +0100
++++ gnome-panel-2.23.6/gnome-panel/panel-menu-items.c 2008-08-06 14:39:57.574285000 +0100
+@@ -137,7 +137,7 @@
+ g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP));
}
-static void
@@ -205,11 +212,11 @@
panel_menu_items_append_from_desktop (GtkWidget *menu,
char *path,
char *force_name)
-@@ -582,23 +582,10 @@
+@@ -951,23 +951,10 @@
char *name;
char *uri;
GFile *file;
-+ GtkRecentManager *recent_view;
++ GtkRecentManager *recent_view;
places_menu = panel_create_menu ();
@@ -230,7 +237,7 @@
if (!gconf_client_get_bool (panel_gconf_get_client (),
DESKTOP_IS_HOME_DIR_KEY,
NULL)) {
-@@ -646,12 +638,9 @@
+@@ -1023,12 +1010,9 @@
add_menu_separator (places_menu);
@@ -240,13 +247,13 @@
-
- panel_recent_append_documents_menu (places_menu,
- place_item->priv->recent_manager);
-+ recent_view = gtk_recent_manager_get_default ();
-+ panel_recent_append_documents_menu (places_menu, recent_view);
-+ panel_menu_items_append_from_desktop (places_menu, "gnome-search-tool.desktop", NULL);
++ recent_view = gtk_recent_manager_get_default ();
++ panel_recent_append_documents_menu (places_menu, recent_view);
++ panel_menu_items_append_from_desktop (places_menu, "gnome-search-tool.desktop", NULL);
return places_menu;
}
-@@ -701,49 +690,55 @@
+@@ -1094,49 +1078,55 @@
panel_place_menu_item_recreate_menu (place_menu);
}
@@ -260,64 +267,66 @@
- gboolean add_separator;
- GList *children;
- GList *last;
-+ GtkWidget *item;
-+ GtkWidget *accel_label;
-+ GtkWidget *image;
-+ GtkWidget *menu;
-
+-
- parent = PANEL_DESKTOP_MENU_ITEM (data);
-+ item = gtk_image_menu_item_new ();
++ GtkWidget *item;
++ GtkWidget *accel_label;
++ GtkWidget *image;
++ GtkWidget *menu;
- add_separator = FALSE;
- children = gtk_container_get_children (GTK_CONTAINER (menu));
- last = g_list_last (children);
-+ accel_label = gtk_accel_label_new (name);
-+ gtk_misc_set_alignment (GTK_MISC (accel_label), 0.0, 0.5);
-
+-
- if (last != NULL)
- add_separator = !GTK_IS_SEPARATOR (GTK_WIDGET (last->data));
-+ gtk_container_add (GTK_CONTAINER (item), accel_label);
-+ gtk_accel_label_set_accel_widget (GTK_ACCEL_LABEL (accel_label),
-+ GTK_WIDGET (item));
-+ gtk_widget_show (accel_label);
++ item = gtk_image_menu_item_new ();
- g_list_free (children);
-+ image = gtk_image_new_from_icon_name (icon, panel_menu_icon_get_size ());
++ accel_label = gtk_accel_label_new (name);
++ gtk_misc_set_alignment (GTK_MISC (accel_label), 0.0, 0.5);
- if (add_separator)
- add_menu_separator (menu);
-+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-+ menu = create_applications_menu (path, NULL);
++ gtk_container_add (GTK_CONTAINER (item), accel_label);
++ gtk_accel_label_set_accel_widget (GTK_ACCEL_LABEL (accel_label),
++ GTK_WIDGET (item));
++ gtk_widget_show (accel_label);
- panel_menu_items_append_from_desktop (menu, "yelp.desktop", NULL);
- panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL);
-+ gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), menu);
++ image = gtk_image_new_from_icon_name (icon, panel_menu_icon_get_size ());
- if (parent->priv->append_lock_logout)
- panel_menu_items_append_lock_logout (menu);
-+ return item;
++ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
++ menu = create_applications_menu (path, NULL);
++
++ gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), menu);
++
++ return item;
}
static GtkWidget *
panel_desktop_menu_item_create_menu (PanelDesktopMenuItem *desktop_item)
{
GtkWidget *desktop_menu;
-+ GtkWidget *item;
++ GtkWidget *item;
+
-+ desktop_menu = panel_create_menu ();
++ desktop_menu = panel_create_menu ();
+
-+ /* SUN_BRANDING */
-+ item = add_xdg_menu (_("Preferences"), "preferences.menu", "gnome-settings");
-+ gtk_menu_shell_append (GTK_MENU_SHELL (desktop_menu), item);
-+ gtk_widget_show (item);
++ /* SUN_BRANDING */
++ item = add_xdg_menu (_("Preferences"), "preferences.menu", "gnome-settings");
++ gtk_menu_shell_append (GTK_MENU_SHELL (desktop_menu), item);
++ gtk_widget_show (item);
+
-+ /* SUN_BRANDING */
-+ item = add_xdg_menu (_("Administration"), "settings.menu", "gnome-system");
-+ gtk_menu_shell_append (GTK_MENU_SHELL (desktop_menu), item);
-+ gtk_widget_show (item);
++ /* SUN_BRANDING */
++ item = add_xdg_menu (_("Administration"), "settings.menu", "gnome-system");
++ gtk_menu_shell_append (GTK_MENU_SHELL (desktop_menu), item);
++ gtk_widget_show (item);
- desktop_menu = create_applications_menu ("settings.menu", NULL);
-+ panel_menu_items_append_from_desktop (desktop_menu, "yelp.desktop", NULL);
++ panel_menu_items_append_from_desktop (desktop_menu, "yelp.desktop", NULL);
- g_object_set_data (G_OBJECT (desktop_menu),
- "panel-menu-append-callback",
@@ -325,39 +334,28 @@
- g_object_set_data (G_OBJECT (desktop_menu),
- "panel-menu-append-callback-data",
- desktop_item);
-+ panel_menu_items_append_lock_logout (desktop_menu);
++ panel_menu_items_append_lock_logout (desktop_menu);
return desktop_menu;
}
-diff -urN gnome-panel-2.17.92/gnome-panel/panel-menu-items.h gnome-panel-2.17.92-hacked/gnome-panel/panel-menu-items.h
---- gnome-panel-2.17.92/gnome-panel/panel-menu-items.h 2007-03-07 13:19:42.389906000 +1300
-+++ gnome-panel-2.17.92-hacked/gnome-panel/panel-menu-items.h 2007-03-15 12:20:07.292055000 +1300
-@@ -92,6 +92,7 @@
- const char *path);
- void panel_place_menu_item_recreate_menu (GtkWidget *widget);
- void panel_desktop_menu_item_recreate_menu (PanelDesktopMenuItem *desktop_item);
-+void panel_menu_items_append_from_desktop (GtkWidget *menu, char *path, char *force_name);
-
- G_END_DECLS
-
-diff -urN gnome-panel-2.17.92/gnome-panel/panel-recent.c gnome-panel-2.17.92-hacked/gnome-panel/panel-recent.c
---- gnome-panel-2.17.92/gnome-panel/panel-recent.c 2007-03-07 13:19:42.335633000 +1300
-+++ gnome-panel-2.17.92-hacked/gnome-panel/panel-recent.c 2007-03-15 12:20:04.822459000 +1300
-@@ -233,12 +233,12 @@
+--- gnome-panel-2.23.6.old/gnome-panel/panel-recent.c 2008-08-06 14:25:24.675744000 +0100
++++ gnome-panel-2.23.6/gnome-panel/panel-recent.c 2008-08-06 14:41:04.241179000 +0100
+@@ -217,12 +217,15 @@
//FIXME this is not possible with GtkRecent...: egg_recent_view_gtk_set_icon_size (view, panel_menu_icon_get_size ());
- g_signal_connect_object (manager, "changed",
-- G_CALLBACK (panel_recent_manager_changed_cb),
-- menu_item, 0);
-+ if (manager) {
-+ g_signal_connect_object (manager, "changed", G_CALLBACK (panel_recent_manager_changed_cb), menu_item, 0);
-+ size = 0;
-+ g_object_get (manager, "size", &size, NULL);
-+ }
++ if (manager) {
++ g_signal_connect_object (manager, "changed",
+ G_CALLBACK (panel_recent_manager_changed_cb),
+ menu_item, 0);
- size = 0;
- g_object_get (manager, "size", &size, NULL);
++ size = 0;
++ g_object_get (manager, "size", &size, NULL);
++ }
++
gtk_widget_set_sensitive (menu_item, size > 0);
add_menu_separator (recent_menu);
--- a/patches/gnome-panel-11-trusted-extensions.diff Wed Aug 06 15:28:54 2008 +0000
+++ b/patches/gnome-panel-11-trusted-extensions.diff Wed Aug 06 16:14:59 2008 +0000
@@ -695,23 +695,9 @@
static void
display_properties_dialog (BonoboUIComponent *uic,
PagerData *pager,
-diff -urN -x '*.orig' panel.orig/config.h.in panel.new/config.h.in
---- panel.orig/config.h.in 2007-11-09 10:57:26.649311000 +0000
-+++ panel.new/config.h.in 2007-11-13 10:57:52.570471000 +0000
-@@ -98,6 +98,9 @@
- /* Define to 1 if you have the <unistd.h> header file. */
- #undef HAVE_UNISTD_H
-
-+/* Defined when GNOME Trusted Solaris Extension lib libgnometsol detected. */
-+#undef HAVE_LIBGNOMETSOL
-+
- /* Define to 1 if you have the `_NSGetEnviron' function. */
- #undef HAVE__NSGETENVIRON
-
-diff -urN -x '*.orig' panel.orig/configure.in panel.new/configure.in
---- panel.orig/configure.in 2007-11-09 10:57:26.647886000 +0000
-+++ panel.new/configure.in 2007-11-13 10:57:52.571198000 +0000
-@@ -76,6 +76,8 @@
+--- gnome-panel-2.23.6.old/configure.in 2008-08-06 14:48:21.276564000 +0100
++++ gnome-panel-2.23.6/configure.in 2008-08-06 14:51:28.865741000 +0100
+@@ -78,6 +78,8 @@
AC_SUBST(LIBPANEL_APPLET_CFLAGS)
AC_SUBST(LIBPANEL_APPLET_LIBS)
@@ -720,9 +706,8 @@
PKG_CHECK_MODULES(WNCKLET, gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED)
AC_SUBST(WNCKLET_CFLAGS)
AC_SUBST(WNCKLET_LIBS)
-diff -urN -x '*.orig' panel.orig/gnome-panel/panel-addto.c panel.new/gnome-panel/panel-addto.c
---- panel.orig/gnome-panel/panel-addto.c 2007-11-09 10:57:21.760687000 +0000
-+++ panel.new/gnome-panel/panel-addto.c 2007-11-13 11:04:06.956352000 +0000
+--- gnome-panel-2.23.6.old/gnome-panel/panel-addto.c 2008-08-06 14:48:19.620758000 +0100
++++ gnome-panel-2.23.6/gnome-panel/panel-addto.c 2008-08-06 14:52:52.104755000 +0100
@@ -26,6 +26,7 @@
#include <string.h>
@@ -731,11 +716,10 @@
#include <gmenu-tree.h>
-@@ -439,6 +440,19 @@
- panel_lockdown_is_applet_disabled (info->iid)) {
+@@ -445,6 +446,19 @@
continue;
}
-+
+
+ /* TJDS - if MLS and has not admin_high clearance do not
+ * display the following applets in the mnenu list.
+ */
@@ -748,13 +732,13 @@
+ strcmp (info->iid, "OAFIID:GNOME_Panel_TrashApplet")==0 ||
+ strcmp (info->iid, "OAFIID:GNOME_PilotApplet")==0))
+ continue;
-
++
applet = g_new0 (PanelAddtoItemInfo, 1);
applet->type = PANEL_ADDTO_APPLET;
-diff -urN -x '*.orig' panel.orig/gnome-panel/panel-applet-frame.c panel.new/gnome-panel/panel-applet-frame.c
---- panel.orig/gnome-panel/panel-applet-frame.c 2007-11-09 10:57:21.757236000 +0000
-+++ panel.new/gnome-panel/panel-applet-frame.c 2007-11-13 11:04:41.243997000 +0000
-@@ -400,8 +400,22 @@
+ applet->name = g_strdup (name);
+--- gnome-panel-2.23.6.old/gnome-panel/panel-applet-frame.c 2008-08-06 14:48:19.954052000 +0100
++++ gnome-panel-2.23.6/gnome-panel/panel-applet-frame.c 2008-08-06 14:54:07.193753000 +0100
+@@ -382,8 +382,22 @@
if (!applet_iid || !applet_iid[0])
return;
@@ -779,9 +763,8 @@
g_free (applet_iid);
}
-diff -urN -x '*.orig' panel.orig/gnome-panel/panel-run-dialog.c panel.new/gnome-panel/panel-run-dialog.c
---- panel.orig/gnome-panel/panel-run-dialog.c 2007-11-09 10:57:21.756285000 +0000
-+++ panel.new/gnome-panel/panel-run-dialog.c 2007-11-13 10:57:52.594030000 +0000
+--- gnome-panel-2.23.6.old/gnome-panel/panel-run-dialog.c 2008-08-06 14:48:19.621394000 +0100
++++ gnome-panel-2.23.6/gnome-panel/panel-run-dialog.c 2008-08-06 14:55:47.085007000 +0100
@@ -41,6 +41,7 @@
#include <gio/gio.h>
#include <gdk/gdkkeysyms.h>
@@ -790,36 +773,35 @@
#include <libgnome/gnome-exec.h>
#include <libgnome/gnome-util.h>
#include <libgnomeui/gnome-entry.h>
-@@ -291,7 +292,17 @@
+@@ -295,6 +296,17 @@
GError *error = NULL;
char **argv;
int argc;
--
-+ char *tsolcmd;
++ char *tsolcmd;
+
-+ screen = gtk_window_get_screen (GTK_WINDOW (dialog->run_dialog));
++ screen = gtk_window_get_screen (GTK_WINDOW (dialog->run_dialog));
+
-+ if (gnome_desktop_tsol_is_multi_label_session ()) {
-+ tsolcmd = g_strdup_printf ("%d:%s", gdk_screen_get_number (screen), command);
-+ gnome_desktop_tsol_proxy_app_launch (tsolcmd);
-+ g_free (tsolcmd);
-+ return TRUE;
-+ }
-+
++ if (gnome_desktop_tsol_is_multi_label_session ()) {
++ tsolcmd = g_strdup_printf ("%d:%s",
++ gdk_screen_get_number (screen), command);
++ gnome_desktop_tsol_proxy_app_launch (tsolcmd);
++ g_free (tsolcmd);
++ return TRUE;
++ }
+
if (!command_is_executable (command))
return FALSE;
-
---- gnome-panel-2.23.5.old/gnome-panel/panel-action-button.c Thu Jul 24 13:58:24 2008
-+++ gnome-panel-2.23.5/gnome-panel/panel-action-button.c Thu Jul 24 14:02:49 2008
+--- gnome-panel-2.23.6.old/gnome-panel/panel-action-button.c 2008-08-06 14:48:19.613994000 +0100
++++ gnome-panel-2.23.6/gnome-panel/panel-action-button.c 2008-08-06 14:57:38.292372000 +0100
@@ -31,6 +31,7 @@
#include "panel-action-button.h"
#include <glib/gi18n.h>
+#include <libgnome/gnome-desktop-tsol-extensions.h>
+ #include <libpanel-util/panel-error.h>
#include <libpanel-util/panel-session-manager.h>
-
-@@ -221,6 +222,14 @@
+@@ -222,6 +223,14 @@
GError *error = NULL;
screen = gtk_widget_get_screen (widget);
@@ -834,7 +816,7 @@
panel_launch_desktop_file ("gnome-search-tool.desktop",
"gnome-search-tool",
screen,
-@@ -257,6 +266,13 @@
+@@ -258,6 +267,13 @@
screen = gtk_widget_get_screen (GTK_WIDGET (widget));
error = NULL;
@@ -848,17 +830,17 @@
gdk_spawn_command_line_on_screen (screen, "nautilus-connect-server",
&error);
---- gnome-panel-2.23.5.old/gnome-panel/panel-menu-items.c Thu Jul 24 14:05:30 2008
-+++ gnome-panel-2.23.5/gnome-panel/panel-menu-items.c Thu Jul 24 14:07:55 2008
-@@ -40,6 +40,7 @@
+--- gnome-panel-2.23.6.old/gnome-panel/panel-menu-items.c 2008-08-06 14:48:19.855088000 +0100
++++ gnome-panel-2.23.6/gnome-panel/panel-menu-items.c 2008-08-06 14:59:59.998631000 +0100
+@@ -38,6 +38,7 @@
+ #include <string.h>
+ #include <glib/gi18n.h>
#include <gio/gio.h>
++#include <libgnome/gnome-desktop-tsol-extensions.h>
- #include <libgnome/gnome-url.h>
-+#include <libgnome/gnome-desktop-tsol-extensions.h>
- #include <libgnomeui/gnome-url.h>
-
+ #include <libpanel-util/panel-error.h>
#include <libpanel-util/panel-glib.h>
-@@ -156,6 +157,19 @@
+@@ -126,6 +127,19 @@
activate_home_uri (GtkWidget *menuitem,
gpointer data)
{
@@ -875,10 +857,10 @@
+ return;
+ }
+
- activate_uri (menuitem, g_get_home_dir ());
+ activate_path (menuitem, g_get_home_dir ());
}
-@@ -163,6 +177,19 @@
+@@ -133,6 +147,19 @@
activate_desktop_uri (GtkWidget *menuitem,
gpointer data)
{
@@ -895,6 +877,18 @@
+ return;
+ }
+
- activate_uri (menuitem,
- g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP));
+ activate_path (menuitem,
+ g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP));
}
+--- gnome-panel-2.23.6.old/config.h.in 2008-08-06 15:08:54.104032000 +0100
++++ gnome-panel-2.23.6/config.h.in 2008-08-06 15:09:51.392641000 +0100
+@@ -104,6 +104,9 @@
+ /* Define to 1 if you have the <unistd.h> header file. */
+ #undef HAVE_UNISTD_H
+
++/* Define when GNOME Trusted Solaris Extension lib libgnometsol detected. */
++#undef HAVE_LIBGNOMETSOL
++
+ /* Define to 1 if you have the `_NSGetEnviron' function. */
+ #undef HAVE__NSGETENVIRON
+
--- a/patches/gnome-panel-15-double-func.diff Wed Aug 06 15:28:54 2008 +0000
+++ b/patches/gnome-panel-15-double-func.diff Wed Aug 06 16:14:59 2008 +0000
@@ -1,10 +1,10 @@
---- gnome-panel-2.23.3/gnome-panel/gnome-desktop-item-edit.c.orig 2008-07-16 14:58:47.828310148 +0100
-+++ gnome-panel-2.23.3/gnome-panel/gnome-desktop-item-edit.c 2008-07-16 14:59:00.538069210 +0100
-@@ -15,7 +15,6 @@
+--- gnome-panel-2.23.6.old/gnome-panel/gnome-desktop-item-edit.c 2008-08-06 15:20:25.240876000 +0100
++++ gnome-panel-2.23.6/gnome-panel/gnome-desktop-item-edit.c 2008-08-06 15:21:16.699897000 +0100
+@@ -18,7 +18,6 @@
#include "applet.h"
GSList *panel_applet_list_applets (void) { return NULL; }
#include "panel-gconf.h"
-GConfClient *panel_gconf_get_client (void) { return NULL; }
#include "panel-config-global.h"
gboolean panel_global_config_get_tooltips_enabled (void) { return FALSE; }
-
+ #include "panel-lockdown.h"
--- a/patches/gnome-panel-16-disable-lock-screen.diff Wed Aug 06 15:28:54 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
---- gnome-panel-2.23.5.old/gnome-panel/panel-menu-items.c Thu Jul 24 14:17:14 2008
-+++ gnome-panel-2.23.5/gnome-panel/panel-menu-items.c Thu Jul 24 14:20:16 2008
-@@ -1554,25 +1554,23 @@
- if (!panel_lockdown_get_disable_log_out ()) {
- item = panel_menu_items_create_action_item_full (PANEL_ACTION_LOGOUT,
- label, tooltip);
-+ if (item != NULL) {
-+ if (!separator_inserted)
-+ add_menu_separator (menu);
-+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-+ }
-+
-+ item = panel_menu_items_create_action_item (PANEL_ACTION_SHUTDOWN);
-+ if (item != NULL) {
-+ if (!separator_inserted)
-+ add_menu_separator (menu);
-+
-+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-+ }
- }
-
- g_free (label);
- g_free (tooltip);
--
-- if (item != NULL) {
-- if (!separator_inserted)
-- add_menu_separator (menu);
--
-- gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-- }
--
-- item = panel_menu_items_create_action_item (PANEL_ACTION_SHUTDOWN);
-- if (item != NULL) {
-- if (!separator_inserted)
-- add_menu_separator (menu);
--
-- gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-- }
- }
-
- void
---- gnome-panel-2.23.5.old/gnome-panel/panel-util.c Thu Jul 24 14:17:14 2008
-+++ gnome-panel-2.23.5/gnome-panel/panel-util.c Thu Jul 24 14:21:10 2008
-@@ -732,6 +732,9 @@
-
- g_return_val_if_fail (action != NULL, FALSE);
-
-+ if (panel_lockdown_get_disable_lock_screen ())
-+ return FALSE;
-+
- command = panel_lock_screen_action_get_command (action);
- if (command)
- enabled = TRUE;