From 8518bfc3a90af363d14baa8d57220030ffb378dc Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Jul 09 2007 04:30:46 +0000 Subject: 2.19.5 --- diff --git a/.cvsignore b/.cvsignore index 4f454ac..91053b5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gnome-panel-2.19.4.tar.bz2 +gnome-panel-2.19.5.tar.bz2 diff --git a/gnome-panel-2.13.91-ignore-unknown-options.patch b/gnome-panel-2.13.91-ignore-unknown-options.patch deleted file mode 100644 index e953555..0000000 --- a/gnome-panel-2.13.91-ignore-unknown-options.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gnome-panel-2.13.91/gnome-panel/main.c.ignore-unknown-options 2006-02-27 11:41:51.000000000 -0500 -+++ gnome-panel-2.13.91/gnome-panel/main.c 2006-02-27 11:42:18.000000000 -0500 -@@ -49,6 +49,8 @@ - - context = g_option_context_new (""); - -+ g_option_context_set_ignore_unknown_options (context, TRUE); -+ - g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE); - - gnome_program_init ("gnome-panel", VERSION, diff --git a/gnome-panel-2.14.2-xio-error.patch b/gnome-panel-2.14.2-xio-error.patch deleted file mode 100644 index b69879b..0000000 --- a/gnome-panel-2.14.2-xio-error.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- gnome-panel-2.14.2/gnome-panel/panel-applet-frame.c.xio-error 2006-03-06 15:19:20.000000000 -0500 -+++ gnome-panel-2.14.2/gnome-panel/panel-applet-frame.c 2006-07-26 11:01:06.000000000 -0400 -@@ -31,6 +31,8 @@ - #include - #include - -+#include -+ - #include "panel-applet-frame.h" - #include "panel-profile.h" - #include "panel-util.h" -@@ -105,6 +107,10 @@ static void panel_applet_frame_activated - CORBA_Environment *ev, - gpointer *data); - -+static int (* panel_applet_frame_old_xio_error_handler) (Display *); -+static int panel_applet_frame_xio_error_handler (Display *display); -+static gboolean panel_applet_frame_display_is_dead = FALSE; -+ - void - panel_applet_frame_sync_menu_state (PanelAppletFrame *frame) - { -@@ -943,6 +949,9 @@ panel_applet_frame_cnx_broken (ORBitConn - - g_return_if_fail (PANEL_IS_APPLET_FRAME (frame)); - -+ if (panel_applet_frame_display_is_dead) -+ return; -+ - screen = gtk_widget_get_screen (GTK_WIDGET (frame)); - - if (frame->priv->iid) -@@ -1236,6 +1245,17 @@ panel_applet_frame_event_listener (Bonob - panel_applet_frame_set_size_hints_from_any (frame, any); - } - -+static int -+panel_applet_frame_xio_error_handler (Display *display) -+{ -+ panel_applet_frame_display_is_dead = TRUE; -+ -+ if (panel_applet_frame_old_xio_error_handler) -+ return panel_applet_frame_old_xio_error_handler (display); -+ -+ return 0; -+} -+ - static void - panel_applet_frame_activated (Bonobo_Unknown object, - CORBA_Environment *ev, -@@ -1373,6 +1393,9 @@ panel_applet_frame_activated (Bonobo_Unk - ORBit_small_listen_for_broken (object, - G_CALLBACK (panel_applet_frame_cnx_broken), - frame); -+ if (!panel_applet_frame_old_xio_error_handler) -+ panel_applet_frame_old_xio_error_handler = -+ XSetIOErrorHandler (panel_applet_frame_xio_error_handler); - - gtk_container_add (GTK_CONTAINER (frame), widget); - diff --git a/gnome-panel-2.17.91-vendor.patch b/gnome-panel-2.17.91-vendor.patch deleted file mode 100644 index 7a630e5..0000000 --- a/gnome-panel-2.17.91-vendor.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- gnome-panel-2.17.91.svn20070207/gnome-panel/panel-menu-items.c.vendor 2007-02-07 00:18:07.000000000 -0500 -+++ gnome-panel-2.17.91.svn20070207/gnome-panel/panel-menu-items.c 2007-02-07 01:07:52.000000000 -0500 -@@ -576,7 +576,7 @@ - HOME_NAME_KEY, - NULL); - panel_menu_items_append_from_desktop (places_menu, -- "nautilus-home.desktop", -+ "gnome-nautilus-home.desktop", - gconf_name); - if (gconf_name) - g_free (gconf_name); -@@ -611,7 +611,7 @@ - COMPUTER_NAME_KEY, - NULL); - panel_menu_items_append_from_desktop (places_menu, -- "nautilus-computer.desktop", -+ "gnome-nautilus-computer.desktop", - gconf_name); - if (gconf_name) - g_free (gconf_name); -@@ -624,7 +624,7 @@ - add_menu_separator (places_menu); - - panel_menu_items_append_from_desktop (places_menu, -- "network-scheme.desktop", -+ "gnome-network-scheme.desktop", - NULL); - panel_place_menu_item_append_volumes (places_menu, TRUE); - -@@ -715,7 +715,7 @@ - if (add_separator) - add_menu_separator (menu); - -- panel_menu_items_append_from_desktop (menu, "yelp.desktop", NULL); -+ panel_menu_items_append_from_desktop (menu, "gnome-yelp.desktop", NULL); - panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL); - - if (parent->priv->append_lock_logout) diff --git a/gnome-panel-2.17.92-move-suspend-to-menu.patch b/gnome-panel-2.17.92-move-suspend-to-menu.patch deleted file mode 100644 index 8171856..0000000 --- a/gnome-panel-2.17.92-move-suspend-to-menu.patch +++ /dev/null @@ -1,241 +0,0 @@ ---- gnome-panel-2.17.92/gnome-panel/panel-enums.h.move-suspend-to-menu 2007-02-26 15:40:23.000000000 -0500 -+++ gnome-panel-2.17.92/gnome-panel/panel-enums.h 2007-02-28 00:35:24.000000000 -0500 -@@ -96,6 +96,7 @@ - PANEL_ACTION_FORCE_QUIT, - PANEL_ACTION_CONNECT_SERVER, - PANEL_ACTION_SHUTDOWN, -+ PANEL_ACTION_SUSPEND, - /* compatibility with GNOME < 2.13.90 */ - PANEL_ACTION_SCREENSHOT, - PANEL_ACTION_LAST ---- gnome-panel-2.17.92/gnome-panel/panel-logout.c.move-suspend-to-menu 2007-02-28 00:35:24.000000000 -0500 -+++ gnome-panel-2.17.92/gnome-panel/panel-logout.c 2007-02-28 00:35:24.000000000 -0500 -@@ -334,10 +334,6 @@ - primary_text = _("Shut down this system now?"); - - logout_dialog->priv->default_response = PANEL_LOGOUT_RESPONSE_SHUTDOWN; -- if (panel_power_manager_can_suspend (logout_dialog->priv->power_manager)) -- gtk_dialog_add_button (GTK_DIALOG (logout_dialog), -- _("S_uspend"), -- PANEL_LOGOUT_RESPONSE_STR); - - if (panel_power_manager_can_hibernate (logout_dialog->priv->power_manager)) - gtk_dialog_add_button (GTK_DIALOG (logout_dialog), ---- gnome-panel-2.17.92/gnome-panel/panel-action-button.c.move-suspend-to-menu 2007-02-28 00:35:24.000000000 -0500 -+++ gnome-panel-2.17.92/gnome-panel/panel-action-button.c 2007-02-28 00:37:38.000000000 -0500 -@@ -46,6 +46,7 @@ - #include "panel-lockdown.h" - #include "panel-logout.h" - #include "panel-compatibility.h" -+#include "panel-power-manager.h" - #include "panel-gdm.h" - - G_DEFINE_TYPE (PanelActionButton, panel_action_button, BUTTON_TYPE_WIDGET); -@@ -78,6 +79,7 @@ - { PANEL_ACTION_FORCE_QUIT, "force-quit" }, - { PANEL_ACTION_CONNECT_SERVER, "connect-server" }, - { PANEL_ACTION_SHUTDOWN, "shutdown" }, -+ { PANEL_ACTION_SUSPEND, "suspend" }, - /* compatibility with GNOME < 2.13.90 */ - { PANEL_ACTION_SCREENSHOT, "screenshot" }, - { 0, NULL }, -@@ -179,12 +181,47 @@ - } - - static gboolean -+panel_action_can_suspend (void) -+{ -+ PanelPowerManager *manager; -+ gboolean can_suspend; -+ -+ manager = panel_get_power_manager (); -+ -+ can_suspend = panel_power_manager_can_suspend (manager); -+ -+ g_object_unref (manager); -+ -+ return can_suspend; -+} -+ -+static gboolean - panel_action_shutdown_is_disabled (void) - { - return (panel_lockdown_get_disable_log_out() || - !gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN)); - } - -+ -+ -+static gboolean -+panel_action_suspend_is_disabled (void) -+{ -+ return !panel_action_can_suspend (); -+} -+ -+static void -+panel_action_suspend (GtkWidget *widget) -+{ -+ PanelPowerManager *manager; -+ -+ manager = panel_get_power_manager (); -+ -+ panel_power_manager_attempt_suspend (manager); -+ -+ g_object_unref (manager); -+} -+ - /* Run Application - */ - static void -@@ -363,6 +400,16 @@ - panel_action_shutdown, NULL, NULL, - panel_action_shutdown_is_disabled - }, -+ { -+ PANEL_ACTION_SUSPEND, -+ "screensaver", -+ N_("Suspend"), -+ N_("Suspend the computer"), -+ "gospanel-20", -+ "ACTION:suspend:NEW", -+ panel_action_suspend, NULL, NULL, -+ panel_action_suspend_is_disabled -+ }, - /* deprecated actions */ - { - PANEL_ACTION_SCREENSHOT, ---- gnome-panel-2.17.92/gnome-panel/panel-menu-items.c.move-suspend-to-menu 2007-02-28 00:35:24.000000000 -0500 -+++ gnome-panel-2.17.92/gnome-panel/panel-menu-items.c 2007-02-28 00:35:24.000000000 -0500 -@@ -49,6 +49,7 @@ - #include "panel-recent.h" - #include "panel-stock-icons.h" - #include "panel-util.h" -+#include "panel-power-manager.h" - - #define BOOKMARKS_FILENAME ".gtk-bookmarks" - #define DESKTOP_IS_HOME_DIR_DIR "/apps/nautilus/preferences" -@@ -954,10 +955,22 @@ - menuitem->priv->use_image = use_image; - - menuitem->priv->append_lock_logout = append_lock_logout; -- if (append_lock_logout) -+ if (append_lock_logout) { -+ PanelPowerManager *manager; -+ - panel_lockdown_notify_add (G_CALLBACK (panel_desktop_menu_item_recreate_menu), - menuitem); - -+ manager = panel_get_power_manager (); -+ -+ g_signal_connect_swapped (manager, "notify::is-connected", -+ G_CALLBACK -+ (panel_desktop_menu_item_recreate_menu), -+ menuitem); -+ -+ g_object_unref (manager); -+ } -+ - menuitem->priv->menu = panel_desktop_menu_item_create_menu (menuitem); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), - menuitem->priv->menu); -@@ -1062,6 +1075,14 @@ - gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); - } - -+ item = panel_menu_items_create_action_item (PANEL_ACTION_SUSPEND); -+ 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) ---- gnome-panel-2.17.92/gnome-panel/panel-power-manager.h.move-suspend-to-menu 2007-02-26 15:40:23.000000000 -0500 -+++ gnome-panel-2.17.92/gnome-panel/panel-power-manager.h 2007-02-28 00:35:24.000000000 -0500 -@@ -78,3 +78,83 @@ - G_END_DECLS - - #endif /* PANEL_POWER_MANAGER_H */ -+/* panel-power-manager.h - functions for powering down, restarting, and -+ * suspending the computer -+ * -+ * Copyright (C) 2006 Ray Strode -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2, or (at your option) -+ * any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -+ * 02111-1307, USA. -+ */ -+#ifndef PANEL_POWER_MANAGER_H -+#define PANEL_POWER_MANAGER_H -+ -+#include -+#include -+ -+G_BEGIN_DECLS -+ -+#define PANEL_TYPE_POWER_MANAGER (panel_power_manager_get_type ()) -+#define PANEL_POWER_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PANEL_TYPE_POWER_MANAGER, PanelPowerManager)) -+#define PANEL_POWER_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PANEL_TYPE_POWER_MANAGER, PanelPowerManagerClass)) -+#define PANEL_IS_POWER_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PANEL_TYPE_POWER_MANAGER)) -+#define PANEL_IS_POWER_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PANEL_TYPE_POWER_MANAGER)) -+#define PANEL_POWER_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), PANEL_TYPE_POWER_MANAGER, PanelPowerManagerClass)) -+#define PANEL_POWER_MANAGER_ERROR (panel_power_manager_error_quark ()) -+ -+typedef struct _PanelPowerManager PanelPowerManager; -+typedef struct _PanelPowerManagerClass PanelPowerManagerClass; -+typedef struct _PanelPowerManagerPrivate PanelPowerManagerPrivate; -+typedef enum _PanelPowerManagerError PanelPowerManagerError; -+ -+ -+struct _PanelPowerManager { -+ GObject parent; -+ -+ /*< private > */ -+ PanelPowerManagerPrivate *priv; -+}; -+ -+struct _PanelPowerManagerClass { -+ GObjectClass parent_class; -+ -+ /* signals */ -+ void (* request_failed) (PanelPowerManager *manager, -+ GError *error); -+}; -+ -+enum _PanelPowerManagerError { -+ PANEL_POWER_MANAGER_ERROR_SUSPENDING = 0, -+ PANEL_POWER_MANAGER_ERROR_HIBERNATING -+}; -+ -+GType panel_power_manager_get_type (void); -+GQuark panel_power_manager_error_quark (void); -+ -+PanelPowerManager *panel_power_manager_new (void) G_GNUC_MALLOC; -+ -+gboolean panel_power_manager_can_suspend (PanelPowerManager *manager); -+gboolean panel_power_manager_can_hibernate (PanelPowerManager *manager); -+gboolean panel_power_manager_can_power_down (PanelPowerManager *manager); -+gboolean panel_power_manager_can_restart (PanelPowerManager *manager); -+ -+void panel_power_manager_attempt_suspend (PanelPowerManager *manager); -+void panel_power_manager_attempt_hibernate (PanelPowerManager *manager); -+ -+PanelPowerManager *panel_get_power_manager (void); -+ -+G_END_DECLS -+ -+#endif /* PANEL_POWER_MANAGER_H */ diff --git a/gnome-panel-2.18.0-fix-invalid-read.patch b/gnome-panel-2.18.0-fix-invalid-read.patch deleted file mode 100644 index 7acfb56..0000000 --- a/gnome-panel-2.18.0-fix-invalid-read.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- gnome-panel-2.18.0/gnome-panel/panel-run-dialog.c.fix-invalid-read 2007-04-04 15:35:14.000000000 -0400 -+++ gnome-panel-2.18.0/gnome-panel/panel-run-dialog.c 2007-04-04 15:40:24.000000000 -0400 -@@ -111,6 +111,8 @@ - - static PanelRunDialog *static_dialog = NULL; - -+static void panel_run_dialog_disconnect_pixmap (PanelRunDialog *dialog); -+ - static void - panel_run_dialog_destroy (PanelRunDialog *dialog) - { -@@ -165,6 +167,8 @@ - if (dialog->completion) - g_completion_free (dialog->completion); - dialog->completion = NULL; -+ -+ panel_run_dialog_disconnect_pixmap (dialog); - - g_free (dialog); - } -@@ -1905,6 +1909,17 @@ - } - - static void -+panel_run_dialog_disconnect_pixmap (PanelRunDialog *dialog) -+{ -+ g_signal_handlers_disconnect_by_func (dialog->pixmap, -+ G_CALLBACK (panel_run_dialog_style_set), -+ dialog); -+ g_signal_handlers_disconnect_by_func (dialog->pixmap, -+ G_CALLBACK (panel_run_dialog_screen_changed), -+ dialog); -+} -+ -+static void - panel_run_dialog_static_dialog_destroyed (PanelRunDialog *dialog) - { - /* just reset the static dialog to NULL for next time */ diff --git a/gnome-panel-2.18.0-fix-name-too-long-error.patch b/gnome-panel-2.18.0-fix-name-too-long-error.patch deleted file mode 100644 index 15e34e4..0000000 --- a/gnome-panel-2.18.0-fix-name-too-long-error.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- gnome-panel-2.18.0/gnome-panel/panel-ditem-editor.c.fix-name-too-long-error 2007-03-12 14:48:43.000000000 -0400 -+++ gnome-panel-2.18.0/gnome-panel/panel-ditem-editor.c 2007-04-04 12:35:55.000000000 -0400 -@@ -1331,6 +1331,9 @@ - _("Could not save launcher"), - error->message); - g_error_free (error); -+ panel_util_key_file_set_string (dialog->priv->key_file, "Name", ""); -+ panel_util_key_file_set_string (dialog->priv->key_file, "Comment", ""); -+ panel_util_key_file_set_string (dialog->priv->key_file, "Icon", ""); - return FALSE; - } else { - g_signal_emit (G_OBJECT (dialog), diff --git a/gnome-panel-2.18.0-fix-tasks.patch b/gnome-panel-2.18.0-fix-tasks.patch deleted file mode 100644 index f7c9d39..0000000 --- a/gnome-panel-2.18.0-fix-tasks.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- gnome-panel-2.18.0/applets/clock/calendar-client.c (revision 10319) -+++ gnome-panel-2.18.0/applets/clock/calendar-client.c (working copy) -@@ -614,8 +614,13 @@ - get_ical_percent_complete (icalcomponent *ical) - { - icalproperty *prop; -+ icalproperty_status status; - int percent_complete; - -+ status = icalcomponent_get_status (ical); -+ if (status == ICAL_STATUS_COMPLETED) -+ return 100; -+ - prop = icalcomponent_get_first_property (ical, ICAL_COMPLETED_PROPERTY); - if (prop) - return 100; diff --git a/gnome-panel-2.18.0-hide-menu-if-root.patch b/gnome-panel-2.18.0-hide-menu-if-root.patch deleted file mode 100644 index 82a403a..0000000 --- a/gnome-panel-2.18.0-hide-menu-if-root.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- gnome-panel-2.18.0/gnome-panel/panel-util.c.hide-menu-if-root 2007-03-30 12:35:38.000000000 -0400 -+++ gnome-panel-2.18.0/gnome-panel/panel-util.c 2007-03-30 12:39:28.000000000 -0400 -@@ -780,6 +780,12 @@ - - g_return_val_if_fail (action != NULL, FALSE); - -+ /* Neither gnome-screensaver or xscreensaver allow root -+ * to lock the screen -+ */ -+ if ((strcmp (action, "lock") == 0) && (geteuid () == 0)) -+ return FALSE; -+ - command = panel_lock_screen_action_get_command (action); - if (command) - enabled = TRUE; diff --git a/gnome-panel-2.18.0-update-clock-immediately.patch b/gnome-panel-2.18.0-update-clock-immediately.patch deleted file mode 100644 index 89018e5..0000000 --- a/gnome-panel-2.18.0-update-clock-immediately.patch +++ /dev/null @@ -1,69 +0,0 @@ ---- gnome-panel-2.18.0/applets/clock/clock.c.update-clock-immediately 2007-04-03 20:10:39.000000000 +0400 -+++ gnome-panel-2.18.0/applets/clock/clock.c 2007-04-03 20:43:08.000000000 +0400 -@@ -2001,14 +2001,30 @@ - g_free (utf8); - } - -+static void -+on_config_tool_exited (GPid pid, -+ gint status, -+ gpointer data) -+{ -+ ClockData *clock; -+ -+ clock = (ClockData *) data; -+ -+ refresh_clock (clock); -+ -+ g_spawn_close_pid (pid); -+} -+ - static gboolean - try_config_tool (GdkScreen *screen, -- const char *tool) -+ const char *tool, -+ ClockData *clock) - { - GtkWidget *dialog; - GError *err; - char **argv; - char *path; -+ GPid pid; - - if (!tool || tool[0] == '\0') - return FALSE; -@@ -2028,15 +2044,18 @@ - NULL, - argv, - NULL, -- G_SPAWN_SEARCH_PATH, -- NULL, -+ G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, - NULL, - NULL, -+ &pid, - &err)) { -+ -+ g_child_watch_add (pid, on_config_tool_exited, clock); - g_strfreev (argv); - return TRUE; - } - -+ - g_strfreev (argv); - - dialog = gtk_message_dialog_new (NULL, -@@ -2070,11 +2089,11 @@ - - screen = gtk_widget_get_screen (cd->applet); - -- if (try_config_tool (screen, cd->config_tool)) -+ if (try_config_tool (screen, cd->config_tool, cd)) - return; - - for (i = 0; i < G_N_ELEMENTS (clock_config_tools); i++) -- if (try_config_tool (screen, clock_config_tools [i])) -+ if (try_config_tool (screen, clock_config_tools [i], cd)) - return; - - dialog = gtk_message_dialog_new (NULL, diff --git a/gnome-panel-2.19.5-vendor.patch b/gnome-panel-2.19.5-vendor.patch new file mode 100644 index 0000000..0afbf46 --- /dev/null +++ b/gnome-panel-2.19.5-vendor.patch @@ -0,0 +1,29 @@ +--- gnome-panel-2.17.91.svn20070207/gnome-panel/panel-menu-items.c.vendor 2007-02-07 00:18:07.000000000 -0500 ++++ gnome-panel-2.17.91.svn20070207/gnome-panel/panel-menu-items.c 2007-02-07 01:07:52.000000000 -0500 +@@ -611,7 +611,7 @@ + COMPUTER_NAME_KEY, + NULL); + panel_menu_items_append_from_desktop (places_menu, +- "nautilus-computer.desktop", ++ "gnome-nautilus-computer.desktop", + gconf_name); + if (gconf_name) + g_free (gconf_name); +@@ -624,7 +624,7 @@ + add_menu_separator (places_menu); + + panel_menu_items_append_from_desktop (places_menu, +- "network-scheme.desktop", ++ "gnome-network-scheme.desktop", + NULL); + panel_place_menu_item_append_volumes (places_menu, TRUE); + +@@ -715,7 +715,7 @@ + if (add_separator) + add_menu_separator (menu); + +- panel_menu_items_append_from_desktop (menu, "yelp.desktop", NULL); ++ panel_menu_items_append_from_desktop (menu, "gnome-yelp.desktop", NULL); + panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL); + + if (parent->priv->append_lock_logout) diff --git a/gnome-panel.spec b/gnome-panel.spec index bec619c..23c8382 100644 --- a/gnome-panel.spec +++ b/gnome-panel.spec @@ -8,7 +8,7 @@ %define libbonoboui_version 2.3.0 %define orbit_version 2.4.0 %define gnome_vfs2_version 2.14.2 -%define libwnck_version 2.19.3 +%define libwnck_version 2.19.5 %define gconf_version 2.14 %define gnome_menus_version 2.11.1 %define evolution_data_server_version 1.9.1 @@ -81,23 +81,15 @@ BuildRequires: ORBit2-devel >= %{orbit_version} BuildRequires: dbus-devel >= %{dbus_version} %endif -Patch0: gnome-panel-2.17.91-vendor.patch -Patch2: gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch -Patch5: gnome-panel-2.17.91-about-fedora.patch -Patch6: gnome-panel-2.13.5-switch-user.patch -Patch8: gnome-panel-2.16.1-search.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=399270 -Patch9: gnome-panel-2.13.91-ignore-unknown-options.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=399274 -Patch12: gnome-panel-2.14.2-xio-error.patch -Patch13: gnome-panel-2.19.2-move-suspend-to-menu.patch -Patch15: gnome-panel-2.16.0-compiz-support.patch - -# http://bugzilla.gnome.org/show_bug.cgi?id=424545 -Patch18: gnome-panel-2.18.0-hide-menu-if-root.patch - -# http://bugzilla.gnome.org/show_bug.cgi?id=426281 -Patch20: gnome-panel-2.18.0-fix-name-too-long-error.patch +Patch0: gnome-panel-2.19.5-vendor.patch +Patch1: gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch +Patch2: gnome-panel-2.17.91-about-fedora.patch +Patch3: gnome-panel-2.13.5-switch-user.patch +Patch4: gnome-panel-2.16.1-search.patch +Patch5: gnome-panel-2.19.2-move-suspend-to-menu.patch +# Drop this patch for now, it should have AT LEAST been moved +# to an upstream bugzilla by now +#Patch6: gnome-panel-2.16.0-compiz-support.patch Conflicts: gnome-power-manager < 2.15.3 @@ -124,16 +116,12 @@ Panel Applets using the libpanel-applet library. %setup -q -n %{name}-%{version} %patch0 -p1 -b .vendor -%patch2 -p1 -b .speak-to-us-ye-old-wise-fish -%patch5 -p1 -b .about-fedora -%patch6 -p1 -b .switch-user -%patch8 -p1 -b .search -%patch9 -p1 -b .ignore-unknown-options -%patch12 -p1 -b .xio-error -%patch13 -p1 -b .move-suspend-to-menu -%patch15 -p0 -b .compiz-support -%patch18 -p1 -b .hide-lock-menu-if-root -%patch20 -p1 -b .fix-name-too-long-error +%patch1 -p1 -b .speak-to-us-ye-old-wise-fish +%patch2 -p1 -b .about-fedora +%patch3 -p1 -b .switch-user +%patch4 -p1 -b .search +%patch5 -p1 -b .move-suspend-to-menu +#%patch6 -p0 -b .compiz-support . %{SOURCE4} diff --git a/sources b/sources index 2016157..f0154fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2d401c18ffa0ee3308a0a687da5713ec gnome-panel-2.19.4.tar.bz2 +74d2153a7af3f059fac5642a254eb03d gnome-panel-2.19.5.tar.bz2