try to move to latest release

this is wip in case mclasen gets motivation to finish my work
before i get back to it

22 files changed, 545 insertions, 2935 deletions

diff --git a/.gitignore b/.gitignore
index fd9de86..89cb3d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ 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
diff --git a/0001-Update-to-GDBus-API-change.patch b/0001-Update-to-GDBus-API-change.patch
deleted file mode 100644
index 2e1ed5b..0000000
--- a/0001-Update-to-GDBus-API-change.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-From eb9b57ea502c268f2e4eddacc1c2cfb5283a407d Mon Sep 17 00:00:00 2001
-From: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Fri, 18 Jun 2010 12:17:26 +0200
-Subject: [PATCH 1/3] Update to GDBus API change
-
-Fixes bug #621766.
----
- configure.in                                       |    2 +-
- .../panel-applet-container.c                       |   64 ++++++++++----------
- 2 files changed, 32 insertions(+), 34 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index ba108b0..f3b3fbd 100644
---- a/configure.in
-+++ b/configure.in
-@@ -57,7 +57,7 @@ AC_CHECK_FUNCS(_NSGetEnviron)
- LIBGNOME_DESKTOP_REQUIRED=2.24.0
- GDK_PIXBUF_REQUIRED=2.7.1
- PANGO_REQUIRED=1.15.4
--GLIB_REQUIRED=2.25.7
-+GLIB_REQUIRED=2.25.9
- GTK_REQUIRED=2.19.7
- LIBWNCK_REQUIRED=2.19.5
- GCONF_REQUIRED=2.6.1
-diff --git a/gnome-panel/libpanel-applet-private/panel-applet-container.c b/gnome-panel/libpanel-applet-private/panel-applet-container.c
-index ad5eeaf..96d4aa4 100644
---- a/gnome-panel/libpanel-applet-private/panel-applet-container.c
-+++ b/gnome-panel/libpanel-applet-private/panel-applet-container.c
-@@ -27,7 +27,6 @@
- struct _PanelAppletContainerPrivate {
- 	GDBusProxy *applet_proxy;
- 
--	guint       proxy_watcher_id;
- 	guint       name_watcher_id;
- 	gchar      *bus_name;
- 
-@@ -142,11 +141,6 @@ panel_applet_container_dispose (GObject *object)
- 		container->priv->name_watcher_id = 0;
- 	}
- 
--	if (container->priv->proxy_watcher_id > 0) {
--		g_bus_unwatch_proxy (container->priv->proxy_watcher_id);
--		container->priv->proxy_watcher_id = 0;
--	}
--
- 	if (container->priv->applet_proxy) {
- 		g_object_unref (container->priv->applet_proxy);
- 		container->priv->applet_proxy = NULL;
-@@ -255,10 +249,6 @@ panel_applet_container_plug_removed (PanelAppletContainer *container)
- 		g_bus_unwatch_name (container->priv->name_watcher_id);
- 		container->priv->name_watcher_id = 0;
- 	}
--	if (container->priv->proxy_watcher_id > 0) {
--		g_bus_unwatch_proxy (container->priv->proxy_watcher_id);
--		container->priv->proxy_watcher_id = 0;
--	}
- 
- 	g_object_unref (container->priv->applet_proxy);
- 	container->priv->applet_proxy = NULL;
-@@ -322,23 +312,33 @@ on_property_changed (GDBusConnection      *connection,
- }
- 
- static void
--on_proxy_appeared (GDBusConnection *connection,
--		   const gchar     *name,
--		   const gchar     *name_owner,
--		   GDBusProxy      *proxy,
--		   gpointer         user_data)
-+on_proxy_appeared (GObject      *source_object,
-+		   GAsyncResult *res,
-+		   gpointer      user_data)
- {
- 	GSimpleAsyncResult   *result = G_SIMPLE_ASYNC_RESULT (user_data);
- 	PanelAppletContainer *container;
-+	GDBusProxy           *proxy;
-+	GError               *error = NULL;
-+
-+	proxy = g_dbus_proxy_new_finish (res, &error);
-+	if (!proxy) {
-+		g_simple_async_result_set_from_error (result, error);
-+		g_error_free (error);
-+		g_simple_async_result_complete (result);
-+		g_object_unref (result);
-+
-+		return;
-+	}
- 
- 	container = PANEL_APPLET_CONTAINER (g_async_result_get_source_object (G_ASYNC_RESULT (result)));
- 
--	container->priv->applet_proxy = g_object_ref (proxy);
-+	container->priv->applet_proxy = proxy;
- 	g_signal_connect (container->priv->applet_proxy, "g-signal",
- 			  G_CALLBACK (panel_applet_container_child_signal),
- 			  container);
--	g_dbus_connection_signal_subscribe (connection,
--					    name_owner,
-+	g_dbus_connection_signal_subscribe (g_dbus_proxy_get_connection (proxy),
-+					    g_dbus_proxy_get_name (proxy),
- 					    "org.freedesktop.DBus.Properties",
- 					    "PropertiesChanged",
- 					    g_dbus_proxy_get_object_path (proxy),
-@@ -384,18 +384,16 @@ get_applet_cb (GObject      *source_object,
- 	container = PANEL_APPLET_CONTAINER (g_async_result_get_source_object (G_ASYNC_RESULT (result)));
- 	g_variant_get (retvals, "(&ou)", &applet_path, &container->priv->xid);
- 
--	container->priv->proxy_watcher_id =
--		g_bus_watch_proxy_on_connection (connection,
--						 container->priv->bus_name,
--						 G_BUS_NAME_WATCHER_FLAGS_NONE,
--						 applet_path,
--						 PANEL_APPLET_INTERFACE,
--						 G_TYPE_DBUS_PROXY,
--						 G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
--						 (GBusProxyAppearedCallback) on_proxy_appeared,
--						 NULL,
--						 result,
--						 NULL);
-+	g_dbus_proxy_new (connection,
-+			  G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
-+			  NULL,
-+			  container->priv->bus_name,
-+			  applet_path,
-+			  PANEL_APPLET_INTERFACE,
-+			  NULL,
-+			  (GAsyncReadyCallback) on_proxy_appeared,
-+			  result);
-+
- 	g_variant_unref (retvals);
- 
- 	/* g_async_result_get_source_object returns new ref */
-@@ -601,7 +599,7 @@ panel_applet_container_child_set (PanelAppletContainer *container,
- 	g_hash_table_insert (container->priv->pending_ops, result, cancellable);
- 
- 	g_dbus_connection_call (g_dbus_proxy_get_connection (proxy),
--				g_dbus_proxy_get_unique_bus_name (proxy),
-+				g_dbus_proxy_get_name (proxy),
- 				g_dbus_proxy_get_object_path (proxy),
- 				"org.freedesktop.DBus.Properties",
- 				"Set",
-@@ -701,7 +699,7 @@ panel_applet_container_child_get (PanelAppletContainer *container,
- 	g_hash_table_insert (container->priv->pending_ops, result, cancellable);
- 
- 	g_dbus_connection_call (g_dbus_proxy_get_connection (proxy),
--				g_dbus_proxy_get_unique_bus_name (proxy),
-+				g_dbus_proxy_get_name (proxy),
- 				g_dbus_proxy_get_object_path (proxy),
- 				"org.freedesktop.DBus.Properties",
- 				"Get",
-@@ -772,7 +770,7 @@ panel_applet_container_child_popup_menu (PanelAppletContainer *container,
- 					    panel_applet_container_child_popup_menu);
- 
- 	g_dbus_connection_call (g_dbus_proxy_get_connection (proxy),
--				g_dbus_proxy_get_unique_bus_name (proxy),
-+				g_dbus_proxy_get_name (proxy),
- 				g_dbus_proxy_get_object_path (proxy),
- 				PANEL_APPLET_INTERFACE,
- 				"PopupMenu",
--- 
-1.7.1
-
diff --git a/clock-wakeups.patch b/clock-wakeups.patch
deleted file mode 100644
index 6f842aa..0000000
--- a/clock-wakeups.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -up gnome-panel-2.23.3/applets/clock/system-timezone.c.wakeups gnome-panel-2.23.3/applets/clock/system-timezone.c
---- gnome-panel-2.23.3/applets/clock/system-timezone.c.wakeups	2008-06-10 19:31:19.000000000 -0400
-+++ gnome-panel-2.23.3/applets/clock/system-timezone.c	2008-06-10 19:33:02.000000000 -0400
-@@ -67,7 +67,7 @@
- #include "system-timezone.h"
- 
- /* Files that we look at and that should be monitored */
--#define CHECK_NB 5
-+#define CHECK_NB 2
- #ifndef SYSTZ_SET_TEST
- #define ETC_TIMEZONE        "/etc/timezone"
- #define ETC_TIMEZONE_MAJ    "/etc/TIMEZONE"
-@@ -90,10 +90,7 @@
- #define TZ_MAGIC "TZif"
- 
- static char *files_to_check[CHECK_NB] = {
--        ETC_TIMEZONE,
--        ETC_TIMEZONE_MAJ,
-         ETC_SYSCONFIG_CLOCK,
--        ETC_CONF_D_CLOCK,
-         ETC_LOCALTIME
- };
- 
diff --git a/gnome-panel-2.16.0-compiz-support.patch b/gnome-panel-2.16.0-compiz-support.patch
deleted file mode 100644
index fccf386..0000000
--- a/gnome-panel-2.16.0-compiz-support.patch
+++ /dev/null
@@ -1,1147 +0,0 @@
-? birnan
-Index: applets/wncklet/workspace-switcher.c
-===================================================================
-RCS file: /cvs/gnome/gnome-panel/applets/wncklet/workspace-switcher.c,v
-retrieving revision 1.77
-diff -u -r1.77 workspace-switcher.c
---- applets/wncklet/workspace-switcher.c	7 Aug 2006 23:49:19 -0000	1.77
-+++ applets/wncklet/workspace-switcher.c	18 Sep 2006 23:28:00 -0000
-@@ -26,6 +26,9 @@
- #include <libwnck/libwnck.h>
- #include <gconf/gconf-client.h>
- #include <libgnomeui/gnome-help.h>
-+#include <gdk/gdkx.h>
-+#include <X11/Xlib.h>
-+#include <X11/Xatom.h>
- 
- #include "workspace-switcher.h"
- 
-@@ -48,6 +51,9 @@
- 
- 	/* Properties: */
- 	GtkWidget *properties_dialog;
-+        GtkWidget *notebook;
-+        GtkWidget *viewport_child;
-+        GtkWidget *workspace_child;
- 	GtkWidget *display_workspaces_toggle;
- 	GtkWidget *all_workspaces_radio;
- 	GtkWidget *current_only_radio;
-@@ -56,6 +62,8 @@
- 	GtkWidget *num_workspaces_spin;
- 	GtkWidget *workspaces_tree;
- 	GtkWidget *about;
-+        GtkWidget *width_spinbutton;
-+        GtkWidget *height_spinbutton;
- 
- 	GtkListStore *workspaces_store;
- 	
-@@ -780,6 +788,37 @@
- }
- 
- static void
-+spinbutton_changed (GtkWidget *widget,
-+                    gpointer   data)
-+{
-+        GConfClient *client = gconf_client_get_default ();
-+        const char *key = data;
-+
-+        int value = gtk_spin_button_get_value (GTK_SPIN_BUTTON (widget));
-+
-+        gconf_client_set_int (client, key, value, NULL);
-+}
-+
-+static void
-+setup_spinbutton (GtkSpinButton *spin,
-+                  const char *key,
-+                  int minimum)
-+{
-+        GConfClient *client = gconf_client_get_default ();
-+        int value;
-+        
-+        if (!gconf_client_key_is_writable (client, key, NULL))
-+                gtk_widget_set_sensitive (GTK_WIDGET (spin), FALSE);
-+
-+        value = gconf_client_get_int (client, key, NULL);
-+
-+        gtk_spin_button_set_range (spin, minimum, G_MAXINT);
-+        gtk_spin_button_set_value (spin, value);
-+        
-+        g_signal_connect (spin, "value_changed", G_CALLBACK (spinbutton_changed), (gpointer)key);
-+}
-+
-+static void
- setup_dialog (GladeXML  *xml,
- 	      PagerData *pager)
- {
-@@ -910,6 +949,114 @@
- 				pager,
- 				pager->applet);
- 	}
-+
-+        gtk_notebook_set_show_tabs (GTK_NOTEBOOK (pager->notebook), FALSE);
-+        gtk_notebook_set_show_border (GTK_NOTEBOOK (pager->notebook), FALSE);
-+
-+        setup_spinbutton (pager->width_spinbutton, "/apps/compiz/general/screen0/options/hsize", 1);
-+        setup_spinbutton (pager->height_spinbutton, "/apps/compiz/general/screen0/options/vsize", 1);
-+}
-+
-+/* get_wm_window() and current_window_manager() are essentially cutted and pasted
-+ * from gnome-wm.c from gnome-control-center.
-+ */
-+static Window
-+get_wm_window (void)
-+{
-+    Window *xwindow;
-+    Atom type;
-+    gint format;
-+    gulong nitems;
-+    gulong bytes_after;
-+    Window result;
-+    
-+    XGetWindowProperty (GDK_DISPLAY (), GDK_ROOT_WINDOW (),
-+			XInternAtom (GDK_DISPLAY (), "_NET_SUPPORTING_WM_CHECK", False),
-+			0, G_MAXLONG, False, XA_WINDOW, &type, &format,
-+			&nitems, &bytes_after, (guchar **) &xwindow);
-+    
-+    if (type != XA_WINDOW)
-+    {
-+	return None;
-+    }
-+    
-+    gdk_error_trap_push ();
-+    XSelectInput (GDK_DISPLAY (), *xwindow, StructureNotifyMask | PropertyChangeMask);
-+    XSync (GDK_DISPLAY (), False);
-+    
-+    if (gdk_error_trap_pop ())
-+    {
-+	XFree (xwindow);
-+	return None;
-+    }
-+    
-+    result = *xwindow;
-+    XFree (xwindow);
-+
-+    return result;
-+}
-+
-+static char*
-+get_current_window_manager (void)
-+{
-+    Atom utf8_string, atom, type;
-+    int result;
-+    char *retval;
-+    int format;
-+    gulong nitems;
-+    gulong bytes_after;
-+    gchar *val;
-+    Window wm_window = get_wm_window ();
-+    
-+    utf8_string = XInternAtom (GDK_DISPLAY (), "UTF8_STRING", False);
-+    atom = XInternAtom (GDK_DISPLAY (), "_NET_WM_NAME", False);
-+    
-+    gdk_error_trap_push ();
-+    
-+    result = XGetWindowProperty (GDK_DISPLAY (),
-+				 wm_window,
-+				 atom,
-+				 0, G_MAXLONG,
-+				 False, utf8_string,
-+				 &type, &format, &nitems,
-+				 &bytes_after, (guchar **)&val);
-+    
-+    if (gdk_error_trap_pop () || result != Success)
-+	return NULL;
-+    
-+    if (type != utf8_string ||
-+	format !=8 ||
-+	nitems == 0)
-+    {
-+	if (val)
-+	    XFree (val);
-+	return NULL;
-+    }
-+    
-+    if (!g_utf8_validate (val, nitems, NULL))
-+    {
-+	XFree (val);
-+	return NULL;
-+    }
-+    
-+    retval = g_strndup (val, nitems);
-+    
-+    XFree (val);
-+    
-+    return retval;
-+}
-+
-+static gboolean
-+compiz_is_running (void)
-+{
-+    gboolean result;
-+    char *wm = get_current_window_manager ();
-+    
-+    result = wm && strcmp (wm, "compiz") == 0;
-+    
-+    g_free (wm);
-+    
-+    return result;
- }
- 
- static void 
-@@ -917,23 +1064,50 @@
- 			   PagerData         *pager,
- 			   const gchar       *verbname)
- {
--	if (pager->properties_dialog == NULL) {
--		GladeXML  *xml;
-+        gboolean using_compiz;
-+        
-+	if (pager->properties_dialog == NULL) { 
-+                GladeXML  *xml = glade_xml_new (PAGER_GLADEDIR "/workspace-switcher.glade", NULL, NULL);
- 
--		xml = glade_xml_new (PAGER_GLADEDIR "/workspace-switcher.glade", NULL, NULL);
- 		pager->properties_dialog = glade_xml_get_widget (xml, "pager_properties_dialog");
--
-+                pager->notebook = glade_xml_get_widget (xml, "notebook");
-+                pager->viewport_child = glade_xml_get_widget (xml, "viewport-child");
-+                pager->workspace_child = glade_xml_get_widget (xml, "workspace-child");
-+                pager->width_spinbutton = glade_xml_get_widget (xml, "width-spinbutton");
-+                pager->height_spinbutton = glade_xml_get_widget (xml, "height-spinbutton");
-+
-+                g_object_ref (pager->viewport_child);
-+                g_object_ref (pager->workspace_child);
-+                
- 		g_object_add_weak_pointer (G_OBJECT (pager->properties_dialog), 
- 					   (gpointer *) &pager->properties_dialog);
- 
- 		setup_dialog (xml, pager);
--		
--		g_object_unref (G_OBJECT (xml));
-+                
-+                g_object_unref (G_OBJECT (xml));
- 	}
- 
-+        using_compiz = compiz_is_running();
-+
-+        if (using_compiz) {
-+                gtk_widget_hide (pager->workspace_child);
-+                gtk_widget_show (pager->viewport_child);
-+                gtk_window_set_resizable (GTK_WINDOW (pager->properties_dialog), FALSE);
-+        }
-+        else {
-+                gtk_widget_show (pager->workspace_child);
-+                gtk_widget_hide (pager->viewport_child);
-+                gtk_window_set_resizable (GTK_WINDOW (pager->properties_dialog), TRUE);
-+        }
-+        
- 	gtk_window_set_icon_name (GTK_WINDOW (pager->properties_dialog),
- 	                          "gnome-panel-workspace-switcher");
- 	gtk_window_set_screen (GTK_WINDOW (pager->properties_dialog),
- 			       gtk_widget_get_screen (pager->applet));
- 	gtk_window_present (GTK_WINDOW (pager->properties_dialog));
-+
-+        if (using_compiz) {
-+                gtk_widget_grab_focus (pager->width_spinbutton);
-+                gtk_editable_select_region (GTK_EDITABLE (pager->width_spinbutton), 0, -1);
-+        }
- }
-Index: applets/wncklet/workspace-switcher.glade
-===================================================================
-RCS file: /cvs/gnome/gnome-panel/applets/wncklet/workspace-switcher.glade,v
-retrieving revision 1.23
-diff -u -r1.23 workspace-switcher.glade
---- applets/wncklet/workspace-switcher.glade	13 Oct 2003 20:11:52 -0000	1.23
-+++ applets/wncklet/workspace-switcher.glade	18 Sep 2006 23:28:00 -0000
-@@ -12,6 +12,13 @@
-   <property name="modal">False</property>
-   <property name="resizable">True</property>
-   <property name="destroy_with_parent">False</property>
-+  <property name="decorated">True</property>
-+  <property name="skip_taskbar_hint">False</property>
-+  <property name="skip_pager_hint">False</property>
-+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-+  <property name="focus_on_map">True</property>
-+  <property name="urgency_hint">False</property>
-   <property name="has_separator">False</property>
- 
-   <child internal-child="vbox">
-@@ -33,6 +40,7 @@
- 	      <property name="label">gtk-help</property>
- 	      <property name="use_stock">True</property>
- 	      <property name="relief">GTK_RELIEF_NORMAL</property>
-+	      <property name="focus_on_click">True</property>
- 	      <property name="response_id">-11</property>
- 	    </widget>
- 	  </child>
-@@ -46,6 +54,7 @@
- 	      <property name="label">gtk-close</property>
- 	      <property name="use_stock">True</property>
- 	      <property name="relief">GTK_RELIEF_NORMAL</property>
-+	      <property name="focus_on_click">True</property>
- 	      <property name="response_id">0</property>
- 	    </widget>
- 	  </child>
-@@ -59,58 +68,45 @@
-       </child>
- 
-       <child>
--	<widget class="GtkVBox" id="vbox2">
--	  <property name="border_width">5</property>
-+	<widget class="GtkNotebook" id="notebook">
- 	  <property name="visible">True</property>
--	  <property name="homogeneous">False</property>
--	  <property name="spacing">18</property>
-+	  <property name="can_focus">True</property>
-+	  <property name="show_tabs">True</property>
-+	  <property name="show_border">False</property>
-+	  <property name="tab_pos">GTK_POS_TOP</property>
-+	  <property name="scrollable">False</property>
-+	  <property name="enable_popup">False</property>
- 
- 	  <child>
--	    <widget class="GtkVBox" id="vbox3">
-+	    <widget class="GtkVBox" id="workspace-child">
-+	      <property name="border_width">5</property>
- 	      <property name="visible">True</property>
- 	      <property name="homogeneous">False</property>
--	      <property name="spacing">6</property>
--
--	      <child>
--		<widget class="GtkLabel" id="label4">
--		  <property name="visible">True</property>
--		  <property name="label" translatable="yes">&lt;b&gt;Switcher&lt;/b&gt;</property>
--		  <property name="use_underline">False</property>
--		  <property name="use_markup">True</property>
--		  <property name="justify">GTK_JUSTIFY_LEFT</property>
--		  <property name="wrap">False</property>
--		  <property name="selectable">False</property>
--		  <property name="xalign">0</property>
--		  <property name="yalign">0.5</property>
--		  <property name="xpad">0</property>
--		  <property name="ypad">0</property>
--		</widget>
--		<packing>
--		  <property name="padding">0</property>
--		  <property name="expand">False</property>
--		  <property name="fill">False</property>
--		</packing>
--	      </child>
-+	      <property name="spacing">18</property>
- 
- 	      <child>
--		<widget class="GtkHBox" id="hbox5">
-+		<widget class="GtkVBox" id="vbox3">
- 		  <property name="visible">True</property>
- 		  <property name="homogeneous">False</property>
--		  <property name="spacing">0</property>
-+		  <property name="spacing">6</property>
- 
- 		  <child>
--		    <widget class="GtkLabel" id="label5">
-+		    <widget class="GtkLabel" id="label4">
- 		      <property name="visible">True</property>
--		      <property name="label" translatable="yes">    </property>
-+		      <property name="label" translatable="yes">&lt;b&gt;Switcher&lt;/b&gt;</property>
- 		      <property name="use_underline">False</property>
--		      <property name="use_markup">False</property>
-+		      <property name="use_markup">True</property>
- 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
- 		      <property name="wrap">False</property>
- 		      <property name="selectable">False</property>
--		      <property name="xalign">0.5</property>
-+		      <property name="xalign">0</property>
- 		      <property name="yalign">0.5</property>
- 		      <property name="xpad">0</property>
- 		      <property name="ypad">0</property>
-+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-+		      <property name="width_chars">-1</property>
-+		      <property name="single_line_mode">False</property>
-+		      <property name="angle">0</property>
- 		    </widget>
- 		    <packing>
- 		      <property name="padding">0</property>
-@@ -120,21 +116,28 @@
- 		  </child>
- 
- 		  <child>
--		    <widget class="GtkVBox" id="vbox5">
-+		    <widget class="GtkHBox" id="hbox5">
- 		      <property name="visible">True</property>
- 		      <property name="homogeneous">False</property>
--		      <property name="spacing">6</property>
-+		      <property name="spacing">0</property>
- 
- 		      <child>
--			<widget class="GtkRadioButton" id="current_only_radio">
-+			<widget class="GtkLabel" id="label5">
- 			  <property name="visible">True</property>
--			  <property name="can_focus">True</property>
--			  <property name="label" translatable="yes">Show _only the current workspace</property>
--			  <property name="use_underline">True</property>
--			  <property name="relief">GTK_RELIEF_NORMAL</property>
--			  <property name="active">False</property>
--			  <property name="inconsistent">False</property>
--			  <property name="draw_indicator">True</property>
-+			  <property name="label" translatable="yes">    </property>
-+			  <property name="use_underline">False</property>
-+			  <property name="use_markup">False</property>
-+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-+			  <property name="wrap">False</property>
-+			  <property name="selectable">False</property>
-+			  <property name="xalign">0.5</property>
-+			  <property name="yalign">0.5</property>
-+			  <property name="xpad">0</property>
-+			  <property name="ypad">0</property>
-+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-+			  <property name="width_chars">-1</property>
-+			  <property name="single_line_mode">False</property>
-+			  <property name="angle">0</property>
- 			</widget>
- 			<packing>
- 			  <property name="padding">0</property>
-@@ -144,22 +147,22 @@
- 		      </child>
- 
- 		      <child>
--			<widget class="GtkHBox" id="hbox9">
-+			<widget class="GtkVBox" id="vbox5">
- 			  <property name="visible">True</property>
- 			  <property name="homogeneous">False</property>
--			  <property name="spacing">12</property>
-+			  <property name="spacing">6</property>
- 
- 			  <child>
--			    <widget class="GtkRadioButton" id="all_workspaces_radio">
-+			    <widget class="GtkRadioButton" id="current_only_radio">
- 			      <property name="visible">True</property>
- 			      <property name="can_focus">True</property>
--			      <property name="label" translatable="yes">Show _all workspaces in:</property>
-+			      <property name="label" translatable="yes">Show _only the current workspace</property>
- 			      <property name="use_underline">True</property>
- 			      <property name="relief">GTK_RELIEF_NORMAL</property>
-+			      <property name="focus_on_click">True</property>
- 			      <property name="active">False</property>
- 			      <property name="inconsistent">False</property>
- 			      <property name="draw_indicator">True</property>
--			      <property name="group">current_only_radio</property>
- 			    </widget>
- 			    <packing>
- 			      <property name="padding">0</property>
-@@ -169,22 +172,81 @@
- 			  </child>
- 
- 			  <child>
--			    <widget class="GtkHBox" id="hbox10">
-+			    <widget class="GtkHBox" id="hbox9">
- 			      <property name="visible">True</property>
- 			      <property name="homogeneous">False</property>
--			      <property name="spacing">6</property>
-+			      <property name="spacing">12</property>
- 
- 			      <child>
--				<widget class="GtkSpinButton" id="num_rows_spin">
-+				<widget class="GtkRadioButton" id="all_workspaces_radio">
- 				  <property name="visible">True</property>
- 				  <property name="can_focus">True</property>
--				  <property name="climb_rate">1</property>
--				  <property name="digits">0</property>
--				  <property name="numeric">True</property>
--				  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
--				  <property name="snap_to_ticks">False</property>
--				  <property name="wrap">False</property>
--				  <property name="adjustment">1 1 16 1 10 10</property>
-+				  <property name="label" translatable="yes">Show _all workspaces in:</property>
-+				  <property name="use_underline">True</property>
-+				  <property name="relief">GTK_RELIEF_NORMAL</property>
-+				  <property name="focus_on_click">True</property>
-+				  <property name="active">False</property>
-+				  <property name="inconsistent">False</property>
-+				  <property name="draw_indicator">True</property>
-+				  <property name="group">current_only_radio</property>
-+				</widget>
-+				<packing>
-+				  <property name="padding">0</property>
-+				  <property name="expand">False</property>
-+				  <property name="fill">False</property>
-+				</packing>
-+			      </child>
-+
-+			      <child>
-+				<widget class="GtkHBox" id="hbox10">
-+				  <property name="visible">True</property>
-+				  <property name="homogeneous">False</property>
-+				  <property name="spacing">6</property>
-+
-+				  <child>
-+				    <widget class="GtkSpinButton" id="num_rows_spin">
-+				      <property name="visible">True</property>
-+				      <property name="can_focus">True</property>
-+				      <property name="climb_rate">1</property>
-+				      <property name="digits">0</property>
-+				      <property name="numeric">True</property>
-+				      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-+				      <property name="snap_to_ticks">False</property>
-+				      <property name="wrap">False</property>
-+				      <property name="adjustment">1 1 16 1 10 10</property>
-+				    </widget>
-+				    <packing>
-+				      <property name="padding">0</property>
-+				      <property name="expand">True</property>
-+				      <property name="fill">True</property>
-+				    </packing>
-+				  </child>
-+
-+				  <child>
-+				    <widget class="GtkLabel" id="label_row_col">
-+				      <property name="visible">True</property>
-+				      <property name="label" translatable="yes">rows</property>
-+				      <property name="use_underline">False</property>
-+				      <property name="use_markup">False</property>
-+				      <property name="justify">GTK_JUSTIFY_CENTER</property>
-+				      <property name="wrap">False</property>
-+				      <property name="selectable">False</property>
-+				      <property name="xalign">0</property>
-+				      <property name="yalign">0.5</property>
-+				      <property name="xpad">0</property>
-+				      <property name="ypad">0</property>
-+				      <property name="mnemonic_widget">num_rows_spin</property>
-+				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-+				      <property name="width_chars">-1</property>
-+				      <property name="single_line_mode">False</property>
-+				      <property name="angle">0</property>
-+				    </widget>
-+				    <packing>
-+				      <property name="padding">0</property>
-+				      <property name="expand">False</property>
-+				      <property name="fill">False</property>
-+				    </packing>
-+				  </child>
- 				</widget>
- 				<packing>
- 				  <property name="padding">0</property>
-@@ -192,12 +254,114 @@
- 				  <property name="fill">True</property>
- 				</packing>
- 			      </child>
-+			    </widget>
-+			    <packing>
-+			      <property name="padding">0</property>
-+			      <property name="expand">True</property>
-+			      <property name="fill">True</property>
-+			    </packing>
-+			  </child>
-+			</widget>
-+			<packing>
-+			  <property name="padding">0</property>
-+			  <property name="expand">True</property>
-+			  <property name="fill">True</property>
-+			</packing>
-+		      </child>
-+		    </widget>
-+		    <packing>
-+		      <property name="padding">0</property>
-+		      <property name="expand">True</property>
-+		      <property name="fill">True</property>
-+		    </packing>
-+		  </child>
-+		</widget>
-+		<packing>
-+		  <property name="padding">0</property>
-+		  <property name="expand">False</property>
-+		  <property name="fill">True</property>
-+		</packing>
-+	      </child>
-+
-+	      <child>
-+		<widget class="GtkVBox" id="vbox4">
-+		  <property name="visible">True</property>
-+		  <property name="homogeneous">False</property>
-+		  <property name="spacing">6</property>
-+
-+		  <child>
-+		    <widget class="GtkLabel" id="label6">
-+		      <property name="visible">True</property>
-+		      <property name="label" translatable="yes">&lt;b&gt;Workspaces&lt;/b&gt;</property>
-+		      <property name="use_underline">False</property>
-+		      <property name="use_markup">True</property>
-+		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-+		      <property name="wrap">False</property>
-+		      <property name="selectable">False</property>
-+		      <property name="xalign">0</property>
-+		      <property name="yalign">0.5</property>
-+		      <property name="xpad">0</property>
-+		      <property name="ypad">0</property>
-+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-+		      <property name="width_chars">-1</property>
-+		      <property name="single_line_mode">False</property>
-+		      <property name="angle">0</property>
-+		    </widget>
-+		    <packing>
-+		      <property name="padding">0</property>
-+		      <property name="expand">False</property>
-+		      <property name="fill">False</property>
-+		    </packing>
-+		  </child>
-+
-+		  <child>
-+		    <widget class="GtkHBox" id="hbox8">
-+		      <property name="visible">True</property>
-+		      <property name="homogeneous">False</property>
-+		      <property name="spacing">0</property>
-+
-+		      <child>
-+			<widget class="GtkLabel" id="label7">
-+			  <property name="visible">True</property>
-+			  <property name="label" translatable="yes">    </property>
-+			  <property name="use_underline">False</property>
-+			  <property name="use_markup">False</property>
-+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-+			  <property name="wrap">False</property>
-+			  <property name="selectable">False</property>
-+			  <property name="xalign">0.5</property>
-+			  <property name="yalign">0.5</property>
-+			  <property name="xpad">0</property>
-+			  <property name="ypad">0</property>
-+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-+			  <property name="width_chars">-1</property>
-+			  <property name="single_line_mode">False</property>
-+			  <property name="angle">0</property>
-+			</widget>
-+			<packing>
-+			  <property name="padding">0</property>
-+			  <property name="expand">False</property>
-+			  <property name="fill">False</property>
-+			</packing>
-+		      </child>
-+
-+		      <child>
-+			<widget class="GtkVBox" id="vbox1">
-+			  <property name="visible">True</property>
-+			  <property name="homogeneous">False</property>
-+			  <property name="spacing">6</property>
-+
-+			  <child>
-+			    <widget class="GtkHBox" id="hbox4">
-+			      <property name="visible">True</property>
-+			      <property name="homogeneous">False</property>
-+			      <property name="spacing">12</property>
- 
- 			      <child>
--				<widget class="GtkLabel" id="label_row_col">
-+				<widget class="GtkLabel" id="num_workspaces_label">
- 				  <property name="visible">True</property>
--				  <property name="label" translatable="yes">rows</property>
--				  <property name="use_underline">False</property>
-+				  <property name="label" translatable="yes">Number of _workspaces:</property>
-+				  <property name="use_underline">True</property>
- 				  <property name="use_markup">False</property>
- 				  <property name="justify">GTK_JUSTIFY_CENTER</property>
- 				  <property name="wrap">False</property>
-@@ -206,7 +370,11 @@
- 				  <property name="yalign">0.5</property>
- 				  <property name="xpad">0</property>
- 				  <property name="ypad">0</property>
--				  <property name="mnemonic_widget">num_rows_spin</property>
-+				  <property name="mnemonic_widget">num_workspaces_spin</property>
-+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-+				  <property name="width_chars">-1</property>
-+				  <property name="single_line_mode">False</property>
-+				  <property name="angle">0</property>
- 				</widget>
- 				<packing>
- 				  <property name="padding">0</property>
-@@ -214,6 +382,83 @@
- 				  <property name="fill">False</property>
- 				</packing>
- 			      </child>
-+
-+			      <child>
-+				<widget class="GtkSpinButton" id="num_workspaces_spin">
-+				  <property name="visible">True</property>
-+				  <property name="can_focus">True</property>
-+				  <property name="climb_rate">1</property>
-+				  <property name="digits">0</property>
-+				  <property name="numeric">True</property>
-+				  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-+				  <property name="snap_to_ticks">False</property>
-+				  <property name="wrap">False</property>
-+				  <property name="adjustment">1 1 36 1 10 10</property>
-+				</widget>
-+				<packing>
-+				  <property name="padding">0</property>
-+				  <property name="expand">True</property>
-+				  <property name="fill">True</property>
-+				</packing>
-+			      </child>
-+			    </widget>
-+			    <packing>
-+			      <property name="padding">0</property>
-+			      <property name="expand">False</property>
-+			      <property name="fill">False</property>
-+			    </packing>
-+			  </child>
-+
-+			  <child>
-+			    <widget class="GtkLabel" id="workspaces_label">
-+			      <property name="visible">True</property>
-+			      <property name="label" translatable="yes">Workspace na_mes:</property>
-+			      <property name="use_underline">True</property>
-+			      <property name="use_markup">False</property>
-+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-+			      <property name="wrap">False</property>
-+			      <property name="selectable">False</property>
-+			      <property name="xalign">0</property>
-+			      <property name="yalign">0.5</property>
-+			      <property name="xpad">0</property>
-+			      <property name="ypad">0</property>
-+			      <property name="mnemonic_widget">workspaces_tree_view</property>
-+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-+			      <property name="width_chars">-1</property>
-+			      <property name="single_line_mode">False</property>
-+			      <property name="angle">0</property>
-+			    </widget>
-+			    <packing>
-+			      <property name="padding">0</property>
-+			      <property name="expand">False</property>
-+			      <property name="fill">False</property>
-+			    </packing>
-+			  </child>
-+
-+			  <child>
-+			    <widget class="GtkScrolledWindow" id="scrolledwindow1">
-+			      <property name="height_request">100</property>
-+			      <property name="visible">True</property>
-+			      <property name="can_focus">True</property>
-+			      <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-+			      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-+			      <property name="shadow_type">GTK_SHADOW_IN</property>
-+			      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-+
-+			      <child>
-+				<widget class="GtkTreeView" id="workspaces_tree_view">
-+				  <property name="visible">True</property>
-+				  <property name="tooltip" translatable="yes">Workspace Names</property>
-+				  <property name="can_focus">True</property>
-+				  <property name="headers_visible">False</property>
-+				  <property name="rules_hint">False</property>
-+				  <property name="reorderable">False</property>
-+				  <property name="enable_search">True</property>
-+				  <property name="fixed_height_mode">False</property>
-+				  <property name="hover_selection">False</property>
-+				  <property name="hover_expand">False</property>
-+				</widget>
-+			      </child>
- 			    </widget>
- 			    <packing>
- 			      <property name="padding">0</property>
-@@ -221,6 +466,25 @@
- 			      <property name="fill">True</property>
- 			    </packing>
- 			  </child>
-+
-+			  <child>
-+			    <widget class="GtkCheckButton" id="workspace_name_toggle">
-+			      <property name="visible">True</property>
-+			      <property name="can_focus">True</property>
-+			      <property name="label" translatable="yes">Show workspace _names in switcher</property>
-+			      <property name="use_underline">True</property>
-+			      <property name="relief">GTK_RELIEF_NORMAL</property>
-+			      <property name="focus_on_click">True</property>
-+			      <property name="active">False</property>
-+			      <property name="inconsistent">False</property>
-+			      <property name="draw_indicator">True</property>
-+			    </widget>
-+			    <packing>
-+			      <property name="padding">0</property>
-+			      <property name="expand">False</property>
-+			      <property name="fill">False</property>
-+			    </packing>
-+			  </child>
- 			</widget>
- 			<packing>
- 			  <property name="padding">0</property>
-@@ -244,22 +508,45 @@
- 	      </child>
- 	    </widget>
- 	    <packing>
--	      <property name="padding">0</property>
--	      <property name="expand">False</property>
--	      <property name="fill">True</property>
-+	      <property name="tab_expand">False</property>
-+	      <property name="tab_fill">True</property>
- 	    </packing>
- 	  </child>
- 
- 	  <child>
--	    <widget class="GtkVBox" id="vbox4">
-+	    <widget class="GtkLabel" id="label7">
-+	      <property name="visible">True</property>
-+	      <property name="label" translatable="yes">label7</property>
-+	      <property name="use_underline">False</property>
-+	      <property name="use_markup">False</property>
-+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-+	      <property name="wrap">False</property>
-+	      <property name="selectable">False</property>
-+	      <property name="xalign">0.5</property>
-+	      <property name="yalign">0.5</property>
-+	      <property name="xpad">0</property>
-+	      <property name="ypad">0</property>
-+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-+	      <property name="width_chars">-1</property>
-+	      <property name="single_line_mode">False</property>
-+	      <property name="angle">0</property>
-+	    </widget>
-+	    <packing>
-+	      <property name="type">tab</property>
-+	    </packing>
-+	  </child>
-+
-+	  <child>
-+	    <widget class="GtkVBox" id="viewport-child">
-+	      <property name="border_width">6</property>
- 	      <property name="visible">True</property>
- 	      <property name="homogeneous">False</property>
- 	      <property name="spacing">6</property>
- 
- 	      <child>
--		<widget class="GtkLabel" id="label6">
-+		<widget class="GtkLabel" id="label9">
- 		  <property name="visible">True</property>
--		  <property name="label" translatable="yes">&lt;b&gt;Workspaces&lt;/b&gt;</property>
-+		  <property name="label" translatable="yes">&lt;b&gt;Desktop Size&lt;/b&gt;</property>
- 		  <property name="use_underline">False</property>
- 		  <property name="use_markup">True</property>
- 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-@@ -269,6 +556,10 @@
- 		  <property name="yalign">0.5</property>
- 		  <property name="xpad">0</property>
- 		  <property name="ypad">0</property>
-+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-+		  <property name="width_chars">-1</property>
-+		  <property name="single_line_mode">False</property>
-+		  <property name="angle">0</property>
- 		</widget>
- 		<packing>
- 		  <property name="padding">0</property>
-@@ -278,13 +569,13 @@
- 	      </child>
- 
- 	      <child>
--		<widget class="GtkHBox" id="hbox8">
-+		<widget class="GtkHBox" id="hbox11">
- 		  <property name="visible">True</property>
- 		  <property name="homogeneous">False</property>
- 		  <property name="spacing">0</property>
- 
- 		  <child>
--		    <widget class="GtkLabel" id="label7">
-+		    <widget class="GtkLabel" id="label10">
- 		      <property name="visible">True</property>
- 		      <property name="label" translatable="yes">    </property>
- 		      <property name="use_underline">False</property>
-@@ -296,6 +587,10 @@
- 		      <property name="yalign">0.5</property>
- 		      <property name="xpad">0</property>
- 		      <property name="ypad">0</property>
-+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-+		      <property name="width_chars">-1</property>
-+		      <property name="single_line_mode">False</property>
-+		      <property name="angle">0</property>
- 		    </widget>
- 		    <packing>
- 		      <property name="padding">0</property>
-@@ -305,129 +600,178 @@
- 		  </child>
- 
- 		  <child>
--		    <widget class="GtkVBox" id="vbox1">
-+		    <widget class="GtkVBox" id="vbox7">
- 		      <property name="visible">True</property>
- 		      <property name="homogeneous">False</property>
- 		      <property name="spacing">6</property>
- 
- 		      <child>
--			<widget class="GtkHBox" id="hbox4">
-+			<widget class="GtkTable" id="table1">
- 			  <property name="visible">True</property>
-+			  <property name="n_rows">2</property>
-+			  <property name="n_columns">3</property>
- 			  <property name="homogeneous">False</property>
--			  <property name="spacing">12</property>
-+			  <property name="row_spacing">6</property>
-+			  <property name="column_spacing">6</property>
- 
- 			  <child>
--			    <widget class="GtkLabel" id="num_workspaces_label">
-+			    <widget class="GtkLabel" id="label11">
- 			      <property name="visible">True</property>
--			      <property name="label" translatable="yes">Number of _workspaces:</property>
--			      <property name="use_underline">True</property>
-+			      <property name="label" translatable="yes">Width:</property>
-+			      <property name="use_underline">False</property>
- 			      <property name="use_markup">False</property>
--			      <property name="justify">GTK_JUSTIFY_CENTER</property>
-+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
- 			      <property name="wrap">False</property>
- 			      <property name="selectable">False</property>
- 			      <property name="xalign">0</property>
- 			      <property name="yalign">0.5</property>
- 			      <property name="xpad">0</property>
- 			      <property name="ypad">0</property>
--			      <property name="mnemonic_widget">num_workspaces_spin</property>
-+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-+			      <property name="width_chars">-1</property>
-+			      <property name="single_line_mode">False</property>
-+			      <property name="angle">0</property>
- 			    </widget>
- 			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">False</property>
--			      <property name="fill">False</property>
-+			      <property name="left_attach">0</property>
-+			      <property name="right_attach">1</property>
-+			      <property name="top_attach">0</property>
-+			      <property name="bottom_attach">1</property>
-+			      <property name="x_options">fill</property>
-+			      <property name="y_options"></property>
-+			    </packing>
-+			  </child>
-+
-+			  <child>
-+			    <widget class="GtkLabel" id="label12">
-+			      <property name="visible">True</property>
-+			      <property name="label" translatable="yes">Height:</property>
-+			      <property name="use_underline">False</property>
-+			      <property name="use_markup">False</property>
-+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-+			      <property name="wrap">False</property>
-+			      <property name="selectable">False</property>
-+			      <property name="xalign">0</property>
-+			      <property name="yalign">0.5</property>
-+			      <property name="xpad">0</property>
-+			      <property name="ypad">0</property>
-+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-+			      <property name="width_chars">-1</property>
-+			      <property name="single_line_mode">False</property>
-+			      <property name="angle">0</property>
-+			    </widget>
-+			    <packing>
-+			      <property name="left_attach">0</property>
-+			      <property name="right_attach">1</property>
-+			      <property name="top_attach">1</property>
-+			      <property name="bottom_attach">2</property>
-+			      <property name="x_options">fill</property>
-+			      <property name="y_options"></property>
- 			    </packing>
- 			  </child>
- 
- 			  <child>
--			    <widget class="GtkSpinButton" id="num_workspaces_spin">
-+			    <widget class="GtkLabel" id="label13">
-+			      <property name="visible">True</property>
-+			      <property name="label" translatable="yes">columns</property>
-+			      <property name="use_underline">False</property>
-+			      <property name="use_markup">False</property>
-+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-+			      <property name="wrap">False</property>
-+			      <property name="selectable">False</property>
-+			      <property name="xalign">0</property>
-+			      <property name="yalign">0.5</property>
-+			      <property name="xpad">0</property>
-+			      <property name="ypad">0</property>
-+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-+			      <property name="width_chars">-1</property>
-+			      <property name="single_line_mode">False</property>
-+			      <property name="angle">0</property>
-+			    </widget>
-+			    <packing>
-+			      <property name="left_attach">2</property>
-+			      <property name="right_attach">3</property>
-+			      <property name="top_attach">0</property>
-+			      <property name="bottom_attach">1</property>
-+			      <property name="x_options">fill</property>
-+			      <property name="y_options"></property>
-+			    </packing>
-+			  </child>
-+
-+			  <child>
-+			    <widget class="GtkLabel" id="label14">
-+			      <property name="visible">True</property>
-+			      <property name="label" translatable="yes">rows</property>
-+			      <property name="use_underline">False</property>
-+			      <property name="use_markup">False</property>
-+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-+			      <property name="wrap">False</property>
-+			      <property name="selectable">False</property>
-+			      <property name="xalign">0</property>
-+			      <property name="yalign">0.5</property>
-+			      <property name="xpad">0</property>
-+			      <property name="ypad">0</property>
-+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-+			      <property name="width_chars">-1</property>
-+			      <property name="single_line_mode">False</property>
-+			      <property name="angle">0</property>
-+			    </widget>
-+			    <packing>
-+			      <property name="left_attach">2</property>
-+			      <property name="right_attach">3</property>
-+			      <property name="top_attach">1</property>
-+			      <property name="bottom_attach">2</property>
-+			      <property name="x_options">fill</property>
-+			      <property name="y_options"></property>
-+			    </packing>
-+			  </child>
-+
-+			  <child>
-+			    <widget class="GtkSpinButton" id="width-spinbutton">
- 			      <property name="visible">True</property>
- 			      <property name="can_focus">True</property>
- 			      <property name="climb_rate">1</property>
- 			      <property name="digits">0</property>
--			      <property name="numeric">True</property>
-+			      <property name="numeric">False</property>
- 			      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
- 			      <property name="snap_to_ticks">False</property>
- 			      <property name="wrap">False</property>
--			      <property name="adjustment">1 1 36 1 10 10</property>
-+			      <property name="adjustment">1 0 100 1 10 10</property>
- 			    </widget>
- 			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">True</property>
--			      <property name="fill">True</property>
-+			      <property name="left_attach">1</property>
-+			      <property name="right_attach">2</property>
-+			      <property name="top_attach">0</property>
-+			      <property name="bottom_attach">1</property>
-+			      <property name="x_options">fill</property>
-+			      <property name="y_options"></property>
- 			    </packing>
- 			  </child>
--			</widget>
--			<packing>
--			  <property name="padding">0</property>
--			  <property name="expand">False</property>
--			  <property name="fill">False</property>
--			</packing>
--		      </child>
--
--		      <child>
--			<widget class="GtkLabel" id="workspaces_label">
--			  <property name="visible">True</property>
--			  <property name="label" translatable="yes">Workspace na_mes:</property>
--			  <property name="use_underline">True</property>
--			  <property name="use_markup">False</property>
--			  <property name="justify">GTK_JUSTIFY_LEFT</property>
--			  <property name="wrap">False</property>
--			  <property name="selectable">False</property>
--			  <property name="xalign">0</property>
--			  <property name="yalign">0.5</property>
--			  <property name="xpad">0</property>
--			  <property name="ypad">0</property>
--			  <property name="mnemonic_widget">workspaces_tree_view</property>
--			</widget>
--			<packing>
--			  <property name="padding">0</property>
--			  <property name="expand">False</property>
--			  <property name="fill">False</property>
--			</packing>
--		      </child>
--
--		      <child>
--			<widget class="GtkScrolledWindow" id="scrolledwindow1">
--			  <property name="height_request">100</property>
--			  <property name="visible">True</property>
--			  <property name="can_focus">True</property>
--			  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
--			  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
--			  <property name="shadow_type">GTK_SHADOW_IN</property>
--			  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
- 
- 			  <child>
--			    <widget class="GtkTreeView" id="workspaces_tree_view">
-+			    <widget class="GtkSpinButton" id="height-spinbutton">
- 			      <property name="visible">True</property>
--			      <property name="tooltip" translatable="yes">Workspace Names</property>
- 			      <property name="can_focus">True</property>
--			      <property name="headers_visible">False</property>
--			      <property name="rules_hint">False</property>
--			      <property name="reorderable">False</property>
--			      <property name="enable_search">True</property>
-+			      <property name="climb_rate">1</property>
-+			      <property name="digits">0</property>
-+			      <property name="numeric">False</property>
-+			      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-+			      <property name="snap_to_ticks">False</property>
-+			      <property name="wrap">False</property>
-+			      <property name="adjustment">1 0 100 1 10 10</property>
- 			    </widget>
-+			    <packing>
-+			      <property name="left_attach">1</property>
-+			      <property name="right_attach">2</property>
-+			      <property name="top_attach">1</property>
-+			      <property name="bottom_attach">2</property>
-+			      <property name="x_options">fill</property>
-+			      <property name="y_options"></property>
-+			    </packing>
- 			  </child>
- 			</widget>
- 			<packing>
- 			  <property name="padding">0</property>
--			  <property name="expand">True</property>
--			  <property name="fill">True</property>
--			</packing>
--		      </child>
--
--		      <child>
--			<widget class="GtkCheckButton" id="workspace_name_toggle">
--			  <property name="visible">True</property>
--			  <property name="can_focus">True</property>
--			  <property name="label" translatable="yes">Show workspace _names in switcher</property>
--			  <property name="use_underline">True</property>
--			  <property name="relief">GTK_RELIEF_NORMAL</property>
--			  <property name="active">False</property>
--			  <property name="inconsistent">False</property>
--			  <property name="draw_indicator">True</property>
--			</widget>
--			<packing>
--			  <property name="padding">0</property>
- 			  <property name="expand">False</property>
- 			  <property name="fill">False</property>
- 			</packing>
-@@ -448,9 +792,31 @@
- 	      </child>
- 	    </widget>
- 	    <packing>
--	      <property name="padding">0</property>
--	      <property name="expand">True</property>
--	      <property name="fill">True</property>
-+	      <property name="tab_expand">False</property>
-+	      <property name="tab_fill">True</property>
-+	    </packing>
-+	  </child>
-+
-+	  <child>
-+	    <widget class="GtkLabel" id="label8">
-+	      <property name="visible">True</property>
-+	      <property name="label" translatable="yes">label8</property>
-+	      <property name="use_underline">False</property>
-+	      <property name="use_markup">False</property>
-+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-+	      <property name="wrap">False</property>
-+	      <property name="selectable">False</property>
-+	      <property name="xalign">0.5</property>
-+	      <property name="yalign">0.5</property>
-+	      <property name="xpad">0</property>
-+	      <property name="ypad">0</property>
-+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-+	      <property name="width_chars">-1</property>
-+	      <property name="single_line_mode">False</property>
-+	      <property name="angle">0</property>
-+	    </widget>
-+	    <packing>
-+	      <property name="type">tab</property>
- 	    </packing>
- 	  </child>
- 	</widget>
diff --git a/gnome-panel-2.17.91-about-fedora.patch b/gnome-panel-2.17.91-about-fedora.patch
deleted file mode 100644
index dee4085..0000000
--- a/gnome-panel-2.17.91-about-fedora.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gnome-panel-2.17.91.svn20070207/gnome-panel/panel-menu-items.c.about-fedora	2007-02-07 01:08:52.000000000 -0500
-+++ gnome-panel-2.17.91.svn20070207/gnome-panel/panel-menu-items.c	2007-02-07 01:10:44.000000000 -0500
-@@ -717,6 +717,7 @@
- 
- 	panel_menu_items_append_from_desktop (menu, "gnome-yelp.desktop", NULL);
- 	panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL);
-+	panel_menu_items_append_from_desktop (menu, "about-fedora.desktop", NULL);
- 
- 	if (parent->priv->append_lock_logout)
- 		panel_menu_items_append_lock_logout (menu);
diff --git a/gnome-panel-2.21.92-about-this-computer.patch b/gnome-panel-2.21.92-about-this-computer.patch
deleted file mode 100644
index 4b07b3b..0000000
--- a/gnome-panel-2.21.92-about-this-computer.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up gnome-panel-2.21.92/gnome-panel/panel-menu-items.c.about-this-computer gnome-panel-2.21.92/gnome-panel/panel-menu-items.c
---- gnome-panel-2.21.92/gnome-panel/panel-menu-items.c.about-this-computer	2008-03-08 14:35:22.000000000 -0500
-+++ gnome-panel-2.21.92/gnome-panel/panel-menu-items.c	2008-03-09 16:48:07.000000000 -0400
-@@ -1128,6 +1128,8 @@ panel_desktop_menu_item_append_menu (Gtk
- 	panel_menu_items_append_from_desktop (menu, "gnome-yelp.desktop", NULL);
- 	panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL);
- 	panel_menu_items_append_from_desktop (menu, "about-fedora.desktop", NULL);
-+	if (panel_has_desktop_file ("about-this-computer.desktop"))
-+		panel_menu_items_append_from_desktop (menu, "about-this-computer.desktop", NULL);
- 
- 	if (parent->priv->append_lock_logout)
- 		panel_menu_items_append_lock_logout (menu);
diff --git a/gnome-panel-2.23.4-vendor.patch b/gnome-panel-2.23.4-vendor.patch
deleted file mode 100644
index 91877e5..0000000
--- a/gnome-panel-2.23.4-vendor.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -up gnome-panel-2.23.4/gnome-panel/panel-menu-items.c.vendor gnome-panel-2.23.4/gnome-panel/panel-menu-items.c
---- gnome-panel-2.23.4/gnome-panel/panel-menu-items.c.vendor	2008-06-17 06:02:08.000000000 -0400
-+++ gnome-panel-2.23.4/gnome-panel/panel-menu-items.c	2008-07-18 21:40:34.000000000 -0400
-@@ -1011,7 +1011,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);
- 	if (gconf_name)
- 		g_free (gconf_name);
-@@ -1024,7 +1024,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);
- 	panel_place_menu_item_append_remote_gio (place_item, places_menu);
- 
-@@ -1131,7 +1131,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);
-+	panel_menu_items_append_from_desktop (menu, "gnome-yelp.desktop", NULL);
- 	panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL);
- 
- 	if (parent->priv->append_lock_logout)
diff --git a/gnome-panel-2.25.3-search.patch b/gnome-panel-2.25.3-search.patch
deleted file mode 100644
index 630667b..0000000
--- a/gnome-panel-2.25.3-search.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-Index: gnome-panel/libpanel-util/panel-launch.c
-===================================================================
---- gnome-panel/libpanel-util/panel-launch.c	(revision 11419)
-+++ gnome-panel/libpanel-util/panel-launch.c	(working copy)
-@@ -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 @@
- }
- 
- 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,
-Index: gnome-panel/libpanel-util/panel-launch.h
-===================================================================
---- gnome-panel/libpanel-util/panel-launch.h	(revision 11419)
-+++ gnome-panel/libpanel-util/panel-launch.h	(working copy)
-@@ -47,6 +47,8 @@
- 				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);
-Index: gnome-panel/panel-menu-items.c
-===================================================================
---- gnome-panel/panel-menu-items.c	(revision 11420)
-+++ gnome-panel/panel-menu-items.c	(working copy)
-@@ -1004,10 +1004,21 @@
- 
- 	add_menu_separator (places_menu);
- 
--	panel_menu_items_append_from_desktop (places_menu,
--					      "gnome-search-tool.desktop",
--					      NULL);
-+        if (panel_has_desktop_file ("gnome-beagle-search.desktop")) {
-+              panel_menu_items_append_from_desktop (places_menu,
-+                                                    "gnome-beagle-search.desktop",
-+                                                    NULL);
-+	} 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);
-+        } else {
-+              panel_menu_items_append_from_desktop (places_menu,
-+                                                    "gnome-search-tool.desktop",
-+                                                    NULL);
-+        }
- 
-+
- 	panel_recent_append_documents_menu (places_menu,
- 					    place_item->priv->recent_manager);
- 
-Index: gnome-panel/panel-action-button.c
-===================================================================
---- gnome-panel/panel-action-button.c	(revision 11419)
-+++ gnome-panel/panel-action-button.c	(working copy)
-@@ -220,9 +220,19 @@
- 	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 --git a/gnome-panel-2.26.0-show-emblemed-icons.patch b/gnome-panel-2.26.0-show-emblemed-icons.patch
deleted file mode 100644
index 203b30f..0000000
--- a/gnome-panel-2.26.0-show-emblemed-icons.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- gnome-panel-2.26.0/gnome-panel/panel-util.h.orig	2009-04-13 15:12:27.000000000 -0400
-+++ gnome-panel-2.26.0/gnome-panel/panel-util.h	2009-04-13 15:19:17.000000000 -0400
-@@ -65,6 +65,9 @@ void panel_util_set_tooltip_text (GtkWid
- char *panel_util_get_icon_name_from_g_icon (GIcon *gicon);
- GdkPixbuf *panel_util_get_pixbuf_from_g_loadable_icon (GIcon *gicon,
- 						       int    size);
-+GdkPixbuf *panel_util_get_pixbuf_from_gicon (GtkIconTheme  *icon_theme,
-+                                             GIcon         *gicon,
-+                                             int            size);
- GFile *panel_util_get_file_optional_homedir (const char *location);
- 
- G_END_DECLS
---- gnome-panel-2.26.0/gnome-panel/panel-util.c.orig	2009-04-13 15:12:22.000000000 -0400
-+++ gnome-panel-2.26.0/gnome-panel/panel-util.c	2009-04-13 15:19:09.000000000 -0400
-@@ -832,6 +832,33 @@ panel_util_get_pixbuf_from_g_loadable_ic
- 	return pixbuf;
- }
- 
-+GdkPixbuf *
-+panel_util_get_pixbuf_from_gicon (GtkIconTheme  *icon_theme,
-+				  GIcon *gicon,
-+				  int    size)
-+{
-+	GdkPixbuf    *pixbuf;
-+	GtkIconInfo  *icon_info;
-+
-+	g_return_val_if_fail (G_IS_ICON (gicon), NULL);
-+
-+	pixbuf = NULL;
-+
-+	icon_info = gtk_icon_theme_lookup_by_gicon (icon_theme,
-+						    gicon,
-+						    size,
-+						    0);
-+	if (icon_info == NULL)
-+		goto out;
-+
-+	pixbuf = gtk_icon_info_load_icon (icon_info, NULL);
-+
-+	gtk_icon_info_free (icon_info);
-+
-+ out:
-+	return pixbuf;
-+}
-+
- static char *
- panel_util_get_file_display_name_if_mount (GFile *file)
- {
---- gnome-panel-2.26.0/gnome-panel/menu.c.orig	2009-04-13 15:05:37.000000000 -0400
-+++ gnome-panel-2.26.0/gnome-panel/menu.c	2009-04-13 15:22:38.000000000 -0400
-@@ -599,7 +599,7 @@ load_icons_handler_again:
- 						   &long_operation);
- 			g_free (icon_name);
- 		} else {
--			pb = panel_util_get_pixbuf_from_g_loadable_icon (icon->gicon, icon_height);
-+                        pb = panel_util_get_pixbuf_from_gicon (icon->icon_theme, icon->gicon, icon_height);
- 			if (!pb && icon->fallback_image) {
- 				pb = panel_make_menu_icon (icon->icon_theme,
- 							   NULL,
diff --git a/gnome-panel-2.27.4-fix-monitor.patch b/gnome-panel-2.27.4-fix-monitor.patch
deleted file mode 100644
index 25c176d..0000000
--- a/gnome-panel-2.27.4-fix-monitor.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -up gnome-panel-2.27.4/gnome-panel/panel-toplevel.c.fix-monitor gnome-panel-2.27.4/gnome-panel/panel-toplevel.c
---- gnome-panel-2.27.4/gnome-panel/panel-toplevel.c.fix-monitor	2009-07-24 13:32:56.736614448 -0400
-+++ gnome-panel-2.27.4/gnome-panel/panel-toplevel.c	2009-07-24 13:43:25.944864163 -0400
-@@ -2518,6 +2518,13 @@ panel_toplevel_update_geometry (PanelTop
- 				GtkRequisition *requisition)
- {
- 	toplevel->priv->updated_geometry_initial = TRUE;
-+
-+	/* If the panel got assigned to a monitor that no longer exists, then
-+	 * move it to one that does.
-+	 */
-+	if (toplevel->priv->monitor >= panel_multiscreen_monitors (gtk_window_get_screen (GTK_WINDOW (toplevel)))) {
-+		panel_toplevel_set_monitor (toplevel, 0);
-+	}
- 	panel_toplevel_update_size (toplevel, requisition);
- 	panel_toplevel_update_position (toplevel);
- 
diff --git a/gnome-panel-2.31.2-libm.patch b/gnome-panel-2.31.2-libm.patch
deleted file mode 100644
index 97b2991..0000000
--- a/gnome-panel-2.31.2-libm.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up gnome-panel-2.31.2/applets/clock/Makefile.am.libm gnome-panel-2.31.2/applets/clock/Makefile.am
---- gnome-panel-2.31.2/applets/clock/Makefile.am.libm	2010-06-17 10:21:14.000000000 +0200
-+++ gnome-panel-2.31.2/applets/clock/Makefile.am	2010-06-17 10:21:28.000000000 +0200
-@@ -67,7 +67,7 @@ CLOCK_LDADD =						\
- 	$(CLOCK_LIBS)					\
- 	$(LIBPANEL_APPLET_LIBS)				\
- 	$(POLKIT_LIBS)				\
--	-lgweather
-+	-lgweather -lm
- 
- BUILT_SOURCES =					\
- 	clock-marshallers.c			\
diff --git a/gnome-panel-gdbus.patch b/gnome-panel-gdbus.patch
deleted file mode 100644
index 6c99426..0000000
--- a/gnome-panel-gdbus.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up gnome-panel-2.31.4/gnome-panel/libpanel-applet-private/panel-applet-container.c.gdbus gnome-panel-2.31.4/gnome-panel/libpanel-applet-private/panel-applet-container.c
---- gnome-panel-2.31.4/gnome-panel/libpanel-applet-private/panel-applet-container.c.gdbus	2010-08-03 07:16:07.876419001 -0400
-+++ gnome-panel-2.31.4/gnome-panel/libpanel-applet-private/panel-applet-container.c	2010-08-03 07:16:25.425419002 -0400
-@@ -343,6 +343,7 @@ on_proxy_appeared (GObject      *source_
- 					    "PropertiesChanged",
- 					    g_dbus_proxy_get_object_path (proxy),
- 					    PANEL_APPLET_INTERFACE,
-+                                            0,
- 					    (GDBusSignalCallback) on_property_changed,
- 					    container, NULL);
- 
-diff -up gnome-panel-2.31.4/gnome-panel/panel-shell.c.gdbus gnome-panel-2.31.4/gnome-panel/panel-shell.c
---- gnome-panel-2.31.4/gnome-panel/panel-shell.c.gdbus	2010-06-22 19:00:28.000000000 -0400
-+++ gnome-panel-2.31.4/gnome-panel/panel-shell.c	2010-08-03 07:13:40.269419001 -0400
-@@ -126,6 +126,7 @@ panel_shell_register (gboolean replace)
- 						    "NameLost",
- 						    "/org/freedesktop/DBus",
- 						    PANEL_DBUS_SERVICE,
-+                                                    0,
- 						    (GDBusSignalCallback)panel_shell_on_name_lost,
- 						    NULL, NULL);
- 		break;
diff --git a/gnome-panel-libs.patch b/gnome-panel-libs.patch
index f77f454..f02dd49 100644
--- a/gnome-panel-libs.patch
+++ b/gnome-panel-libs.patch
@@ -1,7 +1,174 @@
-diff -up gnome-panel-2.31.92/configure.ac.libs gnome-panel-2.31.92/configure.ac
---- gnome-panel-2.31.92/configure.ac.libs	2010-09-14 08:48:16.000000000 -0400
-+++ gnome-panel-2.31.92/configure.ac	2010-09-22 00:52:56.138997995 -0400
-@@ -235,10 +235,15 @@ AC_SUBST(X_LIBS)
+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
  
@@ -20,10 +187,297 @@ diff -up gnome-panel-2.31.92/configure.ac.libs gnome-panel-2.31.92/configure.ac
  
  dnl Modules dir
  AC_SUBST([modulesdir],"\$(libdir)/gnome-panel/modules")
-diff -up gnome-panel-2.31.92/gnome-panel/Makefile.am.libs gnome-panel-2.31.92/gnome-panel/Makefile.am
---- gnome-panel-2.31.92/gnome-panel/Makefile.am.libs	2010-09-14 03:55:39.000000000 -0400
-+++ gnome-panel-2.31.92/gnome-panel/Makefile.am	2010-09-22 00:53:48.106998001 -0400
-@@ -154,6 +154,7 @@ gnome_panel_LDADD =		\
+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)									\
@@ -31,11 +485,71 @@ diff -up gnome-panel-2.31.92/gnome-panel/Makefile.am.libs gnome-panel-2.31.92/gn
  	$(X_LIBS)
  
  gnome_panel_LDFLAGS = -export-dynamic
-@@ -170,6 +171,7 @@ gnome_desktop_item_edit_LDFLAGS = -expor
+@@ -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)			\
-+	-lm	\
- 	$(X_LIBS)
+ 	$(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)
  
- uidir = $(datadir)/gnome-panel/ui
+ libpanel_applet_4_la_LDFLAGS = \
+ 	-version-info $(LIB_PANEL_APPLET_LT_VERSION)	\
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 091a40e..9b349d8 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -1,13 +1,13 @@
 %define gettext_package gnome-panel-2.0
 
-%define gnome_desktop_version 2.11.1
+%define gnome_desktop_version 2.91.6
 %define glib2_version 2.25.9
 %define gtk2_version 2.11.3
 %define libgnome_version 2.13.0
 %define libgnomeui_version 2.5.4
 %define libbonoboui_version 2.3.0
 %define orbit_version 2.4.0
-%define libwnck_version 2.19.5
+%define libwnck_version 2.91.6
 %define gconf_version 2.14
 %define gnome_menus_version 2.27.92
 %define evolution_data_server_version 1.9.1
@@ -15,17 +15,17 @@
 %define dbus_version 0.60
 %define dbus_glib_version 0.60
 %define gnome_doc_utils_version 0.3.2
-%define libgweather_version 2.27.90
+%define libgweather_version 2.91.0
 
 %define use_evolution_data_server 1
 
 Summary: GNOME panel
 Name: gnome-panel
-Version: 2.31.92
-Release: 2%{?dist}
+Version: 2.91.6
+Release: 1%{?dist}
 URL: http://www.gnome.org
 #VCS: git:git://git.gnome.org/gnome-panel
-Source0: http://download.gnome.org/sources/gnome-panel/2.31/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-panel/2.91/%{name}-%{version}.tar.bz2
 
 Source3: redhat-panel-default-setup.entries
 Source4: gnome-compiler-flags.m4
@@ -35,7 +35,7 @@ License: GPLv2+ and LGPLv2+ and GFDL
 Group: User Interface/Desktops
 
 Requires: gnome-desktop >= %{gnome_desktop_version}
-Requires: libwnck >= %{libwnck_version}
+Requires: libwnck3 >= %{libwnck_version}
 Requires: gnome-menus >= %{gnome_menus_version}
 %if %{use_evolution_data_server}
 Requires: evolution-data-server >= %{evolution_data_server_version}
@@ -58,12 +58,12 @@ BuildRequires: scrollkeeper
 BuildRequires: libxslt
 BuildRequires: libX11-devel
 BuildRequires: libXt-devel
-BuildRequires: gnome-desktop-devel >= %{gnome_desktop_version}
+BuildRequires: pkgconfig(gnome-desktop-3.0) >= %{gnome_desktop_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: libgnome-devel >= %{libgnome_version}
 BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
 BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
-BuildRequires: libwnck-devel >= %{libwnck_version}
+BuildRequires: pkgconfig(libwnck-3.0) >= %{libwnck_version}
 BuildRequires: GConf2-devel >= %{gconf_version}
 BuildRequires: gnome-menus-devel >= %{gnome_menus_version}
 BuildRequires: cairo-devel >= %{cairo_version}
@@ -88,15 +88,12 @@ BuildRequires: gettext-devel
 BuildRequires: libtool
 BuildRequires: libcanberra-devel
 
-Patch0: gnome-panel-vendor.patch
 Patch1: gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch
-Patch2: gnome-panel-search.patch
-Patch3: gnome-panel-about.patch
 
 # the next three patches belong together
 # http://bugzilla.gnome.org/show_bug.cgi?id=470966
 Patch8: launcher-desktop-files.patch
-Patch9: desktop-file-monitoring.patch
+#Patch9: desktop-file-monitoring.patch
 Patch10: preferred-apps.patch
 
 # don't pop up an error dialog if an applet from the
@@ -113,12 +110,6 @@ Patch38: clock-network.patch
 Patch40: clock-home.patch
 Patch41: bookmarks-submenu.patch
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=343436
-Patch43: panel-padding.patch
-
-# https://bugzilla.gnome.org/show_bug.cgi?id=583273
-Patch45: icon-padding.patch
-
 # https://bugzilla.redhat.com/show_bug.cgi?id=537798
 Patch47: fix-clock-crash.patch
 
@@ -154,33 +145,26 @@ Panel Applets using the libpanel-applet library.
 
 %prep
 %setup -q -n %{name}-%{version}
-
-%patch0 -p1 -b .vendor
 %patch1 -p1 -b .speak-to-us-ye-old-wise-fish
-%patch2 -p1 -b .search
-%patch3 -p1 -b .about
 %patch8 -p1 -b .launcher-desktop-files
-%patch9 -p1 -b .desktop-file-monitoring
+#%patch9 -p1 -b .desktop-file-monitoring
 %patch10 -p1 -b .preferred-apps
 #%patch11 -p1 -b .applet-error
 %patch24 -p1 -b .allow-spurious-view-done-signals
 %patch38 -p1 -b .clock-network
 %patch40 -p1 -b .clock-home
 %patch41 -p1 -b .bookmarks-submenu
-%patch43 -p1 -b .panel-padding
-#%patch45 -p1 -b .icon-padding
 %patch47 -p1 -b .fix-clock-crash
 %patch48 -p1 -b .libs
 
 cp -f %{SOURCE3} gnome-panel/panel-default-setup.entries
 cp -f %{SOURCE4} m4
 cp -f %{SOURCE5} gnome-panel/panel-compatibility.schemas
-
+rm -f libtool
 autoreconf -i -f
 
 %build
 %configure \
-   --disable-shave \
    --disable-gtk-doc \
    --disable-scrollkeeper \
 %if %{use_evolution_data_server}
@@ -361,6 +345,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null || :
 %{_datadir}/gir-1.0/PanelApplet-3.0.gir
 
 %changelog
+* 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
 
diff --git a/icon-order.patch b/icon-order.patch
deleted file mode 100644
index fa5503b..0000000
--- a/icon-order.patch
+++ /dev/null
@@ -1,219 +0,0 @@
-diff -up gnome-panel-2.29.6/applets/notification_area/na-tray-child.c.icon-order gnome-panel-2.29.6/applets/notification_area/na-tray-child.c
---- gnome-panel-2.29.6/applets/notification_area/na-tray-child.c.icon-order	2010-01-13 22:26:27.000000000 -0500
-+++ gnome-panel-2.29.6/applets/notification_area/na-tray-child.c	2010-02-17 19:08:47.471655712 -0500
-@@ -428,3 +428,84 @@ na_tray_child_force_redraw (NaTrayChild 
- #endif
-     }
- }
-+
-+
-+/* from libwnck xutils.c */
-+static char *
-+latin1_to_utf8 (const char *latin1)
-+{
-+  GString *str;
-+  const char *p;
-+
-+  str = g_string_new (NULL);
-+
-+  p = latin1;
-+  while (*p)
-+    {
-+      g_string_append_unichar (str, (gunichar) *p);
-+      ++p;
-+    }
-+
-+  return g_string_free (str, FALSE);
-+}
-+
-+/* derived from libwnck xutils.c */
-+static void
-+_get_wmclass (Display *xdisplay,
-+              Window   xwindow,
-+              char   **res_class,
-+              char   **res_name)
-+{
-+  XClassHint ch;
-+  char *retval;
-+
-+  gdk_error_trap_push ();
-+
-+  ch.res_name = NULL;
-+  ch.res_class = NULL;
-+
-+  XGetClassHint (xdisplay, xwindow, &ch);
-+
-+  gdk_error_trap_pop ();
-+
-+  retval = NULL;
-+
-+  if (res_class)
-+    *res_class = NULL;
-+
-+  if (res_name)
-+    *res_name = NULL;
-+
-+  if (ch.res_name)
-+    {
-+      if (res_name)
-+        *res_name = latin1_to_utf8 (ch.res_name);
-+
-+      XFree (ch.res_name);
-+    }
-+
-+  if (ch.res_class)
-+    {
-+      if (res_class)
-+        *res_class = latin1_to_utf8 (ch.res_class);
-+
-+      XFree (ch.res_class);
-+    }
-+}
-+
-+void
-+na_tray_child_get_wm_class (NaTrayChild *child,
-+                            char **res_name,
-+                            char **res_class)
-+{
-+  GdkDisplay *display;
-+
-+  g_return_if_fail (NA_IS_TRAY_CHILD (child));
-+
-+  display = gtk_widget_get_display (GTK_WIDGET (child));
-+
-+  _get_wmclass (GDK_DISPLAY_XDISPLAY (display),
-+                child->icon_window,
-+                res_class,
-+                res_name);
-+}
-diff -up gnome-panel-2.29.6/applets/notification_area/na-tray-child.h.icon-order gnome-panel-2.29.6/applets/notification_area/na-tray-child.h
---- gnome-panel-2.29.6/applets/notification_area/na-tray-child.h.icon-order	2010-01-13 22:26:27.000000000 -0500
-+++ gnome-panel-2.29.6/applets/notification_area/na-tray-child.h	2010-02-17 19:08:47.473682322 -0500
-@@ -61,7 +61,10 @@ char           *na_tray_child_get_title 
- gboolean        na_tray_child_has_alpha      (NaTrayChild *child);
- void            na_tray_child_set_composited (NaTrayChild *child,
-                                               gboolean     composited);
--void            na_tray_child_force_redraw   (NaTrayChild *child);
-+void            na_tray_child_force_redraw   (NaTrayChild  *child);
-+void            na_tray_child_get_wm_class   (NaTrayChild  *child,
-+					      char        **res_name,
-+			     		      char        **res_class);
- 
- G_END_DECLS
- 
-diff -up gnome-panel-2.29.6/applets/notification_area/na-tray.c.icon-order gnome-panel-2.29.6/applets/notification_area/na-tray.c
---- gnome-panel-2.29.6/applets/notification_area/na-tray.c.icon-order	2010-01-13 22:26:27.000000000 -0500
-+++ gnome-panel-2.29.6/applets/notification_area/na-tray.c	2010-02-17 19:11:27.056945278 -0500
-@@ -117,6 +117,52 @@ get_tray (TraysScreen *trays_screen)
-   return trays_screen->all_trays->data;
- }
- 
-+const char *roles[] = {
-+  "keyboard",
-+  "volume",
-+  "bluetooth",
-+  "network",
-+  "battery",
-+  NULL
-+};
-+
-+const char *wmclass_roles[] = {
-+  "Bluetooth-applet", "bluetooth",
-+  "Gnome-volume-control-applet", "volume",
-+  "Nm-applet", "network",
-+  "Gnome-power-manager", "battery",
-+  "keyboard", "keyboard",
-+  NULL,
-+};
-+
-+static const char *
-+find_role (const char *wmclass)
-+{
-+  int i;
-+
-+  for (i = 0; wmclass_roles[i]; i += 2)
-+    {
-+      if (strcmp (wmclass, wmclass_roles[i]) == 0)
-+        return wmclass_roles[i + 1];
-+    }
-+
-+  return NULL;
-+}
-+
-+static int
-+find_role_pos (const char *role)
-+{
-+  int i;
-+
-+  for (i = 0; roles[i]; i++)
-+    {
-+      if (strcmp (role, roles[i]) == 0)
-+        break;
-+    }
-+
-+  return i + 1;
-+}
-+
- static void
- tray_added (NaTrayManager *manager,
-             GtkWidget     *icon,
-@@ -124,6 +170,11 @@ tray_added (NaTrayManager *manager,
- {
-   NaTray *tray;
-   NaTrayPrivate *priv;
-+  GList *l, *children;
-+  int position;
-+  char *class_a;
-+  const char *role;
-+  int role_position;
- 
-   tray = get_tray (trays_screen);
-   if (tray == NULL)
-@@ -132,10 +183,45 @@ tray_added (NaTrayManager *manager,
-   priv = tray->priv;
- 
-   g_assert (priv->trays_screen == trays_screen);
--  
-+
-   g_hash_table_insert (trays_screen->icon_table, icon, tray);
- 
--  gtk_box_pack_end (GTK_BOX (priv->box), icon, FALSE, FALSE, 0);
-+  position = 0;
-+
-+  class_a = NULL;
-+  na_tray_child_get_wm_class (NA_TRAY_CHILD (icon), NULL, &class_a);
-+  if (!class_a)
-+    goto insert;
-+
-+  role = find_role (class_a);
-+  g_free (class_a);
-+  if (!role)
-+    goto insert;
-+
-+  role_position = find_role_pos (role);
-+  g_object_set_data (G_OBJECT (icon), "role-position", GINT_TO_POINTER (role_position));
-+
-+  children = gtk_container_get_children (GTK_CONTAINER (priv->box));
-+  for (l = g_list_last (children); l; l = l->prev)
-+    {
-+      GtkWidget *child = l->data;
-+      gint rp;
-+
-+      rp = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (child), "role-position"));
-+      if (rp == 0 || rp < role_position)
-+        {
-+          position = g_list_index (children, child) + 1;
-+          break;
-+        }
-+    }
-+  g_list_free (children);
-+
-+  if (position < 0)
-+    position = 0;
-+
-+insert:
-+  gtk_box_pack_start (GTK_BOX (priv->box), icon, FALSE, FALSE, 0);
-+  gtk_box_reorder_child (GTK_BOX (priv->box), icon, position);
- 
-   gtk_widget_show (icon);
- }
diff --git a/panel-icons.patch b/panel-icons.patch
deleted file mode 100644
index 01c9f86..0000000
--- a/panel-icons.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-diff -up gnome-panel-2.27.4/gnome-panel/menu.c.panel-icons gnome-panel-2.27.4/gnome-panel/menu.c
---- gnome-panel-2.27.4/gnome-panel/menu.c.panel-icons	2009-07-01 09:06:23.000000000 -0400
-+++ gnome-panel-2.27.4/gnome-panel/menu.c	2009-07-31 18:31:52.836622831 -0400
-@@ -1389,7 +1389,7 @@ create_submenu_entry (GtkWidget         
- {
- 	GtkWidget *menuitem;
- 
--	menuitem = panel_image_menu_item_new ();
-+	menuitem = gtk_image_menu_item_new ();
- 	panel_load_menu_image_deferred (menuitem,
- 					panel_menu_icon_get_size (),
- 					NULL, NULL,
-diff -up gnome-panel-2.27.4/gnome-panel/panel-menu-items.c.panel-icons gnome-panel-2.27.4/gnome-panel/panel-menu-items.c
---- gnome-panel-2.27.4/gnome-panel/panel-menu-items.c.panel-icons	2009-07-31 18:31:52.737846416 -0400
-+++ gnome-panel-2.27.4/gnome-panel/panel-menu-items.c	2009-07-31 18:34:05.243598174 -0400
-@@ -1,4 +1,5 @@
--/*
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
-+ *
-  * Copyright (C) 2005 Vincent Untz
-  *
-  * This program is free software; you can redistribute it and/or
-@@ -141,7 +142,8 @@ activate_desktop_uri (GtkWidget *menuite
- static void
- panel_menu_items_append_from_desktop (GtkWidget *menu,
- 				      char      *path,
--				      char      *force_name)
-+				      char      *force_name,
-+                                      gboolean   use_icon)
- {
- 	GKeyFile  *key_file;
- 	gboolean   loaded;
-@@ -237,7 +239,12 @@ panel_menu_items_append_from_desktop (Gt
- 	else
- 		name = g_strdup (force_name);
- 
--	item = panel_image_menu_item_new ();
-+	if (use_icon) {
-+		item = panel_image_menu_item_new ();
-+        } else {
-+		item = gtk_image_menu_item_new ();
-+	}
-+
- 	setup_menu_item_with_icon (item, panel_menu_icon_get_size (),
- 				   icon, NULL, NULL, name);
- 
-@@ -313,7 +320,7 @@ panel_menu_items_create_action_item_full
- 	if (panel_action_get_is_disabled (action_type))
- 		return NULL;
- 
--	item = panel_image_menu_item_new ();
-+	item = gtk_image_menu_item_new ();
-         setup_menu_item_with_icon (item,
- 				   panel_menu_icon_get_size (),
- 				   panel_action_get_icon_name (action_type),
-@@ -1032,7 +1039,8 @@ panel_place_menu_item_create_menu (Panel
- 					      NULL);
- 	panel_menu_items_append_from_desktop (places_menu,
- 					      "gnome-nautilus-computer.desktop",
--					      gconf_name);
-+					      gconf_name,
-+                                              TRUE);
- 	if (gconf_name)
- 		g_free (gconf_name);
- 
-@@ -1041,7 +1049,8 @@ panel_place_menu_item_create_menu (Panel
- 
- 	panel_menu_items_append_from_desktop (places_menu,
- 					      "gnome-network-scheme.desktop",
--					      NULL);
-+					      NULL,
-+                                              TRUE);
- 	panel_place_menu_item_append_remote_gio (place_item, places_menu);
- 
- 	if (panel_is_program_in_path ("nautilus-connect-server")) {
-@@ -1056,15 +1065,18 @@ panel_place_menu_item_create_menu (Panel
-         if (panel_has_desktop_file ("gnome-beagle-search.desktop")) {
-               panel_menu_items_append_from_desktop (places_menu,
-                                                     "gnome-beagle-search.desktop",
--                                                    NULL);
-+                                                    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);
-+                                                    NULL,
-+                                                    FALSE);
-         } else {
-               panel_menu_items_append_from_desktop (places_menu,
-                                                     "gnome-search-tool.desktop",
--                                                    NULL);
-+                                                    NULL,
-+                                                    FALSE);
-         }
- 
- 
-@@ -1158,9 +1170,9 @@ panel_desktop_menu_item_append_menu (Gtk
- 	if (add_separator)
- 		add_menu_separator (menu);
- 
--	panel_menu_items_append_from_desktop (menu, "gnome-yelp.desktop", NULL);
-+	panel_menu_items_append_from_desktop (menu, "gnome-yelp.desktop", NULL, FALSE);
- 	if (panel_has_desktop_file ("about-this-computer.desktop"))
--		panel_menu_items_append_from_desktop (menu, "about-this-computer.desktop", NULL);
-+		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 -up gnome-panel-2.27.4/gnome-panel/panel-recent.c.panel-icons gnome-panel-2.27.4/gnome-panel/panel-recent.c
---- gnome-panel-2.27.4/gnome-panel/panel-recent.c.panel-icons	2009-07-01 09:06:23.000000000 -0400
-+++ gnome-panel-2.27.4/gnome-panel/panel-recent.c	2009-07-31 18:31:52.839621328 -0400
-@@ -188,7 +188,7 @@ panel_recent_append_documents_menu (GtkW
- 	GtkWidget      *menu_item;
- 	int             size;
- 
--	menu_item = panel_image_menu_item_new ();
-+	menu_item = gtk_image_menu_item_new ();
- 	setup_menu_item_with_icon (menu_item,
- 				   panel_menu_icon_get_size (),
- 				   PANEL_ICON_RECENT,
diff --git a/panel-randr-crashes.patch b/panel-randr-crashes.patch
deleted file mode 100644
index 9e870c1..0000000
--- a/panel-randr-crashes.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 66b8e290bd0b767183cba583917907940b5b425a Mon Sep 17 00:00:00 2001
-From: Vincent Untz <vuntz@gnome.org>
-Date: Tue, 6 Oct 2009 12:47:52 +0200
-Subject: [PATCH] [panel] Fix crashes in various conditions with the new randr code
-
-If nothing had probed the randr screen resources before us and the X
-server is supporting randr 1.3, then we got no output, and therefore no
-monitor. The fix here is to actively probe for resources if we detect
-this case. See https://bugzilla.gnome.org/show_bug.cgi?id=597101
-
-Also, in some cases, all outputs appear disconnected. See
-https://bugzilla.novell.com/show_bug.cgi?id=543876
-
-To be completely on the safe side, if we get no monitor information from
-randr, even if it is successful, we fallback to the GTK+ method.
----
- gnome-panel/panel-multiscreen.c |   35 ++++++++++++++++++++++++++++++-----
- 1 files changed, 30 insertions(+), 5 deletions(-)
-
-diff --git a/gnome-panel/panel-multiscreen.c b/gnome-panel/panel-multiscreen.c
-index 8a05221..4ed76ae 100644
---- a/gnome-panel/panel-multiscreen.c
-+++ b/gnome-panel/panel-multiscreen.c
-@@ -136,9 +136,17 @@ panel_multiscreen_get_randr_monitors_for_screen (GdkScreen     *screen,
- 	xroot = GDK_WINDOW_XWINDOW (gdk_screen_get_root_window (screen));
- 
- #if (RANDR_MAJOR > 1 || (RANDR_MAJOR == 1 && RANDR_MINOR >= 3))
--	if (have_randr_1_3)
-+	if (have_randr_1_3) {
- 		resources = XRRGetScreenResourcesCurrent (xdisplay, xroot);
--	else
-+		if (resources->noutput == 0) {
-+			/* This might happen if nothing tried to get randr
-+			 * resources from the server before, so we need an
-+			 * active probe. See comment #27 in
-+			 * https://bugzilla.gnome.org/show_bug.cgi?id=597101 */
-+			XRRFreeScreenResources (resources);
-+			resources = XRRGetScreenResources (xdisplay, xroot);
-+		}
-+	} else
- 		resources = XRRGetScreenResources (xdisplay, xroot);
- #else
- 	resources = XRRGetScreenResources (xdisplay, xroot);
-@@ -205,6 +213,17 @@ panel_multiscreen_get_randr_monitors_for_screen (GdkScreen     *screen,
- 		return FALSE;
- 	}
- 
-+	if (geometries->len == 0) {
-+		/* This can happen in at least one case:
-+		 * https://bugzilla.novell.com/show_bug.cgi?id=543876 where all
-+		 * monitors appear disconnected (possibly because the  screen
-+		 * is behing a KVM switch) -- see comment #8.
-+		 * There might be other cases too, so we stay on the safe side.
-+		 */
-+		g_array_free (geometries, TRUE);
-+		return FALSE;
-+	}
-+
- 	*monitors_ret = geometries->len;
- 	*geometries_ret = (GdkRectangle *) g_array_free (geometries, FALSE);
- 
-@@ -238,9 +257,15 @@ panel_multiscreen_get_raw_monitors_for_screen (GdkScreen     *screen,
- 					       int           *monitors_ret,
- 					       GdkRectangle **geometries_ret)
- {
--	if (panel_multiscreen_get_randr_monitors_for_screen (screen,
--							     monitors_ret,
--							     geometries_ret))
-+	gboolean res;
-+
-+	*monitors_ret = 0;
-+	*geometries_ret = NULL;
-+
-+	res = panel_multiscreen_get_randr_monitors_for_screen (screen,
-+							       monitors_ret,
-+							       geometries_ret);
-+	if (res && *monitors_ret > 0)
- 		return;
- 
- 	panel_multiscreen_get_gdk_monitors_for_screen (screen,
--- 
-1.6.4.2
\ No newline at end of file
diff --git a/polkit-error.patch b/polkit-error.patch
deleted file mode 100644
index cfeaa02..0000000
--- a/polkit-error.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -up gnome-panel-2.28.0/applets/clock/gnome-clock-applet-mechanism.c.polkit-error gnome-panel-2.28.0/applets/clock/gnome-clock-applet-mechanism.c
---- gnome-panel-2.28.0/applets/clock/gnome-clock-applet-mechanism.c.polkit-error	2009-12-15 22:43:20.419177854 -0500
-+++ gnome-panel-2.28.0/applets/clock/gnome-clock-applet-mechanism.c	2009-12-15 22:46:08.544926738 -0500
-@@ -241,9 +241,16 @@ _check_polkit_for_action (GnomeClockAppl
-                                                             action,
-                                                             NULL,
-                                                             POLKIT_CHECK_AUTHORIZATION_FLAGS_ALLOW_USER_INTERACTION,
--                                                            NULL, NULL);
-+                                                            NULL, &error);
-         g_object_unref (subject);
- 
-+        if (error) {
-+                dbus_g_method_return_error (context, error);
-+                g_error_free (error);
-+
-+                return FALSE;
-+        }
-+
-         if (!polkit_authorization_result_get_is_authorized (result)) {
-                 error = g_error_new (GNOME_CLOCK_APPLET_MECHANISM_ERROR,
-                                      GNOME_CLOCK_APPLET_MECHANISM_ERROR_NOT_PRIVILEGED,
-@@ -565,19 +572,28 @@ check_can_do (GnomeClockAppletMechanism 
-         const char *sender;
-         PolkitSubject *subject;
-         PolkitAuthorizationResult *result;
-+        GError *error;
- 
-         /* Check that caller is privileged */
-         sender = dbus_g_method_get_sender (context);
-         subject = polkit_system_bus_name_new (sender);
- 
-+        error = NULL;
-         result = polkit_authority_check_authorization_sync (mechanism->priv->auth,
-                                                             subject,
-                                                             action,
-                                                             NULL,
-                                                             0,
--                                                            NULL, NULL);
-+                                                            NULL,
-+                                                            &error);
-         g_object_unref (subject);
- 
-+        if (error) {
-+                dbus_g_method_return_error (context, error);
-+                g_error_free (error);
-+                return;
-+        }
-+
-         if (polkit_authorization_result_get_is_authorized (result)) {
-                 dbus_g_method_return (context, 2);
-         }
diff --git a/polkit1.patch b/polkit1.patch
deleted file mode 100644
index ee90edc..0000000
--- a/polkit1.patch
+++ /dev/null
@@ -1,789 +0,0 @@
-diff -up gnome-panel-2.27.4/applets/clock/clock.c.polkit1 gnome-panel-2.27.4/applets/clock/clock.c
---- gnome-panel-2.27.4/applets/clock/clock.c.polkit1	2009-07-01 09:06:23.000000000 -0400
-+++ gnome-panel-2.27.4/applets/clock/clock.c	2009-08-13 14:09:17.734209990 -0400
-@@ -1617,7 +1617,7 @@ update_set_time_button (ClockData *cd)
- {
- 	gint can_set;
- 
--	can_set = can_set_system_time (); /* this can return 0, 1, 2 */
-+	can_set = can_set_system_time ();
- 
- 	if (cd->time_settings_button)
- 		gtk_widget_set_sensitive (cd->time_settings_button, can_set);
-@@ -1680,7 +1680,7 @@ set_time (GtkWidget *widget, ClockData *
- 
- 	tim = mktime (&t);
- 
--	set_system_time_async (tim, GDK_WINDOW_XWINDOW (cd->applet->window), (GFunc)set_time_callback, cd, NULL);
-+	set_system_time_async (tim, (GFunc)set_time_callback, cd, NULL);
- }
- 
- static void
-diff -up gnome-panel-2.27.4/applets/clock/clock-location.c.polkit1 gnome-panel-2.27.4/applets/clock/clock-location.c
---- gnome-panel-2.27.4/applets/clock/clock-location.c.polkit1	2009-08-13 14:09:17.708956705 -0400
-+++ gnome-panel-2.27.4/applets/clock/clock-location.c	2009-08-13 14:09:17.737208766 -0400
-@@ -537,8 +537,7 @@ clock_location_make_current (ClockLocati
- 
-         filename = g_build_filename (SYSTEM_ZONEINFODIR, priv->timezone, NULL);
-         set_system_timezone_async (filename,
--				   transient_parent_xid,
--                                   (GFunc)make_current_cb, 
-+                                   (GFunc)make_current_cb,
- 				   mcdata,
-                                    free_make_current_data);
-         g_free (filename);
-diff -up gnome-panel-2.27.4/applets/clock/gnome-clock-applet-mechanism.c.polkit1 gnome-panel-2.27.4/applets/clock/gnome-clock-applet-mechanism.c
---- gnome-panel-2.27.4/applets/clock/gnome-clock-applet-mechanism.c.polkit1	2009-04-19 13:45:09.000000000 -0400
-+++ gnome-panel-2.27.4/applets/clock/gnome-clock-applet-mechanism.c	2009-08-13 14:09:17.739206856 -0400
-@@ -37,7 +37,7 @@
- #include <dbus/dbus-glib.h>
- #include <dbus/dbus-glib-lowlevel.h>
- 
--#include <polkit-dbus/polkit-dbus.h>
-+#include <polkit/polkit.h>
- 
- #include "system-timezone.h"
- 
-@@ -68,7 +68,7 @@ struct GnomeClockAppletMechanismPrivate
- {
-         DBusGConnection *system_bus_connection;
-         DBusGProxy      *system_bus_proxy;
--        PolKitContext   *pol_ctx;
-+        PolkitAuthority *auth;
- };
- 
- static void     gnome_clock_applet_mechanism_finalize    (GObject     *object);
-@@ -172,50 +172,11 @@ gnome_clock_applet_mechanism_finalize (G
- }
- 
- static gboolean
--pk_io_watch_have_data (GIOChannel *channel, GIOCondition condition, gpointer user_data)
--{
--        int fd;
--        PolKitContext *pk_context = user_data;
--        fd = g_io_channel_unix_get_fd (channel);
--        polkit_context_io_func (pk_context, fd);
--        return TRUE;
--}
--
--static int 
--pk_io_add_watch (PolKitContext *pk_context, int fd)
--{
--        guint id = 0;
--        GIOChannel *channel;
--        channel = g_io_channel_unix_new (fd);
--        if (channel == NULL)
--                goto out;
--        id = g_io_add_watch (channel, G_IO_IN, pk_io_watch_have_data, pk_context);
--        if (id == 0) {
--                g_io_channel_unref (channel);
--                goto out;
--        }
--        g_io_channel_unref (channel);
--out:
--        return id;
--}
--
--static void 
--pk_io_remove_watch (PolKitContext *pk_context, int watch_id)
--{
--        g_source_remove (watch_id);
--}
--
--static gboolean
- register_mechanism (GnomeClockAppletMechanism *mechanism)
- {
-         GError *error = NULL;
- 
--        mechanism->priv->pol_ctx = polkit_context_new ();
--        polkit_context_set_io_watch_functions (mechanism->priv->pol_ctx, pk_io_add_watch, pk_io_remove_watch);
--        if (!polkit_context_init (mechanism->priv->pol_ctx, NULL)) {
--                g_critical ("cannot initialize libpolkit");
--                goto error;
--        }
-+        mechanism->priv->auth = polkit_authority_get ();
- 
-         error = NULL;
-         mechanism->priv->system_bus_connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
-@@ -266,49 +227,36 @@ _check_polkit_for_action (GnomeClockAppl
- {
-         const char *sender;
-         GError *error;
--        DBusError dbus_error;
--        PolKitCaller *pk_caller;
--        PolKitAction *pk_action;
--        PolKitResult pk_result;
-+        PolkitSubject *subject;
-+        PolkitAuthorizationResult *result;
- 
-         error = NULL;
- 
-         /* Check that caller is privileged */
-         sender = dbus_g_method_get_sender (context);
--        dbus_error_init (&dbus_error);
--        pk_caller = polkit_caller_new_from_dbus_name (
--                dbus_g_connection_get_connection (mechanism->priv->system_bus_connection),
--                sender, 
--                &dbus_error);
--        if (pk_caller == NULL) {
--                error = g_error_new (GNOME_CLOCK_APPLET_MECHANISM_ERROR,
--                                     GNOME_CLOCK_APPLET_MECHANISM_ERROR_GENERAL,
--                                     "Error getting information about caller: %s: %s",
--                                     dbus_error.name, dbus_error.message);
--                dbus_error_free (&dbus_error);
--                dbus_g_method_return_error (context, error);
--                g_error_free (error);
--                return FALSE;
--        }
-+        subject = polkit_system_bus_name_new (sender);
- 
--        pk_action = polkit_action_new ();
--        polkit_action_set_action_id (pk_action, action);
--        pk_result = polkit_context_is_caller_authorized (mechanism->priv->pol_ctx, pk_action, pk_caller, FALSE, NULL);
--        polkit_caller_unref (pk_caller);
--        polkit_action_unref (pk_action);
-+        result = polkit_authority_check_authorization_sync (mechanism->priv->auth,
-+                                                            subject,
-+                                                            action,
-+                                                            NULL,
-+                                                            POLKIT_CHECK_AUTHORIZATION_FLAGS_ALLOW_USER_INTERACTION,
-+                                                            NULL, NULL);
-+        g_object_unref (subject);
- 
--        if (pk_result != POLKIT_RESULT_YES) {
-+        if (!polkit_authorization_result_get_is_authorized (result)) {
-                 error = g_error_new (GNOME_CLOCK_APPLET_MECHANISM_ERROR,
-                                      GNOME_CLOCK_APPLET_MECHANISM_ERROR_NOT_PRIVILEGED,
--                                     "%s %s <-- (action, result)",
--                                     action,
--                                     polkit_result_to_string_representation (pk_result));
--                dbus_error_free (&dbus_error);
-+                                     "Not Authorized for action %s", action);
-                 dbus_g_method_return_error (context, error);
-                 g_error_free (error);
-+		g_object_unref (result);
-+
-                 return FALSE;
-         }
- 
-+	g_object_unref (result);
-+
-         return TRUE;
- }
- 
-@@ -607,5 +555,61 @@ gnome_clock_applet_mechanism_set_hardwar
-         }
-         dbus_g_method_return (context);
-         return TRUE;
-+}
-+
-+static void
-+check_can_do (GnomeClockAppletMechanism *mechanism,
-+              const char                *action,
-+              DBusGMethodInvocation     *context)
-+{
-+        const char *sender;
-+        PolkitSubject *subject;
-+        PolkitAuthorizationResult *result;
-+
-+        /* Check that caller is privileged */
-+        sender = dbus_g_method_get_sender (context);
-+        subject = polkit_system_bus_name_new (sender);
-+
-+        result = polkit_authority_check_authorization_sync (mechanism->priv->auth,
-+                                                            subject,
-+                                                            action,
-+                                                            NULL,
-+                                                            0,
-+                                                            NULL, NULL);
-+        g_object_unref (subject);
-+
-+        if (polkit_authorization_result_get_is_authorized (result)) {
-+		dbus_g_method_return (context, 2);
-+	}
-+	else if (polkit_authorization_result_get_is_challenge (result)) {
-+		dbus_g_method_return (context, 1);
-+	}
-+	else {
-+		dbus_g_method_return (context, 0);
-+	}
-+
-+	g_object_unref (result);
-+}
-+
-+
-+gboolean
-+gnome_clock_applet_mechanism_can_set_time (GnomeClockAppletMechanism    *mechanism,
-+                                           DBusGMethodInvocation        *context)
-+{
-+        check_can_do (mechanism,
-+                      "org.gnome.clockapplet.mechanism.settime",
-+                      context);
-+
-+	return TRUE;
-+}
-+
-+gboolean
-+gnome_clock_applet_mechanism_can_set_timezone (GnomeClockAppletMechanism    *mechanism,
-+                                               DBusGMethodInvocation        *context)
-+{
-+        check_can_do (mechanism,
-+                      "org.gnome.clockapplet.mechanism.settimezone",
-+                      context);
- 
-+	return TRUE;
- }
-diff -up gnome-panel-2.27.4/applets/clock/gnome-clock-applet-mechanism.h.polkit1 gnome-panel-2.27.4/applets/clock/gnome-clock-applet-mechanism.h
---- gnome-panel-2.27.4/applets/clock/gnome-clock-applet-mechanism.h.polkit1	2009-04-19 13:45:09.000000000 -0400
-+++ gnome-panel-2.27.4/applets/clock/gnome-clock-applet-mechanism.h	2009-08-13 14:09:17.740206913 -0400
-@@ -69,9 +69,14 @@ gboolean            gnome_clock_applet_m
-                                                                const char                   *zone_file,
-                                                                DBusGMethodInvocation        *context);
- 
-+gboolean            gnome_clock_applet_mechanism_can_set_timezone (GnomeClockAppletMechanism    *mechanism,
-+                                                                   DBusGMethodInvocation        *context);
-+
- gboolean            gnome_clock_applet_mechanism_set_time     (GnomeClockAppletMechanism    *mechanism,
-                                                                gint64                        seconds_since_epoch,
-                                                                DBusGMethodInvocation        *context);
-+gboolean            gnome_clock_applet_mechanism_can_set_time (GnomeClockAppletMechanism    *mechanism,
-+                                                               DBusGMethodInvocation        *context);
- 
- gboolean            gnome_clock_applet_mechanism_adjust_time  (GnomeClockAppletMechanism    *mechanism,
-                                                                gint64                        seconds_to_add,
-diff -up gnome-panel-2.27.4/applets/clock/gnome-clock-applet-mechanism.xml.polkit1 gnome-panel-2.27.4/applets/clock/gnome-clock-applet-mechanism.xml
---- gnome-panel-2.27.4/applets/clock/gnome-clock-applet-mechanism.xml.polkit1	2009-04-19 13:45:09.000000000 -0400
-+++ gnome-panel-2.27.4/applets/clock/gnome-clock-applet-mechanism.xml	2009-08-13 14:09:17.741205993 -0400
-@@ -5,10 +5,18 @@
-       <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-       <arg name="zonefile" direction="in" type="s"/>
-     </method>
-+    <method name="CanSetTimezone">
-+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-+      <arg name="value" direction="out" type="i"/>
-+    </method>
-     <method name="SetTime">
-       <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-       <arg name="seconds_since_epoch" direction="in" type="x"/>
-     </method>
-+    <method name="CanSetTime">
-+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-+      <arg name="value" direction="out" type="i"/>
-+    </method>
-     <method name="AdjustTime">
-       <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-       <arg name="seconds_to_add" direction="in" type="x"/>
-diff -up gnome-panel-2.27.4/applets/clock/Makefile.am.polkit1 gnome-panel-2.27.4/applets/clock/Makefile.am
---- gnome-panel-2.27.4/applets/clock/Makefile.am.polkit1	2009-07-01 09:06:23.000000000 -0400
-+++ gnome-panel-2.27.4/applets/clock/Makefile.am	2009-08-13 14:09:17.742205491 -0400
-@@ -9,7 +9,7 @@ INCLUDES =							\
- 	$(GNOME_INCLUDEDIR)					\
- 	$(WARN_CFLAGS)						\
- 	$(CLOCK_CFLAGS)						\
--	$(POLKIT_GNOME_CFLAGS)					\
-+	$(POLKIT_CFLAGS)					\
- 	$(LIBPANEL_APPLET_CFLAGS)				\
- 	-DDATADIR=\""$(datadir)"\"				\
- 	-DGLADEDIR=\""$(datadir)/gnome-panel/glade"\"		\
-@@ -67,7 +67,7 @@ CLOCK_LDADD =						\
- 	../../libpanel-applet/libpanel-applet-2.la	\
- 	$(CLOCK_LIBS)					\
- 	$(LIBPANEL_APPLET_LIBS)				\
--	$(POLKIT_GNOME_LIBS)				\
-+	$(POLKIT_LIBS)				\
- 	-lgweather
- 
- BUILT_SOURCES =					\
-@@ -132,11 +132,11 @@ endif
- 
- gnome_clock_applet_mechanism_INCLUDES =	\
- 	$(CLOCK_MECHANISM_CFLAGS) 	\
--	$(POLKIT_GNOME_CFLAGS)
-+	$(POLKIT_CFLAGS)
- 
- gnome_clock_applet_mechanism_LDADD =	\
- 	$(CLOCK_MECHANISM_LIBS)		\
--	$(POLKIT_GNOME_LIBS)
-+	$(POLKIT_LIBS)
- 
- if CLOCK_INPROCESS
- APPLET_TYPE     = shlib
-@@ -206,7 +206,7 @@ endif
- 
- dbus_servicesdir = $(datadir)/dbus-1/system-services
- dbus_confdir = $(sysconfdir)/dbus-1/system.d
--polkitdir = $(datadir)/PolicyKit/policy
-+polkitdir = $(datadir)/polkit-1/actions
- 
- dbus_services_in_files = org.gnome.ClockApplet.Mechanism.service.in
- polkit_in_files = org.gnome.clockapplet.mechanism.policy.in
-diff -up gnome-panel-2.27.4/applets/clock/org.gnome.clockapplet.mechanism.policy.in.polkit1 gnome-panel-2.27.4/applets/clock/org.gnome.clockapplet.mechanism.policy.in
---- gnome-panel-2.27.4/applets/clock/org.gnome.clockapplet.mechanism.policy.in.polkit1	2009-04-19 13:45:09.000000000 -0400
-+++ gnome-panel-2.27.4/applets/clock/org.gnome.clockapplet.mechanism.policy.in	2009-08-13 14:21:10.175979956 -0400
-@@ -13,7 +13,7 @@
-     <_message>Privileges are required to change the system time zone.</_message>
-     <defaults>
-       <allow_inactive>no</allow_inactive>
--      <allow_active>auth_self_keep_always</allow_active>
-+      <allow_active>auth_admin_keep</allow_active>
-     </defaults>
-   </action>
- 
-@@ -22,7 +22,7 @@
-     <_message>Privileges are required to change the system time.</_message>
-     <defaults>
-       <allow_inactive>no</allow_inactive>
--      <allow_active>auth_self_keep_always</allow_active>
-+      <allow_active>auth_admin_keep</allow_active>
-     </defaults>
-   </action>
- 
-@@ -31,7 +31,7 @@
-     <_message>Privileges are required to configure the hardware clock.</_message>
-     <defaults>
-       <allow_inactive>no</allow_inactive>
--      <allow_active>auth_self_keep_always</allow_active>
-+      <allow_active>auth_admin_keep</allow_active>
-     </defaults>
-   </action>
- 
-diff -up gnome-panel-2.27.4/applets/clock/set-timezone.c.polkit1 gnome-panel-2.27.4/applets/clock/set-timezone.c
---- gnome-panel-2.27.4/applets/clock/set-timezone.c.polkit1	2009-04-19 13:45:09.000000000 -0400
-+++ gnome-panel-2.27.4/applets/clock/set-timezone.c	2009-08-13 14:09:17.744960941 -0400
-@@ -32,31 +32,8 @@
- #include <dbus/dbus-glib.h>
- #include <dbus/dbus-glib-lowlevel.h>
- 
--#include <polkit/polkit.h>
--#include <polkit-dbus/polkit-dbus.h>
--
- #include "set-timezone.h"
- 
--#define CACHE_VALIDITY_SEC 2
--
--static DBusGConnection *
--get_session_bus (void)
--{
--        GError          *error;
--        static DBusGConnection *bus = NULL;
--
--	if (bus == NULL) {
--        	error = NULL;
--        	bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
--        	if (bus == NULL) {
--               		g_warning ("Couldn't connect to session bus: %s", 
--				   error->message);
--                	g_error_free (error);
--        	}
--	}
--
--        return bus;
--}
- 
- static DBusGConnection *
- get_system_bus (void)
-@@ -77,148 +54,96 @@ get_system_bus (void)
-         return bus;
- }
- 
--static gboolean
--pk_io_watch_have_data (GIOChannel *channel, GIOCondition condition, gpointer user_data)
--{
--        int fd;
--        PolKitContext *pk_context = user_data;
--        fd = g_io_channel_unix_get_fd (channel);
--        polkit_context_io_func (pk_context, fd);
--        return TRUE;
--}
--
--static int 
--pk_io_add_watch_fn (PolKitContext *pk_context, int fd)
--{
--        guint id = 0;
--        GIOChannel *channel;
--        channel = g_io_channel_unix_new (fd);
--        if (channel == NULL)
--                goto out;
--        id = g_io_add_watch (channel, G_IO_IN, pk_io_watch_have_data, pk_context);
--        if (id == 0) {
--                g_io_channel_unref (channel);
--                goto out;
--        }
--        g_io_channel_unref (channel);
--out:
--        return id;
--}
-+#define CACHE_VALIDITY_SEC 2
- 
--static void 
--pk_io_remove_watch_fn (PolKitContext *pk_context, int watch_id)
--{
--        g_source_remove (watch_id);
--}
-+typedef  void (*CanDoFunc) (gint value);
- 
--static PolKitContext *
--get_pk_context (void)
-+static void
-+can_do_notify (DBusGProxy     *proxy,
-+	       DBusGProxyCall *call,
-+	       void           *user_data)
- {
--	static PolKitContext *pk_context = NULL;
-+        CanDoFunc callback = user_data;
-+	GError *error = NULL;
-+	gint value;
- 
--	if (pk_context == NULL) {
--		pk_context = polkit_context_new ();
--                polkit_context_set_io_watch_functions (pk_context,
--                                                       pk_io_add_watch_fn,
--                                                       pk_io_remove_watch_fn);
--		if (!polkit_context_init (pk_context, NULL)) {
--			polkit_context_unref (pk_context);
--			pk_context = NULL;
--		}
-+	if (dbus_g_proxy_end_call (proxy, call,
-+                                   &error,
-+                                   G_TYPE_INT, &value,
-+                                   G_TYPE_INVALID)) {
-+        	callback (value);
- 	}
--
--	return pk_context;
- }
- 
--static gint
--can_do (const gchar *pk_action_id)
-+static void
-+can_do_refresh (const gchar *action, CanDoFunc callback)
- {
--	DBusConnection *system_bus;
--	PolKitCaller *pk_caller;
--        PolKitAction *pk_action;
--        PolKitResult pk_result;
--	PolKitContext *pk_context;
--        DBusError dbus_error;
--	gint res = 0;
--
--        pk_caller = NULL;
--        pk_action = NULL;
--
--	system_bus = dbus_g_connection_get_connection (get_system_bus ());
--	if (system_bus == NULL)
--		goto out;
--	
--	pk_context = get_pk_context ();
--	if (pk_context == NULL)
--		goto out;
--	
--        pk_action = polkit_action_new ();
--        polkit_action_set_action_id (pk_action, pk_action_id);
--
--        dbus_error_init (&dbus_error);
--        pk_caller = polkit_caller_new_from_pid (system_bus, getpid (), &dbus_error);
--        if (pk_caller == NULL) {
--                fprintf (stderr, "cannot get caller from dbus name\n");
--                goto out;
--        }
-+        DBusGConnection *bus;
-+        DBusGProxy      *proxy;
- 
--        pk_result = polkit_context_is_caller_authorized (pk_context, pk_action, pk_caller, FALSE, NULL);
-+        bus = get_system_bus ();
-+        if (bus == NULL)
-+                return;
- 
--	switch (pk_result) {
--        case POLKIT_RESULT_UNKNOWN:
--        case POLKIT_RESULT_NO:
-- 		res = 0;
--		break;
--        case POLKIT_RESULT_YES:
--		res = 2;
--		break;
--        default:
--                /* This covers all the POLKIT_RESULT_ONLY_VIA_[SELF|ADMIN]_AUTH_* cases as more of these
--                 * may be added in the future.
--                 */
--		res = 1;
--		break;
--	}
--	
--out:
--        if (pk_action != NULL)
--                polkit_action_unref (pk_action);
--        if (pk_caller != NULL)
--                polkit_caller_unref (pk_caller);
-+	proxy = dbus_g_proxy_new_for_name (bus,
-+					   "org.gnome.ClockApplet.Mechanism",
-+					   "/",
-+					   "org.gnome.ClockApplet.Mechanism");
-+
-+	dbus_g_proxy_begin_call_with_timeout (proxy,
-+					      action,
-+					      can_do_notify,
-+					      callback, NULL,
-+					      INT_MAX,
-+					      G_TYPE_INVALID);
-+}
- 
--	return res;
-+static gint   settimezone_cache = 0;
-+static time_t settimezone_stamp = 0;
-+
-+static void
-+update_can_settimezone (gint res)
-+{
-+	settimezone_cache = res;
-+	time (&settimezone_stamp);
- }
- 
- gint
- can_set_system_timezone (void)
- {
--	static gboolean cache = FALSE;
--	static time_t   last_refreshed = 0;
- 	time_t          now;
- 
- 	time (&now);
--	if (ABS (now - last_refreshed) > CACHE_VALIDITY_SEC) {
--		cache = can_do ("org.gnome.clockapplet.mechanism.settimezone");
--		last_refreshed = now;
-+	if (ABS (now - settimezone_stamp) > CACHE_VALIDITY_SEC) {
-+		can_do_refresh ("CanSetTimezone", update_can_settimezone);
-+		settimezone_stamp = now;
- 	}
- 
--	return cache;
-+	return settimezone_cache;
-+}
-+
-+static gint   settime_cache = 0;
-+static time_t settime_stamp = 0;
-+
-+static void
-+update_can_settime (gint res)
-+{
-+	settime_cache = res;
-+	time (&settime_stamp);
- }
- 
- gint
- can_set_system_time (void)
- {
--	static gboolean cache = FALSE;
--	static time_t   last_refreshed = 0;
--	time_t          now;
-+	time_t now;
- 
- 	time (&now);
--	if (ABS (now - last_refreshed) > CACHE_VALIDITY_SEC) {
--		cache = can_do ("org.gnome.clockapplet.mechanism.settime");
--		last_refreshed = now;
-+	if (ABS (now - settime_stamp) > CACHE_VALIDITY_SEC) {
-+		can_do_refresh ("CanSetTime", update_can_settime);
-+		settime_stamp = now;
- 	}
- 
--	return cache;
-+	return settime_cache;
- }
- 
- typedef struct {
-@@ -226,7 +151,6 @@ typedef struct {
-         gchar *call;
- 	gint64 time;
- 	gchar *filename;
--        guint transient_parent_xid;
- 	GFunc callback;
- 	gpointer data;
- 	GDestroyNotify notify;
-@@ -246,61 +170,6 @@ free_data (gpointer d)
- 	}
- }
- 
--static void set_time_async (SetTimeCallbackData *data);
--
--static void 
--auth_notify (DBusGProxy     *proxy,
--             DBusGProxyCall *call,
--             void           *user_data)
--{
--	SetTimeCallbackData *data = user_data;
--	GError *error = NULL;
--	gboolean gained_privilege;
--
--	if (dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_BOOLEAN, &gained_privilege, G_TYPE_INVALID)) {
--		if (gained_privilege)
--			set_time_async (data);
--	}
--	else {
--		if (data->callback) 
--			data->callback (data->data, error);
--		else
--			g_error_free (error);
--	}
--}
--
--static void
--do_auth_async (const gchar         *action, 
--               const gchar         *result, 
--               SetTimeCallbackData *data)
--{
--        DBusGConnection *bus;
--	DBusGProxy *proxy;
--
--	g_debug ("helper refused; returned polkit_result='%s' and polkit_action='%s'",
--		 result, action);
--
--	/* Now ask the user for auth... */
--        bus = get_session_bus ();
--	if (bus == NULL)
--		return;
--
--	proxy = dbus_g_proxy_new_for_name (bus,
--					"org.gnome.PolicyKit",
--					"/org/gnome/PolicyKit/Manager",
--					"org.gnome.PolicyKit.Manager");
--	
--	data->ref_count++;
--	dbus_g_proxy_begin_call_with_timeout (proxy,
--					      "ShowDialog",
--					      auth_notify,
--					      data, free_data,
--					      INT_MAX,
--					      G_TYPE_STRING, action,
--					      G_TYPE_UINT, data->transient_parent_xid,
--					      G_TYPE_INVALID);
--}
--
- static void
- set_time_notify (DBusGProxy     *proxy,
- 		 DBusGProxyCall *call,
-@@ -324,17 +193,6 @@ set_time_notify (DBusGProxy     *proxy,
- 			if (data->callback)
- 				data->callback (data->data, NULL);
- 		}
--		else if (dbus_g_error_has_name (error, "org.gnome.ClockApplet.Mechanism.NotPrivileged")) {
--			gchar **tokens;
--
--			tokens = g_strsplit (error->message, " ", 2);
--			g_error_free (error);                            
--			if (g_strv_length (tokens) == 2) 
--				do_auth_async (tokens[0], tokens[1], data);
--			else
--				g_warning ("helper return string malformed");
--			g_strfreev (tokens);
--		}
- 		else {
- 			if (data->callback)
- 				data->callback (data->data, error);
-@@ -386,9 +244,8 @@ set_time_async (SetTimeCallbackData *dat
- 
- void
- set_system_time_async (gint64         time,
--                       guint          transient_parent_xid,
--		       GFunc          callback, 
--		       gpointer       d, 
-+		       GFunc          callback,
-+		       gpointer       d,
- 		       GDestroyNotify notify)
- {
- 	SetTimeCallbackData *data;
-@@ -401,7 +258,6 @@ set_system_time_async (gint64         ti
- 	data->call = "SetTime";
- 	data->time = time;
- 	data->filename = NULL;
--        data->transient_parent_xid = transient_parent_xid;
- 	data->callback = callback;
- 	data->data = d;
- 	data->notify = notify;
-@@ -412,9 +268,8 @@ set_system_time_async (gint64         ti
- 
- void
- set_system_timezone_async (const gchar    *filename,
--                           guint           transient_parent_xid,
--	             	   GFunc           callback, 
--		           gpointer        d, 
-+	             	   GFunc           callback,
-+		           gpointer        d,
- 		           GDestroyNotify  notify)
- {
- 	SetTimeCallbackData *data;
-@@ -427,7 +282,6 @@ set_system_timezone_async (const gchar  
- 	data->call = "SetTimezone";
- 	data->time = -1;
- 	data->filename = g_strdup (filename);
--        data->transient_parent_xid = transient_parent_xid;
- 	data->callback = callback;
- 	data->data = d;
- 	data->notify = notify;
-diff -up gnome-panel-2.27.4/applets/clock/set-timezone.h.polkit1 gnome-panel-2.27.4/applets/clock/set-timezone.h
---- gnome-panel-2.27.4/applets/clock/set-timezone.h.polkit1	2009-04-19 13:45:09.000000000 -0400
-+++ gnome-panel-2.27.4/applets/clock/set-timezone.h	2009-08-13 14:09:17.745957855 -0400
-@@ -28,13 +28,11 @@ gint     can_set_system_timezone (void);
- gint     can_set_system_time     (void);
- 
- void     set_system_time_async   (gint64         time,
--                                  guint          transient_parent_xid,
-                                   GFunc          callback,
-                                   gpointer       data,
-                                   GDestroyNotify notify);
- 
- void     set_system_timezone_async   (const gchar    *filename,
--                                      guint           transient_parent_xid,
-                                       GFunc           callback,
-                                       gpointer        data,
-                                       GDestroyNotify  notify);
-diff -up gnome-panel-2.27.4/configure.in.polkit1 gnome-panel-2.27.4/configure.in
---- gnome-panel-2.27.4/configure.in.polkit1	2009-07-15 11:05:33.000000000 -0400
-+++ gnome-panel-2.27.4/configure.in	2009-08-13 14:09:17.746976770 -0400
-@@ -129,24 +129,21 @@ PKG_CHECK_MODULES(CLOCK_MECHANISM, [ gth
- AC_SUBST(CLOCK_MECHANISM_CFLAGS)
- AC_SUBST(CLOCK_MECHANISM_LIBS)
- 
--POLKIT_GNOME_REQUIRED=0.7
--POLKIT_DBUS_REQUIRED=0.7
-+POLKIT_REQUIRED=0.91
- DBUS_GLIB_REQUIRED=0.71
- DBUS_REQUIRED=1.1.2
- NETWORK_MANAGER_REQUIRED=0.6
-  
- # PolicyKit detection; defaults to 'auto' (use it if it's available)
- #
--POLKIT_GNOME_CFLAGS=
--POLKIT_GNOME_LIBS=
--POLKIT_DBUS_CFLAGS=
--POLKIT_DBUS_LIBS=
-+POLKIT_CFLAGS=
-+POLKIT_LIBS=
- AC_ARG_ENABLE(polkit, AS_HELP_STRING([--enable-polkit],[Enable PolicyKit support (auto)]),enable_polkit=$enableval,enable_polkit=auto)
- if test "x$enable_polkit" = "xno" ; then
-   HAVE_POLKIT=no
- else
-   HAVE_POLKIT=no
--  PKG_CHECK_MODULES(POLKIT_GNOME, polkit-gnome >= $POLKIT_GNOME_REQUIRED dbus-1 >= $DBUS_REQUIRED, HAVE_POLKIT=yes, HAVE_POLKIT=no)
-+  PKG_CHECK_MODULES(POLKIT, polkit-gobject-1 >= $POLKIT_REQUIRED dbus-1 >= $DBUS_REQUIRED, HAVE_POLKIT=yes, HAVE_POLKIT=no)
-  
-   if test "x$enable_polkit" = "xyes" -a "x$HAVE_POLKIT" = "xno" ; then
-     AC_MSG_ERROR(PolicyKit support explicity enabled but not available)
-@@ -154,16 +151,11 @@ else
- 
-   if test "x$HAVE_POLKIT" = "xyes" ; then
-     AC_DEFINE(HAVE_POLKIT, 1, [Defined if PolicyKit support is enabled])
--    PKG_CHECK_MODULES(POLKIT_DBUS, polkit-dbus >= $POLKIT_DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED gobject-2.0)
--    AC_CHECK_PROG([POLKIT_POLICY_FILE_VALIDATE],
--                  [polkit-policy-file-validate], [polkit-policy-file-validate])
-   fi
- fi
- AM_CONDITIONAL(HAVE_POLKIT, test "x$HAVE_POLKIT" = "xyes")
--AC_SUBST(POLKIT_GNOME_CFLAGS)
--AC_SUBST(POLKIT_GNOME_LIBS)
--AC_SUBST(POLKIT_DBUS_CFLAGS)
--AC_SUBST(POLKIT_DBUS_LIBS)
-+AC_SUBST(POLKIT_CFLAGS)
-+AC_SUBST(POLKIT_LIBS)
- 
- AC_ARG_ENABLE(network_manager, AS_HELP_STRING([--enable-network-manager],[Enable NetworkManager support (auto)]),enable_network_manager=$enableval,enable_network_manager=auto)
- if test "x$enable_network_manager" = "xno" ; then
diff --git a/recent-icon.patch b/recent-icon.patch
deleted file mode 100644
index a30c376..0000000
--- a/recent-icon.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-panel-2.27.4/gnome-panel/panel-recent.c	2009-08-05 20:10:20.383768104 -0400
-+++ gnome-panel-2.27.4.recent/gnome-panel/panel-recent.c	2009-08-05 19:58:53.593528282 -0400
-@@ -227,7 +227,7 @@
- 
- 	add_menu_separator (recent_menu);
- 
--	menu_item = panel_image_menu_item_new ();
-+	menu_item = gtk_image_menu_item_new ();
- 	setup_menu_item_with_icon (menu_item,
- 				   panel_menu_icon_get_size (),
- 				   NULL,
diff --git a/resolution-change.patch b/resolution-change.patch
deleted file mode 100644
index 9447804..0000000
--- a/resolution-change.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up gnome-panel-2.28.0/gnome-panel/panel-widget.c.resolution-change gnome-panel-2.28.0/gnome-panel/panel-widget.c
---- gnome-panel-2.28.0/gnome-panel/panel-widget.c.resolution-change	2009-11-09 22:48:41.992597171 -0500
-+++ gnome-panel-2.28.0/gnome-panel/panel-widget.c	2009-11-09 22:37:57.240584835 -0500
-@@ -1186,7 +1186,7 @@ panel_widget_right_stick(PanelWidget *pa
- 
- 	ad = list->data;
- 	do { 
--		i = ad->constrained;
-+		i = ad->pos;
- 		ad->pos = ad->constrained = pos--;
- 		ad->cells = 1;
- 		prev = list;
-@@ -1194,7 +1194,7 @@ panel_widget_right_stick(PanelWidget *pa
- 		if(!list)
- 			break;
- 		ad = list->data;
--	} while(ad->constrained + ad->cells == i);
-+	} while(ad->pos + ad->cells == i);
- 
- 	for (list = prev; list; list = list->next)
- 		emit_applet_moved (panel, list->data);
diff --git a/sources b/sources
index 2439508..dbe1f73 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b3c9235fcf339e1858bac82bc08b1310  gnome-panel-2.31.92.tar.bz2
+4bc500a5c877c45f99d293dc7d102ae8  gnome-panel-2.91.6.tar.bz2