From 3711e0891e42b46969a060ffeea3dee7acd2dd84 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 4 Feb 2015 13:35:21 -0600 Subject: gnome-panel 3.8.1 --- applet-error.patch | 36 -- bookmarks-submenu.patch | 12 - clock-home.patch | 21 - clock-network.patch | 22 - desktop-file-monitoring.patch | 280 ----------- drop-gweather-xml-include.patch | 10 - fix-clock-crash.patch | 52 -- ...panel-2.10.1-speak-to-us-ye-old-wise-fish.patch | 11 - ...-2.21.92-allow-spurious-view-done-signals.patch | 17 - gnome-panel-about.patch | 13 - gnome-panel-libs.patch | 555 --------------------- gnome-panel-search.patch | 104 ---- gnome-panel-use-gnome-menus.patch | 69 --- gnome-panel-vendor.patch | 30 -- gnome-panel.spec | 30 +- icon-padding.patch | 255 ---------- launcher-desktop-files.patch | 80 --- na-style-realize.patch | 47 -- panel-padding.patch | 343 ------------- preferred-apps.patch | 272 ---------- 20 files changed, 13 insertions(+), 2246 deletions(-) delete mode 100644 applet-error.patch delete mode 100644 bookmarks-submenu.patch delete mode 100644 clock-home.patch delete mode 100644 clock-network.patch delete mode 100644 desktop-file-monitoring.patch delete mode 100644 drop-gweather-xml-include.patch delete mode 100644 fix-clock-crash.patch delete mode 100644 gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch delete mode 100644 gnome-panel-2.21.92-allow-spurious-view-done-signals.patch delete mode 100644 gnome-panel-about.patch delete mode 100644 gnome-panel-libs.patch delete mode 100644 gnome-panel-search.patch delete mode 100644 gnome-panel-use-gnome-menus.patch delete mode 100644 gnome-panel-vendor.patch delete mode 100644 icon-padding.patch delete mode 100644 launcher-desktop-files.patch delete mode 100644 na-style-realize.patch delete mode 100644 panel-padding.patch delete mode 100644 preferred-apps.patch diff --git a/applet-error.patch b/applet-error.patch deleted file mode 100644 index 9a3228a..0000000 --- a/applet-error.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -up gnome-panel-2.25.5/gnome-panel/panel-applet-frame.c.applet-error gnome-panel-2.25.5/gnome-panel/panel-applet-frame.c ---- gnome-panel-2.25.5/gnome-panel/panel-applet-frame.c.applet-error 2009-01-20 09:04:47.000000000 -0500 -+++ gnome-panel-2.25.5/gnome-panel/panel-applet-frame.c 2009-01-20 14:22:33.000000000 -0500 -@@ -1246,6 +1246,21 @@ panel_applet_frame_event_listener (Bonob - panel_applet_frame_set_size_hints_from_any (frame, any); - } - -+static gboolean -+in_default_panel_config (const gchar *id) -+{ -+ gchar *dir; -+ gboolean result; -+ -+ dir = g_strconcat (PANEL_DEFAULTS_DIR, "/applets/", id, NULL); -+ result = gconf_client_dir_exists (panel_gconf_get_client (), -+ dir, -+ NULL); -+ g_free (dir); -+ -+ return result; -+} -+ - static void - panel_applet_frame_activated (CORBA_Object object, - const char *error_reason, -@@ -1425,7 +1440,9 @@ panel_applet_frame_activated (CORBA_Obje - return; - - error_out: -- panel_applet_frame_loading_failed (frame, frame_act->id); -+ if (!in_default_panel_config (frame_act->id)) { -+ panel_applet_frame_loading_failed (frame, frame_act->id); -+ } - if (widget) - g_object_unref (widget); - panel_applet_stop_loading (frame_act->id); diff --git a/bookmarks-submenu.patch b/bookmarks-submenu.patch deleted file mode 100644 index 90e619f..0000000 --- a/bookmarks-submenu.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up gnome-panel-2.29.5.1/gnome-panel/panel-menu-items.c.bookmarks-submenu gnome-panel-2.29.5.1/gnome-panel/panel-menu-items.c ---- gnome-panel-2.29.5.1/gnome-panel/panel-menu-items.c.bookmarks-submenu 2010-01-17 18:19:36.000000000 -0500 -+++ gnome-panel-2.29.5.1/gnome-panel/panel-menu-items.c 2010-01-17 18:21:00.466529924 -0500 -@@ -61,7 +61,7 @@ - #define NAMES_DIR "/apps/nautilus/desktop" - #define HOME_NAME_KEY "/apps/nautilus/desktop/home_icon_name" - #define COMPUTER_NAME_KEY "/apps/nautilus/desktop/computer_icon_name" --#define MAX_ITEMS_OR_SUBMENU 5 -+#define MAX_ITEMS_OR_SUBMENU 8 - #define MAX_BOOKMARK_ITEMS 100 - - G_DEFINE_TYPE (PanelPlaceMenuItem, panel_place_menu_item, GTK_TYPE_IMAGE_MENU_ITEM) diff --git a/clock-home.patch b/clock-home.patch deleted file mode 100644 index a4a60e3..0000000 --- a/clock-home.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up gnome-panel-2.28.0/applets/clock/clock.schemas.in.clock-home gnome-panel-2.28.0/applets/clock/clock.schemas.in ---- gnome-panel-2.28.0/applets/clock/clock.schemas.in.clock-home 2009-07-01 09:06:23.000000000 -0400 -+++ gnome-panel-2.28.0/applets/clock/clock.schemas.in 2009-10-07 22:36:12.298466938 -0400 -@@ -211,7 +211,7 @@ - /schemas/apps/clock_applet/prefs/expand_locations - clock-applet - bool -- false -+ true - - Expand list of locations - -@@ -271,7 +271,7 @@ - clock-applet - list - string -- [] -+ [<location name="" city="Boston" timezone="America/New_York" latitude="42.360558" longitude="-71.010559" code="KBOS" current="true"/>] - - List of locations - diff --git a/clock-network.patch b/clock-network.patch deleted file mode 100644 index db88b82..0000000 --- a/clock-network.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up gnome-panel-2.26.1/applets/clock/clock-location.c.network gnome-panel-2.26.1/applets/clock/clock-location.c ---- gnome-panel-2.26.1/applets/clock/clock-location.c.network 2009-04-15 17:28:26.760634154 -0400 -+++ gnome-panel-2.26.1/applets/clock/clock-location.c 2009-04-15 17:43:41.869383882 -0400 -@@ -12,6 +12,9 @@ - #include - #include - #include -+#include -+#include -+#include - - #include - #include -@@ -695,6 +698,8 @@ state_notify (DBusPendingCall *pending, - DBUS_TYPE_UINT32, &result, - DBUS_TYPE_INVALID)) { - if (result == NM_STATE_CONNECTED) { -+ /* thank you, glibc */ -+ res_init (); - update_weather_infos (); - } - } diff --git a/desktop-file-monitoring.patch b/desktop-file-monitoring.patch deleted file mode 100644 index adfa5e2..0000000 --- a/desktop-file-monitoring.patch +++ /dev/null @@ -1,280 +0,0 @@ -diff -up gnome-panel-2.29.5.1/gnome-panel/launcher.c.desktop-file-monitoring gnome-panel-2.29.5.1/gnome-panel/launcher.c ---- gnome-panel-2.29.5.1/gnome-panel/launcher.c.desktop-file-monitoring 2010-01-13 22:26:27.000000000 -0500 -+++ gnome-panel-2.29.5.1/gnome-panel/launcher.c 2010-01-17 18:06:14.640537280 -0500 -@@ -237,6 +237,8 @@ static void - destroy_launcher (GtkWidget *widget, - Launcher *launcher) - { -+ if (launcher->monitor) -+ g_object_unref (launcher->monitor); - launcher_properties_destroy (launcher); - launcher_widget_destroy_open_dialogs (launcher); - } -@@ -410,6 +412,37 @@ drag_data_get_cb (GtkWidget *widg - - } - -+static void setup_button (Launcher *launcher); -+ -+static void -+desktop_file_changed (GFileMonitor *monitor, -+ GFile *file, -+ GFile *other_file, -+ GFileMonitorEvent event_type, -+ gpointer user_data) -+{ -+ Launcher *launcher = user_data; -+ GKeyFile *key_file; -+ -+ if (event_type == G_FILE_MONITOR_EVENT_CHANGED || -+ event_type == G_FILE_MONITOR_EVENT_CREATED) { -+ gchar *path; -+ -+ path = g_file_get_path (file); -+ -+ key_file = g_key_file_new (); -+ if (g_key_file_load_from_file (key_file, path, -+ G_KEY_FILE_KEEP_COMMENTS|G_KEY_FILE_KEEP_TRANSLATIONS, -+ NULL)) { -+ g_key_file_free (launcher->key_file); -+ launcher->key_file = key_file; -+ setup_button (launcher); -+ } -+ -+ g_free (path); -+ } -+} -+ - static Launcher * - create_launcher (const char *location) - { -@@ -482,6 +515,21 @@ create_launcher (const char *location) - launcher->key_file = key_file; - launcher->prop_dialog = NULL; - launcher->destroy_handler = 0; -+ launcher->monitor = NULL; -+ -+ /* Watch for changes to the desktop file. Since we don't want -+ * to do this for every launcher, we only do it if the desktop -+ * file contains a X-Panel-Monitor entry. -+ */ -+ if (g_key_file_get_boolean (key_file, "Desktop Entry", "X-Panel-Monitor", NULL)) { -+ GFile *file; -+ -+ file = g_file_new_for_path (new_location); -+ launcher->monitor = g_file_monitor_file (file, 0, NULL, NULL); -+ g_signal_connect (launcher->monitor, "changed", -+ G_CALLBACK (desktop_file_changed), launcher); -+ g_object_unref (file); -+ } - - /* Icon will be setup later */ - launcher->button = button_widget_new (NULL /* icon */, -@@ -612,6 +660,15 @@ static void - launcher_changed (PanelDItemEditor *dialog, - Launcher *launcher) - { -+ /* If the user manually changes launcher properties, -+ * we stop monitoring the desktop file to not overwrite -+ * user changes. -+ */ -+ if (launcher->monitor) { -+ g_object_unref (launcher->monitor); -+ launcher->monitor = NULL; -+ } -+ - /* Setup the button look */ - setup_button (launcher); - } -@@ -681,6 +738,42 @@ launcher_save_uri (PanelDItemEditor *dia - return NULL; - } - -+static const char * -+desktop_file_to_monitor (PanelDItemEditor *editor) -+{ -+ const char *entry; -+ GKeyFile *key_file; -+ -+ /* When the user selects a desktop file in the ditem editor, -+ * start monitoring the desktop file for changes. -+ */ -+ entry = panel_ditem_editor_get_orig_desktop_file (editor); -+ if (entry) { -+ key_file = g_key_file_new (); -+ if (!g_key_file_load_from_file (key_file, entry, 0, NULL) || -+ !panel_key_file_get_boolean (key_file, "X-Panel-Monitor", FALSE)) -+ entry = NULL; -+ g_key_file_free (key_file); -+ } -+ -+ return entry; -+} -+ -+static void -+start_monitoring (Launcher *launcher) -+{ -+ GFile *file; -+ -+ file = g_file_new_for_path (launcher->location); -+ if (launcher->monitor) -+ g_object_unref (launcher->monitor); -+ launcher->monitor = g_file_monitor_file (file, 0, NULL, NULL); -+ g_signal_connect (launcher->monitor, "changed", -+ G_CALLBACK (desktop_file_changed), -+ launcher); -+ g_object_unref (file); -+} -+ - static void - launcher_saved (GtkWidget *dialog, - Launcher *launcher) -@@ -688,11 +781,15 @@ launcher_saved (GtkWidget *dialog, - const char *uri; - GConfClient *client; - const char *key; -+ const char *path; - - uri = panel_ditem_editor_get_uri (PANEL_DITEM_EDITOR (dialog)); - if (panel_launcher_get_filename (uri) != NULL) - uri = panel_launcher_get_filename (uri); - -+ if ((path = desktop_file_to_monitor (PANEL_DITEM_EDITOR (dialog))) != NULL) -+ uri = path; -+ - if (uri && launcher->location && strcmp (uri, launcher->location)) { - client = panel_gconf_get_client (); - -@@ -705,6 +802,9 @@ launcher_saved (GtkWidget *dialog, - if (launcher->location) - g_free (launcher->location); - launcher->location = g_strdup (uri); -+ -+ if (path) -+ start_monitoring (launcher); - } - } - -@@ -871,6 +971,7 @@ launcher_new_saved (GtkWidget *dialog, - PanelWidget *panel; - int pos; - const char *uri; -+ const char *path; - - pos = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (dialog), "pos")); - panel = g_object_get_data (G_OBJECT (dialog), "panel"); -@@ -878,6 +979,10 @@ launcher_new_saved (GtkWidget *dialog, - uri = panel_ditem_editor_get_uri (PANEL_DITEM_EDITOR (dialog)); - if (panel_launcher_get_filename (uri) != NULL) - uri = panel_launcher_get_filename (uri); -+ -+ if ((path = desktop_file_to_monitor (PANEL_DITEM_EDITOR (dialog))) != NULL) -+ uri = path; -+ - panel_launcher_create (panel->toplevel, pos, uri); - } - -diff -up gnome-panel-2.29.5.1/gnome-panel/launcher.h.desktop-file-monitoring gnome-panel-2.29.5.1/gnome-panel/launcher.h ---- gnome-panel-2.29.5.1/gnome-panel/launcher.h.desktop-file-monitoring 2009-04-19 13:45:09.000000000 -0400 -+++ gnome-panel-2.29.5.1/gnome-panel/launcher.h 2010-01-17 18:06:14.638537025 -0500 -@@ -27,6 +27,8 @@ typedef struct { - GSList *error_dialogs; - - gulong destroy_handler; -+ -+ GFileMonitor *monitor; - } Launcher; - - void panel_launcher_create (PanelToplevel *toplevel, -@@ -56,7 +58,6 @@ void launcher_load_from_gconf - gint position, - const char *id); - --void panel_launcher_delete (Launcher *launcher); - - void ask_about_launcher (const char *file, - PanelWidget *panel, -diff -up gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c.desktop-file-monitoring gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c ---- gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c.desktop-file-monitoring 2010-01-17 18:06:14.635278719 -0500 -+++ gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c 2010-01-17 18:11:39.921279627 -0500 -@@ -81,6 +81,8 @@ struct _PanelDItemEditorPrivate - GtkWidget *close_button; - GtkWidget *cancel_button; - GtkWidget *ok_button; -+ -+ char *orig_desktop_file; - }; - - /* Time in seconds after which we save the file on the disk */ -@@ -366,6 +368,10 @@ panel_ditem_editor_destroy (GtkObject *o - g_free (dialog->priv->uri); - dialog->priv->uri = NULL; - -+ if (dialog->priv->orig_desktop_file != NULL) -+ g_free (dialog->priv->orig_desktop_file); -+ dialog->priv->orig_desktop_file = NULL; -+ - GTK_OBJECT_CLASS (panel_ditem_editor_parent_class)->destroy (object); - } - -@@ -833,6 +839,13 @@ panel_ditem_editor_changed (PanelDItemEd - TRUE); - } - -+ /* When the user changes any fields, unset the orig_desktop_file -+ * field since the editor contents are not entirely from a desktop -+ * file anymore. -+ */ -+ g_free (dialog->priv->orig_desktop_file); -+ dialog->priv->orig_desktop_file = NULL; -+ - dialog->priv->dirty = TRUE; - g_signal_emit (G_OBJECT (dialog), ditem_edit_signals[CHANGED], 0); - } -@@ -992,6 +1005,13 @@ update_editor_from_desktop_file (PanelDI - */ - setup_icon_chooser (dialog, icon); - -+ /* We set the orig_desktop_file field to let the -+ * launcher know that the editor contents are coming -+ * directly from a desktop file. -+ */ -+ g_free (dialog->priv->orig_desktop_file); -+ dialog->priv->orig_desktop_file = g_strdup (uri); -+ - g_free (name); - g_free (comment); - g_free (icon); -@@ -1066,6 +1086,7 @@ update_chooser_for_type (PanelDItemEdito - g_assert_not_reached (); - } - -+ - chooser = dialog->priv->command_browse_filechooser; - - gtk_window_set_title (GTK_WINDOW (chooser), -@@ -1849,3 +1870,12 @@ panel_ditem_register_save_uri_func (Pane - dialog->priv->save_uri = save_uri; - dialog->priv->save_uri_data = data; - } -+ -+G_CONST_RETURN char * -+panel_ditem_editor_get_orig_desktop_file (PanelDItemEditor *dialog) -+{ -+ g_return_val_if_fail (PANEL_IS_DITEM_EDITOR (dialog), NULL); -+ -+ return dialog->priv->orig_desktop_file; -+} -+ -diff -up gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.h.desktop-file-monitoring gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.h ---- gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.h.desktop-file-monitoring 2009-04-19 13:45:09.000000000 -0400 -+++ gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.h 2010-01-17 18:06:14.638537025 -0500 -@@ -101,6 +101,8 @@ void panel_ditem_editor_set_uri (PanelDI - const char *uri); - - G_CONST_RETURN char *panel_ditem_editor_get_uri (PanelDItemEditor *dialog); -+G_CONST_RETURN char *panel_ditem_editor_get_orig_desktop_file (PanelDItemEditor *dialog); -+ - - void panel_ditem_register_save_uri_func (PanelDItemEditor *dialog, - PanelDitemSaveUri save_uri, diff --git a/drop-gweather-xml-include.patch b/drop-gweather-xml-include.patch deleted file mode 100644 index 3b3a559..0000000 --- a/drop-gweather-xml-include.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- applets/clock/clock.c.orig 2012-12-25 14:38:00.101601746 -0600 -+++ applets/clock/clock.c 2012-12-25 14:38:30.331443803 -0600 -@@ -54,7 +54,6 @@ - #define GNOME_DESKTOP_USE_UNSTABLE_API - #include - --#include - #include - #include - #include diff --git a/fix-clock-crash.patch b/fix-clock-crash.patch deleted file mode 100644 index 4a12b60..0000000 --- a/fix-clock-crash.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 58d7ba0359ab128f30b39ea0518a69ed83a4e329 Mon Sep 17 00:00:00 2001 -From: Ray Strode -Date: Tue, 8 Dec 2009 14:48:58 -0500 -Subject: [PATCH] Only call e_passwords_shutdown once - -It doesn't appear to support being called multiple times -in a row. - -It appears there was already an attempt to do this with a -reference counter called clock_numbers: - -/* Used to count the number of clock instances. It's there to know when - * we should free resources that are shared. */ -static int clock_numbers = 0; - -But the logic was wrong. ---- - applets/clock/clock.c | 9 +++++++-- - 1 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/applets/clock/clock.c b/applets/clock/clock.c -index ddbbc16..c06530a 100644 ---- a/applets/clock/clock.c -+++ b/applets/clock/clock.c -@@ -803,8 +803,11 @@ destroy_clock (GtkWidget * widget, ClockData *cd) - - #ifdef HAVE_LIBECAL - if (clock_numbers > 0) { -- e_passwords_shutdown (); - clock_numbers--; -+ -+ if (clock_numbers == 0) { -+ e_passwords_shutdown (); -+ } - } - #endif - } -@@ -1385,8 +1388,10 @@ static void - create_clock_widget (ClockData *cd) - { - #ifdef HAVE_LIBECAL -+ if (clock_numbers == 0) { -+ e_passwords_init (); -+ } - clock_numbers++; -- e_passwords_init (); - #endif - - /* Main toggle button */ --- -1.6.5.2 - diff --git a/gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch b/gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch deleted file mode 100644 index 3188df4..0000000 --- a/gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gnome-panel-2.10.1/applets/fish/fish.schemas.in.speak-to-us-ye-old-wise-fish 2005-04-25 06:52:48.000000000 -0400 -+++ gnome-panel-2.10.1/applets/fish/fish.schemas.in 2005-04-25 06:53:13.000000000 -0400 -@@ -34,7 +34,7 @@ - /schemas/apps/fish_applet/prefs/command - fish-applet - string -- fortune -+ ddate - - Command to execute on click - diff --git a/gnome-panel-2.21.92-allow-spurious-view-done-signals.patch b/gnome-panel-2.21.92-allow-spurious-view-done-signals.patch deleted file mode 100644 index 8032a80..0000000 --- a/gnome-panel-2.21.92-allow-spurious-view-done-signals.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -up gnome-panel-2.21.92/applets/clock/calendar-client.c.allow-spurious-view-done-signals gnome-panel-2.21.92/applets/clock/calendar-client.c ---- gnome-panel-2.21.92/applets/clock/calendar-client.c.allow-spurious-view-done-signals 2008-02-26 08:17:49.000000000 -0500 -+++ gnome-panel-2.21.92/applets/clock/calendar-client.c 2008-03-03 10:22:57.000000000 -0500 -@@ -1217,6 +1217,13 @@ calendar_client_handle_query_completed ( - { - CalendarClientQuery *query; - -+ if (!source->query_in_progress) -+ { -+ g_warning ("Got spurious 'view-done' signal from calendar backend for query %p\n", -+ &source->completed_query); -+ return; -+ } -+ - query = goddamn_this_is_crack (source, view, NULL); - - dprintf ("Query %p completed: %s\n", query, e_cal_get_error_message (status)); diff --git a/gnome-panel-about.patch b/gnome-panel-about.patch deleted file mode 100644 index 3b31508..0000000 --- a/gnome-panel-about.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up gnome-panel-2.27.91/gnome-panel/panel-menu-items.c.about gnome-panel-2.27.91/gnome-panel/panel-menu-items.c ---- gnome-panel-2.27.91/gnome-panel/panel-menu-items.c.about 2009-08-25 13:32:12.101272238 -0400 -+++ gnome-panel-2.27.91/gnome-panel/panel-menu-items.c 2009-08-25 14:08:21.444015913 -0400 -@@ -1170,7 +1170,8 @@ panel_desktop_menu_item_append_menu (Gtk - add_menu_separator (menu); - - panel_menu_items_append_from_desktop (menu, "gnome-yelp.desktop", NULL, FALSE); -- panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL, FALSE); -+ if (panel_has_desktop_file ("about-this-computer.desktop")) -+ panel_menu_items_append_from_desktop (menu, "about-this-computer.desktop", NULL, FALSE); - - if (parent->priv->append_lock_logout) - panel_menu_items_append_lock_logout (menu); diff --git a/gnome-panel-libs.patch b/gnome-panel-libs.patch deleted file mode 100644 index f02dd49..0000000 --- a/gnome-panel-libs.patch +++ /dev/null @@ -1,555 +0,0 @@ -diff -up gnome-panel-2.91.6/applets/clock/.libs gnome-panel-2.91.6/applets/clock/ -Only in gnome-panel-2.91.6/applets/clock/: calendar-client.c -Only in gnome-panel-2.91.6/applets/clock/: calendar-client.c.allow-spurious-view-done-signals -Only in gnome-panel-2.91.6/applets/clock/: calendar-client.h -Only in gnome-panel-2.91.6/applets/clock/: calendar-debug.h -Only in gnome-panel-2.91.6/applets/clock/: calendar-sources.c -Only in gnome-panel-2.91.6/applets/clock/: calendar-sources.h -Only in gnome-panel-2.91.6/applets/clock/: calendar-window.c -Only in gnome-panel-2.91.6/applets/clock/: calendar-window.h -Binary files gnome-panel-2.91.6/applets/clock/.libs/clock-applet and gnome-panel-2.91.6/applets/clock/clock-applet differ -Only in gnome-panel-2.91.6/applets/clock/: clock_applet-calendar-client.o -Only in gnome-panel-2.91.6/applets/clock/: clock_applet-calendar-sources.o -Only in gnome-panel-2.91.6/applets/clock/: clock_applet-calendar-window.o -Only in gnome-panel-2.91.6/applets/clock/: clock_applet-clock-face.o -Only in gnome-panel-2.91.6/applets/clock/: clock_applet-clock-location.o -Only in gnome-panel-2.91.6/applets/clock/: clock_applet-clock-location-tile.o -Only in gnome-panel-2.91.6/applets/clock/: clock_applet-clock-map.o -Only in gnome-panel-2.91.6/applets/clock/: clock_applet-clock-marshallers.o -Only in gnome-panel-2.91.6/applets/clock/: clock_applet-clock.o -Only in gnome-panel-2.91.6/applets/clock/: clock_applet-clock-sunpos.o -Only in gnome-panel-2.91.6/applets/clock/: clock_applet-clock-typebuiltins.o -Only in gnome-panel-2.91.6/applets/clock/: clock_applet-clock-utils.o -Only in gnome-panel-2.91.6/applets/clock/: clock_applet-set-timezone.o -Only in gnome-panel-2.91.6/applets/clock/: clock.c -Only in gnome-panel-2.91.6/applets/clock/: clock.c.fix-clock-crash -Only in gnome-panel-2.91.6/applets/clock/: clock-face.c -Only in gnome-panel-2.91.6/applets/clock/: clock-face.h -Only in gnome-panel-2.91.6/applets/clock/: clock.h -Only in gnome-panel-2.91.6/applets/clock/: clock-location.c -Only in gnome-panel-2.91.6/applets/clock/: clock-location.c.clock-network -Only in gnome-panel-2.91.6/applets/clock/: clock-location.h -Only in gnome-panel-2.91.6/applets/clock/: clock-location-tile.c -Only in gnome-panel-2.91.6/applets/clock/: clock-location-tile.h -Only in gnome-panel-2.91.6/applets/clock/: clock-map.c -Only in gnome-panel-2.91.6/applets/clock/: clock-map.h -Only in gnome-panel-2.91.6/applets/clock/: clock-marshallers.c -Only in gnome-panel-2.91.6/applets/clock/: clock-marshallers.h -Only in gnome-panel-2.91.6/applets/clock/: clock-marshallers.list -Only in gnome-panel-2.91.6/applets/clock/: clock-menu.xml -Only in gnome-panel-2.91.6/applets/clock/: clock.schemas -Only in gnome-panel-2.91.6/applets/clock/: clock.schemas.in -Only in gnome-panel-2.91.6/applets/clock/: clock.schemas.in.clock-home -Only in gnome-panel-2.91.6/applets/clock/: clock-sunpos.c -Only in gnome-panel-2.91.6/applets/clock/: clock-sunpos.h -Only in gnome-panel-2.91.6/applets/clock/: clock-typebuiltins.c -Only in gnome-panel-2.91.6/applets/clock/: clock-typebuiltins.h -Only in gnome-panel-2.91.6/applets/clock/: clock.ui -Only in gnome-panel-2.91.6/applets/clock/: clock-utils.c -Only in gnome-panel-2.91.6/applets/clock/: clock-utils.h -Only in gnome-panel-2.91.6/applets/clock/: .libs -Only in gnome-panel-2.91.6/applets/clock/.libs: libsystem-timezone.a -Only in gnome-panel-2.91.6/applets/clock/: Makefile -Only in gnome-panel-2.91.6/applets/clock/: Makefile.am -Only in gnome-panel-2.91.6/applets/clock/: Makefile.in -Only in gnome-panel-2.91.6/applets/clock/: org.gnome.panel.applet.ClockAppletFactory.service -Only in gnome-panel-2.91.6/applets/clock/: org.gnome.panel.applet.ClockAppletFactory.service.in -Only in gnome-panel-2.91.6/applets/clock/: org.gnome.panel.ClockApplet.panel-applet -Only in gnome-panel-2.91.6/applets/clock/: org.gnome.panel.ClockApplet.panel-applet.in -Only in gnome-panel-2.91.6/applets/clock/: org.gnome.panel.ClockApplet.panel-applet.in.in -Only in gnome-panel-2.91.6/applets/clock/: pixmaps -Only in gnome-panel-2.91.6/applets/clock/: set-timezone.c -Only in gnome-panel-2.91.6/applets/clock/: set-timezone.h -Only in gnome-panel-2.91.6/applets/clock/: system-timezone.c -Only in gnome-panel-2.91.6/applets/clock/: system-timezone.h -Only in gnome-panel-2.91.6/applets/clock/: system-timezone.lo -Binary files gnome-panel-2.91.6/applets/clock/.libs/system-timezone.o and gnome-panel-2.91.6/applets/clock/system-timezone.o differ -Only in gnome-panel-2.91.6/applets/clock/: test-system-timezone -Only in gnome-panel-2.91.6/applets/clock/: test-system-timezone.c -Only in gnome-panel-2.91.6/applets/clock/: test-system-timezone.o -diff -up gnome-panel-2.91.6/applets/fish/.libs gnome-panel-2.91.6/applets/fish/ -Only in gnome-panel-2.91.6/applets/fish/: fishanim.png -Binary files gnome-panel-2.91.6/applets/fish/.libs/fish-applet and gnome-panel-2.91.6/applets/fish/fish-applet differ -Only in gnome-panel-2.91.6/applets/fish/: fish_applet-fish.o -Only in gnome-panel-2.91.6/applets/fish/: fish.c -Only in gnome-panel-2.91.6/applets/fish/: fish-menu.xml -Only in gnome-panel-2.91.6/applets/fish/: fish.schemas -Only in gnome-panel-2.91.6/applets/fish/: fish.schemas.in -Only in gnome-panel-2.91.6/applets/fish/: fish.schemas.in.speak-to-us-ye-old-wise-fish -Only in gnome-panel-2.91.6/applets/fish/: fish.ui -Only in gnome-panel-2.91.6/applets/fish/: footguy.png -Only in gnome-panel-2.91.6/applets/fish/: .libs -Only in gnome-panel-2.91.6/applets/fish/: Makefile -Only in gnome-panel-2.91.6/applets/fish/: Makefile.am -Only in gnome-panel-2.91.6/applets/fish/: Makefile.in -Only in gnome-panel-2.91.6/applets/fish/: monkey.png -Only in gnome-panel-2.91.6/applets/fish/: oldwanda.png -Only in gnome-panel-2.91.6/applets/fish/: org.gnome.panel.applet.FishAppletFactory.service -Only in gnome-panel-2.91.6/applets/fish/: org.gnome.panel.applet.FishAppletFactory.service.in -Only in gnome-panel-2.91.6/applets/fish/: org.gnome.panel.FishApplet.panel-applet -Only in gnome-panel-2.91.6/applets/fish/: org.gnome.panel.FishApplet.panel-applet.in -Only in gnome-panel-2.91.6/applets/fish/: org.gnome.panel.FishApplet.panel-applet.in.in -Only in gnome-panel-2.91.6/applets/fish/: wanda.png -Only in gnome-panel-2.91.6/applets/fish/: wanda.svg -diff -up gnome-panel-2.91.6/applets/notification_area/.libs gnome-panel-2.91.6/applets/notification_area/ -Only in gnome-panel-2.91.6/applets/notification_area/: fixedtip.c -Only in gnome-panel-2.91.6/applets/notification_area/: fixedtip.h -Only in gnome-panel-2.91.6/applets/notification_area/: fixedtip.lo -Binary files gnome-panel-2.91.6/applets/notification_area/.libs/fixedtip.o and gnome-panel-2.91.6/applets/notification_area/fixedtip.o differ -Only in gnome-panel-2.91.6/applets/notification_area/: .libs -Only in gnome-panel-2.91.6/applets/notification_area/.libs: libtray.a -Only in gnome-panel-2.91.6/applets/notification_area/: main.c -Only in gnome-panel-2.91.6/applets/notification_area/: Makefile -Only in gnome-panel-2.91.6/applets/notification_area/: Makefile.am -Only in gnome-panel-2.91.6/applets/notification_area/: Makefile.am.libs -Only in gnome-panel-2.91.6/applets/notification_area/: Makefile.in -Only in gnome-panel-2.91.6/applets/notification_area/: na-marshal.c -Only in gnome-panel-2.91.6/applets/notification_area/: na-marshal.h -Only in gnome-panel-2.91.6/applets/notification_area/: na-marshal.list -Only in gnome-panel-2.91.6/applets/notification_area/: na-marshal.lo -Binary files gnome-panel-2.91.6/applets/notification_area/.libs/na-marshal.o and gnome-panel-2.91.6/applets/notification_area/na-marshal.o differ -Only in gnome-panel-2.91.6/applets/notification_area/: na-tray.c -Only in gnome-panel-2.91.6/applets/notification_area/: na-tray-child.c -Only in gnome-panel-2.91.6/applets/notification_area/: na-tray-child.h -Only in gnome-panel-2.91.6/applets/notification_area/: na-tray-child.lo -Binary files gnome-panel-2.91.6/applets/notification_area/.libs/na-tray-child.o and gnome-panel-2.91.6/applets/notification_area/na-tray-child.o differ -Only in gnome-panel-2.91.6/applets/notification_area/: na-tray.h -Only in gnome-panel-2.91.6/applets/notification_area/: na-tray.lo -Only in gnome-panel-2.91.6/applets/notification_area/: na-tray-manager.c -Only in gnome-panel-2.91.6/applets/notification_area/: na-tray-manager.h -Only in gnome-panel-2.91.6/applets/notification_area/: na-tray-manager.lo -Binary files gnome-panel-2.91.6/applets/notification_area/.libs/na-tray-manager.o and gnome-panel-2.91.6/applets/notification_area/na-tray-manager.o differ -Binary files gnome-panel-2.91.6/applets/notification_area/.libs/na-tray.o and gnome-panel-2.91.6/applets/notification_area/na-tray.o differ -Only in gnome-panel-2.91.6/applets/notification_area/: notification_area_applet-main.o -Only in gnome-panel-2.91.6/applets/notification_area/: notification-area-menu.xml -Only in gnome-panel-2.91.6/applets/notification_area/: org.gnome.panel.applet.NotificationAreaAppletFactory.service -Only in gnome-panel-2.91.6/applets/notification_area/: org.gnome.panel.applet.NotificationAreaAppletFactory.service.in -Only in gnome-panel-2.91.6/applets/notification_area/: org.gnome.panel.NotificationAreaApplet.panel-applet -Only in gnome-panel-2.91.6/applets/notification_area/: org.gnome.panel.NotificationAreaApplet.panel-applet.in -Only in gnome-panel-2.91.6/applets/notification_area/: org.gnome.panel.NotificationAreaApplet.panel-applet.in.in -Only in gnome-panel-2.91.6/applets/notification_area/: testtray.c -Only in gnome-panel-2.91.6/applets/notification_area/: testtray.o -diff -up gnome-panel-2.91.6/applets/notification_area/Makefile.am.libs gnome-panel-2.91.6/applets/notification_area/Makefile.am ---- gnome-panel-2.91.6/applets/notification_area/Makefile.am.libs 2011-01-31 18:52:27.000000000 -0500 -+++ gnome-panel-2.91.6/applets/notification_area/Makefile.am 2011-02-02 19:45:49.002989988 -0500 -@@ -29,8 +29,8 @@ libtray_la_SOURCES = \ - NOTIFICATION_AREA_SOURCES = main.c - - NOTIFICATION_AREA_LDADD = \ -- ../../libpanel-applet/libpanel-applet-4.la \ - $(X_LIBS) \ -+ ../../libpanel-applet/libpanel-applet-4.la \ - $(NOTIFICATION_AREA_LIBS) \ - $(LIBPANEL_APPLET_LIBS) \ - libtray.la -diff -up gnome-panel-2.91.6/configure.ac.libs gnome-panel-2.91.6/configure.ac ---- gnome-panel-2.91.6/configure.ac.libs 2011-02-01 20:43:03.000000000 -0500 -+++ gnome-panel-2.91.6/configure.ac 2011-02-02 19:45:49.003990000 -0500 -@@ -83,7 +83,7 @@ PKG_CHECK_MODULES(PANEL, gdk-pixbuf-2.0 - AC_SUBST(PANEL_CFLAGS) - AC_SUBST(PANEL_LIBS) - --PKG_CHECK_MODULES(LIBPANEL_APPLET, gtk+-3.0 >= $GTK_REQUIRED cairo-xlib cairo-gobject gconf-2.0 >= $GCONF_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED) -+PKG_CHECK_MODULES(LIBPANEL_APPLET, gdk-x11-3.0 >= $GTK_REQUIRED gdk-3.0 >= $GTK_REQUIRED gtk+-x11-3.0 >= $GTK_REQUIRED gtk+-3.0 >= $GTK_REQUIRED cairo-xlib cairo-gobject gconf-2.0 >= $GCONF_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED) - AC_SUBST(LIBPANEL_APPLET_CFLAGS) - AC_SUBST(LIBPANEL_APPLET_LIBS) - -@@ -91,11 +91,11 @@ PKG_CHECK_MODULES(FISH, gtk+-3.0 >= $GTK - AC_SUBST(FISH_CFLAGS) - AC_SUBST(FISH_LIBS) - --PKG_CHECK_MODULES(NOTIFICATION_AREA, gtk+-3.0 >= $GTK_REQUIRED) -+PKG_CHECK_MODULES(NOTIFICATION_AREA, gdk-x11-3.0 >= $GTK_REQUIRED gdk-3.0 >= $GTK_REQUIRED gtk+-x11-3.0 >= $GTK_REQUIRED gtk+-3.0 >= $GTK_REQUIRED) - AC_SUBST(NOTIFICATION_AREA_CFLAGS) - AC_SUBST(NOTIFICATION_AREA_LIBS) - --PKG_CHECK_MODULES(WNCKLET, gtk+-3.0 >= $GTK_REQUIRED libwnck-3.0 >= $LIBWNCK_REQUIRED) -+PKG_CHECK_MODULES(WNCKLET, gdk-x11-3.0 >= $GTK_REQUIRED gdk-3.0 >= $GTK_REQUIRED gtk+-x11-3.0 >= $GTK_REQUIRED gtk+-3.0 >= $GTK_REQUIRED libwnck-3.0 >= $LIBWNCK_REQUIRED) - AC_SUBST(WNCKLET_CFLAGS) - AC_SUBST(WNCKLET_LIBS) - -@@ -242,10 +242,15 @@ AC_SUBST(X_LIBS) - - dnl X RANDR extension - --PKG_CHECK_MODULES(XRANDR, xrandr >= 1.2.0, have_randr=yes, have_randr=no) --if test "x$have_randr" = "xyes"; then -+PKG_CHECK_MODULES(XRANDR, xrandr >= 1.2.0, [ - AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library]) --fi -+ have_randr=yes -+ X_LIBS="$X_LIBS $XRANDR_LIBS" -+], [ -+ have_randr=no -+]) -+ -+AC_SUBST(X_LIBS) - - dnl Modules dir - AC_SUBST([modulesdir],"\$(libdir)/gnome-panel/modules") -diff -up gnome-panel-2.91.6/gnome-panel/libegg/.libs gnome-panel-2.91.6/gnome-panel/libegg/ -Only in gnome-panel-2.91.6/gnome-panel/libegg/: eggdesktopfile.c -Only in gnome-panel-2.91.6/gnome-panel/libegg/: eggdesktopfile.h -Only in gnome-panel-2.91.6/gnome-panel/libegg/: eggdesktopfile.lo -Binary files gnome-panel-2.91.6/gnome-panel/libegg/.libs/eggdesktopfile.o and gnome-panel-2.91.6/gnome-panel/libegg/eggdesktopfile.o differ -Only in gnome-panel-2.91.6/gnome-panel/libegg/: eggsmclient.c -Only in gnome-panel-2.91.6/gnome-panel/libegg/: eggsmclient.h -Only in gnome-panel-2.91.6/gnome-panel/libegg/: eggsmclient.lo -Binary files gnome-panel-2.91.6/gnome-panel/libegg/.libs/eggsmclient.o and gnome-panel-2.91.6/gnome-panel/libegg/eggsmclient.o differ -Only in gnome-panel-2.91.6/gnome-panel/libegg/: eggsmclient-private.h -Only in gnome-panel-2.91.6/gnome-panel/libegg/: eggsmclient-xsmp.c -Only in gnome-panel-2.91.6/gnome-panel/libegg/: eggsmclient-xsmp.lo -Binary files gnome-panel-2.91.6/gnome-panel/libegg/.libs/eggsmclient-xsmp.o and gnome-panel-2.91.6/gnome-panel/libegg/eggsmclient-xsmp.o differ -Only in gnome-panel-2.91.6/gnome-panel/libegg/.libs: libegg.a -Only in gnome-panel-2.91.6/gnome-panel/libegg/: .libs -Only in gnome-panel-2.91.6/gnome-panel/libegg/: Makefile -Only in gnome-panel-2.91.6/gnome-panel/libegg/: Makefile.am -Only in gnome-panel-2.91.6/gnome-panel/libegg/: Makefile.in -diff -up gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/.libs gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/ -Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/.libs: libpanel-applet-private.a -Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/.libs: libpanel-applet-private-mini.a -Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/: .libs -Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/: Makefile -Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/: Makefile.am -Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/: Makefile.in -Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/: panel-applet-container.c -Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/: panel-applet-container.h -Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/: panel-applet-container.lo -Binary files gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/.libs/panel-applet-container.o and gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/panel-applet-container.o differ -Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/: panel-applet-frame-dbus.c -Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/: panel-applet-frame-dbus.h -Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/: panel-applet-frame-dbus.lo -Binary files gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/.libs/panel-applet-frame-dbus.o and gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/panel-applet-frame-dbus.o differ -Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/: panel-applet-mini.c -Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/: panel-applet-mini.lo -Binary files gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/.libs/panel-applet-mini.o and gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/panel-applet-mini.o differ -Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/: panel-applets-manager-dbus.c -Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/: panel-applets-manager-dbus.h -Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/: panel-applets-manager-dbus.lo -Binary files gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/.libs/panel-applets-manager-dbus.o and gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/panel-applets-manager-dbus.o differ -diff -up gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs gnome-panel-2.91.6/gnome-panel/libpanel-util/ -Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs: libpanel-util.a -Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: .libs -Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: Makefile -Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: Makefile.am -Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: Makefile.in -Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-cleanup.c -Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-cleanup.h -Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-cleanup.lo -Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-cleanup.o and gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-cleanup.o differ -Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-dbus-service.c -Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-dbus-service.h -Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-dbus-service.lo -Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-dbus-service.o and gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-dbus-service.o differ -Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-error.c -Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-error.h -Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-error.lo -Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-error.o and gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-error.o differ -Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-glib.c -Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-glib.h -Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-glib.lo -Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-glib.o and gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-glib.o differ -Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-gtk.c -Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-gtk.h -Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-gtk.lo -Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-gtk.o and gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-gtk.o differ -Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-icon-chooser.c -Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-icon-chooser.h -Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-icon-chooser.lo -Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-icon-chooser.o and gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-icon-chooser.o differ -Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-keyfile.c -Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-keyfile.h -Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-keyfile.lo -Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-keyfile.o and gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-keyfile.o differ -Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-launch.c -Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-launch.h -Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-launch.lo -Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-launch.o and gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-launch.o differ -Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-list.c -Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-list.h -Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-list.lo -Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-list.o and gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-list.o differ -Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-session-manager.c -Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-session-manager.h -Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-session-manager.lo -Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-session-manager.o and gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-session-manager.o differ -Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-show.c -Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-show.h -Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-show.lo -Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-show.o and gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-show.o differ -Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-xdg.c -Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-xdg.h -Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-xdg.lo -Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-xdg.o and gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-xdg.o differ -diff -up gnome-panel-2.91.6/gnome-panel/.libs gnome-panel-2.91.6/gnome-panel/ -Only in gnome-panel-2.91.6/gnome-panel/: applet.c -Only in gnome-panel-2.91.6/gnome-panel/: applet.h -Only in gnome-panel-2.91.6/gnome-panel/: button-widget.c -Only in gnome-panel-2.91.6/gnome-panel/: button-widget.h -Only in gnome-panel-2.91.6/gnome-panel/: drawer.c -Only in gnome-panel-2.91.6/gnome-panel/: drawer.h -Only in gnome-panel-2.91.6/gnome-panel/: gnome-desktop-item-edit -Only in gnome-panel-2.91.6/gnome-panel/: gnome-desktop-item-edit.c -Only in gnome-panel-2.91.6/gnome-panel/: gnome-desktop-item-edit.o -Only in gnome-panel-2.91.6/gnome-panel/: gnome-panel -Only in gnome-panel-2.91.6/gnome-panel/: gnome-panel-add -Only in gnome-panel-2.91.6/gnome-panel/: gnome-panel-add.in -Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-applet.o -Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-button-widget.o -Only in gnome-panel-2.91.6/gnome-panel/: gnome-panel.desktop -Only in gnome-panel-2.91.6/gnome-panel/: gnome-panel.desktop.in -Only in gnome-panel-2.91.6/gnome-panel/: gnome-panel.desktop.in.in -Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-drawer.o -Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-launcher.o -Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-main.o -Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-menu.o -Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-a11y.o -Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-action-button.o -Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-action-protocol.o -Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-addto.o -Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-applet-frame.o -Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-applet-info.o -Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-applets-manager.o -Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-background-monitor.o -Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-background.o -Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-bindings.o -Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-compatibility.o -Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-config-global.o -Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-context-menu.o -Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-ditem-editor.o -Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-force-quit.o -Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-frame.o -Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-gconf.o -Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-lockdown.o -Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-marshal.o -Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-menu-bar.o -Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-menu-button.o -Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-menu-items.o -Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-modules.o -Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-multiscreen.o -Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel.o -Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-profile.o -Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-properties-dialog.o -Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-recent.o -Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-run-dialog.o -Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-separator.o -Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-session.o -Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-shell.o -Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-stock-icons.o -Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-struts.o -Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-toplevel.o -Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-typebuiltins.o -Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-util.o -Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-widget.o -Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-xutils.o -Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-xstuff.o -Only in gnome-panel-2.91.6/gnome-panel/: launcher.c -Only in gnome-panel-2.91.6/gnome-panel/: launcher.c.preferred-apps -Only in gnome-panel-2.91.6/gnome-panel/: launcher.h -Only in gnome-panel-2.91.6/gnome-panel/: launcher.h.preferred-apps -Only in gnome-panel-2.91.6/gnome-panel/: libegg -Only in gnome-panel-2.91.6/gnome-panel/: libpanel-applet-private -Only in gnome-panel-2.91.6/gnome-panel/: libpanel-util -Only in gnome-panel-2.91.6/gnome-panel/: .libs -Only in gnome-panel-2.91.6/gnome-panel/: main.c -Only in gnome-panel-2.91.6/gnome-panel/: main.c.preferred-apps -Only in gnome-panel-2.91.6/gnome-panel/: Makefile -Only in gnome-panel-2.91.6/gnome-panel/: Makefile.am -Only in gnome-panel-2.91.6/gnome-panel/: Makefile.am.libs -Only in gnome-panel-2.91.6/gnome-panel/: Makefile.in -Only in gnome-panel-2.91.6/gnome-panel/: menu.c -Only in gnome-panel-2.91.6/gnome-panel/: menu.h -Only in gnome-panel-2.91.6/gnome-panel/: nothing.cP -Only in gnome-panel-2.91.6/gnome-panel/: nothing.h -Only in gnome-panel-2.91.6/gnome-panel/: panel-a11y.c -Only in gnome-panel-2.91.6/gnome-panel/: panel-a11y.h -Only in gnome-panel-2.91.6/gnome-panel/: panel-action-button.c -Only in gnome-panel-2.91.6/gnome-panel/: panel-action-button.h -Only in gnome-panel-2.91.6/gnome-panel/: panel-action-protocol.c -Only in gnome-panel-2.91.6/gnome-panel/: panel-action-protocol.h -Only in gnome-panel-2.91.6/gnome-panel/: panel-addto.c -Only in gnome-panel-2.91.6/gnome-panel/: panel-addto.h -Only in gnome-panel-2.91.6/gnome-panel/: panel-applet-frame.c -Only in gnome-panel-2.91.6/gnome-panel/: panel-applet-frame.h -Only in gnome-panel-2.91.6/gnome-panel/: panel-applet-info.c -Only in gnome-panel-2.91.6/gnome-panel/: panel-applet-info.h -Only in gnome-panel-2.91.6/gnome-panel/: panel-applets-manager.c -Only in gnome-panel-2.91.6/gnome-panel/: panel-applets-manager.h -Only in gnome-panel-2.91.6/gnome-panel/: panel-background.c -Only in gnome-panel-2.91.6/gnome-panel/: panel-background.h -Only in gnome-panel-2.91.6/gnome-panel/: panel-background-monitor.c -Only in gnome-panel-2.91.6/gnome-panel/: panel-background-monitor.h -Only in gnome-panel-2.91.6/gnome-panel/: panel-bindings.c -Only in gnome-panel-2.91.6/gnome-panel/: panel-bindings.h -Only in gnome-panel-2.91.6/gnome-panel/: panel.c -Only in gnome-panel-2.91.6/gnome-panel/: panel-compatibility.c -Only in gnome-panel-2.91.6/gnome-panel/: panel-compatibility.h -Only in gnome-panel-2.91.6/gnome-panel/: panel-compatibility.schemas -Only in gnome-panel-2.91.6/gnome-panel/: panel-config-global.c -Only in gnome-panel-2.91.6/gnome-panel/: panel-config-global.h -Only in gnome-panel-2.91.6/gnome-panel/: panel-context-menu.c -Only in gnome-panel-2.91.6/gnome-panel/: panel-context-menu.h -Only in gnome-panel-2.91.6/gnome-panel/: panel-default-setup.entries -Only in gnome-panel-2.91.6/gnome-panel/: panel-ditem-editor.c -Only in gnome-panel-2.91.6/gnome-panel/: panel-ditem-editor.c.launcher-desktop-files -Only in gnome-panel-2.91.6/gnome-panel/: panel-ditem-editor.h -Only in gnome-panel-2.91.6/gnome-panel/: panel-ditem-editor.o -Only in gnome-panel-2.91.6/gnome-panel/: panel-enums.h -Only in gnome-panel-2.91.6/gnome-panel/: panel-force-quit.c -Only in gnome-panel-2.91.6/gnome-panel/: panel-force-quit.h -Only in gnome-panel-2.91.6/gnome-panel/: panel-frame.c -Only in gnome-panel-2.91.6/gnome-panel/: panel-frame.h -Only in gnome-panel-2.91.6/gnome-panel/: panel-gconf.c -Only in gnome-panel-2.91.6/gnome-panel/: panel-gconf.h -Only in gnome-panel-2.91.6/gnome-panel/: panel-general.schemas -Only in gnome-panel-2.91.6/gnome-panel/: panel-general.schemas.in -Only in gnome-panel-2.91.6/gnome-panel/: panel-global.schemas -Only in gnome-panel-2.91.6/gnome-panel/: panel-global.schemas.in -Only in gnome-panel-2.91.6/gnome-panel/: panel-globals.h -Only in gnome-panel-2.91.6/gnome-panel/: panel.h -Only in gnome-panel-2.91.6/gnome-panel/: panel-icon-names.h -Only in gnome-panel-2.91.6/gnome-panel/: panel-lockdown.c -Only in gnome-panel-2.91.6/gnome-panel/: panel-lockdown.h -Only in gnome-panel-2.91.6/gnome-panel/: panel-marshal.c -Only in gnome-panel-2.91.6/gnome-panel/: panel-marshal.h -Only in gnome-panel-2.91.6/gnome-panel/: panel-marshal.list -Only in gnome-panel-2.91.6/gnome-panel/: panel-marshal.o -Only in gnome-panel-2.91.6/gnome-panel/: panel-menu-bar.c -Only in gnome-panel-2.91.6/gnome-panel/: panel-menu-bar.h -Only in gnome-panel-2.91.6/gnome-panel/: panel-menu-button.c -Only in gnome-panel-2.91.6/gnome-panel/: panel-menu-button.h -Only in gnome-panel-2.91.6/gnome-panel/: panel-menu-items.c -Only in gnome-panel-2.91.6/gnome-panel/: panel-menu-items.c.bookmarks-submenu -Only in gnome-panel-2.91.6/gnome-panel/: panel-menu-items.h -Only in gnome-panel-2.91.6/gnome-panel/: panel-modules.c -Only in gnome-panel-2.91.6/gnome-panel/: panel-modules.h -Only in gnome-panel-2.91.6/gnome-panel/: panel-multiscreen.c -Only in gnome-panel-2.91.6/gnome-panel/: panel-multiscreen.h -Only in gnome-panel-2.91.6/gnome-panel/: panel-object.schemas -Only in gnome-panel-2.91.6/gnome-panel/: panel-object.schemas.in -Only in gnome-panel-2.91.6/gnome-panel/: panel-profile.c -Only in gnome-panel-2.91.6/gnome-panel/: panel-profile.h -Only in gnome-panel-2.91.6/gnome-panel/: panel-properties-dialog.c -Only in gnome-panel-2.91.6/gnome-panel/: panel-properties-dialog.h -Only in gnome-panel-2.91.6/gnome-panel/: panel-properties-dialog.ui -Only in gnome-panel-2.91.6/gnome-panel/: panel-recent.c -Only in gnome-panel-2.91.6/gnome-panel/: panel-recent.h -Only in gnome-panel-2.91.6/gnome-panel/: panel-run-dialog.c -Only in gnome-panel-2.91.6/gnome-panel/: panel-run-dialog.c.preferred-apps -Only in gnome-panel-2.91.6/gnome-panel/: panel-run-dialog.h -Only in gnome-panel-2.91.6/gnome-panel/: panel-run-dialog.h.preferred-apps -Only in gnome-panel-2.91.6/gnome-panel/: panel-run-dialog.ui -Only in gnome-panel-2.91.6/gnome-panel/: panel-separator.c -Only in gnome-panel-2.91.6/gnome-panel/: panel-separator.h -Only in gnome-panel-2.91.6/gnome-panel/: panel-session.c -Only in gnome-panel-2.91.6/gnome-panel/: panel-session.h -Only in gnome-panel-2.91.6/gnome-panel/: panel-shell.c -Only in gnome-panel-2.91.6/gnome-panel/: panel-shell.h -Only in gnome-panel-2.91.6/gnome-panel/: panel-stock-icons.c -Only in gnome-panel-2.91.6/gnome-panel/: panel-stock-icons.h -Only in gnome-panel-2.91.6/gnome-panel/: panel-struts.c -Only in gnome-panel-2.91.6/gnome-panel/: panel-struts.h -Only in gnome-panel-2.91.6/gnome-panel/: panel-test-applets -Only in gnome-panel-2.91.6/gnome-panel/: panel-test-applets.c -Only in gnome-panel-2.91.6/gnome-panel/: panel_test_applets-panel-applet-info.o -Only in gnome-panel-2.91.6/gnome-panel/: panel_test_applets-panel-applets-manager.o -Only in gnome-panel-2.91.6/gnome-panel/: panel_test_applets-panel-marshal.o -Only in gnome-panel-2.91.6/gnome-panel/: panel_test_applets-panel-modules.o -Only in gnome-panel-2.91.6/gnome-panel/: panel_test_applets-panel-test-applets.o -Only in gnome-panel-2.91.6/gnome-panel/: panel-test-applets.ui -Only in gnome-panel-2.91.6/gnome-panel/: panel-toplevel.c -Only in gnome-panel-2.91.6/gnome-panel/: panel-toplevel.h -Only in gnome-panel-2.91.6/gnome-panel/: panel-toplevel.schemas -Only in gnome-panel-2.91.6/gnome-panel/: panel-toplevel.schemas.in -Only in gnome-panel-2.91.6/gnome-panel/: panel-typebuiltins.c -Only in gnome-panel-2.91.6/gnome-panel/: panel-typebuiltins.h -Only in gnome-panel-2.91.6/gnome-panel/: panel-types.h -Only in gnome-panel-2.91.6/gnome-panel/: panel-util.c -Only in gnome-panel-2.91.6/gnome-panel/: panel-util.h -Only in gnome-panel-2.91.6/gnome-panel/: panel-util.o -Only in gnome-panel-2.91.6/gnome-panel/: panel-widget.c -Only in gnome-panel-2.91.6/gnome-panel/: panel-widget.h -Only in gnome-panel-2.91.6/gnome-panel/: panel-xutils.c -Only in gnome-panel-2.91.6/gnome-panel/: panel-xutils.h -Only in gnome-panel-2.91.6/gnome-panel/: xstuff.c -Only in gnome-panel-2.91.6/gnome-panel/: xstuff.h -Only in gnome-panel-2.91.6/gnome-panel/: xstuff.o -diff -up gnome-panel-2.91.6/gnome-panel/Makefile.am.libs gnome-panel-2.91.6/gnome-panel/Makefile.am ---- gnome-panel-2.91.6/gnome-panel/Makefile.am.libs 2011-01-31 18:50:19.000000000 -0500 -+++ gnome-panel-2.91.6/gnome-panel/Makefile.am 2011-02-02 19:45:49.003990000 -0500 -@@ -135,6 +135,7 @@ gnome_panel_LDADD = \ - $(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la \ - $(PANEL_LIBS) \ - $(XRANDR_LIBS) \ -+ -lm \ - $(X_LIBS) - - gnome_panel_LDFLAGS = -export-dynamic -@@ -149,7 +150,8 @@ gnome_desktop_item_edit_SOURCES = \ - gnome_desktop_item_edit_LDADD = \ - $(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la \ - $(PANEL_LIBS) \ -- $(X_LIBS) -+ $(X_LIBS) \ -+ -lm - - panel_test_applets_SOURCES = \ - panel-modules.c \ -diff -up gnome-panel-2.91.6/libpanel-applet/.libs gnome-panel-2.91.6/libpanel-applet/ -Only in gnome-panel-2.91.6/libpanel-applet/: libpanelapplet-4.0.pc -Only in gnome-panel-2.91.6/libpanel-applet/: libpanelapplet-4.0.pc.in -Only in gnome-panel-2.91.6/libpanel-applet/: libpanelapplet-4.0-uninstalled.pc -Only in gnome-panel-2.91.6/libpanel-applet/: libpanelapplet-4.0-uninstalled.pc.in -Only in gnome-panel-2.91.6/libpanel-applet/.libs: libpanel-applet-4.a -Only in gnome-panel-2.91.6/libpanel-applet/.libs: libpanel-applet-4.lai -Only in gnome-panel-2.91.6/libpanel-applet/.libs: libpanel-applet-4.so -Only in gnome-panel-2.91.6/libpanel-applet/.libs: libpanel-applet-4.so.0 -Only in gnome-panel-2.91.6/libpanel-applet/.libs: libpanel-applet-4.so.0.0.0 -Only in gnome-panel-2.91.6/libpanel-applet/: .libs -Only in gnome-panel-2.91.6/libpanel-applet/: Makefile -Only in gnome-panel-2.91.6/libpanel-applet/: Makefile.am -Only in gnome-panel-2.91.6/libpanel-applet/: Makefile.am.libs -Only in gnome-panel-2.91.6/libpanel-applet/: Makefile.in -Only in gnome-panel-2.91.6/libpanel-applet/: org.gnome.panel.TestApplet.panel-applet -Only in gnome-panel-2.91.6/libpanel-applet/: org.gnome.panel.TestApplet.panel-applet.in -Only in gnome-panel-2.91.6/libpanel-applet/: PanelApplet-4.0.gir -Only in gnome-panel-2.91.6/libpanel-applet/: PanelApplet-4.0.typelib -Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet.c -Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-enums.c -Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-enums.h -Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-enums.lo -Binary files gnome-panel-2.91.6/libpanel-applet/.libs/panel-applet-enums.o and gnome-panel-2.91.6/libpanel-applet/panel-applet-enums.o differ -Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-factory.c -Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-factory.h -Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-factory.lo -Binary files gnome-panel-2.91.6/libpanel-applet/.libs/panel-applet-factory.o and gnome-panel-2.91.6/libpanel-applet/panel-applet-factory.o differ -Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-gconf.c -Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-gconf.h -Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-gconf.lo -Binary files gnome-panel-2.91.6/libpanel-applet/.libs/panel-applet-gconf.o and gnome-panel-2.91.6/libpanel-applet/panel-applet-gconf.o differ -Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet.h -Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet.lo -Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-marshal.c -Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-marshal.h -Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-marshal.list -Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-marshal.lo -Binary files gnome-panel-2.91.6/libpanel-applet/.libs/panel-applet-marshal.o and gnome-panel-2.91.6/libpanel-applet/panel-applet-marshal.o differ -Binary files gnome-panel-2.91.6/libpanel-applet/.libs/panel-applet.o and gnome-panel-2.91.6/libpanel-applet/panel-applet.o differ -Binary files gnome-panel-2.91.6/libpanel-applet/.libs/test-dbus-applet and gnome-panel-2.91.6/libpanel-applet/test-dbus-applet differ -Only in gnome-panel-2.91.6/libpanel-applet/: test-dbus-applet.c -Only in gnome-panel-2.91.6/libpanel-applet/: test-dbus-applet.o -Only in gnome-panel-2.91.6/libpanel-applet/: TODO -diff -up gnome-panel-2.91.6/libpanel-applet/Makefile.am.libs gnome-panel-2.91.6/libpanel-applet/Makefile.am ---- gnome-panel-2.91.6/libpanel-applet/Makefile.am.libs 2011-02-02 19:49:30.834702141 -0500 -+++ gnome-panel-2.91.6/libpanel-applet/Makefile.am 2011-02-02 19:49:36.886776132 -0500 -@@ -25,8 +25,8 @@ libpanel_applet_4_la_SOURCES = \ - panel-applet-gconf.h - - libpanel_applet_4_la_LIBADD = \ -- $(LIBPANEL_APPLET_LIBS) \ -- $(X_LIBS) -+ $(X_LIBS) \ -+ $(LIBPANEL_APPLET_LIBS) - - libpanel_applet_4_la_LDFLAGS = \ - -version-info $(LIB_PANEL_APPLET_LT_VERSION) \ diff --git a/gnome-panel-search.patch b/gnome-panel-search.patch deleted file mode 100644 index 277ba9f..0000000 --- a/gnome-panel-search.patch +++ /dev/null @@ -1,104 +0,0 @@ -diff -up gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.c.search gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.c ---- gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.c.search 2009-04-19 13:45:09.000000000 -0400 -+++ gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.c 2009-08-25 11:33:36.666288948 -0400 -@@ -29,6 +29,8 @@ - #include - #include - -+#include -+ - #include "panel-error.h" - #include "panel-glib.h" - -@@ -201,6 +203,23 @@ panel_launch_desktop_file (const char * - } - - gboolean -+panel_has_desktop_file (const char *desktop_file) -+{ -+ GnomeDesktopItem *ditem; -+ -+ if (g_path_is_absolute (desktop_file)) -+ ditem = gnome_desktop_item_new_from_file (desktop_file, 0, NULL); -+ else -+ ditem = gnome_desktop_item_new_from_basename (desktop_file, 0, NULL); -+ if (ditem != NULL) { -+ gnome_desktop_item_unref (ditem); -+ return TRUE; -+ } -+ -+ return FALSE; -+} -+ -+gboolean - panel_launch_desktop_file_with_fallback (const char *desktop_file, - const char *fallback_exec, - GdkScreen *screen, -diff -up gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.h.search gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.h ---- gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.h.search 2009-04-19 13:45:09.000000000 -0400 -+++ gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.h 2009-08-25 11:33:36.667276923 -0400 -@@ -47,6 +47,8 @@ gboolean panel_launch_key_file (GKeyFile - GdkScreen *screen, - GError **error); - -+gboolean panel_has_desktop_file (const char *desktop_file); -+ - gboolean panel_launch_desktop_file (const char *desktop_file, - GdkScreen *screen, - GError **error); -diff -up gnome-panel-2.27.91/gnome-panel/panel-action-button.c.search gnome-panel-2.27.91/gnome-panel/panel-action-button.c ---- gnome-panel-2.27.91/gnome-panel/panel-action-button.c.search 2009-04-19 13:45:09.000000000 -0400 -+++ gnome-panel-2.27.91/gnome-panel/panel-action-button.c 2009-08-25 11:33:36.671290074 -0400 -@@ -219,9 +219,19 @@ panel_action_search (GtkWidget *widget) - GdkScreen *screen; - - screen = gtk_widget_get_screen (widget); -- panel_launch_desktop_file_with_fallback ("gnome-search-tool.desktop", -- "gnome-search-tool", -- screen, NULL); -+ if (panel_has_desktop_file ("gnome-beagle-search.desktop")) { -+ panel_launch_desktop_file ("gnome-beagle-search.desktop", -+ screen, -+ NULL); -+ } else if (panel_has_desktop_file ("fedora-tracker-search-tool.desktop")) { -+ panel_launch_desktop_file ("fedora-tracker-search-tool.desktop", -+ screen, -+ NULL); -+ } else { -+ panel_launch_desktop_file ("gnome-search-tool.desktop", -+ screen, -+ NULL); -+ } - } - - /* Force Quit -diff -up gnome-panel-2.27.91/gnome-panel/panel-menu-items.c.search gnome-panel-2.27.91/gnome-panel/panel-menu-items.c ---- gnome-panel-2.27.91/gnome-panel/panel-menu-items.c.search 2009-08-25 11:33:36.643267021 -0400 -+++ gnome-panel-2.27.91/gnome-panel/panel-menu-items.c 2009-08-25 11:42:41.517027329 -0400 -@@ -1062,10 +1062,22 @@ panel_place_menu_item_create_menu (Panel - - add_menu_separator (places_menu); - -- panel_menu_items_append_from_desktop (places_menu, -- "gnome-search-tool.desktop", -- NULL, -- FALSE); -+ if (panel_has_desktop_file ("gnome-beagle-search.desktop")) { -+ panel_menu_items_append_from_desktop (places_menu, -+ "gnome-beagle-search.desktop", -+ NULL, -+ FALSE); -+ } else if (panel_has_desktop_file ("fedora-tracker-search-tool.desktop")) { -+ panel_menu_items_append_from_desktop (places_menu, -+ "fedora-tracker-search-tool.desktop", -+ NULL, -+ FALSE); -+ } else { -+ panel_menu_items_append_from_desktop (places_menu, -+ "gnome-search-tool.desktop", -+ NULL, -+ FALSE); -+ } - - panel_recent_append_documents_menu (places_menu, - place_item->priv->recent_manager); diff --git a/gnome-panel-use-gnome-menus.patch b/gnome-panel-use-gnome-menus.patch deleted file mode 100644 index 87495cc..0000000 --- a/gnome-panel-use-gnome-menus.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff -up gnome-panel-3.1.5/gnome-panel/menu.c.menus gnome-panel-3.1.5/gnome-panel/menu.c ---- gnome-panel-3.1.5/gnome-panel/menu.c.menus 2011-08-01 13:39:56.000000000 -0400 -+++ gnome-panel-3.1.5/gnome-panel/menu.c 2011-08-17 18:58:26.341620915 -0400 -@@ -1401,7 +1401,7 @@ create_main_menu (PanelWidget *panel) - { - GtkWidget *main_menu; - -- main_menu = create_applications_menu ("applications.menu", NULL, TRUE); -+ main_menu = create_applications_menu ("gnome-applications.menu", NULL, TRUE); - - g_object_set_data (G_OBJECT (main_menu), "menu_panel", panel); - /* FIXME need to update the panel on parent_set */ -diff -up gnome-panel-3.1.5/gnome-panel/panel-addto.c.menus gnome-panel-3.1.5/gnome-panel/panel-addto.c ---- gnome-panel-3.1.5/gnome-panel/panel-addto.c.menus 2011-08-01 13:39:56.000000000 -0400 -+++ gnome-panel-3.1.5/gnome-panel/panel-addto.c 2011-08-17 18:59:37.306668576 -0400 -@@ -666,7 +666,7 @@ panel_addto_make_application_model (Pane - G_TYPE_POINTER, - G_TYPE_STRING); - -- tree = gmenu_tree_new ("applications.menu", GMENU_TREE_FLAGS_SORT_DISPLAY_NAME); -+ tree = gmenu_tree_new ("applications-gnome.menu", GMENU_TREE_FLAGS_SORT_DISPLAY_NAME); - - if (!gmenu_tree_load_sync (tree, NULL)) { - g_object_unref (tree); -@@ -675,7 +675,7 @@ panel_addto_make_application_model (Pane - - if (tree != NULL && (root = gmenu_tree_get_root_directory (tree))) { - panel_addto_make_application_list (&dialog->application_list, -- root, "applications.menu", -+ root, "gnome-applications.menu", - PANEL_ADDTO_MENU_SHOW_ALL); - panel_addto_populate_application_model (store, NULL, dialog->application_list); - -diff -up gnome-panel-3.1.5/gnome-panel/panel-menu-bar.c.menus gnome-panel-3.1.5/gnome-panel/panel-menu-bar.c ---- gnome-panel-3.1.5/gnome-panel/panel-menu-bar.c.menus 2011-04-05 06:39:04.000000000 -0400 -+++ gnome-panel-3.1.5/gnome-panel/panel-menu-bar.c 2011-08-17 18:58:26.388620946 -0400 -@@ -129,7 +129,7 @@ panel_menu_bar_init (PanelMenuBar *menub - - menubar->priv->info = NULL; - -- menubar->priv->applications_menu = create_applications_menu ("applications.menu", NULL, TRUE); -+ menubar->priv->applications_menu = create_applications_menu ("gnome-applications.menu", NULL, TRUE); - - menubar->priv->applications_item = panel_image_menu_item_new (); - gtk_menu_item_set_label (GTK_MENU_ITEM (menubar->priv->applications_item), -diff -up gnome-panel-3.1.5/gnome-panel/panel-menu-button.c.menus gnome-panel-3.1.5/gnome-panel/panel-menu-button.c ---- gnome-panel-3.1.5/gnome-panel/panel-menu-button.c.menus 2011-08-01 13:39:56.000000000 -0400 -+++ gnome-panel-3.1.5/gnome-panel/panel-menu-button.c 2011-08-17 18:58:26.345620917 -0400 -@@ -74,7 +74,7 @@ typedef struct { - } MenuPathRootItem; - - static MenuPathRootItem root_items [] = { -- { APPLICATIONS_MENU, "applications", "applications.menu" }, -+ { APPLICATIONS_MENU, "applications", "gnome-applications.menu" }, - { GNOMECC_MENU, "gnomecc", "gnomecc.menu" } - }; - -diff -up gnome-panel-3.1.5/gnome-panel/panel-run-dialog.c.menus gnome-panel-3.1.5/gnome-panel/panel-run-dialog.c ---- gnome-panel-3.1.5/gnome-panel/panel-run-dialog.c.menus 2011-08-01 13:39:56.000000000 -0400 -+++ gnome-panel-3.1.5/gnome-panel/panel-run-dialog.c 2011-08-17 18:59:14.635653222 -0400 -@@ -781,7 +781,7 @@ get_all_applications (void) - GMenuTreeDirectory *root; - GSList *retval; - -- tree = gmenu_tree_new ("applications.menu", GMENU_TREE_FLAGS_SORT_DISPLAY_NAME); -+ tree = gmenu_tree_new ("gnome-applications.menu", GMENU_TREE_FLAGS_SORT_DISPLAY_NAME); - - if (!gmenu_tree_load_sync (tree, NULL)) - return NULL; diff --git a/gnome-panel-vendor.patch b/gnome-panel-vendor.patch deleted file mode 100644 index e52a18a..0000000 --- a/gnome-panel-vendor.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -up gnome-panel-2.27.91/gnome-panel/panel-menu-items.c.vendor gnome-panel-2.27.91/gnome-panel/panel-menu-items.c ---- gnome-panel-2.27.91/gnome-panel/panel-menu-items.c.vendor 2009-08-19 15:59:57.000000000 -0400 -+++ gnome-panel-2.27.91/gnome-panel/panel-menu-items.c 2009-08-25 11:32:39.980266025 -0400 -@@ -1038,7 +1038,7 @@ panel_place_menu_item_create_menu (Panel - COMPUTER_NAME_KEY, - NULL); - panel_menu_items_append_from_desktop (places_menu, -- "nautilus-computer.desktop", -+ "gnome-nautilus-computer.desktop", - gconf_name, - TRUE); - if (gconf_name) -@@ -1048,7 +1048,7 @@ panel_place_menu_item_create_menu (Panel - add_menu_separator (places_menu); - - panel_menu_items_append_from_desktop (places_menu, -- "network-scheme.desktop", -+ "gnome-network-scheme.desktop", - NULL, - TRUE); - panel_place_menu_item_append_remote_gio (place_item, places_menu); -@@ -1157,7 +1157,7 @@ panel_desktop_menu_item_append_menu (Gtk - if (add_separator) - add_menu_separator (menu); - -- panel_menu_items_append_from_desktop (menu, "yelp.desktop", NULL, FALSE); -+ panel_menu_items_append_from_desktop (menu, "gnome-yelp.desktop", NULL, FALSE); - panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL, FALSE); - - if (parent->priv->append_lock_logout) diff --git a/gnome-panel.spec b/gnome-panel.spec index 380feee..2d74188 100644 --- a/gnome-panel.spec +++ b/gnome-panel.spec @@ -4,7 +4,7 @@ %define glib2_version 2.31.14 %define gtk3_version 3.3.8 %define libwnck_version 2.91.6 -%define gnome_menus_version 3.1.4 +%define gnome_menus_version 3.7.90 %define evolution_data_server_version 3.5.3 %define cairo_version 1.0.0 %define dbus_version 1.1.2 @@ -16,24 +16,15 @@ Summary: GNOME panel Name: gnome-panel -Version: 3.6.2 -Release: 6%{?dist} +Version: 3.8.1 +Release: 1%{?dist} URL: http://www.gnome.org #VCS: git:git://git.gnome.org/gnome-panel -Source0: http://download.gnome.org/sources/gnome-panel/3.6/%{name}-%{version}.tar.xz +Source0: http://download.gnome.org/sources/gnome-panel/3.8/%{name}-%{version}.tar.xz # https://bugzilla.gnome.org/show_bug.cgi?id=646749 Patch0: Use-16px-menu-icons.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=685142 -Patch1: gnome-panel-use-gnome-menus.patch - -# https://bugzilla.redhat.com/show_bug.cgi?id=890219 -Patch2: drop-gweather-xml-include.patch - -# https://bugzilla.gnome.org/show_bug.cgi?id=690353 -Patch3: na-style-realize.patch - License: GPLv2+ and LGPLv2+ and GFDL Group: User Interface/Desktops @@ -154,14 +145,12 @@ Panel Applets using the libpanel-applet library. %prep %setup -q -n %{name}-%{version} %patch0 -p1 -b .16px -%patch1 -p1 -b .menus -%patch2 -p0 -b .gweather -%patch3 -p1 -b .na-style rm -f libtool autoreconf -i -f %build %configure \ + --libexecdir=%{_libexecdir}/%{name} \ --disable-gtk-doc \ %if %{use_evolution_data_server} --enable-eds=yes @@ -186,6 +175,10 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL rm -rf $RPM_BUILD_ROOT/var/scrollkeeper find $RPM_BUILD_ROOT -name '*.*a' -delete; +# provided by gnome-flashback +rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome-session/sessions +rm -rf $RPM_BUILD_ROOT%{_datadir}/xsessions + desktop-file-install --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ $RPM_BUILD_ROOT%{_datadir}/applications/gnome-panel.desktop @@ -223,7 +216,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || : %{_datadir}/applications/gnome-panel.desktop %{_bindir}/gnome-panel %{_bindir}/gnome-desktop-item-edit -%{_libexecdir}/* +%{_libexecdir}/%{name}/ %{_datadir}/dbus-1/services/org.gnome.panel.applet.ClockAppletFactory.service %{_datadir}/dbus-1/services/org.gnome.panel.applet.FishAppletFactory.service @@ -254,6 +247,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || : %{_datadir}/gir-1.0/PanelApplet-4.0.gir %changelog +* Sun Jan 11 2015 Yaakov Selkowitz - 3.8.1-1 +- Version bump for GNOME Flashback 3.10. + * Thu Feb 14 2013 Fedora Release Engineering - 3.6.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/icon-padding.patch b/icon-padding.patch deleted file mode 100644 index 5ccf4c0..0000000 --- a/icon-padding.patch +++ /dev/null @@ -1,255 +0,0 @@ -diff -u -r gnome-panel-2.28.0/applets/notification_area/main.c hacked/applets/notification_area/main.c ---- gnome-panel-2.28.0/applets/notification_area/main.c 2009-07-01 09:06:23.000000000 -0400 -+++ hacked/applets/notification_area/main.c 2009-10-17 23:06:01.001313433 -0400 -@@ -25,6 +25,7 @@ - - #include - #include -+#include - - #include - #include -@@ -34,6 +35,7 @@ - #include "fixedtip.h" - - #define NOTIFICATION_AREA_ICON "gnome-panel-notification-area" -+#define SCHEMA_DIR "/schemas/apps/notification_area_applet/prefs" - - typedef struct - { -@@ -231,6 +233,39 @@ - gtk_widget_set_name (widget, "na-tray"); - } - -+static void -+padding_changed (GConfClient *client, -+ guint cnxn_id, -+ GConfEntry *entry, -+ gpointer user_data) -+{ -+ AppletData *data = user_data; -+ gint value; -+ -+ if (!entry->value || entry->value->type != GCONF_VALUE_INT) -+ return; -+ -+ value = gconf_value_get_int (entry->value); -+ -+ na_tray_set_padding (data->tray, value); -+} -+ -+static void -+setup_gconf (AppletData *data) -+{ -+ GConfClient *client; -+ char *key; -+ int value; -+ -+ client = gconf_client_get_default (); -+ key = panel_applet_gconf_get_full_key (data->applet, "padding"); -+ value = gconf_client_get_int (client, key, NULL); -+ na_tray_set_padding (data->tray, value); -+ gconf_client_notify_add (client, key, padding_changed, data, NULL, NULL); -+ g_free (key); -+ g_object_unref (client); -+} -+ - static gboolean - applet_factory (PanelApplet *applet, - const gchar *iid, -@@ -260,9 +295,10 @@ - atko = gtk_widget_get_accessible (GTK_WIDGET (applet)); - atk_object_set_name (atko, _("Panel Notification Area")); - -+ panel_applet_add_preferences (applet, SCHEMA_DIR, NULL); - panel_applet_set_flags (applet, - PANEL_APPLET_HAS_HANDLE|PANEL_APPLET_EXPAND_MINOR); -- -+ - g_signal_connect (applet, "change_orient", - G_CALLBACK (applet_change_orientation), data); - g_signal_connect (applet, "change_background", -@@ -270,6 +306,8 @@ - g_signal_connect (applet, "destroy", - G_CALLBACK (applet_destroy), data); - -+ setup_gconf (data); -+ - panel_applet_set_background_widget (applet, GTK_WIDGET (applet)); - - gtk_container_add (GTK_CONTAINER (applet), GTK_WIDGET (tray)); -diff -u -r gnome-panel-2.28.0/applets/notification_area/Makefile.am hacked/applets/notification_area/Makefile.am ---- gnome-panel-2.28.0/applets/notification_area/Makefile.am 2009-07-21 13:25:43.000000000 -0400 -+++ hacked/applets/notification_area/Makefile.am 2009-10-17 23:16:42.401072682 -0400 -@@ -66,6 +66,24 @@ - - @INTLTOOL_SERVER_RULE@ - -+schemasdir = $(GCONF_SCHEMA_FILE_DIR) -+schemas_in_files = notification_area_applet.schemas.in -+schemas_DATA = $(schemas_in_files:.schemas.in=.schemas) -+ -+@INTLTOOL_SCHEMAS_RULE@ -+ -+if GCONF_SCHEMAS_INSTALL -+# don't do this if we are building in eg. rpm -+install-data-local: -+ if test -z "$(DESTDIR)" ; then \ -+ for p in $(schemas_DATA) ; do \ -+ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/applets/notification_area/$$p ; \ -+ done \ -+ fi -+else -+install-data-local: -+endif -+ - uidir = $(datadir)/gnome-2.0/ui - ui_DATA = GNOME_NotificationAreaApplet.xml - -diff -u -r gnome-panel-2.28.0/applets/notification_area/na-tray.c hacked/applets/notification_area/na-tray.c ---- gnome-panel-2.28.0/applets/notification_area/na-tray.c 2009-10-17 23:22:01.095308064 -0400 -+++ hacked/applets/notification_area/na-tray.c 2009-10-17 23:00:01.304062848 -0400 -@@ -602,6 +602,8 @@ - { - trays_screens [screen_number].tray_manager = tray_manager; - -+ na_tray_manager_set_padding (tray_manager, 0); -+ - g_signal_connect (tray_manager, "tray_icon_added", - G_CALLBACK (tray_added), - &trays_screens [screen_number]); -@@ -804,6 +806,16 @@ - } - - void -+na_tray_set_padding (NaTray *tray, -+ gint padding) -+{ -+ NaTrayPrivate *priv = tray->priv; -+ -+ if (get_tray (priv->trays_screen) == tray) -+ na_tray_manager_set_padding (priv->trays_screen->tray_manager, padding); -+} -+ -+void - na_tray_force_redraw (NaTray *tray) - { - NaTrayPrivate *priv = tray->priv; -diff -u -r gnome-panel-2.28.0/applets/notification_area/na-tray.h hacked/applets/notification_area/na-tray.h ---- gnome-panel-2.28.0/applets/notification_area/na-tray.h 2009-04-19 13:45:09.000000000 -0400 -+++ hacked/applets/notification_area/na-tray.h 2009-10-17 23:00:30.491375187 -0400 -@@ -60,6 +60,8 @@ - void na_tray_set_orientation (NaTray *tray, - GtkOrientation orientation); - GtkOrientation na_tray_get_orientation (NaTray *tray); -+void na_tray_set_padding (NaTray *tray, -+ gint padding); - void na_tray_force_redraw (NaTray *tray); - - G_END_DECLS -diff -u -r gnome-panel-2.28.0/applets/notification_area/na-tray-manager.c hacked/applets/notification_area/na-tray-manager.c ---- gnome-panel-2.28.0/applets/notification_area/na-tray-manager.c 2009-07-27 08:01:39.000000000 -0400 -+++ hacked/applets/notification_area/na-tray-manager.c 2009-10-17 21:55:00.582062966 -0400 -@@ -653,6 +653,32 @@ - #endif - } - -+static void -+na_tray_manager_set_padding_property (NaTrayManager *manager) -+{ -+#ifdef GDK_WINDOWING_X11 -+ GdkDisplay *display; -+ Atom orientation_atom; -+ gulong data[1]; -+ -+ if (!manager->invisible || !manager->invisible->window) -+ return; -+ -+ display = gtk_widget_get_display (manager->invisible); -+ orientation_atom = gdk_x11_get_xatom_by_name_for_display (display, -+ "_NET_SYSTEM_TRAY_PADDING"); -+ -+ data[0] = manager->padding; -+ -+ XChangeProperty (GDK_DISPLAY_XDISPLAY (display), -+ GDK_WINDOW_XWINDOW (manager->invisible->window), -+ orientation_atom, -+ XA_CARDINAL, 32, -+ PropModeReplace, -+ (guchar *) &data, 1); -+#endif -+} -+ - #ifdef GDK_WINDOWING_X11 - - static gboolean -@@ -697,6 +723,7 @@ - - na_tray_manager_set_orientation_property (manager); - na_tray_manager_set_visual_property (manager); -+ na_tray_manager_set_padding_property (manager); - - timestamp = gdk_x11_get_server_time (invisible->window); - -@@ -836,6 +863,20 @@ - } - } - -+void -+na_tray_manager_set_padding (NaTrayManager *manager, -+ gint padding) -+{ -+ g_return_if_fail (NA_IS_TRAY_MANAGER (manager)); -+ -+ if (manager->padding != padding) -+ { -+ manager->padding = padding; -+ -+ na_tray_manager_set_padding_property (manager); -+ } -+} -+ - GtkOrientation - na_tray_manager_get_orientation (NaTrayManager *manager) - { -diff -u -r gnome-panel-2.28.0/applets/notification_area/na-tray-manager.h hacked/applets/notification_area/na-tray-manager.h ---- gnome-panel-2.28.0/applets/notification_area/na-tray-manager.h 2009-04-19 13:45:09.000000000 -0400 -+++ hacked/applets/notification_area/na-tray-manager.h 2009-10-17 21:55:42.646312700 -0400 -@@ -55,6 +55,7 @@ - GtkWidget *invisible; - GdkScreen *screen; - GtkOrientation orientation; -+ gint padding; - - GList *messages; - GHashTable *socket_table; -@@ -91,6 +92,8 @@ - void na_tray_manager_set_orientation (NaTrayManager *manager, - GtkOrientation orientation); - GtkOrientation na_tray_manager_get_orientation (NaTrayManager *manager); -+void na_tray_manager_set_padding (NaTrayManager *manager, -+ gint padding); - - G_END_DECLS - -diff -u -r gnome-panel-2.28.0/applets/notification_area/notification_area_applet.schemas.in hacked/applets/notification_area/notification_area_applet.schemas.in ---- gnome-panel-2.28.0/applets/notification_area/notification_area_applet.schemas.in 2009-10-17 23:23:41.071058057 -0400 -+++ hacked/applets/notification_area/notification_area_applet.schemas.in 2009-10-17 23:21:38.588316399 -0400 -@@ -0,0 +1,17 @@ -+ -+ -+ -+ -+ /schemas/apps/notification_area_applet/prefs/padding -+ notification-area-applet -+ int -+ 3 -+ -+ Padding -+ -+ This key specifies padding to be put around status icons. -+ -+ -+ -+ -+ diff --git a/launcher-desktop-files.patch b/launcher-desktop-files.patch deleted file mode 100644 index ab2d715..0000000 --- a/launcher-desktop-files.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff -up gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c.launcher-desktop-files gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c ---- gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c.launcher-desktop-files 2010-01-13 22:26:27.000000000 -0500 -+++ gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c 2010-01-17 18:05:34.492279538 -0500 -@@ -960,6 +960,51 @@ panel_ditem_editor_icon_changed (PanelDI - icon); - } - -+static gboolean -+update_editor_from_desktop_file (PanelDItemEditor *dialog, -+ const gchar *uri) -+{ -+ GKeyFile *key_file; -+ char *name; -+ char *comment; -+ char *exec; -+ char *icon; -+ gboolean retval = FALSE; -+ -+ key_file = g_key_file_new (); -+ if (g_key_file_load_from_file (key_file, uri, 0, NULL)) { -+ if (panel_key_file_get_boolean (key_file, "Terminal", FALSE)) -+ gtk_combo_box_set_active (GTK_COMBO_BOX (dialog->priv->type_combo), 1); -+ else -+ gtk_combo_box_set_active (GTK_COMBO_BOX (dialog->priv->type_combo), 0); -+ -+ name = panel_key_file_get_locale_string (key_file, "Name"); -+ comment = panel_key_file_get_locale_string (key_file, "Comment"); -+ icon = panel_key_file_get_locale_string (key_file, "Icon"); -+ exec = panel_key_file_get_string (key_file, "Exec"); -+ -+ gtk_entry_set_text (GTK_ENTRY (dialog->priv->name_entry), name ? name : ""); -+ gtk_entry_set_text (GTK_ENTRY (dialog->priv->comment_entry), comment ? comment : ""); -+ gtk_entry_set_text (GTK_ENTRY (dialog->priv->command_entry), exec ? exec : ""); -+ -+ /* Note: we need to set the icon last, since the editor -+ * tries to guess the icon when the command is modified -+ */ -+ setup_icon_chooser (dialog, icon); -+ -+ g_free (name); -+ g_free (comment); -+ g_free (icon); -+ g_free (exec); -+ -+ retval = TRUE; -+ } -+ -+ g_key_file_free (key_file); -+ -+ return retval; -+} -+ - static void - command_browse_chooser_response (GtkFileChooser *chooser, - gint response_id, -@@ -973,7 +1018,11 @@ command_browse_chooser_response (GtkFile - case PANEL_DITEM_EDITOR_TYPE_APPLICATION: - case PANEL_DITEM_EDITOR_TYPE_TERMINAL_APPLICATION: - text = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (chooser)); -- uri = panel_util_make_exec_uri_for_desktop (text); -+ if (g_str_has_suffix (text, ".desktop") && -+ update_editor_from_desktop_file (dialog, text)) -+ uri = NULL; -+ else -+ uri = panel_util_make_exec_uri_for_desktop (text); - g_free (text); - break; - case PANEL_DITEM_EDITOR_TYPE_LINK: -@@ -983,8 +1032,9 @@ command_browse_chooser_response (GtkFile - g_assert_not_reached (); - } - -- gtk_entry_set_text (GTK_ENTRY (dialog->priv->command_entry), -- uri); -+ if (uri) -+ gtk_entry_set_text (GTK_ENTRY (dialog->priv->command_entry), -+ uri); - g_free (uri); - } - diff --git a/na-style-realize.patch b/na-style-realize.patch deleted file mode 100644 index fb7bd40..0000000 --- a/na-style-realize.patch +++ /dev/null @@ -1,47 +0,0 @@ -From f1652b60a9fa0580c5fc60758c3ccdfcf691b5c2 Mon Sep 17 00:00:00 2001 -From: Daniel Drake -Date: Mon, 17 Dec 2012 14:58:20 +0000 -Subject: [PATCH] na: apply style after realize - -Under Fedora 18 (GTK-3.6.2), notification icons such as the battery/power -icon from gnome-settings-daemon are appearing all-black on top of a black -background. - -This is because style_updated is being called before the tray applet -is realized, meaning that the following code in -na_tray_applet_style_updated() causes a bail-out: - - if (!applet->priv->tray) - return; - -and the style is never applied. - -Fix this by updating the style explicitly after realizing the widget. ---- - applets/notification_area/main.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/applets/notification_area/main.c b/applets/notification_area/main.c -index 5fc4d1d..0d5de70 100644 ---- a/applets/notification_area/main.c -+++ b/applets/notification_area/main.c -@@ -36,6 +36,8 @@ - - #define NOTIFICATION_AREA_ICON "gnome-panel-notification-area" - -+static void na_tray_applet_style_updated (GtkWidget *widget); -+ - struct _NaTrayAppletPrivate - { - NaTray *tray; -@@ -79,6 +81,7 @@ na_tray_applet_realize (GtkWidget *widget) - - gtk_container_add (GTK_CONTAINER (widget), GTK_WIDGET (applet->priv->tray)); - gtk_widget_show (GTK_WIDGET (applet->priv->tray)); -+ na_tray_applet_style_updated (widget); - } - - static void --- -1.8.0.1 - diff --git a/panel-padding.patch b/panel-padding.patch deleted file mode 100644 index 90dad4b..0000000 --- a/panel-padding.patch +++ /dev/null @@ -1,343 +0,0 @@ -diff -up gnome-panel-2.28.0/gnome-panel/panel-profile.c.panel-padding gnome-panel-2.28.0/gnome-panel/panel-profile.c ---- gnome-panel-2.28.0/gnome-panel/panel-profile.c.panel-padding 2009-09-21 12:29:33.000000000 -0400 -+++ gnome-panel-2.28.0/gnome-panel/panel-profile.c 2009-10-29 09:57:25.285484907 -0400 -@@ -638,6 +638,7 @@ TOPLEVEL_IS_WRITABLE_FUNC ("orientation" - - TOPLEVEL_GET_SET_FUNCS ("size", toplevel, int, size, int) - TOPLEVEL_GET_SET_FUNCS ("expand", toplevel, bool, expand, gboolean) -+TOPLEVEL_GET_SET_FUNCS ("padding", toplevel, int, padding, int) - TOPLEVEL_GET_SET_FUNCS ("auto_hide", toplevel, bool, auto_hide, gboolean) - TOPLEVEL_GET_SET_FUNCS ("enable_buttons", toplevel, bool, enable_buttons, gboolean) - TOPLEVEL_GET_SET_FUNCS ("enable_arrows", toplevel, bool, enable_arrows, gboolean) -@@ -1185,6 +1186,7 @@ panel_profile_toplevel_change_notify (GC - else UPDATE_INT ("monitor", monitor) - else UPDATE_STRING ("name", name) - else UPDATE_BOOL ("expand", expand) -+ else UPDATE_INT ("padding", padding) - else UPDATE_STRING ("orientation", orientation) - else UPDATE_INT ("size", size) - else UPDATE_POS ("x", x, x_right) -@@ -1706,6 +1708,7 @@ panel_profile_load_toplevel (GConfClient - GET_STRING ("name", name); - GET_INT ("monitor", monitor); - GET_BOOL ("expand", expand); -+ GET_INT ("padding", padding); - GET_STRING ("orientation", orientation); - GET_INT ("size", size); - GET_BOOL ("auto_hide", auto_hide); -diff -up gnome-panel-2.28.0/gnome-panel/panel-profile.h.panel-padding gnome-panel-2.28.0/gnome-panel/panel-profile.h ---- gnome-panel-2.28.0/gnome-panel/panel-profile.h.panel-padding 2009-04-19 13:45:09.000000000 -0400 -+++ gnome-panel-2.28.0/gnome-panel/panel-profile.h 2009-10-29 09:57:25.285484907 -0400 -@@ -92,7 +92,10 @@ void panel_profile_set_toplevel_e - gboolean expand); - gboolean panel_profile_get_toplevel_expand (PanelToplevel *toplevel); - gboolean panel_profile_is_writable_toplevel_expand (PanelToplevel *toplevel); -- -+void panel_profile_set_toplevel_padding (PanelToplevel *toplevel, -+ int padding); -+int panel_profile_get_toplevel_padding (PanelToplevel *padding); -+gboolean panel_profile_is_writable_toplevel_padding (PanelToplevel *toplevel); - void panel_profile_set_toplevel_auto_hide (PanelToplevel *toplevel, - gboolean auto_hide); - gboolean panel_profile_get_toplevel_auto_hide (PanelToplevel *toplevel); -diff -up gnome-panel-2.28.0/gnome-panel/panel-toplevel.c.panel-padding gnome-panel-2.28.0/gnome-panel/panel-toplevel.c ---- gnome-panel-2.28.0/gnome-panel/panel-toplevel.c.panel-padding 2009-08-21 06:31:49.000000000 -0400 -+++ gnome-panel-2.28.0/gnome-panel/panel-toplevel.c 2009-10-29 09:57:25.287500667 -0400 -@@ -79,6 +79,7 @@ struct _PanelToplevelPrivate { - gboolean expand; - PanelOrientation orientation; - int size; -+ int padding; - - /* relative to the monitor origin */ - int x; -@@ -213,6 +214,7 @@ enum { - PROP_0, - PROP_NAME, - PROP_EXPAND, -+ PROP_PADDING, - PROP_ORIENTATION, - PROP_SIZE, - PROP_X, -@@ -3862,6 +3864,9 @@ panel_toplevel_set_property (GObject - case PROP_EXPAND: - panel_toplevel_set_expand (toplevel, g_value_get_boolean (value)); - break; -+ case PROP_PADDING: -+ panel_toplevel_set_padding (toplevel, g_value_get_int (value)); -+ break; - case PROP_ORIENTATION: - panel_toplevel_set_orientation (toplevel, g_value_get_enum (value)); - break; -@@ -3956,6 +3961,9 @@ panel_toplevel_get_property (GObject - case PROP_EXPAND: - g_value_set_boolean (value, toplevel->priv->expand); - break; -+ case PROP_PADDING: -+ g_value_set_int (value, toplevel->priv->padding); -+ break; - case PROP_ORIENTATION: - g_value_set_enum (value, toplevel->priv->orientation); - break; -@@ -4118,6 +4126,18 @@ panel_toplevel_class_init (PanelToplevel - - g_object_class_install_property ( - gobject_class, -+ PROP_PADDING, -+ g_param_spec_int ( -+ "padding", -+ "Padding", -+ "Padding that is inserted between objects", -+ 0, -+ G_MAXINT, -+ 0, -+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); -+ -+ g_object_class_install_property ( -+ gobject_class, - PROP_ORIENTATION, - g_param_spec_enum ( - "orientation", -@@ -4698,6 +4718,30 @@ panel_toplevel_get_expand (PanelToplevel - return toplevel->priv->expand; - } - -+void -+panel_toplevel_set_padding (PanelToplevel *toplevel, -+ int padding) -+{ -+ g_return_if_fail (PANEL_IS_TOPLEVEL (toplevel)); -+ -+ if (toplevel->priv->padding == padding) -+ return; -+ -+ toplevel->priv->padding = padding; -+ -+ gtk_widget_queue_resize (GTK_WIDGET (toplevel)); -+ -+ g_object_notify (G_OBJECT (toplevel), "padding"); -+} -+ -+int -+panel_toplevel_get_padding (PanelToplevel *toplevel) -+{ -+ g_return_val_if_fail (PANEL_IS_TOPLEVEL (toplevel), 0); -+ -+ return toplevel->priv->padding; -+} -+ - gboolean - panel_toplevel_get_is_floating (PanelToplevel *toplevel) - { -diff -up gnome-panel-2.28.0/gnome-panel/panel-toplevel.h.panel-padding gnome-panel-2.28.0/gnome-panel/panel-toplevel.h ---- gnome-panel-2.28.0/gnome-panel/panel-toplevel.h.panel-padding 2009-08-19 11:28:09.000000000 -0400 -+++ gnome-panel-2.28.0/gnome-panel/panel-toplevel.h 2009-10-29 09:57:25.288484940 -0400 -@@ -83,6 +83,9 @@ G_CONST_RETURN char *panel_toplevel_get_ - void panel_toplevel_set_expand (PanelToplevel *toplevel, - gboolean expand); - gboolean panel_toplevel_get_expand (PanelToplevel *toplevel); -+void panel_toplevel_set_padding (PanelToplevel *toplevel, -+ int padding); -+int panel_toplevel_get_padding (PanelToplevel *toplevel); - void panel_toplevel_set_orientation (PanelToplevel *toplevel, - PanelOrientation orientation); - PanelOrientation panel_toplevel_get_orientation (PanelToplevel *toplevel); -diff -up gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in.panel-padding gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in ---- gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in.panel-padding 2009-07-01 09:06:23.000000000 -0400 -+++ gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in 2009-10-29 09:57:25.288484940 -0400 -@@ -103,6 +103,19 @@ - - - -+ /schemas/apps/panel/toplevels/padding -+ panel -+ int -+ 0 -+ -+ Padding -+ -+ Padding that will be inserted between objects on this panel. -+ -+ -+ -+ -+ - /schemas/apps/panel/toplevels/x - panel - int -diff -up gnome-panel-2.28.0/gnome-panel/panel-widget.c.panel-padding gnome-panel-2.28.0/gnome-panel/panel-widget.c ---- gnome-panel-2.28.0/gnome-panel/panel-widget.c.panel-padding 2009-08-11 07:32:38.000000000 -0400 -+++ gnome-panel-2.28.0/gnome-panel/panel-widget.c 2009-10-29 10:10:43.531226534 -0400 -@@ -710,9 +710,12 @@ panel_widget_switch_applet_right (PanelW - { - AppletData *ad; - AppletData *nad = NULL; -- -+ gint padding; -+ - g_assert (list != NULL); - -+ padding = panel_toplevel_get_padding (panel->toplevel); -+ - ad = list->data; - if (ad->constrained + ad->min_cells >= panel->size) - return; -@@ -720,8 +723,8 @@ panel_widget_switch_applet_right (PanelW - if (list->next) - nad = list->next->data; - -- if (!nad || nad->constrained >= ad->constrained + ad->min_cells + MOVE_INCREMENT) { -- ad->pos = ad->constrained += MOVE_INCREMENT; -+ if (!nad || nad->constrained >= ad->constrained + ad->min_cells + MOVE_INCREMENT + padding) { -+ ad->pos = ad->constrained += MOVE_INCREMENT + padding; - gtk_widget_queue_resize (GTK_WIDGET (panel)); - emit_applet_moved (panel, ad); - return; -@@ -786,6 +789,9 @@ panel_widget_switch_applet_left (PanelWi - { - AppletData *ad; - AppletData *pad = NULL; -+ gint padding; -+ -+ padding = panel_toplevel_get_padding (panel->toplevel); - - ad = list->data; - if (ad->constrained <= 0) -@@ -794,8 +800,8 @@ panel_widget_switch_applet_left (PanelWi - if (list->prev) - pad = list->prev->data; - -- if (!pad || pad->constrained + pad->min_cells <= ad->constrained - MOVE_INCREMENT) { -- ad->pos = ad->constrained -= MOVE_INCREMENT; -+ if (!pad || pad->constrained + pad->min_cells <= ad->constrained - MOVE_INCREMENT - padding) { -+ ad->pos = ad->constrained -= MOVE_INCREMENT + padding; - gtk_widget_queue_resize (GTK_WIDGET (panel)); - emit_applet_moved (panel, ad); - return; -@@ -874,15 +880,18 @@ panel_widget_get_right_switch_pos (Panel - { - AppletData *ad; - AppletData *nad = NULL; -+ gint padding; - - g_assert (list != NULL); - -+ padding = panel_toplevel_get_padding (panel->toplevel); -+ - ad = list->data; - if (list->next) - nad = list->next->data; - -- if (!nad || nad->constrained >= ad->constrained + ad->min_cells + MOVE_INCREMENT) -- return ad->constrained + MOVE_INCREMENT; -+ if (!nad || nad->constrained >= ad->constrained + ad->min_cells + MOVE_INCREMENT + padding) -+ return ad->constrained + MOVE_INCREMENT + padding; - - if (nad->locked) - return panel_widget_get_right_jump_pos (panel, -@@ -948,15 +957,18 @@ panel_widget_get_left_switch_pos (PanelW - { - AppletData *ad; - AppletData *pad = NULL; -+ gint padding; - - g_assert (list != NULL); - -+ padding = panel_toplevel_get_padding (panel->toplevel); -+ - ad = list->data; - if (list->prev) - pad = list->prev->data; - -- if (!pad || pad->constrained + pad->min_cells <= ad->constrained - MOVE_INCREMENT) -- return ad->constrained - MOVE_INCREMENT; -+ if (!pad || pad->constrained + pad->min_cells <= ad->constrained - MOVE_INCREMENT - padding) -+ return ad->constrained - MOVE_INCREMENT - padding; - - if (pad->locked) - return panel_widget_get_left_jump_pos (panel, -@@ -1195,12 +1207,15 @@ panel_widget_size_request(GtkWidget *wid - GList *list; - GList *ad_with_hints; - gboolean dont_fill; -+ gint padding; - - g_return_if_fail(PANEL_IS_WIDGET(widget)); - g_return_if_fail(requisition!=NULL); - - panel = PANEL_WIDGET(widget); - -+ padding = panel_toplevel_get_padding (panel->toplevel); -+ - if(panel->orient == GTK_ORIENTATION_HORIZONTAL) { - requisition->width = 0; - requisition->height = panel->sz; -@@ -1224,8 +1239,11 @@ panel_widget_size_request(GtkWidget *wid - ad_with_hints = g_list_prepend (ad_with_hints, - ad); - -- else if (panel->packed) -+ else if (panel->packed) { -+ if (list != panel->applet_list) -+ requisition->width += padding; - requisition->width += chreq.width; -+ } - } else { - if (requisition->width < chreq.width && !ad->size_constrained) - requisition->width = chreq.width; -@@ -1234,8 +1252,11 @@ panel_widget_size_request(GtkWidget *wid - ad_with_hints = g_list_prepend (ad_with_hints, - ad); - -- else if (panel->packed) -+ else if (panel->packed) { -+ if (list != panel->applet_list) -+ requisition->height += padding; - requisition->height += chreq.height; -+ } - } - } - -@@ -1333,12 +1354,15 @@ panel_widget_size_allocate(GtkWidget *wi - int i; - int old_size; - gboolean ltr; -+ gint padding; - - g_return_if_fail(PANEL_IS_WIDGET(widget)); - g_return_if_fail(allocation!=NULL); - - panel = PANEL_WIDGET(widget); - -+ padding = panel_toplevel_get_padding (panel->toplevel); -+ - old_size = panel->size; - ltr = gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR; - -@@ -1404,7 +1428,7 @@ panel_widget_size_allocate(GtkWidget *wi - } - ad->min_cells = ad->cells; - gtk_widget_size_allocate(ad->applet,&challoc); -- i += ad->cells; -+ i += ad->cells + padding; - } - - /* EEEEK, there might be not enough room and we don't handle -@@ -1439,7 +1463,7 @@ panel_widget_size_allocate(GtkWidget *wi - if (ad->constrained < i) - ad->constrained = i; - -- i = ad->constrained + ad->cells; -+ i = ad->constrained + ad->cells + padding; - } - - /* Now expand from the right */ -@@ -1464,7 +1488,7 @@ panel_widget_size_allocate(GtkWidget *wi - ad->cells = cells; - } - -- i = ad->constrained; -+ i = ad->constrained - padding; - } - - /* EEEEK, there's not enough room, so shift applets even diff --git a/preferred-apps.patch b/preferred-apps.patch deleted file mode 100644 index 8f755d9..0000000 --- a/preferred-apps.patch +++ /dev/null @@ -1,272 +0,0 @@ -diff -up gnome-panel-2.25.3/gnome-panel/launcher.c.preferred-apps gnome-panel-2.25.3/gnome-panel/launcher.c ---- gnome-panel-2.25.3/gnome-panel/launcher.c.preferred-apps 2009-01-16 14:15:17.000000000 -0500 -+++ gnome-panel-2.25.3/gnome-panel/launcher.c 2009-01-16 14:24:06.000000000 -0500 -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -44,6 +45,7 @@ - #include "panel-compatibility.h" - #include "panel-ditem-editor.h" - #include "panel-icon-names.h" -+#include "panel-run-dialog.h" - - static GdkScreen * - launcher_get_screen (Launcher *launcher) -@@ -1215,3 +1217,189 @@ panel_launcher_set_dnd_enabled (Launcher - } else - gtk_drag_source_unset (launcher->button); - } -+ -+static gchar * -+find_desktop_file_from_exec (const gchar *exec) -+{ -+ GSList *all_applications, *l; -+ gchar *path = NULL; -+ gchar **tokens, **tokens2; -+ gint i, match = 0; -+ -+ /* FIXME no need to construct a humongous list here */ -+ all_applications = get_all_applications (); -+ -+ for (l = all_applications; l; l = l->next) { -+ GMenuTreeEntry *entry = l->data; -+ const char *entry_exec; -+ -+ entry_exec = gmenu_tree_entry_get_exec (entry); -+ -+ if (strcmp (exec, entry_exec) == 0) { -+ path = gmenu_tree_entry_get_desktop_file_path (entry); -+ break; -+ } -+ -+ tokens = g_strsplit (exec, " ", -1); -+ tokens2 = g_strsplit (entry_exec, " ", -1); -+ -+ for (i = 0; tokens[i] && tokens2[i]; i++) { -+ if (strcmp (tokens[i], tokens2[i]) != 0) -+ break; -+ } -+ if (i > match) { -+ match = i; -+ path = gmenu_tree_entry_get_desktop_file_path (entry); -+ } -+ -+ g_strfreev (tokens); -+ g_strfreev (tokens2); -+ } -+ -+ path = g_strdup (path); -+ g_slist_free (all_applications); -+ -+ return path; -+} -+ -+static void -+update_preferred_app (const gchar *filename, -+ const gchar *key, -+ const gchar *exec) -+{ -+ gchar *location; -+ GKeyFile *key_file; -+ GError *error = NULL; -+ gchar *data; -+ gsize len; -+ gboolean needs_terminal; -+ -+ location = find_desktop_file_from_exec (exec); -+ key_file = g_key_file_new (); -+ if (!panel_key_file_load_from_uri (key_file, location, -+ G_KEY_FILE_KEEP_COMMENTS|G_KEY_FILE_KEEP_TRANSLATIONS, -+ NULL)) { -+ /* FIXME would be much better if preferred apps were backed by desktop files */ -+ g_key_file_set_string (key_file, "Desktop Entry", "Version", "1.0"); -+ g_key_file_set_string (key_file, "Desktop Entry", "Encoding", "UTF-8"); -+ g_key_file_set_string (key_file, "Desktop Entry", "Type", "Application"); -+ g_key_file_set_string (key_file, "Desktop Entry", "Exec", exec); -+ if (strstr (key, "http")) { -+ g_key_file_set_string (key_file, "Desktop Entry", "Name", "Preferred Web Browser"); -+ g_key_file_set_string (key_file, "Desktop Entry", "GenericName", "Web Browser"); -+ g_key_file_set_string (key_file, "Desktop Entry", "Comment", "Browse the Web"); -+ g_key_file_set_string (key_file, "Desktop Entry", "Icon", "redhat-web-browser.png"); -+ if (strstr (exec, "%s")) { -+ gchar *exec2, *s; -+ -+ exec2 = g_strdup (exec); -+ s = strstr (exec2, "%s"); -+ s[1] = 'u'; -+ -+ g_key_file_set_string (key_file, "Desktop Entry", "Exec", exec2); -+ g_free (exec2); -+ -+ } -+ } -+ else if (strstr (key, "mailto")) { -+ g_key_file_set_string (key_file, "Desktop Entry", "Name", "Preferred Mail Reader"); -+ g_key_file_set_string (key_file, "Desktop Entry", "GenericName", "Mail Reader"); -+ g_key_file_set_string (key_file, "Desktop Entry", "Comment", "Send email"); -+ g_key_file_set_string (key_file, "Desktop Entry", "Icon", "redhat-email.png"); -+ } -+ if (g_str_has_suffix (key, "command")) { -+ int len; -+ char *key2; -+ -+ len = strlen (key); -+ key2 = g_new (char, len - strlen ("command") + strlen ("needs_terminal") + 1); -+ strncpy (key2, key, len - strlen ("command")); -+ strcpy (key2 + len - strlen ("command"), "needs_terminal"); -+ needs_terminal = gconf_client_get_bool (panel_gconf_get_client (), -+ key2, -+ NULL); -+ g_free (key2); -+ } -+ else -+ needs_terminal = FALSE; -+ g_key_file_set_boolean (key_file, "Desktop Entry", "Terminal", needs_terminal); -+ } -+ -+ g_free (location); -+ -+ g_key_file_set_boolean (key_file, "Desktop Entry", "X-Panel-Monitor", TRUE); -+ g_key_file_set_boolean (key_file, "Desktop Entry", "NoDisplay", TRUE); -+ -+ data = g_key_file_to_data (key_file, &len, &error); -+ if (error) { -+ g_printerr (_("Failed to convert data for '%s': %s"), -+ filename, error->message); -+ g_error_free (error); -+ g_key_file_free (key_file); -+ -+ return; -+ } -+ if (!g_file_set_contents (filename, data, len, &error)) { -+ g_printerr (_("Failed to save '%s': %s"), -+ filename, error->message); -+ g_error_free (error); -+ } -+ -+ g_key_file_free (key_file); -+ g_free (data); -+} -+ -+static void -+preferred_app_changed (GConfClient *client, -+ gint notify_id, -+ GConfEntry *entry, -+ const gchar *filename) -+{ -+ update_preferred_app (filename, -+ gconf_entry_get_key (entry), -+ gconf_value_get_string (entry->value)); -+} -+ -+void -+panel_preferred_apps_init (void) -+{ -+ GConfClient *client; -+ gchar *dirname, *filename, *exec; -+ gint i; -+ -+ const gchar *keys[] = { -+ "/desktop/gnome/url-handlers/http/command", -+ "/desktop/gnome/url-handlers/mailto/command", -+ NULL }; -+ const gchar *files[] = { -+ "preferred-web-browser.desktop", -+ "preferred-mail-reader.desktop", -+ NULL }; -+ -+ client = panel_gconf_get_client (); -+ -+ gconf_client_add_dir (client, -+ "/desktop/gnome/url-handlers", -+ GCONF_CLIENT_PRELOAD_NONE, -+ NULL); -+ -+ for (i = 0; keys[i]; i++) { -+ dirname = g_build_filename (g_get_user_data_dir (), -+ "applications", NULL); -+ filename = g_build_filename (dirname, files[i], NULL); -+ if (!g_file_test (filename, G_FILE_TEST_EXISTS)) { -+ -+ if (!g_file_test (dirname, G_FILE_TEST_EXISTS)) -+ g_mkdir_with_parents (dirname, 0755); -+ -+ exec = gconf_client_get_string (client, keys[i], NULL); -+ update_preferred_app (filename, keys[i], exec); -+ g_free (exec); -+ } -+ g_free (dirname); -+ -+ gconf_client_notify_add (client, keys[i], -+ (GConfClientNotifyFunc) preferred_app_changed, -+ filename, g_free, NULL); -+ } -+} -diff -up gnome-panel-2.25.3/gnome-panel/launcher.h.preferred-apps gnome-panel-2.25.3/gnome-panel/launcher.h ---- gnome-panel-2.25.3/gnome-panel/launcher.h.preferred-apps 2009-01-16 14:15:17.000000000 -0500 -+++ gnome-panel-2.25.3/gnome-panel/launcher.h 2009-01-16 14:15:17.000000000 -0500 -@@ -14,6 +14,8 @@ - #include "applet.h" - #include "panel-widget.h" - -+#include -+ - G_BEGIN_DECLS - - typedef struct { -@@ -71,6 +73,7 @@ void launcher_properties_dest - void panel_launcher_set_dnd_enabled (Launcher *launcher, - gboolean dnd_enabled); - -+void panel_preferred_apps_init (void); - - G_END_DECLS - -diff -up gnome-panel-2.25.3/gnome-panel/main.c.preferred-apps gnome-panel-2.25.3/gnome-panel/main.c ---- gnome-panel-2.25.3/gnome-panel/main.c.preferred-apps 2008-12-09 07:32:37.000000000 -0500 -+++ gnome-panel-2.25.3/gnome-panel/main.c 2009-01-16 14:15:17.000000000 -0500 -@@ -27,6 +27,7 @@ - #include "panel-action-protocol.h" - #include "panel-lockdown.h" - #include "panel-icon-names.h" -+#include "launcher.h" - #include "xstuff.h" - - #include "nothing.cP" -@@ -86,6 +87,7 @@ main (int argc, char **argv) - GCONF_CLIENT_PRELOAD_NONE, - NULL); - -+ panel_preferred_apps_init (); - panel_global_config_load (); - panel_lockdown_init (); - panel_profile_load (); -diff -up gnome-panel-2.25.3/gnome-panel/panel-run-dialog.c.preferred-apps gnome-panel-2.25.3/gnome-panel/panel-run-dialog.c ---- gnome-panel-2.25.3/gnome-panel/panel-run-dialog.c.preferred-apps 2008-12-11 12:03:03.000000000 -0500 -+++ gnome-panel-2.25.3/gnome-panel/panel-run-dialog.c 2009-01-16 14:15:17.000000000 -0500 -@@ -789,7 +789,7 @@ get_all_applications_from_dir (GMenuTree - return list; - } - --static GSList * -+GSList * - get_all_applications (void) - { - GMenuTree *tree; -diff -up gnome-panel-2.25.3/gnome-panel/panel-run-dialog.h.preferred-apps gnome-panel-2.25.3/gnome-panel/panel-run-dialog.h ---- gnome-panel-2.25.3/gnome-panel/panel-run-dialog.h.preferred-apps 2008-11-08 19:27:01.000000000 -0500 -+++ gnome-panel-2.25.3/gnome-panel/panel-run-dialog.h 2009-01-16 14:15:17.000000000 -0500 -@@ -32,6 +32,8 @@ G_BEGIN_DECLS - void panel_run_dialog_present (GdkScreen *screen, - guint32 activate_time); - -+GSList *get_all_applications (void); -+ - G_END_DECLS - - #endif /* __PANEL_RUN_DIALOG_H__ */ -- cgit