Package is retired, replaced by the GNOME Classic session in F19

author: Kalev Lember <kalevlember@gmail.com> 2013-05-01 23:02:10 +0200
committer: Kalev Lember <kalevlember@gmail.com> 2013-05-01 23:02:10 +0200
commit: 26ea386096c0cd7de55cc2226c46b63338c0ef39 (patch)
tree: c411805c2ada0babe69dc3dedce030bf01941b11
parent: c2b77a726bef547662f89b34e32dca592f5d23e9 (diff)
download: gnome-panel-26ea386096c0cd7de55cc2226c46b63338c0ef39.tar.gz
gnome-panel-26ea386096c0cd7de55cc2226c46b63338c0ef39.tar.xz
gnome-panel-26ea386096c0cd7de55cc2226c46b63338c0ef39.zip
28 files changed, 1 insertions, 6722 deletions
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 61583cb..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,31 +0,0 @@
-gnome-panel-2.31.4.tar.bz2
-gnome-panel-2.31.6.tar.bz2
-/gnome-panel-2.31.90.tar.bz2
-/gnome-panel-2.31.92.tar.bz2
-/gnome-panel-2.91.6.tar.bz2
-/gnome-panel-2.91.90.tar.bz2
-/gnome-panel-2.91.91.tar.bz2
-/gnome-panel-2.91.92.tar.bz2
-/gnome-panel-2.91.93.tar.bz2
-/gnome-panel-2.91.94.tar.bz2
-/gnome-panel-3.0.0.tar.bz2
-/gnome-panel-3.0.0.1.tar.bz2
-/gnome-panel-3.0.2.tar.bz2
-/gnome-panel-3.1.5.tar.xz
-/gnome-panel-3.1.91.tar.xz
-/gnome-panel-3.1.92.tar.xz
-/gnome-panel-3.2.0.tar.xz
-/gnome-panel-3.2.1.tar.xz
-/gnome-panel-3.3.1.tar.xz
-/gnome-panel-3.3.3.tar.xz
-/gnome-panel-3.3.5.tar.xz
-/gnome-panel-3.3.90.tar.xz
-/gnome-panel-3.3.91.tar.xz
-/gnome-panel-3.3.92.tar.xz
-/gnome-panel-3.4.0.tar.xz
-/gnome-panel-3.4.1.tar.xz
-/gnome-panel-3.4.2.1.tar.xz
-/gnome-panel-3.5.3.tar.xz
-/gnome-panel-3.5.4.tar.xz
-/gnome-panel-3.6.0.tar.xz
-/gnome-panel-3.6.2.tar.xz
diff --git a/Use-16px-menu-icons.patch b/Use-16px-menu-icons.patch
deleted file mode 100644
index 64e94dd..0000000
--- a/Use-16px-menu-icons.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From de049e9a8846270ed643b5c021ecd75fa259e00e Mon Sep 17 00:00:00 2001
-From: William Jon McCann <jmccann@redhat.com>
-Date: Mon, 4 Apr 2011 17:48:39 -0400
-Subject: [PATCH] Use 16px menu icons
-
-https://bugzilla.gnome.org/show_bug.cgi?id=646749
----
- gnome-panel/panel-stock-icons.h |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/gnome-panel/panel-stock-icons.h b/gnome-panel/panel-stock-icons.h
-index efac6d4..229d80a 100644
---- a/gnome-panel/panel-stock-icons.h
-+++ b/gnome-panel/panel-stock-icons.h
-@@ -31,7 +31,7 @@
- G_BEGIN_DECLS
- 
- /* themeable size - "panel-menu" -- This is used for the icons in the menus */
--#define PANEL_DEFAULT_MENU_ICON_SIZE 		24
-+#define PANEL_DEFAULT_MENU_ICON_SIZE 		16
- 
- /* stock icons */
- #define PANEL_STOCK_FORCE_QUIT          "gnome-panel-force-quit"
--- 
-1.7.3.4
-\ No newline at end of file
diff --git a/add-translations.sh b/add-translations.sh
deleted file mode 100644
index 9824d5a..0000000
--- a/add-translations.sh
+++ /dev/null
@@ -1,235 +0,0 @@
-cat >>po/bg.po <<EOF
-
-msgid "Suspend"
-msgstr "Приспиване"
-EOF
-cat >>po/bn_IN.po <<EOF
-
-msgid "Suspend"
-msgstr "স্থগিত"
-EOF
-cat >>po/bn.po <<EOF
-
-msgid "Suspend"
-msgstr "সাসপেন্ড"
-EOF
-cat >>po/ca.po <<EOF
-
-msgid "Suspend"
-msgstr "Atura temporalment"
-EOF
-cat >>po/cs.po <<EOF
-
-msgid "Suspend"
-msgstr "Suspendovat"
-EOF
-cat >>po/de.po <<EOF
-
-msgid "Suspend"
-msgstr "Stromsparmodus"
-EOF
-cat >>po/dz.po <<EOF
-
-msgid "Suspend"
-msgstr "འཕྲལ་བཀག"
-EOF
-cat >>po/el.po <<EOF
-
-msgid "Suspend"
-msgstr "Αναστολή"
-EOF
-cat >>po/en_CA.po <<EOF
-
-msgid "Suspend"
-msgstr "Suspend"
-EOF
-cat >>po/en_GB.po <<EOF
-
-msgid "Suspend"
-msgstr "Suspend"
-EOF
-cat >>po/es.po <<EOF
-
-msgid "Suspend"
-msgstr "Suspender"
-EOF
-cat >>po/et.po <<EOF
-
-msgid "Suspend"
-msgstr ""
-EOF
-cat >>po/eu.po <<EOF
-
-msgid "Suspend"
-msgstr "Eseki"
-EOF
-cat >>po/fi.po <<EOF
-
-msgid "Suspend"
-msgstr "Keskeytystila"
-EOF
-cat >>po/fr.po <<EOF
-
-msgid "Suspend"
-msgstr "Mise en veille prolongée"
-EOF
-cat >>po/gl.po <<EOF
-
-msgid "Suspend"
-msgstr "Suspender"
-EOF
-cat >>po/gu.po <<EOF
-
-msgid "Suspend"
-msgstr "અટકાવો"
-EOF
-cat >>po/hi.po <<EOF
-
-msgid "Suspend"
-msgstr "स्थगित"
-EOF
-cat >>po/hu.po <<EOF
-
-msgid "Suspend"
-msgstr "Felfüggesztés"
-EOF
-cat >>po/it.po <<EOF
-
-msgid "Suspend"
-msgstr "Sospendi"
-EOF
-cat >>po/ja.po <<EOF
-
-msgid "Suspend"
-msgstr "サスペンド"
-EOF
-cat >>po/ka.po <<EOF
-
-msgid "Suspend"
-msgstr "შეჩერება"
-EOF
-cat >>po/ko.po <<EOF
-
-msgid "Suspend"
-msgstr "절전"
-EOF
-cat >>po/lt.po <<EOF
-
-msgid "Suspend"
-msgstr "Užmigdyti"
-EOF
-cat >>po/lv.po <<EOF
-
-msgid "Suspend"
-msgstr "Pārstāt"
-EOF
-cat >>po/mg.po <<EOF
-
-msgid "Suspend"
-msgstr "Ahatoy"
-EOF
-cat >>po/mk.po <<EOF
-
-msgid "Suspend"
-msgstr "Суспендирај"
-EOF
-cat >>po/ml.po <<EOF
-
-msgid "Suspend"
-msgstr "താല്‍ക്കാലികമായി കംപ്യൂട്ടര്‍ നിര്‍ത്തുക"
-EOF
-cat >>po/nb.po <<EOF
-
-msgid "Suspend"
-msgstr "Hvilemodus"
-EOF
-cat >>po/nl.po <<EOF
-
-msgid "Suspend"
-msgstr "Pauzestand"
-EOF
-cat >>po/or.po <<EOF
-
-msgid "Suspend"
-msgstr "ନିଲମ୍ବନ କରନ୍ତୁ"
-EOF
-cat >>po/pa.po <<EOF
-
-msgid "Suspend"
-msgstr "ਮੁਅੱਤਲ"
-EOF
-cat >>po/pl.po <<EOF
-
-msgid "Suspend"
-msgstr "Wstrzymanie"
-EOF
-cat >>po/pt_BR.po <<EOF
-
-msgid "Suspend"
-msgstr "Suspender"
-EOF
-cat >>po/pt.po <<EOF
-
-msgid "Suspend"
-msgstr "Suspender"
-EOF
-cat >>po/ru.po <<EOF
-
-msgid "Suspend"
-msgstr "Ждущий режим"
-EOF
-cat >>po/sk.po <<EOF
-
-msgid "Suspend"
-msgstr ""
-EOF
-cat >>po/sr@Latn.po <<EOF
-
-msgid "Suspend"
-msgstr "Privremeno zaustavi"
-EOF
-cat >>po/sr.po <<EOF
-
-msgid "Suspend"
-msgstr "Привремено заустави"
-EOF
-cat >>po/sv.po <<EOF
-
-msgid "Suspend"
-msgstr "Vänteläge"
-EOF
-cat >>po/ta.po <<EOF
-
-msgid "Suspend"
-msgstr "இடை நீக்கம்"
-EOF
-cat >>po/th.po <<EOF
-
-msgid "Suspend"
-msgstr "พักเครื่อง"
-EOF
-cat >>po/uk.po <<EOF
-
-msgid "Suspend"
-msgstr "Призупиняти"
-EOF
-cat >>po/vi.po <<EOF
-
-msgid "Suspend"
-msgstr "Ngưng"
-EOF
-cat >>po/zh_CN.po <<EOF
-
-msgid "Suspend"
-msgstr "挂起"
-EOF
-cat >>po/zh_HK.po <<EOF
-
-msgid "Suspend"
-msgstr "暫停"
-EOF
-cat >>po/zh_TW.po <<EOF
-
-msgid "Suspend"
-msgstr "暫停"
-EOF
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 @@
-         <key>/schemas/apps/clock_applet/prefs/expand_locations</key>
-         <owner>clock-applet</owner>
-         <type>bool</type>
--        <default>false</default>
-+        <default>true</default>
-         <locale name="C">
-           <short>Expand list of locations</short>
-           <long>
-@@ -271,7 +271,7 @@
-         <owner>clock-applet</owner>
-         <type>list</type>
-         <list_type>string</list_type>
--        <default>[]</default>
-+        <default>[&lt;location name=&quot;&quot; city=&quot;Boston&quot; timezone=&quot;America/New_York&quot; latitude=&quot;42.360558&quot; longitude=&quot;-71.010559&quot; code=&quot;KBOS&quot; current=&quot;true&quot;/&gt;]</default>
-         <locale name="C">
-           <short>List of locations</short>
-           <long>
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 <time.h>
- #include <unistd.h>
- #include <math.h>
-+#include <netinet/in.h>
-+#include <arpa/nameser.h>
-+#include <resolv.h>
- 
- #include <glib.h>
- #include <gio/gio.h>
-@@ -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/dead.package b/dead.package
new file mode 100644
index 0000000..ec43253
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Package is retired, replaced by the GNOME Classic session in F19
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 <libgnome-desktop/gnome-wall-clock.h>
- 
--#include <libgweather/gweather-xml.h>
- #include <libgweather/location-entry.h>
- #include <libgweather/timezone-menu.h>
- #include <libgweather/gweather-enum-types.h>
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 <rstrode@redhat.com>
-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-compiler-flags.m4 b/gnome-compiler-flags.m4
deleted file mode 100644
index 7368178..0000000
--- a/gnome-compiler-flags.m4
+++ /dev/null
@@ -1,141 +0,0 @@
-dnl GNOME_COMPILE_WARNINGS
-dnl Turn on many useful compiler warnings
-dnl For now, only works on GCC
-AC_DEFUN([GNOME_COMPILE_WARNINGS],[
-    dnl ******************************
-    dnl More compiler warnings
-    dnl ******************************
-
-    AC_ARG_ENABLE(compile-warnings, 
-                  AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
-                                 [Turn on compiler warnings]),,
-                  [enable_compile_warnings="m4_default([$1],[yes])"])
-
-    warnCFLAGS=
-    if test "x$GCC" != xyes; then
-	enable_compile_warnings=no
-    fi
-
-    warning_flags=
-    realsave_CFLAGS="$CFLAGS"
-
-    case "$enable_compile_warnings" in
-    no)
-	warning_flags=
-	;;
-    minimum)
-	warning_flags="-Wall"
-	;;
-    yes)
-	warning_flags="-Wall -Wmissing-prototypes"
-	;;
-    maximum|error)
-	warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
-	CFLAGS="$warning_flags $CFLAGS"
-	for option in -Wno-sign-compare; do
-		SAVE_CFLAGS="$CFLAGS"
-		CFLAGS="$CFLAGS $option"
-		AC_MSG_CHECKING([whether gcc understands $option])
-		AC_TRY_COMPILE([], [],
-			has_option=yes,
-			has_option=no,)
-		CFLAGS="$SAVE_CFLAGS"
-		AC_MSG_RESULT($has_option)
-		if test $has_option = yes; then
-		  warning_flags="$warning_flags $option"
-		fi
-		unset has_option
-		unset SAVE_CFLAGS
-	done
-	unset option
-	if test "$enable_compile_warnings" = "error" ; then
-	    warning_flags="$warning_flags -Werror"
-	fi
-	;;
-    *)
-	AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
-	;;
-    esac
-    CFLAGS="$realsave_CFLAGS"
-    AC_MSG_CHECKING(what warning flags to pass to the C compiler)
-    AC_MSG_RESULT($warning_flags)
-
-    AC_ARG_ENABLE(iso-c,
-                  AC_HELP_STRING([--enable-iso-c],
-                                 [Try to warn if code is not ISO C ]),,
-                  [enable_iso_c=no])
-
-    AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
-    complCFLAGS=
-    if test "x$enable_iso_c" != "xno"; then
-	if test "x$GCC" = "xyes"; then
-	case " $CFLAGS " in
-	    *[\ \	]-ansi[\ \	]*) ;;
-	    *) complCFLAGS="$complCFLAGS -ansi" ;;
-	esac
-	case " $CFLAGS " in
-	    *[\ \	]-pedantic[\ \	]*) ;;
-	    *) complCFLAGS="$complCFLAGS -pedantic" ;;
-	esac
-	fi
-    fi
-    AC_MSG_RESULT($complCFLAGS)
-
-    WARN_CFLAGS="$warning_flags $complCFLAGS"
-    AC_SUBST(WARN_CFLAGS)
-])
-
-dnl For C++, do basically the same thing.
-
-AC_DEFUN([GNOME_CXX_WARNINGS],[
-  AC_ARG_ENABLE(cxx-warnings,
-                AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
-                               [Turn on compiler warnings.]),,
-                [enable_cxx_warnings="m4_default([$1],[minimum])"])
-
-  AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
-  warnCXXFLAGS=
-  if test "x$GCC" != xyes; then
-    enable_compile_warnings=no
-  fi
-  if test "x$enable_cxx_warnings" != "xno"; then
-    if test "x$GCC" = "xyes"; then
-      case " $CXXFLAGS " in
-      *[\ \	]-Wall[\ \	]*) ;;
-      *) warnCXXFLAGS="-Wall -Wno-unused" ;;
-      esac
-
-      ## -W is not all that useful.  And it cannot be controlled
-      ## with individual -Wno-xxx flags, unlike -Wall
-      if test "x$enable_cxx_warnings" = "xyes"; then
-	warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
-      fi
-    fi
-  fi
-  AC_MSG_RESULT($warnCXXFLAGS)
-
-   AC_ARG_ENABLE(iso-cxx,
-                 AC_HELP_STRING([--enable-iso-cxx],
-                                [Try to warn if code is not ISO C++ ]),,
-                 [enable_iso_cxx=no])
-
-   AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
-   complCXXFLAGS=
-   if test "x$enable_iso_cxx" != "xno"; then
-     if test "x$GCC" = "xyes"; then
-      case " $CXXFLAGS " in
-      *[\ \	]-ansi[\ \	]*) ;;
-      *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
-      esac
-
-      case " $CXXFLAGS " in
-      *[\ \	]-pedantic[\ \	]*) ;;
-      *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
-      esac
-     fi
-   fi
-  AC_MSG_RESULT($complCXXFLAGS)
-
-  WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
-  AC_SUBST(WARN_CXXFLAGS)
-])
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 @@
-         <key>/schemas/apps/fish_applet/prefs/command</key>
-         <owner>fish-applet</owner>
-         <type>string</type>
--        <default>fortune</default>
-+        <default>ddate</default>
-         <locale name="C">
-           <short>Command to execute on click</short>
-           <long>
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 <gdk/gdk.h>
- #include <gtk/gtk.h>
- 
-+#include <libgnome/gnome-desktop-item.h>
-+
- #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
deleted file mode 100644
index 380feee..0000000
--- a/gnome-panel.spec
+++ /dev/null
@@ -1,1845 +0,0 @@
-%define gettext_package gnome-panel-2.0
-
-%define gnome_desktop_version 2.91.6
-%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 evolution_data_server_version 3.5.3
-%define cairo_version 1.0.0
-%define dbus_version 1.1.2
-%define dbus_glib_version 0.80
-%define gnome_doc_utils_version 0.3.2
-%define libgweather_version 3.5.1
-
-%define use_evolution_data_server 1
-
-Summary: GNOME panel
-Name: gnome-panel
-Version: 3.6.2
-Release: 6%{?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
-
-# 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
-
-Requires: gnome-desktop3 >= %{gnome_desktop_version}
-Requires: libwnck3 >= %{libwnck_version}
-Requires: gnome-menus >= %{gnome_menus_version}
-%if %{use_evolution_data_server}
-Requires: evolution-data-server >= %{evolution_data_server_version}
-%endif
-Requires: gnome-session-xsession
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-
-Requires(post): hicolor-icon-theme
-Requires(post): GConf2
-Requires(pre): GConf2
-Requires(preun): GConf2
-
-BuildRequires: libxml2-python
-BuildRequires: intltool
-BuildRequires: gettext
-BuildRequires: automake
-BuildRequires: autoconf
-BuildRequires: libtool
-BuildRequires: GConf2-devel
-BuildRequires: gtk3-devel >= %{gtk3_version}
-BuildRequires: itstool
-BuildRequires: libxslt
-BuildRequires: libX11-devel
-BuildRequires: libXt-devel
-BuildRequires: pkgconfig(gnome-desktop-3.0) >= %{gnome_desktop_version}
-BuildRequires: pkgconfig(libwnck-3.0) >= %{libwnck_version}
-BuildRequires: dconf-devel
-BuildRequires: gnome-menus-devel >= %{gnome_menus_version}
-BuildRequires: cairo-devel >= %{cairo_version}
-BuildRequires: yelp-tools
-BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
-BuildRequires: gtk-doc
-BuildRequires: pango-devel
-BuildRequires: libXau-devel
-BuildRequires: libXrandr-devel
-%if %{use_evolution_data_server}
-BuildRequires: evolution-data-server-devel >= %{evolution_data_server_version}
-BuildRequires: dbus-devel >= %{dbus_version}
-%endif
-BuildRequires: polkit-devel >= 0.92
-BuildRequires: libgweather-devel >= %{libgweather_version}
-BuildRequires: librsvg2-devel
-BuildRequires: NetworkManager-devel
-BuildRequires: intltool
-BuildRequires: gettext-devel
-BuildRequires: libtool
-BuildRequires: libcanberra-devel
-BuildRequires: desktop-file-utils
-BuildRequires: gobject-introspection-devel
-BuildRequires: gnome-common
-
-Obsoletes: gdm-user-switch-applet < 1:2.91.6
-Conflicts: gnome-power-manager < 2.15.3
-
-Obsoletes: libgail-gnome < 1.20.4
-
-# Obsolete all old applet packages; this is the output of
-# repoquery --whatrequires libpanel-applet-2.so.0 gnome-python2-applet
-# as of Fedora 15 20110428, as well as ones from Fedora 14.
-Obsoletes: deskbar-applet <= 0:2.32.0-5
-Obsoletes: deskbar-applet-devel <= 0:2.32.0-5
-Obsoletes: file-browser-applet <= 0:0.6.6-2
-Obsoletes: glunarclock <= 0:0.34.1-2
-Obsoletes: gnome-applet-bubblemon <= 0:2.0.15-2
-Obsoletes: gnome-applet-cpufire <= 0:1.6-4
-Obsoletes: gnome-applet-globalmenu <= 0:0.7.9-2
-Obsoletes: gnome-applet-grandr <= 0:0.4.1-3
-Obsoletes: gnome-applet-jalali-calendar <= 0:1.7.1-3
-Obsoletes: gnome-applet-music <= 0:2.5.1-6
-Obsoletes: gnome-applet-sensors <= 0:2.2.7-5
-Obsoletes: gnome-applet-sensors-devel <= 0:2.2.7-5
-Obsoletes: gnome-applet-timer <= 0:2.1.4-3
-Obsoletes: gnome-applet-window-picker <= 0:0.5.8-3
-Obsoletes: gnome-applets <= 1:2.32.0-5
-Obsoletes: gnome-netstatus <= 0:2.28.2-2
-Obsoletes: gnome-python2-applet <= 0:2.32.0-2
-Obsoletes: gnome-schedule <= 0:2.0.2-7
-Obsoletes: gnubiff <= 0:2.2.13-5
-Obsoletes: hamster-applet <= 0:2.32.0-5
-Obsoletes: lock-keys-applet <= 0:1.0-22
-Obsoletes: uim-gnome <= 0:1.6.1-2
-Obsoletes: x-tile <= 0:1.8.6-2
-# Other ones that were already retired from Fedora 15
-Obsoletes: gnome-applet-netspeed <= 0.16-6
-Obsoletes: contact-lookup-applet <= 0.17-7
-
-# Also obsolete the now-dead libpanelappletmm
-Obsoletes: libpanelappletmm <= 0:2.26.0-3
-
-%description
-The GNOME panel provides the window list, workspace switcher, menus, and other
-features for the GNOME desktop.
-
-%package libs
-Summary: Libraries for Panel Applets
-License: LGPLv2+
-Group: Development/Libraries
-
-%description libs
-This package contains the libpanel-applet library that
-is needed by Panel Applets.
-
-%package devel
-Summary: Headers and libraries for Panel Applet development
-License: LGPLv2+
-Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
-
-%description devel
-Panel Applet development package. Contains files needed for developing
-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 \
-   --disable-gtk-doc \
-%if %{use_evolution_data_server}
-   --enable-eds=yes
-%else
-   --enable-eds=no
-%endif
-
-make %{?_smp_mflags} V=1
-
-
-# truncate NEWS
-awk '/^========/ { seen+=1 }
-{ if (seen < 3) print }
-{ if (seen == 3) { print "For older news, see http://git.gnome.org/cgit/gnome-panel/plain/NEWS"; exit } }' NEWS > tmp; mv tmp NEWS
-
-
-%install
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make DESTDIR=$RPM_BUILD_ROOT install
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-
-rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
-find $RPM_BUILD_ROOT -name '*.*a' -delete;
-
-desktop-file-install --delete-original \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  $RPM_BUILD_ROOT%{_datadir}/applications/gnome-panel.desktop
-
-%find_lang %{gettext_package} --all-name --with-gnome
-
-%post
-touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
-
-%postun
-if [ $1 -eq 0 ]; then
-  touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
-  gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null || :
-  glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
-fi
-
-%posttrans
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null || :
-glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
-
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
-
-%files -f %{gettext_package}.lang
-%doc AUTHORS COPYING COPYING.LIB COPYING-DOCS NEWS README
-%{_datadir}/icons/hicolor/16x16/apps/*
-%{_datadir}/icons/hicolor/22x22/apps/*
-%{_datadir}/icons/hicolor/24x24/apps/*
-%{_datadir}/icons/hicolor/32x32/apps/*
-%{_datadir}/icons/hicolor/48x48/apps/*
-%{_datadir}/icons/hicolor/scalable/apps/*
-%{_datadir}/gnome-panel
-%{_datadir}/man/man*/*
-%{_datadir}/applications/gnome-panel.desktop
-%{_bindir}/gnome-panel
-%{_bindir}/gnome-desktop-item-edit
-%{_libexecdir}/*
-
-%{_datadir}/dbus-1/services/org.gnome.panel.applet.ClockAppletFactory.service
-%{_datadir}/dbus-1/services/org.gnome.panel.applet.FishAppletFactory.service
-%{_datadir}/dbus-1/services/org.gnome.panel.applet.NotificationAreaAppletFactory.service
-%{_datadir}/dbus-1/services/org.gnome.panel.applet.WnckletFactory.service
-
-%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.applet.fish.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.applet.window-list.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.applet.workspace-switcher.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.enums.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.launcher.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.menu-button.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.object.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.toplevel.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.applet.clock.gschema.xml
-
-%files libs
-%{_libdir}/*.so.*
-%{_libdir}/girepository-1.0/PanelApplet-4.0.typelib
-
-%files devel
-%{_bindir}/panel-test-applets
-%{_includedir}/gnome-panel-4.0
-%{_libdir}/pkgconfig/*
-%{_libdir}/*.so
-%{_datadir}/gtk-doc
-%{_datadir}/gir-1.0/PanelApplet-4.0.gir
-
-%changelog
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.6.2-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Sun Dec 30 2012 Daniel Drake <dsd@laptop.org> - 3.6.2-5
-- Fix all-black icons in notification area
-
-* Tue Dec 25 2012 Bruno Wolff III <bruno@wolff.to> - 3.6.2-4
-- Drop gweather-xml.h include
-- Rebuild for multiple soname bumps
-
-* Thu Dec 20 2012 Kalev Lember <kalevlember@gmail.com> - 3.6.2-3
-- Rebuilt for libgnome-desktop3 3.7.3 soname bump
-
-* Tue Nov 20 2012 Milan Crha <mcrha@redhat.com> - 3.6.2-2
-- Rebuild against newer evolution-data-server
-
-* Mon Nov 12 2012 Kalev Lember <kalevlember@gmail.com> - 3.6.2-1
-- Update to 3.6.2
-- Clean up some obsolete buildrequires
-
-* Thu Nov  1 2012 Daniel Drake <dsd@laptop.org> - 3.6.0-2
-- Update for new gnome-menus gnome-applications filename (#868614)
-
-* Fri Oct 26 2012 Kalev Lember <kalevlember@gmail.com> - 3.6.0-1
-- Update to 3.6.0
-
-* Thu Oct 25 2012 Milan Crha <mcrha@redhat.com> - 3.5.4-5
-- Rebuild against newer evolution-data-server
-
-* Mon Aug 20 2012 Daniel Drake <dsd@laptop.org> - 3.5.4-4
-- Rebuild for libcamel-1.2.so.40
-
-* Fri Jul 27 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.5.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Sun Jul 22 2012 Ville Skyttä <ville.skytta@iki.fi> - 3.5.4-2
-- Move post(un)install ldconfig scriptlets from main to -libs.
-- Escape macros in %%changelog.
-
-* Wed Jul 18 2012 Matthias Clasen <mclasen@redhat.com> - 3.5.4-1
-- Update to 3.5.4
-
-* Tue Jun 26 2012 Matthias Clasen <mclasen@redhat.com> - 3.5.3-1
-- Update to 3.5.3
-
-* Fri Jun  8 2012 Matthias Clasen <mclasen@redhat.com> - 3.4.2.1-2
-- Rebuild against new gnome-desktop
-
-* Fri May 18 2012 Richard Hughes <hughsient@gmail.com> - 3.4.2.1-1
-- Update to 3.4.2.1
-
-* Tue May 01 2012 Kalev Lember <kalevlember@gmail.com> - 3.4.1-3
-- Rebuilt for evolution-data-server soname bumps
-
-* Tue Apr 24 2012 Kalev Lember <kalevlember@gmail.com> - 3.4.1-2
-- Silence rpm scriptlet output
-
-* Mon Apr 16 2012 Richard Hughes <hughsient@gmail.com> - 3.4.1-1
-- Update to 3.4.1
-
-* Tue Mar 27 2012 Kalev Lember <kalevlember@gmail.com> - 3.4.0-1
-- Update to 3.4.0
-
-* Wed Mar 21 2012 Kalev Lember <kalevlember@gmail.com> - 3.3.92-1
-- Update to 3.3.92
-
-* Tue Mar  6 2012 Matthias Clasen <mclasen@redhat.com> - 3.3.91-1
-- Update to 3.3.91
-
-* Sun Feb 26 2012 Matthias Clasen <mclasen@redhat.com> - 3.3.90-1
-- Update to 3.3.90
-
-* Tue Feb  7 2012 Matthias Clasen <mclasen@redhat.com> - 3.3.5-1
-- Update to 3.3.5
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.3.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Wed Dec 21 2011 Matthias Clasen <mclasen@redhat.com> - 3.3.3-1
-- Update to 3.3.3
-
-* Thu Nov 24 2011 Tomas Bzatek <tbzatek@redhat.com> - 3.3.1-3
-- Another rebuild for new EDS
-
-* Tue Nov 22 2011 Daniel Drake <dsd@laptop.org> - 3.3.1-2
-- Rebuild for libebook-1.2.so.13
-
-* Wed Nov  2 2011 Matthias Clasen <mclasen@redhat.com> - 3.3.1-1
-- Update to 3.3.1
-
-* Sun Oct 30 2011 Bruno Wolff III <bruno@wolff.to> - 3.2.1-3
-- Rebuild against newer evolution-data-server
- 
-* Wed Oct 26 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.1-2
-- Rebuilt for glibc bug#747377
-
-* Tue Oct 18 2011 Matthias Clasen <mclasen@redhat.com> - 3.2.1-1
-- Update to 3.2.1
-
-* Wed Sep 28 2011 Peter Robinson <pbrobinson@fedoraproject.org> - 3.2.0-2
-- Fix Source URL, remove no longer needed band-aid - RHBZ 730586
-
-* Tue Sep 27 2011 Ray <rstrode@redhat.com> - 3.2.0-1
-- Update to 3.2.0
-
-* Tue Sep 20 2011 Matthias Clasen <mclasen@redhat.com> - 3.1.92-1
-- Update to 3.1.92
-
-* Thu Sep 08 2011 Kalev Lember <kalevlember@gmail.com> - 3.1.91-3
-- Obsolete additional -devel packages that AutoQA caught
-
-* Wed Sep  7 2011 Matthias Clasen <mclasen@redhat.com> - 3.1.91-2
-- Rebuild against newer libcamel
-
-* Tue Sep  6 2011 Matthias Clasen <mclasen@redhat.com> - 3.1.91-1
-- Update to 3.1.91
-
-* Tue Aug 30 2011 Milan Crha <mcrha@redhat.com> - 3.1.5-5
-- Rebuild against newer evolution-data-server (once again)
-
-* Mon Aug 29 2011 Milan Crha <mcrha@redhat.com> - 3.1.5-4
-- Rebuild against newer evolution-data-server
-
-* Wed Aug 24 2011 Matthias Clasen <mclasen@redhat.com> - 3.1.5-3
-- Make the -libs dependency archful
-
-* Fri Aug 19 2011 Matthias Clasen <mclasen@redhat.com> - 3.1.5-2
-- Rebuild
-
-* Wed Aug 17 2011 Matthias Clasen <mclasen@redhat.com> - 3.1.5-1
-- Update to 3.1.5
-
-* Tue Aug 16 2011 Milan Crha <mcrha@redhat.com> - 3.0.2-4
-- Rebuild against newer evolution-data-server
-
-* Mon Jul 25 2011 Matthias Clasen <mclasen@redhat.com> - 3.0.2-3
-- Rebuild
-
-* Tue Jul 05 2011 Adam Williamson <awilliam@redhat.com> - 3.0.2-2
-- rebuild for new e-d-s
-
-* Thu Jun 16 2011 Tomas Bzatek <tbzatek@redhat.com> - 3.0.2-1
-- Update to 3.0.2
-
-* Thu May  5 2011 Colin Walters <walters@verbum.org> - 3.0.0.1-5
-- Also obsolete libpanelappletmm
-
-* Thu Apr 28 2011 Colin Walters <walters@verbum.org> - 3.0.0.1-4
-- Obsolete old applet packages so upgrades proceeed
-
-* Mon Apr 25 2011 Matthias Clasen <mclasen@redhat.com> - 3.0.0.1-3
-- Obsolete libgail-gnome (#697795)
-
-* Mon Apr 11 2011 Colin Walters <walters@verbum.org> - 3.0.0.1-2
-- Use gnome menu, not redhat-menus
-
-* Wed Apr  6 2011 Matthias Clasen <mclasen@redhat.com> - 3.0.0.1-1
-- Update to 3.0.0.1
-
-* Tue Apr  5 2011 Matthias Clasen <mclasen@redhat.com> - 3.0.0-2
-- Make icon sizes more uniform
-
-* Mon Apr  4 2011 Matthias Clasen <mclasen@redhat.com> - 3.0.0-1
-- Update to 3.0.0
-
-* Fri Apr  1 2011 Matthias Clasen <mclasen@redhat.com> - 2.91.94-1
-- Update to 2.91.94
-
-* Tue Mar 29 2011 Matthias Clasen <mclasen@redhat.com> - 2.91.93-1
-- Update to 2.91.93
-
-* Wed Mar 23 2011 Matthias Clasen <mclasen@redhat.com> - 2.91.92-1
-- Update to 2.91.92
-
-* Mon Mar  7 2011 Matthias Clasen <mclasen@redhat.com> - 2.91.91-1
-- Update to 2.91.91
-
-* Thu Feb 24 2011 Colin Walters <walters@verbum.org> - 2.91.90-2
-- Require gnome-shell to band aid upgrades
-
-* Tue Feb 22 2011 Matthias Clasen <mclasen@redhat.com> 2.91.90-1
-- Update to 2.91.90
-
-* Fri Feb 11 2011 Matthias Clasen <mclasen@redhat.com> 2.91.6-5
-- Rebuild against newer gtk
-
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.91.6-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Wed Feb 02 2011 Ray Strode <rstrode@redhat.com> 2.91.6-3
-- Cut out the layers of built up cruft.
-
-* Wed Feb  2 2011 Matthias Clasen <mclasen@redhat.com> 2.91.6-2
-- Various build fixes
-
-* Wed Feb 02 2011 Ray Strode <rstrode@redhat.com> 2.91.6-1
-- Update to 2.91.6
-
-* Wed Sep 29 2010 jkeating - 2.31.92-2
-- Rebuilt for gcc bug 634757
-
-* Wed Sep 22 2010 Matthias Clasen <mclasen@redhat.com> - 2.31.92-1
-- Update to 2.31.92
-
-* Tue Sep 21 2010 Matthias Clasen <mclasen@redhat.com> - 2.31.90-3
-- Rebuild against newer gtk3
-
-* Mon Aug 23 2010 Matthias Clasen <mclasen@redhat.com> - 2.31.90-2
-- Co-own /usr/share/gtk-doc (#604360)
-
-* Thu Aug 19 2010 Matthias Clasen <mclasen@redhat.com> - 2.31.90-1
-- Update to 2.31.90
-
-* Wed Aug  4 2010 Matthias Clasen <mclasen@redhat.com> - 2.31.6-1
-- Update to 2.31.6
-
-* Tue Aug  3 2010 Matthias Clasen <mclasen@redhat.com> - 2.31.4-4
-- Adapt to GDBus api changes
-
-* Thu Jul 15 2010 Colin Walters <walters@verbum.org> - 2.31.4-3
-- Rebuild with new gobject-introspection
-
-* Thu Jul 15 2010 Matthias Clasen <mclasen@redhat.com> 2.31.4-2
-- Rebuild against new evolution-data-server
-
-* Wed Jun 30 2010 Matthias Clasen <mclasen@redhat.com> 2.31.4-1
-- Update to 2.31.4
-
-* Mon Jun 21 2010 Matthias Clasen <mclasen@redhat.com> 2.31.2-4
-- Update for GLib api change
-
-* Thu Jun 17 2010 Dan Horák <dan[at]danny.cz> 2.31.2-3
-- link also with libm
-
-* Sat May 29 2010 Matthias Clasen <mclasen@redhat.com> 2.31.2-2
-- Rebuild
-
-* Fri May 28 2010 Matthias Clasen <mclasen@redhat.com> 2.31.2-1
-- Update to 2.31.2
-
-* Sun May 09 2010 Matthew Barnes <mbarnes@redhat.com> 2.30.0-2
-- Rebuild against newer libedataserver and libedataserverui.
-
-* Mon Mar 29 2010 Matthias Clasen <mclasen@redhat.com> 2.30.0-1
-- Update to 2.30.0
-
-* Thu Mar 11 2010 Matthias Clasen <mclasen@redhat.com> 2.29.92.1-1
-- Update to 2.29.92.1
-
-* Mon Feb 22 2010 Matthias Clasen <mclasen@redhat.com> 2.29.91-1
-- Update to 2.29.91
-
-* Wed Feb 17 2010 Matthias Clasen <mclasen@redhat.com> 2.29.6-2
-- Update icon-order patch to sort keyboard, too
-
-* Thu Feb 11 2010 Matthias Clasen <mclasen@redhat.com> 2.29.6-1
-- Update to 2.29.6
-
-* Sun Jan 17 2010 Matthias Clasen <mclasen@redhat.com> 2.29.5.1-1
-- Update to 2.29.5.1
-
-* Tue Dec 15 2009 Matthias Clasen <mclasen@redhat.com> 2.28.0-17
-- Handle errors returned from PolicyKit in the clock applet (#547624)
-- Fix clock crash (bug 537798)
-- Improve the behaviour of the panel when screen resolution
-  changes (gnome #341441)
-
-* Thu Oct 29 2009 Matthias Clasen <mclasen@redhat.com> 2.28.0-12
-- Make padding work correctly in non-expanded panels (#529614)
-
-* Tue Oct 20 2009 Matthias Clasen <mclasen@redhat.com> 2.28.0-11
-- Remove a leftover debugging statement
-
-* Tue Oct 20 2009 Matthias Clasen <mclasen@redhat.com> 2.28.0-10
-- Reduce the inter-applet padding
-
-* Mon Oct 19 2009 Ray Strode <rstrode@redhat.com> 2.28.0-9
-- Add explicit libs requires (bug 525600)
-
-* Mon Oct 19 2009 Matthias Clasen <mclasen@redhat.com> 2.28.0-9
-- Actually set non-zero padding
-
-* Sat Oct 17 2009 Matthias Clasen <mclasen@redhat.com> 2.28.0-8
-- Add padding around status icons
-
-* Fri Oct 16 2009 Matthias Clasen <mclasen@redhat.com> 2.28.0-6
-- Put status icons in a predictable order
-
-* Wed Oct 14 2009 Matthias Clasen <mclasen@redhat.com> 2.28.0-5
-- Tweaks to the default panel configuration
-
-* Thu Oct  8 2009 Matthias Clasen <mclasen@redhat.com> 2.28.0-4
-- Fix possible crashes related to randr events
-
-* Thu Oct  8 2009 Matthias Clasen <mclasen@redhat.com> 2.28.0-3
-- Accept more bookmarks in the places menu before overflowing
-
-* Wed Oct  7 2009 Matthias Clasen <mclasen@redhat.com> 2.28.0-2
-- Add a default location to the clock applet
-
-* Wed Sep 23 2009 Matthias Clasen <mclasen@redhat.com> 2.28.0-1
-- Update to 2.28.0
-
-* Wed Sep  9 2009 Matthias Clasen <mclasen@redhat.com> 2.27.92-1
-- Update to 2.27.92
-
-* Tue Aug 25 2009 Matthias Clasen <mclasen@redhat.com> 2.27.91-1
-- Update to 2.27.91
-
-* Sat Aug 22 2009 Matthias Clasen <mclasen@redhat.com> 2.27.4-9
-- Actually apply the 'clear recent' patch
-
-* Thu Aug 13 2009 Matthias Clasen <mclasen@redhat.com> 2.27.4-8
-- Stricter clock-applet PolicyKit policy
-
-* Wed Aug  5 2009 Matthias Clasen <mclasen@redhat.com> 2.27.4-7
-- Make 'Clear Recent Documents' follow the menu-images setting
-
-* Sun Aug  2 2009 Matthias Clasen <mclasen@redhat.com> 2.27.4-6
-- Save some space
-
-* Fri Jul 31 2009 Matthias Clasen <mclasen@redhat.com> 2.27.4-5
-- Reduce the excessive 'about'-ing in the System menu
-
-* Mon Jul 27 2009 Matthias Clasen <mclasen@redhat.com> 2.27.4-4
-- Drop unneeded direct deps
-
-* Fri Jul 24 2009 Ray Strode <rstrode@redhat.com> 2.27.4-3
-- Make my panels show up again on login (gnome bug 589632)
-
-* Wed Jul 22 2009 Matthias Clasen <mclasen@redhat.com> - 2.27.4-2
-- Make category icons follow the menu-images setting
-
-* Wed Jul 15 2009 Matthias Clasen <mclasen@redhat.com> - 2.27.4-1
-- Update to 2.27.4
-
-* Tue Jun  9 2009 Matthias Clasen <mclasen@redhat.com> - 2.26.2-3
-- Port to PolicyKit 1
-
-* Tue Jun  2 2009 Matthias Clasen <mclasen@redhat.com> - 2.26.2-2
-- Replace tomboy by gnote in the default panel configuration
-
-* Wed May 20 2009 Ray Strode <rstrode@redhat.com> 2.26.2-1
-- Update to 2.26.2
-
-* Mon Apr 27 2009 Matthias Clasen <mclasen@redhat.com> - 2.26.1-3
-- Don't drop schemas translations from po files
-
-* Wed Apr 15 2009 Matthias Clasen <mclasen@redhat.com> - 2.26.1-2
-- Fix the clock applets network tracking code
-
-* Tue Apr 14 2009 Matthias Clasen <mclasen@redhat.com> - 2.26.1-1
-- Update to 2.26.1
-
-* Mon Apr 13 2009 David Zeuthen <davidz@redhat.com> - 2.26.0-2
-- Handle emblemed icons (GNOME #578859)
-
-* Tue Mar 17 2009 Matthias Clasen <mclasen@redhat.com> - 2.26.0-1
-- Update to 2.26.0
-
-* Tue Mar  3 2009 Matthias Clasen <mclasen@redhat.com> - 2.25.92-1
-- Update to 2.25.92
-
-* Fri Feb 27 2009 Matthias Clasen <mclasen@redhat.com> - 2.25.91-3
-- Require PolicyKit-authentication-agent
-
-* Mon Feb 23 2009 Matthias Clasen <mclasen@redhat.com> - 2.25.91-2
-- Fix panel behaviour on screen size changes
-
-* Thu Feb 19 2009 Matthias Clasen <mclasen@redhat.com> - 2.25.91-1
-- Update to 2.25.91
-
-* Tue Feb  3 2009 Matthias Clasen <mclasen@redhat.com> - 2.25.90-1
-- Update to 2.25.90
-
-* Fri Jan 23 2009 Ray Strode <rstrode@redhat.com> - 2.25.5.1-1
-- Update to 2.25.5.1
-- Fixes bug 481029
-
-* Tue Jan 20 2009 Matthias Clasen <mclasen@redhat.com> - 2.25.5-1
-- Update to 2.25.5
-
-* Fri Jan 16 2009 Matthias Clasen <mclasen@redhat.com> - 2.25.3-4
-- And don't write %%s into desktop files
-
-* Fri Jan 16 2009 Matthias Clasen <mclasen@redhat.com> - 2.25.3-3
-- Fix the 'smart launcher' patch
-
-* Thu Dec 18 2008 - Bastien Nocera <bnocera@redhat.com> - 2.25.3-3
-- Remove the mixer from the default panel config as well
-- Update search and preferred apps patches
-
-* Wed Dec 17 2008 Matthias Clasen <mclasen@redhat.com> - 2.25.3-2
-- Update to 2.25.3
-- Drop mixer from default config
-
-* Thu Nov 13 2008 Matthias Clasen <mclasen@redhat.com> - 2.24.1-6
-- Rebuild
-
-* Sun Nov  9 2008 Ray Strode <rstrode@redhat.com> - 2.24.1-4
-- Don't unhide drawers by default.  Patch from
-  Leszek Matok <lam@lac.pl> (bug 470719)
-
-* Mon Nov  3 2008 Ray Strode <rstrode@redhat.com> - 2.24.1-3
-- Fix up panel slide in patch to work better with empty panels
-
-* Mon Nov  3 2008 Ray Strode <rstrode@redhat.com> - 2.24.1-2
-- Fix up panel slide in patch to
-  1) not have odd effects with vertical panels
-  2) set up struts earlier
-
-* Wed Oct 22 2008 Matthias Clasen  <mclasen@redhat.com> - 2.24.1-1
-- Update to 2.24.1
-
-* Wed Oct 22 2008 Ray Strode  <rstrode@redhat.com> - 2.24.0-8
-- Don't make nautilus slide down as the panel slides down,
-  instead push nautilus out of the way immediately, and slide
-  in the available space.
-
-* Sun Oct 12 2008 Ray Strode  <rstrode@redhat.com> - 2.24.0-7
-- Update smooth slide patch to be simpler based on feedback
-  on gnome bug (554343)
-
-* Thu Oct  9 2008 Ray Strode  <rstrode@redhat.com> - 2.24.0-6
-- Hide shutdown item if unavailable
-
-* Thu Oct  9 2008 Matthias Clasen  <mclasen@redhat.com> - 2.24.0-5
-- Don't show menuitems which fail the tryexec test
-
-* Fri Sep 26 2008 Ray Strode  <rstrode@redhat.com> - 2.24.0-4
-- Try to make initial panel slide-in animation be smooth
-
-* Thu Sep 25 2008 Matthias Clasen  <mclasen@redhat.com> - 2.24.0-3
-- Save some space
-
-* Thu Sep 25 2008 Ray Strode  <rstrode@redhat.com> - 2.24.0-2
-- Requires: gnome-session-xsession so it gets pulled in for
-  typical GNOME installs.
-
-* Tue Sep 23 2008 Matthias Clasen  <mclasen@redhat.com> - 2.24.0-1
-- Update to 2.24.0
-
-* Mon Sep  8 2008 Matthias Clasen  <mclasen@redhat.com> - 2.23.92-1
-- Update to 2.23.92
-
-* Tue Sep  2 2008 Matthias Clasen  <mclasen@redhat.com> - 2.23.91-1
-- Update to 2.23.91
-
-* Sat Aug 23 2008 Matthias Clasen  <mclasen@redhat.com> - 2.23.90.1-1
-- Update to 2.23.90.1
-
-* Tue Aug  5 2008 Matthias Clasen  <mclasen@redhat.com> - 2.23.6-1
-- Update to 2.23.6
-
-* Wed Jul 23 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 2.23.5-2
-- fix license tag
-
-* Tue Jul 22 2008 Matthias Clasen  <mclasen@redhat.com> - 2.23.5-1
-- Update to 2.23.5
-
-* Fri Jul 18 2008 Matthias Clasen  <mclasen@redhat.com> - 2.23.4-5
-- Fix one more icon
-
-* Wed Jul  9 2008 Matthias Clasen  <mclasen@redhat.com> - 2.23.4-4
-- Move panel-test-applets to the -devel package
-
-* Wed Jul  9 2008 Matthias Clasen  <mclasen@redhat.com> - 2.23.4-3
-- Use more standard icon names
-
-* Tue Jul  8 2008 Matthias Clasen  <mclasen@redhat.com> - 2.23.4-2
-- Fix debuginfo generation
-
-* Wed Jun 18 2008 Matthias Clasen  <mclasen@redhat.com> - 2.23.4-1
-- Update to 2.23.4
-
-* Tue Jun 10 2008 Matthias Clasen  <mclasen@redhat.com> - 2.23.3-2
-- Avoid unnecessary wakeups in the clock for monitoring 
-  Gentoo config file locations
-
-* Wed Jun  4 2008 Matthias Clasen  <mclasen@redhat.com> - 2.23.3-1
-- 2.23.3
-
-* Wed May 14 2008 Matthias Clasen  <mclasen@redhat.com> - 2.23.2.1-1
-- Update to 2.23.2.1
-
-* Wed May 14 2008 Adam Tkac <atkac redhat com> - 2.23.1-2
-- rebuild
-
-* Fri Apr 25 2008 Matthias Clasen  <mclasen@redhat.com> - 2.23.1-1
-- Update to 2.23.1
-
-* Wed Apr 23 2008 Matthias Clasen  <mclasen@redhat.com> - 2.22.1.2-6
-- Remove an erroneous addition in the last patch
-
-* Tue Apr 22 2008 Matthias Clasen  <mclasen@redhat.com> - 2.22.1.2-5
-- Add another patch that may fix timezone setting problems (#443415)
-
-* Fri Apr 18 2008 Matthias Clasen  <mclasen@redhat.com> - 2.22.1.2-4
-- Use gio to open places 
-- Fix a 64bit issue with timezone handling in the clock
-
-* Fri Apr 18 2008 Matthias Clasen  <mclasen@redhat.com> - 2.22.1.2-3
-- Move the trash applet back where it belongs, to the corner (#439416)
-
-* Wed Apr 16 2008 Matthias Clasen  <mclasen@redhat.com> - 2.22.1.2-2
-- Make help buttons work in clock preferences
-
-* Thu Apr 10 2008 Matthias Clasen  <mclasen@redhat.com> - 2.22.1.2-1
-- Update to 2.22.1.2 (significant performance and usability 
-  improvements for the clock applet)
-
-* Tue Apr 08 2008 - Bastien Nocera <bnocera@redhat.com> - 2.22.1.1-1
-- Update to 2.22.1.1
-
-* Mon Apr  7 2008 Matthias Clasen  <mclasen@redhat.com> - 2.22.1-1
-- Update to 2.22.1
-
-* Sun Apr  6 2008 Matthias Clasen  <mclasen@redhat.com> - 2.22.0-12
-- Fix a typo in the CK shutdown patch, spotted by Kevin Kofler
-
-* Sat Apr  5 2008 Matthias Clasen  <mclasen@redhat.com> - 2.22.0-11
-- Handle PolicyKit errors returned from ConsoleKit
-
-* Fri Apr  4 2008 Matthias Clasen  <mclasen@redhat.com> - 2.22.0-10
-- Ignore dbus errors when setting the time
-
-* Wed Apr  2 2008 Matthias Clasen  <mclasen@redhat.com> - 2.22.0-9
-- Fix a possible crash in the clock applet
-
-* Fri Mar 28 2008 Matthias Clasen  <mclasen@redhat.com> - 2.22.0-8
-- Fix editing of locations in the clock applet
-
-* Fri Mar 28 2008 Matthias Clasen  <mclasen@redhat.com> - 2.22.0-7
-- Convert the edit and find location windows to dialogs
-
-* Thu Mar 27 2008 Matthias Clasen  <mclasen@redhat.com> - 2.22.0-6
-- Improve the time settings window
-
-* Thu Mar 27 2008 Matthias Clasen  <mclasen@redhat.com> - 2.22.0-5
-- Make the find-location window of the clock larger
-
-* Sat Mar 15 2008 Matthias Clasen  <mclasen@redhat.com> - 2.22.0-4
-- Only save the session when the users wants it
-
-* Fri Mar 14 2008 Matthias Clasen  <mclasen@redhat.com> - 2.22.0-3
-- Populate the location list before showing the preference window
-
-* Mon Mar 10 2008 Matthias Clasen  <mclasen@redhat.com> - 2.22.0-2
-- Bump revision
-
-* Mon Mar 10 2008 Jon McCann <jmccann@redhat.com> - 2.22.0-1
-- Update to 2.22.0
-
-* Sat Mar  8 2008 Will Woods <wwoods@redhat.com> - 2.21.92-6
-- Add "About This Computer" item to System menu if it exists
-
-* Mon Mar  3 2008 Matthias Clasen <mclasen@redhat.com> - 2.21.92-5
-- Fix a redraw problem with the clock map
-
-* Mon Mar  3 2008 Matthias Clasen <mclasen@redhat.com> - 2.21.92-4
-- Make the clock applet handle multiple locations in the 
-  same timezone meaningfully
-
-* Mon Mar  3 2008 Matthias Clasen <mclasen@redhat.com> - 2.21.92-3
-- Some upstream clock applet fixes
-
-* Mon Mar  3 2008 Ray Strode <rstrode@redhat.com> - 2.21.92-2
-- Don't crash with Zimbra connector (bug 435355)
-
-* Tue Feb 26 2008 Matthias Clasen <mclasen@redhat.com> - 2.21.92-1
-- Update to 2.21.92
-
-* Fri Feb 22 2008 Matthias Clasen <mclasen@redhat.com> - 2.21.91-9
-- Report sunrise/sunset times in local time
-
-* Thu Feb 21 2008 Matthias Clasen <mclasen@redhat.com> - 2.21.91-8
-- Make drawers open again
-
-* Wed Feb 20 2008 Matthias Clasen <mclasen@redhat.com> - 2.21.91-7
-- Make the last patch work 
-
-* Wed Feb 20 2008 Matthias Clasen <mclasen@redhat.com> - 2.21.91-6
-- Try harder to avoid resizing the popup 
-
-* Tue Feb 19 2008 Matthias Clasen <mclasen@redhat.com> - 2.21.91-5
-- Take daylight savings time into account when calculating offsets
-
-* Mon Feb 18 2008 Matthias Clasen <mclasen@redhat.com> - 2.21.91-4
-- Another round of intlclock fixes
-
-* Sun Feb 17 2008 Matthias Clasen <mclasen@redhat.com> - 2.21.91-3
-- First round of intlclock fixes
-
-* Fri Feb 15 2008 Matthias Clasen <mclasen@redhat.com> - 2.21.91-2
-- Drop gnome-vfs BR
-
-* Wed Feb 12 2008 Matthias Clasen <mclasen@redhat.com> - 2.21.91-1
-- Update to 2.21.91
-- Update patches
-
-* Sun Feb  3 2008 Matthias Clasen <mclasen@redhat.com> - 2.21.90-3
-- Ensure the logout dialog gets focus. 
-
-* Tue Jan 29 2008 Matthias Clasen <mclasen@redhat.com> - 2.21.90-1
-- Update to 2.21.90
-- Drop upstreamed patch
-
-* Fri Jan 25 2008 Jon McCann <jmccann@redhat.com> - 2.21.5-2
-- Add ConsoleKit restart/shutdown support
-
-* Wed Jan 16 2008 Matthias Clasen <mclasen@redhat.com> - 2.21.5-1
-- Update to 2.21.5
-- Drop separate intlclock
-
-* Thu Dec 13 2007 Matthias Clasen <mclasen@redhat.com> - 2.20.2-2
-- Adapt to libgweather api changes
-
-* Tue Nov 27 2007 Matthias Clasen <mclasen@redhat.com> - 2.20.2-1
-- Update to 2.20.2 (translation updates)
-
-* Tue Nov 13 2007 Matthias Clasen <mclasen@redhat.com> - 2.20.1-7
-- Fix a problem with the intlclock GConf schema
-
-* Tue Nov 13 2007 Matthias Clasen <mclasen@redhat.com> - 2.20.1-6
-- Reenable intlclock
-
-* Tue Nov 13 2007 Matthias Clasen <mclasen@redhat.com> - 2.20.1-5
-- Split off a libs subpackage to break a cyclic dependency
-- Build without intlclock for bootstrapping purposes
-
-* Mon Oct 29 2007 Matthias Clasen <mclasen@redhat.com> - 2.20.1-4
-- Intlclock: make default units work correctly
-
-* Sun Oct 28 2007 Matthias Clasen <mclasen@redhat.com> - 2.20.1-3
-- Intlclock: add weather preferences, show temperature in panel
-
-* Sat Oct 20 2007 Matthias Clasen <mclasen@redhat.com> - 2.20.1-2
-- Fix some issues with the offset display in the intlclock
-
-* Mon Oct 15 2007 Matthias Clasen <mclasen@redhat.com> - 2.20.1-1
-- Update to 2.20.1
-
-* Sun Oct 14 2007 Matthias Clasen <mclasen@redhat.com> - 2.20.0.1-9
-- Install the right intlclock icons, and the right gconf schema
-
-* Sun Oct 14 2007 Matthias Clasen <mclasen@redhat.com> - 2.20.0.1-8
-- Add network monitoring to the intlclock
-
-* Sat Oct 13 2007 Matthias Clasen <mclasen@redhat.com> - 2.20.0.1-7
-- Another round of intlclock updates
-  * show offsets in popup
-  * vary clock faces throughout the day
-
-* Fri Oct 12 2007 Matthias Clasen <mclasen@redhat.com> - 2.20.0.1-6
-- Sharper icons
-
-* Tue Oct  9 2007 Matthias Clasen <mclasen@redhat.com> - 2.20.0.1-5
-- Some intlclock updates
-
-* Fri Oct  5 2007 Matthias Clasen <mclasen@redhat.com> - 2.20.0.1-4
-- Replace clock by intlclock
-
-* Wed Oct  3 2007 Matthias Clasen <mclasen@redhat.com> - 2.20.0.1-3
-- Make it possible to start s-c-d from the clock menu again (#316921)
-
-* Fri Sep 21 2007 Matthias Clasen <mclasen@redhat.com> - 2.20.0.1-2
-- Don't pop up an error if an applet from the default
-  configuration is missing  
-
-* Tue Sep 18 2007 Matthias Clasen <mclasen@redhat.com> - 2.20.0.1-1
-- Update to 2.20.0.1
-
-* Mon Sep 17 2007 Matthias Clasen <mclasen@redhat.com> - 2.20.0-1
-- Update to 2.20.0
-
-* Mon Sep 17 2007 Matthias Clasen <mclasen@redhat.com> - 2.19.92-7
-- Can't require tomboy where there's no mono
-
-* Mon Sep 17 2007 Matthias Clasen <mclasen@redhat.com> - 2.19.92-6
-- Turns out we need requires for applets in the default config (#293261)
-
-* Mon Sep 17 2007 Matthias Clasen <mclasen@redhat.com> - 2.19.92-5
-- Drop the requires for fast-user-switch-applet (#253831)
-
-* Thu Sep 13 2007 Matthias Clasen <mclasen@redhat.com> - 2.19.92-4
-- Fix some memleaks
-- Remove OpenOffice launchers from the default configuration
-- Add Tomboy to the default configuration
-
-* Mon Sep 10 2007 Ray Strode <rstrode@redhat.com> - 2.19.92-3
-- create ~/.local/share/applications before writing out 
-  preferred app launchers
-
-* Thu Sep  6 2007 Matthias Clasen <mclasen@redhat.com> - 2.19.92-2
-- Improve the handling of preferred apps in launchers
-
-* Tue Sep  4 2007 Matthias Clasen <mclasen@redhat.com> - 2.19.92-1
-- Update to 2.19.92
-
-* Thu Aug 23 2007 Adam Jackson <ajax@redhat.com> - 2.19.6-2
-- Rebuild for build ID
-
-* Mon Aug 13 2007 Matthias Clasen <mclasen@redhat.com> - 2.19.6-1
-- Update to 2.19.6
-
-* Mon Aug  6 2007 Matthias Clasen <mclasen@redhat.com> - 2.19.5-7
-- Update license field again
-- Use %%find_lang for help files, too
-
-* Sat Aug  4 2007 Matthias Clasen <mclasen@redhat.com> - 2.19.5-6
-- Update license field
-
-* Wed Jul 25 2007 Matthias Clasen <mclasen@redhat.com> - 2.19.5-5
-- Make the panel talk to gnome-power-manager again.
-- Drop the patch to add suspend to the menu, it was
-  rejected by upstream
-
-* Wed Jul 25 2007 Jesse Keating <jkeating@redhat.com> - 2.19.5-4
-- Rebuild for RH #249435
-
-* Tue Jul 24 2007 Matthias Clasen <mclasen@redhat.com> - 2.19.5-3
-- Fix launcher tooltips to react to changes.  (#212164)
-
-* Thu Jul 12 2007 Matthias Clasen <mclasen@redhat.com> - 2.19.5-2
-- Fix a crash in the new timezone code in the clock applet
-
-* Sun Jul  8 2007 Matthias Clasen <mclasen@redhat.com> - 2.19.5-1
-- Update to 2.19.5
-
-* Sat Jul  7 2007 Matthias Clasen <mclasen@redhat.com> - 2.19.4-2
-- Fix directory ownership issues
-
-* Sun Jun 17 2007 Matthias Clasen <mclasen@redhat.com> - 2.19.4-1
-- Update to 2.19.4
-
-* Tue Jun  5 2007 Matthias Clasen <mclasen@redhat.com> - 2.19.3-3
-- Rebuild again
-
-* Mon Jun  4 2007 Matthias Clasen <mclasen@redhat.com> - 2.19.3-2
-- Rebuild against new libwnck
-
-* Mon Jun 04 2007 - Bastien Nocera <bnocera@redhat.com> - 2.19.3-1
-- Update to 2.19.3
-
-* Tue May 22 2007 Matthias Clasen <mclasen@redhat.com> - 2.19.2-2
-- Don't ship a pointless empty file in /usr/share
-
-* Sun May 20 2007 Matthias Clasen <mclasen@redhat.com> - 2.19.2-1
-- Update to 2.19.2
-
-* Fri Apr 13 2007 Ray Strode <rstrode@redhat.com> - 2.18.0-9
-- Apply upstream patch from Ross Burton (upstream bug 416120)
-  to show completed tasks in the clock applet as completed.
-
-* Wed Apr  4 2007 Ray Strode <rstrode@redhat.com> - 2.18.0-8
-- fix invalid read and potentially fix 234544
-
-* Wed Apr  4 2007 Ray Strode <rstrode@redhat.com> - 2.18.0-7
-- Allow users to correct desktop launchers when given an 
-  error initially (bug 233015)
-
-* Tue Apr  3 2007 Ray Strode <rstrode@redhat.com> - 2.18.0-6
-- update the clock after timezone changes (bug 230832)
-
-* Sat Mar 31 2007 Matthias Clasen <mclasen@redhat.com> - 2.18.0-5
-- Remove the bug-buddy patch again; fixed better in libgnome
-
-* Fri Mar 30 2007 Matthias Clasen <mclasen@redhat.com> - 2.18.0-4
-- Fix bug-buddy support in the other applets
-
-* Fri Mar 30 2007 Matthias Clasen <mclasen@redhat.com> - 2.18.0-3
-- Fix bug-buddy support in the clock applet
-
-* Fri Mar 30 2007 Ray Strode <rstrode@redhat.com> - 2.18.0-2
-- hide "Lock Screen" menu item when logged in as root
-
-* Tue Mar 13 2007 Matthias Clasen <mclasen@redhat.com> - 2.18.0-1
-- Update to 2.18.0
-
-* Tue Mar  6 2007 Alexander Larsson <alexl@redhat.com> - 2.17.92-1
-- Add xdg-user-dirs patch
-
-* Wed Feb 28 2007 Matthias Clasen <mclasen@redhat.com> 2.17.92-1
-- Update to 2.17.92
-
-* Tue Feb 13 2007 Matthias Clasen <mclasen@redhat.com> 2.17.91-6
-- Put the fast user switch applet in the default panel configuration
-
-* Tue Feb 13 2007 Matthias Clasen <mclasen@redhat.com> 2.17.91-5
-- Update to 2.17.91
-
-* Sat Feb 10 2007 Matthias Clasen <mclasen@redhat.com> 2.17.91-4.svn20070207
-- Run autoheader since HAVE_LANGINFO_H is missing in config.h.in
-
-* Fri Feb  9 2007 Kristian Høgsberg <krh@redhat.com> 2.17.91-3.svn20070207
-- Update compiz support patch (#227986).
-
-* Thu Feb  8 2007 Matthias Clasen <mclasen@redhat.com> - 2.17.91-2.svn20070207
-- Hide the "Switch User" button on the logout dialog again
-
-* Mon Jan 22 2007 Matthias Clasen <mclasen@redhat.com> - 2.17.90-1
-- Update to 2.17.90
-- Clean up BuildRequires
-- Allow user switching from the logout dialog
-
-* Sun Jan 14 2007 Matthias Clasen <mclasen@redhat.com> - 2.16.2-2
-- Check for the right tracker desktop file
-
-* Tue Dec  5 2006 Matthias Clasen <mclasen@redhat.com> - 2.16.2-1
-- Update to 2.16.2
-- Drop upstreamed patches
-
-* Wed Nov 29 2006 Ray Strode <rstrode@redhat.com> - 2.16.1-8
-- don't ask user if they want to logout if they've set the
-  preference not to 
-
-* Wed Nov 29 2006 Stepan Kasal <skasal@redhat.com> - 2.16.1-7
-- Add BuildRequires: libtool; without it, the aclocal call failed.
-
-* Tue Nov 21 2006 Matthias Clasen <mclasen@redhat.com> - 2.16.1-6
-- Support tracker 
-
-* Thu Nov 16 2006 Matthias Clasen <mclasen@redhat.com> - 2.16.1-5
-- Fix previous patch and also include the fix
-  for gnome bug 359707
-
-* Tue Nov 14 2006 Matthias Clasen <mclasen@redhat.com> - 2.16.1-4
-- Fix copying of launchers by DND, bug 214334
-
-* Tue Nov 14 2006 Ray Strode <rstrode@redhat.com> - 2.16.1-3
-- fix "Add this launcher to panel" chinese translation.
-  Patch by Caius Chance (bug 211569)
-
-* Fri Oct 27 2006 Matthew Barnes <mbarnes@redhat.com> - 2.16.1-2
-- Update BuildRequires for evolution-data-server-devel.
-- Rebuild against evolution-data-server-1.9.1.
-
-* Sat Oct 21 2006 Matthias Clasen <mclasen@redhat.com> - 2.16.1-1
-- Update to 2.16.1
-
-* Wed Oct 18 2006 Matthias Clasen <mclasen@redhat.com> - 2.16.0-5
-- Fix scripts according to packaging guidelines
-
-* Wed Sep 27 2006 Matthias Clasen <mclasen@redhat.com> - 2.16.0-4.fc6
-- Copy translations for "Suspend" menu item from
-  gnome-power-manager
-
-* Tue Sep 19 2006 Matthias Clasen <mclasen@redhat.com> - 2.16.0-3.fc6
-- Fix some directory ownership issues
-- Add a %%preun to uninstall gconf schemas
-- Require hicolor-icon-theme (#204237)
-
-* Mon Sep 18 2006 Soren Sandmann <sandmann@redhat.com> - 2.16.0-2.fc6
-- Add patch to make the pager preference box deal with viewports when compiz
-  is running. (Bug 205905).
-
-* Mon Sep  4 2006 Matthias Clasen <mclasen@redhat.com> - 2.16.0-1.fc6
-- Update to 2.16.0
-
-* Fri Sep  1 2006 Matthias Clasen <mclasen@redhat.com> - 2.15.92-3.fc6
-- Avoid unneeded wakeups in the clock applet (204862)
-
-* Fri Aug 25 2006 Matthias Clasen <mclasen@redhat.com> - 2.15.92-2.fc6
-- Install omf files in the proper location (#201034)
-
-* Mon Aug 21 2006 Matthias Clasen <mclasen@redhat.com> - 2.15.92-1.fc6
-- Update to 2.15.92
-- Require pkgconfig in the -devel package
-- Drop upstreamed patches
-- Drop stale code from .spec
-
-* Fri Aug 18 2006 Matthias Clasen <mclasen@redhat.com> - 2.15.91-4.fc6
-- Make clearing recent files work more than once
-
-* Wed Aug 16 2006 Ray Strode <rstrode@redhat.com> - 2.15.91-3.fc6
-- add more complete fix for bug 201439
-
-* Fri Aug 15 2006 Alexander Larsson <alexl@redhat.com> - 2.15.91-2.fc6
-- Also use beagle for search actions (#201424)
-
-* Sun Aug 13 2006 Matthias Clasen <mclasen@redhat.com> - 2.15.91-1.fc6
-- Update to 2.15.91
-
-* Wed Aug  9 2006 Ray Strode <rstrode@redhat.com> - 2.15.90-5
-- remove suspend from logout dialog
-
--* Mon Aug  7 2006 Matthew Barnes <mbarnes@redhat.com> - 2.15.90-4
-- Rebuild against evolution-data-server-1.7.91
-
-* Mon Aug  7 2006 Ray Strode <rstrode@redhat.com> - 2.15.90-3
-- fix double free in menu editor launcher (bug 201439)
-
-* Fri Aug  4 2006 Ray Strode <rstrode@redhat.com> - 2.15.90-2
-- move suspend to menu again
-- remove autogenerated panel-typebuiltins.c from move-suspend-to-menu (caolanm)
-
-* Fri Aug  4 2006 Ray Strode <rstrode@redhat.com> - 2.15.90-1
-- update to 2.15.90
-
-* Fri Jul 28 2006 Ray Strode <rstrode@redhat.com> - 2.14.2-8
-- don't get stuck in infinite recursion loop from previous
-  fix.  Patch by Fredric Crozat
-
-* Wed Jul 26 2006 Ray Strode <rstrode@redhat.com> - 2.14.2-7
-- don't try to talk to X if the connection is dead (bug 200149)
-
-* Tue Jul 18 2006 Ray Strode <rstrode@redhat.com> - 2.14.2-6
-- change "Suspend" to "Hibernate" where appropriate (bug 190791)
-
-* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 2.14.2-5.1
-- rebuild
-
-* Mon Jun 19 2006 Matthias Clasen <mclasen@redhat.com> - 2.14.2-5
-- Add a patch to support transparent backgrounds in the
-  notification area
-
-* Wed Jun 14 2006 Matthias Clasen <mclasen@redhat.com> - 2.14.2-4
-- Update to new gnome-power-manager interface
-- Conflict with gnome-power-manager < 2.15.3
-
-* Fri Jun  9 2006 Matthias Clasen <mclasen@redhat.com> - 2.14.2-3
-- Add missing BuildRequires
-
-* Mon May 29 2006 Matthias Clasen <mclasen@redhat.com> - 2.14.2-2
-- Update to 2.14.2
-- Drop upstreamed patches
-
-* Mon May 22 2006 Matthias Clasen <mclasen@redhat.com> - 2.14.1-4
-- Make it build in mock
-
-* Fri May 12 2006 Matthias Clasen <mclasen@redhat.com> - 2.14.1-3
-- Close the about dialog
-
-* Mon Apr 10 2006 Matthias Clasen <mclasen@redhat.com> - 2.14.1-2
-- Update to 2.14.1
-- Update patches
-
-* Mon Mar 13 2006 Ray Strode <rstrode@redhat.com> - 2.14.0-1
-- update to 2.14.0
-
-* Tue Feb 28 2006 Karsten Hopp <karsten@redhat.de> 2.13.91-5
-- Buildrequires: ORBit2-devel, which, libxml2-python, libX11-devel,
-  libXt-devel, gnome-doc-utils, dbus-devel
-
-* Mon Feb 27 2006 Ray Strode <rstrode@redhat.com> - 2.13.91-4
-- ignore unknown options (bug 182734)
-
-* Sun Feb 19 2006 Ray Strode <rstrode@redhat.com> - 2.13.91-3
-- bring back shutdown menu item
-
-* Wed Feb 15 2006 Matthias Clasen <mclasen@redhat.com> - 2.13.91-2
-- fix up the gnome-power-manager integration patch
-
-* Mon Feb 13 2006 Matthias Clasen <mclasen@redhat.com> - 2.13.91-1
-- update to 2.13.91
-
-* Mon Feb 13 2006 Ray Strode <rstrode@redhat.com> - 2.13.90-3
-- use beagle if available for search tool
-
-* Sun Feb 12 2006 Ray Strode <rstrode@redhat.com> - 2.13.90-2
-- add first pass at gnome power manager integration
-
-* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 2.13.90-1.2
-- bump again for double-long bug on ppc(64)
-
-* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 2.13.90-1.1
-- rebuilt for new gcc4.1 snapshot and glibc changes
-
-* Fri Jan 27 2006 Matthias Clasen <mclasen@redhat.com> 2.13.90-1
-- Update to 2.13.90
-
-* Fri Jan 20 2006 Matthias Clasen <mclasen@redhat.com> 2.13.5-2
-- Remove "Switch user" button
-
-* Tue Jan 17 2006 Matthias Clasen <mclasen@redhat.com> 2.13.5-1
-- Update to 2.13.5
-
-* Thu Jan  5 2006 Matthias Clasen <mclasen@redhat.com> 2.13.4-1
-- Update to 2.13.4
-- reinstate the desktop-menu-renaming
-
-* Wed Dec 21 2005 Ray Strode <rstrode@redhat.com> 2.13.3-3
-- add patch from cvs to fix crasher bug
-
-* Tue Dec 20 2005 Matthias Clasen <mclasen@redhat.com> 2.13.3-2
-- Rebuild against new libedataserver
-
-* Thu Dec 15 2005 Matthias Clasen <mclasen@redhat.com> 2.13.3-1
-- Update to 2.13.3
-- Use sed rather than patch for po files
-
-* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
-- rebuilt
-
-* Fri Dec  2 2005 Matthias Clasen <mclasen@redhat.com> 2.13.2-1
-- Update to 2.13.2
-
-* Sun Nov 13 2005 John (J5) Palmieri <johnp@redhat.com> 2.12.1-7
-- Fix patch to refrence about-fedora.desktop and not fedora-about.desktop
-
-* Sun Nov 13 2005 John (J5) Palmieri <johnp@redhat.com> 2.12.1-6
-- add about fedora menu item
-- readd gnome-main-menu.png as fedora-logo now installs it to
-  the Bluecurve theme
-
-* Sat Nov 12 2005 Florian La Roche <laroche@redhat.com>
-- remove gnome-main-menu.png as this is part of fedora-logos
-
-* Tue Nov  1 2005 Ray Strode <rstrode@redhat.com> 2.12.1-4
-- rename "Desktop" menu to "System" menu (bug 170812)
-
-* Thu Oct 20 2005 Matthias Clasen  <mclasen@redhat.com> 2.12.1-3
-- Add trash applet to the default setup
-
-* Mon Oct 17 2005 Matthias Clasen  <mclasen@redhat.com> 2.12.1-2
-- Change the "Cancel" button on the "add to" dialog to "Close"
- 
-* Thu Oct  6 2005 Matthias Clasen  <mclasen@redhat.com> 2.12.1-1
-- Update to 2.12.1
-- Update patches
-
-* Fri Sep 30 2005 Mark McLoughlin <markmc@redhat.com> 2.12.0-3
-- Remove hacks to add battery applet to default panel configuration
-  where ACPI/APM is available (#169621) and GIMLET in CJK locales (#169430) 
-
-* Wed Sep 14 2005 Jeremy Katz <katzj@redhat.com> - 2.12.0-2
-- we have mozilla (and e-d-s) on ppc64 now
-
-* Tue Sep  6 2005 Mark McLoughlin <markmc@redhat.com> 2.12.0-1
-- Update to 2.12.0
-
-* Mon Aug 22 2005 Mark McLoughlin <markmc@redhat.com> 2.11.92-1
-- Update to 2.11.92.
-
-* Tue Aug 16 2005 Mark McLoughlin <markmc@redhat.com> 2.11.91-3
-- Rebuild for new cairo
-
-* Wed Aug 10 2005 Mark McLoughlin <markmc@redhat.com> 2.11.91-2
-- Fix "Adjust Date & Time" (#165586)
-
-* Wed Aug 10 2005 Mark McLoughlin <markmc@redhat.com> 2.11.91-1
-- Update to 2.11.91
-
-* Wed Aug 10 2005 Mark McLoughlin <markmc@redhat.com> 2.11.90-2
-- Bump gtk2 req to 2.7.1
-- Remove bogus/stale reqs: libxslt-devel, startup-notification-devel,
-  gnome-keyring, libpng-devel, fontconfig-devel, libtool, automake,
-  autoconf ...
-
-* Thu Aug  4 2005 Matthias Clasen <mclasen@redhat.com> 2.11.90-1
-- New upstream version
-
-* Tue Jul 26 2005 Mark McLoughlin <markmc@redhat.com> 2.11.4-3
-- Rebuild
-
-* Tue Jul 12 2005 Matthias Clasen <mclasen@redhat.com> 2.11.4-2
-- Rebuild
-
-* Fri Jul  8 2005 Matthias Clasen <mclasen@redhat.com> 2.11.4-1
-- Update to 2.11.4
-
-* Mon Jun 27 2005 Mark McLoughlin <markmc@redhat.com> 2.10.1-11
-- Fix "panel doesn't notice new screen size" issue (bug #160439)
-
-* Wed May 11 2005 Mark McLoughlin <markmc@redhat.com> 2.10.1-10
-- Fix "dialogs pop up under panel dialogs" issue (bug #156425)
-
-* Wed May  4 2005 Mark McLoughlin <markmc@redhat.com> 2.10.1-9
-- Fix crash with "Recent Documents" menu (bug #156633)
-
-* Mon May  2 2005 Mark McLoughlin <markmc@redhat.com> 2.10.1-8
-- Update to new OpenOffice.org .desktop file locations in
-  openoffice.org-1.9.97-3 (bug #156064)
-
-* Wed Apr 27 2005 Mark McLoughlin <markmc@redhat.com> - 2.10.1-7
-- Add patch to clamp the size of the icons on the panel at 48x48. Fixes
-  "moved the panel to the side, can't move it back" issue (rh #141743)
-
-* Wed Apr 27 2005 Mark McLoughlin <markmc@redhat.com> 2.10.1-6
-- Reference the OpenOffice.org Impress .desktop file correctly
-
-* Wed Apr 27 2005 Mark McLoughlin <markmc@redhat.com> 2.10.1-5
-- Update launcher locations for OpenOffice.org icons
-
-* Wed Apr 27 2005 Jeremy Katz <katzj@redhat.com> - 2.10.1-4
-- silence %%post
-
-* Mon Apr 25 2005 Mark McLoughlin <markmc@redhat.com> 2.10.1-3
-- Add patch to make Wanda not use non-existent fortune
-  command (rh #152948)
-
-* Mon Apr 18 2005 Mark McLoughlin <markmc@redhat.com> 2.10.1-2
-- Add the battery applet to the panel in %%post if ACPI is
-  available (bug #143828) 
-
-* Mon Apr  4 2005 Mark McLoughlin <markmc@redhat.com> 2.10.1-1
-- Update to 2.10.1
-
-* Mon Mar 28 2005 Christopher Aillon <caillon@redhat.com>
-- rebuilt
-
-* Fri Mar 25 2005 Christopher Aillon <caillon@redhat.com> 2.10.0-2
-- Update the GTK+ theme icon cache on (un)install
-
-* Mon Mar 14 2005 Matthias Clasen <mclasen@redhat.com> 2.10.0-1
-- Update to 2.10.0
-- Bump BuildRequires for libwnck
-- Update patches
-
-* Wed Mar  4 2005 Mark McLoughlin <markmc@redhat.com> 2.9.91-4
-- Fix a BuildRequires
-
-* Wed Mar  2 2005 Mark McLoughlin <markmc@redhat.com> 2.9.91-3
-- Rebuild with gcc4
-
-* Thu Feb 10 2005 Mark McLoughlin <markmc@redhat.com> - 2.9.91-2
-- Require gnome-desktop 2.9.91
-
-* Wed Feb  9 2005 Matthias Clasen <mclasen@redhat.com> - 2.9.91-1
-- Update to 2.9.91
-
-* Mon Feb  7 2005 Mark McLoughlin <markmc@redhat.com> - 2.9.90-4
-- Don't use --makefile-install-rule to install .entries files (#147112)
-
-* Fri Feb  4 2005 Mark McLoughlin <markmc@redhat.com> - 2.9.90-3
-- Update schemas list (#147112)
-
-* Thu Feb  3 2005 Matthias Clasen <mclasen@redhat.com> - 2.9.90-2
-- Look for vendor-prefixed .desktop files
-
-* Mon Jan 31 2005 Matthias Clasen <mclasen@redhat.com> - 2.9.90
-- Update to 2.9.90
-
-* Fri Jan 28 2005 Florian La Roche <laroche@redhat.com>
-- rebuild
-
-* Thu Jan 27 2005 Jeremy Katz <katzj@redhat.com> - 2.8.1-8
-- really disable e-d-s support
-
-* Wed Jan 26 2005 David Malcolm <dmalcolm@redhat.com> - 2.8.1-7
-- Make the evolution-data-server dependency optional at packaging time.
-- Disable it for now to ease transition to Evolution 2.2 (bug #146283)
-
-* Fri Nov 26 2004 Mark McLoughlin <markmc@redhat.com> - 2.8.1-6
-- Add patch to fix launcher animation artifact (bug #136938)
-
-* Fri Nov 12 2004 Mark McLoughlin <markmc@redhat.com> - 2.8.1-5
-- Use /apps/panel for configuration so that homedir sharing with
-  previous versions works reasonably well. This is the location
-  upstream is using from GNOME 2.10 onwards.
-- Install old pager.schemas and tasklist.schemas so that
-  old configurations which reference the old schema names
-  continue to work
-
-* Mon Nov  1 2004 Mark McLoughlin <markmc@redhat.com> - 2.8.1-4
-- Fix use-correct-applications-uri patch to not crash on
-  ia64 - fix from Dave Malcolm (#136908)
-
-* Mon Oct 18 2004  <jrb@redhat.com> - 2.8.1-3
-- change redhat-web.desktop and redhat-email.desktop to be in /usr/share instead of using the menu path
-
-* Fri Oct 15 2004 Matthias Clasen <mclasen@redhat.com>
-- Make dropping non-ASCII uris work.  (#135874)
-
-* Tue Oct 12 2004 Mark McLoughlin <markmc@redhat.com>
-- Update to 2.8.1
-- Change the default no. pager rows back to 1
-- Add a new tamil translation
-
-* Thu Oct  7 2004 Mark McLoughlin <markmc@redhat.com> 2.8.0.1-3
-- Add the Input Method Switcher applet in certain locales (#134659)
-
-* Fri Oct  1 2004 Mark McLoughlin <markmc@redhat.com> 2.8.0.1-2
-- New panel layout from Bryan and Seth
-
-* Wed Sep 29 2004 Mark McLoughlin <markmc@redhat.com> 2.8.0.1-1
-- Update to 2.8.0.1
-
-* Tue Sep 21 2004 Mark McLoughlin <markmc@redhat.com> 2.8.0-2
-- Remove the print launcher from the default setup - it was removed
-  from the desktop-printing package a while ago 
-
-* Tue Sep 21 2004 Mark McLoughlin <markmc@redhat.com> 2.8.0-1
-- Update to 2.8.0
-
-* Tue Aug 31 2004 Mark McLoughlin <markmc@redhat.com> 2.7.92.1-1
-- Update to 2.7.92.1
-
-* Mon Aug 30 2004 Mark McLoughlin <markmc@redhat.com> 2.7.92-1
-- Update to 2.7.92
-
-* Wed Aug 25 2004 Mark McLoughlin <markmc@redhat.com> 2.7.91.1-2
-- Pipe gconftool stdout to /dev/null - fixes bug #130506
-
-* Thu Aug 19 2004 Mark McLoughlin <markmc@redhat.com> 2.7.91.1-1
-- Update to 2.7.91.1
-
-* Wed Aug 18 2004 Mark McLoughlin <markmc@redhat.com> 2.7.91-1
-- Update to 2.7.91
-
-* Tue Aug 10 2004 Mark McLoughlin <markmc@redhat.com> - 2.7.90-1
-- Update to 2.7.90 and remove a bunch of patches
-
-* Mon Aug  2 2004 David Malcolm <dmalcolm@redhat.com> - 2.6.0-11
-- added dependency on evolution-data-server and rebuilt
-
-* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
-- rebuilt
-
-* Mon Apr 19 2004 Mark McLoughlin <markmc@redhat.com> 2.6.0-9
-- Install battstat on the default panel on ppc too
-
-* Mon Apr 19 2004 Mark McLoughlin <markmc@redhat.com> 2.6.0-8
-- Only put the battstat applet on the default panel on ix86 (i.e. the
-  platforms where apmd is built) - bug #121098
-
-* Thu Apr 15 2004 Mark McLoughlin <markmc@redhat.com> 2.6.0-7
-- Fix typo with laptop battery detection scriptlet - bug #120921
-
-* Thu Apr 15 2004 Mark McLoughlin <markmc@redhat.com> 2.6.0-6
-- Overwrite panel-compatibility.schemas with
-  redhat-panel-backwards-compat-config.schemas and install that so
-  it doesn't seem like we've forgotten panel-compatibility.schemas
-
-* Thu Apr  8 2004 Mark McLoughlin <markmc@redhat.com> 2.6.0-5
-- Fix problem with apm detection in %%post on machines whose
-  APM bios doesn't have battery lifetime support
-
-* Wed Apr  7 2004 Mark McLoughlin <markmc@redhat.com> - 2.6.0-4
-- Add patch to make the applications list in the run dialog work
-  correctly with the new vfs menu module. Bug #118305.
-
-* Mon Apr  5 2004 Mark McLoughlin <markmc@redhat.com> 2.6.0-3
-- Fix "vailed to parse hour_format" warnings on install (bug #119956)
-
-* Fri Apr  5 2004 Mark McLoughlin <markmc@redhat.com> - 2.6.0-2
-- Add patches to fixup how we install the default setup
-- Require GConf2-2.6.0-2 for gconftool-2 --load fix
-
-* Wed Mar 31 2004 Mark McLoughlin <markmc@redhat.com> 2.6.0-1
-- Update to 2.6.0
-
-* Wed Mar 10 2004 Mark McLoughlin <markmc@redhat.com>
-- Update to 2.5.92
-
-* Wed Mar 03 2004 Mark McLoughlin <markmc@redhat.com> 2.5.91-2
-- Use the main menu icon in the menu bar (#100407)
-
-* Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
-- rebuilt
-
-* Tue Mar 02 2004 Mark McLoughlin <markmc@redhat.com> 2.5.91-1
-- Update to 2.5.91
-- Split off a -devel package (#108618)
-- Add a scrollkeeper PreReq and scrollkeeper, intltool and
-  libpng-devel BuildRequires. (#110928, Maxim Dzumanenko)
-
-* Fri Feb 27 2004 Mark McLoughlin <markmc@redhat.com> 2.5.90-1
-- Update to 2.5.90
-- Resolve conflicts with the lockf patch and re-work slightly
-
-* Thu Feb 19 2004 Jeremy Katz <katzj@redhat.com> - 2.5.3.1-6
-- and again for real this time
-
-* Wed Feb 18 2004 Jeremy Katz <katzj@redhat.com> - 2.5.3.1-5
-- rebuild without e-d-s
-
-* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
-- rebuilt
-
-* Fri Feb 06 2004 Dan Williams <dcbw@redhat.com> 2.5.3.1-3
-- Add in file locking retries for egg-recent-model stuff, as with
-   gedit.  Makes gnome-panel and other apps like gedit not fight
-   for recent files list on NFS home directories
-
-* Tue Jan 27 2004 Alexander Larsson <alexl@redhat.com> 2.5.3.1-2
-- Add evolution-data-server dependency and rebuild
-
-* Thu Oct  9 2003 Owen Taylor <otaylor@redhat.com> 2.4.0-2
-- Look up the largest size available when picking default images for 
-  panel stock icons (#106673)
-
-* Thu Sep  4 2003 Alexander Larsson <alexl@redhat.com> 2.3.90-1
-- update to 2.3.90
-- Add backwards compat panel config schemas
-
-* Wed Aug 27 2003 Alexander Larsson <alexl@redhat.com> 2.3.7-1
-- update to 2.3.7
-- patch the right icon for the main menu (#102672)
-- PreReq a new gconf (#102530)
-
-* Mon Aug 25 2003 Alexander Larsson <alexl@redhat.com> 2.3.6.2-4
-- Don't lock all objects on panel
-- use "make DESTDIR=... install" so gconf rules are right
-
-* Mon Aug 18 2003 Alexander Larsson <alexl@redhat.com> 2.3.6.2-3
-- Update the default panel setup handling to the new way
-
-* Thu Aug 14 2003 Jonathan Blandford <jrb@redhat.com> 2.3.6.2-1
-- remove the right .la files.
-
-* Thu Aug 14 2003 Alexander Larsson <alexl@redhat.com> 2.3.6.2-1
-- update for gnome 2.3
-
-* Tue Jul 29 2003 Havoc Pennington <hp@redhat.com> 2.2.2.1-3
-- disable gtk doc
-
-* Mon Jul 28 2003 Havoc Pennington <hp@redhat.com> 2.2.2.1-3
-- rebuild
-
-* Wed Jul  9 2003 Alexander Larsson <alexl@redhat.com> 2.2.2.1-2
-- Fix redhat menu icon
-
-* Mon Jul  7 2003 Havoc Pennington <hp@redhat.com> 2.2.2.1-1
-- 2.2.2.1
-- remove memleaks patch, now upstream
-- remove applet-sm patch now upstream
-- remove "null" patch, now upstream
-- remove recent-monitor patch now upstream
-- remove notification area crash fix, now upstream
-
-* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
-- rebuilt
-
-* Mon Feb 24 2003 Elliot Lee <sopwith@redhat.com>
-- debuginfo rebuild
-
-* Mon Feb 24 2003 Elliot Lee <sopwith@redhat.com> 2.2.0.1-8
-- Rebuild with an updated libtool to fix #84742
-
-* Thu Feb 20 2003 Havoc Pennington <hp@redhat.com> 2.2.0.1-6
-- fix memleaks, #84489 #84467
-- use icon theme for button widgets instead of stock ID #82301
-
-* Fri Feb 14 2003 Havoc Pennington <hp@redhat.com> 2.2.0.1-5
-- disable session management for all applets
-
-* Tue Feb 11 2003 Havoc Pennington <hp@redhat.com> 2.2.0.1-4
-- fix #83683 for real, very embarassing bug in the end
-
-* Tue Feb 11 2003 Havoc Pennington <hp@redhat.com> 2.2.0.1-3
-- add assertions to try to narrow down #83683 more
-
-* Tue Feb 11 2003 Tim Waugh <twaugh@redhat.com> 2.2.0.1-2
-- Fix notification area crash (bug #83683).
-
-* Wed Feb  5 2003 Havoc Pennington <hp@redhat.com> 2.2.0.1-1
-- 2.2.0.1
-
-* Mon Feb  3 2003 Matt Wilson <msw@redhat.com> 2.2.0-2
-- added gnome-panel-2.1.90.1-null.patch to avoid segv on 64 bit platforms
-  #82978
-
-* Mon Feb  3 2003 Alexander Larsson <alexl@redhat.com> 2.2.0-1
-- Update to 2.2.0
-- Add patch to disable monitoring in recent-files, since it made you not able to unmount cds.
-
-* Thu Jan 30 2003 Matt Wilson <msw@redhat.com> 2.1.90.1-6
-- disable optimizations on x86_64 to work around gcc bug
-
-* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
-- rebuilt
-
-* Mon Jan 13 2003 Jonathan Blandford <jrb@redhat.com>
-- put the control-center second
-
-* Sat Jan 11 2003 Havoc Pennington <hp@redhat.com>
-- fix the extra separator left when we lack screenshot menuitem
-
-* Fri Jan 10 2003 Havoc Pennington <hp@redhat.com>
-- fix the clock
-
-* Thu Jan  9 2003 Havoc Pennington <hp@redhat.com>
-- remove enhanced-errors patch now upstream
-- change how we're doing the laptop-specific config to avoid cut-and-paste
-- update clock-addons patch
-- remove hardcoded change to default panel icon size, we'll put it in bluecurve
-  theme.
-- run xscreensaver fortune instead of just "fortune" from the fish
-- add printer icon to panel
-
-* Wed Jan  8 2003 Havoc Pennington <hp@redhat.com>
-- 2.1.90.1
-
-* Mon Dec 16 2002 Tim Powers <timp@redhat.com> 2.1.4-4
-- rebuild
-
-* Mon Dec 16 2002 Havoc Pennington <hp@redhat.com>
-- rebuild
-
-* Sat Dec 14 2002 Havoc Pennington <hp@redhat.com>
-- require gnome-desktop 2.1.4
-- include datadir/fish
-
-* Fri Dec 13 2002 Havoc Pennington <hp@redhat.com>
-- 2.1.4
-
-* Mon Dec  2 2002 Havoc Pennington <hp@redhat.com>
-- 2.1.3
-- build req startup-notification-devel
-
-* Wed Nov 13 2002 Havoc Pennington <hp@redhat.com>
-- 2.1.2
-- system tray is now in the main gnome-panel package
-
-* Wed Oct 23 2002 Havoc Pennington <hp@redhat.com>
-- 2.0.10
-- remove memleaks-and-clock-format patch, should be upstream
-- remove WIN_POS_MOUSE purge, done upstream
-
-* Mon Oct 14 2002 Florian La Roche <Florian.LaRoche@redhat.de>
-- fix postun script
-
-* Tue Oct  8 2002 Havoc Pennington <hp@redhat.com>
-- 2.0.9 with menu edit stuff
-- system-tray-applet 0.15 that doesn't crash all the time
-- merge/remove patches as appropriate
-
-* Wed Aug 28 2002 Owen Taylor <otaylor@redhat.com>
-- Fix problem with "hold down print screen" (71432)
-
-* Tue Aug 27 2002 Jonathan Blandford <jrb@redhat.com>
-- panel-properties OnlyShowIn=GNOME;
-- somehow the po file got screwed up.  Works now
-- update po files
-
-* Sun Aug 25 2002 Havoc Pennington <hp@redhat.com>
-- fix from #71762 for clock applet popdown key
-- no WIN_POS_MOUSE fixes #72167
-- fix for #72540 from George
-
-* Wed Aug 21 2002 Havoc Pennington <hp@redhat.com>
-- system tray applet 0.11 with a small memleak fix and a couple translations
-
-* Thu Aug 15 2002 Jonathan Blandford <jrb@redhat.com>
-- menu tweaks
-
-* Wed Aug 14 2002 Tim Powers <timp@redhat.com>
-- bump release
-
-* Wed Aug 14 2002 Preston Brown <pbrown@redhat.com>
-- put battery applet on panel for laptops (#67296)
-
-* Mon Aug 12 2002 Havoc Pennington <hp@redhat.com>
-- 2.0.6 final from gnome 2.0.1
-- remove gnome-panel-screenshot patch now upstream
-
-* Thu Aug  8 2002 Jonathan Blandford <jrb@redhat.com>
-- new system-tray-applet version
-- Fix gnome-panel-screenshot
-
-* Tue Aug  6 2002 Havoc Pennington <hp@redhat.com>
-- 2.0.4
-- replace gnome-logo-icon-transparent.png with redhat-main-menu.png
-  for the foot menu
-
-* Fri Aug  2 2002 Havoc Pennington <hp@redhat.com>
-- fix desktop (logout/lock) menu item location
-  in Alt+F1 and in new menu applets
-- remove Screenshot... menu item
-
-* Fri Aug  2 2002 Havoc Pennington <hp@redhat.com>
-- move around default applets, remove some of them
-- system tray 0.9
-- change default menu flags
-- blow unpackaged files out of build root
-
-* Wed Jul 31 2002 Havoc Pennington <hp@redhat.com>
-- 2.0.3
-- own libexecdir stuff
-
-* Thu Jul 25 2002 Havoc Pennington <hp@redhat.com>
-- new system tray that's prettier and doesn't clip the icon
-
-* Wed Jul 24 2002 Havoc Pennington <hp@redhat.com>
-- system tray 0.7 that doesn't crash on startup
-- get Mozilla desktop file right so we get web browser launcher
-
-* Wed Jul 24 2002 Havoc Pennington <hp@redhat.com>
-- system tray 0.6 with server file fixed (work dammit)
-
-* Tue Jul 23 2002 Havoc Pennington <hp@redhat.com>
-- tweak applet positions but I think it's just broken
-- system tray 0.5 moved back to libdir not libexecdir
-
-* Tue Jul 23 2002 Havoc Pennington <hp@redhat.com>
-- remove ltmain.sh hack
-- new system-tray-applet that works
-
-* Tue Jul 23 2002 Havoc Pennington <hp@redhat.com>
-- put office suite stuff on the panel
-
-* Tue Jul 23 2002 Havoc Pennington <hp@redhat.com>
-- 2.0.2.90 cvs snap
-
-* Wed Jul 10 2002 Havoc Pennington <hp@redhat.com>
-- update the clock patch to be a little smarter in a couple ways
-
-* Thu Jun 27 2002 Owen Taylor <otaylor@redhat.com>
-- Fix problem where system tray applet was being looked for in /unst
-- Fix a crash in the system tray applet
-
-* Wed Jun 26 2002 Owen Taylor <otaylor@redhat.com>
-- Fix typo in the pt_BR translation that was causing GConf problems
-
-* Mon Jun 24 2002 Havoc Pennington <hp@redhat.com>
-- add the system tray applet
-- add system tray applet by default
-- add more launcher by default
-
-* Fri Jun 21 2002 Tim Powers <timp@redhat.com>
-- automated rebuild
-
-* Thu Jun 20 2002 Havoc Pennington <hp@redhat.com>
-- use correct gettext package name, and add check for missing translations
-
-* Mon Jun 17 2002 Havoc Pennington <hp@redhat.com>
-- add the calendar and configuration patch 
-
-* Sun Jun 16 2002 Havoc Pennington <hp@redhat.com>
-- 2.0.0
-- add control center desktop file to file list
-- add gnome-panelrc to file list
-- try fixing panel size (blind, no text box at home)
-
-* Tue Jun 11 2002 Havoc Pennington <hp@redhat.com>
-- rebuild in different environment
-
-* Tue Jun 11 2002 Havoc Pennington <hp@redhat.com>
-- updates to default configuration
-
-* Tue Jun 11 2002 Havoc Pennington <hp@redhat.com>
-- fix schemas installation
-
-* Tue Jun 11 2002 Havoc Pennington <hp@redhat.com>
-- unset old panel schemas when installing new ones
-- put in a broken panel config to see errors about
-- add a patch to give some decent error messages about what's wrong
-  with the default panel config
-
-* Sun Jun 09 2002 Havoc Pennington <hp@redhat.com>
-- rebuild in different environment
-
-* Sun Jun  9 2002 Havoc Pennington <hp@redhat.com>
-- don't provide/obsolete gnome-core
-
-* Fri Jun 07 2002 Havoc Pennington <hp@redhat.com>
-- rebuild in different environment
-
-* Wed Jun  5 2002 Havoc Pennington <hp@redhat.com>
-- 1.5.24
-- ldconfig
-
-* Mon Jun 03 2002 Havoc Pennington <hp@redhat.com>
-- rebuild in different environment
-
-* Fri May 31 2002 Havoc Pennington <hp@redhat.com>
-- 1.5.23
-
-* Sun May 26 2002 Tim Powers <timp@redhat.com>
-- automated rebuild
-
-* Tue May 21 2002 Havoc Pennington <hp@redhat.com>
-- rebuild in different environment
-
-* Tue May 21 2002 Havoc Pennington <hp@redhat.com>
-- 1.5.22
-- provide gnome-core
-- add a bunch of extra build requires so build system 
-  won't get confused
-
-* Fri May  3 2002 Havoc Pennington <hp@redhat.com>
-- 1.5.19
-
-* Fri Apr 19 2002 Havoc Pennington <hp@redhat.com>
-- add the keep-libtool-from-relinking hack so 
-  we get the gen util applet
-
-* Fri Apr 19 2002 Havoc Pennington <hp@redhat.com>
-- obsoletes gnome-core-devel
-- include libdir/*.so
-
-* Fri Apr 19 2002 Havoc Pennington <hp@redhat.com>
-- get libpanel-applet in the package
-
-* Tue Apr 16 2002 Havoc Pennington <hp@redhat.com>
-- Initial build.
-
-
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 <panel-applet.h>
- #include <panel-applet-gconf.h>
-+#include <gconf/gconf-client.h>
- 
- #include <glib/gi18n.h>
- #include <gtk/gtk.h>
-@@ -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 @@
-+<?xml version="1.0"?>
-+<gconfschemafile>
-+    <schemalist>
-+      <schema>
-+        <key>/schemas/apps/notification_area_applet/prefs/padding</key>
-+        <owner>notification-area-applet</owner>
-+        <type>int</type>
-+        <default>3</default>
-+        <locale name="C">
-+          <short>Padding</short>
-+          <long>
-+            This key specifies padding to be put around status icons.
-+          </long>
-+        </locale>
-+      </schema>
-+    </schemalist>
-+</gconfschemafile>
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 <dsd@laptop.org>
-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 @@
-     </schema>
-  
-     <schema>
-+      <key>/schemas/apps/panel/toplevels/padding</key>
-+      <owner>panel</owner>
-+      <type>int</type>
-+      <default>0</default>
-+      <locale name="C">
-+        <short>Padding</short>
-+        <long>
-+          Padding that will be inserted between objects on this panel.
-+        </long>
-+      </locale>
-+    </schema>
-+ 
-+    <schema>
-       <key>/schemas/apps/panel/toplevels/x</key>
-       <owner>panel</owner>
-       <type>int</type>
-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 <glib/gi18n.h>
- #include <gio/gio.h>
- #include <gdk/gdkx.h>
-+#include <gmenu-tree.h>
- 
- #include <libpanel-util/panel-error.h>
- #include <libpanel-util/panel-glib.h>
-@@ -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 <gio/gio.h>
-+
- 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__ */
diff --git a/redhat-panel-backwards-compat-config.schemas b/redhat-panel-backwards-compat-config.schemas
deleted file mode 100644
index 2cdaf44..0000000
--- a/redhat-panel-backwards-compat-config.schemas
+++ /dev/null
@@ -1,1473 +0,0 @@
-<?xml version="1.0"?>
-<gconfschemafile>
-
-<!-- 
-These are the factory defaults for what's on the panel. To change them 
-locally, you can edit this file and rebuild the RPM, or you can just 
-set values in the /etc/gconf/gconf.xml.defaults source using gconftool - 
-see http://www.gnome.org/projects/gconf/
--->
-
-    <schemalist>    
-
-
-
-<!--
-*********************************************************************************
-** Small Screen Setup: 1 edge panel of size 24                                 **
-*********************************************************************************
--->
-
-<!-- ********************************* -->
-<!-- General panel properties :: START -->
-<!-- ********************************* -->
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/small/general/show_program_list</key>
-        <owner>panel</owner>
-        <type>bool</type>
-        <default>false</default>
-        <locale name="C">
-          <short>Show the program listing in the Run box</short>
-          <long>Show the program listing by default when opening the Run box</long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/small/general/enable_program_list</key>
-        <owner>panel</owner>
-        <type>bool</type>
-        <default>true</default>
-        <locale name="C">
-          <short>Enable the program listing in the run box</short>
-          <long>Enable the program listing in the run box</long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/small/general/panel_id_list</key>
-        <owner>panel</owner>
-        <type>list</type>
-	<list_type>string</list_type>
-        <default>[bottom_panel]</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/small/general/applet_id_list</key>
-        <owner>panel</owner>
-        <type>list</type>
-	<list_type>string</list_type>
-        <default>[]</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/small/general/object_id_list</key>
-        <owner>panel</owner>
-        <type>list</type>
-	<list_type>string</list_type>
-        <default>[]</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-<!-- ******************************* -->
-<!-- General panel properties :: END -->
-<!-- ******************************* -->
-
-<!-- ****************************** -->      
-<!-- Edge panel properties :: START -->
-<!-- ****************************** -->
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/panel_type</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>edge-panel</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-      
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/panel_size</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>panel-size-small</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/panel_hide_mode</key>
-        <owner>panel</owner>
-        <type>int</type>
-        <default>0</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/panel_hide_state</key>
-        <owner>panel</owner>
-        <type>int</type>
-        <default>0</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/screen_id</key>
-        <owner>panel</owner>
-        <type>int</type>
-        <default>0</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/screen_edge</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>panel-edge-bottom</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/hide_buttons_enabled</key>
-        <owner>panel</owner>
-        <type>bool</type>
-        <default>false</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/hide_button_pixmaps_enabled</key>
-        <owner>panel</owner>
-        <type>bool</type>
-        <default>true</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/panel_background_type</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>no-background</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/panel_background_pixmap</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default></default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/panel_background_pixmap_fit</key>
-        <owner>panel</owner>
-        <type>bool</type>
-        <default>true</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/panel_background_pixmap_stretch</key>
-        <owner>panel</owner>
-        <type>bool</type>
-        <default>false</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-      
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/panel_background_pixmap_rotate</key>
-        <owner>panel</owner>
-        <type>bool</type>
-        <default>true</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-     
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/panel_background_color</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>#000000</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-<!-- **************************** -->      
-<!-- Edge panel properties :: END -->
-<!-- **************************** -->
-     
-
-<!--
-******************************************************************************************
-** Medium Screen Setup: 1 edge panel of size 36, 1 menu panel of size 24                **
-******************************************************************************************
--->
-
-<!-- ********************************* -->
-<!-- General panel properties :: START -->
-<!-- ********************************* -->
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/general/advanced_run_dialog</key>
-        <owner>panel</owner>
-        <type>bool</type>
-        <default>false</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/general/panel_id_list</key>
-        <owner>panel</owner>
-        <type>list</type>
-	<list_type>string</list_type>
-        <default>[bottom_panel]</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>     
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/general/applet_id_list</key>
-        <owner>panel</owner>
-        <type>list</type>
-	<list_type>string</list_type>
-        <default>[tasklist_applet,pager_applet,tray_applet,clock_applet]</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema> 
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/general/object_id_list</key>
-        <owner>panel</owner>
-        <type>list</type>
-	<list_type>string</list_type>
-        <default>[main_menu,web_browser_launcher,email_launcher,wordprocessor_launcher,presentations_launcher,spreadsheet_launcher,print_launcher]</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>     
-
-<!-- ******************************* -->
-<!-- General panel properties :: END -->
-<!-- ******************************* -->
-
-<!-- ****************************** -->      
-<!-- Edge panel properties :: START -->
-<!-- ****************************** -->
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_type</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>edge-panel</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-      
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_size</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>panel-size-medium</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_hide_mode</key>
-        <owner>panel</owner>
-        <type>int</type>
-        <default>0</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_hide_state</key>
-        <owner>panel</owner>
-        <type>int</type>
-        <default>0</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/screen_id</key>
-        <owner>panel</owner>
-        <type>int</type>
-        <default>0</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/screen_edge</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>panel-edge-bottom</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/hide_buttons_enabled</key>
-        <owner>panel</owner>
-        <type>bool</type>
-        <default>false</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/hide_button_pixmaps_enabled</key>
-        <owner>panel</owner>
-        <type>bool</type>
-        <default>false</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_background_type</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>no-background</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_background_pixmap</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default></default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_background_pixmap_fit</key>
-        <owner>panel</owner>
-        <type>bool</type>
-        <default>true</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_background_pixmap_stretch</key>
-        <owner>panel</owner>
-        <type>bool</type>
-        <default>false</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-      
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_background_pixmap_rotate</key>
-        <owner>panel</owner>
-        <type>bool</type>
-        <default>true</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-     
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_background_color</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>#000000</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <!-- Main Menu -->
-
-      <!-- add custom_icon and custom_icon_file keys to replace icon -->
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/main_menu/object_type</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>menu-object</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/main_menu/panel_id</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>bottom_panel</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-     
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/main_menu/path</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>applications:///</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/main_menu/main-menu</key>
-        <owner>panel</owner>
-        <type>bool</type>
-        <default>true</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/main_menu/global-menu</key>
-        <owner>panel</owner>
-        <type>bool</type>
-        <default>false</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <!-- The person who made this a bitfield stored as an int needs some buttkicking -->
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/main_menu/main-menu-flags</key>
-        <owner>panel</owner>
-        <type>int</type>
-        <default>24580</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-      
-      <!-- Launchers -->
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/web_browser_launcher/object_type</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>launcher-object</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-     
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/web_browser_launcher/launcher_location</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>applications:///Internet/redhat-web.desktop</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-     
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/web_browser_launcher/panel_id</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>bottom_panel</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-     
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/web_browser_launcher/position</key>
-        <owner>panel</owner>
-        <type>int</type>
-        <default>50</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-     
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/web_browser_launcher/panel_right_stick</key>
-        <owner>panel</owner>
-        <type>bool</type>
-        <default>false</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-     
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/terminal_launcher/object_type</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>launcher-object</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/terminal_launcher/launcher_location</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>applications:///System/gnome-terminal.desktop</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-     
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/terminal_launcher/panel_id</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>bottom_panel</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-     
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/terminal_launcher/position</key>
-        <owner>panel</owner>
-        <type>int</type>
-        <default>300</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-     
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/terminal_launcher/panel_stick</key>
-        <owner>panel</owner>
-        <type>bool</type>
-        <default>false</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/email_launcher/object_type</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>launcher-object</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-     
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/email_launcher/launcher_location</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>applications:///Internet/redhat-email.desktop</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-     
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/email_launcher/panel_id</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>bottom_panel</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-     
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/email_launcher/position</key>
-        <owner>panel</owner>
-        <type>int</type>
-        <default>100</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-     
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/email_launcher/panel_right_stick</key>
-        <owner>panel</owner>
-        <type>bool</type>
-        <default>false</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-         <!-- start -->
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/wordprocessor_launcher/object_type</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>launcher-object</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-     
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/wordprocessor_launcher/launcher_location</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>applications:///Office/redhat-word-processor.desktop</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-     
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/wordprocessor_launcher/panel_id</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>bottom_panel</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-     
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/wordprocessor_launcher/position</key>
-        <owner>panel</owner>
-        <type>int</type>
-        <default>150</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-     
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/wordprocessor_launcher/panel_right_stick</key>
-        <owner>panel</owner>
-        <type>bool</type>
-        <default>false</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-         <!-- end -->
-
-
-
-         <!-- start -->
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/presentations_launcher/object_type</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>launcher-object</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-     
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/presentations_launcher/launcher_location</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>applications:///Office/redhat-presentations.desktop</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-     
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/presentations_launcher/panel_id</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>bottom_panel</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-     
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/presentations_launcher/position</key>
-        <owner>panel</owner>
-        <type>int</type>
-        <default>200</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-     
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/presentations_launcher/panel_right_stick</key>
-        <owner>panel</owner>
-        <type>bool</type>
-        <default>false</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-         <!-- end -->
-
-
-
-         <!-- start -->
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/spreadsheet_launcher/object_type</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>launcher-object</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-     
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/spreadsheet_launcher/launcher_location</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>applications:///Office/redhat-spreadsheet.desktop</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-     
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/spreadsheet_launcher/panel_id</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>bottom_panel</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-     
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/spreadsheet_launcher/position</key>
-        <owner>panel</owner>
-        <type>int</type>
-        <default>250</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-     
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/spreadsheet_launcher/panel_right_stick</key>
-        <owner>panel</owner>
-        <type>bool</type>
-        <default>false</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-         <!-- end -->
-
-
-         <!-- start -->
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/print_launcher/object_type</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>launcher-object</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-     
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/print_launcher/launcher_location</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>applications:///Accessories/redhat-print.desktop</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-     
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/print_launcher/panel_id</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>bottom_panel</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-     
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/print_launcher/position</key>
-        <owner>panel</owner>
-        <type>int</type>
-        <default>260</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-     
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/print_launcher/panel_right_stick</key>
-        <owner>panel</owner>
-        <type>bool</type>
-        <default>false</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-         <!-- end -->
-
-
-
-
-         <!-- start -->
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/help_launcher/object_type</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>launcher-object</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-     
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/help_launcher/launcher_location</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>applications:///gnome-yelp.desktop</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-     
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/help_launcher/panel_id</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>bottom_panel</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-     
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/help_launcher/position</key>
-        <owner>panel</owner>
-        <type>int</type>
-        <default>300</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-     
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/objects/help_launcher/panel_right_stick</key>
-        <owner>panel</owner>
-        <type>bool</type>
-        <default>false</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-         <!-- end -->
-
-     
-      <!-- Applets -->
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/applets/tasklist_applet/object_type</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>bonobo-applet</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-      
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/applets/tasklist_applet/panel_id</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>bottom_panel</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-     
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/applets/tasklist_applet/position</key>
-        <owner>panel</owner>
-        <type>int</type>
-        <default>375</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-      
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/applets/tasklist_applet/bonobo_iid</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>OAFIID:GNOME_TasklistApplet</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/applets/tasklist_applet/panel_right_stick</key>
-        <owner>panel</owner>
-        <type>bool</type>
-        <default>false</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/applets/pager_applet/object_type</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>bonobo-applet</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-      
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/applets/pager_applet/panel_id</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>bottom_panel</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-      
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/applets/pager_applet/position</key>
-        <owner>panel</owner>
-        <type>int</type>
-        <default>325</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-      
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/applets/pager_applet/bonobo_iid</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>OAFIID:GNOME_PagerApplet</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-      
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/applets/pager_applet/panel_right_stick</key>
-        <owner>panel</owner>
-        <type>bool</type>
-        <default>false</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <!-- clock -->
- 
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/applets/clock_applet/object_type</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>bonobo-applet</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-      
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/applets/clock_applet/panel_id</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>bottom_panel</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-     
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/applets/clock_applet/position</key>
-        <owner>panel</owner>
-        <type>int</type>
-        <default>0</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-      
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/applets/clock_applet/bonobo_iid</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>OAFIID:GNOME_ClockApplet</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/applets/clock_applet/panel_right_stick</key>
-        <owner>panel</owner>
-        <type>bool</type>
-        <default>true</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-      
-
-      <!-- tray -->
- 
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/applets/tray_applet/object_type</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>bonobo-applet</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-      
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/applets/tray_applet/panel_id</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>bottom_panel</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-     
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/applets/tray_applet/position</key>
-        <owner>panel</owner>
-        <type>int</type>
-        <default>70</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-      
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/applets/tray_applet/bonobo_iid</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>OAFIID:GNOME_SystemTrayApplet</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/medium/applets/tray_applet/panel_right_stick</key>
-        <owner>panel</owner>
-        <type>bool</type>
-        <default>true</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-            
-
-<!-- *********************************** -->
-<!-- Panel Items for Edge Panel :: END -->
-<!-- *********************************** -->
-
-<!-- **************************** -->      
-<!-- Edge panel properties :: END -->
-<!-- **************************** -->
-
-<!-- 
-***********************************************************************************
-** Large Screen Setup: 1 edge panel of size 48, 1 menu panel of size 36          **
-***********************************************************************************
--->
-
-<!-- ********************************* -->
-<!-- General panel properties :: START -->
-<!-- ********************************* -->
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/large/general/advanced_run_dialog</key>
-        <owner>panel</owner>
-        <type>bool</type>
-        <default>false</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/large/general/panel_id_list</key>
-        <owner>panel</owner>
-        <type>list</type>
-	<list_type>string</list_type>
-        <default>[bottom_panel]</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/large/general/applet_id_list</key>
-        <owner>panel</owner>
-        <type>list</type>
-	<list_type>string</list_type>
-        <default>[]</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/large/general/object_id_list</key>
-        <owner>panel</owner>
-        <type>list</type>
-	<list_type>string</list_type>
-        <default>[]</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-<!-- ******************************* -->
-<!-- General panel properties :: END -->
-<!-- ******************************* -->
-
-<!-- ****************************** -->      
-<!-- Edge panel properties :: START -->
-<!-- ****************************** -->
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/panel_type</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>edge-panel</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-      
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/panel_size</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>panel-size-medium</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/panel_hide_mode</key>
-        <owner>panel</owner>
-        <type>int</type>
-        <default>0</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/panel_hide_state</key>
-        <owner>panel</owner>
-        <type>int</type>
-        <default>0</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/screen_id</key>
-        <owner>panel</owner>
-        <type>int</type>
-        <default>0</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/screen_edge</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>panel-edge-bottom</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/hide_buttons_enabled</key>
-        <owner>panel</owner>
-        <type>bool</type>
-        <default>false</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/hide_button_pixmaps_enabled</key>
-        <owner>panel</owner>
-        <type>bool</type>
-        <default>true</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/panel_background_type</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>no-background</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/panel_background_pixmap</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default> </default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/panel_background_pixmap_fit</key>
-        <owner>panel</owner>
-        <type>bool</type>
-        <default>true</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/panel_background_pixmap_stretch</key>
-        <owner>panel</owner>
-        <type>bool</type>
-        <default>false</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-      
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/panel_background_pixmap_rotate</key>
-        <owner>panel</owner>
-        <type>bool</type>
-        <default>true</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-     
-      <schema>
-        <key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/panel_background_color</key>
-        <owner>panel</owner>
-        <type>string</type>
-        <default>#000000</default>
-        <locale name="C">
-          <short></short>
-          <long></long>
-        </locale>
-      </schema>
-
-<!-- **************************** -->      
-<!-- Edge panel properties :: END -->
-<!-- **************************** -->
-
-      
-  </schemalist>
-  
-</gconfschemafile>
diff --git a/redhat-panel-default-setup.entries b/redhat-panel-default-setup.entries
deleted file mode 100644
index 4864563..0000000
--- a/redhat-panel-default-setup.entries
+++ /dev/null
@@ -1,742 +0,0 @@
-<gconfentryfile>
-
-  <entrylist base="/apps/panel/default_setup">
-
-    <!-- List of toplevels -->
-
-    <entry>
-      <key>general/toplevel_id_list</key>
-      <schema_key>/schemas/apps/panel/general/toplevel_id_list</schema_key>
-      <value>
-        <list type="string">
-          <value>
-            <string>top_panel</string>
-          </value>
-          <value>
-            <string>bottom_panel</string>
-          </value>
-        </list>
-      </value>
-    </entry>
-
-    <!-- List of objects -->
-
-    <entry>
-      <key>general/object_id_list</key>
-      <schema_key>/schemas/apps/panel/general/object_id_list</schema_key>
-      <value>
-        <list type="string">
-          <value>
-            <string>menu_bar</string>
-          </value>
-          <value>
-            <string>web_launcher</string>
-          </value>
-          <value>
-            <string>email_launcher</string>
-          </value>
-        </list>
-      </value>
-    </entry>
-
-    <!-- List of applets -->
-
-    <entry>
-      <key>general/applet_id_list</key>
-      <schema_key>/schemas/apps/panel/general/applet_id_list</schema_key>
-      <value>
-        <list type="string">
-          <value>
-            <string>gnote</string>
-          </value>
-          <value>
-            <string>clock</string>
-          </value>
-          <value>
-            <string>systray</string>
-          </value>
-          <value>
-            <string>window_list</string>
-          </value>
-          <value>
-            <string>workspace_switcher</string>
-          </value>
-          <value>
-            <string>trash_applet</string>
-          </value>
-          <value>
-            <string>fast_user_switch_applet</string>
-          </value>
-        </list>
-      </value>
-    </entry>
-
-  <!-- Top Panel -->
-
-    <entry>
-      <key>toplevels/top_panel/name</key>
-      <schema_key>/schemas/apps/panel/toplevels/name</schema_key>
-      <value>
-        <string>Top Panel</string>
-      </value>
-    </entry>
-    <entry>
-      <key>toplevels/top_panel/expand</key>
-      <schema_key>/schemas/apps/panel/toplevels/expand</schema_key>
-      <value>
-        <bool>true</bool>
-      </value>
-    </entry>
-    <entry>
-      <key>toplevels/top_panel/padding</key>
-      <schema_key>/schemas/apps/panel/toplevels/padding</schema_key>
-      <value>
-        <int>8</int>
-      </value>
-    </entry>
-    <entry>
-      <key>toplevels/top_panel/orientation</key>
-      <schema_key>/schemas/apps/panel/toplevels/orientation</schema_key>
-      <value>
-        <string>top</string>
-      </value>
-    </entry>
-    <entry>
-      <key>toplevels/top_panel/size</key>
-      <schema_key>/schemas/apps/panel/toplevels/size</schema_key>
-      <value>
-        <int>24</int>
-      </value>
-    </entry>
-
-    <entry><key>toplevels/top_panel/screen</key><schema_key>/schemas/apps/panel/toplevels/screen</schema_key></entry>
-    <entry><key>toplevels/top_panel/monitor</key><schema_key>/schemas/apps/panel/toplevels/monitor</schema_key></entry>
-    <entry><key>toplevels/top_panel/x</key><schema_key>/schemas/apps/panel/toplevels/x</schema_key></entry>
-    <entry><key>toplevels/top_panel/y</key><schema_key>/schemas/apps/panel/toplevels/y</schema_key></entry>
-    <entry><key>toplevels/top_panel/x_centered</key><schema_key>/schemas/apps/panel/toplevels/x_centered</schema_key></entry>
-    <entry><key>toplevels/top_panel/y_centered</key><schema_key>/schemas/apps/panel/toplevels/y_centered</schema_key></entry>
-    <entry><key>toplevels/top_panel/auto_hide</key><schema_key>/schemas/apps/panel/toplevels/auto_hide</schema_key></entry>
-    <entry><key>toplevels/top_panel/enable_animations</key><schema_key>/schemas/apps/panel/toplevels/enable_animations</schema_key></entry>
-    <entry><key>toplevels/top_panel/enable_buttons</key><schema_key>/schemas/apps/panel/toplevels/enable_buttons</schema_key></entry>
-    <entry><key>toplevels/top_panel/enable_arrows</key><schema_key>/schemas/apps/panel/toplevels/enable_arrows</schema_key></entry>
-    <entry><key>toplevels/top_panel/hide_delay</key><schema_key>/schemas/apps/panel/toplevels/hide_delay</schema_key></entry>
-    <entry><key>toplevels/top_panel/unhide_delay</key><schema_key>/schemas/apps/panel/toplevels/unhide_delay</schema_key></entry>
-    <entry><key>toplevels/top_panel/auto_hide_size</key><schema_key>/schemas/apps/panel/toplevels/auto_hide_size</schema_key></entry>
-    <entry><key>toplevels/top_panel/background/type</key><schema_key>/schemas/apps/panel/toplevels/background/type</schema_key></entry>
-    <entry><key>toplevels/top_panel/background/color</key><schema_key>/schemas/apps/panel/toplevels/background/color</schema_key></entry>
-    <entry><key>toplevels/top_panel/background/opacity</key><schema_key>/schemas/apps/panel/toplevels/background/opacity</schema_key></entry>
-    <entry><key>toplevels/top_panel/background/image</key><schema_key>/schemas/apps/panel/toplevels/background/image</schema_key></entry>
-    <entry><key>toplevels/top_panel/background/fit</key><schema_key>/schemas/apps/panel/toplevels/background/fit</schema_key></entry>
-    <entry><key>toplevels/top_panel/background/stretch</key><schema_key>/schemas/apps/panel/toplevels/background/stretch</schema_key></entry>
-    <entry><key>toplevels/top_panel/background/rotate</key><schema_key>/schemas/apps/panel/toplevels/background/rotate</schema_key></entry>
-
-  <!-- Bottom Panel -->
-
-    <entry>
-      <key>toplevels/bottom_panel/name</key>
-      <schema_key>/schemas/apps/panel/toplevels/name</schema_key>
-      <value>
-        <string>Bottom Panel</string>
-      </value>
-    </entry>
-    <entry>
-      <key>toplevels/bottom_panel/expand</key>
-      <schema_key>/schemas/apps/panel/toplevels/expand</schema_key>
-      <value>
-        <bool>true</bool>
-      </value>
-    </entry>
-    <entry>
-      <key>toplevels/bottom_panel/padding</key>
-      <schema_key>/schemas/apps/panel/toplevels/padding</schema_key>
-      <value>
-        <int>8</int>
-      </value>
-    </entry>
-    <entry>
-      <key>toplevels/bottom_panel/orientation</key>
-      <schema_key>/schemas/apps/panel/toplevels/orientation</schema_key>
-      <value>
-        <string>bottom</string>
-      </value>
-    </entry>
-    <entry>
-      <key>toplevels/bottom_panel/size</key>
-      <schema_key>/schemas/apps/panel/toplevels/size</schema_key>
-      <value>
-        <int>24</int>
-      </value>
-    </entry>
-
-    <entry><key>toplevels/bottom_panel/screen</key><schema_key>/schemas/apps/panel/toplevels/screen</schema_key></entry>
-    <entry><key>toplevels/bottom_panel/monitor</key><schema_key>/schemas/apps/panel/toplevels/monitor</schema_key></entry>
-    <entry><key>toplevels/bottom_panel/x</key><schema_key>/schemas/apps/panel/toplevels/x</schema_key></entry>
-    <entry><key>toplevels/bottom_panel/y</key><schema_key>/schemas/apps/panel/toplevels/y</schema_key></entry>
-    <entry><key>toplevels/bottom_panel/x_centered</key><schema_key>/schemas/apps/panel/toplevels/x_centered</schema_key></entry>
-    <entry><key>toplevels/bottom_panel/y_centered</key><schema_key>/schemas/apps/panel/toplevels/y_centered</schema_key></entry>
-    <entry><key>toplevels/bottom_panel/auto_hide</key><schema_key>/schemas/apps/panel/toplevels/auto_hide</schema_key></entry>
-    <entry><key>toplevels/bottom_panel/enable_animations</key><schema_key>/schemas/apps/panel/toplevels/enable_animations</schema_key></entry>
-    <entry><key>toplevels/bottom_panel/enable_buttons</key><schema_key>/schemas/apps/panel/toplevels/enable_buttons</schema_key></entry>
-    <entry><key>toplevels/bottom_panel/enable_arrows</key><schema_key>/schemas/apps/panel/toplevels/enable_arrows</schema_key></entry>
-    <entry><key>toplevels/bottom_panel/hide_delay</key><schema_key>/schemas/apps/panel/toplevels/hide_delay</schema_key></entry>
-    <entry><key>toplevels/bottom_panel/unhide_delay</key><schema_key>/schemas/apps/panel/toplevels/unhide_delay</schema_key></entry>
-    <entry><key>toplevels/bottom_panel/auto_hide_size</key><schema_key>/schemas/apps/panel/toplevels/auto_hide_size</schema_key></entry>
-    <entry><key>toplevels/bottom_panel/background/type</key><schema_key>/schemas/apps/panel/toplevels/background/type</schema_key></entry>
-    <entry><key>toplevels/bottom_panel/background/color</key><schema_key>/schemas/apps/panel/toplevels/background/color</schema_key></entry>
-    <entry><key>toplevels/bottom_panel/background/opacity</key><schema_key>/schemas/apps/panel/toplevels/background/opacity</schema_key></entry>
-    <entry><key>toplevels/bottom_panel/background/image</key><schema_key>/schemas/apps/panel/toplevels/background/image</schema_key></entry>
-    <entry><key>toplevels/bottom_panel/background/fit</key><schema_key>/schemas/apps/panel/toplevels/background/fit</schema_key></entry>
-    <entry><key>toplevels/bottom_panel/background/stretch</key><schema_key>/schemas/apps/panel/toplevels/background/stretch</schema_key></entry>
-    <entry><key>toplevels/bottom_panel/background/rotate</key><schema_key>/schemas/apps/panel/toplevels/background/rotate</schema_key></entry>
-
-  <!-- Menu Bar -->
-
-    <entry>
-      <key>objects/menu_bar/object_type</key>
-      <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
-      <value>
-        <string>menu-bar</string>
-      </value>
-    </entry>
-    <entry>
-      <key>objects/menu_bar/toplevel_id</key>
-      <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
-      <value>
-        <string>top_panel</string>
-      </value>
-    </entry>
-    <entry>
-      <key>objects/menu_bar/position</key>
-      <schema_key>/schemas/apps/panel/objects/position</schema_key>
-      <value>
-        <int>0</int>
-      </value>
-    </entry>
-    <entry>
-      <key>objects/menu_bar/panel_right_stick</key>
-      <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
-      <value>
-        <bool>false</bool>
-      </value>
-    </entry>
-    <entry>
-      <key>objects/menu_bar/locked</key>
-      <schema_key>/schemas/apps/panel/objects/locked</schema_key>
-      <value>
-        <bool>true</bool>
-      </value>
-    </entry>
-
-    <entry><key>objects/menu_bar/bonobo_iid</key><schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key></entry>
-    <entry><key>objects/menu_bar/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
-    <entry><key>objects/menu_bar/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-    <entry><key>objects/menu_bar/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-    <entry><key>objects/menu_bar/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-    <entry><key>objects/menu_bar/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-    <entry><key>objects/menu_bar/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-    <entry><key>objects/menu_bar/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
-    <entry><key>objects/menu_bar/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
-
-  <!-- Web Launcher -->
-
-    <entry>
-      <key>objects/web_launcher/object_type</key>
-      <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
-      <value>
-        <string>launcher-object</string>
-      </value>
-    </entry>
-    <entry>
-      <key>objects/web_launcher/toplevel_id</key>
-      <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
-      <value>
-        <string>top_panel</string>
-      </value>
-    </entry>
-    <entry>
-      <key>objects/web_launcher/position</key>
-      <schema_key>/schemas/apps/panel/objects/position</schema_key>
-      <value>
-        <int>1</int>
-      </value>
-    </entry>
-    <entry>
-      <key>objects/web_launcher/panel_right_stick</key>
-      <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
-      <value>
-        <bool>false</bool>
-      </value>
-    </entry>
-    <entry>
-      <key>objects/web_launcher/locked</key>
-      <schema_key>/schemas/apps/panel/objects/locked</schema_key>
-      <value>
-        <bool>true</bool>
-      </value>
-    </entry>
-    <entry>
-      <key>objects/web_launcher/launcher_location</key>
-      <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
-      <value>
-        <string>preferred-web-browser.desktop</string>
-      </value>
-    </entry>
-
-    <entry><key>objects/web_launcher/bonobo_iid</key><schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key></entry>
-    <entry><key>objects/web_launcher/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
-    <entry><key>objects/web_launcher/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-    <entry><key>objects/web_launcher/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-    <entry><key>objects/web_launcher/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-    <entry><key>objects/web_launcher/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-    <entry><key>objects/web_launcher/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-    <entry><key>objects/web_launcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
-
-  <!-- Email Launcher -->
-
-    <entry>
-      <key>objects/email_launcher/object_type</key>
-      <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
-      <value>
-        <string>launcher-object</string>
-      </value>
-    </entry>
-    <entry>
-      <key>objects/email_launcher/toplevel_id</key>
-      <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
-      <value>
-        <string>top_panel</string>
-      </value>
-    </entry>
-    <entry>
-      <key>objects/email_launcher/position</key>
-      <schema_key>/schemas/apps/panel/objects/position</schema_key>
-      <value>
-        <int>2</int>
-      </value>
-    </entry>
-    <entry>
-      <key>objects/email_launcher/panel_right_stick</key>
-      <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
-      <value>
-        <bool>false</bool>
-      </value>
-    </entry>
-    <entry>
-      <key>objects/email_launcher/locked</key>
-      <schema_key>/schemas/apps/panel/objects/locked</schema_key>
-      <value>
-        <bool>true</bool>
-      </value>
-    </entry>
-    <entry>
-      <key>objects/email_launcher/launcher_location</key>
-      <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
-      <value>
-        <string>preferred-mail-reader.desktop</string>
-      </value>
-    </entry>
-
-    <entry><key>objects/email_launcher/bonobo_iid</key><schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key></entry>
-    <entry><key>objects/email_launcher/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
-    <entry><key>objects/email_launcher/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-    <entry><key>objects/email_launcher/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-    <entry><key>objects/email_launcher/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-    <entry><key>objects/email_launcher/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-    <entry><key>objects/email_launcher/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-    <entry><key>objects/email_launcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
-
-  <!-- GNote -->
-
-    <entry>
-      <key>applets/gnote/object_type</key>
-      <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
-      <value>
-        <string>bonobo-applet</string>
-      </value>
-    </entry>
-    <entry>
-      <key>applets/gnote/toplevel_id</key>
-      <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
-      <value>
-        <string>top_panel</string>
-      </value>
-    </entry>
-    <entry>
-      <key>applets/gnote/position</key>
-      <schema_key>/schemas/apps/panel/objects/position</schema_key>
-      <value>
-        <int>3</int>
-      </value>
-    </entry>
-    <entry>
-      <key>applets/gnote/panel_right_stick</key>
-      <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
-      <value>
-        <bool>false</bool>
-      </value>
-    </entry>
-    <entry>
-      <key>applets/gnote/locked</key>
-      <schema_key>/schemas/apps/panel/objects/locked</schema_key>
-      <value>
-        <bool>true</bool>
-      </value>
-    </entry>
-    <entry>
-      <key>applets/gnote/bonobo_iid</key>
-      <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
-      <value>
-        <string>OAFIID:GnoteApplet</string>
-      </value>
-    </entry>
-
-    <entry><key>applets/gnote/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
-    <entry><key>applets/gnote/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-    <entry><key>applets/gnote/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-    <entry><key>applets/gnote/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-    <entry><key>applets/gnote/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-    <entry><key>applets/gnote/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-    <entry><key>applets/gnote/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
-    <entry><key>applets/gnote/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
-
-  <!-- Fast User Switch Applet -->
-
-    <entry>
-      <key>applets/fast_user_switch_applet/object_type</key>
-      <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
-      <value>
-        <string>bonobo-applet</string>
-      </value>
-    </entry>
-    <entry>
-      <key>applets/fast_user_switch_applet/toplevel_id</key>
-      <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
-      <value>
-        <string>top_panel</string>
-      </value>
-    </entry>
-    <entry>
-      <key>applets/fast_user_switch_applet/position</key>
-      <schema_key>/schemas/apps/panel/objects/position</schema_key>
-      <value>
-        <int>0</int>
-      </value>
-    </entry>
-    <entry>
-      <key>applets/fast_user_switch_applet/panel_right_stick</key>
-      <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
-      <value>
-        <bool>true</bool>
-      </value>
-    </entry>
-    <entry>
-      <key>applets/fast_user_switch_applet/locked</key>
-      <schema_key>/schemas/apps/panel/objects/locked</schema_key>
-      <value>
-        <bool>true</bool>
-      </value>
-    </entry>
-    <entry>
-      <key>applets/fast_user_switch_applet/bonobo_iid</key>
-      <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
-      <value>
-        <string>OAFIID:GNOME_FastUserSwitchApplet</string>
-      </value>
-    </entry>
-
-    <entry><key>applets/fast_user_switch_applet/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
-    <entry><key>applets/fast_user_switch_applet/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-    <entry><key>applets/fast_user_switch_applet/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-    <entry><key>applets/fast_user_switch_applet/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-    <entry><key>applets/fast_user_switch_applet/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-    <entry><key>applets/fast_user_switch_applet/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-    <entry><key>applets/fast_user_switch_applet/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
-    <entry><key>applets/fast_user_switch_applet/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
-
-  <!-- Clock Applet -->
-
-    <entry>
-      <key>applets/clock/object_type</key>
-      <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
-      <value>
-        <string>bonobo-applet</string>
-      </value>
-    </entry>
-    <entry>
-      <key>applets/clock/toplevel_id</key>
-      <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
-      <value>
-        <string>top_panel</string>
-      </value>
-    </entry>
-    <entry>
-      <key>applets/clock/position</key>
-      <schema_key>/schemas/apps/panel/objects/position</schema_key>
-      <value>
-        <int>1</int>
-      </value>
-    </entry>
-    <entry>
-      <key>applets/clock/panel_right_stick</key>
-      <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
-      <value>
-        <bool>true</bool>
-      </value>
-    </entry>
-    <entry>
-      <key>applets/clock/locked</key>
-      <schema_key>/schemas/apps/panel/objects/locked</schema_key>
-      <value>
-        <bool>true</bool>
-      </value>
-    </entry>
-    <entry>
-      <key>applets/clock/bonobo_iid</key>
-      <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
-      <value>
-        <string>OAFIID:GNOME_ClockApplet</string>
-      </value>
-    </entry>
-
-    <entry><key>applets/clock/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
-    <entry><key>applets/clock/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-    <entry><key>applets/clock/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-    <entry><key>applets/clock/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-    <entry><key>applets/clock/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-    <entry><key>applets/clock/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-    <entry><key>applets/clock/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
-    <entry><key>applets/clock/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
-
-  <!-- System Tray Applet -->
-
-    <entry>
-      <key>applets/systray/object_type</key>
-      <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
-      <value>
-        <string>bonobo-applet</string>
-      </value>
-    </entry>
-    <entry>
-      <key>applets/systray/toplevel_id</key>
-      <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
-      <value>
-        <string>top_panel</string>
-      </value>
-    </entry>
-    <entry>
-      <key>applets/systray/position</key>
-      <schema_key>/schemas/apps/panel/objects/position</schema_key>
-      <value>
-        <int>3</int>
-      </value>
-    </entry>
-    <entry>
-      <key>applets/systray/panel_right_stick</key>
-      <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
-      <value>
-        <bool>true</bool>
-      </value>
-    </entry>
-    <entry>
-      <key>applets/systray/locked</key>
-      <schema_key>/schemas/apps/panel/objects/locked</schema_key>
-      <value>
-        <bool>true</bool>
-      </value>
-    </entry>
-    <entry>
-      <key>applets/systray/bonobo_iid</key>
-      <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
-      <value>
-        <string>OAFIID:GNOME_SystemTrayApplet</string>
-      </value>
-    </entry>
-    <entry>
-      <key>applets/systray/prefs/padding</key>
-      <schema_key>/schemas/apps/notification_area_applet/prefs/padding</schema_key>
-      <value>
-        <int>2</int>
-      </value>
-    </entry>
-
-    <entry><key>applets/systray/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
-    <entry><key>applets/systray/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-    <entry><key>applets/systray/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-    <entry><key>applets/systray/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-    <entry><key>applets/systray/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-    <entry><key>applets/systray/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-    <entry><key>applets/systray/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
-    <entry><key>applets/systray/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
-
-  <!-- Window List Applet -->
-
-    <entry>
-      <key>applets/window_list/object_type</key>
-      <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
-      <value>
-        <string>bonobo-applet</string>
-      </value>
-    </entry>
-    <entry>
-      <key>applets/window_list/toplevel_id</key>
-      <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
-      <value>
-        <string>bottom_panel</string>
-      </value>
-    </entry>
-    <entry>
-      <key>applets/window_list/position</key>
-      <schema_key>/schemas/apps/panel/objects/position</schema_key>
-      <value>
-        <int>1</int>
-      </value>
-    </entry>
-    <entry>
-      <key>applets/window_list/panel_right_stick</key>
-      <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
-      <value>
-        <bool>false</bool>
-      </value>
-    </entry>
-    <entry>
-      <key>applets/window_list/locked</key>
-      <schema_key>/schemas/apps/panel/objects/locked</schema_key>
-      <value>
-        <bool>true</bool>
-      </value>
-    </entry>
-    <entry>
-      <key>applets/window_list/bonobo_iid</key>
-      <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
-      <value>
-        <string>OAFIID:GNOME_WindowListApplet</string>
-      </value>
-    </entry>
-
-    <entry><key>applets/window_list/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
-    <entry><key>applets/window_list/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-    <entry><key>applets/window_list/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-    <entry><key>applets/window_list/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-    <entry><key>applets/window_list/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-    <entry><key>applets/window_list/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-    <entry><key>applets/window_list/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
-    <entry><key>applets/window_list/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
-
-  <!-- Workspace Switcher Applet -->
-
-    <entry>
-      <key>applets/workspace_switcher/object_type</key>
-      <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
-      <value>
-        <string>bonobo-applet</string>
-      </value>
-    </entry>
-    <entry>
-      <key>applets/workspace_switcher/toplevel_id</key>
-      <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
-      <value>
-        <string>bottom_panel</string>
-      </value>
-    </entry>
-    <entry>
-      <key>applets/workspace_switcher/position</key>
-      <schema_key>/schemas/apps/panel/objects/position</schema_key>
-      <value>
-        <int>1</int>
-      </value>
-    </entry>
-    <entry>
-      <key>applets/workspace_switcher/panel_right_stick</key>
-      <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
-      <value>
-        <bool>true</bool>
-      </value>
-    </entry>
-    <entry>
-      <key>applets/workspace_switcher/locked</key>
-      <schema_key>/schemas/apps/panel/objects/locked</schema_key>
-      <value>
-        <bool>true</bool>
-      </value>
-    </entry>
-    <entry>
-      <key>applets/workspace_switcher/bonobo_iid</key>
-      <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
-      <value>
-        <string>OAFIID:GNOME_WorkspaceSwitcherApplet</string>
-      </value>
-    </entry>
-    <entry>
-      <key>applets/workspace_switcher/prefs/num_rows</key>
-      <schema_key>/schemas/apps/workspace_switcher/prefs/num_rows</schema_key>
-      <value>
-        <int>1</int>
-      </value>
-    </entry>
-
-    <entry><key>applets/workspace_switcher/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
-    <entry><key>applets/workspace_switcher/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-    <entry><key>applets/workspace_switcher/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-    <entry><key>applets/workspace_switcher/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-    <entry><key>applets/workspace_switcher/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-    <entry><key>applets/workspace_switcher/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-    <entry><key>applets/workspace_switcher/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
-    <entry><key>applets/workspace_switcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
-
-    <!-- Trash Applet -->
-
-    <entry>
-      <key>applets/trash_applet/object_type</key>
-      <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
-      <value>
-        <string>bonobo-applet</string>
-      </value>
-    </entry>
-    <entry>
-      <key>applets/trash_applet/toplevel_id</key>
-      <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
-      <value>
-        <string>bottom_panel</string>
-      </value>
-    </entry>
-    <entry>
-      <key>applets/trash_applet/position</key>
-      <schema_key>/schemas/apps/panel/objects/position</schema_key>
-      <value>
-        <int>0</int>
-      </value>
-    </entry>
-    <entry>
-      <key>applets/trash_applet/panel_right_stick</key>
-      <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
-      <value>
-        <bool>true</bool>
-      </value>
-    </entry>
-    <entry>
-      <key>applets/trash_applet/locked</key>
-      <schema_key>/schemas/apps/panel/objects/locked</schema_key>
-      <value>
-        <bool>true</bool>
-      </value>
-    </entry>
-    <entry>
-      <key>applets/trash_applet/bonobo_iid</key>
-      <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
-      <value>
-        <string>OAFIID:GNOME_Panel_TrashApplet</string>
-      </value>
-    </entry>
-
-    <entry><key>applets/trash_applet/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
-    <entry><key>applets/trash_applet/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-    <entry><key>applets/trash_applet/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-    <entry><key>applets/trash_applet/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-    <entry><key>applets/trash_applet/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-    <entry><key>applets/trash_applet/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-    <entry><key>applets/trash_applet/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
-    <entry><key>applets/trash_applet/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
-
-  </entrylist>
-
-</gconfentryfile>
diff --git a/sources b/sources
deleted file mode 100644
index c382f1a..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-f394ad73babbce95fd0bb65ec6fd3519  gnome-panel-3.6.2.tar.xz
author	Kalev Lember <kalevlember@gmail.com>	2013-05-01 23:02:10 +0200
committer	Kalev Lember <kalevlember@gmail.com>	2013-05-01 23:02:10 +0200
commit	26ea386096c0cd7de55cc2226c46b63338c0ef39 (patch)
tree	c411805c2ada0babe69dc3dedce030bf01941b11
parent	c2b77a726bef547662f89b34e32dca592f5d23e9 (diff)
download	gnome-panel-26ea386096c0cd7de55cc2226c46b63338c0ef39.tar.gz gnome-panel-26ea386096c0cd7de55cc2226c46b63338c0ef39.tar.xz gnome-panel-26ea386096c0cd7de55cc2226c46b63338c0ef39.zip