The package rpms/gnome-panel.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/gnome-panel.git/commit/?id=9ff8c0...
https://src.fedoraproject.org/cgit/rpms/gnome-panel.git/commit/?id=eeb246...
https://src.fedoraproject.org/cgit/rpms/gnome-panel.git/commit/?id=dbb92b...
https://src.fedoraproject.org/cgit/rpms/gnome-panel.git/commit/?id=881d85...
https://src.fedoraproject.org/cgit/rpms/gnome-panel.git/commit/?id=0b88e2...
https://src.fedoraproject.org/cgit/rpms/gnome-panel.git/commit/?id=cc8f17....
Change:
-%ifarch ppc64
+%ifarch ppc64
+%ifarch %{ix86} ppc
-%ifnarch s390 s390x ppc64
+%ifnarch s390 s390x ppc64
-%ifarch %{ix86} ppc
Thanks.
Full change:
============
commit 9315364c8191a530d7f952832c330f5b17d582b5
Author: Artem Polishchuk <ego.cordatus(a)gmail.com>
Date: Thu Mar 26 12:41:37 2020 +0200
Update to 3.36.0
diff --git a/.gitignore b/.gitignore
index b5a5130..27cb216 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,4 @@ gnome-panel-2.31.6.tar.bz2
/gnome-panel-3.6.0.tar.xz
/gnome-panel-3.6.2.tar.xz
/gnome-panel-3.34.1.tar.xz
+/gnome-panel-3.36.0.tar.xz
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 987e97b..8f6027a 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -7,13 +7,13 @@
%global use_evolution_data_server 1
Name: gnome-panel
-Version: 3.34.1
-Release: 4%{?dist}
+Version: 3.36.0
+Release: 1%{?dist}
Summary: GNOME Flashback panel
License: GPLv2+ and LGPLv2+
URL:
https://wiki.gnome.org/Projects/GnomePanel
-Source0:
https://download.gnome.org/sources/%{name}/3.34/%{name}-%{version}.tar.xz
+Source0:
https://download.gnome.org/sources/%{name}/3.36/%{name}-%{version}.tar.xz
BuildRequires: autoconf
BuildRequires: automake
@@ -146,12 +146,15 @@ find %{buildroot} -name '*.la' -delete;
%{_libdir}/%{name}/
%files libs
+%{_libdir}/lib%{name}.so.*
%{_libdir}/libpanel-applet.so.3*
%files devel
%{_datadir}/gtk-doc/
%{_includedir}/%{name}/
+%{_libdir}/lib%{name}.so
%{_libdir}/libpanel-applet.so
+%{_libdir}/pkgconfig/lib%{name}.pc
%{_libdir}/pkgconfig/libpanel-applet.pc
%files doc
@@ -159,6 +162,9 @@ find %{buildroot} -name '*.la' -delete;
%changelog
+* Thu Mar 26 2020 Artem Polishchuk <ego.cordatus(a)gmail.com> - 3.36.0-1
+- Update to 3.36.0
+
* Sun Feb 23 2020 Artem Polishchuk <ego.cordatus(a)gmail.com> - 3.34.1-4
- Spec file improvements
- Drop obsolete macroses
diff --git a/sources b/sources
index 89354b8..5b0e1d1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gnome-panel-3.34.1.tar.xz) =
6d43285cda00b2e9415cf11f47a51a00941ed294edefb411f7b40003ece814ac08da9d2ccfb167a0a91c7abb9eb17a7f70970ac4eb585ce665cca5fcfbddcf03
+SHA512 (gnome-panel-3.36.0.tar.xz) =
4f77ea291439b4887bb592e8ff326622129ab934049505abe4224989eda2a152f171aeec5ffc817d865d9befee71e60077482244b775d10fec4fc8e987fc06d3
commit d3299764c723e1bb3eb4a72807e006355dfb1418
Author: Artem Polishchuk <ego.cordatus(a)gmail.com>
Date: Wed Mar 25 09:40:58 2020 +0200
Resurrect package for GNOME Flashback #1806544
diff --git a/.gitignore b/.gitignore
index 61583cb..b5a5130 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@ gnome-panel-2.31.6.tar.bz2
/gnome-panel-3.5.4.tar.xz
/gnome-panel-3.6.0.tar.xz
/gnome-panel-3.6.2.tar.xz
+/gnome-panel-3.34.1.tar.xz
diff --git a/Use-16px-menu-icons.patch b/Use-16px-menu-icons.patch
deleted file mode 100644
index 64e94dd..0000000
--- a/Use-16px-menu-icons.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From de049e9a8846270ed643b5c021ecd75fa259e00e Mon Sep 17 00:00:00 2001
-From: William Jon McCann <jmccann(a)redhat.com>
-Date: Mon, 4 Apr 2011 17:48:39 -0400
-Subject: [PATCH] Use 16px menu icons
-
-https://bugzilla.gnome.org/show_bug.cgi?id=646749
----
- gnome-panel/panel-stock-icons.h | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/gnome-panel/panel-stock-icons.h b/gnome-panel/panel-stock-icons.h
-index efac6d4..229d80a 100644
---- a/gnome-panel/panel-stock-icons.h
-+++ b/gnome-panel/panel-stock-icons.h
-@@ -31,7 +31,7 @@
- G_BEGIN_DECLS
-
- /* themeable size - "panel-menu" -- This is used for the icons in the menus
*/
--#define PANEL_DEFAULT_MENU_ICON_SIZE 24
-+#define PANEL_DEFAULT_MENU_ICON_SIZE 16
-
- /* stock icons */
- #define PANEL_STOCK_FORCE_QUIT "gnome-panel-force-quit"
---
-1.7.3.4
\ No newline at end of file
diff --git a/add-translations.sh b/add-translations.sh
deleted file mode 100644
index 9824d5a..0000000
--- a/add-translations.sh
+++ /dev/null
@@ -1,235 +0,0 @@
-cat >>po/bg.po <<EOF
-
-msgid "Suspend"
-msgstr ""
-EOF
-cat >>po/bn_IN.po <<EOF
-
-msgid "Suspend"
-msgstr ""
-EOF
-cat >>po/bn.po <<EOF
-
-msgid "Suspend"
-msgstr ""
-EOF
-cat >>po/ca.po <<EOF
-
-msgid "Suspend"
-msgstr "Atura temporalment"
-EOF
-cat >>po/cs.po <<EOF
-
-msgid "Suspend"
-msgstr "Suspendovat"
-EOF
-cat >>po/de.po <<EOF
-
-msgid "Suspend"
-msgstr "Stromsparmodus"
-EOF
-cat >>po/dz.po <<EOF
-
-msgid "Suspend"
-msgstr ""
-EOF
-cat >>po/el.po <<EOF
-
-msgid "Suspend"
-msgstr ""
-EOF
-cat >>po/en_CA.po <<EOF
-
-msgid "Suspend"
-msgstr "Suspend"
-EOF
-cat >>po/en_GB.po <<EOF
-
-msgid "Suspend"
-msgstr "Suspend"
-EOF
-cat >>po/es.po <<EOF
-
-msgid "Suspend"
-msgstr "Suspender"
-EOF
-cat >>po/et.po <<EOF
-
-msgid "Suspend"
-msgstr ""
-EOF
-cat >>po/eu.po <<EOF
-
-msgid "Suspend"
-msgstr "Eseki"
-EOF
-cat >>po/fi.po <<EOF
-
-msgid "Suspend"
-msgstr "Keskeytystila"
-EOF
-cat >>po/fr.po <<EOF
-
-msgid "Suspend"
-msgstr "Mise en veille prolonge"
-EOF
-cat >>po/gl.po <<EOF
-
-msgid "Suspend"
-msgstr "Suspender"
-EOF
-cat >>po/gu.po <<EOF
-
-msgid "Suspend"
-msgstr ""
-EOF
-cat >>po/hi.po <<EOF
-
-msgid "Suspend"
-msgstr ""
-EOF
-cat >>po/hu.po <<EOF
-
-msgid "Suspend"
-msgstr "Felfggeszts"
-EOF
-cat >>po/it.po <<EOF
-
-msgid "Suspend"
-msgstr "Sospendi"
-EOF
-cat >>po/ja.po <<EOF
-
-msgid "Suspend"
-msgstr ""
-EOF
-cat >>po/ka.po <<EOF
-
-msgid "Suspend"
-msgstr ""
-EOF
-cat >>po/ko.po <<EOF
-
-msgid "Suspend"
-msgstr ""
-EOF
-cat >>po/lt.po <<EOF
-
-msgid "Suspend"
-msgstr "Umigdyti"
-EOF
-cat >>po/lv.po <<EOF
-
-msgid "Suspend"
-msgstr "Prstt"
-EOF
-cat >>po/mg.po <<EOF
-
-msgid "Suspend"
-msgstr "Ahatoy"
-EOF
-cat >>po/mk.po <<EOF
-
-msgid "Suspend"
-msgstr ""
-EOF
-cat >>po/ml.po <<EOF
-
-msgid "Suspend"
-msgstr " "
-EOF
-cat >>po/nb.po <<EOF
-
-msgid "Suspend"
-msgstr "Hvilemodus"
-EOF
-cat >>po/nl.po <<EOF
-
-msgid "Suspend"
-msgstr "Pauzestand"
-EOF
-cat >>po/or.po <<EOF
-
-msgid "Suspend"
-msgstr " "
-EOF
-cat >>po/pa.po <<EOF
-
-msgid "Suspend"
-msgstr ""
-EOF
-cat >>po/pl.po <<EOF
-
-msgid "Suspend"
-msgstr "Wstrzymanie"
-EOF
-cat >>po/pt_BR.po <<EOF
-
-msgid "Suspend"
-msgstr "Suspender"
-EOF
-cat >>po/pt.po <<EOF
-
-msgid "Suspend"
-msgstr "Suspender"
-EOF
-cat >>po/ru.po <<EOF
-
-msgid "Suspend"
-msgstr " "
-EOF
-cat >>po/sk.po <<EOF
-
-msgid "Suspend"
-msgstr ""
-EOF
-cat >>po/sr(a)Latn.po <<EOF
-
-msgid "Suspend"
-msgstr "Privremeno zaustavi"
-EOF
-cat >>po/sr.po <<EOF
-
-msgid "Suspend"
-msgstr " "
-EOF
-cat >>po/sv.po <<EOF
-
-msgid "Suspend"
-msgstr "Vntelge"
-EOF
-cat >>po/ta.po <<EOF
-
-msgid "Suspend"
-msgstr " "
-EOF
-cat >>po/th.po <<EOF
-
-msgid "Suspend"
-msgstr ""
-EOF
-cat >>po/uk.po <<EOF
-
-msgid "Suspend"
-msgstr ""
-EOF
-cat >>po/vi.po <<EOF
-
-msgid "Suspend"
-msgstr "Ngng"
-EOF
-cat >>po/zh_CN.po <<EOF
-
-msgid "Suspend"
-msgstr ""
-EOF
-cat >>po/zh_HK.po <<EOF
-
-msgid "Suspend"
-msgstr ""
-EOF
-cat >>po/zh_TW.po <<EOF
-
-msgid "Suspend"
-msgstr ""
-EOF
diff --git a/applet-error.patch b/applet-error.patch
deleted file mode 100644
index 9a3228a..0000000
--- a/applet-error.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -up gnome-panel-2.25.5/gnome-panel/panel-applet-frame.c.applet-error
gnome-panel-2.25.5/gnome-panel/panel-applet-frame.c
---- gnome-panel-2.25.5/gnome-panel/panel-applet-frame.c.applet-error 2009-01-20
09:04:47.000000000 -0500
-+++ gnome-panel-2.25.5/gnome-panel/panel-applet-frame.c 2009-01-20 14:22:33.000000000
-0500
-@@ -1246,6 +1246,21 @@ panel_applet_frame_event_listener (Bonob
- panel_applet_frame_set_size_hints_from_any (frame, any);
- }
-
-+static gboolean
-+in_default_panel_config (const gchar *id)
-+{
-+ gchar *dir;
-+ gboolean result;
-+
-+ dir = g_strconcat (PANEL_DEFAULTS_DIR, "/applets/", id, NULL);
-+ result = gconf_client_dir_exists (panel_gconf_get_client (),
-+ dir,
-+ NULL);
-+ g_free (dir);
-+
-+ return result;
-+}
-+
- static void
- panel_applet_frame_activated (CORBA_Object object,
- const char *error_reason,
-@@ -1425,7 +1440,9 @@ panel_applet_frame_activated (CORBA_Obje
- return;
-
- error_out:
-- panel_applet_frame_loading_failed (frame, frame_act->id);
-+ if (!in_default_panel_config (frame_act->id)) {
-+ panel_applet_frame_loading_failed (frame, frame_act->id);
-+ }
- if (widget)
- g_object_unref (widget);
- panel_applet_stop_loading (frame_act->id);
diff --git a/bookmarks-submenu.patch b/bookmarks-submenu.patch
deleted file mode 100644
index 90e619f..0000000
--- a/bookmarks-submenu.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up gnome-panel-2.29.5.1/gnome-panel/panel-menu-items.c.bookmarks-submenu
gnome-panel-2.29.5.1/gnome-panel/panel-menu-items.c
---- gnome-panel-2.29.5.1/gnome-panel/panel-menu-items.c.bookmarks-submenu 2010-01-17
18:19:36.000000000 -0500
-+++ gnome-panel-2.29.5.1/gnome-panel/panel-menu-items.c 2010-01-17 18:21:00.466529924
-0500
-@@ -61,7 +61,7 @@
- #define NAMES_DIR "/apps/nautilus/desktop"
- #define HOME_NAME_KEY "/apps/nautilus/desktop/home_icon_name"
- #define COMPUTER_NAME_KEY "/apps/nautilus/desktop/computer_icon_name"
--#define MAX_ITEMS_OR_SUBMENU 5
-+#define MAX_ITEMS_OR_SUBMENU 8
- #define MAX_BOOKMARK_ITEMS 100
-
- G_DEFINE_TYPE (PanelPlaceMenuItem, panel_place_menu_item, GTK_TYPE_IMAGE_MENU_ITEM)
diff --git a/clock-home.patch b/clock-home.patch
deleted file mode 100644
index a4a60e3..0000000
--- a/clock-home.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up gnome-panel-2.28.0/applets/clock/clock.schemas.in.clock-home
gnome-panel-2.28.0/applets/clock/clock.schemas.in
---- gnome-panel-2.28.0/applets/clock/clock.schemas.in.clock-home 2009-07-01
09:06:23.000000000 -0400
-+++ gnome-panel-2.28.0/applets/clock/clock.schemas.in 2009-10-07 22:36:12.298466938
-0400
-@@ -211,7 +211,7 @@
- <key>/schemas/apps/clock_applet/prefs/expand_locations</key>
- <owner>clock-applet</owner>
- <type>bool</type>
-- <default>false</default>
-+ <default>true</default>
- <locale name="C">
- <short>Expand list of locations</short>
- <long>
-@@ -271,7 +271,7 @@
- <owner>clock-applet</owner>
- <type>list</type>
- <list_type>string</list_type>
-- <default>[]</default>
-+ <default>[<location name=""
city="Boston" timezone="America/New_York"
latitude="42.360558" longitude="-71.010559"
code="KBOS" current="true"/>]</default>
- <locale name="C">
- <short>List of locations</short>
- <long>
diff --git a/clock-network.patch b/clock-network.patch
deleted file mode 100644
index db88b82..0000000
--- a/clock-network.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up gnome-panel-2.26.1/applets/clock/clock-location.c.network
gnome-panel-2.26.1/applets/clock/clock-location.c
---- gnome-panel-2.26.1/applets/clock/clock-location.c.network 2009-04-15
17:28:26.760634154 -0400
-+++ gnome-panel-2.26.1/applets/clock/clock-location.c 2009-04-15 17:43:41.869383882
-0400
-@@ -12,6 +12,9 @@
- #include <time.h>
- #include <unistd.h>
- #include <math.h>
-+#include <netinet/in.h>
-+#include <arpa/nameser.h>
-+#include <resolv.h>
-
- #include <glib.h>
- #include <gio/gio.h>
-@@ -695,6 +698,8 @@ state_notify (DBusPendingCall *pending,
- DBUS_TYPE_UINT32, &result,
- DBUS_TYPE_INVALID)) {
- if (result == NM_STATE_CONNECTED) {
-+ /* thank you, glibc */
-+ res_init ();
- update_weather_infos ();
- }
- }
diff --git a/desktop-file-monitoring.patch b/desktop-file-monitoring.patch
deleted file mode 100644
index adfa5e2..0000000
--- a/desktop-file-monitoring.patch
+++ /dev/null
@@ -1,280 +0,0 @@
-diff -up gnome-panel-2.29.5.1/gnome-panel/launcher.c.desktop-file-monitoring
gnome-panel-2.29.5.1/gnome-panel/launcher.c
---- gnome-panel-2.29.5.1/gnome-panel/launcher.c.desktop-file-monitoring 2010-01-13
22:26:27.000000000 -0500
-+++ gnome-panel-2.29.5.1/gnome-panel/launcher.c 2010-01-17 18:06:14.640537280 -0500
-@@ -237,6 +237,8 @@ static void
- destroy_launcher (GtkWidget *widget,
- Launcher *launcher)
- {
-+ if (launcher->monitor)
-+ g_object_unref (launcher->monitor);
- launcher_properties_destroy (launcher);
- launcher_widget_destroy_open_dialogs (launcher);
- }
-@@ -410,6 +412,37 @@ drag_data_get_cb (GtkWidget *widg
-
- }
-
-+static void setup_button (Launcher *launcher);
-+
-+static void
-+desktop_file_changed (GFileMonitor *monitor,
-+ GFile *file,
-+ GFile *other_file,
-+ GFileMonitorEvent event_type,
-+ gpointer user_data)
-+{
-+ Launcher *launcher = user_data;
-+ GKeyFile *key_file;
-+
-+ if (event_type == G_FILE_MONITOR_EVENT_CHANGED ||
-+ event_type == G_FILE_MONITOR_EVENT_CREATED) {
-+ gchar *path;
-+
-+ path = g_file_get_path (file);
-+
-+ key_file = g_key_file_new ();
-+ if (g_key_file_load_from_file (key_file, path,
-+ G_KEY_FILE_KEEP_COMMENTS|G_KEY_FILE_KEEP_TRANSLATIONS,
-+ NULL)) {
-+ g_key_file_free (launcher->key_file);
-+ launcher->key_file = key_file;
-+ setup_button (launcher);
-+ }
-+
-+ g_free (path);
-+ }
-+}
-+
- static Launcher *
- create_launcher (const char *location)
- {
-@@ -482,6 +515,21 @@ create_launcher (const char *location)
- launcher->key_file = key_file;
- launcher->prop_dialog = NULL;
- launcher->destroy_handler = 0;
-+ launcher->monitor = NULL;
-+
-+ /* Watch for changes to the desktop file. Since we don't want
-+ * to do this for every launcher, we only do it if the desktop
-+ * file contains a X-Panel-Monitor entry.
-+ */
-+ if (g_key_file_get_boolean (key_file, "Desktop Entry",
"X-Panel-Monitor", NULL)) {
-+ GFile *file;
-+
-+ file = g_file_new_for_path (new_location);
-+ launcher->monitor = g_file_monitor_file (file, 0, NULL, NULL);
-+ g_signal_connect (launcher->monitor, "changed",
-+ G_CALLBACK (desktop_file_changed), launcher);
-+ g_object_unref (file);
-+ }
-
- /* Icon will be setup later */
- launcher->button = button_widget_new (NULL /* icon */,
-@@ -612,6 +660,15 @@ static void
- launcher_changed (PanelDItemEditor *dialog,
- Launcher *launcher)
- {
-+ /* If the user manually changes launcher properties,
-+ * we stop monitoring the desktop file to not overwrite
-+ * user changes.
-+ */
-+ if (launcher->monitor) {
-+ g_object_unref (launcher->monitor);
-+ launcher->monitor = NULL;
-+ }
-+
- /* Setup the button look */
- setup_button (launcher);
- }
-@@ -681,6 +738,42 @@ launcher_save_uri (PanelDItemEditor *dia
- return NULL;
- }
-
-+static const char *
-+desktop_file_to_monitor (PanelDItemEditor *editor)
-+{
-+ const char *entry;
-+ GKeyFile *key_file;
-+
-+ /* When the user selects a desktop file in the ditem editor,
-+ * start monitoring the desktop file for changes.
-+ */
-+ entry = panel_ditem_editor_get_orig_desktop_file (editor);
-+ if (entry) {
-+ key_file = g_key_file_new ();
-+ if (!g_key_file_load_from_file (key_file, entry, 0, NULL) ||
-+ !panel_key_file_get_boolean (key_file, "X-Panel-Monitor", FALSE))
-+ entry = NULL;
-+ g_key_file_free (key_file);
-+ }
-+
-+ return entry;
-+}
-+
-+static void
-+start_monitoring (Launcher *launcher)
-+{
-+ GFile *file;
-+
-+ file = g_file_new_for_path (launcher->location);
-+ if (launcher->monitor)
-+ g_object_unref (launcher->monitor);
-+ launcher->monitor = g_file_monitor_file (file, 0, NULL, NULL);
-+ g_signal_connect (launcher->monitor, "changed",
-+ G_CALLBACK (desktop_file_changed),
-+ launcher);
-+ g_object_unref (file);
-+}
-+
- static void
- launcher_saved (GtkWidget *dialog,
- Launcher *launcher)
-@@ -688,11 +781,15 @@ launcher_saved (GtkWidget *dialog,
- const char *uri;
- GConfClient *client;
- const char *key;
-+ const char *path;
-
- uri = panel_ditem_editor_get_uri (PANEL_DITEM_EDITOR (dialog));
- if (panel_launcher_get_filename (uri) != NULL)
- uri = panel_launcher_get_filename (uri);
-
-+ if ((path = desktop_file_to_monitor (PANEL_DITEM_EDITOR (dialog))) != NULL)
-+ uri = path;
-+
- if (uri && launcher->location && strcmp (uri,
launcher->location)) {
- client = panel_gconf_get_client ();
-
-@@ -705,6 +802,9 @@ launcher_saved (GtkWidget *dialog,
- if (launcher->location)
- g_free (launcher->location);
- launcher->location = g_strdup (uri);
-+
-+ if (path)
-+ start_monitoring (launcher);
- }
- }
-
-@@ -871,6 +971,7 @@ launcher_new_saved (GtkWidget *dialog,
- PanelWidget *panel;
- int pos;
- const char *uri;
-+ const char *path;
-
- pos = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (dialog), "pos"));
- panel = g_object_get_data (G_OBJECT (dialog), "panel");
-@@ -878,6 +979,10 @@ launcher_new_saved (GtkWidget *dialog,
- uri = panel_ditem_editor_get_uri (PANEL_DITEM_EDITOR (dialog));
- if (panel_launcher_get_filename (uri) != NULL)
- uri = panel_launcher_get_filename (uri);
-+
-+ if ((path = desktop_file_to_monitor (PANEL_DITEM_EDITOR (dialog))) != NULL)
-+ uri = path;
-+
- panel_launcher_create (panel->toplevel, pos, uri);
- }
-
-diff -up gnome-panel-2.29.5.1/gnome-panel/launcher.h.desktop-file-monitoring
gnome-panel-2.29.5.1/gnome-panel/launcher.h
---- gnome-panel-2.29.5.1/gnome-panel/launcher.h.desktop-file-monitoring 2009-04-19
13:45:09.000000000 -0400
-+++ gnome-panel-2.29.5.1/gnome-panel/launcher.h 2010-01-17 18:06:14.638537025 -0500
-@@ -27,6 +27,8 @@ typedef struct {
- GSList *error_dialogs;
-
- gulong destroy_handler;
-+
-+ GFileMonitor *monitor;
- } Launcher;
-
- void panel_launcher_create (PanelToplevel *toplevel,
-@@ -56,7 +58,6 @@ void launcher_load_from_gconf
- gint position,
- const char *id);
-
--void panel_launcher_delete (Launcher *launcher);
-
- void ask_about_launcher (const char *file,
- PanelWidget *panel,
-diff -up gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c.desktop-file-monitoring
gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c
----
gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c.desktop-file-monitoring 2010-01-17
18:06:14.635278719 -0500
-+++ gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c 2010-01-17 18:11:39.921279627
-0500
-@@ -81,6 +81,8 @@ struct _PanelDItemEditorPrivate
- GtkWidget *close_button;
- GtkWidget *cancel_button;
- GtkWidget *ok_button;
-+
-+ char *orig_desktop_file;
- };
-
- /* Time in seconds after which we save the file on the disk */
-@@ -366,6 +368,10 @@ panel_ditem_editor_destroy (GtkObject *o
- g_free (dialog->priv->uri);
- dialog->priv->uri = NULL;
-
-+ if (dialog->priv->orig_desktop_file != NULL)
-+ g_free (dialog->priv->orig_desktop_file);
-+ dialog->priv->orig_desktop_file = NULL;
-+
- GTK_OBJECT_CLASS (panel_ditem_editor_parent_class)->destroy (object);
- }
-
-@@ -833,6 +839,13 @@ panel_ditem_editor_changed (PanelDItemEd
- TRUE);
- }
-
-+ /* When the user changes any fields, unset the orig_desktop_file
-+ * field since the editor contents are not entirely from a desktop
-+ * file anymore.
-+ */
-+ g_free (dialog->priv->orig_desktop_file);
-+ dialog->priv->orig_desktop_file = NULL;
-+
- dialog->priv->dirty = TRUE;
- g_signal_emit (G_OBJECT (dialog), ditem_edit_signals[CHANGED], 0);
- }
-@@ -992,6 +1005,13 @@ update_editor_from_desktop_file (PanelDI
- */
- setup_icon_chooser (dialog, icon);
-
-+ /* We set the orig_desktop_file field to let the
-+ * launcher know that the editor contents are coming
-+ * directly from a desktop file.
-+ */
-+ g_free (dialog->priv->orig_desktop_file);
-+ dialog->priv->orig_desktop_file = g_strdup (uri);
-+
- g_free (name);
- g_free (comment);
- g_free (icon);
-@@ -1066,6 +1086,7 @@ update_chooser_for_type (PanelDItemEdito
- g_assert_not_reached ();
- }
-
-+
- chooser = dialog->priv->command_browse_filechooser;
-
- gtk_window_set_title (GTK_WINDOW (chooser),
-@@ -1849,3 +1870,12 @@ panel_ditem_register_save_uri_func (Pane
- dialog->priv->save_uri = save_uri;
- dialog->priv->save_uri_data = data;
- }
-+
-+G_CONST_RETURN char *
-+panel_ditem_editor_get_orig_desktop_file (PanelDItemEditor *dialog)
-+{
-+ g_return_val_if_fail (PANEL_IS_DITEM_EDITOR (dialog), NULL);
-+
-+ return dialog->priv->orig_desktop_file;
-+}
-+
-diff -up gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.h.desktop-file-monitoring
gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.h
----
gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.h.desktop-file-monitoring 2009-04-19
13:45:09.000000000 -0400
-+++ gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.h 2010-01-17 18:06:14.638537025
-0500
-@@ -101,6 +101,8 @@ void panel_ditem_editor_set_uri (PanelDI
- const char *uri);
-
- G_CONST_RETURN char *panel_ditem_editor_get_uri (PanelDItemEditor *dialog);
-+G_CONST_RETURN char *panel_ditem_editor_get_orig_desktop_file (PanelDItemEditor
*dialog);
-+
-
- void panel_ditem_register_save_uri_func (PanelDItemEditor *dialog,
- PanelDitemSaveUri save_uri,
diff --git a/drop-gweather-xml-include.patch b/drop-gweather-xml-include.patch
deleted file mode 100644
index 3b3a559..0000000
--- a/drop-gweather-xml-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- applets/clock/clock.c.orig 2012-12-25 14:38:00.101601746 -0600
-+++ applets/clock/clock.c 2012-12-25 14:38:30.331443803 -0600
-@@ -54,7 +54,6 @@
- #define GNOME_DESKTOP_USE_UNSTABLE_API
- #include <libgnome-desktop/gnome-wall-clock.h>
-
--#include <libgweather/gweather-xml.h>
- #include <libgweather/location-entry.h>
- #include <libgweather/timezone-menu.h>
- #include <libgweather/gweather-enum-types.h>
diff --git a/fix-clock-crash.patch b/fix-clock-crash.patch
deleted file mode 100644
index 4a12b60..0000000
--- a/fix-clock-crash.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 58d7ba0359ab128f30b39ea0518a69ed83a4e329 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode(a)redhat.com>
-Date: Tue, 8 Dec 2009 14:48:58 -0500
-Subject: [PATCH] Only call e_passwords_shutdown once
-
-It doesn't appear to support being called multiple times
-in a row.
-
-It appears there was already an attempt to do this with a
-reference counter called clock_numbers:
-
-/* Used to count the number of clock instances. It's there to know when
- * we should free resources that are shared. */
-static int clock_numbers = 0;
-
-But the logic was wrong.
----
- applets/clock/clock.c | 9 +++++++--
- 1 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/applets/clock/clock.c b/applets/clock/clock.c
-index ddbbc16..c06530a 100644
---- a/applets/clock/clock.c
-+++ b/applets/clock/clock.c
-@@ -803,8 +803,11 @@ destroy_clock (GtkWidget * widget, ClockData *cd)
-
- #ifdef HAVE_LIBECAL
- if (clock_numbers > 0) {
-- e_passwords_shutdown ();
- clock_numbers--;
-+
-+ if (clock_numbers == 0) {
-+ e_passwords_shutdown ();
-+ }
- }
- #endif
- }
-@@ -1385,8 +1388,10 @@ static void
- create_clock_widget (ClockData *cd)
- {
- #ifdef HAVE_LIBECAL
-+ if (clock_numbers == 0) {
-+ e_passwords_init ();
-+ }
- clock_numbers++;
-- e_passwords_init ();
- #endif
-
- /* Main toggle button */
---
-1.6.5.2
-
diff --git a/gnome-compiler-flags.m4 b/gnome-compiler-flags.m4
deleted file mode 100644
index 7368178..0000000
--- a/gnome-compiler-flags.m4
+++ /dev/null
@@ -1,141 +0,0 @@
-dnl GNOME_COMPILE_WARNINGS
-dnl Turn on many useful compiler warnings
-dnl For now, only works on GCC
-AC_DEFUN([GNOME_COMPILE_WARNINGS],[
- dnl ******************************
- dnl More compiler warnings
- dnl ******************************
-
- AC_ARG_ENABLE(compile-warnings,
-
AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
- [Turn on compiler warnings]),,
- [enable_compile_warnings="m4_default([$1],[yes])"])
-
- warnCFLAGS=
- if test "x$GCC" != xyes; then
- enable_compile_warnings=no
- fi
-
- warning_flags=
- realsave_CFLAGS="$CFLAGS"
-
- case "$enable_compile_warnings" in
- no)
- warning_flags=
- ;;
- minimum)
- warning_flags="-Wall"
- ;;
- yes)
- warning_flags="-Wall -Wmissing-prototypes"
- ;;
- maximum|error)
- warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
- CFLAGS="$warning_flags $CFLAGS"
- for option in -Wno-sign-compare; do
- SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $option"
- AC_MSG_CHECKING([whether gcc understands $option])
- AC_TRY_COMPILE([], [],
- has_option=yes,
- has_option=no,)
- CFLAGS="$SAVE_CFLAGS"
- AC_MSG_RESULT($has_option)
- if test $has_option = yes; then
- warning_flags="$warning_flags $option"
- fi
- unset has_option
- unset SAVE_CFLAGS
- done
- unset option
- if test "$enable_compile_warnings" = "error" ; then
- warning_flags="$warning_flags -Werror"
- fi
- ;;
- *)
- AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to
--enable-compile-warnings)
- ;;
- esac
- CFLAGS="$realsave_CFLAGS"
- AC_MSG_CHECKING(what warning flags to pass to the C compiler)
- AC_MSG_RESULT($warning_flags)
-
- AC_ARG_ENABLE(iso-c,
- AC_HELP_STRING([--enable-iso-c],
- [Try to warn if code is not ISO C ]),,
- [enable_iso_c=no])
-
- AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
- complCFLAGS=
- if test "x$enable_iso_c" != "xno"; then
- if test "x$GCC" = "xyes"; then
- case " $CFLAGS " in
- *[\ \ ]-ansi[\ \ ]*) ;;
- *) complCFLAGS="$complCFLAGS -ansi" ;;
- esac
- case " $CFLAGS " in
- *[\ \ ]-pedantic[\ \ ]*) ;;
- *) complCFLAGS="$complCFLAGS -pedantic" ;;
- esac
- fi
- fi
- AC_MSG_RESULT($complCFLAGS)
-
- WARN_CFLAGS="$warning_flags $complCFLAGS"
- AC_SUBST(WARN_CFLAGS)
-])
-
-dnl For C++, do basically the same thing.
-
-AC_DEFUN([GNOME_CXX_WARNINGS],[
- AC_ARG_ENABLE(cxx-warnings,
- AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
- [Turn on compiler warnings.]),,
- [enable_cxx_warnings="m4_default([$1],[minimum])"])
-
- AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
- warnCXXFLAGS=
- if test "x$GCC" != xyes; then
- enable_compile_warnings=no
- fi
- if test "x$enable_cxx_warnings" != "xno"; then
- if test "x$GCC" = "xyes"; then
- case " $CXXFLAGS " in
- *[\ \ ]-Wall[\ \ ]*) ;;
- *) warnCXXFLAGS="-Wall -Wno-unused" ;;
- esac
-
- ## -W is not all that useful. And it cannot be controlled
- ## with individual -Wno-xxx flags, unlike -Wall
- if test "x$enable_cxx_warnings" = "xyes"; then
- warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
- fi
- fi
- fi
- AC_MSG_RESULT($warnCXXFLAGS)
-
- AC_ARG_ENABLE(iso-cxx,
- AC_HELP_STRING([--enable-iso-cxx],
- [Try to warn if code is not ISO C++ ]),,
- [enable_iso_cxx=no])
-
- AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
- complCXXFLAGS=
- if test "x$enable_iso_cxx" != "xno"; then
- if test "x$GCC" = "xyes"; then
- case " $CXXFLAGS " in
- *[\ \ ]-ansi[\ \ ]*) ;;
- *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
- esac
-
- case " $CXXFLAGS " in
- *[\ \ ]-pedantic[\ \ ]*) ;;
- *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
- esac
- fi
- fi
- AC_MSG_RESULT($complCXXFLAGS)
-
- WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
- AC_SUBST(WARN_CXXFLAGS)
-])
diff --git a/gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch
b/gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch
deleted file mode 100644
index 3188df4..0000000
--- a/gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch
+++ /dev/null
@@ -1,11 +0,0 @@
----
gnome-panel-2.10.1/applets/fish/fish.schemas.in.speak-to-us-ye-old-wise-fish 2005-04-25
06:52:48.000000000 -0400
-+++ gnome-panel-2.10.1/applets/fish/fish.schemas.in 2005-04-25 06:53:13.000000000 -0400
-@@ -34,7 +34,7 @@
- <key>/schemas/apps/fish_applet/prefs/command</key>
- <owner>fish-applet</owner>
- <type>string</type>
-- <default>fortune</default>
-+ <default>ddate</default>
- <locale name="C">
- <short>Command to execute on click</short>
- <long>
diff --git a/gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
b/gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
deleted file mode 100644
index 8032a80..0000000
--- a/gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -up
gnome-panel-2.21.92/applets/clock/calendar-client.c.allow-spurious-view-done-signals
gnome-panel-2.21.92/applets/clock/calendar-client.c
----
gnome-panel-2.21.92/applets/clock/calendar-client.c.allow-spurious-view-done-signals 2008-02-26
08:17:49.000000000 -0500
-+++ gnome-panel-2.21.92/applets/clock/calendar-client.c 2008-03-03 10:22:57.000000000
-0500
-@@ -1217,6 +1217,13 @@ calendar_client_handle_query_completed (
- {
- CalendarClientQuery *query;
-
-+ if (!source->query_in_progress)
-+ {
-+ g_warning ("Got spurious 'view-done' signal from calendar backend for
query %p\n",
-+ &source->completed_query);
-+ return;
-+ }
-+
- query = goddamn_this_is_crack (source, view, NULL);
-
- dprintf ("Query %p completed: %s\n", query, e_cal_get_error_message
(status));
diff --git a/gnome-panel-about.patch b/gnome-panel-about.patch
deleted file mode 100644
index 3b31508..0000000
--- a/gnome-panel-about.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up gnome-panel-2.27.91/gnome-panel/panel-menu-items.c.about
gnome-panel-2.27.91/gnome-panel/panel-menu-items.c
---- gnome-panel-2.27.91/gnome-panel/panel-menu-items.c.about 2009-08-25
13:32:12.101272238 -0400
-+++ gnome-panel-2.27.91/gnome-panel/panel-menu-items.c 2009-08-25 14:08:21.444015913
-0400
-@@ -1170,7 +1170,8 @@ panel_desktop_menu_item_append_menu (Gtk
- add_menu_separator (menu);
-
- panel_menu_items_append_from_desktop (menu, "gnome-yelp.desktop", NULL,
FALSE);
-- panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL,
FALSE);
-+ if (panel_has_desktop_file ("about-this-computer.desktop"))
-+ panel_menu_items_append_from_desktop (menu, "about-this-computer.desktop",
NULL, FALSE);
-
- if (parent->priv->append_lock_logout)
- panel_menu_items_append_lock_logout (menu);
diff --git a/gnome-panel-libs.patch b/gnome-panel-libs.patch
deleted file mode 100644
index f02dd49..0000000
--- a/gnome-panel-libs.patch
+++ /dev/null
@@ -1,555 +0,0 @@
-diff -up gnome-panel-2.91.6/applets/clock/.libs gnome-panel-2.91.6/applets/clock/
-Only in gnome-panel-2.91.6/applets/clock/: calendar-client.c
-Only in gnome-panel-2.91.6/applets/clock/:
calendar-client.c.allow-spurious-view-done-signals
-Only in gnome-panel-2.91.6/applets/clock/: calendar-client.h
-Only in gnome-panel-2.91.6/applets/clock/: calendar-debug.h
-Only in gnome-panel-2.91.6/applets/clock/: calendar-sources.c
-Only in gnome-panel-2.91.6/applets/clock/: calendar-sources.h
-Only in gnome-panel-2.91.6/applets/clock/: calendar-window.c
-Only in gnome-panel-2.91.6/applets/clock/: calendar-window.h
-Binary files gnome-panel-2.91.6/applets/clock/.libs/clock-applet and
gnome-panel-2.91.6/applets/clock/clock-applet differ
-Only in gnome-panel-2.91.6/applets/clock/: clock_applet-calendar-client.o
-Only in gnome-panel-2.91.6/applets/clock/: clock_applet-calendar-sources.o
-Only in gnome-panel-2.91.6/applets/clock/: clock_applet-calendar-window.o
-Only in gnome-panel-2.91.6/applets/clock/: clock_applet-clock-face.o
-Only in gnome-panel-2.91.6/applets/clock/: clock_applet-clock-location.o
-Only in gnome-panel-2.91.6/applets/clock/: clock_applet-clock-location-tile.o
-Only in gnome-panel-2.91.6/applets/clock/: clock_applet-clock-map.o
-Only in gnome-panel-2.91.6/applets/clock/: clock_applet-clock-marshallers.o
-Only in gnome-panel-2.91.6/applets/clock/: clock_applet-clock.o
-Only in gnome-panel-2.91.6/applets/clock/: clock_applet-clock-sunpos.o
-Only in gnome-panel-2.91.6/applets/clock/: clock_applet-clock-typebuiltins.o
-Only in gnome-panel-2.91.6/applets/clock/: clock_applet-clock-utils.o
-Only in gnome-panel-2.91.6/applets/clock/: clock_applet-set-timezone.o
-Only in gnome-panel-2.91.6/applets/clock/: clock.c
-Only in gnome-panel-2.91.6/applets/clock/: clock.c.fix-clock-crash
-Only in gnome-panel-2.91.6/applets/clock/: clock-face.c
-Only in gnome-panel-2.91.6/applets/clock/: clock-face.h
-Only in gnome-panel-2.91.6/applets/clock/: clock.h
-Only in gnome-panel-2.91.6/applets/clock/: clock-location.c
-Only in gnome-panel-2.91.6/applets/clock/: clock-location.c.clock-network
-Only in gnome-panel-2.91.6/applets/clock/: clock-location.h
-Only in gnome-panel-2.91.6/applets/clock/: clock-location-tile.c
-Only in gnome-panel-2.91.6/applets/clock/: clock-location-tile.h
-Only in gnome-panel-2.91.6/applets/clock/: clock-map.c
-Only in gnome-panel-2.91.6/applets/clock/: clock-map.h
-Only in gnome-panel-2.91.6/applets/clock/: clock-marshallers.c
-Only in gnome-panel-2.91.6/applets/clock/: clock-marshallers.h
-Only in gnome-panel-2.91.6/applets/clock/: clock-marshallers.list
-Only in gnome-panel-2.91.6/applets/clock/: clock-menu.xml
-Only in gnome-panel-2.91.6/applets/clock/: clock.schemas
-Only in gnome-panel-2.91.6/applets/clock/: clock.schemas.in
-Only in gnome-panel-2.91.6/applets/clock/: clock.schemas.in.clock-home
-Only in gnome-panel-2.91.6/applets/clock/: clock-sunpos.c
-Only in gnome-panel-2.91.6/applets/clock/: clock-sunpos.h
-Only in gnome-panel-2.91.6/applets/clock/: clock-typebuiltins.c
-Only in gnome-panel-2.91.6/applets/clock/: clock-typebuiltins.h
-Only in gnome-panel-2.91.6/applets/clock/: clock.ui
-Only in gnome-panel-2.91.6/applets/clock/: clock-utils.c
-Only in gnome-panel-2.91.6/applets/clock/: clock-utils.h
-Only in gnome-panel-2.91.6/applets/clock/: .libs
-Only in gnome-panel-2.91.6/applets/clock/.libs: libsystem-timezone.a
-Only in gnome-panel-2.91.6/applets/clock/: Makefile
-Only in gnome-panel-2.91.6/applets/clock/: Makefile.am
-Only in gnome-panel-2.91.6/applets/clock/: Makefile.in
-Only in gnome-panel-2.91.6/applets/clock/:
org.gnome.panel.applet.ClockAppletFactory.service
-Only in gnome-panel-2.91.6/applets/clock/:
org.gnome.panel.applet.ClockAppletFactory.service.in
-Only in gnome-panel-2.91.6/applets/clock/: org.gnome.panel.ClockApplet.panel-applet
-Only in gnome-panel-2.91.6/applets/clock/: org.gnome.panel.ClockApplet.panel-applet.in
-Only in gnome-panel-2.91.6/applets/clock/:
org.gnome.panel.ClockApplet.panel-applet.in.in
-Only in gnome-panel-2.91.6/applets/clock/: pixmaps
-Only in gnome-panel-2.91.6/applets/clock/: set-timezone.c
-Only in gnome-panel-2.91.6/applets/clock/: set-timezone.h
-Only in gnome-panel-2.91.6/applets/clock/: system-timezone.c
-Only in gnome-panel-2.91.6/applets/clock/: system-timezone.h
-Only in gnome-panel-2.91.6/applets/clock/: system-timezone.lo
-Binary files gnome-panel-2.91.6/applets/clock/.libs/system-timezone.o and
gnome-panel-2.91.6/applets/clock/system-timezone.o differ
-Only in gnome-panel-2.91.6/applets/clock/: test-system-timezone
-Only in gnome-panel-2.91.6/applets/clock/: test-system-timezone.c
-Only in gnome-panel-2.91.6/applets/clock/: test-system-timezone.o
-diff -up gnome-panel-2.91.6/applets/fish/.libs gnome-panel-2.91.6/applets/fish/
-Only in gnome-panel-2.91.6/applets/fish/: fishanim.png
-Binary files gnome-panel-2.91.6/applets/fish/.libs/fish-applet and
gnome-panel-2.91.6/applets/fish/fish-applet differ
-Only in gnome-panel-2.91.6/applets/fish/: fish_applet-fish.o
-Only in gnome-panel-2.91.6/applets/fish/: fish.c
-Only in gnome-panel-2.91.6/applets/fish/: fish-menu.xml
-Only in gnome-panel-2.91.6/applets/fish/: fish.schemas
-Only in gnome-panel-2.91.6/applets/fish/: fish.schemas.in
-Only in gnome-panel-2.91.6/applets/fish/: fish.schemas.in.speak-to-us-ye-old-wise-fish
-Only in gnome-panel-2.91.6/applets/fish/: fish.ui
-Only in gnome-panel-2.91.6/applets/fish/: footguy.png
-Only in gnome-panel-2.91.6/applets/fish/: .libs
-Only in gnome-panel-2.91.6/applets/fish/: Makefile
-Only in gnome-panel-2.91.6/applets/fish/: Makefile.am
-Only in gnome-panel-2.91.6/applets/fish/: Makefile.in
-Only in gnome-panel-2.91.6/applets/fish/: monkey.png
-Only in gnome-panel-2.91.6/applets/fish/: oldwanda.png
-Only in gnome-panel-2.91.6/applets/fish/:
org.gnome.panel.applet.FishAppletFactory.service
-Only in gnome-panel-2.91.6/applets/fish/:
org.gnome.panel.applet.FishAppletFactory.service.in
-Only in gnome-panel-2.91.6/applets/fish/: org.gnome.panel.FishApplet.panel-applet
-Only in gnome-panel-2.91.6/applets/fish/: org.gnome.panel.FishApplet.panel-applet.in
-Only in gnome-panel-2.91.6/applets/fish/: org.gnome.panel.FishApplet.panel-applet.in.in
-Only in gnome-panel-2.91.6/applets/fish/: wanda.png
-Only in gnome-panel-2.91.6/applets/fish/: wanda.svg
-diff -up gnome-panel-2.91.6/applets/notification_area/.libs
gnome-panel-2.91.6/applets/notification_area/
-Only in gnome-panel-2.91.6/applets/notification_area/: fixedtip.c
-Only in gnome-panel-2.91.6/applets/notification_area/: fixedtip.h
-Only in gnome-panel-2.91.6/applets/notification_area/: fixedtip.lo
-Binary files gnome-panel-2.91.6/applets/notification_area/.libs/fixedtip.o and
gnome-panel-2.91.6/applets/notification_area/fixedtip.o differ
-Only in gnome-panel-2.91.6/applets/notification_area/: .libs
-Only in gnome-panel-2.91.6/applets/notification_area/.libs: libtray.a
-Only in gnome-panel-2.91.6/applets/notification_area/: main.c
-Only in gnome-panel-2.91.6/applets/notification_area/: Makefile
-Only in gnome-panel-2.91.6/applets/notification_area/: Makefile.am
-Only in gnome-panel-2.91.6/applets/notification_area/: Makefile.am.libs
-Only in gnome-panel-2.91.6/applets/notification_area/: Makefile.in
-Only in gnome-panel-2.91.6/applets/notification_area/: na-marshal.c
-Only in gnome-panel-2.91.6/applets/notification_area/: na-marshal.h
-Only in gnome-panel-2.91.6/applets/notification_area/: na-marshal.list
-Only in gnome-panel-2.91.6/applets/notification_area/: na-marshal.lo
-Binary files gnome-panel-2.91.6/applets/notification_area/.libs/na-marshal.o and
gnome-panel-2.91.6/applets/notification_area/na-marshal.o differ
-Only in gnome-panel-2.91.6/applets/notification_area/: na-tray.c
-Only in gnome-panel-2.91.6/applets/notification_area/: na-tray-child.c
-Only in gnome-panel-2.91.6/applets/notification_area/: na-tray-child.h
-Only in gnome-panel-2.91.6/applets/notification_area/: na-tray-child.lo
-Binary files gnome-panel-2.91.6/applets/notification_area/.libs/na-tray-child.o and
gnome-panel-2.91.6/applets/notification_area/na-tray-child.o differ
-Only in gnome-panel-2.91.6/applets/notification_area/: na-tray.h
-Only in gnome-panel-2.91.6/applets/notification_area/: na-tray.lo
-Only in gnome-panel-2.91.6/applets/notification_area/: na-tray-manager.c
-Only in gnome-panel-2.91.6/applets/notification_area/: na-tray-manager.h
-Only in gnome-panel-2.91.6/applets/notification_area/: na-tray-manager.lo
-Binary files gnome-panel-2.91.6/applets/notification_area/.libs/na-tray-manager.o and
gnome-panel-2.91.6/applets/notification_area/na-tray-manager.o differ
-Binary files gnome-panel-2.91.6/applets/notification_area/.libs/na-tray.o and
gnome-panel-2.91.6/applets/notification_area/na-tray.o differ
-Only in gnome-panel-2.91.6/applets/notification_area/: notification_area_applet-main.o
-Only in gnome-panel-2.91.6/applets/notification_area/: notification-area-menu.xml
-Only in gnome-panel-2.91.6/applets/notification_area/:
org.gnome.panel.applet.NotificationAreaAppletFactory.service
-Only in gnome-panel-2.91.6/applets/notification_area/:
org.gnome.panel.applet.NotificationAreaAppletFactory.service.in
-Only in gnome-panel-2.91.6/applets/notification_area/:
org.gnome.panel.NotificationAreaApplet.panel-applet
-Only in gnome-panel-2.91.6/applets/notification_area/:
org.gnome.panel.NotificationAreaApplet.panel-applet.in
-Only in gnome-panel-2.91.6/applets/notification_area/:
org.gnome.panel.NotificationAreaApplet.panel-applet.in.in
-Only in gnome-panel-2.91.6/applets/notification_area/: testtray.c
-Only in gnome-panel-2.91.6/applets/notification_area/: testtray.o
-diff -up gnome-panel-2.91.6/applets/notification_area/Makefile.am.libs
gnome-panel-2.91.6/applets/notification_area/Makefile.am
---- gnome-panel-2.91.6/applets/notification_area/Makefile.am.libs 2011-01-31
18:52:27.000000000 -0500
-+++ gnome-panel-2.91.6/applets/notification_area/Makefile.am 2011-02-02
19:45:49.002989988 -0500
-@@ -29,8 +29,8 @@ libtray_la_SOURCES = \
- NOTIFICATION_AREA_SOURCES = main.c
-
- NOTIFICATION_AREA_LDADD = \
-- ../../libpanel-applet/libpanel-applet-4.la \
- $(X_LIBS) \
-+ ../../libpanel-applet/libpanel-applet-4.la \
- $(NOTIFICATION_AREA_LIBS) \
- $(LIBPANEL_APPLET_LIBS) \
- libtray.la
-diff -up gnome-panel-2.91.6/configure.ac.libs gnome-panel-2.91.6/configure.ac
---- gnome-panel-2.91.6/configure.ac.libs 2011-02-01 20:43:03.000000000 -0500
-+++ gnome-panel-2.91.6/configure.ac 2011-02-02 19:45:49.003990000 -0500
-@@ -83,7 +83,7 @@ PKG_CHECK_MODULES(PANEL, gdk-pixbuf-2.0
- AC_SUBST(PANEL_CFLAGS)
- AC_SUBST(PANEL_LIBS)
-
--PKG_CHECK_MODULES(LIBPANEL_APPLET, gtk+-3.0 >= $GTK_REQUIRED cairo-xlib cairo-gobject
gconf-2.0 >= $GCONF_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >=
$GLIB_REQUIRED)
-+PKG_CHECK_MODULES(LIBPANEL_APPLET, gdk-x11-3.0 >= $GTK_REQUIRED gdk-3.0 >=
$GTK_REQUIRED gtk+-x11-3.0 >= $GTK_REQUIRED gtk+-3.0 >= $GTK_REQUIRED cairo-xlib
cairo-gobject gconf-2.0 >= $GCONF_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0
>= $GLIB_REQUIRED)
- AC_SUBST(LIBPANEL_APPLET_CFLAGS)
- AC_SUBST(LIBPANEL_APPLET_LIBS)
-
-@@ -91,11 +91,11 @@ PKG_CHECK_MODULES(FISH, gtk+-3.0 >= $GTK
- AC_SUBST(FISH_CFLAGS)
- AC_SUBST(FISH_LIBS)
-
--PKG_CHECK_MODULES(NOTIFICATION_AREA, gtk+-3.0 >= $GTK_REQUIRED)
-+PKG_CHECK_MODULES(NOTIFICATION_AREA, gdk-x11-3.0 >= $GTK_REQUIRED gdk-3.0 >=
$GTK_REQUIRED gtk+-x11-3.0 >= $GTK_REQUIRED gtk+-3.0 >= $GTK_REQUIRED)
- AC_SUBST(NOTIFICATION_AREA_CFLAGS)
- AC_SUBST(NOTIFICATION_AREA_LIBS)
-
--PKG_CHECK_MODULES(WNCKLET, gtk+-3.0 >= $GTK_REQUIRED libwnck-3.0 >=
$LIBWNCK_REQUIRED)
-+PKG_CHECK_MODULES(WNCKLET, gdk-x11-3.0 >= $GTK_REQUIRED gdk-3.0 >= $GTK_REQUIRED
gtk+-x11-3.0 >= $GTK_REQUIRED gtk+-3.0 >= $GTK_REQUIRED libwnck-3.0 >=
$LIBWNCK_REQUIRED)
- AC_SUBST(WNCKLET_CFLAGS)
- AC_SUBST(WNCKLET_LIBS)
-
-@@ -242,10 +242,15 @@ AC_SUBST(X_LIBS)
-
- dnl X RANDR extension
-
--PKG_CHECK_MODULES(XRANDR, xrandr >= 1.2.0, have_randr=yes, have_randr=no)
--if test "x$have_randr" = "xyes"; then
-+PKG_CHECK_MODULES(XRANDR, xrandr >= 1.2.0, [
- AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library])
--fi
-+ have_randr=yes
-+ X_LIBS="$X_LIBS $XRANDR_LIBS"
-+], [
-+ have_randr=no
-+])
-+
-+AC_SUBST(X_LIBS)
-
- dnl Modules dir
- AC_SUBST([modulesdir],"\$(libdir)/gnome-panel/modules")
-diff -up gnome-panel-2.91.6/gnome-panel/libegg/.libs
gnome-panel-2.91.6/gnome-panel/libegg/
-Only in gnome-panel-2.91.6/gnome-panel/libegg/: eggdesktopfile.c
-Only in gnome-panel-2.91.6/gnome-panel/libegg/: eggdesktopfile.h
-Only in gnome-panel-2.91.6/gnome-panel/libegg/: eggdesktopfile.lo
-Binary files gnome-panel-2.91.6/gnome-panel/libegg/.libs/eggdesktopfile.o and
gnome-panel-2.91.6/gnome-panel/libegg/eggdesktopfile.o differ
-Only in gnome-panel-2.91.6/gnome-panel/libegg/: eggsmclient.c
-Only in gnome-panel-2.91.6/gnome-panel/libegg/: eggsmclient.h
-Only in gnome-panel-2.91.6/gnome-panel/libegg/: eggsmclient.lo
-Binary files gnome-panel-2.91.6/gnome-panel/libegg/.libs/eggsmclient.o and
gnome-panel-2.91.6/gnome-panel/libegg/eggsmclient.o differ
-Only in gnome-panel-2.91.6/gnome-panel/libegg/: eggsmclient-private.h
-Only in gnome-panel-2.91.6/gnome-panel/libegg/: eggsmclient-xsmp.c
-Only in gnome-panel-2.91.6/gnome-panel/libegg/: eggsmclient-xsmp.lo
-Binary files gnome-panel-2.91.6/gnome-panel/libegg/.libs/eggsmclient-xsmp.o and
gnome-panel-2.91.6/gnome-panel/libegg/eggsmclient-xsmp.o differ
-Only in gnome-panel-2.91.6/gnome-panel/libegg/.libs: libegg.a
-Only in gnome-panel-2.91.6/gnome-panel/libegg/: .libs
-Only in gnome-panel-2.91.6/gnome-panel/libegg/: Makefile
-Only in gnome-panel-2.91.6/gnome-panel/libegg/: Makefile.am
-Only in gnome-panel-2.91.6/gnome-panel/libegg/: Makefile.in
-diff -up gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/.libs
gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/.libs:
libpanel-applet-private.a
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/.libs:
libpanel-applet-private-mini.a
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/: .libs
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/: Makefile
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/: Makefile.am
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/: Makefile.in
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/:
panel-applet-container.c
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/:
panel-applet-container.h
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/:
panel-applet-container.lo
-Binary files
gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/.libs/panel-applet-container.o and
gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/panel-applet-container.o differ
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/:
panel-applet-frame-dbus.c
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/:
panel-applet-frame-dbus.h
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/:
panel-applet-frame-dbus.lo
-Binary files
gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/.libs/panel-applet-frame-dbus.o and
gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/panel-applet-frame-dbus.o differ
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/: panel-applet-mini.c
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/: panel-applet-mini.lo
-Binary files
gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/.libs/panel-applet-mini.o and
gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/panel-applet-mini.o differ
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/:
panel-applets-manager-dbus.c
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/:
panel-applets-manager-dbus.h
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/:
panel-applets-manager-dbus.lo
-Binary files
gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/.libs/panel-applets-manager-dbus.o
and gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/panel-applets-manager-dbus.o
differ
-diff -up gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs
gnome-panel-2.91.6/gnome-panel/libpanel-util/
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs: libpanel-util.a
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: .libs
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: Makefile
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: Makefile.am
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: Makefile.in
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-cleanup.c
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-cleanup.h
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-cleanup.lo
-Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-cleanup.o and
gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-cleanup.o differ
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-dbus-service.c
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-dbus-service.h
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-dbus-service.lo
-Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-dbus-service.o and
gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-dbus-service.o differ
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-error.c
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-error.h
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-error.lo
-Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-error.o and
gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-error.o differ
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-glib.c
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-glib.h
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-glib.lo
-Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-glib.o and
gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-glib.o differ
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-gtk.c
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-gtk.h
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-gtk.lo
-Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-gtk.o and
gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-gtk.o differ
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-icon-chooser.c
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-icon-chooser.h
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-icon-chooser.lo
-Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-icon-chooser.o and
gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-icon-chooser.o differ
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-keyfile.c
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-keyfile.h
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-keyfile.lo
-Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-keyfile.o and
gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-keyfile.o differ
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-launch.c
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-launch.h
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-launch.lo
-Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-launch.o and
gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-launch.o differ
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-list.c
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-list.h
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-list.lo
-Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-list.o and
gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-list.o differ
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-session-manager.c
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-session-manager.h
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-session-manager.lo
-Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-session-manager.o
and gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-session-manager.o differ
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-show.c
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-show.h
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-show.lo
-Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-show.o and
gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-show.o differ
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-xdg.c
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-xdg.h
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-xdg.lo
-Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-xdg.o and
gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-xdg.o differ
-diff -up gnome-panel-2.91.6/gnome-panel/.libs gnome-panel-2.91.6/gnome-panel/
-Only in gnome-panel-2.91.6/gnome-panel/: applet.c
-Only in gnome-panel-2.91.6/gnome-panel/: applet.h
-Only in gnome-panel-2.91.6/gnome-panel/: button-widget.c
-Only in gnome-panel-2.91.6/gnome-panel/: button-widget.h
-Only in gnome-panel-2.91.6/gnome-panel/: drawer.c
-Only in gnome-panel-2.91.6/gnome-panel/: drawer.h
-Only in gnome-panel-2.91.6/gnome-panel/: gnome-desktop-item-edit
-Only in gnome-panel-2.91.6/gnome-panel/: gnome-desktop-item-edit.c
-Only in gnome-panel-2.91.6/gnome-panel/: gnome-desktop-item-edit.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome-panel
-Only in gnome-panel-2.91.6/gnome-panel/: gnome-panel-add
-Only in gnome-panel-2.91.6/gnome-panel/: gnome-panel-add.in
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-applet.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-button-widget.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome-panel.desktop
-Only in gnome-panel-2.91.6/gnome-panel/: gnome-panel.desktop.in
-Only in gnome-panel-2.91.6/gnome-panel/: gnome-panel.desktop.in.in
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-drawer.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-launcher.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-main.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-menu.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-a11y.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-action-button.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-action-protocol.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-addto.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-applet-frame.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-applet-info.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-applets-manager.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-background-monitor.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-background.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-bindings.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-compatibility.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-config-global.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-context-menu.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-ditem-editor.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-force-quit.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-frame.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-gconf.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-lockdown.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-marshal.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-menu-bar.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-menu-button.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-menu-items.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-modules.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-multiscreen.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-profile.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-properties-dialog.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-recent.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-run-dialog.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-separator.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-session.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-shell.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-stock-icons.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-struts.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-toplevel.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-typebuiltins.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-util.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-widget.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-xutils.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-xstuff.o
-Only in gnome-panel-2.91.6/gnome-panel/: launcher.c
-Only in gnome-panel-2.91.6/gnome-panel/: launcher.c.preferred-apps
-Only in gnome-panel-2.91.6/gnome-panel/: launcher.h
-Only in gnome-panel-2.91.6/gnome-panel/: launcher.h.preferred-apps
-Only in gnome-panel-2.91.6/gnome-panel/: libegg
-Only in gnome-panel-2.91.6/gnome-panel/: libpanel-applet-private
-Only in gnome-panel-2.91.6/gnome-panel/: libpanel-util
-Only in gnome-panel-2.91.6/gnome-panel/: .libs
-Only in gnome-panel-2.91.6/gnome-panel/: main.c
-Only in gnome-panel-2.91.6/gnome-panel/: main.c.preferred-apps
-Only in gnome-panel-2.91.6/gnome-panel/: Makefile
-Only in gnome-panel-2.91.6/gnome-panel/: Makefile.am
-Only in gnome-panel-2.91.6/gnome-panel/: Makefile.am.libs
-Only in gnome-panel-2.91.6/gnome-panel/: Makefile.in
-Only in gnome-panel-2.91.6/gnome-panel/: menu.c
-Only in gnome-panel-2.91.6/gnome-panel/: menu.h
-Only in gnome-panel-2.91.6/gnome-panel/: nothing.cP
-Only in gnome-panel-2.91.6/gnome-panel/: nothing.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-a11y.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-a11y.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-action-button.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-action-button.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-action-protocol.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-action-protocol.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-addto.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-addto.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-applet-frame.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-applet-frame.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-applet-info.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-applet-info.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-applets-manager.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-applets-manager.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-background.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-background.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-background-monitor.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-background-monitor.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-bindings.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-bindings.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-compatibility.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-compatibility.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-compatibility.schemas
-Only in gnome-panel-2.91.6/gnome-panel/: panel-config-global.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-config-global.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-context-menu.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-context-menu.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-default-setup.entries
-Only in gnome-panel-2.91.6/gnome-panel/: panel-ditem-editor.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-ditem-editor.c.launcher-desktop-files
-Only in gnome-panel-2.91.6/gnome-panel/: panel-ditem-editor.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-ditem-editor.o
-Only in gnome-panel-2.91.6/gnome-panel/: panel-enums.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-force-quit.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-force-quit.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-frame.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-frame.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-gconf.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-gconf.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-general.schemas
-Only in gnome-panel-2.91.6/gnome-panel/: panel-general.schemas.in
-Only in gnome-panel-2.91.6/gnome-panel/: panel-global.schemas
-Only in gnome-panel-2.91.6/gnome-panel/: panel-global.schemas.in
-Only in gnome-panel-2.91.6/gnome-panel/: panel-globals.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-icon-names.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-lockdown.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-lockdown.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-marshal.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-marshal.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-marshal.list
-Only in gnome-panel-2.91.6/gnome-panel/: panel-marshal.o
-Only in gnome-panel-2.91.6/gnome-panel/: panel-menu-bar.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-menu-bar.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-menu-button.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-menu-button.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-menu-items.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-menu-items.c.bookmarks-submenu
-Only in gnome-panel-2.91.6/gnome-panel/: panel-menu-items.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-modules.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-modules.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-multiscreen.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-multiscreen.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-object.schemas
-Only in gnome-panel-2.91.6/gnome-panel/: panel-object.schemas.in
-Only in gnome-panel-2.91.6/gnome-panel/: panel-profile.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-profile.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-properties-dialog.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-properties-dialog.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-properties-dialog.ui
-Only in gnome-panel-2.91.6/gnome-panel/: panel-recent.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-recent.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-run-dialog.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-run-dialog.c.preferred-apps
-Only in gnome-panel-2.91.6/gnome-panel/: panel-run-dialog.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-run-dialog.h.preferred-apps
-Only in gnome-panel-2.91.6/gnome-panel/: panel-run-dialog.ui
-Only in gnome-panel-2.91.6/gnome-panel/: panel-separator.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-separator.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-session.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-session.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-shell.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-shell.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-stock-icons.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-stock-icons.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-struts.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-struts.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-test-applets
-Only in gnome-panel-2.91.6/gnome-panel/: panel-test-applets.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel_test_applets-panel-applet-info.o
-Only in gnome-panel-2.91.6/gnome-panel/: panel_test_applets-panel-applets-manager.o
-Only in gnome-panel-2.91.6/gnome-panel/: panel_test_applets-panel-marshal.o
-Only in gnome-panel-2.91.6/gnome-panel/: panel_test_applets-panel-modules.o
-Only in gnome-panel-2.91.6/gnome-panel/: panel_test_applets-panel-test-applets.o
-Only in gnome-panel-2.91.6/gnome-panel/: panel-test-applets.ui
-Only in gnome-panel-2.91.6/gnome-panel/: panel-toplevel.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-toplevel.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-toplevel.schemas
-Only in gnome-panel-2.91.6/gnome-panel/: panel-toplevel.schemas.in
-Only in gnome-panel-2.91.6/gnome-panel/: panel-typebuiltins.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-typebuiltins.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-types.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-util.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-util.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-util.o
-Only in gnome-panel-2.91.6/gnome-panel/: panel-widget.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-widget.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-xutils.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-xutils.h
-Only in gnome-panel-2.91.6/gnome-panel/: xstuff.c
-Only in gnome-panel-2.91.6/gnome-panel/: xstuff.h
-Only in gnome-panel-2.91.6/gnome-panel/: xstuff.o
-diff -up gnome-panel-2.91.6/gnome-panel/Makefile.am.libs
gnome-panel-2.91.6/gnome-panel/Makefile.am
---- gnome-panel-2.91.6/gnome-panel/Makefile.am.libs 2011-01-31 18:50:19.000000000 -0500
-+++ gnome-panel-2.91.6/gnome-panel/Makefile.am 2011-02-02 19:45:49.003990000 -0500
-@@ -135,6 +135,7 @@ gnome_panel_LDADD = \
- $(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la \
- $(PANEL_LIBS) \
- $(XRANDR_LIBS) \
-+ -lm \
- $(X_LIBS)
-
- gnome_panel_LDFLAGS = -export-dynamic
-@@ -149,7 +150,8 @@ gnome_desktop_item_edit_SOURCES = \
- gnome_desktop_item_edit_LDADD = \
- $(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la \
- $(PANEL_LIBS) \
-- $(X_LIBS)
-+ $(X_LIBS) \
-+ -lm
-
- panel_test_applets_SOURCES = \
- panel-modules.c \
-diff -up gnome-panel-2.91.6/libpanel-applet/.libs gnome-panel-2.91.6/libpanel-applet/
-Only in gnome-panel-2.91.6/libpanel-applet/: libpanelapplet-4.0.pc
-Only in gnome-panel-2.91.6/libpanel-applet/: libpanelapplet-4.0.pc.in
-Only in gnome-panel-2.91.6/libpanel-applet/: libpanelapplet-4.0-uninstalled.pc
-Only in gnome-panel-2.91.6/libpanel-applet/: libpanelapplet-4.0-uninstalled.pc.in
-Only in gnome-panel-2.91.6/libpanel-applet/.libs: libpanel-applet-4.a
-Only in gnome-panel-2.91.6/libpanel-applet/.libs: libpanel-applet-4.lai
-Only in gnome-panel-2.91.6/libpanel-applet/.libs: libpanel-applet-4.so
-Only in gnome-panel-2.91.6/libpanel-applet/.libs: libpanel-applet-4.so.0
-Only in gnome-panel-2.91.6/libpanel-applet/.libs: libpanel-applet-4.so.0.0.0
-Only in gnome-panel-2.91.6/libpanel-applet/: .libs
-Only in gnome-panel-2.91.6/libpanel-applet/: Makefile
-Only in gnome-panel-2.91.6/libpanel-applet/: Makefile.am
-Only in gnome-panel-2.91.6/libpanel-applet/: Makefile.am.libs
-Only in gnome-panel-2.91.6/libpanel-applet/: Makefile.in
-Only in gnome-panel-2.91.6/libpanel-applet/: org.gnome.panel.TestApplet.panel-applet
-Only in gnome-panel-2.91.6/libpanel-applet/: org.gnome.panel.TestApplet.panel-applet.in
-Only in gnome-panel-2.91.6/libpanel-applet/: PanelApplet-4.0.gir
-Only in gnome-panel-2.91.6/libpanel-applet/: PanelApplet-4.0.typelib
-Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet.c
-Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-enums.c
-Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-enums.h
-Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-enums.lo
-Binary files gnome-panel-2.91.6/libpanel-applet/.libs/panel-applet-enums.o and
gnome-panel-2.91.6/libpanel-applet/panel-applet-enums.o differ
-Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-factory.c
-Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-factory.h
-Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-factory.lo
-Binary files gnome-panel-2.91.6/libpanel-applet/.libs/panel-applet-factory.o and
gnome-panel-2.91.6/libpanel-applet/panel-applet-factory.o differ
-Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-gconf.c
-Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-gconf.h
-Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-gconf.lo
-Binary files gnome-panel-2.91.6/libpanel-applet/.libs/panel-applet-gconf.o and
gnome-panel-2.91.6/libpanel-applet/panel-applet-gconf.o differ
-Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet.h
-Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet.lo
-Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-marshal.c
-Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-marshal.h
-Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-marshal.list
-Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-marshal.lo
-Binary files gnome-panel-2.91.6/libpanel-applet/.libs/panel-applet-marshal.o and
gnome-panel-2.91.6/libpanel-applet/panel-applet-marshal.o differ
-Binary files gnome-panel-2.91.6/libpanel-applet/.libs/panel-applet.o and
gnome-panel-2.91.6/libpanel-applet/panel-applet.o differ
-Binary files gnome-panel-2.91.6/libpanel-applet/.libs/test-dbus-applet and
gnome-panel-2.91.6/libpanel-applet/test-dbus-applet differ
-Only in gnome-panel-2.91.6/libpanel-applet/: test-dbus-applet.c
-Only in gnome-panel-2.91.6/libpanel-applet/: test-dbus-applet.o
-Only in gnome-panel-2.91.6/libpanel-applet/: TODO
-diff -up gnome-panel-2.91.6/libpanel-applet/Makefile.am.libs
gnome-panel-2.91.6/libpanel-applet/Makefile.am
---- gnome-panel-2.91.6/libpanel-applet/Makefile.am.libs 2011-02-02 19:49:30.834702141
-0500
-+++ gnome-panel-2.91.6/libpanel-applet/Makefile.am 2011-02-02 19:49:36.886776132 -0500
-@@ -25,8 +25,8 @@ libpanel_applet_4_la_SOURCES = \
- panel-applet-gconf.h
-
- libpanel_applet_4_la_LIBADD = \
-- $(LIBPANEL_APPLET_LIBS) \
-- $(X_LIBS)
-+ $(X_LIBS) \
-+ $(LIBPANEL_APPLET_LIBS)
-
- libpanel_applet_4_la_LDFLAGS = \
- -version-info $(LIB_PANEL_APPLET_LT_VERSION) \
diff --git a/gnome-panel-search.patch b/gnome-panel-search.patch
deleted file mode 100644
index 277ba9f..0000000
--- a/gnome-panel-search.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-diff -up gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.c.search
gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.c
---- gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.c.search 2009-04-19
13:45:09.000000000 -0400
-+++ gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.c 2009-08-25
11:33:36.666288948 -0400
-@@ -29,6 +29,8 @@
- #include <gdk/gdk.h>
- #include <gtk/gtk.h>
-
-+#include <libgnome/gnome-desktop-item.h>
-+
- #include "panel-error.h"
- #include "panel-glib.h"
-
-@@ -201,6 +203,23 @@ panel_launch_desktop_file (const char *
- }
-
- gboolean
-+panel_has_desktop_file (const char *desktop_file)
-+{
-+ GnomeDesktopItem *ditem;
-+
-+ if (g_path_is_absolute (desktop_file))
-+ ditem = gnome_desktop_item_new_from_file (desktop_file, 0, NULL);
-+ else
-+ ditem = gnome_desktop_item_new_from_basename (desktop_file, 0, NULL);
-+ if (ditem != NULL) {
-+ gnome_desktop_item_unref (ditem);
-+ return TRUE;
-+ }
-+
-+ return FALSE;
-+}
-+
-+gboolean
- panel_launch_desktop_file_with_fallback (const char *desktop_file,
- const char *fallback_exec,
- GdkScreen *screen,
-diff -up gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.h.search
gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.h
---- gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.h.search 2009-04-19
13:45:09.000000000 -0400
-+++ gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.h 2009-08-25
11:33:36.667276923 -0400
-@@ -47,6 +47,8 @@ gboolean panel_launch_key_file (GKeyFile
- GdkScreen *screen,
- GError **error);
-
-+gboolean panel_has_desktop_file (const char *desktop_file);
-+
- gboolean panel_launch_desktop_file (const char *desktop_file,
- GdkScreen *screen,
- GError **error);
-diff -up gnome-panel-2.27.91/gnome-panel/panel-action-button.c.search
gnome-panel-2.27.91/gnome-panel/panel-action-button.c
---- gnome-panel-2.27.91/gnome-panel/panel-action-button.c.search 2009-04-19
13:45:09.000000000 -0400
-+++ gnome-panel-2.27.91/gnome-panel/panel-action-button.c 2009-08-25 11:33:36.671290074
-0400
-@@ -219,9 +219,19 @@ panel_action_search (GtkWidget *widget)
- GdkScreen *screen;
-
- screen = gtk_widget_get_screen (widget);
-- panel_launch_desktop_file_with_fallback ("gnome-search-tool.desktop",
-- "gnome-search-tool",
-- screen, NULL);
-+ if (panel_has_desktop_file ("gnome-beagle-search.desktop")) {
-+ panel_launch_desktop_file ("gnome-beagle-search.desktop",
-+ screen,
-+ NULL);
-+ } else if (panel_has_desktop_file ("fedora-tracker-search-tool.desktop")) {
-+ panel_launch_desktop_file ("fedora-tracker-search-tool.desktop",
-+ screen,
-+ NULL);
-+ } else {
-+ panel_launch_desktop_file ("gnome-search-tool.desktop",
-+ screen,
-+ NULL);
-+ }
- }
-
- /* Force Quit
-diff -up gnome-panel-2.27.91/gnome-panel/panel-menu-items.c.search
gnome-panel-2.27.91/gnome-panel/panel-menu-items.c
---- gnome-panel-2.27.91/gnome-panel/panel-menu-items.c.search 2009-08-25
11:33:36.643267021 -0400
-+++ gnome-panel-2.27.91/gnome-panel/panel-menu-items.c 2009-08-25 11:42:41.517027329
-0400
-@@ -1062,10 +1062,22 @@ panel_place_menu_item_create_menu (Panel
-
- add_menu_separator (places_menu);
-
-- panel_menu_items_append_from_desktop (places_menu,
-- "gnome-search-tool.desktop",
-- NULL,
-- FALSE);
-+ if (panel_has_desktop_file ("gnome-beagle-search.desktop")) {
-+ panel_menu_items_append_from_desktop (places_menu,
-+ "gnome-beagle-search.desktop",
-+ NULL,
-+ FALSE);
-+ } else if (panel_has_desktop_file ("fedora-tracker-search-tool.desktop")) {
-+ panel_menu_items_append_from_desktop (places_menu,
-+ "fedora-tracker-search-tool.desktop",
-+ NULL,
-+ FALSE);
-+ } else {
-+ panel_menu_items_append_from_desktop (places_menu,
-+ "gnome-search-tool.desktop",
-+ NULL,
-+ FALSE);
-+ }
-
- panel_recent_append_documents_menu (places_menu,
- place_item->priv->recent_manager);
diff --git a/gnome-panel-use-gnome-menus.patch b/gnome-panel-use-gnome-menus.patch
deleted file mode 100644
index 87495cc..0000000
--- a/gnome-panel-use-gnome-menus.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -up gnome-panel-3.1.5/gnome-panel/menu.c.menus gnome-panel-3.1.5/gnome-panel/menu.c
---- gnome-panel-3.1.5/gnome-panel/menu.c.menus 2011-08-01 13:39:56.000000000 -0400
-+++ gnome-panel-3.1.5/gnome-panel/menu.c 2011-08-17 18:58:26.341620915 -0400
-@@ -1401,7 +1401,7 @@ create_main_menu (PanelWidget *panel)
- {
- GtkWidget *main_menu;
-
-- main_menu = create_applications_menu ("applications.menu", NULL, TRUE);
-+ main_menu = create_applications_menu ("gnome-applications.menu", NULL,
TRUE);
-
- g_object_set_data (G_OBJECT (main_menu), "menu_panel", panel);
- /* FIXME need to update the panel on parent_set */
-diff -up gnome-panel-3.1.5/gnome-panel/panel-addto.c.menus
gnome-panel-3.1.5/gnome-panel/panel-addto.c
---- gnome-panel-3.1.5/gnome-panel/panel-addto.c.menus 2011-08-01 13:39:56.000000000
-0400
-+++ gnome-panel-3.1.5/gnome-panel/panel-addto.c 2011-08-17 18:59:37.306668576 -0400
-@@ -666,7 +666,7 @@ panel_addto_make_application_model (Pane
- G_TYPE_POINTER,
- G_TYPE_STRING);
-
-- tree = gmenu_tree_new ("applications.menu",
GMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
-+ tree = gmenu_tree_new ("applications-gnome.menu",
GMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
-
- if (!gmenu_tree_load_sync (tree, NULL)) {
- g_object_unref (tree);
-@@ -675,7 +675,7 @@ panel_addto_make_application_model (Pane
-
- if (tree != NULL && (root = gmenu_tree_get_root_directory (tree))) {
- panel_addto_make_application_list (&dialog->application_list,
-- root, "applications.menu",
-+ root, "gnome-applications.menu",
- PANEL_ADDTO_MENU_SHOW_ALL);
- panel_addto_populate_application_model (store, NULL, dialog->application_list);
-
-diff -up gnome-panel-3.1.5/gnome-panel/panel-menu-bar.c.menus
gnome-panel-3.1.5/gnome-panel/panel-menu-bar.c
---- gnome-panel-3.1.5/gnome-panel/panel-menu-bar.c.menus 2011-04-05 06:39:04.000000000
-0400
-+++ gnome-panel-3.1.5/gnome-panel/panel-menu-bar.c 2011-08-17 18:58:26.388620946 -0400
-@@ -129,7 +129,7 @@ panel_menu_bar_init (PanelMenuBar *menub
-
- menubar->priv->info = NULL;
-
-- menubar->priv->applications_menu = create_applications_menu
("applications.menu", NULL, TRUE);
-+ menubar->priv->applications_menu = create_applications_menu
("gnome-applications.menu", NULL, TRUE);
-
- menubar->priv->applications_item = panel_image_menu_item_new ();
- gtk_menu_item_set_label (GTK_MENU_ITEM (menubar->priv->applications_item),
-diff -up gnome-panel-3.1.5/gnome-panel/panel-menu-button.c.menus
gnome-panel-3.1.5/gnome-panel/panel-menu-button.c
---- gnome-panel-3.1.5/gnome-panel/panel-menu-button.c.menus 2011-08-01 13:39:56.000000000
-0400
-+++ gnome-panel-3.1.5/gnome-panel/panel-menu-button.c 2011-08-17 18:58:26.345620917
-0400
-@@ -74,7 +74,7 @@ typedef struct {
- } MenuPathRootItem;
-
- static MenuPathRootItem root_items [] = {
-- { APPLICATIONS_MENU, "applications", "applications.menu" },
-+ { APPLICATIONS_MENU, "applications", "gnome-applications.menu" },
- { GNOMECC_MENU, "gnomecc", "gnomecc.menu" }
- };
-
-diff -up gnome-panel-3.1.5/gnome-panel/panel-run-dialog.c.menus
gnome-panel-3.1.5/gnome-panel/panel-run-dialog.c
---- gnome-panel-3.1.5/gnome-panel/panel-run-dialog.c.menus 2011-08-01 13:39:56.000000000
-0400
-+++ gnome-panel-3.1.5/gnome-panel/panel-run-dialog.c 2011-08-17 18:59:14.635653222 -0400
-@@ -781,7 +781,7 @@ get_all_applications (void)
- GMenuTreeDirectory *root;
- GSList *retval;
-
-- tree = gmenu_tree_new ("applications.menu",
GMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
-+ tree = gmenu_tree_new ("gnome-applications.menu",
GMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
-
- if (!gmenu_tree_load_sync (tree, NULL))
- return NULL;
diff --git a/gnome-panel-vendor.patch b/gnome-panel-vendor.patch
deleted file mode 100644
index e52a18a..0000000
--- a/gnome-panel-vendor.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -up gnome-panel-2.27.91/gnome-panel/panel-menu-items.c.vendor
gnome-panel-2.27.91/gnome-panel/panel-menu-items.c
---- gnome-panel-2.27.91/gnome-panel/panel-menu-items.c.vendor 2009-08-19
15:59:57.000000000 -0400
-+++ gnome-panel-2.27.91/gnome-panel/panel-menu-items.c 2009-08-25 11:32:39.980266025
-0400
-@@ -1038,7 +1038,7 @@ panel_place_menu_item_create_menu (Panel
- COMPUTER_NAME_KEY,
- NULL);
- panel_menu_items_append_from_desktop (places_menu,
-- "nautilus-computer.desktop",
-+ "gnome-nautilus-computer.desktop",
- gconf_name,
- TRUE);
- if (gconf_name)
-@@ -1048,7 +1048,7 @@ panel_place_menu_item_create_menu (Panel
- add_menu_separator (places_menu);
-
- panel_menu_items_append_from_desktop (places_menu,
-- "network-scheme.desktop",
-+ "gnome-network-scheme.desktop",
- NULL,
- TRUE);
- panel_place_menu_item_append_remote_gio (place_item, places_menu);
-@@ -1157,7 +1157,7 @@ panel_desktop_menu_item_append_menu (Gtk
- if (add_separator)
- add_menu_separator (menu);
-
-- panel_menu_items_append_from_desktop (menu, "yelp.desktop", NULL, FALSE);
-+ panel_menu_items_append_from_desktop (menu, "gnome-yelp.desktop", NULL,
FALSE);
- panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL,
FALSE);
-
- if (parent->priv->append_lock_logout)
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 380feee..987e97b 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -1,259 +1,223 @@
-%define gettext_package gnome-panel-2.0
-
-%define gnome_desktop_version 2.91.6
-%define glib2_version 2.31.14
-%define gtk3_version 3.3.8
-%define libwnck_version 2.91.6
-%define gnome_menus_version 3.1.4
-%define evolution_data_server_version 3.5.3
-%define cairo_version 1.0.0
-%define dbus_version 1.1.2
-%define dbus_glib_version 0.80
-%define gnome_doc_utils_version 0.3.2
-%define libgweather_version 3.5.1
-
-%define use_evolution_data_server 1
-
-Summary: GNOME panel
-Name: gnome-panel
-Version: 3.6.2
-Release: 6%{?dist}
-URL:
http://www.gnome.org
-#VCS:
git:git://git.gnome.org/gnome-panel
-Source0:
http://download.gnome.org/sources/gnome-panel/3.6/%{name}-%{version}.tar.xz
-
-#
https://bugzilla.gnome.org/show_bug.cgi?id=646749
-Patch0: Use-16px-menu-icons.patch
-
-#
https://bugzilla.redhat.com/show_bug.cgi?id=685142
-Patch1: gnome-panel-use-gnome-menus.patch
-
-#
https://bugzilla.redhat.com/show_bug.cgi?id=890219
-Patch2: drop-gweather-xml-include.patch
-
-#
https://bugzilla.gnome.org/show_bug.cgi?id=690353
-Patch3: na-style-realize.patch
-
-License: GPLv2+ and LGPLv2+ and GFDL
-Group: User Interface/Desktops
-
-Requires: gnome-desktop3 >= %{gnome_desktop_version}
-Requires: libwnck3 >= %{libwnck_version}
-Requires: gnome-menus >= %{gnome_menus_version}
+# LTO
+%global optflags %{optflags} -flto
+%global build_ldflags %{build_ldflags} -flto
+
+%global po_package %{name}-3.0
+
+%global use_evolution_data_server 1
+
+Name: gnome-panel
+Version: 3.34.1
+Release: 4%{?dist}
+Summary: GNOME Flashback panel
+
+License: GPLv2+ and LGPLv2+
+URL:
https://wiki.gnome.org/Projects/GnomePanel
+Source0:
https://download.gnome.org/sources/%{name}/3.34/%{name}-%{version}.tar.xz
+
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: desktop-file-utils
+BuildRequires: gcc
+BuildRequires: gettext-devel
+BuildRequires: gnome-common
+BuildRequires: gtk-doc
+BuildRequires: intltool
+BuildRequires: itstool
+BuildRequires: libxslt
+BuildRequires: yelp-tools
+BuildRequires: pkgconfig(cairo-gobject)
+BuildRequires: pkgconfig(cairo-xlib)
+BuildRequires: pkgconfig(dconf) >= 0.13.4
+BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.26.0
+BuildRequires: pkgconfig(gdm)
+BuildRequires: pkgconfig(glib-2.0) >= 2.45.3
+BuildRequires: pkgconfig(gnome-desktop-3.0) >= 2.91.6
+BuildRequires: pkgconfig(gtk+-3.0) >= 3.22.0
+BuildRequires: pkgconfig(gweather-3.0) >= 3.28.0
+BuildRequires: pkgconfig(libgnome-menu-3.0) >= 3.7.90
+BuildRequires: pkgconfig(libsystemd) >= 230
+BuildRequires: pkgconfig(libwnck-3.0) >= 3.4.6
+BuildRequires: pkgconfig(pango) >= 1.15.4
+BuildRequires: pkgconfig(polkit-gobject-1)
+BuildRequires: pkgconfig(x11)
+BuildRequires: pkgconfig(xi)
+BuildRequires: pkgconfig(xrandr) >= 1.3.0
%if %{use_evolution_data_server}
-Requires: evolution-data-server >= %{evolution_data_server_version}
+BuildRequires: pkgconfig(libecal-2.0) >= 3.33.2
+BuildRequires: pkgconfig(libedataserver-1.2) >= 3.33.2
%endif
-Requires: gnome-session-xsession
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-
-Requires(post): hicolor-icon-theme
-Requires(post): GConf2
-Requires(pre): GConf2
-Requires(preun): GConf2
-
-BuildRequires: libxml2-python
-BuildRequires: intltool
-BuildRequires: gettext
-BuildRequires: automake
-BuildRequires: autoconf
-BuildRequires: libtool
-BuildRequires: GConf2-devel
-BuildRequires: gtk3-devel >= %{gtk3_version}
-BuildRequires: itstool
-BuildRequires: libxslt
-BuildRequires: libX11-devel
-BuildRequires: libXt-devel
-BuildRequires: pkgconfig(gnome-desktop-3.0) >= %{gnome_desktop_version}
-BuildRequires: pkgconfig(libwnck-3.0) >= %{libwnck_version}
-BuildRequires: dconf-devel
-BuildRequires: gnome-menus-devel >= %{gnome_menus_version}
-BuildRequires: cairo-devel >= %{cairo_version}
-BuildRequires: yelp-tools
-BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
-BuildRequires: gtk-doc
-BuildRequires: pango-devel
-BuildRequires: libXau-devel
-BuildRequires: libXrandr-devel
+
+Requires: gnome-desktop3
+Requires: gnome-menus >= 3.7.90
%if %{use_evolution_data_server}
-BuildRequires: evolution-data-server-devel >= %{evolution_data_server_version}
-BuildRequires: dbus-devel >= %{dbus_version}
+Requires: evolution-data-server >= 3.33.2
%endif
-BuildRequires: polkit-devel >= 0.92
-BuildRequires: libgweather-devel >= %{libgweather_version}
-BuildRequires: librsvg2-devel
-BuildRequires: NetworkManager-devel
-BuildRequires: intltool
-BuildRequires: gettext-devel
-BuildRequires: libtool
-BuildRequires: libcanberra-devel
-BuildRequires: desktop-file-utils
-BuildRequires: gobject-introspection-devel
-BuildRequires: gnome-common
-
-Obsoletes: gdm-user-switch-applet < 1:2.91.6
-Conflicts: gnome-power-manager < 2.15.3
-
-Obsoletes: libgail-gnome < 1.20.4
-
-# Obsolete all old applet packages; this is the output of
-# repoquery --whatrequires libpanel-applet-2.so.0 gnome-python2-applet
-# as of Fedora 15 20110428, as well as ones from Fedora 14.
-Obsoletes: deskbar-applet <= 0:2.32.0-5
-Obsoletes: deskbar-applet-devel <= 0:2.32.0-5
-Obsoletes: file-browser-applet <= 0:0.6.6-2
-Obsoletes: glunarclock <= 0:0.34.1-2
-Obsoletes: gnome-applet-bubblemon <= 0:2.0.15-2
-Obsoletes: gnome-applet-cpufire <= 0:1.6-4
-Obsoletes: gnome-applet-globalmenu <= 0:0.7.9-2
-Obsoletes: gnome-applet-grandr <= 0:0.4.1-3
-Obsoletes: gnome-applet-jalali-calendar <= 0:1.7.1-3
-Obsoletes: gnome-applet-music <= 0:2.5.1-6
-Obsoletes: gnome-applet-sensors <= 0:2.2.7-5
-Obsoletes: gnome-applet-sensors-devel <= 0:2.2.7-5
-Obsoletes: gnome-applet-timer <= 0:2.1.4-3
-Obsoletes: gnome-applet-window-picker <= 0:0.5.8-3
-Obsoletes: gnome-applets <= 1:2.32.0-5
-Obsoletes: gnome-netstatus <= 0:2.28.2-2
-Obsoletes: gnome-python2-applet <= 0:2.32.0-2
-Obsoletes: gnome-schedule <= 0:2.0.2-7
-Obsoletes: gnubiff <= 0:2.2.13-5
-Obsoletes: hamster-applet <= 0:2.32.0-5
-Obsoletes: lock-keys-applet <= 0:1.0-22
-Obsoletes: uim-gnome <= 0:1.6.1-2
-Obsoletes: x-tile <= 0:1.8.6-2
-# Other ones that were already retired from Fedora 15
-Obsoletes: gnome-applet-netspeed <= 0.16-6
-Obsoletes: contact-lookup-applet <= 0.17-7
-
-# Also obsolete the now-dead libpanelappletmm
-Obsoletes: libpanelappletmm <= 0:2.26.0-3
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: hicolor-icon-theme
+
+Suggests: %{name}-doc
%description
-The GNOME panel provides the window list, workspace switcher, menus, and other
-features for the GNOME desktop.
+Gnome Panel is a component that is part of GnomeFlashback and provides panels
+and default applets for the desktop. A panel is a horizontal or vertical bar
+that can be added to each side of the screen. By default there is one panel on
+the top of the screen and one on the bottom, but this is configurable. The
+panels are used to add applets such as a menu bar to open applications, a clock
+and indicator applets which provide access to configure features of the system
+such as the network, sound or the current keyboard layout. On the bottom panel
+there is usually a list of open applications.
-%package libs
-Summary: Libraries for Panel Applets
-License: LGPLv2+
-Group: Development/Libraries
-%description libs
-This package contains the libpanel-applet library that
-is needed by Panel Applets.
+# libs package
+%package libs
+Summary: Libraries for %{name}
+License: LGPLv2+
-%package devel
-Summary: Headers and libraries for Panel Applet development
-License: LGPLv2+
-Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
+%description libs
+Libraries for %{name}.
-%description devel
-Panel Applet development package. Contains files needed for developing
-Panel Applets using the libpanel-applet library.
-%prep
-%setup -q -n %{name}-%{version}
-%patch0 -p1 -b .16px
-%patch1 -p1 -b .menus
-%patch2 -p0 -b .gweather
-%patch3 -p1 -b .na-style
+# devel package
+%package devel
+Summary: Devel files for %{name}
+
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+
+%description devel
+Devel files for %{name}.
+
+# doc package
+%package doc
+Summary: Docs for %{name}
+BuildArch: noarch
+
+%description doc
+Docs for %{name}.
+
+
+%prep
+%autosetup -p1
rm -f libtool
-autoreconf -i -f
+autoreconf -fiv
+
+
%build
-%configure \
- --disable-gtk-doc \
+# LTO
+export AR=%{_bindir}/gcc-ar
+export RANLIB=%{_bindir}/gcc-ranlib
+export NM=%{_bindir}/gcc-nm
+
+%configure \
+ --enable-gtk-doc \
%if %{use_evolution_data_server}
- --enable-eds=yes
+ --enable-eds=yes
%else
- --enable-eds=no
+ --enable-eds=no
%endif
-
-make %{?_smp_mflags} V=1
-
-
-# truncate NEWS
-awk '/^========/ { seen+=1 }
-{ if (seen < 3) print }
-{ if (seen == 3) { print "For older news, see
http://git.gnome.org/cgit/gnome-panel/plain/NEWS"; exit } }' NEWS > tmp; mv
tmp NEWS
+%make_build
%install
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make DESTDIR=$RPM_BUILD_ROOT install
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-
-rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
-find $RPM_BUILD_ROOT -name '*.*a' -delete;
-
-desktop-file-install --delete-original \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- $RPM_BUILD_ROOT%{_datadir}/applications/gnome-panel.desktop
-
-%find_lang %{gettext_package} --all-name --with-gnome
-
-%post
-touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
-
-%postun
-if [ $1 -eq 0 ]; then
- touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
- gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null || :
- glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
-fi
-
-%posttrans
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null || :
-glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
-
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
-
-%files -f %{gettext_package}.lang
-%doc AUTHORS COPYING COPYING.LIB COPYING-DOCS NEWS README
-%{_datadir}/icons/hicolor/16x16/apps/*
-%{_datadir}/icons/hicolor/22x22/apps/*
-%{_datadir}/icons/hicolor/24x24/apps/*
-%{_datadir}/icons/hicolor/32x32/apps/*
-%{_datadir}/icons/hicolor/48x48/apps/*
-%{_datadir}/icons/hicolor/scalable/apps/*
-%{_datadir}/gnome-panel
+%make_install
+rm -rf %{buildroot}/var/scrollkeeper
+find %{buildroot} -name '*.la' -delete;
+%find_lang %{po_package} --all-name
+
+
+%check
+# Disable temporary
+# *
https://gitlab.freedesktop.org/xdg/desktop-file-utils/-/merge_requests/2
+# *
https://gitlab.freedesktop.org/xdg/xdg-specs/-/merge_requests/5
+%dnl desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
+
+
+%files -f %{po_package}.lang
+%license COPYING COPYING.LIB COPYING-DOCS
+%doc AUTHORS NEWS README
+%{_bindir}/%{name}
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/glib-2.0/schemas/org.gnome.%{name}.*.xml
+%{_datadir}/%{name}/
+%{_datadir}/icons/hicolor/*/apps/*.png
+%{_datadir}/icons/hicolor/scalable/apps/*.svg
%{_datadir}/man/man*/*
-%{_datadir}/applications/gnome-panel.desktop
-%{_bindir}/gnome-panel
-%{_bindir}/gnome-desktop-item-edit
-%{_libexecdir}/*
-
-%{_datadir}/dbus-1/services/org.gnome.panel.applet.ClockAppletFactory.service
-%{_datadir}/dbus-1/services/org.gnome.panel.applet.FishAppletFactory.service
-%{_datadir}/dbus-1/services/org.gnome.panel.applet.NotificationAreaAppletFactory.service
-%{_datadir}/dbus-1/services/org.gnome.panel.applet.WnckletFactory.service
-
-%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.applet.fish.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.applet.window-list.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.applet.workspace-switcher.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.enums.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.launcher.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.menu-button.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.object.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.toplevel.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.applet.clock.gschema.xml
+%{_libdir}/%{name}/
%files libs
-%{_libdir}/*.so.*
-%{_libdir}/girepository-1.0/PanelApplet-4.0.typelib
+%{_libdir}/libpanel-applet.so.3*
%files devel
-%{_bindir}/panel-test-applets
-%{_includedir}/gnome-panel-4.0
-%{_libdir}/pkgconfig/*
-%{_libdir}/*.so
-%{_datadir}/gtk-doc
-%{_datadir}/gir-1.0/PanelApplet-4.0.gir
+%{_datadir}/gtk-doc/
+%{_includedir}/%{name}/
+%{_libdir}/libpanel-applet.so
+%{_libdir}/pkgconfig/libpanel-applet.pc
+
+%files doc
+%{_datadir}/help/
+
%changelog
+* Sun Feb 23 2020 Artem Polishchuk <ego.cordatus(a)gmail.com> - 3.34.1-4
+- Spec file improvements
+- Drop obsolete macroses
+- Enable LTO
+
+* Thu Dec 26 2019 Yaakov Selkowitz <yselkowi(a)redhat.com> - 3.34.1-1
+- new version
+
+* Sun May 05 2019 Yaakov Selkowitz <yselkowi(a)redhat.com> - 3.32.0-1
+- new version
+
+* Mon Nov 12 2018 Yaakov Selkowitz <yselkowi(a)redhat.com> - 3.30.0-1
+- new version
+
+* Tue Mar 13 2018 Yaakov Selkowitz <yselkowi(a)redhat.com> - 3.28.0-1
+- new version
+
+* Mon Nov 13 2017 Yaakov Selkowitz <yselkowi(a)redhat.com> - 3.26.0-1
+- new version
+
+* Tue Mar 28 2017 Yaakov Selkowitz <yselkowi(a)redhat.com> - 3.24.1-1
+- new version
+
+* Sun Mar 26 2017 Yaakov Selkowitz <yselkowi(a)redhat.com> - 3.24.0-1
+- new version
+
+* Sun Mar 26 2017 Yaakov Selkowitz <yselkowi(a)redhat.com> - 3.22.0-1
+- new version
+
+* Mon Sep 12 2016 Yaakov Selkowitz <yselkowi(a)redhat.com> - 3.20.1-1
+- new version
+
+* Mon Apr 18 2016 Yaakov Selkowitz <yselkowi(a)redhat.com> - 3.20.0-1
+- Version bump for GNOME Flashback 3.20.
+
+* Thu Apr 14 2016 Yaakov Selkowitz <yselkowi(a)redhat.com> - 3.18.2-1
+- new version
+
+* Sun Dec 27 2015 Yaakov Selkowitz <yselkowi(a)redhat.com> - 3.18.1-2
+- Drop gnome-shell-specific gnome-session-xsession dependency
+
+* Tue Oct 13 2015 Yaakov Selkowitz <yselkowi(a)redhat.com> - 3.18.1-1
+- Update to 3.18.1
+
+* Fri Oct 02 2015 Yaakov Selkowitz <yselkowi(a)redhat.com> - 3.18.0-1
+- Version bump for GNOME Flashback 3.18.
+
+* Wed Jul 15 2015 Yaakov Selkowitz <yselkowi(a)redhat.com> - 3.17.2-1
+- Unstable version bump
+
+* Wed Jul 15 2015 Yaakov Selkowitz <yselkowi(a)redhat.com> - 3.16.1-1
+- Version bump for GNOME Flashback 3.16.
+
+* Wed Feb 04 2015 Yaakov Selkowitz <yselkowi(a)redhat.com> - 3.14.0-1
+- Version bump for GNOME Flashback 3.14.
+
+* Sun Jan 11 2015 Yaakov Selkowitz <yselkowi(a)redhat.com> - 3.8.1-1
+- Version bump for GNOME Flashback 3.10.
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
3.6.2-6
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
@@ -1841,5 +1805,3 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null
|| :
* Tue Apr 16 2002 Havoc Pennington <hp(a)redhat.com>
- Initial build.
-
-
diff --git a/icon-padding.patch b/icon-padding.patch
deleted file mode 100644
index 5ccf4c0..0000000
--- a/icon-padding.patch
+++ /dev/null
@@ -1,255 +0,0 @@
-diff -u -r gnome-panel-2.28.0/applets/notification_area/main.c
hacked/applets/notification_area/main.c
---- gnome-panel-2.28.0/applets/notification_area/main.c 2009-07-01 09:06:23.000000000
-0400
-+++ hacked/applets/notification_area/main.c 2009-10-17 23:06:01.001313433 -0400
-@@ -25,6 +25,7 @@
-
- #include <panel-applet.h>
- #include <panel-applet-gconf.h>
-+#include <gconf/gconf-client.h>
-
- #include <glib/gi18n.h>
- #include <gtk/gtk.h>
-@@ -34,6 +35,7 @@
- #include "fixedtip.h"
-
- #define NOTIFICATION_AREA_ICON "gnome-panel-notification-area"
-+#define SCHEMA_DIR "/schemas/apps/notification_area_applet/prefs"
-
- typedef struct
- {
-@@ -231,6 +233,39 @@
- gtk_widget_set_name (widget, "na-tray");
- }
-
-+static void
-+padding_changed (GConfClient *client,
-+ guint cnxn_id,
-+ GConfEntry *entry,
-+ gpointer user_data)
-+{
-+ AppletData *data = user_data;
-+ gint value;
-+
-+ if (!entry->value || entry->value->type != GCONF_VALUE_INT)
-+ return;
-+
-+ value = gconf_value_get_int (entry->value);
-+
-+ na_tray_set_padding (data->tray, value);
-+}
-+
-+static void
-+setup_gconf (AppletData *data)
-+{
-+ GConfClient *client;
-+ char *key;
-+ int value;
-+
-+ client = gconf_client_get_default ();
-+ key = panel_applet_gconf_get_full_key (data->applet, "padding");
-+ value = gconf_client_get_int (client, key, NULL);
-+ na_tray_set_padding (data->tray, value);
-+ gconf_client_notify_add (client, key, padding_changed, data, NULL, NULL);
-+ g_free (key);
-+ g_object_unref (client);
-+}
-+
- static gboolean
- applet_factory (PanelApplet *applet,
- const gchar *iid,
-@@ -260,9 +295,10 @@
- atko = gtk_widget_get_accessible (GTK_WIDGET (applet));
- atk_object_set_name (atko, _("Panel Notification Area"));
-
-+ panel_applet_add_preferences (applet, SCHEMA_DIR, NULL);
- panel_applet_set_flags (applet,
- PANEL_APPLET_HAS_HANDLE|PANEL_APPLET_EXPAND_MINOR);
--
-+
- g_signal_connect (applet, "change_orient",
- G_CALLBACK (applet_change_orientation), data);
- g_signal_connect (applet, "change_background",
-@@ -270,6 +306,8 @@
- g_signal_connect (applet, "destroy",
- G_CALLBACK (applet_destroy), data);
-
-+ setup_gconf (data);
-+
- panel_applet_set_background_widget (applet, GTK_WIDGET (applet));
-
- gtk_container_add (GTK_CONTAINER (applet), GTK_WIDGET (tray));
-diff -u -r gnome-panel-2.28.0/applets/notification_area/Makefile.am
hacked/applets/notification_area/Makefile.am
---- gnome-panel-2.28.0/applets/notification_area/Makefile.am 2009-07-21
13:25:43.000000000 -0400
-+++ hacked/applets/notification_area/Makefile.am 2009-10-17 23:16:42.401072682 -0400
-@@ -66,6 +66,24 @@
-
- @INTLTOOL_SERVER_RULE@
-
-+schemasdir = $(GCONF_SCHEMA_FILE_DIR)
-+schemas_in_files = notification_area_applet.schemas.in
-+schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
-+
-+@INTLTOOL_SCHEMAS_RULE@
-+
-+if GCONF_SCHEMAS_INSTALL
-+# don't do this if we are building in eg. rpm
-+install-data-local:
-+ if test -z "$(DESTDIR)" ; then \
-+ for p in $(schemas_DATA) ; do \
-+ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL)
--makefile-install-rule $(top_builddir)/applets/notification_area/$$p ; \
-+ done \
-+ fi
-+else
-+install-data-local:
-+endif
-+
- uidir = $(datadir)/gnome-2.0/ui
- ui_DATA = GNOME_NotificationAreaApplet.xml
-
-diff -u -r gnome-panel-2.28.0/applets/notification_area/na-tray.c
hacked/applets/notification_area/na-tray.c
---- gnome-panel-2.28.0/applets/notification_area/na-tray.c 2009-10-17 23:22:01.095308064
-0400
-+++ hacked/applets/notification_area/na-tray.c 2009-10-17 23:00:01.304062848 -0400
-@@ -602,6 +602,8 @@
- {
- trays_screens [screen_number].tray_manager = tray_manager;
-
-+ na_tray_manager_set_padding (tray_manager, 0);
-+
- g_signal_connect (tray_manager, "tray_icon_added",
- G_CALLBACK (tray_added),
- &trays_screens [screen_number]);
-@@ -804,6 +806,16 @@
- }
-
- void
-+na_tray_set_padding (NaTray *tray,
-+ gint padding)
-+{
-+ NaTrayPrivate *priv = tray->priv;
-+
-+ if (get_tray (priv->trays_screen) == tray)
-+ na_tray_manager_set_padding (priv->trays_screen->tray_manager, padding);
-+}
-+
-+void
- na_tray_force_redraw (NaTray *tray)
- {
- NaTrayPrivate *priv = tray->priv;
-diff -u -r gnome-panel-2.28.0/applets/notification_area/na-tray.h
hacked/applets/notification_area/na-tray.h
---- gnome-panel-2.28.0/applets/notification_area/na-tray.h 2009-04-19 13:45:09.000000000
-0400
-+++ hacked/applets/notification_area/na-tray.h 2009-10-17 23:00:30.491375187 -0400
-@@ -60,6 +60,8 @@
- void na_tray_set_orientation (NaTray *tray,
- GtkOrientation orientation);
- GtkOrientation na_tray_get_orientation (NaTray *tray);
-+void na_tray_set_padding (NaTray *tray,
-+ gint padding);
- void na_tray_force_redraw (NaTray *tray);
-
- G_END_DECLS
-diff -u -r gnome-panel-2.28.0/applets/notification_area/na-tray-manager.c
hacked/applets/notification_area/na-tray-manager.c
---- gnome-panel-2.28.0/applets/notification_area/na-tray-manager.c 2009-07-27
08:01:39.000000000 -0400
-+++ hacked/applets/notification_area/na-tray-manager.c 2009-10-17 21:55:00.582062966
-0400
-@@ -653,6 +653,32 @@
- #endif
- }
-
-+static void
-+na_tray_manager_set_padding_property (NaTrayManager *manager)
-+{
-+#ifdef GDK_WINDOWING_X11
-+ GdkDisplay *display;
-+ Atom orientation_atom;
-+ gulong data[1];
-+
-+ if (!manager->invisible || !manager->invisible->window)
-+ return;
-+
-+ display = gtk_widget_get_display (manager->invisible);
-+ orientation_atom = gdk_x11_get_xatom_by_name_for_display (display,
-+
"_NET_SYSTEM_TRAY_PADDING");
-+
-+ data[0] = manager->padding;
-+
-+ XChangeProperty (GDK_DISPLAY_XDISPLAY (display),
-+ GDK_WINDOW_XWINDOW (manager->invisible->window),
-+ orientation_atom,
-+ XA_CARDINAL, 32,
-+ PropModeReplace,
-+ (guchar *) &data, 1);
-+#endif
-+}
-+
- #ifdef GDK_WINDOWING_X11
-
- static gboolean
-@@ -697,6 +723,7 @@
-
- na_tray_manager_set_orientation_property (manager);
- na_tray_manager_set_visual_property (manager);
-+ na_tray_manager_set_padding_property (manager);
-
- timestamp = gdk_x11_get_server_time (invisible->window);
-
-@@ -836,6 +863,20 @@
- }
- }
-
-+void
-+na_tray_manager_set_padding (NaTrayManager *manager,
-+ gint padding)
-+{
-+ g_return_if_fail (NA_IS_TRAY_MANAGER (manager));
-+
-+ if (manager->padding != padding)
-+ {
-+ manager->padding = padding;
-+
-+ na_tray_manager_set_padding_property (manager);
-+ }
-+}
-+
- GtkOrientation
- na_tray_manager_get_orientation (NaTrayManager *manager)
- {
-diff -u -r gnome-panel-2.28.0/applets/notification_area/na-tray-manager.h
hacked/applets/notification_area/na-tray-manager.h
---- gnome-panel-2.28.0/applets/notification_area/na-tray-manager.h 2009-04-19
13:45:09.000000000 -0400
-+++ hacked/applets/notification_area/na-tray-manager.h 2009-10-17 21:55:42.646312700
-0400
-@@ -55,6 +55,7 @@
- GtkWidget *invisible;
- GdkScreen *screen;
- GtkOrientation orientation;
-+ gint padding;
-
- GList *messages;
- GHashTable *socket_table;
-@@ -91,6 +92,8 @@
- void na_tray_manager_set_orientation (NaTrayManager *manager,
- GtkOrientation orientation);
- GtkOrientation na_tray_manager_get_orientation (NaTrayManager *manager);
-+void na_tray_manager_set_padding (NaTrayManager *manager,
-+ gint padding);
-
- G_END_DECLS
-
-diff -u -r
gnome-panel-2.28.0/applets/notification_area/notification_area_applet.schemas.in
hacked/applets/notification_area/notification_area_applet.schemas.in
----
gnome-panel-2.28.0/applets/notification_area/notification_area_applet.schemas.in 2009-10-17
23:23:41.071058057 -0400
-+++ hacked/applets/notification_area/notification_area_applet.schemas.in 2009-10-17
23:21:38.588316399 -0400
-@@ -0,0 +1,17 @@
-+<?xml version="1.0"?>
-+<gconfschemafile>
-+ <schemalist>
-+ <schema>
-+ <key>/schemas/apps/notification_area_applet/prefs/padding</key>
-+ <owner>notification-area-applet</owner>
-+ <type>int</type>
-+ <default>3</default>
-+ <locale name="C">
-+ <short>Padding</short>
-+ <long>
-+ This key specifies padding to be put around status icons.
-+ </long>
-+ </locale>
-+ </schema>
-+ </schemalist>
-+</gconfschemafile>
diff --git a/launcher-desktop-files.patch b/launcher-desktop-files.patch
deleted file mode 100644
index ab2d715..0000000
--- a/launcher-desktop-files.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff -up gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c.launcher-desktop-files
gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c
----
gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c.launcher-desktop-files 2010-01-13
22:26:27.000000000 -0500
-+++ gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c 2010-01-17 18:05:34.492279538
-0500
-@@ -960,6 +960,51 @@ panel_ditem_editor_icon_changed (PanelDI
- icon);
- }
-
-+static gboolean
-+update_editor_from_desktop_file (PanelDItemEditor *dialog,
-+ const gchar *uri)
-+{
-+ GKeyFile *key_file;
-+ char *name;
-+ char *comment;
-+ char *exec;
-+ char *icon;
-+ gboolean retval = FALSE;
-+
-+ key_file = g_key_file_new ();
-+ if (g_key_file_load_from_file (key_file, uri, 0, NULL)) {
-+ if (panel_key_file_get_boolean (key_file, "Terminal", FALSE))
-+ gtk_combo_box_set_active (GTK_COMBO_BOX
(dialog->priv->type_combo), 1);
-+ else
-+ gtk_combo_box_set_active (GTK_COMBO_BOX
(dialog->priv->type_combo), 0);
-+
-+ name = panel_key_file_get_locale_string (key_file, "Name");
-+ comment = panel_key_file_get_locale_string (key_file,
"Comment");
-+ icon = panel_key_file_get_locale_string (key_file, "Icon");
-+ exec = panel_key_file_get_string (key_file, "Exec");
-+
-+ gtk_entry_set_text (GTK_ENTRY (dialog->priv->name_entry), name ?
name : "");
-+ gtk_entry_set_text (GTK_ENTRY (dialog->priv->comment_entry),
comment ? comment : "");
-+ gtk_entry_set_text (GTK_ENTRY (dialog->priv->command_entry), exec ?
exec : "");
-+
-+ /* Note: we need to set the icon last, since the editor
-+ * tries to guess the icon when the command is modified
-+ */
-+ setup_icon_chooser (dialog, icon);
-+
-+ g_free (name);
-+ g_free (comment);
-+ g_free (icon);
-+ g_free (exec);
-+
-+ retval = TRUE;
-+ }
-+
-+ g_key_file_free (key_file);
-+
-+ return retval;
-+}
-+
- static void
- command_browse_chooser_response (GtkFileChooser *chooser,
- gint response_id,
-@@ -973,7 +1018,11 @@ command_browse_chooser_response (GtkFile
- case PANEL_DITEM_EDITOR_TYPE_APPLICATION:
- case PANEL_DITEM_EDITOR_TYPE_TERMINAL_APPLICATION:
- text = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (chooser));
-- uri = panel_util_make_exec_uri_for_desktop (text);
-+ if (g_str_has_suffix (text, ".desktop") &&
-+ update_editor_from_desktop_file (dialog, text))
-+ uri = NULL;
-+ else
-+ uri = panel_util_make_exec_uri_for_desktop (text);
- g_free (text);
- break;
- case PANEL_DITEM_EDITOR_TYPE_LINK:
-@@ -983,8 +1032,9 @@ command_browse_chooser_response (GtkFile
- g_assert_not_reached ();
- }
-
-- gtk_entry_set_text (GTK_ENTRY (dialog->priv->command_entry),
-- uri);
-+ if (uri)
-+ gtk_entry_set_text (GTK_ENTRY (dialog->priv->command_entry),
-+ uri);
- g_free (uri);
- }
-
diff --git a/na-style-realize.patch b/na-style-realize.patch
deleted file mode 100644
index fb7bd40..0000000
--- a/na-style-realize.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From f1652b60a9fa0580c5fc60758c3ccdfcf691b5c2 Mon Sep 17 00:00:00 2001
-From: Daniel Drake <dsd(a)laptop.org>
-Date: Mon, 17 Dec 2012 14:58:20 +0000
-Subject: [PATCH] na: apply style after realize
-
-Under Fedora 18 (GTK-3.6.2), notification icons such as the battery/power
-icon from gnome-settings-daemon are appearing all-black on top of a black
-background.
-
-This is because style_updated is being called before the tray applet
-is realized, meaning that the following code in
-na_tray_applet_style_updated() causes a bail-out:
-
- if (!applet->priv->tray)
- return;
-
-and the style is never applied.
-
-Fix this by updating the style explicitly after realizing the widget.
----
- applets/notification_area/main.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/applets/notification_area/main.c b/applets/notification_area/main.c
-index 5fc4d1d..0d5de70 100644
---- a/applets/notification_area/main.c
-+++ b/applets/notification_area/main.c
-@@ -36,6 +36,8 @@
-
- #define NOTIFICATION_AREA_ICON "gnome-panel-notification-area"
-
-+static void na_tray_applet_style_updated (GtkWidget *widget);
-+
- struct _NaTrayAppletPrivate
- {
- NaTray *tray;
-@@ -79,6 +81,7 @@ na_tray_applet_realize (GtkWidget *widget)
-
- gtk_container_add (GTK_CONTAINER (widget), GTK_WIDGET (applet->priv->tray));
- gtk_widget_show (GTK_WIDGET (applet->priv->tray));
-+ na_tray_applet_style_updated (widget);
- }
-
- static void
---
-1.8.0.1
-
diff --git a/panel-padding.patch b/panel-padding.patch
deleted file mode 100644
index 90dad4b..0000000
--- a/panel-padding.patch
+++ /dev/null
@@ -1,343 +0,0 @@
-diff -up gnome-panel-2.28.0/gnome-panel/panel-profile.c.panel-padding
gnome-panel-2.28.0/gnome-panel/panel-profile.c
---- gnome-panel-2.28.0/gnome-panel/panel-profile.c.panel-padding 2009-09-21
12:29:33.000000000 -0400
-+++ gnome-panel-2.28.0/gnome-panel/panel-profile.c 2009-10-29 09:57:25.285484907 -0400
-@@ -638,6 +638,7 @@ TOPLEVEL_IS_WRITABLE_FUNC ("orientation"
-
- TOPLEVEL_GET_SET_FUNCS ("size", toplevel, int, size,
int)
- TOPLEVEL_GET_SET_FUNCS ("expand", toplevel, bool, expand,
gboolean)
-+TOPLEVEL_GET_SET_FUNCS ("padding", toplevel, int, padding,
int)
- TOPLEVEL_GET_SET_FUNCS ("auto_hide", toplevel, bool, auto_hide,
gboolean)
- TOPLEVEL_GET_SET_FUNCS ("enable_buttons", toplevel, bool,
enable_buttons, gboolean)
- TOPLEVEL_GET_SET_FUNCS ("enable_arrows", toplevel, bool, enable_arrows,
gboolean)
-@@ -1185,6 +1186,7 @@ panel_profile_toplevel_change_notify (GC
- else UPDATE_INT ("monitor", monitor)
- else UPDATE_STRING ("name", name)
- else UPDATE_BOOL ("expand", expand)
-+ else UPDATE_INT ("padding", padding)
- else UPDATE_STRING ("orientation", orientation)
- else UPDATE_INT ("size", size)
- else UPDATE_POS ("x", x, x_right)
-@@ -1706,6 +1708,7 @@ panel_profile_load_toplevel (GConfClient
- GET_STRING ("name", name);
- GET_INT ("monitor", monitor);
- GET_BOOL ("expand", expand);
-+ GET_INT ("padding", padding);
- GET_STRING ("orientation", orientation);
- GET_INT ("size", size);
- GET_BOOL ("auto_hide", auto_hide);
-diff -up gnome-panel-2.28.0/gnome-panel/panel-profile.h.panel-padding
gnome-panel-2.28.0/gnome-panel/panel-profile.h
---- gnome-panel-2.28.0/gnome-panel/panel-profile.h.panel-padding 2009-04-19
13:45:09.000000000 -0400
-+++ gnome-panel-2.28.0/gnome-panel/panel-profile.h 2009-10-29 09:57:25.285484907 -0400
-@@ -92,7 +92,10 @@ void panel_profile_set_toplevel_e
- gboolean expand);
- gboolean panel_profile_get_toplevel_expand (PanelToplevel *toplevel);
- gboolean panel_profile_is_writable_toplevel_expand (PanelToplevel *toplevel);
--
-+void panel_profile_set_toplevel_padding (PanelToplevel *toplevel,
-+ int padding);
-+int panel_profile_get_toplevel_padding (PanelToplevel *padding);
-+gboolean panel_profile_is_writable_toplevel_padding (PanelToplevel *toplevel);
- void panel_profile_set_toplevel_auto_hide (PanelToplevel *toplevel,
- gboolean auto_hide);
- gboolean panel_profile_get_toplevel_auto_hide (PanelToplevel *toplevel);
-diff -up gnome-panel-2.28.0/gnome-panel/panel-toplevel.c.panel-padding
gnome-panel-2.28.0/gnome-panel/panel-toplevel.c
---- gnome-panel-2.28.0/gnome-panel/panel-toplevel.c.panel-padding 2009-08-21
06:31:49.000000000 -0400
-+++ gnome-panel-2.28.0/gnome-panel/panel-toplevel.c 2009-10-29 09:57:25.287500667 -0400
-@@ -79,6 +79,7 @@ struct _PanelToplevelPrivate {
- gboolean expand;
- PanelOrientation orientation;
- int size;
-+ int padding;
-
- /* relative to the monitor origin */
- int x;
-@@ -213,6 +214,7 @@ enum {
- PROP_0,
- PROP_NAME,
- PROP_EXPAND,
-+ PROP_PADDING,
- PROP_ORIENTATION,
- PROP_SIZE,
- PROP_X,
-@@ -3862,6 +3864,9 @@ panel_toplevel_set_property (GObject
- case PROP_EXPAND:
- panel_toplevel_set_expand (toplevel, g_value_get_boolean (value));
- break;
-+ case PROP_PADDING:
-+ panel_toplevel_set_padding (toplevel, g_value_get_int (value));
-+ break;
- case PROP_ORIENTATION:
- panel_toplevel_set_orientation (toplevel, g_value_get_enum (value));
- break;
-@@ -3956,6 +3961,9 @@ panel_toplevel_get_property (GObject
- case PROP_EXPAND:
- g_value_set_boolean (value, toplevel->priv->expand);
- break;
-+ case PROP_PADDING:
-+ g_value_set_int (value, toplevel->priv->padding);
-+ break;
- case PROP_ORIENTATION:
- g_value_set_enum (value, toplevel->priv->orientation);
- break;
-@@ -4118,6 +4126,18 @@ panel_toplevel_class_init (PanelToplevel
-
- g_object_class_install_property (
- gobject_class,
-+ PROP_PADDING,
-+ g_param_spec_int (
-+ "padding",
-+ "Padding",
-+ "Padding that is inserted between objects",
-+ 0,
-+ G_MAXINT,
-+ 0,
-+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
-+
-+ g_object_class_install_property (
-+ gobject_class,
- PROP_ORIENTATION,
- g_param_spec_enum (
- "orientation",
-@@ -4698,6 +4718,30 @@ panel_toplevel_get_expand (PanelToplevel
- return toplevel->priv->expand;
- }
-
-+void
-+panel_toplevel_set_padding (PanelToplevel *toplevel,
-+ int padding)
-+{
-+ g_return_if_fail (PANEL_IS_TOPLEVEL (toplevel));
-+
-+ if (toplevel->priv->padding == padding)
-+ return;
-+
-+ toplevel->priv->padding = padding;
-+
-+ gtk_widget_queue_resize (GTK_WIDGET (toplevel));
-+
-+ g_object_notify (G_OBJECT (toplevel), "padding");
-+}
-+
-+int
-+panel_toplevel_get_padding (PanelToplevel *toplevel)
-+{
-+ g_return_val_if_fail (PANEL_IS_TOPLEVEL (toplevel), 0);
-+
-+ return toplevel->priv->padding;
-+}
-+
- gboolean
- panel_toplevel_get_is_floating (PanelToplevel *toplevel)
- {
-diff -up gnome-panel-2.28.0/gnome-panel/panel-toplevel.h.panel-padding
gnome-panel-2.28.0/gnome-panel/panel-toplevel.h
---- gnome-panel-2.28.0/gnome-panel/panel-toplevel.h.panel-padding 2009-08-19
11:28:09.000000000 -0400
-+++ gnome-panel-2.28.0/gnome-panel/panel-toplevel.h 2009-10-29 09:57:25.288484940 -0400
-@@ -83,6 +83,9 @@ G_CONST_RETURN char *panel_toplevel_get_
- void panel_toplevel_set_expand (PanelToplevel
*toplevel,
- gboolean expand);
- gboolean panel_toplevel_get_expand (PanelToplevel
*toplevel);
-+void panel_toplevel_set_padding (PanelToplevel
*toplevel,
-+ int
padding);
-+int panel_toplevel_get_padding (PanelToplevel
*toplevel);
- void panel_toplevel_set_orientation (PanelToplevel
*toplevel,
- PanelOrientation orientation);
- PanelOrientation panel_toplevel_get_orientation (PanelToplevel
*toplevel);
-diff -up gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in.panel-padding
gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in
---- gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in.panel-padding 2009-07-01
09:06:23.000000000 -0400
-+++ gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in 2009-10-29
09:57:25.288484940 -0400
-@@ -103,6 +103,19 @@
- </schema>
-
- <schema>
-+ <key>/schemas/apps/panel/toplevels/padding</key>
-+ <owner>panel</owner>
-+ <type>int</type>
-+ <default>0</default>
-+ <locale name="C">
-+ <short>Padding</short>
-+ <long>
-+ Padding that will be inserted between objects on this panel.
-+ </long>
-+ </locale>
-+ </schema>
-+
-+ <schema>
- <key>/schemas/apps/panel/toplevels/x</key>
- <owner>panel</owner>
- <type>int</type>
-diff -up gnome-panel-2.28.0/gnome-panel/panel-widget.c.panel-padding
gnome-panel-2.28.0/gnome-panel/panel-widget.c
---- gnome-panel-2.28.0/gnome-panel/panel-widget.c.panel-padding 2009-08-11
07:32:38.000000000 -0400
-+++ gnome-panel-2.28.0/gnome-panel/panel-widget.c 2009-10-29 10:10:43.531226534 -0400
-@@ -710,9 +710,12 @@ panel_widget_switch_applet_right (PanelW
- {
- AppletData *ad;
- AppletData *nad = NULL;
--
-+ gint padding;
-+
- g_assert (list != NULL);
-
-+ padding = panel_toplevel_get_padding (panel->toplevel);
-+
- ad = list->data;
- if (ad->constrained + ad->min_cells >= panel->size)
- return;
-@@ -720,8 +723,8 @@ panel_widget_switch_applet_right (PanelW
- if (list->next)
- nad = list->next->data;
-
-- if (!nad || nad->constrained >= ad->constrained + ad->min_cells +
MOVE_INCREMENT) {
-- ad->pos = ad->constrained += MOVE_INCREMENT;
-+ if (!nad || nad->constrained >= ad->constrained + ad->min_cells +
MOVE_INCREMENT + padding) {
-+ ad->pos = ad->constrained += MOVE_INCREMENT + padding;
- gtk_widget_queue_resize (GTK_WIDGET (panel));
- emit_applet_moved (panel, ad);
- return;
-@@ -786,6 +789,9 @@ panel_widget_switch_applet_left (PanelWi
- {
- AppletData *ad;
- AppletData *pad = NULL;
-+ gint padding;
-+
-+ padding = panel_toplevel_get_padding (panel->toplevel);
-
- ad = list->data;
- if (ad->constrained <= 0)
-@@ -794,8 +800,8 @@ panel_widget_switch_applet_left (PanelWi
- if (list->prev)
- pad = list->prev->data;
-
-- if (!pad || pad->constrained + pad->min_cells <= ad->constrained -
MOVE_INCREMENT) {
-- ad->pos = ad->constrained -= MOVE_INCREMENT;
-+ if (!pad || pad->constrained + pad->min_cells <= ad->constrained -
MOVE_INCREMENT - padding) {
-+ ad->pos = ad->constrained -= MOVE_INCREMENT + padding;
- gtk_widget_queue_resize (GTK_WIDGET (panel));
- emit_applet_moved (panel, ad);
- return;
-@@ -874,15 +880,18 @@ panel_widget_get_right_switch_pos (Panel
- {
- AppletData *ad;
- AppletData *nad = NULL;
-+ gint padding;
-
- g_assert (list != NULL);
-
-+ padding = panel_toplevel_get_padding (panel->toplevel);
-+
- ad = list->data;
- if (list->next)
- nad = list->next->data;
-
-- if (!nad || nad->constrained >= ad->constrained + ad->min_cells +
MOVE_INCREMENT)
-- return ad->constrained + MOVE_INCREMENT;
-+ if (!nad || nad->constrained >= ad->constrained + ad->min_cells +
MOVE_INCREMENT + padding)
-+ return ad->constrained + MOVE_INCREMENT + padding;
-
- if (nad->locked)
- return panel_widget_get_right_jump_pos (panel,
-@@ -948,15 +957,18 @@ panel_widget_get_left_switch_pos (PanelW
- {
- AppletData *ad;
- AppletData *pad = NULL;
-+ gint padding;
-
- g_assert (list != NULL);
-
-+ padding = panel_toplevel_get_padding (panel->toplevel);
-+
- ad = list->data;
- if (list->prev)
- pad = list->prev->data;
-
-- if (!pad || pad->constrained + pad->min_cells <= ad->constrained -
MOVE_INCREMENT)
-- return ad->constrained - MOVE_INCREMENT;
-+ if (!pad || pad->constrained + pad->min_cells <= ad->constrained -
MOVE_INCREMENT - padding)
-+ return ad->constrained - MOVE_INCREMENT - padding;
-
- if (pad->locked)
- return panel_widget_get_left_jump_pos (panel,
-@@ -1195,12 +1207,15 @@ panel_widget_size_request(GtkWidget *wid
- GList *list;
- GList *ad_with_hints;
- gboolean dont_fill;
-+ gint padding;
-
- g_return_if_fail(PANEL_IS_WIDGET(widget));
- g_return_if_fail(requisition!=NULL);
-
- panel = PANEL_WIDGET(widget);
-
-+ padding = panel_toplevel_get_padding (panel->toplevel);
-+
- if(panel->orient == GTK_ORIENTATION_HORIZONTAL) {
- requisition->width = 0;
- requisition->height = panel->sz;
-@@ -1224,8 +1239,11 @@ panel_widget_size_request(GtkWidget *wid
- ad_with_hints = g_list_prepend (ad_with_hints,
- ad);
-
-- else if (panel->packed)
-+ else if (panel->packed) {
-+ if (list != panel->applet_list)
-+ requisition->width += padding;
- requisition->width += chreq.width;
-+ }
- } else {
- if (requisition->width < chreq.width && !ad->size_constrained)
- requisition->width = chreq.width;
-@@ -1234,8 +1252,11 @@ panel_widget_size_request(GtkWidget *wid
- ad_with_hints = g_list_prepend (ad_with_hints,
- ad);
-
-- else if (panel->packed)
-+ else if (panel->packed) {
-+ if (list != panel->applet_list)
-+ requisition->height += padding;
- requisition->height += chreq.height;
-+ }
- }
- }
-
-@@ -1333,12 +1354,15 @@ panel_widget_size_allocate(GtkWidget *wi
- int i;
- int old_size;
- gboolean ltr;
-+ gint padding;
-
- g_return_if_fail(PANEL_IS_WIDGET(widget));
- g_return_if_fail(allocation!=NULL);
-
- panel = PANEL_WIDGET(widget);
-
-+ padding = panel_toplevel_get_padding (panel->toplevel);
-+
- old_size = panel->size;
- ltr = gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR;
-
-@@ -1404,7 +1428,7 @@ panel_widget_size_allocate(GtkWidget *wi
- }
- ad->min_cells = ad->cells;
- gtk_widget_size_allocate(ad->applet,&challoc);
-- i += ad->cells;
-+ i += ad->cells + padding;
- }
-
- /* EEEEK, there might be not enough room and we don't handle
-@@ -1439,7 +1463,7 @@ panel_widget_size_allocate(GtkWidget *wi
- if (ad->constrained < i)
- ad->constrained = i;
-
-- i = ad->constrained + ad->cells;
-+ i = ad->constrained + ad->cells + padding;
- }
-
- /* Now expand from the right */
-@@ -1464,7 +1488,7 @@ panel_widget_size_allocate(GtkWidget *wi
- ad->cells = cells;
- }
-
-- i = ad->constrained;
-+ i = ad->constrained - padding;
- }
-
- /* EEEEK, there's not enough room, so shift applets even
diff --git a/preferred-apps.patch b/preferred-apps.patch
deleted file mode 100644
index 8f755d9..0000000
--- a/preferred-apps.patch
+++ /dev/null
@@ -1,272 +0,0 @@
-diff -up gnome-panel-2.25.3/gnome-panel/launcher.c.preferred-apps
gnome-panel-2.25.3/gnome-panel/launcher.c
---- gnome-panel-2.25.3/gnome-panel/launcher.c.preferred-apps 2009-01-16
14:15:17.000000000 -0500
-+++ gnome-panel-2.25.3/gnome-panel/launcher.c 2009-01-16 14:24:06.000000000 -0500
-@@ -21,6 +21,7 @@
- #include <glib/gi18n.h>
- #include <gio/gio.h>
- #include <gdk/gdkx.h>
-+#include <gmenu-tree.h>
-
- #include <libpanel-util/panel-error.h>
- #include <libpanel-util/panel-glib.h>
-@@ -44,6 +45,7 @@
- #include "panel-compatibility.h"
- #include "panel-ditem-editor.h"
- #include "panel-icon-names.h"
-+#include "panel-run-dialog.h"
-
- static GdkScreen *
- launcher_get_screen (Launcher *launcher)
-@@ -1215,3 +1217,189 @@ panel_launcher_set_dnd_enabled (Launcher
- } else
- gtk_drag_source_unset (launcher->button);
- }
-+
-+static gchar *
-+find_desktop_file_from_exec (const gchar *exec)
-+{
-+ GSList *all_applications, *l;
-+ gchar *path = NULL;
-+ gchar **tokens, **tokens2;
-+ gint i, match = 0;
-+
-+ /* FIXME no need to construct a humongous list here */
-+ all_applications = get_all_applications ();
-+
-+ for (l = all_applications; l; l = l->next) {
-+ GMenuTreeEntry *entry = l->data;
-+ const char *entry_exec;
-+
-+ entry_exec = gmenu_tree_entry_get_exec (entry);
-+
-+ if (strcmp (exec, entry_exec) == 0) {
-+ path = gmenu_tree_entry_get_desktop_file_path (entry);
-+ break;
-+ }
-+
-+ tokens = g_strsplit (exec, " ", -1);
-+ tokens2 = g_strsplit (entry_exec, " ", -1);
-+
-+ for (i = 0; tokens[i] && tokens2[i]; i++) {
-+ if (strcmp (tokens[i], tokens2[i]) != 0)
-+ break;
-+ }
-+ if (i > match) {
-+ match = i;
-+ path = gmenu_tree_entry_get_desktop_file_path (entry);
-+ }
-+
-+ g_strfreev (tokens);
-+ g_strfreev (tokens2);
-+ }
-+
-+ path = g_strdup (path);
-+ g_slist_free (all_applications);
-+
-+ return path;
-+}
-+
-+static void
-+update_preferred_app (const gchar *filename,
-+ const gchar *key,
-+ const gchar *exec)
-+{
-+ gchar *location;
-+ GKeyFile *key_file;
-+ GError *error = NULL;
-+ gchar *data;
-+ gsize len;
-+ gboolean needs_terminal;
-+
-+ location = find_desktop_file_from_exec (exec);
-+ key_file = g_key_file_new ();
-+ if (!panel_key_file_load_from_uri (key_file, location,
-+ G_KEY_FILE_KEEP_COMMENTS|G_KEY_FILE_KEEP_TRANSLATIONS,
-+ NULL)) {
-+ /* FIXME would be much better if preferred apps were backed by desktop files */
-+ g_key_file_set_string (key_file, "Desktop Entry", "Version",
"1.0");
-+ g_key_file_set_string (key_file, "Desktop Entry", "Encoding",
"UTF-8");
-+ g_key_file_set_string (key_file, "Desktop Entry", "Type",
"Application");
-+ g_key_file_set_string (key_file, "Desktop Entry", "Exec", exec);
-+ if (strstr (key, "http")) {
-+ g_key_file_set_string (key_file, "Desktop Entry", "Name",
"Preferred Web Browser");
-+ g_key_file_set_string (key_file, "Desktop Entry", "GenericName",
"Web Browser");
-+ g_key_file_set_string (key_file, "Desktop Entry", "Comment",
"Browse the Web");
-+ g_key_file_set_string (key_file, "Desktop Entry", "Icon",
"redhat-web-browser.png");
-+ if (strstr (exec, "%s")) {
-+ gchar *exec2, *s;
-+
-+ exec2 = g_strdup (exec);
-+ s = strstr (exec2, "%s");
-+ s[1] = 'u';
-+
-+ g_key_file_set_string (key_file, "Desktop Entry", "Exec",
exec2);
-+ g_free (exec2);
-+
-+ }
-+ }
-+ else if (strstr (key, "mailto")) {
-+ g_key_file_set_string (key_file, "Desktop Entry", "Name",
"Preferred Mail Reader");
-+ g_key_file_set_string (key_file, "Desktop Entry", "GenericName",
"Mail Reader");
-+ g_key_file_set_string (key_file, "Desktop Entry", "Comment",
"Send email");
-+ g_key_file_set_string (key_file, "Desktop Entry", "Icon",
"redhat-email.png");
-+ }
-+ if (g_str_has_suffix (key, "command")) {
-+ int len;
-+ char *key2;
-+
-+ len = strlen (key);
-+ key2 = g_new (char, len - strlen ("command") + strlen
("needs_terminal") + 1);
-+ strncpy (key2, key, len - strlen ("command"));
-+ strcpy (key2 + len - strlen ("command"), "needs_terminal");
-+ needs_terminal = gconf_client_get_bool (panel_gconf_get_client (),
-+ key2,
-+ NULL);
-+ g_free (key2);
-+ }
-+ else
-+ needs_terminal = FALSE;
-+ g_key_file_set_boolean (key_file, "Desktop Entry", "Terminal",
needs_terminal);
-+ }
-+
-+ g_free (location);
-+
-+ g_key_file_set_boolean (key_file, "Desktop Entry",
"X-Panel-Monitor", TRUE);
-+ g_key_file_set_boolean (key_file, "Desktop Entry", "NoDisplay",
TRUE);
-+
-+ data = g_key_file_to_data (key_file, &len, &error);
-+ if (error) {
-+ g_printerr (_("Failed to convert data for '%s': %s"),
-+ filename, error->message);
-+ g_error_free (error);
-+ g_key_file_free (key_file);
-+
-+ return;
-+ }
-+ if (!g_file_set_contents (filename, data, len, &error)) {
-+ g_printerr (_("Failed to save '%s': %s"),
-+ filename, error->message);
-+ g_error_free (error);
-+ }
-+
-+ g_key_file_free (key_file);
-+ g_free (data);
-+}
-+
-+static void
-+preferred_app_changed (GConfClient *client,
-+ gint notify_id,
-+ GConfEntry *entry,
-+ const gchar *filename)
-+{
-+ update_preferred_app (filename,
-+ gconf_entry_get_key (entry),
-+ gconf_value_get_string (entry->value));
-+}
-+
-+void
-+panel_preferred_apps_init (void)
-+{
-+ GConfClient *client;
-+ gchar *dirname, *filename, *exec;
-+ gint i;
-+
-+ const gchar *keys[] = {
-+ "/desktop/gnome/url-handlers/http/command",
-+ "/desktop/gnome/url-handlers/mailto/command",
-+ NULL };
-+ const gchar *files[] = {
-+ "preferred-web-browser.desktop",
-+ "preferred-mail-reader.desktop",
-+ NULL };
-+
-+ client = panel_gconf_get_client ();
-+
-+ gconf_client_add_dir (client,
-+ "/desktop/gnome/url-handlers",
-+ GCONF_CLIENT_PRELOAD_NONE,
-+ NULL);
-+
-+ for (i = 0; keys[i]; i++) {
-+ dirname = g_build_filename (g_get_user_data_dir (),
-+ "applications", NULL);
-+ filename = g_build_filename (dirname, files[i], NULL);
-+ if (!g_file_test (filename, G_FILE_TEST_EXISTS)) {
-+
-+ if (!g_file_test (dirname, G_FILE_TEST_EXISTS))
-+ g_mkdir_with_parents (dirname, 0755);
-+
-+ exec = gconf_client_get_string (client, keys[i], NULL);
-+ update_preferred_app (filename, keys[i], exec);
-+ g_free (exec);
-+ }
-+ g_free (dirname);
-+
-+ gconf_client_notify_add (client, keys[i],
-+ (GConfClientNotifyFunc) preferred_app_changed,
-+ filename, g_free, NULL);
-+ }
-+}
-diff -up gnome-panel-2.25.3/gnome-panel/launcher.h.preferred-apps
gnome-panel-2.25.3/gnome-panel/launcher.h
---- gnome-panel-2.25.3/gnome-panel/launcher.h.preferred-apps 2009-01-16
14:15:17.000000000 -0500
-+++ gnome-panel-2.25.3/gnome-panel/launcher.h 2009-01-16 14:15:17.000000000 -0500
-@@ -14,6 +14,8 @@
- #include "applet.h"
- #include "panel-widget.h"
-
-+#include <gio/gio.h>
-+
- G_BEGIN_DECLS
-
- typedef struct {
-@@ -71,6 +73,7 @@ void launcher_properties_dest
- void panel_launcher_set_dnd_enabled (Launcher *launcher,
- gboolean dnd_enabled);
-
-+void panel_preferred_apps_init (void);
-
- G_END_DECLS
-
-diff -up gnome-panel-2.25.3/gnome-panel/main.c.preferred-apps
gnome-panel-2.25.3/gnome-panel/main.c
---- gnome-panel-2.25.3/gnome-panel/main.c.preferred-apps 2008-12-09 07:32:37.000000000
-0500
-+++ gnome-panel-2.25.3/gnome-panel/main.c 2009-01-16 14:15:17.000000000 -0500
-@@ -27,6 +27,7 @@
- #include "panel-action-protocol.h"
- #include "panel-lockdown.h"
- #include "panel-icon-names.h"
-+#include "launcher.h"
- #include "xstuff.h"
-
- #include "nothing.cP"
-@@ -86,6 +87,7 @@ main (int argc, char **argv)
- GCONF_CLIENT_PRELOAD_NONE,
- NULL);
-
-+ panel_preferred_apps_init ();
- panel_global_config_load ();
- panel_lockdown_init ();
- panel_profile_load ();
-diff -up gnome-panel-2.25.3/gnome-panel/panel-run-dialog.c.preferred-apps
gnome-panel-2.25.3/gnome-panel/panel-run-dialog.c
---- gnome-panel-2.25.3/gnome-panel/panel-run-dialog.c.preferred-apps 2008-12-11
12:03:03.000000000 -0500
-+++ gnome-panel-2.25.3/gnome-panel/panel-run-dialog.c 2009-01-16 14:15:17.000000000
-0500
-@@ -789,7 +789,7 @@ get_all_applications_from_dir (GMenuTree
- return list;
- }
-
--static GSList *
-+GSList *
- get_all_applications (void)
- {
- GMenuTree *tree;
-diff -up gnome-panel-2.25.3/gnome-panel/panel-run-dialog.h.preferred-apps
gnome-panel-2.25.3/gnome-panel/panel-run-dialog.h
---- gnome-panel-2.25.3/gnome-panel/panel-run-dialog.h.preferred-apps 2008-11-08
19:27:01.000000000 -0500
-+++ gnome-panel-2.25.3/gnome-panel/panel-run-dialog.h 2009-01-16 14:15:17.000000000
-0500
-@@ -32,6 +32,8 @@ G_BEGIN_DECLS
- void panel_run_dialog_present (GdkScreen *screen,
- guint32 activate_time);
-
-+GSList *get_all_applications (void);
-+
- G_END_DECLS
-
- #endif /* __PANEL_RUN_DIALOG_H__ */
diff --git a/redhat-panel-backwards-compat-config.schemas
b/redhat-panel-backwards-compat-config.schemas
deleted file mode 100644
index 2cdaf44..0000000
--- a/redhat-panel-backwards-compat-config.schemas
+++ /dev/null
@@ -1,1473 +0,0 @@
-<?xml version="1.0"?>
-<gconfschemafile>
-
-<!--
-These are the factory defaults for what's on the panel. To change them
-locally, you can edit this file and rebuild the RPM, or you can just
-set values in the /etc/gconf/gconf.xml.defaults source using gconftool -
-see
http://www.gnome.org/projects/gconf/
--->
-
- <schemalist>
-
-
-
-<!--
-*********************************************************************************
-** Small Screen Setup: 1 edge panel of size 24 **
-*********************************************************************************
--->
-
-<!-- ********************************* -->
-<!-- General panel properties :: START -->
-<!-- ********************************* -->
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/small/general/show_program_list</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short>Show the program listing in the Run box</short>
- <long>Show the program listing by default when opening the Run
box</long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/small/general/enable_program_list</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>true</default>
- <locale name="C">
- <short>Enable the program listing in the run box</short>
- <long>Enable the program listing in the run box</long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/small/general/panel_id_list</key>
- <owner>panel</owner>
- <type>list</type>
- <list_type>string</list_type>
- <default>[bottom_panel]</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/small/general/applet_id_list</key>
- <owner>panel</owner>
- <type>list</type>
- <list_type>string</list_type>
- <default>[]</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/small/general/object_id_list</key>
- <owner>panel</owner>
- <type>list</type>
- <list_type>string</list_type>
- <default>[]</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
-<!-- ******************************* -->
-<!-- General panel properties :: END -->
-<!-- ******************************* -->
-
-<!-- ****************************** -->
-<!-- Edge panel properties :: START -->
-<!-- ****************************** -->
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/panel_type</key>
- <owner>panel</owner>
- <type>string</type>
- <default>edge-panel</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/panel_size</key>
- <owner>panel</owner>
- <type>string</type>
- <default>panel-size-small</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/panel_hide_mode</key>
- <owner>panel</owner>
- <type>int</type>
- <default>0</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/panel_hide_state</key>
- <owner>panel</owner>
- <type>int</type>
- <default>0</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/screen_id</key>
- <owner>panel</owner>
- <type>int</type>
- <default>0</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/screen_edge</key>
- <owner>panel</owner>
- <type>string</type>
- <default>panel-edge-bottom</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/hide_buttons_enabled</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/hide_button_pixmaps_enabled</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>true</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/panel_background_type</key>
- <owner>panel</owner>
- <type>string</type>
- <default>no-background</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/panel_background_pixmap</key>
- <owner>panel</owner>
- <type>string</type>
- <default></default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/panel_background_pixmap_fit</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>true</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/panel_background_pixmap_stretch</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/panel_background_pixmap_rotate</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>true</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/panel_background_color</key>
- <owner>panel</owner>
- <type>string</type>
- <default>#000000</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
-<!-- **************************** -->
-<!-- Edge panel properties :: END -->
-<!-- **************************** -->
-
-
-<!--
-******************************************************************************************
-** Medium Screen Setup: 1 edge panel of size 36, 1 menu panel of size 24
**
-******************************************************************************************
--->
-
-<!-- ********************************* -->
-<!-- General panel properties :: START -->
-<!-- ********************************* -->
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/general/advanced_run_dialog</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/general/panel_id_list</key>
- <owner>panel</owner>
- <type>list</type>
- <list_type>string</list_type>
- <default>[bottom_panel]</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/general/applet_id_list</key>
- <owner>panel</owner>
- <type>list</type>
- <list_type>string</list_type>
-
<default>[tasklist_applet,pager_applet,tray_applet,clock_applet]</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/general/object_id_list</key>
- <owner>panel</owner>
- <type>list</type>
- <list_type>string</list_type>
-
<default>[main_menu,web_browser_launcher,email_launcher,wordprocessor_launcher,presentations_launcher,spreadsheet_launcher,print_launcher]</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
-<!-- ******************************* -->
-<!-- General panel properties :: END -->
-<!-- ******************************* -->
-
-<!-- ****************************** -->
-<!-- Edge panel properties :: START -->
-<!-- ****************************** -->
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_type</key>
- <owner>panel</owner>
- <type>string</type>
- <default>edge-panel</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_size</key>
- <owner>panel</owner>
- <type>string</type>
- <default>panel-size-medium</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_hide_mode</key>
- <owner>panel</owner>
- <type>int</type>
- <default>0</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_hide_state</key>
- <owner>panel</owner>
- <type>int</type>
- <default>0</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/screen_id</key>
- <owner>panel</owner>
- <type>int</type>
- <default>0</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/screen_edge</key>
- <owner>panel</owner>
- <type>string</type>
- <default>panel-edge-bottom</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/hide_buttons_enabled</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/hide_button_pixmaps_enabled</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_background_type</key>
- <owner>panel</owner>
- <type>string</type>
- <default>no-background</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_background_pixmap</key>
- <owner>panel</owner>
- <type>string</type>
- <default></default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_background_pixmap_fit</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>true</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_background_pixmap_stretch</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_background_pixmap_rotate</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>true</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_background_color</key>
- <owner>panel</owner>
- <type>string</type>
- <default>#000000</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <!-- Main Menu -->
-
- <!-- add custom_icon and custom_icon_file keys to replace icon -->
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/main_menu/object_type</key>
- <owner>panel</owner>
- <type>string</type>
- <default>menu-object</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/main_menu/panel_id</key>
- <owner>panel</owner>
- <type>string</type>
- <default>bottom_panel</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/main_menu/path</key>
- <owner>panel</owner>
- <type>string</type>
- <default>applications:///</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/main_menu/main-menu</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>true</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/main_menu/global-menu</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <!-- The person who made this a bitfield stored as an int needs some buttkicking
-->
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/main_menu/main-menu-flags</key>
- <owner>panel</owner>
- <type>int</type>
- <default>24580</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <!-- Launchers -->
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/web_browser_launcher/object_type</key>
- <owner>panel</owner>
- <type>string</type>
- <default>launcher-object</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/web_browser_launcher/launcher_location</key>
- <owner>panel</owner>
- <type>string</type>
- <default>applications:///Internet/redhat-web.desktop</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/web_browser_launcher/panel_id</key>
- <owner>panel</owner>
- <type>string</type>
- <default>bottom_panel</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/web_browser_launcher/position</key>
- <owner>panel</owner>
- <type>int</type>
- <default>50</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/web_browser_launcher/panel_right_stick</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/terminal_launcher/object_type</key>
- <owner>panel</owner>
- <type>string</type>
- <default>launcher-object</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/terminal_launcher/launcher_location</key>
- <owner>panel</owner>
- <type>string</type>
- <default>applications:///System/gnome-terminal.desktop</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/terminal_launcher/panel_id</key>
- <owner>panel</owner>
- <type>string</type>
- <default>bottom_panel</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/terminal_launcher/position</key>
- <owner>panel</owner>
- <type>int</type>
- <default>300</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/terminal_launcher/panel_stick</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/email_launcher/object_type</key>
- <owner>panel</owner>
- <type>string</type>
- <default>launcher-object</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/email_launcher/launcher_location</key>
- <owner>panel</owner>
- <type>string</type>
- <default>applications:///Internet/redhat-email.desktop</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/email_launcher/panel_id</key>
- <owner>panel</owner>
- <type>string</type>
- <default>bottom_panel</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/email_launcher/position</key>
- <owner>panel</owner>
- <type>int</type>
- <default>100</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/email_launcher/panel_right_stick</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <!-- start -->
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/wordprocessor_launcher/object_type</key>
- <owner>panel</owner>
- <type>string</type>
- <default>launcher-object</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/wordprocessor_launcher/launcher_location</key>
- <owner>panel</owner>
- <type>string</type>
-
<default>applications:///Office/redhat-word-processor.desktop</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/wordprocessor_launcher/panel_id</key>
- <owner>panel</owner>
- <type>string</type>
- <default>bottom_panel</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/wordprocessor_launcher/position</key>
- <owner>panel</owner>
- <type>int</type>
- <default>150</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/wordprocessor_launcher/panel_right_stick</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <!-- end -->
-
-
-
- <!-- start -->
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/presentations_launcher/object_type</key>
- <owner>panel</owner>
- <type>string</type>
- <default>launcher-object</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/presentations_launcher/launcher_location</key>
- <owner>panel</owner>
- <type>string</type>
-
<default>applications:///Office/redhat-presentations.desktop</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/presentations_launcher/panel_id</key>
- <owner>panel</owner>
- <type>string</type>
- <default>bottom_panel</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/presentations_launcher/position</key>
- <owner>panel</owner>
- <type>int</type>
- <default>200</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/presentations_launcher/panel_right_stick</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <!-- end -->
-
-
-
- <!-- start -->
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/spreadsheet_launcher/object_type</key>
- <owner>panel</owner>
- <type>string</type>
- <default>launcher-object</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/spreadsheet_launcher/launcher_location</key>
- <owner>panel</owner>
- <type>string</type>
- <default>applications:///Office/redhat-spreadsheet.desktop</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/spreadsheet_launcher/panel_id</key>
- <owner>panel</owner>
- <type>string</type>
- <default>bottom_panel</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/spreadsheet_launcher/position</key>
- <owner>panel</owner>
- <type>int</type>
- <default>250</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/spreadsheet_launcher/panel_right_stick</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <!-- end -->
-
-
- <!-- start -->
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/print_launcher/object_type</key>
- <owner>panel</owner>
- <type>string</type>
- <default>launcher-object</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/print_launcher/launcher_location</key>
- <owner>panel</owner>
- <type>string</type>
- <default>applications:///Accessories/redhat-print.desktop</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/print_launcher/panel_id</key>
- <owner>panel</owner>
- <type>string</type>
- <default>bottom_panel</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/print_launcher/position</key>
- <owner>panel</owner>
- <type>int</type>
- <default>260</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/print_launcher/panel_right_stick</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <!-- end -->
-
-
-
-
- <!-- start -->
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/help_launcher/object_type</key>
- <owner>panel</owner>
- <type>string</type>
- <default>launcher-object</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/help_launcher/launcher_location</key>
- <owner>panel</owner>
- <type>string</type>
- <default>applications:///gnome-yelp.desktop</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/help_launcher/panel_id</key>
- <owner>panel</owner>
- <type>string</type>
- <default>bottom_panel</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/help_launcher/position</key>
- <owner>panel</owner>
- <type>int</type>
- <default>300</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/help_launcher/panel_right_stick</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <!-- end -->
-
-
- <!-- Applets -->
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/applets/tasklist_applet/object_type</key>
- <owner>panel</owner>
- <type>string</type>
- <default>bonobo-applet</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/applets/tasklist_applet/panel_id</key>
- <owner>panel</owner>
- <type>string</type>
- <default>bottom_panel</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/applets/tasklist_applet/position</key>
- <owner>panel</owner>
- <type>int</type>
- <default>375</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/applets/tasklist_applet/bonobo_iid</key>
- <owner>panel</owner>
- <type>string</type>
- <default>OAFIID:GNOME_TasklistApplet</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/applets/tasklist_applet/panel_right_stick</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/applets/pager_applet/object_type</key>
- <owner>panel</owner>
- <type>string</type>
- <default>bonobo-applet</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/applets/pager_applet/panel_id</key>
- <owner>panel</owner>
- <type>string</type>
- <default>bottom_panel</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/applets/pager_applet/position</key>
- <owner>panel</owner>
- <type>int</type>
- <default>325</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/applets/pager_applet/bonobo_iid</key>
- <owner>panel</owner>
- <type>string</type>
- <default>OAFIID:GNOME_PagerApplet</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/applets/pager_applet/panel_right_stick</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <!-- clock -->
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/applets/clock_applet/object_type</key>
- <owner>panel</owner>
- <type>string</type>
- <default>bonobo-applet</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/applets/clock_applet/panel_id</key>
- <owner>panel</owner>
- <type>string</type>
- <default>bottom_panel</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/applets/clock_applet/position</key>
- <owner>panel</owner>
- <type>int</type>
- <default>0</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/applets/clock_applet/bonobo_iid</key>
- <owner>panel</owner>
- <type>string</type>
- <default>OAFIID:GNOME_ClockApplet</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/applets/clock_applet/panel_right_stick</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>true</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
-
- <!-- tray -->
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/applets/tray_applet/object_type</key>
- <owner>panel</owner>
- <type>string</type>
- <default>bonobo-applet</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/applets/tray_applet/panel_id</key>
- <owner>panel</owner>
- <type>string</type>
- <default>bottom_panel</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/applets/tray_applet/position</key>
- <owner>panel</owner>
- <type>int</type>
- <default>70</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/applets/tray_applet/bonobo_iid</key>
- <owner>panel</owner>
- <type>string</type>
- <default>OAFIID:GNOME_SystemTrayApplet</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/applets/tray_applet/panel_right_stick</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>true</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
-
-<!-- *********************************** -->
-<!-- Panel Items for Edge Panel :: END -->
-<!-- *********************************** -->
-
-<!-- **************************** -->
-<!-- Edge panel properties :: END -->
-<!-- **************************** -->
-
-<!--
-***********************************************************************************
-** Large Screen Setup: 1 edge panel of size 48, 1 menu panel of size 36 **
-***********************************************************************************
--->
-
-<!-- ********************************* -->
-<!-- General panel properties :: START -->
-<!-- ********************************* -->
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/large/general/advanced_run_dialog</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/large/general/panel_id_list</key>
- <owner>panel</owner>
- <type>list</type>
- <list_type>string</list_type>
- <default>[bottom_panel]</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/large/general/applet_id_list</key>
- <owner>panel</owner>
- <type>list</type>
- <list_type>string</list_type>
- <default>[]</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/large/general/object_id_list</key>
- <owner>panel</owner>
- <type>list</type>
- <list_type>string</list_type>
- <default>[]</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
-<!-- ******************************* -->
-<!-- General panel properties :: END -->
-<!-- ******************************* -->
-
-<!-- ****************************** -->
-<!-- Edge panel properties :: START -->
-<!-- ****************************** -->
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/panel_type</key>
- <owner>panel</owner>
- <type>string</type>
- <default>edge-panel</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/panel_size</key>
- <owner>panel</owner>
- <type>string</type>
- <default>panel-size-medium</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/panel_hide_mode</key>
- <owner>panel</owner>
- <type>int</type>
- <default>0</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/panel_hide_state</key>
- <owner>panel</owner>
- <type>int</type>
- <default>0</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/screen_id</key>
- <owner>panel</owner>
- <type>int</type>
- <default>0</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/screen_edge</key>
- <owner>panel</owner>
- <type>string</type>
- <default>panel-edge-bottom</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/hide_buttons_enabled</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/hide_button_pixmaps_enabled</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>true</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/panel_background_type</key>
- <owner>panel</owner>
- <type>string</type>
- <default>no-background</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/panel_background_pixmap</key>
- <owner>panel</owner>
- <type>string</type>
- <default> </default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/panel_background_pixmap_fit</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>true</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/panel_background_pixmap_stretch</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/panel_background_pixmap_rotate</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>true</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/panel_background_color</key>
- <owner>panel</owner>
- <type>string</type>
- <default>#000000</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
-<!-- **************************** -->
-<!-- Edge panel properties :: END -->
-<!-- **************************** -->
-
-
- </schemalist>
-
-</gconfschemafile>
diff --git a/redhat-panel-default-setup.entries b/redhat-panel-default-setup.entries
deleted file mode 100644
index 4864563..0000000
--- a/redhat-panel-default-setup.entries
+++ /dev/null
@@ -1,742 +0,0 @@
-<gconfentryfile>
-
- <entrylist base="/apps/panel/default_setup">
-
- <!-- List of toplevels -->
-
- <entry>
- <key>general/toplevel_id_list</key>
- <schema_key>/schemas/apps/panel/general/toplevel_id_list</schema_key>
- <value>
- <list type="string">
- <value>
- <string>top_panel</string>
- </value>
- <value>
- <string>bottom_panel</string>
- </value>
- </list>
- </value>
- </entry>
-
- <!-- List of objects -->
-
- <entry>
- <key>general/object_id_list</key>
- <schema_key>/schemas/apps/panel/general/object_id_list</schema_key>
- <value>
- <list type="string">
- <value>
- <string>menu_bar</string>
- </value>
- <value>
- <string>web_launcher</string>
- </value>
- <value>
- <string>email_launcher</string>
- </value>
- </list>
- </value>
- </entry>
-
- <!-- List of applets -->
-
- <entry>
- <key>general/applet_id_list</key>
- <schema_key>/schemas/apps/panel/general/applet_id_list</schema_key>
- <value>
- <list type="string">
- <value>
- <string>gnote</string>
- </value>
- <value>
- <string>clock</string>
- </value>
- <value>
- <string>systray</string>
- </value>
- <value>
- <string>window_list</string>
- </value>
- <value>
- <string>workspace_switcher</string>
- </value>
- <value>
- <string>trash_applet</string>
- </value>
- <value>
- <string>fast_user_switch_applet</string>
- </value>
- </list>
- </value>
- </entry>
-
- <!-- Top Panel -->
-
- <entry>
- <key>toplevels/top_panel/name</key>
- <schema_key>/schemas/apps/panel/toplevels/name</schema_key>
- <value>
- <string>Top Panel</string>
- </value>
- </entry>
- <entry>
- <key>toplevels/top_panel/expand</key>
- <schema_key>/schemas/apps/panel/toplevels/expand</schema_key>
- <value>
- <bool>true</bool>
- </value>
- </entry>
- <entry>
- <key>toplevels/top_panel/padding</key>
- <schema_key>/schemas/apps/panel/toplevels/padding</schema_key>
- <value>
- <int>8</int>
- </value>
- </entry>
- <entry>
- <key>toplevels/top_panel/orientation</key>
- <schema_key>/schemas/apps/panel/toplevels/orientation</schema_key>
- <value>
- <string>top</string>
- </value>
- </entry>
- <entry>
- <key>toplevels/top_panel/size</key>
- <schema_key>/schemas/apps/panel/toplevels/size</schema_key>
- <value>
- <int>24</int>
- </value>
- </entry>
-
-
<entry><key>toplevels/top_panel/screen</key><schema_key>/schemas/apps/panel/toplevels/screen</schema_key></entry>
-
<entry><key>toplevels/top_panel/monitor</key><schema_key>/schemas/apps/panel/toplevels/monitor</schema_key></entry>
-
<entry><key>toplevels/top_panel/x</key><schema_key>/schemas/apps/panel/toplevels/x</schema_key></entry>
-
<entry><key>toplevels/top_panel/y</key><schema_key>/schemas/apps/panel/toplevels/y</schema_key></entry>
-
<entry><key>toplevels/top_panel/x_centered</key><schema_key>/schemas/apps/panel/toplevels/x_centered</schema_key></entry>
-
<entry><key>toplevels/top_panel/y_centered</key><schema_key>/schemas/apps/panel/toplevels/y_centered</schema_key></entry>
-
<entry><key>toplevels/top_panel/auto_hide</key><schema_key>/schemas/apps/panel/toplevels/auto_hide</schema_key></entry>
-
<entry><key>toplevels/top_panel/enable_animations</key><schema_key>/schemas/apps/panel/toplevels/enable_animations</schema_key></entry>
-
<entry><key>toplevels/top_panel/enable_buttons</key><schema_key>/schemas/apps/panel/toplevels/enable_buttons</schema_key></entry>
-
<entry><key>toplevels/top_panel/enable_arrows</key><schema_key>/schemas/apps/panel/toplevels/enable_arrows</schema_key></entry>
-
<entry><key>toplevels/top_panel/hide_delay</key><schema_key>/schemas/apps/panel/toplevels/hide_delay</schema_key></entry>
-
<entry><key>toplevels/top_panel/unhide_delay</key><schema_key>/schemas/apps/panel/toplevels/unhide_delay</schema_key></entry>
-
<entry><key>toplevels/top_panel/auto_hide_size</key><schema_key>/schemas/apps/panel/toplevels/auto_hide_size</schema_key></entry>
-
<entry><key>toplevels/top_panel/background/type</key><schema_key>/schemas/apps/panel/toplevels/background/type</schema_key></entry>
-
<entry><key>toplevels/top_panel/background/color</key><schema_key>/schemas/apps/panel/toplevels/background/color</schema_key></entry>
-
<entry><key>toplevels/top_panel/background/opacity</key><schema_key>/schemas/apps/panel/toplevels/background/opacity</schema_key></entry>
-
<entry><key>toplevels/top_panel/background/image</key><schema_key>/schemas/apps/panel/toplevels/background/image</schema_key></entry>
-
<entry><key>toplevels/top_panel/background/fit</key><schema_key>/schemas/apps/panel/toplevels/background/fit</schema_key></entry>
-
<entry><key>toplevels/top_panel/background/stretch</key><schema_key>/schemas/apps/panel/toplevels/background/stretch</schema_key></entry>
-
<entry><key>toplevels/top_panel/background/rotate</key><schema_key>/schemas/apps/panel/toplevels/background/rotate</schema_key></entry>
-
- <!-- Bottom Panel -->
-
- <entry>
- <key>toplevels/bottom_panel/name</key>
- <schema_key>/schemas/apps/panel/toplevels/name</schema_key>
- <value>
- <string>Bottom Panel</string>
- </value>
- </entry>
- <entry>
- <key>toplevels/bottom_panel/expand</key>
- <schema_key>/schemas/apps/panel/toplevels/expand</schema_key>
- <value>
- <bool>true</bool>
- </value>
- </entry>
- <entry>
- <key>toplevels/bottom_panel/padding</key>
- <schema_key>/schemas/apps/panel/toplevels/padding</schema_key>
- <value>
- <int>8</int>
- </value>
- </entry>
- <entry>
- <key>toplevels/bottom_panel/orientation</key>
- <schema_key>/schemas/apps/panel/toplevels/orientation</schema_key>
- <value>
- <string>bottom</string>
- </value>
- </entry>
- <entry>
- <key>toplevels/bottom_panel/size</key>
- <schema_key>/schemas/apps/panel/toplevels/size</schema_key>
- <value>
- <int>24</int>
- </value>
- </entry>
-
-
<entry><key>toplevels/bottom_panel/screen</key><schema_key>/schemas/apps/panel/toplevels/screen</schema_key></entry>
-
<entry><key>toplevels/bottom_panel/monitor</key><schema_key>/schemas/apps/panel/toplevels/monitor</schema_key></entry>
-
<entry><key>toplevels/bottom_panel/x</key><schema_key>/schemas/apps/panel/toplevels/x</schema_key></entry>
-
<entry><key>toplevels/bottom_panel/y</key><schema_key>/schemas/apps/panel/toplevels/y</schema_key></entry>
-
<entry><key>toplevels/bottom_panel/x_centered</key><schema_key>/schemas/apps/panel/toplevels/x_centered</schema_key></entry>
-
<entry><key>toplevels/bottom_panel/y_centered</key><schema_key>/schemas/apps/panel/toplevels/y_centered</schema_key></entry>
-
<entry><key>toplevels/bottom_panel/auto_hide</key><schema_key>/schemas/apps/panel/toplevels/auto_hide</schema_key></entry>
-
<entry><key>toplevels/bottom_panel/enable_animations</key><schema_key>/schemas/apps/panel/toplevels/enable_animations</schema_key></entry>
-
<entry><key>toplevels/bottom_panel/enable_buttons</key><schema_key>/schemas/apps/panel/toplevels/enable_buttons</schema_key></entry>
-
<entry><key>toplevels/bottom_panel/enable_arrows</key><schema_key>/schemas/apps/panel/toplevels/enable_arrows</schema_key></entry>
-
<entry><key>toplevels/bottom_panel/hide_delay</key><schema_key>/schemas/apps/panel/toplevels/hide_delay</schema_key></entry>
-
<entry><key>toplevels/bottom_panel/unhide_delay</key><schema_key>/schemas/apps/panel/toplevels/unhide_delay</schema_key></entry>
-
<entry><key>toplevels/bottom_panel/auto_hide_size</key><schema_key>/schemas/apps/panel/toplevels/auto_hide_size</schema_key></entry>
-
<entry><key>toplevels/bottom_panel/background/type</key><schema_key>/schemas/apps/panel/toplevels/background/type</schema_key></entry>
-
<entry><key>toplevels/bottom_panel/background/color</key><schema_key>/schemas/apps/panel/toplevels/background/color</schema_key></entry>
-
<entry><key>toplevels/bottom_panel/background/opacity</key><schema_key>/schemas/apps/panel/toplevels/background/opacity</schema_key></entry>
-
<entry><key>toplevels/bottom_panel/background/image</key><schema_key>/schemas/apps/panel/toplevels/background/image</schema_key></entry>
-
<entry><key>toplevels/bottom_panel/background/fit</key><schema_key>/schemas/apps/panel/toplevels/background/fit</schema_key></entry>
-
<entry><key>toplevels/bottom_panel/background/stretch</key><schema_key>/schemas/apps/panel/toplevels/background/stretch</schema_key></entry>
-
<entry><key>toplevels/bottom_panel/background/rotate</key><schema_key>/schemas/apps/panel/toplevels/background/rotate</schema_key></entry>
-
- <!-- Menu Bar -->
-
- <entry>
- <key>objects/menu_bar/object_type</key>
- <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
- <value>
- <string>menu-bar</string>
- </value>
- </entry>
- <entry>
- <key>objects/menu_bar/toplevel_id</key>
- <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
- <value>
- <string>top_panel</string>
- </value>
- </entry>
- <entry>
- <key>objects/menu_bar/position</key>
- <schema_key>/schemas/apps/panel/objects/position</schema_key>
- <value>
- <int>0</int>
- </value>
- </entry>
- <entry>
- <key>objects/menu_bar/panel_right_stick</key>
- <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
- <value>
- <bool>false</bool>
- </value>
- </entry>
- <entry>
- <key>objects/menu_bar/locked</key>
- <schema_key>/schemas/apps/panel/objects/locked</schema_key>
- <value>
- <bool>true</bool>
- </value>
- </entry>
-
-
<entry><key>objects/menu_bar/bonobo_iid</key><schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key></entry>
-
<entry><key>objects/menu_bar/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key>
</entry>
-
<entry><key>objects/menu_bar/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-
<entry><key>objects/menu_bar/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-
<entry><key>objects/menu_bar/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-
<entry><key>objects/menu_bar/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-
<entry><key>objects/menu_bar/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-
<entry><key>objects/menu_bar/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
-
<entry><key>objects/menu_bar/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
-
- <!-- Web Launcher -->
-
- <entry>
- <key>objects/web_launcher/object_type</key>
- <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
- <value>
- <string>launcher-object</string>
- </value>
- </entry>
- <entry>
- <key>objects/web_launcher/toplevel_id</key>
- <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
- <value>
- <string>top_panel</string>
- </value>
- </entry>
- <entry>
- <key>objects/web_launcher/position</key>
- <schema_key>/schemas/apps/panel/objects/position</schema_key>
- <value>
- <int>1</int>
- </value>
- </entry>
- <entry>
- <key>objects/web_launcher/panel_right_stick</key>
- <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
- <value>
- <bool>false</bool>
- </value>
- </entry>
- <entry>
- <key>objects/web_launcher/locked</key>
- <schema_key>/schemas/apps/panel/objects/locked</schema_key>
- <value>
- <bool>true</bool>
- </value>
- </entry>
- <entry>
- <key>objects/web_launcher/launcher_location</key>
- <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
- <value>
- <string>preferred-web-browser.desktop</string>
- </value>
- </entry>
-
-
<entry><key>objects/web_launcher/bonobo_iid</key><schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key></entry>
-
<entry><key>objects/web_launcher/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key>
</entry>
-
<entry><key>objects/web_launcher/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-
<entry><key>objects/web_launcher/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-
<entry><key>objects/web_launcher/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-
<entry><key>objects/web_launcher/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-
<entry><key>objects/web_launcher/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-
<entry><key>objects/web_launcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
-
- <!-- Email Launcher -->
-
- <entry>
- <key>objects/email_launcher/object_type</key>
- <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
- <value>
- <string>launcher-object</string>
- </value>
- </entry>
- <entry>
- <key>objects/email_launcher/toplevel_id</key>
- <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
- <value>
- <string>top_panel</string>
- </value>
- </entry>
- <entry>
- <key>objects/email_launcher/position</key>
- <schema_key>/schemas/apps/panel/objects/position</schema_key>
- <value>
- <int>2</int>
- </value>
- </entry>
- <entry>
- <key>objects/email_launcher/panel_right_stick</key>
- <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
- <value>
- <bool>false</bool>
- </value>
- </entry>
- <entry>
- <key>objects/email_launcher/locked</key>
- <schema_key>/schemas/apps/panel/objects/locked</schema_key>
- <value>
- <bool>true</bool>
- </value>
- </entry>
- <entry>
- <key>objects/email_launcher/launcher_location</key>
- <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
- <value>
- <string>preferred-mail-reader.desktop</string>
- </value>
- </entry>
-
-
<entry><key>objects/email_launcher/bonobo_iid</key><schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key></entry>
-
<entry><key>objects/email_launcher/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key>
</entry>
-
<entry><key>objects/email_launcher/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-
<entry><key>objects/email_launcher/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-
<entry><key>objects/email_launcher/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-
<entry><key>objects/email_launcher/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-
<entry><key>objects/email_launcher/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-
<entry><key>objects/email_launcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
-
- <!-- GNote -->
-
- <entry>
- <key>applets/gnote/object_type</key>
- <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
- <value>
- <string>bonobo-applet</string>
- </value>
- </entry>
- <entry>
- <key>applets/gnote/toplevel_id</key>
- <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
- <value>
- <string>top_panel</string>
- </value>
- </entry>
- <entry>
- <key>applets/gnote/position</key>
- <schema_key>/schemas/apps/panel/objects/position</schema_key>
- <value>
- <int>3</int>
- </value>
- </entry>
- <entry>
- <key>applets/gnote/panel_right_stick</key>
- <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
- <value>
- <bool>false</bool>
- </value>
- </entry>
- <entry>
- <key>applets/gnote/locked</key>
- <schema_key>/schemas/apps/panel/objects/locked</schema_key>
- <value>
- <bool>true</bool>
- </value>
- </entry>
- <entry>
- <key>applets/gnote/bonobo_iid</key>
- <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
- <value>
- <string>OAFIID:GnoteApplet</string>
- </value>
- </entry>
-
-
<entry><key>applets/gnote/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key>
</entry>
-
<entry><key>applets/gnote/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-
<entry><key>applets/gnote/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-
<entry><key>applets/gnote/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-
<entry><key>applets/gnote/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-
<entry><key>applets/gnote/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-
<entry><key>applets/gnote/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
-
<entry><key>applets/gnote/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
-
- <!-- Fast User Switch Applet -->
-
- <entry>
- <key>applets/fast_user_switch_applet/object_type</key>
- <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
- <value>
- <string>bonobo-applet</string>
- </value>
- </entry>
- <entry>
- <key>applets/fast_user_switch_applet/toplevel_id</key>
- <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
- <value>
- <string>top_panel</string>
- </value>
- </entry>
- <entry>
- <key>applets/fast_user_switch_applet/position</key>
- <schema_key>/schemas/apps/panel/objects/position</schema_key>
- <value>
- <int>0</int>
- </value>
- </entry>
- <entry>
- <key>applets/fast_user_switch_applet/panel_right_stick</key>
- <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
- <value>
- <bool>true</bool>
- </value>
- </entry>
- <entry>
- <key>applets/fast_user_switch_applet/locked</key>
- <schema_key>/schemas/apps/panel/objects/locked</schema_key>
- <value>
- <bool>true</bool>
- </value>
- </entry>
- <entry>
- <key>applets/fast_user_switch_applet/bonobo_iid</key>
- <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
- <value>
- <string>OAFIID:GNOME_FastUserSwitchApplet</string>
- </value>
- </entry>
-
-
<entry><key>applets/fast_user_switch_applet/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key>
</entry>
-
<entry><key>applets/fast_user_switch_applet/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-
<entry><key>applets/fast_user_switch_applet/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-
<entry><key>applets/fast_user_switch_applet/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-
<entry><key>applets/fast_user_switch_applet/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-
<entry><key>applets/fast_user_switch_applet/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-
<entry><key>applets/fast_user_switch_applet/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
-
<entry><key>applets/fast_user_switch_applet/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
-
- <!-- Clock Applet -->
-
- <entry>
- <key>applets/clock/object_type</key>
- <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
- <value>
- <string>bonobo-applet</string>
- </value>
- </entry>
- <entry>
- <key>applets/clock/toplevel_id</key>
- <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
- <value>
- <string>top_panel</string>
- </value>
- </entry>
- <entry>
- <key>applets/clock/position</key>
- <schema_key>/schemas/apps/panel/objects/position</schema_key>
- <value>
- <int>1</int>
- </value>
- </entry>
- <entry>
- <key>applets/clock/panel_right_stick</key>
- <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
- <value>
- <bool>true</bool>
- </value>
- </entry>
- <entry>
- <key>applets/clock/locked</key>
- <schema_key>/schemas/apps/panel/objects/locked</schema_key>
- <value>
- <bool>true</bool>
- </value>
- </entry>
- <entry>
- <key>applets/clock/bonobo_iid</key>
- <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
- <value>
- <string>OAFIID:GNOME_ClockApplet</string>
- </value>
- </entry>
-
-
<entry><key>applets/clock/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key>
</entry>
-
<entry><key>applets/clock/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-
<entry><key>applets/clock/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-
<entry><key>applets/clock/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-
<entry><key>applets/clock/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-
<entry><key>applets/clock/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-
<entry><key>applets/clock/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
-
<entry><key>applets/clock/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
-
- <!-- System Tray Applet -->
-
- <entry>
- <key>applets/systray/object_type</key>
- <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
- <value>
- <string>bonobo-applet</string>
- </value>
- </entry>
- <entry>
- <key>applets/systray/toplevel_id</key>
- <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
- <value>
- <string>top_panel</string>
- </value>
- </entry>
- <entry>
- <key>applets/systray/position</key>
- <schema_key>/schemas/apps/panel/objects/position</schema_key>
- <value>
- <int>3</int>
- </value>
- </entry>
- <entry>
- <key>applets/systray/panel_right_stick</key>
- <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
- <value>
- <bool>true</bool>
- </value>
- </entry>
- <entry>
- <key>applets/systray/locked</key>
- <schema_key>/schemas/apps/panel/objects/locked</schema_key>
- <value>
- <bool>true</bool>
- </value>
- </entry>
- <entry>
- <key>applets/systray/bonobo_iid</key>
- <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
- <value>
- <string>OAFIID:GNOME_SystemTrayApplet</string>
- </value>
- </entry>
- <entry>
- <key>applets/systray/prefs/padding</key>
-
<schema_key>/schemas/apps/notification_area_applet/prefs/padding</schema_key>
- <value>
- <int>2</int>
- </value>
- </entry>
-
-
<entry><key>applets/systray/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key>
</entry>
-
<entry><key>applets/systray/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-
<entry><key>applets/systray/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-
<entry><key>applets/systray/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-
<entry><key>applets/systray/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-
<entry><key>applets/systray/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-
<entry><key>applets/systray/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
-
<entry><key>applets/systray/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
-
- <!-- Window List Applet -->
-
- <entry>
- <key>applets/window_list/object_type</key>
- <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
- <value>
- <string>bonobo-applet</string>
- </value>
- </entry>
- <entry>
- <key>applets/window_list/toplevel_id</key>
- <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
- <value>
- <string>bottom_panel</string>
- </value>
- </entry>
- <entry>
- <key>applets/window_list/position</key>
- <schema_key>/schemas/apps/panel/objects/position</schema_key>
- <value>
- <int>1</int>
- </value>
- </entry>
- <entry>
- <key>applets/window_list/panel_right_stick</key>
- <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
- <value>
- <bool>false</bool>
- </value>
- </entry>
- <entry>
- <key>applets/window_list/locked</key>
- <schema_key>/schemas/apps/panel/objects/locked</schema_key>
- <value>
- <bool>true</bool>
- </value>
- </entry>
- <entry>
- <key>applets/window_list/bonobo_iid</key>
- <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
- <value>
- <string>OAFIID:GNOME_WindowListApplet</string>
- </value>
- </entry>
-
-
<entry><key>applets/window_list/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key>
</entry>
-
<entry><key>applets/window_list/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-
<entry><key>applets/window_list/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-
<entry><key>applets/window_list/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-
<entry><key>applets/window_list/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-
<entry><key>applets/window_list/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-
<entry><key>applets/window_list/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
-
<entry><key>applets/window_list/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
-
- <!-- Workspace Switcher Applet -->
-
- <entry>
- <key>applets/workspace_switcher/object_type</key>
- <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
- <value>
- <string>bonobo-applet</string>
- </value>
- </entry>
- <entry>
- <key>applets/workspace_switcher/toplevel_id</key>
- <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
- <value>
- <string>bottom_panel</string>
- </value>
- </entry>
- <entry>
- <key>applets/workspace_switcher/position</key>
- <schema_key>/schemas/apps/panel/objects/position</schema_key>
- <value>
- <int>1</int>
- </value>
- </entry>
- <entry>
- <key>applets/workspace_switcher/panel_right_stick</key>
- <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
- <value>
- <bool>true</bool>
- </value>
- </entry>
- <entry>
- <key>applets/workspace_switcher/locked</key>
- <schema_key>/schemas/apps/panel/objects/locked</schema_key>
- <value>
- <bool>true</bool>
- </value>
- </entry>
- <entry>
- <key>applets/workspace_switcher/bonobo_iid</key>
- <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
- <value>
- <string>OAFIID:GNOME_WorkspaceSwitcherApplet</string>
- </value>
- </entry>
- <entry>
- <key>applets/workspace_switcher/prefs/num_rows</key>
-
<schema_key>/schemas/apps/workspace_switcher/prefs/num_rows</schema_key>
- <value>
- <int>1</int>
- </value>
- </entry>
-
-
<entry><key>applets/workspace_switcher/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key>
</entry>
-
<entry><key>applets/workspace_switcher/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-
<entry><key>applets/workspace_switcher/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-
<entry><key>applets/workspace_switcher/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-
<entry><key>applets/workspace_switcher/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-
<entry><key>applets/workspace_switcher/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-
<entry><key>applets/workspace_switcher/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
-
<entry><key>applets/workspace_switcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
-
- <!-- Trash Applet -->
-
- <entry>
- <key>applets/trash_applet/object_type</key>
- <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
- <value>
- <string>bonobo-applet</string>
- </value>
- </entry>
- <entry>
- <key>applets/trash_applet/toplevel_id</key>
- <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
- <value>
- <string>bottom_panel</string>
- </value>
- </entry>
- <entry>
- <key>applets/trash_applet/position</key>
- <schema_key>/schemas/apps/panel/objects/position</schema_key>
- <value>
- <int>0</int>
- </value>
- </entry>
- <entry>
- <key>applets/trash_applet/panel_right_stick</key>
- <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
- <value>
- <bool>true</bool>
- </value>
- </entry>
- <entry>
- <key>applets/trash_applet/locked</key>
- <schema_key>/schemas/apps/panel/objects/locked</schema_key>
- <value>
- <bool>true</bool>
- </value>
- </entry>
- <entry>
- <key>applets/trash_applet/bonobo_iid</key>
- <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
- <value>
- <string>OAFIID:GNOME_Panel_TrashApplet</string>
- </value>
- </entry>
-
-
<entry><key>applets/trash_applet/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key>
</entry>
-
<entry><key>applets/trash_applet/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-
<entry><key>applets/trash_applet/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-
<entry><key>applets/trash_applet/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-
<entry><key>applets/trash_applet/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-
<entry><key>applets/trash_applet/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-
<entry><key>applets/trash_applet/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
-
<entry><key>applets/trash_applet/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
-
- </entrylist>
-
-</gconfentryfile>
diff --git a/sources b/sources
index c382f1a..89354b8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f394ad73babbce95fd0bb65ec6fd3519 gnome-panel-3.6.2.tar.xz
+SHA512 (gnome-panel-3.34.1.tar.xz) =
6d43285cda00b2e9415cf11f47a51a00941ed294edefb411f7b40003ece814ac08da9d2ccfb167a0a91c7abb9eb17a7f70970ac4eb585ce665cca5fcfbddcf03
commit 3163b499fb2182566471c04b78a23aba4c4eec98
Author: Tomas Hrcka <thrcka(a)redhat.com>
Date: Wed Mar 25 08:24:58 2020 +0100
Revert "Package is retired, replaced by the GNOME Classic session in F19"
This reverts commit 26ea386096c0cd7de55cc2226c46b63338c0ef39.
Unretirement request:
https://pagure.io/releng/issue/9348
Signed-off-by: Tomas Hrcka <thrcka(a)redhat.com>
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..61583cb
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,31 @@
+gnome-panel-2.31.4.tar.bz2
+gnome-panel-2.31.6.tar.bz2
+/gnome-panel-2.31.90.tar.bz2
+/gnome-panel-2.31.92.tar.bz2
+/gnome-panel-2.91.6.tar.bz2
+/gnome-panel-2.91.90.tar.bz2
+/gnome-panel-2.91.91.tar.bz2
+/gnome-panel-2.91.92.tar.bz2
+/gnome-panel-2.91.93.tar.bz2
+/gnome-panel-2.91.94.tar.bz2
+/gnome-panel-3.0.0.tar.bz2
+/gnome-panel-3.0.0.1.tar.bz2
+/gnome-panel-3.0.2.tar.bz2
+/gnome-panel-3.1.5.tar.xz
+/gnome-panel-3.1.91.tar.xz
+/gnome-panel-3.1.92.tar.xz
+/gnome-panel-3.2.0.tar.xz
+/gnome-panel-3.2.1.tar.xz
+/gnome-panel-3.3.1.tar.xz
+/gnome-panel-3.3.3.tar.xz
+/gnome-panel-3.3.5.tar.xz
+/gnome-panel-3.3.90.tar.xz
+/gnome-panel-3.3.91.tar.xz
+/gnome-panel-3.3.92.tar.xz
+/gnome-panel-3.4.0.tar.xz
+/gnome-panel-3.4.1.tar.xz
+/gnome-panel-3.4.2.1.tar.xz
+/gnome-panel-3.5.3.tar.xz
+/gnome-panel-3.5.4.tar.xz
+/gnome-panel-3.6.0.tar.xz
+/gnome-panel-3.6.2.tar.xz
diff --git a/Use-16px-menu-icons.patch b/Use-16px-menu-icons.patch
new file mode 100644
index 0000000..64e94dd
--- /dev/null
+++ b/Use-16px-menu-icons.patch
@@ -0,0 +1,25 @@
+From de049e9a8846270ed643b5c021ecd75fa259e00e Mon Sep 17 00:00:00 2001
+From: William Jon McCann <jmccann(a)redhat.com>
+Date: Mon, 4 Apr 2011 17:48:39 -0400
+Subject: [PATCH] Use 16px menu icons
+
+https://bugzilla.gnome.org/show_bug.cgi?id=646749
+---
+ gnome-panel/panel-stock-icons.h | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/gnome-panel/panel-stock-icons.h b/gnome-panel/panel-stock-icons.h
+index efac6d4..229d80a 100644
+--- a/gnome-panel/panel-stock-icons.h
++++ b/gnome-panel/panel-stock-icons.h
+@@ -31,7 +31,7 @@
+ G_BEGIN_DECLS
+
+ /* themeable size - "panel-menu" -- This is used for the icons in the menus
*/
+-#define PANEL_DEFAULT_MENU_ICON_SIZE 24
++#define PANEL_DEFAULT_MENU_ICON_SIZE 16
+
+ /* stock icons */
+ #define PANEL_STOCK_FORCE_QUIT "gnome-panel-force-quit"
+--
+1.7.3.4
\ No newline at end of file
diff --git a/add-translations.sh b/add-translations.sh
new file mode 100644
index 0000000..9824d5a
--- /dev/null
+++ b/add-translations.sh
@@ -0,0 +1,235 @@
+cat >>po/bg.po <<EOF
+
+msgid "Suspend"
+msgstr ""
+EOF
+cat >>po/bn_IN.po <<EOF
+
+msgid "Suspend"
+msgstr ""
+EOF
+cat >>po/bn.po <<EOF
+
+msgid "Suspend"
+msgstr ""
+EOF
+cat >>po/ca.po <<EOF
+
+msgid "Suspend"
+msgstr "Atura temporalment"
+EOF
+cat >>po/cs.po <<EOF
+
+msgid "Suspend"
+msgstr "Suspendovat"
+EOF
+cat >>po/de.po <<EOF
+
+msgid "Suspend"
+msgstr "Stromsparmodus"
+EOF
+cat >>po/dz.po <<EOF
+
+msgid "Suspend"
+msgstr ""
+EOF
+cat >>po/el.po <<EOF
+
+msgid "Suspend"
+msgstr ""
+EOF
+cat >>po/en_CA.po <<EOF
+
+msgid "Suspend"
+msgstr "Suspend"
+EOF
+cat >>po/en_GB.po <<EOF
+
+msgid "Suspend"
+msgstr "Suspend"
+EOF
+cat >>po/es.po <<EOF
+
+msgid "Suspend"
+msgstr "Suspender"
+EOF
+cat >>po/et.po <<EOF
+
+msgid "Suspend"
+msgstr ""
+EOF
+cat >>po/eu.po <<EOF
+
+msgid "Suspend"
+msgstr "Eseki"
+EOF
+cat >>po/fi.po <<EOF
+
+msgid "Suspend"
+msgstr "Keskeytystila"
+EOF
+cat >>po/fr.po <<EOF
+
+msgid "Suspend"
+msgstr "Mise en veille prolonge"
+EOF
+cat >>po/gl.po <<EOF
+
+msgid "Suspend"
+msgstr "Suspender"
+EOF
+cat >>po/gu.po <<EOF
+
+msgid "Suspend"
+msgstr ""
+EOF
+cat >>po/hi.po <<EOF
+
+msgid "Suspend"
+msgstr ""
+EOF
+cat >>po/hu.po <<EOF
+
+msgid "Suspend"
+msgstr "Felfggeszts"
+EOF
+cat >>po/it.po <<EOF
+
+msgid "Suspend"
+msgstr "Sospendi"
+EOF
+cat >>po/ja.po <<EOF
+
+msgid "Suspend"
+msgstr ""
+EOF
+cat >>po/ka.po <<EOF
+
+msgid "Suspend"
+msgstr ""
+EOF
+cat >>po/ko.po <<EOF
+
+msgid "Suspend"
+msgstr ""
+EOF
+cat >>po/lt.po <<EOF
+
+msgid "Suspend"
+msgstr "Umigdyti"
+EOF
+cat >>po/lv.po <<EOF
+
+msgid "Suspend"
+msgstr "Prstt"
+EOF
+cat >>po/mg.po <<EOF
+
+msgid "Suspend"
+msgstr "Ahatoy"
+EOF
+cat >>po/mk.po <<EOF
+
+msgid "Suspend"
+msgstr ""
+EOF
+cat >>po/ml.po <<EOF
+
+msgid "Suspend"
+msgstr " "
+EOF
+cat >>po/nb.po <<EOF
+
+msgid "Suspend"
+msgstr "Hvilemodus"
+EOF
+cat >>po/nl.po <<EOF
+
+msgid "Suspend"
+msgstr "Pauzestand"
+EOF
+cat >>po/or.po <<EOF
+
+msgid "Suspend"
+msgstr " "
+EOF
+cat >>po/pa.po <<EOF
+
+msgid "Suspend"
+msgstr ""
+EOF
+cat >>po/pl.po <<EOF
+
+msgid "Suspend"
+msgstr "Wstrzymanie"
+EOF
+cat >>po/pt_BR.po <<EOF
+
+msgid "Suspend"
+msgstr "Suspender"
+EOF
+cat >>po/pt.po <<EOF
+
+msgid "Suspend"
+msgstr "Suspender"
+EOF
+cat >>po/ru.po <<EOF
+
+msgid "Suspend"
+msgstr " "
+EOF
+cat >>po/sk.po <<EOF
+
+msgid "Suspend"
+msgstr ""
+EOF
+cat >>po/sr(a)Latn.po <<EOF
+
+msgid "Suspend"
+msgstr "Privremeno zaustavi"
+EOF
+cat >>po/sr.po <<EOF
+
+msgid "Suspend"
+msgstr " "
+EOF
+cat >>po/sv.po <<EOF
+
+msgid "Suspend"
+msgstr "Vntelge"
+EOF
+cat >>po/ta.po <<EOF
+
+msgid "Suspend"
+msgstr " "
+EOF
+cat >>po/th.po <<EOF
+
+msgid "Suspend"
+msgstr ""
+EOF
+cat >>po/uk.po <<EOF
+
+msgid "Suspend"
+msgstr ""
+EOF
+cat >>po/vi.po <<EOF
+
+msgid "Suspend"
+msgstr "Ngng"
+EOF
+cat >>po/zh_CN.po <<EOF
+
+msgid "Suspend"
+msgstr ""
+EOF
+cat >>po/zh_HK.po <<EOF
+
+msgid "Suspend"
+msgstr ""
+EOF
+cat >>po/zh_TW.po <<EOF
+
+msgid "Suspend"
+msgstr ""
+EOF
diff --git a/applet-error.patch b/applet-error.patch
new file mode 100644
index 0000000..9a3228a
--- /dev/null
+++ b/applet-error.patch
@@ -0,0 +1,36 @@
+diff -up gnome-panel-2.25.5/gnome-panel/panel-applet-frame.c.applet-error
gnome-panel-2.25.5/gnome-panel/panel-applet-frame.c
+--- gnome-panel-2.25.5/gnome-panel/panel-applet-frame.c.applet-error 2009-01-20
09:04:47.000000000 -0500
++++ gnome-panel-2.25.5/gnome-panel/panel-applet-frame.c 2009-01-20 14:22:33.000000000
-0500
+@@ -1246,6 +1246,21 @@ panel_applet_frame_event_listener (Bonob
+ panel_applet_frame_set_size_hints_from_any (frame, any);
+ }
+
++static gboolean
++in_default_panel_config (const gchar *id)
++{
++ gchar *dir;
++ gboolean result;
++
++ dir = g_strconcat (PANEL_DEFAULTS_DIR, "/applets/", id, NULL);
++ result = gconf_client_dir_exists (panel_gconf_get_client (),
++ dir,
++ NULL);
++ g_free (dir);
++
++ return result;
++}
++
+ static void
+ panel_applet_frame_activated (CORBA_Object object,
+ const char *error_reason,
+@@ -1425,7 +1440,9 @@ panel_applet_frame_activated (CORBA_Obje
+ return;
+
+ error_out:
+- panel_applet_frame_loading_failed (frame, frame_act->id);
++ if (!in_default_panel_config (frame_act->id)) {
++ panel_applet_frame_loading_failed (frame, frame_act->id);
++ }
+ if (widget)
+ g_object_unref (widget);
+ panel_applet_stop_loading (frame_act->id);
diff --git a/bookmarks-submenu.patch b/bookmarks-submenu.patch
new file mode 100644
index 0000000..90e619f
--- /dev/null
+++ b/bookmarks-submenu.patch
@@ -0,0 +1,12 @@
+diff -up gnome-panel-2.29.5.1/gnome-panel/panel-menu-items.c.bookmarks-submenu
gnome-panel-2.29.5.1/gnome-panel/panel-menu-items.c
+--- gnome-panel-2.29.5.1/gnome-panel/panel-menu-items.c.bookmarks-submenu 2010-01-17
18:19:36.000000000 -0500
++++ gnome-panel-2.29.5.1/gnome-panel/panel-menu-items.c 2010-01-17 18:21:00.466529924
-0500
+@@ -61,7 +61,7 @@
+ #define NAMES_DIR "/apps/nautilus/desktop"
+ #define HOME_NAME_KEY "/apps/nautilus/desktop/home_icon_name"
+ #define COMPUTER_NAME_KEY "/apps/nautilus/desktop/computer_icon_name"
+-#define MAX_ITEMS_OR_SUBMENU 5
++#define MAX_ITEMS_OR_SUBMENU 8
+ #define MAX_BOOKMARK_ITEMS 100
+
+ G_DEFINE_TYPE (PanelPlaceMenuItem, panel_place_menu_item, GTK_TYPE_IMAGE_MENU_ITEM)
diff --git a/clock-home.patch b/clock-home.patch
new file mode 100644
index 0000000..a4a60e3
--- /dev/null
+++ b/clock-home.patch
@@ -0,0 +1,21 @@
+diff -up gnome-panel-2.28.0/applets/clock/clock.schemas.in.clock-home
gnome-panel-2.28.0/applets/clock/clock.schemas.in
+--- gnome-panel-2.28.0/applets/clock/clock.schemas.in.clock-home 2009-07-01
09:06:23.000000000 -0400
++++ gnome-panel-2.28.0/applets/clock/clock.schemas.in 2009-10-07 22:36:12.298466938
-0400
+@@ -211,7 +211,7 @@
+ <key>/schemas/apps/clock_applet/prefs/expand_locations</key>
+ <owner>clock-applet</owner>
+ <type>bool</type>
+- <default>false</default>
++ <default>true</default>
+ <locale name="C">
+ <short>Expand list of locations</short>
+ <long>
+@@ -271,7 +271,7 @@
+ <owner>clock-applet</owner>
+ <type>list</type>
+ <list_type>string</list_type>
+- <default>[]</default>
++ <default>[<location name=""
city="Boston" timezone="America/New_York"
latitude="42.360558" longitude="-71.010559"
code="KBOS" current="true"/>]</default>
+ <locale name="C">
+ <short>List of locations</short>
+ <long>
diff --git a/clock-network.patch b/clock-network.patch
new file mode 100644
index 0000000..db88b82
--- /dev/null
+++ b/clock-network.patch
@@ -0,0 +1,22 @@
+diff -up gnome-panel-2.26.1/applets/clock/clock-location.c.network
gnome-panel-2.26.1/applets/clock/clock-location.c
+--- gnome-panel-2.26.1/applets/clock/clock-location.c.network 2009-04-15
17:28:26.760634154 -0400
++++ gnome-panel-2.26.1/applets/clock/clock-location.c 2009-04-15 17:43:41.869383882
-0400
+@@ -12,6 +12,9 @@
+ #include <time.h>
+ #include <unistd.h>
+ #include <math.h>
++#include <netinet/in.h>
++#include <arpa/nameser.h>
++#include <resolv.h>
+
+ #include <glib.h>
+ #include <gio/gio.h>
+@@ -695,6 +698,8 @@ state_notify (DBusPendingCall *pending,
+ DBUS_TYPE_UINT32, &result,
+ DBUS_TYPE_INVALID)) {
+ if (result == NM_STATE_CONNECTED) {
++ /* thank you, glibc */
++ res_init ();
+ update_weather_infos ();
+ }
+ }
diff --git a/dead.package b/dead.package
deleted file mode 100644
index ec43253..0000000
--- a/dead.package
+++ /dev/null
@@ -1 +0,0 @@
-Package is retired, replaced by the GNOME Classic session in F19
diff --git a/desktop-file-monitoring.patch b/desktop-file-monitoring.patch
new file mode 100644
index 0000000..adfa5e2
--- /dev/null
+++ b/desktop-file-monitoring.patch
@@ -0,0 +1,280 @@
+diff -up gnome-panel-2.29.5.1/gnome-panel/launcher.c.desktop-file-monitoring
gnome-panel-2.29.5.1/gnome-panel/launcher.c
+--- gnome-panel-2.29.5.1/gnome-panel/launcher.c.desktop-file-monitoring 2010-01-13
22:26:27.000000000 -0500
++++ gnome-panel-2.29.5.1/gnome-panel/launcher.c 2010-01-17 18:06:14.640537280 -0500
+@@ -237,6 +237,8 @@ static void
+ destroy_launcher (GtkWidget *widget,
+ Launcher *launcher)
+ {
++ if (launcher->monitor)
++ g_object_unref (launcher->monitor);
+ launcher_properties_destroy (launcher);
+ launcher_widget_destroy_open_dialogs (launcher);
+ }
+@@ -410,6 +412,37 @@ drag_data_get_cb (GtkWidget *widg
+
+ }
+
++static void setup_button (Launcher *launcher);
++
++static void
++desktop_file_changed (GFileMonitor *monitor,
++ GFile *file,
++ GFile *other_file,
++ GFileMonitorEvent event_type,
++ gpointer user_data)
++{
++ Launcher *launcher = user_data;
++ GKeyFile *key_file;
++
++ if (event_type == G_FILE_MONITOR_EVENT_CHANGED ||
++ event_type == G_FILE_MONITOR_EVENT_CREATED) {
++ gchar *path;
++
++ path = g_file_get_path (file);
++
++ key_file = g_key_file_new ();
++ if (g_key_file_load_from_file (key_file, path,
++ G_KEY_FILE_KEEP_COMMENTS|G_KEY_FILE_KEEP_TRANSLATIONS,
++ NULL)) {
++ g_key_file_free (launcher->key_file);
++ launcher->key_file = key_file;
++ setup_button (launcher);
++ }
++
++ g_free (path);
++ }
++}
++
+ static Launcher *
+ create_launcher (const char *location)
+ {
+@@ -482,6 +515,21 @@ create_launcher (const char *location)
+ launcher->key_file = key_file;
+ launcher->prop_dialog = NULL;
+ launcher->destroy_handler = 0;
++ launcher->monitor = NULL;
++
++ /* Watch for changes to the desktop file. Since we don't want
++ * to do this for every launcher, we only do it if the desktop
++ * file contains a X-Panel-Monitor entry.
++ */
++ if (g_key_file_get_boolean (key_file, "Desktop Entry",
"X-Panel-Monitor", NULL)) {
++ GFile *file;
++
++ file = g_file_new_for_path (new_location);
++ launcher->monitor = g_file_monitor_file (file, 0, NULL, NULL);
++ g_signal_connect (launcher->monitor, "changed",
++ G_CALLBACK (desktop_file_changed), launcher);
++ g_object_unref (file);
++ }
+
+ /* Icon will be setup later */
+ launcher->button = button_widget_new (NULL /* icon */,
+@@ -612,6 +660,15 @@ static void
+ launcher_changed (PanelDItemEditor *dialog,
+ Launcher *launcher)
+ {
++ /* If the user manually changes launcher properties,
++ * we stop monitoring the desktop file to not overwrite
++ * user changes.
++ */
++ if (launcher->monitor) {
++ g_object_unref (launcher->monitor);
++ launcher->monitor = NULL;
++ }
++
+ /* Setup the button look */
+ setup_button (launcher);
+ }
+@@ -681,6 +738,42 @@ launcher_save_uri (PanelDItemEditor *dia
+ return NULL;
+ }
+
++static const char *
++desktop_file_to_monitor (PanelDItemEditor *editor)
++{
++ const char *entry;
++ GKeyFile *key_file;
++
++ /* When the user selects a desktop file in the ditem editor,
++ * start monitoring the desktop file for changes.
++ */
++ entry = panel_ditem_editor_get_orig_desktop_file (editor);
++ if (entry) {
++ key_file = g_key_file_new ();
++ if (!g_key_file_load_from_file (key_file, entry, 0, NULL) ||
++ !panel_key_file_get_boolean (key_file, "X-Panel-Monitor", FALSE))
++ entry = NULL;
++ g_key_file_free (key_file);
++ }
++
++ return entry;
++}
++
++static void
++start_monitoring (Launcher *launcher)
++{
++ GFile *file;
++
++ file = g_file_new_for_path (launcher->location);
++ if (launcher->monitor)
++ g_object_unref (launcher->monitor);
++ launcher->monitor = g_file_monitor_file (file, 0, NULL, NULL);
++ g_signal_connect (launcher->monitor, "changed",
++ G_CALLBACK (desktop_file_changed),
++ launcher);
++ g_object_unref (file);
++}
++
+ static void
+ launcher_saved (GtkWidget *dialog,
+ Launcher *launcher)
+@@ -688,11 +781,15 @@ launcher_saved (GtkWidget *dialog,
+ const char *uri;
+ GConfClient *client;
+ const char *key;
++ const char *path;
+
+ uri = panel_ditem_editor_get_uri (PANEL_DITEM_EDITOR (dialog));
+ if (panel_launcher_get_filename (uri) != NULL)
+ uri = panel_launcher_get_filename (uri);
+
++ if ((path = desktop_file_to_monitor (PANEL_DITEM_EDITOR (dialog))) != NULL)
++ uri = path;
++
+ if (uri && launcher->location && strcmp (uri,
launcher->location)) {
+ client = panel_gconf_get_client ();
+
+@@ -705,6 +802,9 @@ launcher_saved (GtkWidget *dialog,
+ if (launcher->location)
+ g_free (launcher->location);
+ launcher->location = g_strdup (uri);
++
++ if (path)
++ start_monitoring (launcher);
+ }
+ }
+
+@@ -871,6 +971,7 @@ launcher_new_saved (GtkWidget *dialog,
+ PanelWidget *panel;
+ int pos;
+ const char *uri;
++ const char *path;
+
+ pos = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (dialog), "pos"));
+ panel = g_object_get_data (G_OBJECT (dialog), "panel");
+@@ -878,6 +979,10 @@ launcher_new_saved (GtkWidget *dialog,
+ uri = panel_ditem_editor_get_uri (PANEL_DITEM_EDITOR (dialog));
+ if (panel_launcher_get_filename (uri) != NULL)
+ uri = panel_launcher_get_filename (uri);
++
++ if ((path = desktop_file_to_monitor (PANEL_DITEM_EDITOR (dialog))) != NULL)
++ uri = path;
++
+ panel_launcher_create (panel->toplevel, pos, uri);
+ }
+
+diff -up gnome-panel-2.29.5.1/gnome-panel/launcher.h.desktop-file-monitoring
gnome-panel-2.29.5.1/gnome-panel/launcher.h
+--- gnome-panel-2.29.5.1/gnome-panel/launcher.h.desktop-file-monitoring 2009-04-19
13:45:09.000000000 -0400
++++ gnome-panel-2.29.5.1/gnome-panel/launcher.h 2010-01-17 18:06:14.638537025 -0500
+@@ -27,6 +27,8 @@ typedef struct {
+ GSList *error_dialogs;
+
+ gulong destroy_handler;
++
++ GFileMonitor *monitor;
+ } Launcher;
+
+ void panel_launcher_create (PanelToplevel *toplevel,
+@@ -56,7 +58,6 @@ void launcher_load_from_gconf
+ gint position,
+ const char *id);
+
+-void panel_launcher_delete (Launcher *launcher);
+
+ void ask_about_launcher (const char *file,
+ PanelWidget *panel,
+diff -up gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c.desktop-file-monitoring
gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c
+---
gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c.desktop-file-monitoring 2010-01-17
18:06:14.635278719 -0500
++++ gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c 2010-01-17 18:11:39.921279627
-0500
+@@ -81,6 +81,8 @@ struct _PanelDItemEditorPrivate
+ GtkWidget *close_button;
+ GtkWidget *cancel_button;
+ GtkWidget *ok_button;
++
++ char *orig_desktop_file;
+ };
+
+ /* Time in seconds after which we save the file on the disk */
+@@ -366,6 +368,10 @@ panel_ditem_editor_destroy (GtkObject *o
+ g_free (dialog->priv->uri);
+ dialog->priv->uri = NULL;
+
++ if (dialog->priv->orig_desktop_file != NULL)
++ g_free (dialog->priv->orig_desktop_file);
++ dialog->priv->orig_desktop_file = NULL;
++
+ GTK_OBJECT_CLASS (panel_ditem_editor_parent_class)->destroy (object);
+ }
+
+@@ -833,6 +839,13 @@ panel_ditem_editor_changed (PanelDItemEd
+ TRUE);
+ }
+
++ /* When the user changes any fields, unset the orig_desktop_file
++ * field since the editor contents are not entirely from a desktop
++ * file anymore.
++ */
++ g_free (dialog->priv->orig_desktop_file);
++ dialog->priv->orig_desktop_file = NULL;
++
+ dialog->priv->dirty = TRUE;
+ g_signal_emit (G_OBJECT (dialog), ditem_edit_signals[CHANGED], 0);
+ }
+@@ -992,6 +1005,13 @@ update_editor_from_desktop_file (PanelDI
+ */
+ setup_icon_chooser (dialog, icon);
+
++ /* We set the orig_desktop_file field to let the
++ * launcher know that the editor contents are coming
++ * directly from a desktop file.
++ */
++ g_free (dialog->priv->orig_desktop_file);
++ dialog->priv->orig_desktop_file = g_strdup (uri);
++
+ g_free (name);
+ g_free (comment);
+ g_free (icon);
+@@ -1066,6 +1086,7 @@ update_chooser_for_type (PanelDItemEdito
+ g_assert_not_reached ();
+ }
+
++
+ chooser = dialog->priv->command_browse_filechooser;
+
+ gtk_window_set_title (GTK_WINDOW (chooser),
+@@ -1849,3 +1870,12 @@ panel_ditem_register_save_uri_func (Pane
+ dialog->priv->save_uri = save_uri;
+ dialog->priv->save_uri_data = data;
+ }
++
++G_CONST_RETURN char *
++panel_ditem_editor_get_orig_desktop_file (PanelDItemEditor *dialog)
++{
++ g_return_val_if_fail (PANEL_IS_DITEM_EDITOR (dialog), NULL);
++
++ return dialog->priv->orig_desktop_file;
++}
++
+diff -up gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.h.desktop-file-monitoring
gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.h
+---
gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.h.desktop-file-monitoring 2009-04-19
13:45:09.000000000 -0400
++++ gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.h 2010-01-17 18:06:14.638537025
-0500
+@@ -101,6 +101,8 @@ void panel_ditem_editor_set_uri (PanelDI
+ const char *uri);
+
+ G_CONST_RETURN char *panel_ditem_editor_get_uri (PanelDItemEditor *dialog);
++G_CONST_RETURN char *panel_ditem_editor_get_orig_desktop_file (PanelDItemEditor
*dialog);
++
+
+ void panel_ditem_register_save_uri_func (PanelDItemEditor *dialog,
+ PanelDitemSaveUri save_uri,
diff --git a/drop-gweather-xml-include.patch b/drop-gweather-xml-include.patch
new file mode 100644
index 0000000..3b3a559
--- /dev/null
+++ b/drop-gweather-xml-include.patch
@@ -0,0 +1,10 @@
+--- applets/clock/clock.c.orig 2012-12-25 14:38:00.101601746 -0600
++++ applets/clock/clock.c 2012-12-25 14:38:30.331443803 -0600
+@@ -54,7 +54,6 @@
+ #define GNOME_DESKTOP_USE_UNSTABLE_API
+ #include <libgnome-desktop/gnome-wall-clock.h>
+
+-#include <libgweather/gweather-xml.h>
+ #include <libgweather/location-entry.h>
+ #include <libgweather/timezone-menu.h>
+ #include <libgweather/gweather-enum-types.h>
diff --git a/fix-clock-crash.patch b/fix-clock-crash.patch
new file mode 100644
index 0000000..4a12b60
--- /dev/null
+++ b/fix-clock-crash.patch
@@ -0,0 +1,52 @@
+From 58d7ba0359ab128f30b39ea0518a69ed83a4e329 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode(a)redhat.com>
+Date: Tue, 8 Dec 2009 14:48:58 -0500
+Subject: [PATCH] Only call e_passwords_shutdown once
+
+It doesn't appear to support being called multiple times
+in a row.
+
+It appears there was already an attempt to do this with a
+reference counter called clock_numbers:
+
+/* Used to count the number of clock instances. It's there to know when
+ * we should free resources that are shared. */
+static int clock_numbers = 0;
+
+But the logic was wrong.
+---
+ applets/clock/clock.c | 9 +++++++--
+ 1 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/applets/clock/clock.c b/applets/clock/clock.c
+index ddbbc16..c06530a 100644
+--- a/applets/clock/clock.c
++++ b/applets/clock/clock.c
+@@ -803,8 +803,11 @@ destroy_clock (GtkWidget * widget, ClockData *cd)
+
+ #ifdef HAVE_LIBECAL
+ if (clock_numbers > 0) {
+- e_passwords_shutdown ();
+ clock_numbers--;
++
++ if (clock_numbers == 0) {
++ e_passwords_shutdown ();
++ }
+ }
+ #endif
+ }
+@@ -1385,8 +1388,10 @@ static void
+ create_clock_widget (ClockData *cd)
+ {
+ #ifdef HAVE_LIBECAL
++ if (clock_numbers == 0) {
++ e_passwords_init ();
++ }
+ clock_numbers++;
+- e_passwords_init ();
+ #endif
+
+ /* Main toggle button */
+--
+1.6.5.2
+
diff --git a/gnome-compiler-flags.m4 b/gnome-compiler-flags.m4
new file mode 100644
index 0000000..7368178
--- /dev/null
+++ b/gnome-compiler-flags.m4
@@ -0,0 +1,141 @@
+dnl GNOME_COMPILE_WARNINGS
+dnl Turn on many useful compiler warnings
+dnl For now, only works on GCC
+AC_DEFUN([GNOME_COMPILE_WARNINGS],[
+ dnl ******************************
+ dnl More compiler warnings
+ dnl ******************************
+
+ AC_ARG_ENABLE(compile-warnings,
+
AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
+ [Turn on compiler warnings]),,
+ [enable_compile_warnings="m4_default([$1],[yes])"])
+
+ warnCFLAGS=
+ if test "x$GCC" != xyes; then
+ enable_compile_warnings=no
+ fi
+
+ warning_flags=
+ realsave_CFLAGS="$CFLAGS"
+
+ case "$enable_compile_warnings" in
+ no)
+ warning_flags=
+ ;;
+ minimum)
+ warning_flags="-Wall"
+ ;;
+ yes)
+ warning_flags="-Wall -Wmissing-prototypes"
+ ;;
+ maximum|error)
+ warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
+ CFLAGS="$warning_flags $CFLAGS"
+ for option in -Wno-sign-compare; do
+ SAVE_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $option"
+ AC_MSG_CHECKING([whether gcc understands $option])
+ AC_TRY_COMPILE([], [],
+ has_option=yes,
+ has_option=no,)
+ CFLAGS="$SAVE_CFLAGS"
+ AC_MSG_RESULT($has_option)
+ if test $has_option = yes; then
+ warning_flags="$warning_flags $option"
+ fi
+ unset has_option
+ unset SAVE_CFLAGS
+ done
+ unset option
+ if test "$enable_compile_warnings" = "error" ; then
+ warning_flags="$warning_flags -Werror"
+ fi
+ ;;
+ *)
+ AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to
--enable-compile-warnings)
+ ;;
+ esac
+ CFLAGS="$realsave_CFLAGS"
+ AC_MSG_CHECKING(what warning flags to pass to the C compiler)
+ AC_MSG_RESULT($warning_flags)
+
+ AC_ARG_ENABLE(iso-c,
+ AC_HELP_STRING([--enable-iso-c],
+ [Try to warn if code is not ISO C ]),,
+ [enable_iso_c=no])
+
+ AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
+ complCFLAGS=
+ if test "x$enable_iso_c" != "xno"; then
+ if test "x$GCC" = "xyes"; then
+ case " $CFLAGS " in
+ *[\ \ ]-ansi[\ \ ]*) ;;
+ *) complCFLAGS="$complCFLAGS -ansi" ;;
+ esac
+ case " $CFLAGS " in
+ *[\ \ ]-pedantic[\ \ ]*) ;;
+ *) complCFLAGS="$complCFLAGS -pedantic" ;;
+ esac
+ fi
+ fi
+ AC_MSG_RESULT($complCFLAGS)
+
+ WARN_CFLAGS="$warning_flags $complCFLAGS"
+ AC_SUBST(WARN_CFLAGS)
+])
+
+dnl For C++, do basically the same thing.
+
+AC_DEFUN([GNOME_CXX_WARNINGS],[
+ AC_ARG_ENABLE(cxx-warnings,
+ AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
+ [Turn on compiler warnings.]),,
+ [enable_cxx_warnings="m4_default([$1],[minimum])"])
+
+ AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
+ warnCXXFLAGS=
+ if test "x$GCC" != xyes; then
+ enable_compile_warnings=no
+ fi
+ if test "x$enable_cxx_warnings" != "xno"; then
+ if test "x$GCC" = "xyes"; then
+ case " $CXXFLAGS " in
+ *[\ \ ]-Wall[\ \ ]*) ;;
+ *) warnCXXFLAGS="-Wall -Wno-unused" ;;
+ esac
+
+ ## -W is not all that useful. And it cannot be controlled
+ ## with individual -Wno-xxx flags, unlike -Wall
+ if test "x$enable_cxx_warnings" = "xyes"; then
+ warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
+ fi
+ fi
+ fi
+ AC_MSG_RESULT($warnCXXFLAGS)
+
+ AC_ARG_ENABLE(iso-cxx,
+ AC_HELP_STRING([--enable-iso-cxx],
+ [Try to warn if code is not ISO C++ ]),,
+ [enable_iso_cxx=no])
+
+ AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
+ complCXXFLAGS=
+ if test "x$enable_iso_cxx" != "xno"; then
+ if test "x$GCC" = "xyes"; then
+ case " $CXXFLAGS " in
+ *[\ \ ]-ansi[\ \ ]*) ;;
+ *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
+ esac
+
+ case " $CXXFLAGS " in
+ *[\ \ ]-pedantic[\ \ ]*) ;;
+ *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
+ esac
+ fi
+ fi
+ AC_MSG_RESULT($complCXXFLAGS)
+
+ WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
+ AC_SUBST(WARN_CXXFLAGS)
+])
diff --git a/gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch
b/gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch
new file mode 100644
index 0000000..3188df4
--- /dev/null
+++ b/gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch
@@ -0,0 +1,11 @@
+---
gnome-panel-2.10.1/applets/fish/fish.schemas.in.speak-to-us-ye-old-wise-fish 2005-04-25
06:52:48.000000000 -0400
++++ gnome-panel-2.10.1/applets/fish/fish.schemas.in 2005-04-25 06:53:13.000000000 -0400
+@@ -34,7 +34,7 @@
+ <key>/schemas/apps/fish_applet/prefs/command</key>
+ <owner>fish-applet</owner>
+ <type>string</type>
+- <default>fortune</default>
++ <default>ddate</default>
+ <locale name="C">
+ <short>Command to execute on click</short>
+ <long>
diff --git a/gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
b/gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
new file mode 100644
index 0000000..8032a80
--- /dev/null
+++ b/gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
@@ -0,0 +1,17 @@
+diff -up
gnome-panel-2.21.92/applets/clock/calendar-client.c.allow-spurious-view-done-signals
gnome-panel-2.21.92/applets/clock/calendar-client.c
+---
gnome-panel-2.21.92/applets/clock/calendar-client.c.allow-spurious-view-done-signals 2008-02-26
08:17:49.000000000 -0500
++++ gnome-panel-2.21.92/applets/clock/calendar-client.c 2008-03-03 10:22:57.000000000
-0500
+@@ -1217,6 +1217,13 @@ calendar_client_handle_query_completed (
+ {
+ CalendarClientQuery *query;
+
++ if (!source->query_in_progress)
++ {
++ g_warning ("Got spurious 'view-done' signal from calendar backend for
query %p\n",
++ &source->completed_query);
++ return;
++ }
++
+ query = goddamn_this_is_crack (source, view, NULL);
+
+ dprintf ("Query %p completed: %s\n", query, e_cal_get_error_message
(status));
diff --git a/gnome-panel-about.patch b/gnome-panel-about.patch
new file mode 100644
index 0000000..3b31508
--- /dev/null
+++ b/gnome-panel-about.patch
@@ -0,0 +1,13 @@
+diff -up gnome-panel-2.27.91/gnome-panel/panel-menu-items.c.about
gnome-panel-2.27.91/gnome-panel/panel-menu-items.c
+--- gnome-panel-2.27.91/gnome-panel/panel-menu-items.c.about 2009-08-25
13:32:12.101272238 -0400
++++ gnome-panel-2.27.91/gnome-panel/panel-menu-items.c 2009-08-25 14:08:21.444015913
-0400
+@@ -1170,7 +1170,8 @@ panel_desktop_menu_item_append_menu (Gtk
+ add_menu_separator (menu);
+
+ panel_menu_items_append_from_desktop (menu, "gnome-yelp.desktop", NULL,
FALSE);
+- panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL,
FALSE);
++ if (panel_has_desktop_file ("about-this-computer.desktop"))
++ panel_menu_items_append_from_desktop (menu, "about-this-computer.desktop",
NULL, FALSE);
+
+ if (parent->priv->append_lock_logout)
+ panel_menu_items_append_lock_logout (menu);
diff --git a/gnome-panel-libs.patch b/gnome-panel-libs.patch
new file mode 100644
index 0000000..f02dd49
--- /dev/null
+++ b/gnome-panel-libs.patch
@@ -0,0 +1,555 @@
+diff -up gnome-panel-2.91.6/applets/clock/.libs gnome-panel-2.91.6/applets/clock/
+Only in gnome-panel-2.91.6/applets/clock/: calendar-client.c
+Only in gnome-panel-2.91.6/applets/clock/:
calendar-client.c.allow-spurious-view-done-signals
+Only in gnome-panel-2.91.6/applets/clock/: calendar-client.h
+Only in gnome-panel-2.91.6/applets/clock/: calendar-debug.h
+Only in gnome-panel-2.91.6/applets/clock/: calendar-sources.c
+Only in gnome-panel-2.91.6/applets/clock/: calendar-sources.h
+Only in gnome-panel-2.91.6/applets/clock/: calendar-window.c
+Only in gnome-panel-2.91.6/applets/clock/: calendar-window.h
+Binary files gnome-panel-2.91.6/applets/clock/.libs/clock-applet and
gnome-panel-2.91.6/applets/clock/clock-applet differ
+Only in gnome-panel-2.91.6/applets/clock/: clock_applet-calendar-client.o
+Only in gnome-panel-2.91.6/applets/clock/: clock_applet-calendar-sources.o
+Only in gnome-panel-2.91.6/applets/clock/: clock_applet-calendar-window.o
+Only in gnome-panel-2.91.6/applets/clock/: clock_applet-clock-face.o
+Only in gnome-panel-2.91.6/applets/clock/: clock_applet-clock-location.o
+Only in gnome-panel-2.91.6/applets/clock/: clock_applet-clock-location-tile.o
+Only in gnome-panel-2.91.6/applets/clock/: clock_applet-clock-map.o
+Only in gnome-panel-2.91.6/applets/clock/: clock_applet-clock-marshallers.o
+Only in gnome-panel-2.91.6/applets/clock/: clock_applet-clock.o
+Only in gnome-panel-2.91.6/applets/clock/: clock_applet-clock-sunpos.o
+Only in gnome-panel-2.91.6/applets/clock/: clock_applet-clock-typebuiltins.o
+Only in gnome-panel-2.91.6/applets/clock/: clock_applet-clock-utils.o
+Only in gnome-panel-2.91.6/applets/clock/: clock_applet-set-timezone.o
+Only in gnome-panel-2.91.6/applets/clock/: clock.c
+Only in gnome-panel-2.91.6/applets/clock/: clock.c.fix-clock-crash
+Only in gnome-panel-2.91.6/applets/clock/: clock-face.c
+Only in gnome-panel-2.91.6/applets/clock/: clock-face.h
+Only in gnome-panel-2.91.6/applets/clock/: clock.h
+Only in gnome-panel-2.91.6/applets/clock/: clock-location.c
+Only in gnome-panel-2.91.6/applets/clock/: clock-location.c.clock-network
+Only in gnome-panel-2.91.6/applets/clock/: clock-location.h
+Only in gnome-panel-2.91.6/applets/clock/: clock-location-tile.c
+Only in gnome-panel-2.91.6/applets/clock/: clock-location-tile.h
+Only in gnome-panel-2.91.6/applets/clock/: clock-map.c
+Only in gnome-panel-2.91.6/applets/clock/: clock-map.h
+Only in gnome-panel-2.91.6/applets/clock/: clock-marshallers.c
+Only in gnome-panel-2.91.6/applets/clock/: clock-marshallers.h
+Only in gnome-panel-2.91.6/applets/clock/: clock-marshallers.list
+Only in gnome-panel-2.91.6/applets/clock/: clock-menu.xml
+Only in gnome-panel-2.91.6/applets/clock/: clock.schemas
+Only in gnome-panel-2.91.6/applets/clock/: clock.schemas.in
+Only in gnome-panel-2.91.6/applets/clock/: clock.schemas.in.clock-home
+Only in gnome-panel-2.91.6/applets/clock/: clock-sunpos.c
+Only in gnome-panel-2.91.6/applets/clock/: clock-sunpos.h
+Only in gnome-panel-2.91.6/applets/clock/: clock-typebuiltins.c
+Only in gnome-panel-2.91.6/applets/clock/: clock-typebuiltins.h
+Only in gnome-panel-2.91.6/applets/clock/: clock.ui
+Only in gnome-panel-2.91.6/applets/clock/: clock-utils.c
+Only in gnome-panel-2.91.6/applets/clock/: clock-utils.h
+Only in gnome-panel-2.91.6/applets/clock/: .libs
+Only in gnome-panel-2.91.6/applets/clock/.libs: libsystem-timezone.a
+Only in gnome-panel-2.91.6/applets/clock/: Makefile
+Only in gnome-panel-2.91.6/applets/clock/: Makefile.am
+Only in gnome-panel-2.91.6/applets/clock/: Makefile.in
+Only in gnome-panel-2.91.6/applets/clock/:
org.gnome.panel.applet.ClockAppletFactory.service
+Only in gnome-panel-2.91.6/applets/clock/:
org.gnome.panel.applet.ClockAppletFactory.service.in
+Only in gnome-panel-2.91.6/applets/clock/: org.gnome.panel.ClockApplet.panel-applet
+Only in gnome-panel-2.91.6/applets/clock/: org.gnome.panel.ClockApplet.panel-applet.in
+Only in gnome-panel-2.91.6/applets/clock/:
org.gnome.panel.ClockApplet.panel-applet.in.in
+Only in gnome-panel-2.91.6/applets/clock/: pixmaps
+Only in gnome-panel-2.91.6/applets/clock/: set-timezone.c
+Only in gnome-panel-2.91.6/applets/clock/: set-timezone.h
+Only in gnome-panel-2.91.6/applets/clock/: system-timezone.c
+Only in gnome-panel-2.91.6/applets/clock/: system-timezone.h
+Only in gnome-panel-2.91.6/applets/clock/: system-timezone.lo
+Binary files gnome-panel-2.91.6/applets/clock/.libs/system-timezone.o and
gnome-panel-2.91.6/applets/clock/system-timezone.o differ
+Only in gnome-panel-2.91.6/applets/clock/: test-system-timezone
+Only in gnome-panel-2.91.6/applets/clock/: test-system-timezone.c
+Only in gnome-panel-2.91.6/applets/clock/: test-system-timezone.o
+diff -up gnome-panel-2.91.6/applets/fish/.libs gnome-panel-2.91.6/applets/fish/
+Only in gnome-panel-2.91.6/applets/fish/: fishanim.png
+Binary files gnome-panel-2.91.6/applets/fish/.libs/fish-applet and
gnome-panel-2.91.6/applets/fish/fish-applet differ
+Only in gnome-panel-2.91.6/applets/fish/: fish_applet-fish.o
+Only in gnome-panel-2.91.6/applets/fish/: fish.c
+Only in gnome-panel-2.91.6/applets/fish/: fish-menu.xml
+Only in gnome-panel-2.91.6/applets/fish/: fish.schemas
+Only in gnome-panel-2.91.6/applets/fish/: fish.schemas.in
+Only in gnome-panel-2.91.6/applets/fish/: fish.schemas.in.speak-to-us-ye-old-wise-fish
+Only in gnome-panel-2.91.6/applets/fish/: fish.ui
+Only in gnome-panel-2.91.6/applets/fish/: footguy.png
+Only in gnome-panel-2.91.6/applets/fish/: .libs
+Only in gnome-panel-2.91.6/applets/fish/: Makefile
+Only in gnome-panel-2.91.6/applets/fish/: Makefile.am
+Only in gnome-panel-2.91.6/applets/fish/: Makefile.in
+Only in gnome-panel-2.91.6/applets/fish/: monkey.png
+Only in gnome-panel-2.91.6/applets/fish/: oldwanda.png
+Only in gnome-panel-2.91.6/applets/fish/:
org.gnome.panel.applet.FishAppletFactory.service
+Only in gnome-panel-2.91.6/applets/fish/:
org.gnome.panel.applet.FishAppletFactory.service.in
+Only in gnome-panel-2.91.6/applets/fish/: org.gnome.panel.FishApplet.panel-applet
+Only in gnome-panel-2.91.6/applets/fish/: org.gnome.panel.FishApplet.panel-applet.in
+Only in gnome-panel-2.91.6/applets/fish/: org.gnome.panel.FishApplet.panel-applet.in.in
+Only in gnome-panel-2.91.6/applets/fish/: wanda.png
+Only in gnome-panel-2.91.6/applets/fish/: wanda.svg
+diff -up gnome-panel-2.91.6/applets/notification_area/.libs
gnome-panel-2.91.6/applets/notification_area/
+Only in gnome-panel-2.91.6/applets/notification_area/: fixedtip.c
+Only in gnome-panel-2.91.6/applets/notification_area/: fixedtip.h
+Only in gnome-panel-2.91.6/applets/notification_area/: fixedtip.lo
+Binary files gnome-panel-2.91.6/applets/notification_area/.libs/fixedtip.o and
gnome-panel-2.91.6/applets/notification_area/fixedtip.o differ
+Only in gnome-panel-2.91.6/applets/notification_area/: .libs
+Only in gnome-panel-2.91.6/applets/notification_area/.libs: libtray.a
+Only in gnome-panel-2.91.6/applets/notification_area/: main.c
+Only in gnome-panel-2.91.6/applets/notification_area/: Makefile
+Only in gnome-panel-2.91.6/applets/notification_area/: Makefile.am
+Only in gnome-panel-2.91.6/applets/notification_area/: Makefile.am.libs
+Only in gnome-panel-2.91.6/applets/notification_area/: Makefile.in
+Only in gnome-panel-2.91.6/applets/notification_area/: na-marshal.c
+Only in gnome-panel-2.91.6/applets/notification_area/: na-marshal.h
+Only in gnome-panel-2.91.6/applets/notification_area/: na-marshal.list
+Only in gnome-panel-2.91.6/applets/notification_area/: na-marshal.lo
+Binary files gnome-panel-2.91.6/applets/notification_area/.libs/na-marshal.o and
gnome-panel-2.91.6/applets/notification_area/na-marshal.o differ
+Only in gnome-panel-2.91.6/applets/notification_area/: na-tray.c
+Only in gnome-panel-2.91.6/applets/notification_area/: na-tray-child.c
+Only in gnome-panel-2.91.6/applets/notification_area/: na-tray-child.h
+Only in gnome-panel-2.91.6/applets/notification_area/: na-tray-child.lo
+Binary files gnome-panel-2.91.6/applets/notification_area/.libs/na-tray-child.o and
gnome-panel-2.91.6/applets/notification_area/na-tray-child.o differ
+Only in gnome-panel-2.91.6/applets/notification_area/: na-tray.h
+Only in gnome-panel-2.91.6/applets/notification_area/: na-tray.lo
+Only in gnome-panel-2.91.6/applets/notification_area/: na-tray-manager.c
+Only in gnome-panel-2.91.6/applets/notification_area/: na-tray-manager.h
+Only in gnome-panel-2.91.6/applets/notification_area/: na-tray-manager.lo
+Binary files gnome-panel-2.91.6/applets/notification_area/.libs/na-tray-manager.o and
gnome-panel-2.91.6/applets/notification_area/na-tray-manager.o differ
+Binary files gnome-panel-2.91.6/applets/notification_area/.libs/na-tray.o and
gnome-panel-2.91.6/applets/notification_area/na-tray.o differ
+Only in gnome-panel-2.91.6/applets/notification_area/: notification_area_applet-main.o
+Only in gnome-panel-2.91.6/applets/notification_area/: notification-area-menu.xml
+Only in gnome-panel-2.91.6/applets/notification_area/:
org.gnome.panel.applet.NotificationAreaAppletFactory.service
+Only in gnome-panel-2.91.6/applets/notification_area/:
org.gnome.panel.applet.NotificationAreaAppletFactory.service.in
+Only in gnome-panel-2.91.6/applets/notification_area/:
org.gnome.panel.NotificationAreaApplet.panel-applet
+Only in gnome-panel-2.91.6/applets/notification_area/:
org.gnome.panel.NotificationAreaApplet.panel-applet.in
+Only in gnome-panel-2.91.6/applets/notification_area/:
org.gnome.panel.NotificationAreaApplet.panel-applet.in.in
+Only in gnome-panel-2.91.6/applets/notification_area/: testtray.c
+Only in gnome-panel-2.91.6/applets/notification_area/: testtray.o
+diff -up gnome-panel-2.91.6/applets/notification_area/Makefile.am.libs
gnome-panel-2.91.6/applets/notification_area/Makefile.am
+--- gnome-panel-2.91.6/applets/notification_area/Makefile.am.libs 2011-01-31
18:52:27.000000000 -0500
++++ gnome-panel-2.91.6/applets/notification_area/Makefile.am 2011-02-02
19:45:49.002989988 -0500
+@@ -29,8 +29,8 @@ libtray_la_SOURCES = \
+ NOTIFICATION_AREA_SOURCES = main.c
+
+ NOTIFICATION_AREA_LDADD = \
+- ../../libpanel-applet/libpanel-applet-4.la \
+ $(X_LIBS) \
++ ../../libpanel-applet/libpanel-applet-4.la \
+ $(NOTIFICATION_AREA_LIBS) \
+ $(LIBPANEL_APPLET_LIBS) \
+ libtray.la
+diff -up gnome-panel-2.91.6/configure.ac.libs gnome-panel-2.91.6/configure.ac
+--- gnome-panel-2.91.6/configure.ac.libs 2011-02-01 20:43:03.000000000 -0500
++++ gnome-panel-2.91.6/configure.ac 2011-02-02 19:45:49.003990000 -0500
+@@ -83,7 +83,7 @@ PKG_CHECK_MODULES(PANEL, gdk-pixbuf-2.0
+ AC_SUBST(PANEL_CFLAGS)
+ AC_SUBST(PANEL_LIBS)
+
+-PKG_CHECK_MODULES(LIBPANEL_APPLET, gtk+-3.0 >= $GTK_REQUIRED cairo-xlib cairo-gobject
gconf-2.0 >= $GCONF_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >=
$GLIB_REQUIRED)
++PKG_CHECK_MODULES(LIBPANEL_APPLET, gdk-x11-3.0 >= $GTK_REQUIRED gdk-3.0 >=
$GTK_REQUIRED gtk+-x11-3.0 >= $GTK_REQUIRED gtk+-3.0 >= $GTK_REQUIRED cairo-xlib
cairo-gobject gconf-2.0 >= $GCONF_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0
>= $GLIB_REQUIRED)
+ AC_SUBST(LIBPANEL_APPLET_CFLAGS)
+ AC_SUBST(LIBPANEL_APPLET_LIBS)
+
+@@ -91,11 +91,11 @@ PKG_CHECK_MODULES(FISH, gtk+-3.0 >= $GTK
+ AC_SUBST(FISH_CFLAGS)
+ AC_SUBST(FISH_LIBS)
+
+-PKG_CHECK_MODULES(NOTIFICATION_AREA, gtk+-3.0 >= $GTK_REQUIRED)
++PKG_CHECK_MODULES(NOTIFICATION_AREA, gdk-x11-3.0 >= $GTK_REQUIRED gdk-3.0 >=
$GTK_REQUIRED gtk+-x11-3.0 >= $GTK_REQUIRED gtk+-3.0 >= $GTK_REQUIRED)
+ AC_SUBST(NOTIFICATION_AREA_CFLAGS)
+ AC_SUBST(NOTIFICATION_AREA_LIBS)
+
+-PKG_CHECK_MODULES(WNCKLET, gtk+-3.0 >= $GTK_REQUIRED libwnck-3.0 >=
$LIBWNCK_REQUIRED)
++PKG_CHECK_MODULES(WNCKLET, gdk-x11-3.0 >= $GTK_REQUIRED gdk-3.0 >= $GTK_REQUIRED
gtk+-x11-3.0 >= $GTK_REQUIRED gtk+-3.0 >= $GTK_REQUIRED libwnck-3.0 >=
$LIBWNCK_REQUIRED)
+ AC_SUBST(WNCKLET_CFLAGS)
+ AC_SUBST(WNCKLET_LIBS)
+
+@@ -242,10 +242,15 @@ AC_SUBST(X_LIBS)
+
+ dnl X RANDR extension
+
+-PKG_CHECK_MODULES(XRANDR, xrandr >= 1.2.0, have_randr=yes, have_randr=no)
+-if test "x$have_randr" = "xyes"; then
++PKG_CHECK_MODULES(XRANDR, xrandr >= 1.2.0, [
+ AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library])
+-fi
++ have_randr=yes
++ X_LIBS="$X_LIBS $XRANDR_LIBS"
++], [
++ have_randr=no
++])
++
++AC_SUBST(X_LIBS)
+
+ dnl Modules dir
+ AC_SUBST([modulesdir],"\$(libdir)/gnome-panel/modules")
+diff -up gnome-panel-2.91.6/gnome-panel/libegg/.libs
gnome-panel-2.91.6/gnome-panel/libegg/
+Only in gnome-panel-2.91.6/gnome-panel/libegg/: eggdesktopfile.c
+Only in gnome-panel-2.91.6/gnome-panel/libegg/: eggdesktopfile.h
+Only in gnome-panel-2.91.6/gnome-panel/libegg/: eggdesktopfile.lo
+Binary files gnome-panel-2.91.6/gnome-panel/libegg/.libs/eggdesktopfile.o and
gnome-panel-2.91.6/gnome-panel/libegg/eggdesktopfile.o differ
+Only in gnome-panel-2.91.6/gnome-panel/libegg/: eggsmclient.c
+Only in gnome-panel-2.91.6/gnome-panel/libegg/: eggsmclient.h
+Only in gnome-panel-2.91.6/gnome-panel/libegg/: eggsmclient.lo
+Binary files gnome-panel-2.91.6/gnome-panel/libegg/.libs/eggsmclient.o and
gnome-panel-2.91.6/gnome-panel/libegg/eggsmclient.o differ
+Only in gnome-panel-2.91.6/gnome-panel/libegg/: eggsmclient-private.h
+Only in gnome-panel-2.91.6/gnome-panel/libegg/: eggsmclient-xsmp.c
+Only in gnome-panel-2.91.6/gnome-panel/libegg/: eggsmclient-xsmp.lo
+Binary files gnome-panel-2.91.6/gnome-panel/libegg/.libs/eggsmclient-xsmp.o and
gnome-panel-2.91.6/gnome-panel/libegg/eggsmclient-xsmp.o differ
+Only in gnome-panel-2.91.6/gnome-panel/libegg/.libs: libegg.a
+Only in gnome-panel-2.91.6/gnome-panel/libegg/: .libs
+Only in gnome-panel-2.91.6/gnome-panel/libegg/: Makefile
+Only in gnome-panel-2.91.6/gnome-panel/libegg/: Makefile.am
+Only in gnome-panel-2.91.6/gnome-panel/libegg/: Makefile.in
+diff -up gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/.libs
gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/.libs:
libpanel-applet-private.a
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/.libs:
libpanel-applet-private-mini.a
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/: .libs
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/: Makefile
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/: Makefile.am
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/: Makefile.in
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/:
panel-applet-container.c
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/:
panel-applet-container.h
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/:
panel-applet-container.lo
+Binary files
gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/.libs/panel-applet-container.o and
gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/panel-applet-container.o differ
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/:
panel-applet-frame-dbus.c
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/:
panel-applet-frame-dbus.h
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/:
panel-applet-frame-dbus.lo
+Binary files
gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/.libs/panel-applet-frame-dbus.o and
gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/panel-applet-frame-dbus.o differ
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/: panel-applet-mini.c
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/: panel-applet-mini.lo
+Binary files
gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/.libs/panel-applet-mini.o and
gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/panel-applet-mini.o differ
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/:
panel-applets-manager-dbus.c
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/:
panel-applets-manager-dbus.h
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/:
panel-applets-manager-dbus.lo
+Binary files
gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/.libs/panel-applets-manager-dbus.o
and gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/panel-applets-manager-dbus.o
differ
+diff -up gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs
gnome-panel-2.91.6/gnome-panel/libpanel-util/
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs: libpanel-util.a
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: .libs
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: Makefile
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: Makefile.am
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: Makefile.in
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-cleanup.c
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-cleanup.h
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-cleanup.lo
+Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-cleanup.o and
gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-cleanup.o differ
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-dbus-service.c
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-dbus-service.h
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-dbus-service.lo
+Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-dbus-service.o and
gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-dbus-service.o differ
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-error.c
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-error.h
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-error.lo
+Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-error.o and
gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-error.o differ
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-glib.c
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-glib.h
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-glib.lo
+Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-glib.o and
gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-glib.o differ
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-gtk.c
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-gtk.h
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-gtk.lo
+Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-gtk.o and
gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-gtk.o differ
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-icon-chooser.c
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-icon-chooser.h
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-icon-chooser.lo
+Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-icon-chooser.o and
gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-icon-chooser.o differ
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-keyfile.c
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-keyfile.h
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-keyfile.lo
+Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-keyfile.o and
gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-keyfile.o differ
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-launch.c
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-launch.h
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-launch.lo
+Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-launch.o and
gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-launch.o differ
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-list.c
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-list.h
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-list.lo
+Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-list.o and
gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-list.o differ
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-session-manager.c
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-session-manager.h
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-session-manager.lo
+Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-session-manager.o
and gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-session-manager.o differ
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-show.c
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-show.h
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-show.lo
+Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-show.o and
gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-show.o differ
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-xdg.c
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-xdg.h
+Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-xdg.lo
+Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-xdg.o and
gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-xdg.o differ
+diff -up gnome-panel-2.91.6/gnome-panel/.libs gnome-panel-2.91.6/gnome-panel/
+Only in gnome-panel-2.91.6/gnome-panel/: applet.c
+Only in gnome-panel-2.91.6/gnome-panel/: applet.h
+Only in gnome-panel-2.91.6/gnome-panel/: button-widget.c
+Only in gnome-panel-2.91.6/gnome-panel/: button-widget.h
+Only in gnome-panel-2.91.6/gnome-panel/: drawer.c
+Only in gnome-panel-2.91.6/gnome-panel/: drawer.h
+Only in gnome-panel-2.91.6/gnome-panel/: gnome-desktop-item-edit
+Only in gnome-panel-2.91.6/gnome-panel/: gnome-desktop-item-edit.c
+Only in gnome-panel-2.91.6/gnome-panel/: gnome-desktop-item-edit.o
+Only in gnome-panel-2.91.6/gnome-panel/: gnome-panel
+Only in gnome-panel-2.91.6/gnome-panel/: gnome-panel-add
+Only in gnome-panel-2.91.6/gnome-panel/: gnome-panel-add.in
+Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-applet.o
+Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-button-widget.o
+Only in gnome-panel-2.91.6/gnome-panel/: gnome-panel.desktop
+Only in gnome-panel-2.91.6/gnome-panel/: gnome-panel.desktop.in
+Only in gnome-panel-2.91.6/gnome-panel/: gnome-panel.desktop.in.in
+Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-drawer.o
+Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-launcher.o
+Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-main.o
+Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-menu.o
+Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-a11y.o
+Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-action-button.o
+Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-action-protocol.o
+Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-addto.o
+Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-applet-frame.o
+Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-applet-info.o
+Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-applets-manager.o
+Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-background-monitor.o
+Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-background.o
+Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-bindings.o
+Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-compatibility.o
+Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-config-global.o
+Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-context-menu.o
+Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-ditem-editor.o
+Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-force-quit.o
+Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-frame.o
+Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-gconf.o
+Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-lockdown.o
+Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-marshal.o
+Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-menu-bar.o
+Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-menu-button.o
+Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-menu-items.o
+Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-modules.o
+Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-multiscreen.o
+Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel.o
+Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-profile.o
+Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-properties-dialog.o
+Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-recent.o
+Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-run-dialog.o
+Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-separator.o
+Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-session.o
+Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-shell.o
+Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-stock-icons.o
+Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-struts.o
+Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-toplevel.o
+Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-typebuiltins.o
+Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-util.o
+Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-widget.o
+Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-xutils.o
+Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-xstuff.o
+Only in gnome-panel-2.91.6/gnome-panel/: launcher.c
+Only in gnome-panel-2.91.6/gnome-panel/: launcher.c.preferred-apps
+Only in gnome-panel-2.91.6/gnome-panel/: launcher.h
+Only in gnome-panel-2.91.6/gnome-panel/: launcher.h.preferred-apps
+Only in gnome-panel-2.91.6/gnome-panel/: libegg
+Only in gnome-panel-2.91.6/gnome-panel/: libpanel-applet-private
+Only in gnome-panel-2.91.6/gnome-panel/: libpanel-util
+Only in gnome-panel-2.91.6/gnome-panel/: .libs
+Only in gnome-panel-2.91.6/gnome-panel/: main.c
+Only in gnome-panel-2.91.6/gnome-panel/: main.c.preferred-apps
+Only in gnome-panel-2.91.6/gnome-panel/: Makefile
+Only in gnome-panel-2.91.6/gnome-panel/: Makefile.am
+Only in gnome-panel-2.91.6/gnome-panel/: Makefile.am.libs
+Only in gnome-panel-2.91.6/gnome-panel/: Makefile.in
+Only in gnome-panel-2.91.6/gnome-panel/: menu.c
+Only in gnome-panel-2.91.6/gnome-panel/: menu.h
+Only in gnome-panel-2.91.6/gnome-panel/: nothing.cP
+Only in gnome-panel-2.91.6/gnome-panel/: nothing.h
+Only in gnome-panel-2.91.6/gnome-panel/: panel-a11y.c
+Only in gnome-panel-2.91.6/gnome-panel/: panel-a11y.h
+Only in gnome-panel-2.91.6/gnome-panel/: panel-action-button.c
+Only in gnome-panel-2.91.6/gnome-panel/: panel-action-button.h
+Only in gnome-panel-2.91.6/gnome-panel/: panel-action-protocol.c
+Only in gnome-panel-2.91.6/gnome-panel/: panel-action-protocol.h
+Only in gnome-panel-2.91.6/gnome-panel/: panel-addto.c
+Only in gnome-panel-2.91.6/gnome-panel/: panel-addto.h
+Only in gnome-panel-2.91.6/gnome-panel/: panel-applet-frame.c
+Only in gnome-panel-2.91.6/gnome-panel/: panel-applet-frame.h
+Only in gnome-panel-2.91.6/gnome-panel/: panel-applet-info.c
+Only in gnome-panel-2.91.6/gnome-panel/: panel-applet-info.h
+Only in gnome-panel-2.91.6/gnome-panel/: panel-applets-manager.c
+Only in gnome-panel-2.91.6/gnome-panel/: panel-applets-manager.h
+Only in gnome-panel-2.91.6/gnome-panel/: panel-background.c
+Only in gnome-panel-2.91.6/gnome-panel/: panel-background.h
+Only in gnome-panel-2.91.6/gnome-panel/: panel-background-monitor.c
+Only in gnome-panel-2.91.6/gnome-panel/: panel-background-monitor.h
+Only in gnome-panel-2.91.6/gnome-panel/: panel-bindings.c
+Only in gnome-panel-2.91.6/gnome-panel/: panel-bindings.h
+Only in gnome-panel-2.91.6/gnome-panel/: panel.c
+Only in gnome-panel-2.91.6/gnome-panel/: panel-compatibility.c
+Only in gnome-panel-2.91.6/gnome-panel/: panel-compatibility.h
+Only in gnome-panel-2.91.6/gnome-panel/: panel-compatibility.schemas
+Only in gnome-panel-2.91.6/gnome-panel/: panel-config-global.c
+Only in gnome-panel-2.91.6/gnome-panel/: panel-config-global.h
+Only in gnome-panel-2.91.6/gnome-panel/: panel-context-menu.c
+Only in gnome-panel-2.91.6/gnome-panel/: panel-context-menu.h
+Only in gnome-panel-2.91.6/gnome-panel/: panel-default-setup.entries
+Only in gnome-panel-2.91.6/gnome-panel/: panel-ditem-editor.c
+Only in gnome-panel-2.91.6/gnome-panel/: panel-ditem-editor.c.launcher-desktop-files
+Only in gnome-panel-2.91.6/gnome-panel/: panel-ditem-editor.h
+Only in gnome-panel-2.91.6/gnome-panel/: panel-ditem-editor.o
+Only in gnome-panel-2.91.6/gnome-panel/: panel-enums.h
+Only in gnome-panel-2.91.6/gnome-panel/: panel-force-quit.c
+Only in gnome-panel-2.91.6/gnome-panel/: panel-force-quit.h
+Only in gnome-panel-2.91.6/gnome-panel/: panel-frame.c
+Only in gnome-panel-2.91.6/gnome-panel/: panel-frame.h
+Only in gnome-panel-2.91.6/gnome-panel/: panel-gconf.c
+Only in gnome-panel-2.91.6/gnome-panel/: panel-gconf.h
+Only in gnome-panel-2.91.6/gnome-panel/: panel-general.schemas
+Only in gnome-panel-2.91.6/gnome-panel/: panel-general.schemas.in
+Only in gnome-panel-2.91.6/gnome-panel/: panel-global.schemas
+Only in gnome-panel-2.91.6/gnome-panel/: panel-global.schemas.in
+Only in gnome-panel-2.91.6/gnome-panel/: panel-globals.h
+Only in gnome-panel-2.91.6/gnome-panel/: panel.h
+Only in gnome-panel-2.91.6/gnome-panel/: panel-icon-names.h
+Only in gnome-panel-2.91.6/gnome-panel/: panel-lockdown.c
+Only in gnome-panel-2.91.6/gnome-panel/: panel-lockdown.h
+Only in gnome-panel-2.91.6/gnome-panel/: panel-marshal.c
+Only in gnome-panel-2.91.6/gnome-panel/: panel-marshal.h
+Only in gnome-panel-2.91.6/gnome-panel/: panel-marshal.list
+Only in gnome-panel-2.91.6/gnome-panel/: panel-marshal.o
+Only in gnome-panel-2.91.6/gnome-panel/: panel-menu-bar.c
+Only in gnome-panel-2.91.6/gnome-panel/: panel-menu-bar.h
+Only in gnome-panel-2.91.6/gnome-panel/: panel-menu-button.c
+Only in gnome-panel-2.91.6/gnome-panel/: panel-menu-button.h
+Only in gnome-panel-2.91.6/gnome-panel/: panel-menu-items.c
+Only in gnome-panel-2.91.6/gnome-panel/: panel-menu-items.c.bookmarks-submenu
+Only in gnome-panel-2.91.6/gnome-panel/: panel-menu-items.h
+Only in gnome-panel-2.91.6/gnome-panel/: panel-modules.c
+Only in gnome-panel-2.91.6/gnome-panel/: panel-modules.h
+Only in gnome-panel-2.91.6/gnome-panel/: panel-multiscreen.c
+Only in gnome-panel-2.91.6/gnome-panel/: panel-multiscreen.h
+Only in gnome-panel-2.91.6/gnome-panel/: panel-object.schemas
+Only in gnome-panel-2.91.6/gnome-panel/: panel-object.schemas.in
+Only in gnome-panel-2.91.6/gnome-panel/: panel-profile.c
+Only in gnome-panel-2.91.6/gnome-panel/: panel-profile.h
+Only in gnome-panel-2.91.6/gnome-panel/: panel-properties-dialog.c
+Only in gnome-panel-2.91.6/gnome-panel/: panel-properties-dialog.h
+Only in gnome-panel-2.91.6/gnome-panel/: panel-properties-dialog.ui
+Only in gnome-panel-2.91.6/gnome-panel/: panel-recent.c
+Only in gnome-panel-2.91.6/gnome-panel/: panel-recent.h
+Only in gnome-panel-2.91.6/gnome-panel/: panel-run-dialog.c
+Only in gnome-panel-2.91.6/gnome-panel/: panel-run-dialog.c.preferred-apps
+Only in gnome-panel-2.91.6/gnome-panel/: panel-run-dialog.h
+Only in gnome-panel-2.91.6/gnome-panel/: panel-run-dialog.h.preferred-apps
+Only in gnome-panel-2.91.6/gnome-panel/: panel-run-dialog.ui
+Only in gnome-panel-2.91.6/gnome-panel/: panel-separator.c
+Only in gnome-panel-2.91.6/gnome-panel/: panel-separator.h
+Only in gnome-panel-2.91.6/gnome-panel/: panel-session.c
+Only in gnome-panel-2.91.6/gnome-panel/: panel-session.h
+Only in gnome-panel-2.91.6/gnome-panel/: panel-shell.c
+Only in gnome-panel-2.91.6/gnome-panel/: panel-shell.h
+Only in gnome-panel-2.91.6/gnome-panel/: panel-stock-icons.c
+Only in gnome-panel-2.91.6/gnome-panel/: panel-stock-icons.h
+Only in gnome-panel-2.91.6/gnome-panel/: panel-struts.c
+Only in gnome-panel-2.91.6/gnome-panel/: panel-struts.h
+Only in gnome-panel-2.91.6/gnome-panel/: panel-test-applets
+Only in gnome-panel-2.91.6/gnome-panel/: panel-test-applets.c
+Only in gnome-panel-2.91.6/gnome-panel/: panel_test_applets-panel-applet-info.o
+Only in gnome-panel-2.91.6/gnome-panel/: panel_test_applets-panel-applets-manager.o
+Only in gnome-panel-2.91.6/gnome-panel/: panel_test_applets-panel-marshal.o
+Only in gnome-panel-2.91.6/gnome-panel/: panel_test_applets-panel-modules.o
+Only in gnome-panel-2.91.6/gnome-panel/: panel_test_applets-panel-test-applets.o
+Only in gnome-panel-2.91.6/gnome-panel/: panel-test-applets.ui
+Only in gnome-panel-2.91.6/gnome-panel/: panel-toplevel.c
+Only in gnome-panel-2.91.6/gnome-panel/: panel-toplevel.h
+Only in gnome-panel-2.91.6/gnome-panel/: panel-toplevel.schemas
+Only in gnome-panel-2.91.6/gnome-panel/: panel-toplevel.schemas.in
+Only in gnome-panel-2.91.6/gnome-panel/: panel-typebuiltins.c
+Only in gnome-panel-2.91.6/gnome-panel/: panel-typebuiltins.h
+Only in gnome-panel-2.91.6/gnome-panel/: panel-types.h
+Only in gnome-panel-2.91.6/gnome-panel/: panel-util.c
+Only in gnome-panel-2.91.6/gnome-panel/: panel-util.h
+Only in gnome-panel-2.91.6/gnome-panel/: panel-util.o
+Only in gnome-panel-2.91.6/gnome-panel/: panel-widget.c
+Only in gnome-panel-2.91.6/gnome-panel/: panel-widget.h
+Only in gnome-panel-2.91.6/gnome-panel/: panel-xutils.c
+Only in gnome-panel-2.91.6/gnome-panel/: panel-xutils.h
+Only in gnome-panel-2.91.6/gnome-panel/: xstuff.c
+Only in gnome-panel-2.91.6/gnome-panel/: xstuff.h
+Only in gnome-panel-2.91.6/gnome-panel/: xstuff.o
+diff -up gnome-panel-2.91.6/gnome-panel/Makefile.am.libs
gnome-panel-2.91.6/gnome-panel/Makefile.am
+--- gnome-panel-2.91.6/gnome-panel/Makefile.am.libs 2011-01-31 18:50:19.000000000 -0500
++++ gnome-panel-2.91.6/gnome-panel/Makefile.am 2011-02-02 19:45:49.003990000 -0500
+@@ -135,6 +135,7 @@ gnome_panel_LDADD = \
+ $(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la \
+ $(PANEL_LIBS) \
+ $(XRANDR_LIBS) \
++ -lm \
+ $(X_LIBS)
+
+ gnome_panel_LDFLAGS = -export-dynamic
+@@ -149,7 +150,8 @@ gnome_desktop_item_edit_SOURCES = \
+ gnome_desktop_item_edit_LDADD = \
+ $(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la \
+ $(PANEL_LIBS) \
+- $(X_LIBS)
++ $(X_LIBS) \
++ -lm
+
+ panel_test_applets_SOURCES = \
+ panel-modules.c \
+diff -up gnome-panel-2.91.6/libpanel-applet/.libs gnome-panel-2.91.6/libpanel-applet/
+Only in gnome-panel-2.91.6/libpanel-applet/: libpanelapplet-4.0.pc
+Only in gnome-panel-2.91.6/libpanel-applet/: libpanelapplet-4.0.pc.in
+Only in gnome-panel-2.91.6/libpanel-applet/: libpanelapplet-4.0-uninstalled.pc
+Only in gnome-panel-2.91.6/libpanel-applet/: libpanelapplet-4.0-uninstalled.pc.in
+Only in gnome-panel-2.91.6/libpanel-applet/.libs: libpanel-applet-4.a
+Only in gnome-panel-2.91.6/libpanel-applet/.libs: libpanel-applet-4.lai
+Only in gnome-panel-2.91.6/libpanel-applet/.libs: libpanel-applet-4.so
+Only in gnome-panel-2.91.6/libpanel-applet/.libs: libpanel-applet-4.so.0
+Only in gnome-panel-2.91.6/libpanel-applet/.libs: libpanel-applet-4.so.0.0.0
+Only in gnome-panel-2.91.6/libpanel-applet/: .libs
+Only in gnome-panel-2.91.6/libpanel-applet/: Makefile
+Only in gnome-panel-2.91.6/libpanel-applet/: Makefile.am
+Only in gnome-panel-2.91.6/libpanel-applet/: Makefile.am.libs
+Only in gnome-panel-2.91.6/libpanel-applet/: Makefile.in
+Only in gnome-panel-2.91.6/libpanel-applet/: org.gnome.panel.TestApplet.panel-applet
+Only in gnome-panel-2.91.6/libpanel-applet/: org.gnome.panel.TestApplet.panel-applet.in
+Only in gnome-panel-2.91.6/libpanel-applet/: PanelApplet-4.0.gir
+Only in gnome-panel-2.91.6/libpanel-applet/: PanelApplet-4.0.typelib
+Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet.c
+Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-enums.c
+Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-enums.h
+Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-enums.lo
+Binary files gnome-panel-2.91.6/libpanel-applet/.libs/panel-applet-enums.o and
gnome-panel-2.91.6/libpanel-applet/panel-applet-enums.o differ
+Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-factory.c
+Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-factory.h
+Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-factory.lo
+Binary files gnome-panel-2.91.6/libpanel-applet/.libs/panel-applet-factory.o and
gnome-panel-2.91.6/libpanel-applet/panel-applet-factory.o differ
+Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-gconf.c
+Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-gconf.h
+Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-gconf.lo
+Binary files gnome-panel-2.91.6/libpanel-applet/.libs/panel-applet-gconf.o and
gnome-panel-2.91.6/libpanel-applet/panel-applet-gconf.o differ
+Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet.h
+Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet.lo
+Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-marshal.c
+Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-marshal.h
+Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-marshal.list
+Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-marshal.lo
+Binary files gnome-panel-2.91.6/libpanel-applet/.libs/panel-applet-marshal.o and
gnome-panel-2.91.6/libpanel-applet/panel-applet-marshal.o differ
+Binary files gnome-panel-2.91.6/libpanel-applet/.libs/panel-applet.o and
gnome-panel-2.91.6/libpanel-applet/panel-applet.o differ
+Binary files gnome-panel-2.91.6/libpanel-applet/.libs/test-dbus-applet and
gnome-panel-2.91.6/libpanel-applet/test-dbus-applet differ
+Only in gnome-panel-2.91.6/libpanel-applet/: test-dbus-applet.c
+Only in gnome-panel-2.91.6/libpanel-applet/: test-dbus-applet.o
+Only in gnome-panel-2.91.6/libpanel-applet/: TODO
+diff -up gnome-panel-2.91.6/libpanel-applet/Makefile.am.libs
gnome-panel-2.91.6/libpanel-applet/Makefile.am
+--- gnome-panel-2.91.6/libpanel-applet/Makefile.am.libs 2011-02-02 19:49:30.834702141
-0500
++++ gnome-panel-2.91.6/libpanel-applet/Makefile.am 2011-02-02 19:49:36.886776132 -0500
+@@ -25,8 +25,8 @@ libpanel_applet_4_la_SOURCES = \
+ panel-applet-gconf.h
+
+ libpanel_applet_4_la_LIBADD = \
+- $(LIBPANEL_APPLET_LIBS) \
+- $(X_LIBS)
++ $(X_LIBS) \
++ $(LIBPANEL_APPLET_LIBS)
+
+ libpanel_applet_4_la_LDFLAGS = \
+ -version-info $(LIB_PANEL_APPLET_LT_VERSION) \
diff --git a/gnome-panel-search.patch b/gnome-panel-search.patch
new file mode 100644
index 0000000..277ba9f
--- /dev/null
+++ b/gnome-panel-search.patch
@@ -0,0 +1,104 @@
+diff -up gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.c.search
gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.c
+--- gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.c.search 2009-04-19
13:45:09.000000000 -0400
++++ gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.c 2009-08-25
11:33:36.666288948 -0400
+@@ -29,6 +29,8 @@
+ #include <gdk/gdk.h>
+ #include <gtk/gtk.h>
+
++#include <libgnome/gnome-desktop-item.h>
++
+ #include "panel-error.h"
+ #include "panel-glib.h"
+
+@@ -201,6 +203,23 @@ panel_launch_desktop_file (const char *
+ }
+
+ gboolean
++panel_has_desktop_file (const char *desktop_file)
++{
++ GnomeDesktopItem *ditem;
++
++ if (g_path_is_absolute (desktop_file))
++ ditem = gnome_desktop_item_new_from_file (desktop_file, 0, NULL);
++ else
++ ditem = gnome_desktop_item_new_from_basename (desktop_file, 0, NULL);
++ if (ditem != NULL) {
++ gnome_desktop_item_unref (ditem);
++ return TRUE;
++ }
++
++ return FALSE;
++}
++
++gboolean
+ panel_launch_desktop_file_with_fallback (const char *desktop_file,
+ const char *fallback_exec,
+ GdkScreen *screen,
+diff -up gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.h.search
gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.h
+--- gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.h.search 2009-04-19
13:45:09.000000000 -0400
++++ gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.h 2009-08-25
11:33:36.667276923 -0400
+@@ -47,6 +47,8 @@ gboolean panel_launch_key_file (GKeyFile
+ GdkScreen *screen,
+ GError **error);
+
++gboolean panel_has_desktop_file (const char *desktop_file);
++
+ gboolean panel_launch_desktop_file (const char *desktop_file,
+ GdkScreen *screen,
+ GError **error);
+diff -up gnome-panel-2.27.91/gnome-panel/panel-action-button.c.search
gnome-panel-2.27.91/gnome-panel/panel-action-button.c
+--- gnome-panel-2.27.91/gnome-panel/panel-action-button.c.search 2009-04-19
13:45:09.000000000 -0400
++++ gnome-panel-2.27.91/gnome-panel/panel-action-button.c 2009-08-25 11:33:36.671290074
-0400
+@@ -219,9 +219,19 @@ panel_action_search (GtkWidget *widget)
+ GdkScreen *screen;
+
+ screen = gtk_widget_get_screen (widget);
+- panel_launch_desktop_file_with_fallback ("gnome-search-tool.desktop",
+- "gnome-search-tool",
+- screen, NULL);
++ if (panel_has_desktop_file ("gnome-beagle-search.desktop")) {
++ panel_launch_desktop_file ("gnome-beagle-search.desktop",
++ screen,
++ NULL);
++ } else if (panel_has_desktop_file ("fedora-tracker-search-tool.desktop")) {
++ panel_launch_desktop_file ("fedora-tracker-search-tool.desktop",
++ screen,
++ NULL);
++ } else {
++ panel_launch_desktop_file ("gnome-search-tool.desktop",
++ screen,
++ NULL);
++ }
+ }
+
+ /* Force Quit
+diff -up gnome-panel-2.27.91/gnome-panel/panel-menu-items.c.search
gnome-panel-2.27.91/gnome-panel/panel-menu-items.c
+--- gnome-panel-2.27.91/gnome-panel/panel-menu-items.c.search 2009-08-25
11:33:36.643267021 -0400
++++ gnome-panel-2.27.91/gnome-panel/panel-menu-items.c 2009-08-25 11:42:41.517027329
-0400
+@@ -1062,10 +1062,22 @@ panel_place_menu_item_create_menu (Panel
+
+ add_menu_separator (places_menu);
+
+- panel_menu_items_append_from_desktop (places_menu,
+- "gnome-search-tool.desktop",
+- NULL,
+- FALSE);
++ if (panel_has_desktop_file ("gnome-beagle-search.desktop")) {
++ panel_menu_items_append_from_desktop (places_menu,
++ "gnome-beagle-search.desktop",
++ NULL,
++ FALSE);
++ } else if (panel_has_desktop_file ("fedora-tracker-search-tool.desktop")) {
++ panel_menu_items_append_from_desktop (places_menu,
++ "fedora-tracker-search-tool.desktop",
++ NULL,
++ FALSE);
++ } else {
++ panel_menu_items_append_from_desktop (places_menu,
++ "gnome-search-tool.desktop",
++ NULL,
++ FALSE);
++ }
+
+ panel_recent_append_documents_menu (places_menu,
+ place_item->priv->recent_manager);
diff --git a/gnome-panel-use-gnome-menus.patch b/gnome-panel-use-gnome-menus.patch
new file mode 100644
index 0000000..87495cc
--- /dev/null
+++ b/gnome-panel-use-gnome-menus.patch
@@ -0,0 +1,69 @@
+diff -up gnome-panel-3.1.5/gnome-panel/menu.c.menus gnome-panel-3.1.5/gnome-panel/menu.c
+--- gnome-panel-3.1.5/gnome-panel/menu.c.menus 2011-08-01 13:39:56.000000000 -0400
++++ gnome-panel-3.1.5/gnome-panel/menu.c 2011-08-17 18:58:26.341620915 -0400
+@@ -1401,7 +1401,7 @@ create_main_menu (PanelWidget *panel)
+ {
+ GtkWidget *main_menu;
+
+- main_menu = create_applications_menu ("applications.menu", NULL, TRUE);
++ main_menu = create_applications_menu ("gnome-applications.menu", NULL,
TRUE);
+
+ g_object_set_data (G_OBJECT (main_menu), "menu_panel", panel);
+ /* FIXME need to update the panel on parent_set */
+diff -up gnome-panel-3.1.5/gnome-panel/panel-addto.c.menus
gnome-panel-3.1.5/gnome-panel/panel-addto.c
+--- gnome-panel-3.1.5/gnome-panel/panel-addto.c.menus 2011-08-01 13:39:56.000000000
-0400
++++ gnome-panel-3.1.5/gnome-panel/panel-addto.c 2011-08-17 18:59:37.306668576 -0400
+@@ -666,7 +666,7 @@ panel_addto_make_application_model (Pane
+ G_TYPE_POINTER,
+ G_TYPE_STRING);
+
+- tree = gmenu_tree_new ("applications.menu",
GMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
++ tree = gmenu_tree_new ("applications-gnome.menu",
GMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
+
+ if (!gmenu_tree_load_sync (tree, NULL)) {
+ g_object_unref (tree);
+@@ -675,7 +675,7 @@ panel_addto_make_application_model (Pane
+
+ if (tree != NULL && (root = gmenu_tree_get_root_directory (tree))) {
+ panel_addto_make_application_list (&dialog->application_list,
+- root, "applications.menu",
++ root, "gnome-applications.menu",
+ PANEL_ADDTO_MENU_SHOW_ALL);
+ panel_addto_populate_application_model (store, NULL, dialog->application_list);
+
+diff -up gnome-panel-3.1.5/gnome-panel/panel-menu-bar.c.menus
gnome-panel-3.1.5/gnome-panel/panel-menu-bar.c
+--- gnome-panel-3.1.5/gnome-panel/panel-menu-bar.c.menus 2011-04-05 06:39:04.000000000
-0400
++++ gnome-panel-3.1.5/gnome-panel/panel-menu-bar.c 2011-08-17 18:58:26.388620946 -0400
+@@ -129,7 +129,7 @@ panel_menu_bar_init (PanelMenuBar *menub
+
+ menubar->priv->info = NULL;
+
+- menubar->priv->applications_menu = create_applications_menu
("applications.menu", NULL, TRUE);
++ menubar->priv->applications_menu = create_applications_menu
("gnome-applications.menu", NULL, TRUE);
+
+ menubar->priv->applications_item = panel_image_menu_item_new ();
+ gtk_menu_item_set_label (GTK_MENU_ITEM (menubar->priv->applications_item),
+diff -up gnome-panel-3.1.5/gnome-panel/panel-menu-button.c.menus
gnome-panel-3.1.5/gnome-panel/panel-menu-button.c
+--- gnome-panel-3.1.5/gnome-panel/panel-menu-button.c.menus 2011-08-01 13:39:56.000000000
-0400
++++ gnome-panel-3.1.5/gnome-panel/panel-menu-button.c 2011-08-17 18:58:26.345620917
-0400
+@@ -74,7 +74,7 @@ typedef struct {
+ } MenuPathRootItem;
+
+ static MenuPathRootItem root_items [] = {
+- { APPLICATIONS_MENU, "applications", "applications.menu" },
++ { APPLICATIONS_MENU, "applications", "gnome-applications.menu" },
+ { GNOMECC_MENU, "gnomecc", "gnomecc.menu" }
+ };
+
+diff -up gnome-panel-3.1.5/gnome-panel/panel-run-dialog.c.menus
gnome-panel-3.1.5/gnome-panel/panel-run-dialog.c
+--- gnome-panel-3.1.5/gnome-panel/panel-run-dialog.c.menus 2011-08-01 13:39:56.000000000
-0400
++++ gnome-panel-3.1.5/gnome-panel/panel-run-dialog.c 2011-08-17 18:59:14.635653222 -0400
+@@ -781,7 +781,7 @@ get_all_applications (void)
+ GMenuTreeDirectory *root;
+ GSList *retval;
+
+- tree = gmenu_tree_new ("applications.menu",
GMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
++ tree = gmenu_tree_new ("gnome-applications.menu",
GMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
+
+ if (!gmenu_tree_load_sync (tree, NULL))
+ return NULL;
diff --git a/gnome-panel-vendor.patch b/gnome-panel-vendor.patch
new file mode 100644
index 0000000..e52a18a
--- /dev/null
+++ b/gnome-panel-vendor.patch
@@ -0,0 +1,30 @@
+diff -up gnome-panel-2.27.91/gnome-panel/panel-menu-items.c.vendor
gnome-panel-2.27.91/gnome-panel/panel-menu-items.c
+--- gnome-panel-2.27.91/gnome-panel/panel-menu-items.c.vendor 2009-08-19
15:59:57.000000000 -0400
++++ gnome-panel-2.27.91/gnome-panel/panel-menu-items.c 2009-08-25 11:32:39.980266025
-0400
+@@ -1038,7 +1038,7 @@ panel_place_menu_item_create_menu (Panel
+ COMPUTER_NAME_KEY,
+ NULL);
+ panel_menu_items_append_from_desktop (places_menu,
+- "nautilus-computer.desktop",
++ "gnome-nautilus-computer.desktop",
+ gconf_name,
+ TRUE);
+ if (gconf_name)
+@@ -1048,7 +1048,7 @@ panel_place_menu_item_create_menu (Panel
+ add_menu_separator (places_menu);
+
+ panel_menu_items_append_from_desktop (places_menu,
+- "network-scheme.desktop",
++ "gnome-network-scheme.desktop",
+ NULL,
+ TRUE);
+ panel_place_menu_item_append_remote_gio (place_item, places_menu);
+@@ -1157,7 +1157,7 @@ panel_desktop_menu_item_append_menu (Gtk
+ if (add_separator)
+ add_menu_separator (menu);
+
+- panel_menu_items_append_from_desktop (menu, "yelp.desktop", NULL, FALSE);
++ panel_menu_items_append_from_desktop (menu, "gnome-yelp.desktop", NULL,
FALSE);
+ panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL,
FALSE);
+
+ if (parent->priv->append_lock_logout)
diff --git a/gnome-panel.spec b/gnome-panel.spec
new file mode 100644
index 0000000..380feee
--- /dev/null
+++ b/gnome-panel.spec
@@ -0,0 +1,1845 @@
+%define gettext_package gnome-panel-2.0
+
+%define gnome_desktop_version 2.91.6
+%define glib2_version 2.31.14
+%define gtk3_version 3.3.8
+%define libwnck_version 2.91.6
+%define gnome_menus_version 3.1.4
+%define evolution_data_server_version 3.5.3
+%define cairo_version 1.0.0
+%define dbus_version 1.1.2
+%define dbus_glib_version 0.80
+%define gnome_doc_utils_version 0.3.2
+%define libgweather_version 3.5.1
+
+%define use_evolution_data_server 1
+
+Summary: GNOME panel
+Name: gnome-panel
+Version: 3.6.2
+Release: 6%{?dist}
+URL:
http://www.gnome.org
+#VCS:
git:git://git.gnome.org/gnome-panel
+Source0:
http://download.gnome.org/sources/gnome-panel/3.6/%{name}-%{version}.tar.xz
+
+#
https://bugzilla.gnome.org/show_bug.cgi?id=646749
+Patch0: Use-16px-menu-icons.patch
+
+#
https://bugzilla.redhat.com/show_bug.cgi?id=685142
+Patch1: gnome-panel-use-gnome-menus.patch
+
+#
https://bugzilla.redhat.com/show_bug.cgi?id=890219
+Patch2: drop-gweather-xml-include.patch
+
+#
https://bugzilla.gnome.org/show_bug.cgi?id=690353
+Patch3: na-style-realize.patch
+
+License: GPLv2+ and LGPLv2+ and GFDL
+Group: User Interface/Desktops
+
+Requires: gnome-desktop3 >= %{gnome_desktop_version}
+Requires: libwnck3 >= %{libwnck_version}
+Requires: gnome-menus >= %{gnome_menus_version}
+%if %{use_evolution_data_server}
+Requires: evolution-data-server >= %{evolution_data_server_version}
+%endif
+Requires: gnome-session-xsession
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+
+Requires(post): hicolor-icon-theme
+Requires(post): GConf2
+Requires(pre): GConf2
+Requires(preun): GConf2
+
+BuildRequires: libxml2-python
+BuildRequires: intltool
+BuildRequires: gettext
+BuildRequires: automake
+BuildRequires: autoconf
+BuildRequires: libtool
+BuildRequires: GConf2-devel
+BuildRequires: gtk3-devel >= %{gtk3_version}
+BuildRequires: itstool
+BuildRequires: libxslt
+BuildRequires: libX11-devel
+BuildRequires: libXt-devel
+BuildRequires: pkgconfig(gnome-desktop-3.0) >= %{gnome_desktop_version}
+BuildRequires: pkgconfig(libwnck-3.0) >= %{libwnck_version}
+BuildRequires: dconf-devel
+BuildRequires: gnome-menus-devel >= %{gnome_menus_version}
+BuildRequires: cairo-devel >= %{cairo_version}
+BuildRequires: yelp-tools
+BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
+BuildRequires: gtk-doc
+BuildRequires: pango-devel
+BuildRequires: libXau-devel
+BuildRequires: libXrandr-devel
+%if %{use_evolution_data_server}
+BuildRequires: evolution-data-server-devel >= %{evolution_data_server_version}
+BuildRequires: dbus-devel >= %{dbus_version}
+%endif
+BuildRequires: polkit-devel >= 0.92
+BuildRequires: libgweather-devel >= %{libgweather_version}
+BuildRequires: librsvg2-devel
+BuildRequires: NetworkManager-devel
+BuildRequires: intltool
+BuildRequires: gettext-devel
+BuildRequires: libtool
+BuildRequires: libcanberra-devel
+BuildRequires: desktop-file-utils
+BuildRequires: gobject-introspection-devel
+BuildRequires: gnome-common
+
+Obsoletes: gdm-user-switch-applet < 1:2.91.6
+Conflicts: gnome-power-manager < 2.15.3
+
+Obsoletes: libgail-gnome < 1.20.4
+
+# Obsolete all old applet packages; this is the output of
+# repoquery --whatrequires libpanel-applet-2.so.0 gnome-python2-applet
+# as of Fedora 15 20110428, as well as ones from Fedora 14.
+Obsoletes: deskbar-applet <= 0:2.32.0-5
+Obsoletes: deskbar-applet-devel <= 0:2.32.0-5
+Obsoletes: file-browser-applet <= 0:0.6.6-2
+Obsoletes: glunarclock <= 0:0.34.1-2
+Obsoletes: gnome-applet-bubblemon <= 0:2.0.15-2
+Obsoletes: gnome-applet-cpufire <= 0:1.6-4
+Obsoletes: gnome-applet-globalmenu <= 0:0.7.9-2
+Obsoletes: gnome-applet-grandr <= 0:0.4.1-3
+Obsoletes: gnome-applet-jalali-calendar <= 0:1.7.1-3
+Obsoletes: gnome-applet-music <= 0:2.5.1-6
+Obsoletes: gnome-applet-sensors <= 0:2.2.7-5
+Obsoletes: gnome-applet-sensors-devel <= 0:2.2.7-5
+Obsoletes: gnome-applet-timer <= 0:2.1.4-3
+Obsoletes: gnome-applet-window-picker <= 0:0.5.8-3
+Obsoletes: gnome-applets <= 1:2.32.0-5
+Obsoletes: gnome-netstatus <= 0:2.28.2-2
+Obsoletes: gnome-python2-applet <= 0:2.32.0-2
+Obsoletes: gnome-schedule <= 0:2.0.2-7
+Obsoletes: gnubiff <= 0:2.2.13-5
+Obsoletes: hamster-applet <= 0:2.32.0-5
+Obsoletes: lock-keys-applet <= 0:1.0-22
+Obsoletes: uim-gnome <= 0:1.6.1-2
+Obsoletes: x-tile <= 0:1.8.6-2
+# Other ones that were already retired from Fedora 15
+Obsoletes: gnome-applet-netspeed <= 0.16-6
+Obsoletes: contact-lookup-applet <= 0.17-7
+
+# Also obsolete the now-dead libpanelappletmm
+Obsoletes: libpanelappletmm <= 0:2.26.0-3
+
+%description
+The GNOME panel provides the window list, workspace switcher, menus, and other
+features for the GNOME desktop.
+
+%package libs
+Summary: Libraries for Panel Applets
+License: LGPLv2+
+Group: Development/Libraries
+
+%description libs
+This package contains the libpanel-applet library that
+is needed by Panel Applets.
+
+%package devel
+Summary: Headers and libraries for Panel Applet development
+License: LGPLv2+
+Group: Development/Libraries
+Requires: %{name}-libs = %{version}-%{release}
+
+%description devel
+Panel Applet development package. Contains files needed for developing
+Panel Applets using the libpanel-applet library.
+
+%prep
+%setup -q -n %{name}-%{version}
+%patch0 -p1 -b .16px
+%patch1 -p1 -b .menus
+%patch2 -p0 -b .gweather
+%patch3 -p1 -b .na-style
+
+rm -f libtool
+autoreconf -i -f
+%build
+%configure \
+ --disable-gtk-doc \
+%if %{use_evolution_data_server}
+ --enable-eds=yes
+%else
+ --enable-eds=no
+%endif
+
+make %{?_smp_mflags} V=1
+
+
+# truncate NEWS
+awk '/^========/ { seen+=1 }
+{ if (seen < 3) print }
+{ if (seen == 3) { print "For older news, see
http://git.gnome.org/cgit/gnome-panel/plain/NEWS"; exit } }' NEWS > tmp; mv
tmp NEWS
+
+
+%install
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+make DESTDIR=$RPM_BUILD_ROOT install
+unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+
+rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
+find $RPM_BUILD_ROOT -name '*.*a' -delete;
+
+desktop-file-install --delete-original \
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ $RPM_BUILD_ROOT%{_datadir}/applications/gnome-panel.desktop
+
+%find_lang %{gettext_package} --all-name --with-gnome
+
+%post
+touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
+
+%postun
+if [ $1 -eq 0 ]; then
+ touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
+ gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null || :
+ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null || :
+glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
+
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
+%files -f %{gettext_package}.lang
+%doc AUTHORS COPYING COPYING.LIB COPYING-DOCS NEWS README
+%{_datadir}/icons/hicolor/16x16/apps/*
+%{_datadir}/icons/hicolor/22x22/apps/*
+%{_datadir}/icons/hicolor/24x24/apps/*
+%{_datadir}/icons/hicolor/32x32/apps/*
+%{_datadir}/icons/hicolor/48x48/apps/*
+%{_datadir}/icons/hicolor/scalable/apps/*
+%{_datadir}/gnome-panel
+%{_datadir}/man/man*/*
+%{_datadir}/applications/gnome-panel.desktop
+%{_bindir}/gnome-panel
+%{_bindir}/gnome-desktop-item-edit
+%{_libexecdir}/*
+
+%{_datadir}/dbus-1/services/org.gnome.panel.applet.ClockAppletFactory.service
+%{_datadir}/dbus-1/services/org.gnome.panel.applet.FishAppletFactory.service
+%{_datadir}/dbus-1/services/org.gnome.panel.applet.NotificationAreaAppletFactory.service
+%{_datadir}/dbus-1/services/org.gnome.panel.applet.WnckletFactory.service
+
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.applet.fish.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.applet.window-list.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.applet.workspace-switcher.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.enums.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.launcher.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.menu-button.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.object.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.toplevel.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.applet.clock.gschema.xml
+
+%files libs
+%{_libdir}/*.so.*
+%{_libdir}/girepository-1.0/PanelApplet-4.0.typelib
+
+%files devel
+%{_bindir}/panel-test-applets
+%{_includedir}/gnome-panel-4.0
+%{_libdir}/pkgconfig/*
+%{_libdir}/*.so
+%{_datadir}/gtk-doc
+%{_datadir}/gir-1.0/PanelApplet-4.0.gir
+
+%changelog
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
3.6.2-6
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Sun Dec 30 2012 Daniel Drake <dsd(a)laptop.org> - 3.6.2-5
+- Fix all-black icons in notification area
+
+* Tue Dec 25 2012 Bruno Wolff III <bruno(a)wolff.to> - 3.6.2-4
+- Drop gweather-xml.h include
+- Rebuild for multiple soname bumps
+
+* Thu Dec 20 2012 Kalev Lember <kalevlember(a)gmail.com> - 3.6.2-3
+- Rebuilt for libgnome-desktop3 3.7.3 soname bump
+
+* Tue Nov 20 2012 Milan Crha <mcrha(a)redhat.com> - 3.6.2-2
+- Rebuild against newer evolution-data-server
+
+* Mon Nov 12 2012 Kalev Lember <kalevlember(a)gmail.com> - 3.6.2-1
+- Update to 3.6.2
+- Clean up some obsolete buildrequires
+
+* Thu Nov 1 2012 Daniel Drake <dsd(a)laptop.org> - 3.6.0-2
+- Update for new gnome-menus gnome-applications filename (#868614)
+
+* Fri Oct 26 2012 Kalev Lember <kalevlember(a)gmail.com> - 3.6.0-1
+- Update to 3.6.0
+
+* Thu Oct 25 2012 Milan Crha <mcrha(a)redhat.com> - 3.5.4-5
+- Rebuild against newer evolution-data-server
+
+* Mon Aug 20 2012 Daniel Drake <dsd(a)laptop.org> - 3.5.4-4
+- Rebuild for libcamel-1.2.so.40
+
+* Fri Jul 27 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
3.5.4-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sun Jul 22 2012 Ville Skytt <ville.skytta(a)iki.fi> - 3.5.4-2
+- Move post(un)install ldconfig scriptlets from main to -libs.
+- Escape macros in %%changelog.
+
+* Wed Jul 18 2012 Matthias Clasen <mclasen(a)redhat.com> - 3.5.4-1
+- Update to 3.5.4
+
+* Tue Jun 26 2012 Matthias Clasen <mclasen(a)redhat.com> - 3.5.3-1
+- Update to 3.5.3
+
+* Fri Jun 8 2012 Matthias Clasen <mclasen(a)redhat.com> - 3.4.2.1-2
+- Rebuild against new gnome-desktop
+
+* Fri May 18 2012 Richard Hughes <hughsient(a)gmail.com> - 3.4.2.1-1
+- Update to 3.4.2.1
+
+* Tue May 01 2012 Kalev Lember <kalevlember(a)gmail.com> - 3.4.1-3
+- Rebuilt for evolution-data-server soname bumps
+
+* Tue Apr 24 2012 Kalev Lember <kalevlember(a)gmail.com> - 3.4.1-2
+- Silence rpm scriptlet output
+
+* Mon Apr 16 2012 Richard Hughes <hughsient(a)gmail.com> - 3.4.1-1
+- Update to 3.4.1
+
+* Tue Mar 27 2012 Kalev Lember <kalevlember(a)gmail.com> - 3.4.0-1
+- Update to 3.4.0
+
+* Wed Mar 21 2012 Kalev Lember <kalevlember(a)gmail.com> - 3.3.92-1
+- Update to 3.3.92
+
+* Tue Mar 6 2012 Matthias Clasen <mclasen(a)redhat.com> - 3.3.91-1
+- Update to 3.3.91
+
+* Sun Feb 26 2012 Matthias Clasen <mclasen(a)redhat.com> - 3.3.90-1
+- Update to 3.3.90
+
+* Tue Feb 7 2012 Matthias Clasen <mclasen(a)redhat.com> - 3.3.5-1
+- Update to 3.3.5
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
3.3.3-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Wed Dec 21 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.3.3-1
+- Update to 3.3.3
+
+* Thu Nov 24 2011 Tomas Bzatek <tbzatek(a)redhat.com> - 3.3.1-3
+- Another rebuild for new EDS
+
+* Tue Nov 22 2011 Daniel Drake <dsd(a)laptop.org> - 3.3.1-2
+- Rebuild for libebook-1.2.so.13
+
+* Wed Nov 2 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.3.1-1
+- Update to 3.3.1
+
+* Sun Oct 30 2011 Bruno Wolff III <bruno(a)wolff.to> - 3.2.1-3
+- Rebuild against newer evolution-data-server
+
+* Wed Oct 26 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
3.2.1-2
+- Rebuilt for glibc bug#747377
+
+* Tue Oct 18 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.2.1-1
+- Update to 3.2.1
+
+* Wed Sep 28 2011 Peter Robinson <pbrobinson(a)fedoraproject.org> - 3.2.0-2
+- Fix Source URL, remove no longer needed band-aid - RHBZ 730586
+
+* Tue Sep 27 2011 Ray <rstrode(a)redhat.com> - 3.2.0-1
+- Update to 3.2.0
+
+* Tue Sep 20 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.1.92-1
+- Update to 3.1.92
+
+* Thu Sep 08 2011 Kalev Lember <kalevlember(a)gmail.com> - 3.1.91-3
+- Obsolete additional -devel packages that AutoQA caught
+
+* Wed Sep 7 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.1.91-2
+- Rebuild against newer libcamel
+
+* Tue Sep 6 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.1.91-1
+- Update to 3.1.91
+
+* Tue Aug 30 2011 Milan Crha <mcrha(a)redhat.com> - 3.1.5-5
+- Rebuild against newer evolution-data-server (once again)
+
+* Mon Aug 29 2011 Milan Crha <mcrha(a)redhat.com> - 3.1.5-4
+- Rebuild against newer evolution-data-server
+
+* Wed Aug 24 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.1.5-3
+- Make the -libs dependency archful
+
+* Fri Aug 19 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.1.5-2
+- Rebuild
+
+* Wed Aug 17 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.1.5-1
+- Update to 3.1.5
+
+* Tue Aug 16 2011 Milan Crha <mcrha(a)redhat.com> - 3.0.2-4
+- Rebuild against newer evolution-data-server
+
+* Mon Jul 25 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.0.2-3
+- Rebuild
+
+* Tue Jul 05 2011 Adam Williamson <awilliam(a)redhat.com> - 3.0.2-2
+- rebuild for new e-d-s
+
+* Thu Jun 16 2011 Tomas Bzatek <tbzatek(a)redhat.com> - 3.0.2-1
+- Update to 3.0.2
+
+* Thu May 5 2011 Colin Walters <walters(a)verbum.org> - 3.0.0.1-5
+- Also obsolete libpanelappletmm
+
+* Thu Apr 28 2011 Colin Walters <walters(a)verbum.org> - 3.0.0.1-4
+- Obsolete old applet packages so upgrades proceeed
+
+* Mon Apr 25 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.0.0.1-3
+- Obsolete libgail-gnome (#697795)
+
+* Mon Apr 11 2011 Colin Walters <walters(a)verbum.org> - 3.0.0.1-2
+- Use gnome menu, not redhat-menus
+
+* Wed Apr 6 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.0.0.1-1
+- Update to 3.0.0.1
+
+* Tue Apr 5 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.0.0-2
+- Make icon sizes more uniform
+
+* Mon Apr 4 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.0.0-1
+- Update to 3.0.0
+
+* Fri Apr 1 2011 Matthias Clasen <mclasen(a)redhat.com> - 2.91.94-1
+- Update to 2.91.94
+
+* Tue Mar 29 2011 Matthias Clasen <mclasen(a)redhat.com> - 2.91.93-1
+- Update to 2.91.93
+
+* Wed Mar 23 2011 Matthias Clasen <mclasen(a)redhat.com> - 2.91.92-1
+- Update to 2.91.92
+
+* Mon Mar 7 2011 Matthias Clasen <mclasen(a)redhat.com> - 2.91.91-1
+- Update to 2.91.91
+
+* Thu Feb 24 2011 Colin Walters <walters(a)verbum.org> - 2.91.90-2
+- Require gnome-shell to band aid upgrades
+
+* Tue Feb 22 2011 Matthias Clasen <mclasen(a)redhat.com> 2.91.90-1
+- Update to 2.91.90
+
+* Fri Feb 11 2011 Matthias Clasen <mclasen(a)redhat.com> 2.91.6-5
+- Rebuild against newer gtk
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
2.91.6-4
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Wed Feb 02 2011 Ray Strode <rstrode(a)redhat.com> 2.91.6-3
+- Cut out the layers of built up cruft.
+
+* Wed Feb 2 2011 Matthias Clasen <mclasen(a)redhat.com> 2.91.6-2
+- Various build fixes
+
+* Wed Feb 02 2011 Ray Strode <rstrode(a)redhat.com> 2.91.6-1
+- Update to 2.91.6
+
+* Wed Sep 29 2010 jkeating - 2.31.92-2
+- Rebuilt for gcc bug 634757
+
+* Wed Sep 22 2010 Matthias Clasen <mclasen(a)redhat.com> - 2.31.92-1
+- Update to 2.31.92
+
+* Tue Sep 21 2010 Matthias Clasen <mclasen(a)redhat.com> - 2.31.90-3
+- Rebuild against newer gtk3
+
+* Mon Aug 23 2010 Matthias Clasen <mclasen(a)redhat.com> - 2.31.90-2
+- Co-own /usr/share/gtk-doc (#604360)
+
+* Thu Aug 19 2010 Matthias Clasen <mclasen(a)redhat.com> - 2.31.90-1
+- Update to 2.31.90
+
+* Wed Aug 4 2010 Matthias Clasen <mclasen(a)redhat.com> - 2.31.6-1
+- Update to 2.31.6
+
+* Tue Aug 3 2010 Matthias Clasen <mclasen(a)redhat.com> - 2.31.4-4
+- Adapt to GDBus api changes
+
+* Thu Jul 15 2010 Colin Walters <walters(a)verbum.org> - 2.31.4-3
+- Rebuild with new gobject-introspection
+
+* Thu Jul 15 2010 Matthias Clasen <mclasen(a)redhat.com> 2.31.4-2
+- Rebuild against new evolution-data-server
+
+* Wed Jun 30 2010 Matthias Clasen <mclasen(a)redhat.com> 2.31.4-1
+- Update to 2.31.4
+
+* Mon Jun 21 2010 Matthias Clasen <mclasen(a)redhat.com> 2.31.2-4
+- Update for GLib api change
+
+* Thu Jun 17 2010 Dan Hork <dan[at]danny.cz> 2.31.2-3
+- link also with libm
+
+* Sat May 29 2010 Matthias Clasen <mclasen(a)redhat.com> 2.31.2-2
+- Rebuild
+
+* Fri May 28 2010 Matthias Clasen <mclasen(a)redhat.com> 2.31.2-1
+- Update to 2.31.2
+
+* Sun May 09 2010 Matthew Barnes <mbarnes(a)redhat.com> 2.30.0-2
+- Rebuild against newer libedataserver and libedataserverui.
+
+* Mon Mar 29 2010 Matthias Clasen <mclasen(a)redhat.com> 2.30.0-1
+- Update to 2.30.0
+
+* Thu Mar 11 2010 Matthias Clasen <mclasen(a)redhat.com> 2.29.92.1-1
+- Update to 2.29.92.1
+
+* Mon Feb 22 2010 Matthias Clasen <mclasen(a)redhat.com> 2.29.91-1
+- Update to 2.29.91
+
+* Wed Feb 17 2010 Matthias Clasen <mclasen(a)redhat.com> 2.29.6-2
+- Update icon-order patch to sort keyboard, too
+
+* Thu Feb 11 2010 Matthias Clasen <mclasen(a)redhat.com> 2.29.6-1
+- Update to 2.29.6
+
+* Sun Jan 17 2010 Matthias Clasen <mclasen(a)redhat.com> 2.29.5.1-1
+- Update to 2.29.5.1
+
+* Tue Dec 15 2009 Matthias Clasen <mclasen(a)redhat.com> 2.28.0-17
+- Handle errors returned from PolicyKit in the clock applet (#547624)
+- Fix clock crash (bug 537798)
+- Improve the behaviour of the panel when screen resolution
+ changes (gnome #341441)
+
+* Thu Oct 29 2009 Matthias Clasen <mclasen(a)redhat.com> 2.28.0-12
+- Make padding work correctly in non-expanded panels (#529614)
+
+* Tue Oct 20 2009 Matthias Clasen <mclasen(a)redhat.com> 2.28.0-11
+- Remove a leftover debugging statement
+
+* Tue Oct 20 2009 Matthias Clasen <mclasen(a)redhat.com> 2.28.0-10
+- Reduce the inter-applet padding
+
+* Mon Oct 19 2009 Ray Strode <rstrode(a)redhat.com> 2.28.0-9
+- Add explicit libs requires (bug 525600)
+
+* Mon Oct 19 2009 Matthias Clasen <mclasen(a)redhat.com> 2.28.0-9
+- Actually set non-zero padding
+
+* Sat Oct 17 2009 Matthias Clasen <mclasen(a)redhat.com> 2.28.0-8
+- Add padding around status icons
+
+* Fri Oct 16 2009 Matthias Clasen <mclasen(a)redhat.com> 2.28.0-6
+- Put status icons in a predictable order
+
+* Wed Oct 14 2009 Matthias Clasen <mclasen(a)redhat.com> 2.28.0-5
+- Tweaks to the default panel configuration
+
+* Thu Oct 8 2009 Matthias Clasen <mclasen(a)redhat.com> 2.28.0-4
+- Fix possible crashes related to randr events
+
+* Thu Oct 8 2009 Matthias Clasen <mclasen(a)redhat.com> 2.28.0-3
+- Accept more bookmarks in the places menu before overflowing
+
+* Wed Oct 7 2009 Matthias Clasen <mclasen(a)redhat.com> 2.28.0-2
+- Add a default location to the clock applet
+
+* Wed Sep 23 2009 Matthias Clasen <mclasen(a)redhat.com> 2.28.0-1
+- Update to 2.28.0
+
+* Wed Sep 9 2009 Matthias Clasen <mclasen(a)redhat.com> 2.27.92-1
+- Update to 2.27.92
+
+* Tue Aug 25 2009 Matthias Clasen <mclasen(a)redhat.com> 2.27.91-1
+- Update to 2.27.91
+
+* Sat Aug 22 2009 Matthias Clasen <mclasen(a)redhat.com> 2.27.4-9
+- Actually apply the 'clear recent' patch
+
+* Thu Aug 13 2009 Matthias Clasen <mclasen(a)redhat.com> 2.27.4-8
+- Stricter clock-applet PolicyKit policy
+
+* Wed Aug 5 2009 Matthias Clasen <mclasen(a)redhat.com> 2.27.4-7
+- Make 'Clear Recent Documents' follow the menu-images setting
+
+* Sun Aug 2 2009 Matthias Clasen <mclasen(a)redhat.com> 2.27.4-6
+- Save some space
+
+* Fri Jul 31 2009 Matthias Clasen <mclasen(a)redhat.com> 2.27.4-5
+- Reduce the excessive 'about'-ing in the System menu
+
+* Mon Jul 27 2009 Matthias Clasen <mclasen(a)redhat.com> 2.27.4-4
+- Drop unneeded direct deps
+
+* Fri Jul 24 2009 Ray Strode <rstrode(a)redhat.com> 2.27.4-3
+- Make my panels show up again on login (gnome bug 589632)
+
+* Wed Jul 22 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.27.4-2
+- Make category icons follow the menu-images setting
+
+* Wed Jul 15 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.27.4-1
+- Update to 2.27.4
+
+* Tue Jun 9 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.26.2-3
+- Port to PolicyKit 1
+
+* Tue Jun 2 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.26.2-2
+- Replace tomboy by gnote in the default panel configuration
+
+* Wed May 20 2009 Ray Strode <rstrode(a)redhat.com> 2.26.2-1
+- Update to 2.26.2
+
+* Mon Apr 27 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.26.1-3
+- Don't drop schemas translations from po files
+
+* Wed Apr 15 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.26.1-2
+- Fix the clock applets network tracking code
+
+* Tue Apr 14 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.26.1-1
+- Update to 2.26.1
+
+* Mon Apr 13 2009 David Zeuthen <davidz(a)redhat.com> - 2.26.0-2
+- Handle emblemed icons (GNOME #578859)
+
+* Tue Mar 17 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.26.0-1
+- Update to 2.26.0
+
+* Tue Mar 3 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.25.92-1
+- Update to 2.25.92
+
+* Fri Feb 27 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.25.91-3
+- Require PolicyKit-authentication-agent
+
+* Mon Feb 23 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.25.91-2
+- Fix panel behaviour on screen size changes
+
+* Thu Feb 19 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.25.91-1
+- Update to 2.25.91
+
+* Tue Feb 3 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.25.90-1
+- Update to 2.25.90
+
+* Fri Jan 23 2009 Ray Strode <rstrode(a)redhat.com> - 2.25.5.1-1
+- Update to 2.25.5.1
+- Fixes bug 481029
+
+* Tue Jan 20 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.25.5-1
+- Update to 2.25.5
+
+* Fri Jan 16 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.25.3-4
+- And don't write %%s into desktop files
+
+* Fri Jan 16 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.25.3-3
+- Fix the 'smart launcher' patch
+
+* Thu Dec 18 2008 - Bastien Nocera <bnocera(a)redhat.com> - 2.25.3-3
+- Remove the mixer from the default panel config as well
+- Update search and preferred apps patches
+
+* Wed Dec 17 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.25.3-2
+- Update to 2.25.3
+- Drop mixer from default config
+
+* Thu Nov 13 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.24.1-6
+- Rebuild
+
+* Sun Nov 9 2008 Ray Strode <rstrode(a)redhat.com> - 2.24.1-4
+- Don't unhide drawers by default. Patch from
+ Leszek Matok <lam(a)lac.pl> (bug 470719)
+
+* Mon Nov 3 2008 Ray Strode <rstrode(a)redhat.com> - 2.24.1-3
+- Fix up panel slide in patch to work better with empty panels
+
+* Mon Nov 3 2008 Ray Strode <rstrode(a)redhat.com> - 2.24.1-2
+- Fix up panel slide in patch to
+ 1) not have odd effects with vertical panels
+ 2) set up struts earlier
+
+* Wed Oct 22 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.24.1-1
+- Update to 2.24.1
+
+* Wed Oct 22 2008 Ray Strode <rstrode(a)redhat.com> - 2.24.0-8
+- Don't make nautilus slide down as the panel slides down,
+ instead push nautilus out of the way immediately, and slide
+ in the available space.
+
+* Sun Oct 12 2008 Ray Strode <rstrode(a)redhat.com> - 2.24.0-7
+- Update smooth slide patch to be simpler based on feedback
+ on gnome bug (554343)
+
+* Thu Oct 9 2008 Ray Strode <rstrode(a)redhat.com> - 2.24.0-6
+- Hide shutdown item if unavailable
+
+* Thu Oct 9 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.24.0-5
+- Don't show menuitems which fail the tryexec test
+
+* Fri Sep 26 2008 Ray Strode <rstrode(a)redhat.com> - 2.24.0-4
+- Try to make initial panel slide-in animation be smooth
+
+* Thu Sep 25 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.24.0-3
+- Save some space
+
+* Thu Sep 25 2008 Ray Strode <rstrode(a)redhat.com> - 2.24.0-2
+- Requires: gnome-session-xsession so it gets pulled in for
+ typical GNOME installs.
+
+* Tue Sep 23 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
+* Mon Sep 8 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.92-1
+- Update to 2.23.92
+
+* Tue Sep 2 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.91-1
+- Update to 2.23.91
+
+* Sat Aug 23 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.90.1-1
+- Update to 2.23.90.1
+
+* Tue Aug 5 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.6-1
+- Update to 2.23.6
+
+* Wed Jul 23 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.23.5-2
+- fix license tag
+
+* Tue Jul 22 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.5-1
+- Update to 2.23.5
+
+* Fri Jul 18 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.4-5
+- Fix one more icon
+
+* Wed Jul 9 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.4-4
+- Move panel-test-applets to the -devel package
+
+* Wed Jul 9 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.4-3
+- Use more standard icon names
+
+* Tue Jul 8 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.4-2
+- Fix debuginfo generation
+
+* Wed Jun 18 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.4-1
+- Update to 2.23.4
+
+* Tue Jun 10 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.3-2
+- Avoid unnecessary wakeups in the clock for monitoring
+ Gentoo config file locations
+
+* Wed Jun 4 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.3-1
+- 2.23.3
+
+* Wed May 14 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.2.1-1
+- Update to 2.23.2.1
+
+* Wed May 14 2008 Adam Tkac <atkac redhat com> - 2.23.1-2
+- rebuild
+
+* Fri Apr 25 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.1-1
+- Update to 2.23.1
+
+* Wed Apr 23 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.1.2-6
+- Remove an erroneous addition in the last patch
+
+* Tue Apr 22 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.1.2-5
+- Add another patch that may fix timezone setting problems (#443415)
+
+* Fri Apr 18 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.1.2-4
+- Use gio to open places
+- Fix a 64bit issue with timezone handling in the clock
+
+* Fri Apr 18 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.1.2-3
+- Move the trash applet back where it belongs, to the corner (#439416)
+
+* Wed Apr 16 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.1.2-2
+- Make help buttons work in clock preferences
+
+* Thu Apr 10 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.1.2-1
+- Update to 2.22.1.2 (significant performance and usability
+ improvements for the clock applet)
+
+* Tue Apr 08 2008 - Bastien Nocera <bnocera(a)redhat.com> - 2.22.1.1-1
+- Update to 2.22.1.1
+
+* Mon Apr 7 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.1-1
+- Update to 2.22.1
+
+* Sun Apr 6 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.0-12
+- Fix a typo in the CK shutdown patch, spotted by Kevin Kofler
+
+* Sat Apr 5 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.0-11
+- Handle PolicyKit errors returned from ConsoleKit
+
+* Fri Apr 4 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.0-10
+- Ignore dbus errors when setting the time
+
+* Wed Apr 2 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.0-9
+- Fix a possible crash in the clock applet
+
+* Fri Mar 28 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.0-8
+- Fix editing of locations in the clock applet
+
+* Fri Mar 28 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.0-7
+- Convert the edit and find location windows to dialogs
+
+* Thu Mar 27 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.0-6
+- Improve the time settings window
+
+* Thu Mar 27 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.0-5
+- Make the find-location window of the clock larger
+
+* Sat Mar 15 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.0-4
+- Only save the session when the users wants it
+
+* Fri Mar 14 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.0-3
+- Populate the location list before showing the preference window
+
+* Mon Mar 10 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.0-2
+- Bump revision
+
+* Mon Mar 10 2008 Jon McCann <jmccann(a)redhat.com> - 2.22.0-1
+- Update to 2.22.0
+
+* Sat Mar 8 2008 Will Woods <wwoods(a)redhat.com> - 2.21.92-6
+- Add "About This Computer" item to System menu if it exists
+
+* Mon Mar 3 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.92-5
+- Fix a redraw problem with the clock map
+
+* Mon Mar 3 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.92-4
+- Make the clock applet handle multiple locations in the
+ same timezone meaningfully
+
+* Mon Mar 3 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.92-3
+- Some upstream clock applet fixes
+
+* Mon Mar 3 2008 Ray Strode <rstrode(a)redhat.com> - 2.21.92-2
+- Don't crash with Zimbra connector (bug 435355)
+
+* Tue Feb 26 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.92-1
+- Update to 2.21.92
+
+* Fri Feb 22 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.91-9
+- Report sunrise/sunset times in local time
+
+* Thu Feb 21 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.91-8
+- Make drawers open again
+
+* Wed Feb 20 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.91-7
+- Make the last patch work
+
+* Wed Feb 20 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.91-6
+- Try harder to avoid resizing the popup
+
+* Tue Feb 19 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.91-5
+- Take daylight savings time into account when calculating offsets
+
+* Mon Feb 18 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.91-4
+- Another round of intlclock fixes
+
+* Sun Feb 17 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.91-3
+- First round of intlclock fixes
+
+* Fri Feb 15 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.91-2
+- Drop gnome-vfs BR
+
+* Wed Feb 12 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.91-1
+- Update to 2.21.91
+- Update patches
+
+* Sun Feb 3 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.90-3
+- Ensure the logout dialog gets focus.
+
+* Tue Jan 29 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.90-1
+- Update to 2.21.90
+- Drop upstreamed patch
+
+* Fri Jan 25 2008 Jon McCann <jmccann(a)redhat.com> - 2.21.5-2
+- Add ConsoleKit restart/shutdown support
+
+* Wed Jan 16 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.5-1
+- Update to 2.21.5
+- Drop separate intlclock
+
+* Thu Dec 13 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.2-2
+- Adapt to libgweather api changes
+
+* Tue Nov 27 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.2-1
+- Update to 2.20.2 (translation updates)
+
+* Tue Nov 13 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.1-7
+- Fix a problem with the intlclock GConf schema
+
+* Tue Nov 13 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.1-6
+- Reenable intlclock
+
+* Tue Nov 13 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.1-5
+- Split off a libs subpackage to break a cyclic dependency
+- Build without intlclock for bootstrapping purposes
+
+* Mon Oct 29 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.1-4
+- Intlclock: make default units work correctly
+
+* Sun Oct 28 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.1-3
+- Intlclock: add weather preferences, show temperature in panel
+
+* Sat Oct 20 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.1-2
+- Fix some issues with the offset display in the intlclock
+
+* Mon Oct 15 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.1-1
+- Update to 2.20.1
+
+* Sun Oct 14 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.0.1-9
+- Install the right intlclock icons, and the right gconf schema
+
+* Sun Oct 14 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.0.1-8
+- Add network monitoring to the intlclock
+
+* Sat Oct 13 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.0.1-7
+- Another round of intlclock updates
+ * show offsets in popup
+ * vary clock faces throughout the day
+
+* Fri Oct 12 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.0.1-6
+- Sharper icons
+
+* Tue Oct 9 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.0.1-5
+- Some intlclock updates
+
+* Fri Oct 5 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.0.1-4
+- Replace clock by intlclock
+
+* Wed Oct 3 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.0.1-3
+- Make it possible to start s-c-d from the clock menu again (#316921)
+
+* Fri Sep 21 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.0.1-2
+- Don't pop up an error if an applet from the default
+ configuration is missing
+
+* Tue Sep 18 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.0.1-1
+- Update to 2.20.0.1
+
+* Mon Sep 17 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.0-1
+- Update to 2.20.0
+
+* Mon Sep 17 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.19.92-7
+- Can't require tomboy where there's no mono
+
+* Mon Sep 17 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.19.92-6
+- Turns out we need requires for applets in the default config (#293261)
+
+* Mon Sep 17 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.19.92-5
+- Drop the requires for fast-user-switch-applet (#253831)
+
+* Thu Sep 13 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.19.92-4
+- Fix some memleaks
+- Remove OpenOffice launchers from the default configuration
+- Add Tomboy to the default configuration
+
+* Mon Sep 10 2007 Ray Strode <rstrode(a)redhat.com> - 2.19.92-3
+- create ~/.local/share/applications before writing out
+ preferred app launchers
+
+* Thu Sep 6 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.19.92-2
+- Improve the handling of preferred apps in launchers
+
+* Tue Sep 4 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.19.92-1
+- Update to 2.19.92
+
+* Thu Aug 23 2007 Adam Jackson <ajax(a)redhat.com> - 2.19.6-2
+- Rebuild for build ID
+
+* Mon Aug 13 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.19.6-1
+- Update to 2.19.6
+
+* Mon Aug 6 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.19.5-7
+- Update license field again
+- Use %%find_lang for help files, too
+
+* Sat Aug 4 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.19.5-6
+- Update license field
+
+* Wed Jul 25 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.19.5-5
+- Make the panel talk to gnome-power-manager again.
+- Drop the patch to add suspend to the menu, it was
+ rejected by upstream
+
+* Wed Jul 25 2007 Jesse Keating <jkeating(a)redhat.com> - 2.19.5-4
+- Rebuild for RH #249435
+
+* Tue Jul 24 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.19.5-3
+- Fix launcher tooltips to react to changes. (#212164)
+
+* Thu Jul 12 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.19.5-2
+- Fix a crash in the new timezone code in the clock applet
+
+* Sun Jul 8 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.19.5-1
+- Update to 2.19.5
+
+* Sat Jul 7 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.19.4-2
+- Fix directory ownership issues
+
+* Sun Jun 17 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.19.4-1
+- Update to 2.19.4
+
+* Tue Jun 5 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.19.3-3
+- Rebuild again
+
+* Mon Jun 4 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.19.3-2
+- Rebuild against new libwnck
+
+* Mon Jun 04 2007 - Bastien Nocera <bnocera(a)redhat.com> - 2.19.3-1
+- Update to 2.19.3
+
+* Tue May 22 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.19.2-2
+- Don't ship a pointless empty file in /usr/share
+
+* Sun May 20 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.19.2-1
+- Update to 2.19.2
+
+* Fri Apr 13 2007 Ray Strode <rstrode(a)redhat.com> - 2.18.0-9
+- Apply upstream patch from Ross Burton (upstream bug 416120)
+ to show completed tasks in the clock applet as completed.
+
+* Wed Apr 4 2007 Ray Strode <rstrode(a)redhat.com> - 2.18.0-8
+- fix invalid read and potentially fix 234544
+
+* Wed Apr 4 2007 Ray Strode <rstrode(a)redhat.com> - 2.18.0-7
+- Allow users to correct desktop launchers when given an
+ error initially (bug 233015)
+
+* Tue Apr 3 2007 Ray Strode <rstrode(a)redhat.com> - 2.18.0-6
+- update the clock after timezone changes (bug 230832)
+
+* Sat Mar 31 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.18.0-5
+- Remove the bug-buddy patch again; fixed better in libgnome
+
+* Fri Mar 30 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.18.0-4
+- Fix bug-buddy support in the other applets
+
+* Fri Mar 30 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.18.0-3
+- Fix bug-buddy support in the clock applet
+
+* Fri Mar 30 2007 Ray Strode <rstrode(a)redhat.com> - 2.18.0-2
+- hide "Lock Screen" menu item when logged in as root
+
+* Tue Mar 13 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.18.0-1
+- Update to 2.18.0
+
+* Tue Mar 6 2007 Alexander Larsson <alexl(a)redhat.com> - 2.17.92-1
+- Add xdg-user-dirs patch
+
+* Wed Feb 28 2007 Matthias Clasen <mclasen(a)redhat.com> 2.17.92-1
+- Update to 2.17.92
+
+* Tue Feb 13 2007 Matthias Clasen <mclasen(a)redhat.com> 2.17.91-6
+- Put the fast user switch applet in the default panel configuration
+
+* Tue Feb 13 2007 Matthias Clasen <mclasen(a)redhat.com> 2.17.91-5
+- Update to 2.17.91
+
+* Sat Feb 10 2007 Matthias Clasen <mclasen(a)redhat.com> 2.17.91-4.svn20070207
+- Run autoheader since HAVE_LANGINFO_H is missing in config.h.in
+
+* Fri Feb 9 2007 Kristian Hgsberg <krh(a)redhat.com> 2.17.91-3.svn20070207
+- Update compiz support patch (#227986).
+
+* Thu Feb 8 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.17.91-2.svn20070207
+- Hide the "Switch User" button on the logout dialog again
+
+* Mon Jan 22 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.17.90-1
+- Update to 2.17.90
+- Clean up BuildRequires
+- Allow user switching from the logout dialog
+
+* Sun Jan 14 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.16.2-2
+- Check for the right tracker desktop file
+
+* Tue Dec 5 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.16.2-1
+- Update to 2.16.2
+- Drop upstreamed patches
+
+* Wed Nov 29 2006 Ray Strode <rstrode(a)redhat.com> - 2.16.1-8
+- don't ask user if they want to logout if they've set the
+ preference not to
+
+* Wed Nov 29 2006 Stepan Kasal <skasal(a)redhat.com> - 2.16.1-7
+- Add BuildRequires: libtool; without it, the aclocal call failed.
+
+* Tue Nov 21 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.16.1-6
+- Support tracker
+
+* Thu Nov 16 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.16.1-5
+- Fix previous patch and also include the fix
+ for gnome bug 359707
+
+* Tue Nov 14 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.16.1-4
+- Fix copying of launchers by DND, bug 214334
+
+* Tue Nov 14 2006 Ray Strode <rstrode(a)redhat.com> - 2.16.1-3
+- fix "Add this launcher to panel" chinese translation.
+ Patch by Caius Chance (bug 211569)
+
+* Fri Oct 27 2006 Matthew Barnes <mbarnes(a)redhat.com> - 2.16.1-2
+- Update BuildRequires for evolution-data-server-devel.
+- Rebuild against evolution-data-server-1.9.1.
+
+* Sat Oct 21 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.16.1-1
+- Update to 2.16.1
+
+* Wed Oct 18 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.16.0-5
+- Fix scripts according to packaging guidelines
+
+* Wed Sep 27 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.16.0-4.fc6
+- Copy translations for "Suspend" menu item from
+ gnome-power-manager
+
+* Tue Sep 19 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.16.0-3.fc6
+- Fix some directory ownership issues
+- Add a %%preun to uninstall gconf schemas
+- Require hicolor-icon-theme (#204237)
+
+* Mon Sep 18 2006 Soren Sandmann <sandmann(a)redhat.com> - 2.16.0-2.fc6
+- Add patch to make the pager preference box deal with viewports when compiz
+ is running. (Bug 205905).
+
+* Mon Sep 4 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.16.0-1.fc6
+- Update to 2.16.0
+
+* Fri Sep 1 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.15.92-3.fc6
+- Avoid unneeded wakeups in the clock applet (204862)
+
+* Fri Aug 25 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.15.92-2.fc6
+- Install omf files in the proper location (#201034)
+
+* Mon Aug 21 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.15.92-1.fc6
+- Update to 2.15.92
+- Require pkgconfig in the -devel package
+- Drop upstreamed patches
+- Drop stale code from .spec
+
+* Fri Aug 18 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.15.91-4.fc6
+- Make clearing recent files work more than once
+
+* Wed Aug 16 2006 Ray Strode <rstrode(a)redhat.com> - 2.15.91-3.fc6
+- add more complete fix for bug 201439
+
+* Fri Aug 15 2006 Alexander Larsson <alexl(a)redhat.com> - 2.15.91-2.fc6
+- Also use beagle for search actions (#201424)
+
+* Sun Aug 13 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.15.91-1.fc6
+- Update to 2.15.91
+
+* Wed Aug 9 2006 Ray Strode <rstrode(a)redhat.com> - 2.15.90-5
+- remove suspend from logout dialog
+
+-* Mon Aug 7 2006 Matthew Barnes <mbarnes(a)redhat.com> - 2.15.90-4
+- Rebuild against evolution-data-server-1.7.91
+
+* Mon Aug 7 2006 Ray Strode <rstrode(a)redhat.com> - 2.15.90-3
+- fix double free in menu editor launcher (bug 201439)
+
+* Fri Aug 4 2006 Ray Strode <rstrode(a)redhat.com> - 2.15.90-2
+- move suspend to menu again
+- remove autogenerated panel-typebuiltins.c from move-suspend-to-menu (caolanm)
+
+* Fri Aug 4 2006 Ray Strode <rstrode(a)redhat.com> - 2.15.90-1
+- update to 2.15.90
+
+* Fri Jul 28 2006 Ray Strode <rstrode(a)redhat.com> - 2.14.2-8
+- don't get stuck in infinite recursion loop from previous
+ fix. Patch by Fredric Crozat
+
+* Wed Jul 26 2006 Ray Strode <rstrode(a)redhat.com> - 2.14.2-7
+- don't try to talk to X if the connection is dead (bug 200149)
+
+* Tue Jul 18 2006 Ray Strode <rstrode(a)redhat.com> - 2.14.2-6
+- change "Suspend" to "Hibernate" where appropriate (bug 190791)
+
+* Wed Jul 12 2006 Jesse Keating <jkeating(a)redhat.com> - 2.14.2-5.1
+- rebuild
+
+* Mon Jun 19 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.14.2-5
+- Add a patch to support transparent backgrounds in the
+ notification area
+
+* Wed Jun 14 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.14.2-4
+- Update to new gnome-power-manager interface
+- Conflict with gnome-power-manager < 2.15.3
+
+* Fri Jun 9 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.14.2-3
+- Add missing BuildRequires
+
+* Mon May 29 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.14.2-2
+- Update to 2.14.2
+- Drop upstreamed patches
+
+* Mon May 22 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.14.1-4
+- Make it build in mock
+
+* Fri May 12 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.14.1-3
+- Close the about dialog
+
+* Mon Apr 10 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.14.1-2
+- Update to 2.14.1
+- Update patches
+
+* Mon Mar 13 2006 Ray Strode <rstrode(a)redhat.com> - 2.14.0-1
+- update to 2.14.0
+
+* Tue Feb 28 2006 Karsten Hopp <karsten(a)redhat.de> 2.13.91-5
+- Buildrequires: ORBit2-devel, which, libxml2-python, libX11-devel,
+ libXt-devel, gnome-doc-utils, dbus-devel
+
+* Mon Feb 27 2006 Ray Strode <rstrode(a)redhat.com> - 2.13.91-4
+- ignore unknown options (bug 182734)
+
+* Sun Feb 19 2006 Ray Strode <rstrode(a)redhat.com> - 2.13.91-3
+- bring back shutdown menu item
+
+* Wed Feb 15 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.13.91-2
+- fix up the gnome-power-manager integration patch
+
+* Mon Feb 13 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.13.91-1
+- update to 2.13.91
+
+* Mon Feb 13 2006 Ray Strode <rstrode(a)redhat.com> - 2.13.90-3
+- use beagle if available for search tool
+
+* Sun Feb 12 2006 Ray Strode <rstrode(a)redhat.com> - 2.13.90-2
+- add first pass at gnome power manager integration
+
+* Fri Feb 10 2006 Jesse Keating <jkeating(a)redhat.com> - 2.13.90-1.2
+- bump again for double-long bug on ppc(64)
+
+* Tue Feb 07 2006 Jesse Keating <jkeating(a)redhat.com> - 2.13.90-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
+* Fri Jan 27 2006 Matthias Clasen <mclasen(a)redhat.com> 2.13.90-1
+- Update to 2.13.90
+
+* Fri Jan 20 2006 Matthias Clasen <mclasen(a)redhat.com> 2.13.5-2
+- Remove "Switch user" button
+
+* Tue Jan 17 2006 Matthias Clasen <mclasen(a)redhat.com> 2.13.5-1
+- Update to 2.13.5
+
+* Thu Jan 5 2006 Matthias Clasen <mclasen(a)redhat.com> 2.13.4-1
+- Update to 2.13.4
+- reinstate the desktop-menu-renaming
+
+* Wed Dec 21 2005 Ray Strode <rstrode(a)redhat.com> 2.13.3-3
+- add patch from cvs to fix crasher bug
+
+* Tue Dec 20 2005 Matthias Clasen <mclasen(a)redhat.com> 2.13.3-2
+- Rebuild against new libedataserver
+
+* Thu Dec 15 2005 Matthias Clasen <mclasen(a)redhat.com> 2.13.3-1
+- Update to 2.13.3
+- Use sed rather than patch for po files
+
+* Fri Dec 09 2005 Jesse Keating <jkeating(a)redhat.com>
+- rebuilt
+
+* Fri Dec 2 2005 Matthias Clasen <mclasen(a)redhat.com> 2.13.2-1
+- Update to 2.13.2
+
+* Sun Nov 13 2005 John (J5) Palmieri <johnp(a)redhat.com> 2.12.1-7
+- Fix patch to refrence about-fedora.desktop and not fedora-about.desktop
+
+* Sun Nov 13 2005 John (J5) Palmieri <johnp(a)redhat.com> 2.12.1-6
+- add about fedora menu item
+- readd gnome-main-menu.png as fedora-logo now installs it to
+ the Bluecurve theme
+
+* Sat Nov 12 2005 Florian La Roche <laroche(a)redhat.com>
+- remove gnome-main-menu.png as this is part of fedora-logos
+
+* Tue Nov 1 2005 Ray Strode <rstrode(a)redhat.com> 2.12.1-4
+- rename "Desktop" menu to "System" menu (bug 170812)
+
+* Thu Oct 20 2005 Matthias Clasen <mclasen(a)redhat.com> 2.12.1-3
+- Add trash applet to the default setup
+
+* Mon Oct 17 2005 Matthias Clasen <mclasen(a)redhat.com> 2.12.1-2
+- Change the "Cancel" button on the "add to" dialog to
"Close"
+
+* Thu Oct 6 2005 Matthias Clasen <mclasen(a)redhat.com> 2.12.1-1
+- Update to 2.12.1
+- Update patches
+
+* Fri Sep 30 2005 Mark McLoughlin <markmc(a)redhat.com> 2.12.0-3
+- Remove hacks to add battery applet to default panel configuration
+ where ACPI/APM is available (#169621) and GIMLET in CJK locales (#169430)
+
+* Wed Sep 14 2005 Jeremy Katz <katzj(a)redhat.com> - 2.12.0-2
+- we have mozilla (and e-d-s) on ppc64 now
+
+* Tue Sep 6 2005 Mark McLoughlin <markmc(a)redhat.com> 2.12.0-1
+- Update to 2.12.0
+
+* Mon Aug 22 2005 Mark McLoughlin <markmc(a)redhat.com> 2.11.92-1
+- Update to 2.11.92.
+
+* Tue Aug 16 2005 Mark McLoughlin <markmc(a)redhat.com> 2.11.91-3
+- Rebuild for new cairo
+
+* Wed Aug 10 2005 Mark McLoughlin <markmc(a)redhat.com> 2.11.91-2
+- Fix "Adjust Date & Time" (#165586)
+
+* Wed Aug 10 2005 Mark McLoughlin <markmc(a)redhat.com> 2.11.91-1
+- Update to 2.11.91
+
+* Wed Aug 10 2005 Mark McLoughlin <markmc(a)redhat.com> 2.11.90-2
+- Bump gtk2 req to 2.7.1
+- Remove bogus/stale reqs: libxslt-devel, startup-notification-devel,
+ gnome-keyring, libpng-devel, fontconfig-devel, libtool, automake,
+ autoconf ...
+
+* Thu Aug 4 2005 Matthias Clasen <mclasen(a)redhat.com> 2.11.90-1
+- New upstream version
+
+* Tue Jul 26 2005 Mark McLoughlin <markmc(a)redhat.com> 2.11.4-3
+- Rebuild
+
+* Tue Jul 12 2005 Matthias Clasen <mclasen(a)redhat.com> 2.11.4-2
+- Rebuild
+
+* Fri Jul 8 2005 Matthias Clasen <mclasen(a)redhat.com> 2.11.4-1
+- Update to 2.11.4
+
+* Mon Jun 27 2005 Mark McLoughlin <markmc(a)redhat.com> 2.10.1-11
+- Fix "panel doesn't notice new screen size" issue (bug #160439)
+
+* Wed May 11 2005 Mark McLoughlin <markmc(a)redhat.com> 2.10.1-10
+- Fix "dialogs pop up under panel dialogs" issue (bug #156425)
+
+* Wed May 4 2005 Mark McLoughlin <markmc(a)redhat.com> 2.10.1-9
+- Fix crash with "Recent Documents" menu (bug #156633)
+
+* Mon May 2 2005 Mark McLoughlin <markmc(a)redhat.com> 2.10.1-8
+- Update to new
OpenOffice.org .desktop file locations in
+ openoffice.org-1.9.97-3 (bug #156064)
+
+* Wed Apr 27 2005 Mark McLoughlin <markmc(a)redhat.com> - 2.10.1-7
+- Add patch to clamp the size of the icons on the panel at 48x48. Fixes
+ "moved the panel to the side, can't move it back" issue (rh #141743)
+
+* Wed Apr 27 2005 Mark McLoughlin <markmc(a)redhat.com> 2.10.1-6
+- Reference the
OpenOffice.org Impress .desktop file correctly
+
+* Wed Apr 27 2005 Mark McLoughlin <markmc(a)redhat.com> 2.10.1-5
+- Update launcher locations for
OpenOffice.org icons
+
+* Wed Apr 27 2005 Jeremy Katz <katzj(a)redhat.com> - 2.10.1-4
+- silence %%post
+
+* Mon Apr 25 2005 Mark McLoughlin <markmc(a)redhat.com> 2.10.1-3
+- Add patch to make Wanda not use non-existent fortune
+ command (rh #152948)
+
+* Mon Apr 18 2005 Mark McLoughlin <markmc(a)redhat.com> 2.10.1-2
+- Add the battery applet to the panel in %%post if ACPI is
+ available (bug #143828)
+
+* Mon Apr 4 2005 Mark McLoughlin <markmc(a)redhat.com> 2.10.1-1
+- Update to 2.10.1
+
+* Mon Mar 28 2005 Christopher Aillon <caillon(a)redhat.com>
+- rebuilt
+
+* Fri Mar 25 2005 Christopher Aillon <caillon(a)redhat.com> 2.10.0-2
+- Update the GTK+ theme icon cache on (un)install
+
+* Mon Mar 14 2005 Matthias Clasen <mclasen(a)redhat.com> 2.10.0-1
+- Update to 2.10.0
+- Bump BuildRequires for libwnck
+- Update patches
+
+* Wed Mar 4 2005 Mark McLoughlin <markmc(a)redhat.com> 2.9.91-4
+- Fix a BuildRequires
+
+* Wed Mar 2 2005 Mark McLoughlin <markmc(a)redhat.com> 2.9.91-3
+- Rebuild with gcc4
+
+* Thu Feb 10 2005 Mark McLoughlin <markmc(a)redhat.com> - 2.9.91-2
+- Require gnome-desktop 2.9.91
+
+* Wed Feb 9 2005 Matthias Clasen <mclasen(a)redhat.com> - 2.9.91-1
+- Update to 2.9.91
+
+* Mon Feb 7 2005 Mark McLoughlin <markmc(a)redhat.com> - 2.9.90-4
+- Don't use --makefile-install-rule to install .entries files (#147112)
+
+* Fri Feb 4 2005 Mark McLoughlin <markmc(a)redhat.com> - 2.9.90-3
+- Update schemas list (#147112)
+
+* Thu Feb 3 2005 Matthias Clasen <mclasen(a)redhat.com> - 2.9.90-2
+- Look for vendor-prefixed .desktop files
+
+* Mon Jan 31 2005 Matthias Clasen <mclasen(a)redhat.com> - 2.9.90
+- Update to 2.9.90
+
+* Fri Jan 28 2005 Florian La Roche <laroche(a)redhat.com>
+- rebuild
+
+* Thu Jan 27 2005 Jeremy Katz <katzj(a)redhat.com> - 2.8.1-8
+- really disable e-d-s support
+
+* Wed Jan 26 2005 David Malcolm <dmalcolm(a)redhat.com> - 2.8.1-7
+- Make the evolution-data-server dependency optional at packaging time.
+- Disable it for now to ease transition to Evolution 2.2 (bug #146283)
+
+* Fri Nov 26 2004 Mark McLoughlin <markmc(a)redhat.com> - 2.8.1-6
+- Add patch to fix launcher animation artifact (bug #136938)
+
+* Fri Nov 12 2004 Mark McLoughlin <markmc(a)redhat.com> - 2.8.1-5
+- Use /apps/panel for configuration so that homedir sharing with
+ previous versions works reasonably well. This is the location
+ upstream is using from GNOME 2.10 onwards.
+- Install old pager.schemas and tasklist.schemas so that
+ old configurations which reference the old schema names
+ continue to work
+
+* Mon Nov 1 2004 Mark McLoughlin <markmc(a)redhat.com> - 2.8.1-4
+- Fix use-correct-applications-uri patch to not crash on
+ ia64 - fix from Dave Malcolm (#136908)
+
+* Mon Oct 18 2004 <jrb(a)redhat.com> - 2.8.1-3
+- change redhat-web.desktop and redhat-email.desktop to be in /usr/share instead of using
the menu path
+
+* Fri Oct 15 2004 Matthias Clasen <mclasen(a)redhat.com>
+- Make dropping non-ASCII uris work. (#135874)
+
+* Tue Oct 12 2004 Mark McLoughlin <markmc(a)redhat.com>
+- Update to 2.8.1
+- Change the default no. pager rows back to 1
+- Add a new tamil translation
+
+* Thu Oct 7 2004 Mark McLoughlin <markmc(a)redhat.com> 2.8.0.1-3
+- Add the Input Method Switcher applet in certain locales (#134659)
+
+* Fri Oct 1 2004 Mark McLoughlin <markmc(a)redhat.com> 2.8.0.1-2
+- New panel layout from Bryan and Seth
+
+* Wed Sep 29 2004 Mark McLoughlin <markmc(a)redhat.com> 2.8.0.1-1
+- Update to 2.8.0.1
+
+* Tue Sep 21 2004 Mark McLoughlin <markmc(a)redhat.com> 2.8.0-2
+- Remove the print launcher from the default setup - it was removed
+ from the desktop-printing package a while ago
+
+* Tue Sep 21 2004 Mark McLoughlin <markmc(a)redhat.com> 2.8.0-1
+- Update to 2.8.0
+
+* Tue Aug 31 2004 Mark McLoughlin <markmc(a)redhat.com> 2.7.92.1-1
+- Update to 2.7.92.1
+
+* Mon Aug 30 2004 Mark McLoughlin <markmc(a)redhat.com> 2.7.92-1
+- Update to 2.7.92
+
+* Wed Aug 25 2004 Mark McLoughlin <markmc(a)redhat.com> 2.7.91.1-2
+- Pipe gconftool stdout to /dev/null - fixes bug #130506
+
+* Thu Aug 19 2004 Mark McLoughlin <markmc(a)redhat.com> 2.7.91.1-1
+- Update to 2.7.91.1
+
+* Wed Aug 18 2004 Mark McLoughlin <markmc(a)redhat.com> 2.7.91-1
+- Update to 2.7.91
+
+* Tue Aug 10 2004 Mark McLoughlin <markmc(a)redhat.com> - 2.7.90-1
+- Update to 2.7.90 and remove a bunch of patches
+
+* Mon Aug 2 2004 David Malcolm <dmalcolm(a)redhat.com> - 2.6.0-11
+- added dependency on evolution-data-server and rebuilt
+
+* Tue Jun 15 2004 Elliot Lee <sopwith(a)redhat.com>
+- rebuilt
+
+* Mon Apr 19 2004 Mark McLoughlin <markmc(a)redhat.com> 2.6.0-9
+- Install battstat on the default panel on ppc too
+
+* Mon Apr 19 2004 Mark McLoughlin <markmc(a)redhat.com> 2.6.0-8
+- Only put the battstat applet on the default panel on ix86 (i.e. the
+ platforms where apmd is built) - bug #121098
+
+* Thu Apr 15 2004 Mark McLoughlin <markmc(a)redhat.com> 2.6.0-7
+- Fix typo with laptop battery detection scriptlet - bug #120921
+
+* Thu Apr 15 2004 Mark McLoughlin <markmc(a)redhat.com> 2.6.0-6
+- Overwrite panel-compatibility.schemas with
+ redhat-panel-backwards-compat-config.schemas and install that so
+ it doesn't seem like we've forgotten panel-compatibility.schemas
+
+* Thu Apr 8 2004 Mark McLoughlin <markmc(a)redhat.com> 2.6.0-5
+- Fix problem with apm detection in %%post on machines whose
+ APM bios doesn't have battery lifetime support
+
+* Wed Apr 7 2004 Mark McLoughlin <markmc(a)redhat.com> - 2.6.0-4
+- Add patch to make the applications list in the run dialog work
+ correctly with the new vfs menu module. Bug #118305.
+
+* Mon Apr 5 2004 Mark McLoughlin <markmc(a)redhat.com> 2.6.0-3
+- Fix "vailed to parse hour_format" warnings on install (bug #119956)
+
+* Fri Apr 5 2004 Mark McLoughlin <markmc(a)redhat.com> - 2.6.0-2
+- Add patches to fixup how we install the default setup
+- Require GConf2-2.6.0-2 for gconftool-2 --load fix
+
+* Wed Mar 31 2004 Mark McLoughlin <markmc(a)redhat.com> 2.6.0-1
+- Update to 2.6.0
+
+* Wed Mar 10 2004 Mark McLoughlin <markmc(a)redhat.com>
+- Update to 2.5.92
+
+* Wed Mar 03 2004 Mark McLoughlin <markmc(a)redhat.com> 2.5.91-2
+- Use the main menu icon in the menu bar (#100407)
+
+* Tue Mar 02 2004 Elliot Lee <sopwith(a)redhat.com>
+- rebuilt
+
+* Tue Mar 02 2004 Mark McLoughlin <markmc(a)redhat.com> 2.5.91-1
+- Update to 2.5.91
+- Split off a -devel package (#108618)
+- Add a scrollkeeper PreReq and scrollkeeper, intltool and
+ libpng-devel BuildRequires. (#110928, Maxim Dzumanenko)
+
+* Fri Feb 27 2004 Mark McLoughlin <markmc(a)redhat.com> 2.5.90-1
+- Update to 2.5.90
+- Resolve conflicts with the lockf patch and re-work slightly
+
+* Thu Feb 19 2004 Jeremy Katz <katzj(a)redhat.com> - 2.5.3.1-6
+- and again for real this time
+
+* Wed Feb 18 2004 Jeremy Katz <katzj(a)redhat.com> - 2.5.3.1-5
+- rebuild without e-d-s
+
+* Fri Feb 13 2004 Elliot Lee <sopwith(a)redhat.com>
+- rebuilt
+
+* Fri Feb 06 2004 Dan Williams <dcbw(a)redhat.com> 2.5.3.1-3
+- Add in file locking retries for egg-recent-model stuff, as with
+ gedit. Makes gnome-panel and other apps like gedit not fight
+ for recent files list on NFS home directories
+
+* Tue Jan 27 2004 Alexander Larsson <alexl(a)redhat.com> 2.5.3.1-2
+- Add evolution-data-server dependency and rebuild
+
+* Thu Oct 9 2003 Owen Taylor <otaylor(a)redhat.com> 2.4.0-2
+- Look up the largest size available when picking default images for
+ panel stock icons (#106673)
+
+* Thu Sep 4 2003 Alexander Larsson <alexl(a)redhat.com> 2.3.90-1
+- update to 2.3.90
+- Add backwards compat panel config schemas
+
+* Wed Aug 27 2003 Alexander Larsson <alexl(a)redhat.com> 2.3.7-1
+- update to 2.3.7
+- patch the right icon for the main menu (#102672)
+- PreReq a new gconf (#102530)
+
+* Mon Aug 25 2003 Alexander Larsson <alexl(a)redhat.com> 2.3.6.2-4
+- Don't lock all objects on panel
+- use "make DESTDIR=... install" so gconf rules are right
+
+* Mon Aug 18 2003 Alexander Larsson <alexl(a)redhat.com> 2.3.6.2-3
+- Update the default panel setup handling to the new way
+
+* Thu Aug 14 2003 Jonathan Blandford <jrb(a)redhat.com> 2.3.6.2-1
+- remove the right .la files.
+
+* Thu Aug 14 2003 Alexander Larsson <alexl(a)redhat.com> 2.3.6.2-1
+- update for gnome 2.3
+
+* Tue Jul 29 2003 Havoc Pennington <hp(a)redhat.com> 2.2.2.1-3
+- disable gtk doc
+
+* Mon Jul 28 2003 Havoc Pennington <hp(a)redhat.com> 2.2.2.1-3
+- rebuild
+
+* Wed Jul 9 2003 Alexander Larsson <alexl(a)redhat.com> 2.2.2.1-2
+- Fix redhat menu icon
+
+* Mon Jul 7 2003 Havoc Pennington <hp(a)redhat.com> 2.2.2.1-1
+- 2.2.2.1
+- remove memleaks patch, now upstream
+- remove applet-sm patch now upstream
+- remove "null" patch, now upstream
+- remove recent-monitor patch now upstream
+- remove notification area crash fix, now upstream
+
+* Wed Jun 04 2003 Elliot Lee <sopwith(a)redhat.com>
+- rebuilt
+
+* Mon Feb 24 2003 Elliot Lee <sopwith(a)redhat.com>
+- debuginfo rebuild
+
+* Mon Feb 24 2003 Elliot Lee <sopwith(a)redhat.com> 2.2.0.1-8
+- Rebuild with an updated libtool to fix #84742
+
+* Thu Feb 20 2003 Havoc Pennington <hp(a)redhat.com> 2.2.0.1-6
+- fix memleaks, #84489 #84467
+- use icon theme for button widgets instead of stock ID #82301
+
+* Fri Feb 14 2003 Havoc Pennington <hp(a)redhat.com> 2.2.0.1-5
+- disable session management for all applets
+
+* Tue Feb 11 2003 Havoc Pennington <hp(a)redhat.com> 2.2.0.1-4
+- fix #83683 for real, very embarassing bug in the end
+
+* Tue Feb 11 2003 Havoc Pennington <hp(a)redhat.com> 2.2.0.1-3
+- add assertions to try to narrow down #83683 more
+
+* Tue Feb 11 2003 Tim Waugh <twaugh(a)redhat.com> 2.2.0.1-2
+- Fix notification area crash (bug #83683).
+
+* Wed Feb 5 2003 Havoc Pennington <hp(a)redhat.com> 2.2.0.1-1
+- 2.2.0.1
+
+* Mon Feb 3 2003 Matt Wilson <msw(a)redhat.com> 2.2.0-2
+- added gnome-panel-2.1.90.1-null.patch to avoid segv on 64 bit platforms
+ #82978
+
+* Mon Feb 3 2003 Alexander Larsson <alexl(a)redhat.com> 2.2.0-1
+- Update to 2.2.0
+- Add patch to disable monitoring in recent-files, since it made you not able to unmount
cds.
+
+* Thu Jan 30 2003 Matt Wilson <msw(a)redhat.com> 2.1.90.1-6
+- disable optimizations on x86_64 to work around gcc bug
+
+* Wed Jan 22 2003 Tim Powers <timp(a)redhat.com>
+- rebuilt
+
+* Mon Jan 13 2003 Jonathan Blandford <jrb(a)redhat.com>
+- put the control-center second
+
+* Sat Jan 11 2003 Havoc Pennington <hp(a)redhat.com>
+- fix the extra separator left when we lack screenshot menuitem
+
+* Fri Jan 10 2003 Havoc Pennington <hp(a)redhat.com>
+- fix the clock
+
+* Thu Jan 9 2003 Havoc Pennington <hp(a)redhat.com>
+- remove enhanced-errors patch now upstream
+- change how we're doing the laptop-specific config to avoid cut-and-paste
+- update clock-addons patch
+- remove hardcoded change to default panel icon size, we'll put it in bluecurve
+ theme.
+- run xscreensaver fortune instead of just "fortune" from the fish
+- add printer icon to panel
+
+* Wed Jan 8 2003 Havoc Pennington <hp(a)redhat.com>
+- 2.1.90.1
+
+* Mon Dec 16 2002 Tim Powers <timp(a)redhat.com> 2.1.4-4
+- rebuild
+
+* Mon Dec 16 2002 Havoc Pennington <hp(a)redhat.com>
+- rebuild
+
+* Sat Dec 14 2002 Havoc Pennington <hp(a)redhat.com>
+- require gnome-desktop 2.1.4
+- include datadir/fish
+
+* Fri Dec 13 2002 Havoc Pennington <hp(a)redhat.com>
+- 2.1.4
+
+* Mon Dec 2 2002 Havoc Pennington <hp(a)redhat.com>
+- 2.1.3
+- build req startup-notification-devel
+
+* Wed Nov 13 2002 Havoc Pennington <hp(a)redhat.com>
+- 2.1.2
+- system tray is now in the main gnome-panel package
+
+* Wed Oct 23 2002 Havoc Pennington <hp(a)redhat.com>
+- 2.0.10
+- remove memleaks-and-clock-format patch, should be upstream
+- remove WIN_POS_MOUSE purge, done upstream
+
+* Mon Oct 14 2002 Florian La Roche <Florian.LaRoche(a)redhat.de>
+- fix postun script
+
+* Tue Oct 8 2002 Havoc Pennington <hp(a)redhat.com>
+- 2.0.9 with menu edit stuff
+- system-tray-applet 0.15 that doesn't crash all the time
+- merge/remove patches as appropriate
+
+* Wed Aug 28 2002 Owen Taylor <otaylor(a)redhat.com>
+- Fix problem with "hold down print screen" (71432)
+
+* Tue Aug 27 2002 Jonathan Blandford <jrb(a)redhat.com>
+- panel-properties OnlyShowIn=GNOME;
+- somehow the po file got screwed up. Works now
+- update po files
+
+* Sun Aug 25 2002 Havoc Pennington <hp(a)redhat.com>
+- fix from #71762 for clock applet popdown key
+- no WIN_POS_MOUSE fixes #72167
+- fix for #72540 from George
+
+* Wed Aug 21 2002 Havoc Pennington <hp(a)redhat.com>
+- system tray applet 0.11 with a small memleak fix and a couple translations
+
+* Thu Aug 15 2002 Jonathan Blandford <jrb(a)redhat.com>
+- menu tweaks
+
+* Wed Aug 14 2002 Tim Powers <timp(a)redhat.com>
+- bump release
+
+* Wed Aug 14 2002 Preston Brown <pbrown(a)redhat.com>
+- put battery applet on panel for laptops (#67296)
+
+* Mon Aug 12 2002 Havoc Pennington <hp(a)redhat.com>
+- 2.0.6 final from gnome 2.0.1
+- remove gnome-panel-screenshot patch now upstream
+
+* Thu Aug 8 2002 Jonathan Blandford <jrb(a)redhat.com>
+- new system-tray-applet version
+- Fix gnome-panel-screenshot
+
+* Tue Aug 6 2002 Havoc Pennington <hp(a)redhat.com>
+- 2.0.4
+- replace gnome-logo-icon-transparent.png with redhat-main-menu.png
+ for the foot menu
+
+* Fri Aug 2 2002 Havoc Pennington <hp(a)redhat.com>
+- fix desktop (logout/lock) menu item location
+ in Alt+F1 and in new menu applets
+- remove Screenshot... menu item
+
+* Fri Aug 2 2002 Havoc Pennington <hp(a)redhat.com>
+- move around default applets, remove some of them
+- system tray 0.9
+- change default menu flags
+- blow unpackaged files out of build root
+
+* Wed Jul 31 2002 Havoc Pennington <hp(a)redhat.com>
+- 2.0.3
+- own libexecdir stuff
+
+* Thu Jul 25 2002 Havoc Pennington <hp(a)redhat.com>
+- new system tray that's prettier and doesn't clip the icon
+
+* Wed Jul 24 2002 Havoc Pennington <hp(a)redhat.com>
+- system tray 0.7 that doesn't crash on startup
+- get Mozilla desktop file right so we get web browser launcher
+
+* Wed Jul 24 2002 Havoc Pennington <hp(a)redhat.com>
+- system tray 0.6 with server file fixed (work dammit)
+
+* Tue Jul 23 2002 Havoc Pennington <hp(a)redhat.com>
+- tweak applet positions but I think it's just broken
+- system tray 0.5 moved back to libdir not libexecdir
+
+* Tue Jul 23 2002 Havoc Pennington <hp(a)redhat.com>
+- remove ltmain.sh hack
+- new system-tray-applet that works
+
+* Tue Jul 23 2002 Havoc Pennington <hp(a)redhat.com>
+- put office suite stuff on the panel
+
+* Tue Jul 23 2002 Havoc Pennington <hp(a)redhat.com>
+- 2.0.2.90 cvs snap
+
+* Wed Jul 10 2002 Havoc Pennington <hp(a)redhat.com>
+- update the clock patch to be a little smarter in a couple ways
+
+* Thu Jun 27 2002 Owen Taylor <otaylor(a)redhat.com>
+- Fix problem where system tray applet was being looked for in /unst
+- Fix a crash in the system tray applet
+
+* Wed Jun 26 2002 Owen Taylor <otaylor(a)redhat.com>
+- Fix typo in the pt_BR translation that was causing GConf problems
+
+* Mon Jun 24 2002 Havoc Pennington <hp(a)redhat.com>
+- add the system tray applet
+- add system tray applet by default
+- add more launcher by default
+
+* Fri Jun 21 2002 Tim Powers <timp(a)redhat.com>
+- automated rebuild
+
+* Thu Jun 20 2002 Havoc Pennington <hp(a)redhat.com>
+- use correct gettext package name, and add check for missing translations
+
+* Mon Jun 17 2002 Havoc Pennington <hp(a)redhat.com>
+- add the calendar and configuration patch
+
+* Sun Jun 16 2002 Havoc Pennington <hp(a)redhat.com>
+- 2.0.0
+- add control center desktop file to file list
+- add gnome-panelrc to file list
+- try fixing panel size (blind, no text box at home)
+
+* Tue Jun 11 2002 Havoc Pennington <hp(a)redhat.com>
+- rebuild in different environment
+
+* Tue Jun 11 2002 Havoc Pennington <hp(a)redhat.com>
+- updates to default configuration
+
+* Tue Jun 11 2002 Havoc Pennington <hp(a)redhat.com>
+- fix schemas installation
+
+* Tue Jun 11 2002 Havoc Pennington <hp(a)redhat.com>
+- unset old panel schemas when installing new ones
+- put in a broken panel config to see errors about
+- add a patch to give some decent error messages about what's wrong
+ with the default panel config
+
+* Sun Jun 09 2002 Havoc Pennington <hp(a)redhat.com>
+- rebuild in different environment
+
+* Sun Jun 9 2002 Havoc Pennington <hp(a)redhat.com>
+- don't provide/obsolete gnome-core
+
+* Fri Jun 07 2002 Havoc Pennington <hp(a)redhat.com>
+- rebuild in different environment
+
+* Wed Jun 5 2002 Havoc Pennington <hp(a)redhat.com>
+- 1.5.24
+- ldconfig
+
+* Mon Jun 03 2002 Havoc Pennington <hp(a)redhat.com>
+- rebuild in different environment
+
+* Fri May 31 2002 Havoc Pennington <hp(a)redhat.com>
+- 1.5.23
+
+* Sun May 26 2002 Tim Powers <timp(a)redhat.com>
+- automated rebuild
+
+* Tue May 21 2002 Havoc Pennington <hp(a)redhat.com>
+- rebuild in different environment
+
+* Tue May 21 2002 Havoc Pennington <hp(a)redhat.com>
+- 1.5.22
+- provide gnome-core
+- add a bunch of extra build requires so build system
+ won't get confused
+
+* Fri May 3 2002 Havoc Pennington <hp(a)redhat.com>
+- 1.5.19
+
+* Fri Apr 19 2002 Havoc Pennington <hp(a)redhat.com>
+- add the keep-libtool-from-relinking hack so
+ we get the gen util applet
+
+* Fri Apr 19 2002 Havoc Pennington <hp(a)redhat.com>
+- obsoletes gnome-core-devel
+- include libdir/*.so
+
+* Fri Apr 19 2002 Havoc Pennington <hp(a)redhat.com>
+- get libpanel-applet in the package
+
+* Tue Apr 16 2002 Havoc Pennington <hp(a)redhat.com>
+- Initial build.
+
+
diff --git a/icon-padding.patch b/icon-padding.patch
new file mode 100644
index 0000000..5ccf4c0
--- /dev/null
+++ b/icon-padding.patch
@@ -0,0 +1,255 @@
+diff -u -r gnome-panel-2.28.0/applets/notification_area/main.c
hacked/applets/notification_area/main.c
+--- gnome-panel-2.28.0/applets/notification_area/main.c 2009-07-01 09:06:23.000000000
-0400
++++ hacked/applets/notification_area/main.c 2009-10-17 23:06:01.001313433 -0400
+@@ -25,6 +25,7 @@
+
+ #include <panel-applet.h>
+ #include <panel-applet-gconf.h>
++#include <gconf/gconf-client.h>
+
+ #include <glib/gi18n.h>
+ #include <gtk/gtk.h>
+@@ -34,6 +35,7 @@
+ #include "fixedtip.h"
+
+ #define NOTIFICATION_AREA_ICON "gnome-panel-notification-area"
++#define SCHEMA_DIR "/schemas/apps/notification_area_applet/prefs"
+
+ typedef struct
+ {
+@@ -231,6 +233,39 @@
+ gtk_widget_set_name (widget, "na-tray");
+ }
+
++static void
++padding_changed (GConfClient *client,
++ guint cnxn_id,
++ GConfEntry *entry,
++ gpointer user_data)
++{
++ AppletData *data = user_data;
++ gint value;
++
++ if (!entry->value || entry->value->type != GCONF_VALUE_INT)
++ return;
++
++ value = gconf_value_get_int (entry->value);
++
++ na_tray_set_padding (data->tray, value);
++}
++
++static void
++setup_gconf (AppletData *data)
++{
++ GConfClient *client;
++ char *key;
++ int value;
++
++ client = gconf_client_get_default ();
++ key = panel_applet_gconf_get_full_key (data->applet, "padding");
++ value = gconf_client_get_int (client, key, NULL);
++ na_tray_set_padding (data->tray, value);
++ gconf_client_notify_add (client, key, padding_changed, data, NULL, NULL);
++ g_free (key);
++ g_object_unref (client);
++}
++
+ static gboolean
+ applet_factory (PanelApplet *applet,
+ const gchar *iid,
+@@ -260,9 +295,10 @@
+ atko = gtk_widget_get_accessible (GTK_WIDGET (applet));
+ atk_object_set_name (atko, _("Panel Notification Area"));
+
++ panel_applet_add_preferences (applet, SCHEMA_DIR, NULL);
+ panel_applet_set_flags (applet,
+ PANEL_APPLET_HAS_HANDLE|PANEL_APPLET_EXPAND_MINOR);
+-
++
+ g_signal_connect (applet, "change_orient",
+ G_CALLBACK (applet_change_orientation), data);
+ g_signal_connect (applet, "change_background",
+@@ -270,6 +306,8 @@
+ g_signal_connect (applet, "destroy",
+ G_CALLBACK (applet_destroy), data);
+
++ setup_gconf (data);
++
+ panel_applet_set_background_widget (applet, GTK_WIDGET (applet));
+
+ gtk_container_add (GTK_CONTAINER (applet), GTK_WIDGET (tray));
+diff -u -r gnome-panel-2.28.0/applets/notification_area/Makefile.am
hacked/applets/notification_area/Makefile.am
+--- gnome-panel-2.28.0/applets/notification_area/Makefile.am 2009-07-21
13:25:43.000000000 -0400
++++ hacked/applets/notification_area/Makefile.am 2009-10-17 23:16:42.401072682 -0400
+@@ -66,6 +66,24 @@
+
+ @INTLTOOL_SERVER_RULE@
+
++schemasdir = $(GCONF_SCHEMA_FILE_DIR)
++schemas_in_files = notification_area_applet.schemas.in
++schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
++
++@INTLTOOL_SCHEMAS_RULE@
++
++if GCONF_SCHEMAS_INSTALL
++# don't do this if we are building in eg. rpm
++install-data-local:
++ if test -z "$(DESTDIR)" ; then \
++ for p in $(schemas_DATA) ; do \
++ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL)
--makefile-install-rule $(top_builddir)/applets/notification_area/$$p ; \
++ done \
++ fi
++else
++install-data-local:
++endif
++
+ uidir = $(datadir)/gnome-2.0/ui
+ ui_DATA = GNOME_NotificationAreaApplet.xml
+
+diff -u -r gnome-panel-2.28.0/applets/notification_area/na-tray.c
hacked/applets/notification_area/na-tray.c
+--- gnome-panel-2.28.0/applets/notification_area/na-tray.c 2009-10-17 23:22:01.095308064
-0400
++++ hacked/applets/notification_area/na-tray.c 2009-10-17 23:00:01.304062848 -0400
+@@ -602,6 +602,8 @@
+ {
+ trays_screens [screen_number].tray_manager = tray_manager;
+
++ na_tray_manager_set_padding (tray_manager, 0);
++
+ g_signal_connect (tray_manager, "tray_icon_added",
+ G_CALLBACK (tray_added),
+ &trays_screens [screen_number]);
+@@ -804,6 +806,16 @@
+ }
+
+ void
++na_tray_set_padding (NaTray *tray,
++ gint padding)
++{
++ NaTrayPrivate *priv = tray->priv;
++
++ if (get_tray (priv->trays_screen) == tray)
++ na_tray_manager_set_padding (priv->trays_screen->tray_manager, padding);
++}
++
++void
+ na_tray_force_redraw (NaTray *tray)
+ {
+ NaTrayPrivate *priv = tray->priv;
+diff -u -r gnome-panel-2.28.0/applets/notification_area/na-tray.h
hacked/applets/notification_area/na-tray.h
+--- gnome-panel-2.28.0/applets/notification_area/na-tray.h 2009-04-19 13:45:09.000000000
-0400
++++ hacked/applets/notification_area/na-tray.h 2009-10-17 23:00:30.491375187 -0400
+@@ -60,6 +60,8 @@
+ void na_tray_set_orientation (NaTray *tray,
+ GtkOrientation orientation);
+ GtkOrientation na_tray_get_orientation (NaTray *tray);
++void na_tray_set_padding (NaTray *tray,
++ gint padding);
+ void na_tray_force_redraw (NaTray *tray);
+
+ G_END_DECLS
+diff -u -r gnome-panel-2.28.0/applets/notification_area/na-tray-manager.c
hacked/applets/notification_area/na-tray-manager.c
+--- gnome-panel-2.28.0/applets/notification_area/na-tray-manager.c 2009-07-27
08:01:39.000000000 -0400
++++ hacked/applets/notification_area/na-tray-manager.c 2009-10-17 21:55:00.582062966
-0400
+@@ -653,6 +653,32 @@
+ #endif
+ }
+
++static void
++na_tray_manager_set_padding_property (NaTrayManager *manager)
++{
++#ifdef GDK_WINDOWING_X11
++ GdkDisplay *display;
++ Atom orientation_atom;
++ gulong data[1];
++
++ if (!manager->invisible || !manager->invisible->window)
++ return;
++
++ display = gtk_widget_get_display (manager->invisible);
++ orientation_atom = gdk_x11_get_xatom_by_name_for_display (display,
++
"_NET_SYSTEM_TRAY_PADDING");
++
++ data[0] = manager->padding;
++
++ XChangeProperty (GDK_DISPLAY_XDISPLAY (display),
++ GDK_WINDOW_XWINDOW (manager->invisible->window),
++ orientation_atom,
++ XA_CARDINAL, 32,
++ PropModeReplace,
++ (guchar *) &data, 1);
++#endif
++}
++
+ #ifdef GDK_WINDOWING_X11
+
+ static gboolean
+@@ -697,6 +723,7 @@
+
+ na_tray_manager_set_orientation_property (manager);
+ na_tray_manager_set_visual_property (manager);
++ na_tray_manager_set_padding_property (manager);
+
+ timestamp = gdk_x11_get_server_time (invisible->window);
+
+@@ -836,6 +863,20 @@
+ }
+ }
+
++void
++na_tray_manager_set_padding (NaTrayManager *manager,
++ gint padding)
++{
++ g_return_if_fail (NA_IS_TRAY_MANAGER (manager));
++
++ if (manager->padding != padding)
++ {
++ manager->padding = padding;
++
++ na_tray_manager_set_padding_property (manager);
++ }
++}
++
+ GtkOrientation
+ na_tray_manager_get_orientation (NaTrayManager *manager)
+ {
+diff -u -r gnome-panel-2.28.0/applets/notification_area/na-tray-manager.h
hacked/applets/notification_area/na-tray-manager.h
+--- gnome-panel-2.28.0/applets/notification_area/na-tray-manager.h 2009-04-19
13:45:09.000000000 -0400
++++ hacked/applets/notification_area/na-tray-manager.h 2009-10-17 21:55:42.646312700
-0400
+@@ -55,6 +55,7 @@
+ GtkWidget *invisible;
+ GdkScreen *screen;
+ GtkOrientation orientation;
++ gint padding;
+
+ GList *messages;
+ GHashTable *socket_table;
+@@ -91,6 +92,8 @@
+ void na_tray_manager_set_orientation (NaTrayManager *manager,
+ GtkOrientation orientation);
+ GtkOrientation na_tray_manager_get_orientation (NaTrayManager *manager);
++void na_tray_manager_set_padding (NaTrayManager *manager,
++ gint padding);
+
+ G_END_DECLS
+
+diff -u -r
gnome-panel-2.28.0/applets/notification_area/notification_area_applet.schemas.in
hacked/applets/notification_area/notification_area_applet.schemas.in
+---
gnome-panel-2.28.0/applets/notification_area/notification_area_applet.schemas.in 2009-10-17
23:23:41.071058057 -0400
++++ hacked/applets/notification_area/notification_area_applet.schemas.in 2009-10-17
23:21:38.588316399 -0400
+@@ -0,0 +1,17 @@
++<?xml version="1.0"?>
++<gconfschemafile>
++ <schemalist>
++ <schema>
++ <key>/schemas/apps/notification_area_applet/prefs/padding</key>
++ <owner>notification-area-applet</owner>
++ <type>int</type>
++ <default>3</default>
++ <locale name="C">
++ <short>Padding</short>
++ <long>
++ This key specifies padding to be put around status icons.
++ </long>
++ </locale>
++ </schema>
++ </schemalist>
++</gconfschemafile>
diff --git a/launcher-desktop-files.patch b/launcher-desktop-files.patch
new file mode 100644
index 0000000..ab2d715
--- /dev/null
+++ b/launcher-desktop-files.patch
@@ -0,0 +1,80 @@
+diff -up gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c.launcher-desktop-files
gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c
+---
gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c.launcher-desktop-files 2010-01-13
22:26:27.000000000 -0500
++++ gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c 2010-01-17 18:05:34.492279538
-0500
+@@ -960,6 +960,51 @@ panel_ditem_editor_icon_changed (PanelDI
+ icon);
+ }
+
++static gboolean
++update_editor_from_desktop_file (PanelDItemEditor *dialog,
++ const gchar *uri)
++{
++ GKeyFile *key_file;
++ char *name;
++ char *comment;
++ char *exec;
++ char *icon;
++ gboolean retval = FALSE;
++
++ key_file = g_key_file_new ();
++ if (g_key_file_load_from_file (key_file, uri, 0, NULL)) {
++ if (panel_key_file_get_boolean (key_file, "Terminal", FALSE))
++ gtk_combo_box_set_active (GTK_COMBO_BOX
(dialog->priv->type_combo), 1);
++ else
++ gtk_combo_box_set_active (GTK_COMBO_BOX
(dialog->priv->type_combo), 0);
++
++ name = panel_key_file_get_locale_string (key_file, "Name");
++ comment = panel_key_file_get_locale_string (key_file,
"Comment");
++ icon = panel_key_file_get_locale_string (key_file, "Icon");
++ exec = panel_key_file_get_string (key_file, "Exec");
++
++ gtk_entry_set_text (GTK_ENTRY (dialog->priv->name_entry), name ?
name : "");
++ gtk_entry_set_text (GTK_ENTRY (dialog->priv->comment_entry),
comment ? comment : "");
++ gtk_entry_set_text (GTK_ENTRY (dialog->priv->command_entry), exec ?
exec : "");
++
++ /* Note: we need to set the icon last, since the editor
++ * tries to guess the icon when the command is modified
++ */
++ setup_icon_chooser (dialog, icon);
++
++ g_free (name);
++ g_free (comment);
++ g_free (icon);
++ g_free (exec);
++
++ retval = TRUE;
++ }
++
++ g_key_file_free (key_file);
++
++ return retval;
++}
++
+ static void
+ command_browse_chooser_response (GtkFileChooser *chooser,
+ gint response_id,
+@@ -973,7 +1018,11 @@ command_browse_chooser_response (GtkFile
+ case PANEL_DITEM_EDITOR_TYPE_APPLICATION:
+ case PANEL_DITEM_EDITOR_TYPE_TERMINAL_APPLICATION:
+ text = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (chooser));
+- uri = panel_util_make_exec_uri_for_desktop (text);
++ if (g_str_has_suffix (text, ".desktop") &&
++ update_editor_from_desktop_file (dialog, text))
++ uri = NULL;
++ else
++ uri = panel_util_make_exec_uri_for_desktop (text);
+ g_free (text);
+ break;
+ case PANEL_DITEM_EDITOR_TYPE_LINK:
+@@ -983,8 +1032,9 @@ command_browse_chooser_response (GtkFile
+ g_assert_not_reached ();
+ }
+
+- gtk_entry_set_text (GTK_ENTRY (dialog->priv->command_entry),
+- uri);
++ if (uri)
++ gtk_entry_set_text (GTK_ENTRY (dialog->priv->command_entry),
++ uri);
+ g_free (uri);
+ }
+
diff --git a/na-style-realize.patch b/na-style-realize.patch
new file mode 100644
index 0000000..fb7bd40
--- /dev/null
+++ b/na-style-realize.patch
@@ -0,0 +1,47 @@
+From f1652b60a9fa0580c5fc60758c3ccdfcf691b5c2 Mon Sep 17 00:00:00 2001
+From: Daniel Drake <dsd(a)laptop.org>
+Date: Mon, 17 Dec 2012 14:58:20 +0000
+Subject: [PATCH] na: apply style after realize
+
+Under Fedora 18 (GTK-3.6.2), notification icons such as the battery/power
+icon from gnome-settings-daemon are appearing all-black on top of a black
+background.
+
+This is because style_updated is being called before the tray applet
+is realized, meaning that the following code in
+na_tray_applet_style_updated() causes a bail-out:
+
+ if (!applet->priv->tray)
+ return;
+
+and the style is never applied.
+
+Fix this by updating the style explicitly after realizing the widget.
+---
+ applets/notification_area/main.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/applets/notification_area/main.c b/applets/notification_area/main.c
+index 5fc4d1d..0d5de70 100644
+--- a/applets/notification_area/main.c
++++ b/applets/notification_area/main.c
+@@ -36,6 +36,8 @@
+
+ #define NOTIFICATION_AREA_ICON "gnome-panel-notification-area"
+
++static void na_tray_applet_style_updated (GtkWidget *widget);
++
+ struct _NaTrayAppletPrivate
+ {
+ NaTray *tray;
+@@ -79,6 +81,7 @@ na_tray_applet_realize (GtkWidget *widget)
+
+ gtk_container_add (GTK_CONTAINER (widget), GTK_WIDGET (applet->priv->tray));
+ gtk_widget_show (GTK_WIDGET (applet->priv->tray));
++ na_tray_applet_style_updated (widget);
+ }
+
+ static void
+--
+1.8.0.1
+
diff --git a/panel-padding.patch b/panel-padding.patch
new file mode 100644
index 0000000..90dad4b
--- /dev/null
+++ b/panel-padding.patch
@@ -0,0 +1,343 @@
+diff -up gnome-panel-2.28.0/gnome-panel/panel-profile.c.panel-padding
gnome-panel-2.28.0/gnome-panel/panel-profile.c
+--- gnome-panel-2.28.0/gnome-panel/panel-profile.c.panel-padding 2009-09-21
12:29:33.000000000 -0400
++++ gnome-panel-2.28.0/gnome-panel/panel-profile.c 2009-10-29 09:57:25.285484907 -0400
+@@ -638,6 +638,7 @@ TOPLEVEL_IS_WRITABLE_FUNC ("orientation"
+
+ TOPLEVEL_GET_SET_FUNCS ("size", toplevel, int, size,
int)
+ TOPLEVEL_GET_SET_FUNCS ("expand", toplevel, bool, expand,
gboolean)
++TOPLEVEL_GET_SET_FUNCS ("padding", toplevel, int, padding,
int)
+ TOPLEVEL_GET_SET_FUNCS ("auto_hide", toplevel, bool, auto_hide,
gboolean)
+ TOPLEVEL_GET_SET_FUNCS ("enable_buttons", toplevel, bool,
enable_buttons, gboolean)
+ TOPLEVEL_GET_SET_FUNCS ("enable_arrows", toplevel, bool, enable_arrows,
gboolean)
+@@ -1185,6 +1186,7 @@ panel_profile_toplevel_change_notify (GC
+ else UPDATE_INT ("monitor", monitor)
+ else UPDATE_STRING ("name", name)
+ else UPDATE_BOOL ("expand", expand)
++ else UPDATE_INT ("padding", padding)
+ else UPDATE_STRING ("orientation", orientation)
+ else UPDATE_INT ("size", size)
+ else UPDATE_POS ("x", x, x_right)
+@@ -1706,6 +1708,7 @@ panel_profile_load_toplevel (GConfClient
+ GET_STRING ("name", name);
+ GET_INT ("monitor", monitor);
+ GET_BOOL ("expand", expand);
++ GET_INT ("padding", padding);
+ GET_STRING ("orientation", orientation);
+ GET_INT ("size", size);
+ GET_BOOL ("auto_hide", auto_hide);
+diff -up gnome-panel-2.28.0/gnome-panel/panel-profile.h.panel-padding
gnome-panel-2.28.0/gnome-panel/panel-profile.h
+--- gnome-panel-2.28.0/gnome-panel/panel-profile.h.panel-padding 2009-04-19
13:45:09.000000000 -0400
++++ gnome-panel-2.28.0/gnome-panel/panel-profile.h 2009-10-29 09:57:25.285484907 -0400
+@@ -92,7 +92,10 @@ void panel_profile_set_toplevel_e
+ gboolean expand);
+ gboolean panel_profile_get_toplevel_expand (PanelToplevel *toplevel);
+ gboolean panel_profile_is_writable_toplevel_expand (PanelToplevel *toplevel);
+-
++void panel_profile_set_toplevel_padding (PanelToplevel *toplevel,
++ int padding);
++int panel_profile_get_toplevel_padding (PanelToplevel *padding);
++gboolean panel_profile_is_writable_toplevel_padding (PanelToplevel *toplevel);
+ void panel_profile_set_toplevel_auto_hide (PanelToplevel *toplevel,
+ gboolean auto_hide);
+ gboolean panel_profile_get_toplevel_auto_hide (PanelToplevel *toplevel);
+diff -up gnome-panel-2.28.0/gnome-panel/panel-toplevel.c.panel-padding
gnome-panel-2.28.0/gnome-panel/panel-toplevel.c
+--- gnome-panel-2.28.0/gnome-panel/panel-toplevel.c.panel-padding 2009-08-21
06:31:49.000000000 -0400
++++ gnome-panel-2.28.0/gnome-panel/panel-toplevel.c 2009-10-29 09:57:25.287500667 -0400
+@@ -79,6 +79,7 @@ struct _PanelToplevelPrivate {
+ gboolean expand;
+ PanelOrientation orientation;
+ int size;
++ int padding;
+
+ /* relative to the monitor origin */
+ int x;
+@@ -213,6 +214,7 @@ enum {
+ PROP_0,
+ PROP_NAME,
+ PROP_EXPAND,
++ PROP_PADDING,
+ PROP_ORIENTATION,
+ PROP_SIZE,
+ PROP_X,
+@@ -3862,6 +3864,9 @@ panel_toplevel_set_property (GObject
+ case PROP_EXPAND:
+ panel_toplevel_set_expand (toplevel, g_value_get_boolean (value));
+ break;
++ case PROP_PADDING:
++ panel_toplevel_set_padding (toplevel, g_value_get_int (value));
++ break;
+ case PROP_ORIENTATION:
+ panel_toplevel_set_orientation (toplevel, g_value_get_enum (value));
+ break;
+@@ -3956,6 +3961,9 @@ panel_toplevel_get_property (GObject
+ case PROP_EXPAND:
+ g_value_set_boolean (value, toplevel->priv->expand);
+ break;
++ case PROP_PADDING:
++ g_value_set_int (value, toplevel->priv->padding);
++ break;
+ case PROP_ORIENTATION:
+ g_value_set_enum (value, toplevel->priv->orientation);
+ break;
+@@ -4118,6 +4126,18 @@ panel_toplevel_class_init (PanelToplevel
+
+ g_object_class_install_property (
+ gobject_class,
++ PROP_PADDING,
++ g_param_spec_int (
++ "padding",
++ "Padding",
++ "Padding that is inserted between objects",
++ 0,
++ G_MAXINT,
++ 0,
++ G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
++
++ g_object_class_install_property (
++ gobject_class,
+ PROP_ORIENTATION,
+ g_param_spec_enum (
+ "orientation",
+@@ -4698,6 +4718,30 @@ panel_toplevel_get_expand (PanelToplevel
+ return toplevel->priv->expand;
+ }
+
++void
++panel_toplevel_set_padding (PanelToplevel *toplevel,
++ int padding)
++{
++ g_return_if_fail (PANEL_IS_TOPLEVEL (toplevel));
++
++ if (toplevel->priv->padding == padding)
++ return;
++
++ toplevel->priv->padding = padding;
++
++ gtk_widget_queue_resize (GTK_WIDGET (toplevel));
++
++ g_object_notify (G_OBJECT (toplevel), "padding");
++}
++
++int
++panel_toplevel_get_padding (PanelToplevel *toplevel)
++{
++ g_return_val_if_fail (PANEL_IS_TOPLEVEL (toplevel), 0);
++
++ return toplevel->priv->padding;
++}
++
+ gboolean
+ panel_toplevel_get_is_floating (PanelToplevel *toplevel)
+ {
+diff -up gnome-panel-2.28.0/gnome-panel/panel-toplevel.h.panel-padding
gnome-panel-2.28.0/gnome-panel/panel-toplevel.h
+--- gnome-panel-2.28.0/gnome-panel/panel-toplevel.h.panel-padding 2009-08-19
11:28:09.000000000 -0400
++++ gnome-panel-2.28.0/gnome-panel/panel-toplevel.h 2009-10-29 09:57:25.288484940 -0400
+@@ -83,6 +83,9 @@ G_CONST_RETURN char *panel_toplevel_get_
+ void panel_toplevel_set_expand (PanelToplevel
*toplevel,
+ gboolean expand);
+ gboolean panel_toplevel_get_expand (PanelToplevel
*toplevel);
++void panel_toplevel_set_padding (PanelToplevel
*toplevel,
++ int
padding);
++int panel_toplevel_get_padding (PanelToplevel
*toplevel);
+ void panel_toplevel_set_orientation (PanelToplevel
*toplevel,
+ PanelOrientation orientation);
+ PanelOrientation panel_toplevel_get_orientation (PanelToplevel
*toplevel);
+diff -up gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in.panel-padding
gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in
+--- gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in.panel-padding 2009-07-01
09:06:23.000000000 -0400
++++ gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in 2009-10-29
09:57:25.288484940 -0400
+@@ -103,6 +103,19 @@
+ </schema>
+
+ <schema>
++ <key>/schemas/apps/panel/toplevels/padding</key>
++ <owner>panel</owner>
++ <type>int</type>
++ <default>0</default>
++ <locale name="C">
++ <short>Padding</short>
++ <long>
++ Padding that will be inserted between objects on this panel.
++ </long>
++ </locale>
++ </schema>
++
++ <schema>
+ <key>/schemas/apps/panel/toplevels/x</key>
+ <owner>panel</owner>
+ <type>int</type>
+diff -up gnome-panel-2.28.0/gnome-panel/panel-widget.c.panel-padding
gnome-panel-2.28.0/gnome-panel/panel-widget.c
+--- gnome-panel-2.28.0/gnome-panel/panel-widget.c.panel-padding 2009-08-11
07:32:38.000000000 -0400
++++ gnome-panel-2.28.0/gnome-panel/panel-widget.c 2009-10-29 10:10:43.531226534 -0400
+@@ -710,9 +710,12 @@ panel_widget_switch_applet_right (PanelW
+ {
+ AppletData *ad;
+ AppletData *nad = NULL;
+-
++ gint padding;
++
+ g_assert (list != NULL);
+
++ padding = panel_toplevel_get_padding (panel->toplevel);
++
+ ad = list->data;
+ if (ad->constrained + ad->min_cells >= panel->size)
+ return;
+@@ -720,8 +723,8 @@ panel_widget_switch_applet_right (PanelW
+ if (list->next)
+ nad = list->next->data;
+
+- if (!nad || nad->constrained >= ad->constrained + ad->min_cells +
MOVE_INCREMENT) {
+- ad->pos = ad->constrained += MOVE_INCREMENT;
++ if (!nad || nad->constrained >= ad->constrained + ad->min_cells +
MOVE_INCREMENT + padding) {
++ ad->pos = ad->constrained += MOVE_INCREMENT + padding;
+ gtk_widget_queue_resize (GTK_WIDGET (panel));
+ emit_applet_moved (panel, ad);
+ return;
+@@ -786,6 +789,9 @@ panel_widget_switch_applet_left (PanelWi
+ {
+ AppletData *ad;
+ AppletData *pad = NULL;
++ gint padding;
++
++ padding = panel_toplevel_get_padding (panel->toplevel);
+
+ ad = list->data;
+ if (ad->constrained <= 0)
+@@ -794,8 +800,8 @@ panel_widget_switch_applet_left (PanelWi
+ if (list->prev)
+ pad = list->prev->data;
+
+- if (!pad || pad->constrained + pad->min_cells <= ad->constrained -
MOVE_INCREMENT) {
+- ad->pos = ad->constrained -= MOVE_INCREMENT;
++ if (!pad || pad->constrained + pad->min_cells <= ad->constrained -
MOVE_INCREMENT - padding) {
++ ad->pos = ad->constrained -= MOVE_INCREMENT + padding;
+ gtk_widget_queue_resize (GTK_WIDGET (panel));
+ emit_applet_moved (panel, ad);
+ return;
+@@ -874,15 +880,18 @@ panel_widget_get_right_switch_pos (Panel
+ {
+ AppletData *ad;
+ AppletData *nad = NULL;
++ gint padding;
+
+ g_assert (list != NULL);
+
++ padding = panel_toplevel_get_padding (panel->toplevel);
++
+ ad = list->data;
+ if (list->next)
+ nad = list->next->data;
+
+- if (!nad || nad->constrained >= ad->constrained + ad->min_cells +
MOVE_INCREMENT)
+- return ad->constrained + MOVE_INCREMENT;
++ if (!nad || nad->constrained >= ad->constrained + ad->min_cells +
MOVE_INCREMENT + padding)
++ return ad->constrained + MOVE_INCREMENT + padding;
+
+ if (nad->locked)
+ return panel_widget_get_right_jump_pos (panel,
+@@ -948,15 +957,18 @@ panel_widget_get_left_switch_pos (PanelW
+ {
+ AppletData *ad;
+ AppletData *pad = NULL;
++ gint padding;
+
+ g_assert (list != NULL);
+
++ padding = panel_toplevel_get_padding (panel->toplevel);
++
+ ad = list->data;
+ if (list->prev)
+ pad = list->prev->data;
+
+- if (!pad || pad->constrained + pad->min_cells <= ad->constrained -
MOVE_INCREMENT)
+- return ad->constrained - MOVE_INCREMENT;
++ if (!pad || pad->constrained + pad->min_cells <= ad->constrained -
MOVE_INCREMENT - padding)
++ return ad->constrained - MOVE_INCREMENT - padding;
+
+ if (pad->locked)
+ return panel_widget_get_left_jump_pos (panel,
+@@ -1195,12 +1207,15 @@ panel_widget_size_request(GtkWidget *wid
+ GList *list;
+ GList *ad_with_hints;
+ gboolean dont_fill;
++ gint padding;
+
+ g_return_if_fail(PANEL_IS_WIDGET(widget));
+ g_return_if_fail(requisition!=NULL);
+
+ panel = PANEL_WIDGET(widget);
+
++ padding = panel_toplevel_get_padding (panel->toplevel);
++
+ if(panel->orient == GTK_ORIENTATION_HORIZONTAL) {
+ requisition->width = 0;
+ requisition->height = panel->sz;
+@@ -1224,8 +1239,11 @@ panel_widget_size_request(GtkWidget *wid
+ ad_with_hints = g_list_prepend (ad_with_hints,
+ ad);
+
+- else if (panel->packed)
++ else if (panel->packed) {
++ if (list != panel->applet_list)
++ requisition->width += padding;
+ requisition->width += chreq.width;
++ }
+ } else {
+ if (requisition->width < chreq.width && !ad->size_constrained)
+ requisition->width = chreq.width;
+@@ -1234,8 +1252,11 @@ panel_widget_size_request(GtkWidget *wid
+ ad_with_hints = g_list_prepend (ad_with_hints,
+ ad);
+
+- else if (panel->packed)
++ else if (panel->packed) {
++ if (list != panel->applet_list)
++ requisition->height += padding;
+ requisition->height += chreq.height;
++ }
+ }
+ }
+
+@@ -1333,12 +1354,15 @@ panel_widget_size_allocate(GtkWidget *wi
+ int i;
+ int old_size;
+ gboolean ltr;
++ gint padding;
+
+ g_return_if_fail(PANEL_IS_WIDGET(widget));
+ g_return_if_fail(allocation!=NULL);
+
+ panel = PANEL_WIDGET(widget);
+
++ padding = panel_toplevel_get_padding (panel->toplevel);
++
+ old_size = panel->size;
+ ltr = gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR;
+
+@@ -1404,7 +1428,7 @@ panel_widget_size_allocate(GtkWidget *wi
+ }
+ ad->min_cells = ad->cells;
+ gtk_widget_size_allocate(ad->applet,&challoc);
+- i += ad->cells;
++ i += ad->cells + padding;
+ }
+
+ /* EEEEK, there might be not enough room and we don't handle
+@@ -1439,7 +1463,7 @@ panel_widget_size_allocate(GtkWidget *wi
+ if (ad->constrained < i)
+ ad->constrained = i;
+
+- i = ad->constrained + ad->cells;
++ i = ad->constrained + ad->cells + padding;
+ }
+
+ /* Now expand from the right */
+@@ -1464,7 +1488,7 @@ panel_widget_size_allocate(GtkWidget *wi
+ ad->cells = cells;
+ }
+
+- i = ad->constrained;
++ i = ad->constrained - padding;
+ }
+
+ /* EEEEK, there's not enough room, so shift applets even
diff --git a/preferred-apps.patch b/preferred-apps.patch
new file mode 100644
index 0000000..8f755d9
--- /dev/null
+++ b/preferred-apps.patch
@@ -0,0 +1,272 @@
+diff -up gnome-panel-2.25.3/gnome-panel/launcher.c.preferred-apps
gnome-panel-2.25.3/gnome-panel/launcher.c
+--- gnome-panel-2.25.3/gnome-panel/launcher.c.preferred-apps 2009-01-16
14:15:17.000000000 -0500
++++ gnome-panel-2.25.3/gnome-panel/launcher.c 2009-01-16 14:24:06.000000000 -0500
+@@ -21,6 +21,7 @@
+ #include <glib/gi18n.h>
+ #include <gio/gio.h>
+ #include <gdk/gdkx.h>
++#include <gmenu-tree.h>
+
+ #include <libpanel-util/panel-error.h>
+ #include <libpanel-util/panel-glib.h>
+@@ -44,6 +45,7 @@
+ #include "panel-compatibility.h"
+ #include "panel-ditem-editor.h"
+ #include "panel-icon-names.h"
++#include "panel-run-dialog.h"
+
+ static GdkScreen *
+ launcher_get_screen (Launcher *launcher)
+@@ -1215,3 +1217,189 @@ panel_launcher_set_dnd_enabled (Launcher
+ } else
+ gtk_drag_source_unset (launcher->button);
+ }
++
++static gchar *
++find_desktop_file_from_exec (const gchar *exec)
++{
++ GSList *all_applications, *l;
++ gchar *path = NULL;
++ gchar **tokens, **tokens2;
++ gint i, match = 0;
++
++ /* FIXME no need to construct a humongous list here */
++ all_applications = get_all_applications ();
++
++ for (l = all_applications; l; l = l->next) {
++ GMenuTreeEntry *entry = l->data;
++ const char *entry_exec;
++
++ entry_exec = gmenu_tree_entry_get_exec (entry);
++
++ if (strcmp (exec, entry_exec) == 0) {
++ path = gmenu_tree_entry_get_desktop_file_path (entry);
++ break;
++ }
++
++ tokens = g_strsplit (exec, " ", -1);
++ tokens2 = g_strsplit (entry_exec, " ", -1);
++
++ for (i = 0; tokens[i] && tokens2[i]; i++) {
++ if (strcmp (tokens[i], tokens2[i]) != 0)
++ break;
++ }
++ if (i > match) {
++ match = i;
++ path = gmenu_tree_entry_get_desktop_file_path (entry);
++ }
++
++ g_strfreev (tokens);
++ g_strfreev (tokens2);
++ }
++
++ path = g_strdup (path);
++ g_slist_free (all_applications);
++
++ return path;
++}
++
++static void
++update_preferred_app (const gchar *filename,
++ const gchar *key,
++ const gchar *exec)
++{
++ gchar *location;
++ GKeyFile *key_file;
++ GError *error = NULL;
++ gchar *data;
++ gsize len;
++ gboolean needs_terminal;
++
++ location = find_desktop_file_from_exec (exec);
++ key_file = g_key_file_new ();
++ if (!panel_key_file_load_from_uri (key_file, location,
++ G_KEY_FILE_KEEP_COMMENTS|G_KEY_FILE_KEEP_TRANSLATIONS,
++ NULL)) {
++ /* FIXME would be much better if preferred apps were backed by desktop files */
++ g_key_file_set_string (key_file, "Desktop Entry", "Version",
"1.0");
++ g_key_file_set_string (key_file, "Desktop Entry", "Encoding",
"UTF-8");
++ g_key_file_set_string (key_file, "Desktop Entry", "Type",
"Application");
++ g_key_file_set_string (key_file, "Desktop Entry", "Exec", exec);
++ if (strstr (key, "http")) {
++ g_key_file_set_string (key_file, "Desktop Entry", "Name",
"Preferred Web Browser");
++ g_key_file_set_string (key_file, "Desktop Entry", "GenericName",
"Web Browser");
++ g_key_file_set_string (key_file, "Desktop Entry", "Comment",
"Browse the Web");
++ g_key_file_set_string (key_file, "Desktop Entry", "Icon",
"redhat-web-browser.png");
++ if (strstr (exec, "%s")) {
++ gchar *exec2, *s;
++
++ exec2 = g_strdup (exec);
++ s = strstr (exec2, "%s");
++ s[1] = 'u';
++
++ g_key_file_set_string (key_file, "Desktop Entry", "Exec",
exec2);
++ g_free (exec2);
++
++ }
++ }
++ else if (strstr (key, "mailto")) {
++ g_key_file_set_string (key_file, "Desktop Entry", "Name",
"Preferred Mail Reader");
++ g_key_file_set_string (key_file, "Desktop Entry", "GenericName",
"Mail Reader");
++ g_key_file_set_string (key_file, "Desktop Entry", "Comment",
"Send email");
++ g_key_file_set_string (key_file, "Desktop Entry", "Icon",
"redhat-email.png");
++ }
++ if (g_str_has_suffix (key, "command")) {
++ int len;
++ char *key2;
++
++ len = strlen (key);
++ key2 = g_new (char, len - strlen ("command") + strlen
("needs_terminal") + 1);
++ strncpy (key2, key, len - strlen ("command"));
++ strcpy (key2 + len - strlen ("command"), "needs_terminal");
++ needs_terminal = gconf_client_get_bool (panel_gconf_get_client (),
++ key2,
++ NULL);
++ g_free (key2);
++ }
++ else
++ needs_terminal = FALSE;
++ g_key_file_set_boolean (key_file, "Desktop Entry", "Terminal",
needs_terminal);
++ }
++
++ g_free (location);
++
++ g_key_file_set_boolean (key_file, "Desktop Entry",
"X-Panel-Monitor", TRUE);
++ g_key_file_set_boolean (key_file, "Desktop Entry", "NoDisplay",
TRUE);
++
++ data = g_key_file_to_data (key_file, &len, &error);
++ if (error) {
++ g_printerr (_("Failed to convert data for '%s': %s"),
++ filename, error->message);
++ g_error_free (error);
++ g_key_file_free (key_file);
++
++ return;
++ }
++ if (!g_file_set_contents (filename, data, len, &error)) {
++ g_printerr (_("Failed to save '%s': %s"),
++ filename, error->message);
++ g_error_free (error);
++ }
++
++ g_key_file_free (key_file);
++ g_free (data);
++}
++
++static void
++preferred_app_changed (GConfClient *client,
++ gint notify_id,
++ GConfEntry *entry,
++ const gchar *filename)
++{
++ update_preferred_app (filename,
++ gconf_entry_get_key (entry),
++ gconf_value_get_string (entry->value));
++}
++
++void
++panel_preferred_apps_init (void)
++{
++ GConfClient *client;
++ gchar *dirname, *filename, *exec;
++ gint i;
++
++ const gchar *keys[] = {
++ "/desktop/gnome/url-handlers/http/command",
++ "/desktop/gnome/url-handlers/mailto/command",
++ NULL };
++ const gchar *files[] = {
++ "preferred-web-browser.desktop",
++ "preferred-mail-reader.desktop",
++ NULL };
++
++ client = panel_gconf_get_client ();
++
++ gconf_client_add_dir (client,
++ "/desktop/gnome/url-handlers",
++ GCONF_CLIENT_PRELOAD_NONE,
++ NULL);
++
++ for (i = 0; keys[i]; i++) {
++ dirname = g_build_filename (g_get_user_data_dir (),
++ "applications", NULL);
++ filename = g_build_filename (dirname, files[i], NULL);
++ if (!g_file_test (filename, G_FILE_TEST_EXISTS)) {
++
++ if (!g_file_test (dirname, G_FILE_TEST_EXISTS))
++ g_mkdir_with_parents (dirname, 0755);
++
++ exec = gconf_client_get_string (client, keys[i], NULL);
++ update_preferred_app (filename, keys[i], exec);
++ g_free (exec);
++ }
++ g_free (dirname);
++
++ gconf_client_notify_add (client, keys[i],
++ (GConfClientNotifyFunc) preferred_app_changed,
++ filename, g_free, NULL);
++ }
++}
+diff -up gnome-panel-2.25.3/gnome-panel/launcher.h.preferred-apps
gnome-panel-2.25.3/gnome-panel/launcher.h
+--- gnome-panel-2.25.3/gnome-panel/launcher.h.preferred-apps 2009-01-16
14:15:17.000000000 -0500
++++ gnome-panel-2.25.3/gnome-panel/launcher.h 2009-01-16 14:15:17.000000000 -0500
+@@ -14,6 +14,8 @@
+ #include "applet.h"
+ #include "panel-widget.h"
+
++#include <gio/gio.h>
++
+ G_BEGIN_DECLS
+
+ typedef struct {
+@@ -71,6 +73,7 @@ void launcher_properties_dest
+ void panel_launcher_set_dnd_enabled (Launcher *launcher,
+ gboolean dnd_enabled);
+
++void panel_preferred_apps_init (void);
+
+ G_END_DECLS
+
+diff -up gnome-panel-2.25.3/gnome-panel/main.c.preferred-apps
gnome-panel-2.25.3/gnome-panel/main.c
+--- gnome-panel-2.25.3/gnome-panel/main.c.preferred-apps 2008-12-09 07:32:37.000000000
-0500
++++ gnome-panel-2.25.3/gnome-panel/main.c 2009-01-16 14:15:17.000000000 -0500
+@@ -27,6 +27,7 @@
+ #include "panel-action-protocol.h"
+ #include "panel-lockdown.h"
+ #include "panel-icon-names.h"
++#include "launcher.h"
+ #include "xstuff.h"
+
+ #include "nothing.cP"
+@@ -86,6 +87,7 @@ main (int argc, char **argv)
+ GCONF_CLIENT_PRELOAD_NONE,
+ NULL);
+
++ panel_preferred_apps_init ();
+ panel_global_config_load ();
+ panel_lockdown_init ();
+ panel_profile_load ();
+diff -up gnome-panel-2.25.3/gnome-panel/panel-run-dialog.c.preferred-apps
gnome-panel-2.25.3/gnome-panel/panel-run-dialog.c
+--- gnome-panel-2.25.3/gnome-panel/panel-run-dialog.c.preferred-apps 2008-12-11
12:03:03.000000000 -0500
++++ gnome-panel-2.25.3/gnome-panel/panel-run-dialog.c 2009-01-16 14:15:17.000000000
-0500
+@@ -789,7 +789,7 @@ get_all_applications_from_dir (GMenuTree
+ return list;
+ }
+
+-static GSList *
++GSList *
+ get_all_applications (void)
+ {
+ GMenuTree *tree;
+diff -up gnome-panel-2.25.3/gnome-panel/panel-run-dialog.h.preferred-apps
gnome-panel-2.25.3/gnome-panel/panel-run-dialog.h
+--- gnome-panel-2.25.3/gnome-panel/panel-run-dialog.h.preferred-apps 2008-11-08
19:27:01.000000000 -0500
++++ gnome-panel-2.25.3/gnome-panel/panel-run-dialog.h 2009-01-16 14:15:17.000000000
-0500
+@@ -32,6 +32,8 @@ G_BEGIN_DECLS
+ void panel_run_dialog_present (GdkScreen *screen,
+ guint32 activate_time);
+
++GSList *get_all_applications (void);
++
+ G_END_DECLS
+
+ #endif /* __PANEL_RUN_DIALOG_H__ */
diff --git a/redhat-panel-backwards-compat-config.schemas
b/redhat-panel-backwards-compat-config.schemas
new file mode 100644
index 0000000..2cdaf44
--- /dev/null
+++ b/redhat-panel-backwards-compat-config.schemas
@@ -0,0 +1,1473 @@
+<?xml version="1.0"?>
+<gconfschemafile>
+
+<!--
+These are the factory defaults for what's on the panel. To change them
+locally, you can edit this file and rebuild the RPM, or you can just
+set values in the /etc/gconf/gconf.xml.defaults source using gconftool -
+see
http://www.gnome.org/projects/gconf/
+-->
+
+ <schemalist>
+
+
+
+<!--
+*********************************************************************************
+** Small Screen Setup: 1 edge panel of size 24 **
+*********************************************************************************
+-->
+
+<!-- ********************************* -->
+<!-- General panel properties :: START -->
+<!-- ********************************* -->
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/small/general/show_program_list</key>
+ <owner>panel</owner>
+ <type>bool</type>
+ <default>false</default>
+ <locale name="C">
+ <short>Show the program listing in the Run box</short>
+ <long>Show the program listing by default when opening the Run
box</long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/small/general/enable_program_list</key>
+ <owner>panel</owner>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short>Enable the program listing in the run box</short>
+ <long>Enable the program listing in the run box</long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/small/general/panel_id_list</key>
+ <owner>panel</owner>
+ <type>list</type>
+ <list_type>string</list_type>
+ <default>[bottom_panel]</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/small/general/applet_id_list</key>
+ <owner>panel</owner>
+ <type>list</type>
+ <list_type>string</list_type>
+ <default>[]</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/small/general/object_id_list</key>
+ <owner>panel</owner>
+ <type>list</type>
+ <list_type>string</list_type>
+ <default>[]</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+<!-- ******************************* -->
+<!-- General panel properties :: END -->
+<!-- ******************************* -->
+
+<!-- ****************************** -->
+<!-- Edge panel properties :: START -->
+<!-- ****************************** -->
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/panel_type</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>edge-panel</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/panel_size</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>panel-size-small</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/panel_hide_mode</key>
+ <owner>panel</owner>
+ <type>int</type>
+ <default>0</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/panel_hide_state</key>
+ <owner>panel</owner>
+ <type>int</type>
+ <default>0</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/screen_id</key>
+ <owner>panel</owner>
+ <type>int</type>
+ <default>0</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/screen_edge</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>panel-edge-bottom</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/hide_buttons_enabled</key>
+ <owner>panel</owner>
+ <type>bool</type>
+ <default>false</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/hide_button_pixmaps_enabled</key>
+ <owner>panel</owner>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/panel_background_type</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>no-background</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/panel_background_pixmap</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default></default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/panel_background_pixmap_fit</key>
+ <owner>panel</owner>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/panel_background_pixmap_stretch</key>
+ <owner>panel</owner>
+ <type>bool</type>
+ <default>false</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/panel_background_pixmap_rotate</key>
+ <owner>panel</owner>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/panel_background_color</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>#000000</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+<!-- **************************** -->
+<!-- Edge panel properties :: END -->
+<!-- **************************** -->
+
+
+<!--
+******************************************************************************************
+** Medium Screen Setup: 1 edge panel of size 36, 1 menu panel of size 24
**
+******************************************************************************************
+-->
+
+<!-- ********************************* -->
+<!-- General panel properties :: START -->
+<!-- ********************************* -->
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/general/advanced_run_dialog</key>
+ <owner>panel</owner>
+ <type>bool</type>
+ <default>false</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/general/panel_id_list</key>
+ <owner>panel</owner>
+ <type>list</type>
+ <list_type>string</list_type>
+ <default>[bottom_panel]</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/general/applet_id_list</key>
+ <owner>panel</owner>
+ <type>list</type>
+ <list_type>string</list_type>
+
<default>[tasklist_applet,pager_applet,tray_applet,clock_applet]</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/general/object_id_list</key>
+ <owner>panel</owner>
+ <type>list</type>
+ <list_type>string</list_type>
+
<default>[main_menu,web_browser_launcher,email_launcher,wordprocessor_launcher,presentations_launcher,spreadsheet_launcher,print_launcher]</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+<!-- ******************************* -->
+<!-- General panel properties :: END -->
+<!-- ******************************* -->
+
+<!-- ****************************** -->
+<!-- Edge panel properties :: START -->
+<!-- ****************************** -->
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_type</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>edge-panel</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_size</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>panel-size-medium</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_hide_mode</key>
+ <owner>panel</owner>
+ <type>int</type>
+ <default>0</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_hide_state</key>
+ <owner>panel</owner>
+ <type>int</type>
+ <default>0</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/screen_id</key>
+ <owner>panel</owner>
+ <type>int</type>
+ <default>0</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/screen_edge</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>panel-edge-bottom</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/hide_buttons_enabled</key>
+ <owner>panel</owner>
+ <type>bool</type>
+ <default>false</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/hide_button_pixmaps_enabled</key>
+ <owner>panel</owner>
+ <type>bool</type>
+ <default>false</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_background_type</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>no-background</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_background_pixmap</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default></default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_background_pixmap_fit</key>
+ <owner>panel</owner>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_background_pixmap_stretch</key>
+ <owner>panel</owner>
+ <type>bool</type>
+ <default>false</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_background_pixmap_rotate</key>
+ <owner>panel</owner>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_background_color</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>#000000</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <!-- Main Menu -->
+
+ <!-- add custom_icon and custom_icon_file keys to replace icon -->
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/objects/main_menu/object_type</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>menu-object</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/objects/main_menu/panel_id</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>bottom_panel</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/objects/main_menu/path</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>applications:///</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/objects/main_menu/main-menu</key>
+ <owner>panel</owner>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/objects/main_menu/global-menu</key>
+ <owner>panel</owner>
+ <type>bool</type>
+ <default>false</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <!-- The person who made this a bitfield stored as an int needs some buttkicking
-->
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/objects/main_menu/main-menu-flags</key>
+ <owner>panel</owner>
+ <type>int</type>
+ <default>24580</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <!-- Launchers -->
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/objects/web_browser_launcher/object_type</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>launcher-object</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/objects/web_browser_launcher/launcher_location</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>applications:///Internet/redhat-web.desktop</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/objects/web_browser_launcher/panel_id</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>bottom_panel</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/objects/web_browser_launcher/position</key>
+ <owner>panel</owner>
+ <type>int</type>
+ <default>50</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/objects/web_browser_launcher/panel_right_stick</key>
+ <owner>panel</owner>
+ <type>bool</type>
+ <default>false</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/objects/terminal_launcher/object_type</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>launcher-object</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/objects/terminal_launcher/launcher_location</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>applications:///System/gnome-terminal.desktop</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/objects/terminal_launcher/panel_id</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>bottom_panel</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/objects/terminal_launcher/position</key>
+ <owner>panel</owner>
+ <type>int</type>
+ <default>300</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/objects/terminal_launcher/panel_stick</key>
+ <owner>panel</owner>
+ <type>bool</type>
+ <default>false</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/objects/email_launcher/object_type</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>launcher-object</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/objects/email_launcher/launcher_location</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>applications:///Internet/redhat-email.desktop</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/objects/email_launcher/panel_id</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>bottom_panel</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/objects/email_launcher/position</key>
+ <owner>panel</owner>
+ <type>int</type>
+ <default>100</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/objects/email_launcher/panel_right_stick</key>
+ <owner>panel</owner>
+ <type>bool</type>
+ <default>false</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <!-- start -->
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/objects/wordprocessor_launcher/object_type</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>launcher-object</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/objects/wordprocessor_launcher/launcher_location</key>
+ <owner>panel</owner>
+ <type>string</type>
+
<default>applications:///Office/redhat-word-processor.desktop</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/objects/wordprocessor_launcher/panel_id</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>bottom_panel</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/objects/wordprocessor_launcher/position</key>
+ <owner>panel</owner>
+ <type>int</type>
+ <default>150</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/objects/wordprocessor_launcher/panel_right_stick</key>
+ <owner>panel</owner>
+ <type>bool</type>
+ <default>false</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <!-- end -->
+
+
+
+ <!-- start -->
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/objects/presentations_launcher/object_type</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>launcher-object</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/objects/presentations_launcher/launcher_location</key>
+ <owner>panel</owner>
+ <type>string</type>
+
<default>applications:///Office/redhat-presentations.desktop</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/objects/presentations_launcher/panel_id</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>bottom_panel</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/objects/presentations_launcher/position</key>
+ <owner>panel</owner>
+ <type>int</type>
+ <default>200</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/objects/presentations_launcher/panel_right_stick</key>
+ <owner>panel</owner>
+ <type>bool</type>
+ <default>false</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <!-- end -->
+
+
+
+ <!-- start -->
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/objects/spreadsheet_launcher/object_type</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>launcher-object</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/objects/spreadsheet_launcher/launcher_location</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>applications:///Office/redhat-spreadsheet.desktop</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/objects/spreadsheet_launcher/panel_id</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>bottom_panel</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/objects/spreadsheet_launcher/position</key>
+ <owner>panel</owner>
+ <type>int</type>
+ <default>250</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/objects/spreadsheet_launcher/panel_right_stick</key>
+ <owner>panel</owner>
+ <type>bool</type>
+ <default>false</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <!-- end -->
+
+
+ <!-- start -->
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/objects/print_launcher/object_type</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>launcher-object</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/objects/print_launcher/launcher_location</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>applications:///Accessories/redhat-print.desktop</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/objects/print_launcher/panel_id</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>bottom_panel</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/objects/print_launcher/position</key>
+ <owner>panel</owner>
+ <type>int</type>
+ <default>260</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/objects/print_launcher/panel_right_stick</key>
+ <owner>panel</owner>
+ <type>bool</type>
+ <default>false</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <!-- end -->
+
+
+
+
+ <!-- start -->
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/objects/help_launcher/object_type</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>launcher-object</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/objects/help_launcher/launcher_location</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>applications:///gnome-yelp.desktop</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/objects/help_launcher/panel_id</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>bottom_panel</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/objects/help_launcher/position</key>
+ <owner>panel</owner>
+ <type>int</type>
+ <default>300</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/objects/help_launcher/panel_right_stick</key>
+ <owner>panel</owner>
+ <type>bool</type>
+ <default>false</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <!-- end -->
+
+
+ <!-- Applets -->
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/applets/tasklist_applet/object_type</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>bonobo-applet</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/applets/tasklist_applet/panel_id</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>bottom_panel</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/applets/tasklist_applet/position</key>
+ <owner>panel</owner>
+ <type>int</type>
+ <default>375</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/applets/tasklist_applet/bonobo_iid</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>OAFIID:GNOME_TasklistApplet</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/applets/tasklist_applet/panel_right_stick</key>
+ <owner>panel</owner>
+ <type>bool</type>
+ <default>false</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/applets/pager_applet/object_type</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>bonobo-applet</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/applets/pager_applet/panel_id</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>bottom_panel</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/applets/pager_applet/position</key>
+ <owner>panel</owner>
+ <type>int</type>
+ <default>325</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/applets/pager_applet/bonobo_iid</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>OAFIID:GNOME_PagerApplet</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/applets/pager_applet/panel_right_stick</key>
+ <owner>panel</owner>
+ <type>bool</type>
+ <default>false</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <!-- clock -->
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/applets/clock_applet/object_type</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>bonobo-applet</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/applets/clock_applet/panel_id</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>bottom_panel</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/applets/clock_applet/position</key>
+ <owner>panel</owner>
+ <type>int</type>
+ <default>0</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/applets/clock_applet/bonobo_iid</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>OAFIID:GNOME_ClockApplet</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/applets/clock_applet/panel_right_stick</key>
+ <owner>panel</owner>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+
+ <!-- tray -->
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/applets/tray_applet/object_type</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>bonobo-applet</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/applets/tray_applet/panel_id</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>bottom_panel</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/applets/tray_applet/position</key>
+ <owner>panel</owner>
+ <type>int</type>
+ <default>70</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/applets/tray_applet/bonobo_iid</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>OAFIID:GNOME_SystemTrayApplet</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/medium/applets/tray_applet/panel_right_stick</key>
+ <owner>panel</owner>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+
+<!-- *********************************** -->
+<!-- Panel Items for Edge Panel :: END -->
+<!-- *********************************** -->
+
+<!-- **************************** -->
+<!-- Edge panel properties :: END -->
+<!-- **************************** -->
+
+<!--
+***********************************************************************************
+** Large Screen Setup: 1 edge panel of size 48, 1 menu panel of size 36 **
+***********************************************************************************
+-->
+
+<!-- ********************************* -->
+<!-- General panel properties :: START -->
+<!-- ********************************* -->
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/large/general/advanced_run_dialog</key>
+ <owner>panel</owner>
+ <type>bool</type>
+ <default>false</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/large/general/panel_id_list</key>
+ <owner>panel</owner>
+ <type>list</type>
+ <list_type>string</list_type>
+ <default>[bottom_panel]</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/large/general/applet_id_list</key>
+ <owner>panel</owner>
+ <type>list</type>
+ <list_type>string</list_type>
+ <default>[]</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/large/general/object_id_list</key>
+ <owner>panel</owner>
+ <type>list</type>
+ <list_type>string</list_type>
+ <default>[]</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+<!-- ******************************* -->
+<!-- General panel properties :: END -->
+<!-- ******************************* -->
+
+<!-- ****************************** -->
+<!-- Edge panel properties :: START -->
+<!-- ****************************** -->
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/panel_type</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>edge-panel</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/panel_size</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>panel-size-medium</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/panel_hide_mode</key>
+ <owner>panel</owner>
+ <type>int</type>
+ <default>0</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/panel_hide_state</key>
+ <owner>panel</owner>
+ <type>int</type>
+ <default>0</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/screen_id</key>
+ <owner>panel</owner>
+ <type>int</type>
+ <default>0</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/screen_edge</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>panel-edge-bottom</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/hide_buttons_enabled</key>
+ <owner>panel</owner>
+ <type>bool</type>
+ <default>false</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/hide_button_pixmaps_enabled</key>
+ <owner>panel</owner>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/panel_background_type</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>no-background</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/panel_background_pixmap</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default> </default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/panel_background_pixmap_fit</key>
+ <owner>panel</owner>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/panel_background_pixmap_stretch</key>
+ <owner>panel</owner>
+ <type>bool</type>
+ <default>false</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/panel_background_pixmap_rotate</key>
+ <owner>panel</owner>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+ <schema>
+
<key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/panel_background_color</key>
+ <owner>panel</owner>
+ <type>string</type>
+ <default>#000000</default>
+ <locale name="C">
+ <short></short>
+ <long></long>
+ </locale>
+ </schema>
+
+<!-- **************************** -->
+<!-- Edge panel properties :: END -->
+<!-- **************************** -->
+
+
+ </schemalist>
+
+</gconfschemafile>
diff --git a/redhat-panel-default-setup.entries b/redhat-panel-default-setup.entries
new file mode 100644
index 0000000..4864563
--- /dev/null
+++ b/redhat-panel-default-setup.entries
@@ -0,0 +1,742 @@
+<gconfentryfile>
+
+ <entrylist base="/apps/panel/default_setup">
+
+ <!-- List of toplevels -->
+
+ <entry>
+ <key>general/toplevel_id_list</key>
+ <schema_key>/schemas/apps/panel/general/toplevel_id_list</schema_key>
+ <value>
+ <list type="string">
+ <value>
+ <string>top_panel</string>
+ </value>
+ <value>
+ <string>bottom_panel</string>
+ </value>
+ </list>
+ </value>
+ </entry>
+
+ <!-- List of objects -->
+
+ <entry>
+ <key>general/object_id_list</key>
+ <schema_key>/schemas/apps/panel/general/object_id_list</schema_key>
+ <value>
+ <list type="string">
+ <value>
+ <string>menu_bar</string>
+ </value>
+ <value>
+ <string>web_launcher</string>
+ </value>
+ <value>
+ <string>email_launcher</string>
+ </value>
+ </list>
+ </value>
+ </entry>
+
+ <!-- List of applets -->
+
+ <entry>
+ <key>general/applet_id_list</key>
+ <schema_key>/schemas/apps/panel/general/applet_id_list</schema_key>
+ <value>
+ <list type="string">
+ <value>
+ <string>gnote</string>
+ </value>
+ <value>
+ <string>clock</string>
+ </value>
+ <value>
+ <string>systray</string>
+ </value>
+ <value>
+ <string>window_list</string>
+ </value>
+ <value>
+ <string>workspace_switcher</string>
+ </value>
+ <value>
+ <string>trash_applet</string>
+ </value>
+ <value>
+ <string>fast_user_switch_applet</string>
+ </value>
+ </list>
+ </value>
+ </entry>
+
+ <!-- Top Panel -->
+
+ <entry>
+ <key>toplevels/top_panel/name</key>
+ <schema_key>/schemas/apps/panel/toplevels/name</schema_key>
+ <value>
+ <string>Top Panel</string>
+ </value>
+ </entry>
+ <entry>
+ <key>toplevels/top_panel/expand</key>
+ <schema_key>/schemas/apps/panel/toplevels/expand</schema_key>
+ <value>
+ <bool>true</bool>
+ </value>
+ </entry>
+ <entry>
+ <key>toplevels/top_panel/padding</key>
+ <schema_key>/schemas/apps/panel/toplevels/padding</schema_key>
+ <value>
+ <int>8</int>
+ </value>
+ </entry>
+ <entry>
+ <key>toplevels/top_panel/orientation</key>
+ <schema_key>/schemas/apps/panel/toplevels/orientation</schema_key>
+ <value>
+ <string>top</string>
+ </value>
+ </entry>
+ <entry>
+ <key>toplevels/top_panel/size</key>
+ <schema_key>/schemas/apps/panel/toplevels/size</schema_key>
+ <value>
+ <int>24</int>
+ </value>
+ </entry>
+
+
<entry><key>toplevels/top_panel/screen</key><schema_key>/schemas/apps/panel/toplevels/screen</schema_key></entry>
+
<entry><key>toplevels/top_panel/monitor</key><schema_key>/schemas/apps/panel/toplevels/monitor</schema_key></entry>
+
<entry><key>toplevels/top_panel/x</key><schema_key>/schemas/apps/panel/toplevels/x</schema_key></entry>
+
<entry><key>toplevels/top_panel/y</key><schema_key>/schemas/apps/panel/toplevels/y</schema_key></entry>
+
<entry><key>toplevels/top_panel/x_centered</key><schema_key>/schemas/apps/panel/toplevels/x_centered</schema_key></entry>
+
<entry><key>toplevels/top_panel/y_centered</key><schema_key>/schemas/apps/panel/toplevels/y_centered</schema_key></entry>
+
<entry><key>toplevels/top_panel/auto_hide</key><schema_key>/schemas/apps/panel/toplevels/auto_hide</schema_key></entry>
+
<entry><key>toplevels/top_panel/enable_animations</key><schema_key>/schemas/apps/panel/toplevels/enable_animations</schema_key></entry>
+
<entry><key>toplevels/top_panel/enable_buttons</key><schema_key>/schemas/apps/panel/toplevels/enable_buttons</schema_key></entry>
+
<entry><key>toplevels/top_panel/enable_arrows</key><schema_key>/schemas/apps/panel/toplevels/enable_arrows</schema_key></entry>
+
<entry><key>toplevels/top_panel/hide_delay</key><schema_key>/schemas/apps/panel/toplevels/hide_delay</schema_key></entry>
+
<entry><key>toplevels/top_panel/unhide_delay</key><schema_key>/schemas/apps/panel/toplevels/unhide_delay</schema_key></entry>
+
<entry><key>toplevels/top_panel/auto_hide_size</key><schema_key>/schemas/apps/panel/toplevels/auto_hide_size</schema_key></entry>
+
<entry><key>toplevels/top_panel/background/type</key><schema_key>/schemas/apps/panel/toplevels/background/type</schema_key></entry>
+
<entry><key>toplevels/top_panel/background/color</key><schema_key>/schemas/apps/panel/toplevels/background/color</schema_key></entry>
+
<entry><key>toplevels/top_panel/background/opacity</key><schema_key>/schemas/apps/panel/toplevels/background/opacity</schema_key></entry>
+
<entry><key>toplevels/top_panel/background/image</key><schema_key>/schemas/apps/panel/toplevels/background/image</schema_key></entry>
+
<entry><key>toplevels/top_panel/background/fit</key><schema_key>/schemas/apps/panel/toplevels/background/fit</schema_key></entry>
+
<entry><key>toplevels/top_panel/background/stretch</key><schema_key>/schemas/apps/panel/toplevels/background/stretch</schema_key></entry>
+
<entry><key>toplevels/top_panel/background/rotate</key><schema_key>/schemas/apps/panel/toplevels/background/rotate</schema_key></entry>
+
+ <!-- Bottom Panel -->
+
+ <entry>
+ <key>toplevels/bottom_panel/name</key>
+ <schema_key>/schemas/apps/panel/toplevels/name</schema_key>
+ <value>
+ <string>Bottom Panel</string>
+ </value>
+ </entry>
+ <entry>
+ <key>toplevels/bottom_panel/expand</key>
+ <schema_key>/schemas/apps/panel/toplevels/expand</schema_key>
+ <value>
+ <bool>true</bool>
+ </value>
+ </entry>
+ <entry>
+ <key>toplevels/bottom_panel/padding</key>
+ <schema_key>/schemas/apps/panel/toplevels/padding</schema_key>
+ <value>
+ <int>8</int>
+ </value>
+ </entry>
+ <entry>
+ <key>toplevels/bottom_panel/orientation</key>
+ <schema_key>/schemas/apps/panel/toplevels/orientation</schema_key>
+ <value>
+ <string>bottom</string>
+ </value>
+ </entry>
+ <entry>
+ <key>toplevels/bottom_panel/size</key>
+ <schema_key>/schemas/apps/panel/toplevels/size</schema_key>
+ <value>
+ <int>24</int>
+ </value>
+ </entry>
+
+
<entry><key>toplevels/bottom_panel/screen</key><schema_key>/schemas/apps/panel/toplevels/screen</schema_key></entry>
+
<entry><key>toplevels/bottom_panel/monitor</key><schema_key>/schemas/apps/panel/toplevels/monitor</schema_key></entry>
+
<entry><key>toplevels/bottom_panel/x</key><schema_key>/schemas/apps/panel/toplevels/x</schema_key></entry>
+
<entry><key>toplevels/bottom_panel/y</key><schema_key>/schemas/apps/panel/toplevels/y</schema_key></entry>
+
<entry><key>toplevels/bottom_panel/x_centered</key><schema_key>/schemas/apps/panel/toplevels/x_centered</schema_key></entry>
+
<entry><key>toplevels/bottom_panel/y_centered</key><schema_key>/schemas/apps/panel/toplevels/y_centered</schema_key></entry>
+
<entry><key>toplevels/bottom_panel/auto_hide</key><schema_key>/schemas/apps/panel/toplevels/auto_hide</schema_key></entry>
+
<entry><key>toplevels/bottom_panel/enable_animations</key><schema_key>/schemas/apps/panel/toplevels/enable_animations</schema_key></entry>
+
<entry><key>toplevels/bottom_panel/enable_buttons</key><schema_key>/schemas/apps/panel/toplevels/enable_buttons</schema_key></entry>
+
<entry><key>toplevels/bottom_panel/enable_arrows</key><schema_key>/schemas/apps/panel/toplevels/enable_arrows</schema_key></entry>
+
<entry><key>toplevels/bottom_panel/hide_delay</key><schema_key>/schemas/apps/panel/toplevels/hide_delay</schema_key></entry>
+
<entry><key>toplevels/bottom_panel/unhide_delay</key><schema_key>/schemas/apps/panel/toplevels/unhide_delay</schema_key></entry>
+
<entry><key>toplevels/bottom_panel/auto_hide_size</key><schema_key>/schemas/apps/panel/toplevels/auto_hide_size</schema_key></entry>
+
<entry><key>toplevels/bottom_panel/background/type</key><schema_key>/schemas/apps/panel/toplevels/background/type</schema_key></entry>
+
<entry><key>toplevels/bottom_panel/background/color</key><schema_key>/schemas/apps/panel/toplevels/background/color</schema_key></entry>
+
<entry><key>toplevels/bottom_panel/background/opacity</key><schema_key>/schemas/apps/panel/toplevels/background/opacity</schema_key></entry>
+
<entry><key>toplevels/bottom_panel/background/image</key><schema_key>/schemas/apps/panel/toplevels/background/image</schema_key></entry>
+
<entry><key>toplevels/bottom_panel/background/fit</key><schema_key>/schemas/apps/panel/toplevels/background/fit</schema_key></entry>
+
<entry><key>toplevels/bottom_panel/background/stretch</key><schema_key>/schemas/apps/panel/toplevels/background/stretch</schema_key></entry>
+
<entry><key>toplevels/bottom_panel/background/rotate</key><schema_key>/schemas/apps/panel/toplevels/background/rotate</schema_key></entry>
+
+ <!-- Menu Bar -->
+
+ <entry>
+ <key>objects/menu_bar/object_type</key>
+ <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
+ <value>
+ <string>menu-bar</string>
+ </value>
+ </entry>
+ <entry>
+ <key>objects/menu_bar/toplevel_id</key>
+ <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
+ <value>
+ <string>top_panel</string>
+ </value>
+ </entry>
+ <entry>
+ <key>objects/menu_bar/position</key>
+ <schema_key>/schemas/apps/panel/objects/position</schema_key>
+ <value>
+ <int>0</int>
+ </value>
+ </entry>
+ <entry>
+ <key>objects/menu_bar/panel_right_stick</key>
+ <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
+ <value>
+ <bool>false</bool>
+ </value>
+ </entry>
+ <entry>
+ <key>objects/menu_bar/locked</key>
+ <schema_key>/schemas/apps/panel/objects/locked</schema_key>
+ <value>
+ <bool>true</bool>
+ </value>
+ </entry>
+
+
<entry><key>objects/menu_bar/bonobo_iid</key><schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key></entry>
+
<entry><key>objects/menu_bar/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key>
</entry>
+
<entry><key>objects/menu_bar/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
+
<entry><key>objects/menu_bar/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
+
<entry><key>objects/menu_bar/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
+
<entry><key>objects/menu_bar/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
+
<entry><key>objects/menu_bar/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
+
<entry><key>objects/menu_bar/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
+
<entry><key>objects/menu_bar/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
+
+ <!-- Web Launcher -->
+
+ <entry>
+ <key>objects/web_launcher/object_type</key>
+ <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
+ <value>
+ <string>launcher-object</string>
+ </value>
+ </entry>
+ <entry>
+ <key>objects/web_launcher/toplevel_id</key>
+ <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
+ <value>
+ <string>top_panel</string>
+ </value>
+ </entry>
+ <entry>
+ <key>objects/web_launcher/position</key>
+ <schema_key>/schemas/apps/panel/objects/position</schema_key>
+ <value>
+ <int>1</int>
+ </value>
+ </entry>
+ <entry>
+ <key>objects/web_launcher/panel_right_stick</key>
+ <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
+ <value>
+ <bool>false</bool>
+ </value>
+ </entry>
+ <entry>
+ <key>objects/web_launcher/locked</key>
+ <schema_key>/schemas/apps/panel/objects/locked</schema_key>
+ <value>
+ <bool>true</bool>
+ </value>
+ </entry>
+ <entry>
+ <key>objects/web_launcher/launcher_location</key>
+ <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
+ <value>
+ <string>preferred-web-browser.desktop</string>
+ </value>
+ </entry>
+
+
<entry><key>objects/web_launcher/bonobo_iid</key><schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key></entry>
+
<entry><key>objects/web_launcher/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key>
</entry>
+
<entry><key>objects/web_launcher/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
+
<entry><key>objects/web_launcher/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
+
<entry><key>objects/web_launcher/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
+
<entry><key>objects/web_launcher/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
+
<entry><key>objects/web_launcher/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
+
<entry><key>objects/web_launcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
+
+ <!-- Email Launcher -->
+
+ <entry>
+ <key>objects/email_launcher/object_type</key>
+ <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
+ <value>
+ <string>launcher-object</string>
+ </value>
+ </entry>
+ <entry>
+ <key>objects/email_launcher/toplevel_id</key>
+ <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
+ <value>
+ <string>top_panel</string>
+ </value>
+ </entry>
+ <entry>
+ <key>objects/email_launcher/position</key>
+ <schema_key>/schemas/apps/panel/objects/position</schema_key>
+ <value>
+ <int>2</int>
+ </value>
+ </entry>
+ <entry>
+ <key>objects/email_launcher/panel_right_stick</key>
+ <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
+ <value>
+ <bool>false</bool>
+ </value>
+ </entry>
+ <entry>
+ <key>objects/email_launcher/locked</key>
+ <schema_key>/schemas/apps/panel/objects/locked</schema_key>
+ <value>
+ <bool>true</bool>
+ </value>
+ </entry>
+ <entry>
+ <key>objects/email_launcher/launcher_location</key>
+ <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
+ <value>
+ <string>preferred-mail-reader.desktop</string>
+ </value>
+ </entry>
+
+
<entry><key>objects/email_launcher/bonobo_iid</key><schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key></entry>
+
<entry><key>objects/email_launcher/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key>
</entry>
+
<entry><key>objects/email_launcher/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
+
<entry><key>objects/email_launcher/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
+
<entry><key>objects/email_launcher/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
+
<entry><key>objects/email_launcher/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
+
<entry><key>objects/email_launcher/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
+
<entry><key>objects/email_launcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
+
+ <!-- GNote -->
+
+ <entry>
+ <key>applets/gnote/object_type</key>
+ <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
+ <value>
+ <string>bonobo-applet</string>
+ </value>
+ </entry>
+ <entry>
+ <key>applets/gnote/toplevel_id</key>
+ <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
+ <value>
+ <string>top_panel</string>
+ </value>
+ </entry>
+ <entry>
+ <key>applets/gnote/position</key>
+ <schema_key>/schemas/apps/panel/objects/position</schema_key>
+ <value>
+ <int>3</int>
+ </value>
+ </entry>
+ <entry>
+ <key>applets/gnote/panel_right_stick</key>
+ <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
+ <value>
+ <bool>false</bool>
+ </value>
+ </entry>
+ <entry>
+ <key>applets/gnote/locked</key>
+ <schema_key>/schemas/apps/panel/objects/locked</schema_key>
+ <value>
+ <bool>true</bool>
+ </value>
+ </entry>
+ <entry>
+ <key>applets/gnote/bonobo_iid</key>
+ <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
+ <value>
+ <string>OAFIID:GnoteApplet</string>
+ </value>
+ </entry>
+
+
<entry><key>applets/gnote/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key>
</entry>
+
<entry><key>applets/gnote/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
+
<entry><key>applets/gnote/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
+
<entry><key>applets/gnote/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
+
<entry><key>applets/gnote/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
+
<entry><key>applets/gnote/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
+
<entry><key>applets/gnote/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
+
<entry><key>applets/gnote/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
+
+ <!-- Fast User Switch Applet -->
+
+ <entry>
+ <key>applets/fast_user_switch_applet/object_type</key>
+ <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
+ <value>
+ <string>bonobo-applet</string>
+ </value>
+ </entry>
+ <entry>
+ <key>applets/fast_user_switch_applet/toplevel_id</key>
+ <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
+ <value>
+ <string>top_panel</string>
+ </value>
+ </entry>
+ <entry>
+ <key>applets/fast_user_switch_applet/position</key>
+ <schema_key>/schemas/apps/panel/objects/position</schema_key>
+ <value>
+ <int>0</int>
+ </value>
+ </entry>
+ <entry>
+ <key>applets/fast_user_switch_applet/panel_right_stick</key>
+ <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
+ <value>
+ <bool>true</bool>
+ </value>
+ </entry>
+ <entry>
+ <key>applets/fast_user_switch_applet/locked</key>
+ <schema_key>/schemas/apps/panel/objects/locked</schema_key>
+ <value>
+ <bool>true</bool>
+ </value>
+ </entry>
+ <entry>
+ <key>applets/fast_user_switch_applet/bonobo_iid</key>
+ <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
+ <value>
+ <string>OAFIID:GNOME_FastUserSwitchApplet</string>
+ </value>
+ </entry>
+
+
<entry><key>applets/fast_user_switch_applet/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key>
</entry>
+
<entry><key>applets/fast_user_switch_applet/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
+
<entry><key>applets/fast_user_switch_applet/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
+
<entry><key>applets/fast_user_switch_applet/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
+
<entry><key>applets/fast_user_switch_applet/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
+
<entry><key>applets/fast_user_switch_applet/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
+
<entry><key>applets/fast_user_switch_applet/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
+
<entry><key>applets/fast_user_switch_applet/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
+
+ <!-- Clock Applet -->
+
+ <entry>
+ <key>applets/clock/object_type</key>
+ <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
+ <value>
+ <string>bonobo-applet</string>
+ </value>
+ </entry>
+ <entry>
+ <key>applets/clock/toplevel_id</key>
+ <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
+ <value>
+ <string>top_panel</string>
+ </value>
+ </entry>
+ <entry>
+ <key>applets/clock/position</key>
+ <schema_key>/schemas/apps/panel/objects/position</schema_key>
+ <value>
+ <int>1</int>
+ </value>
+ </entry>
+ <entry>
+ <key>applets/clock/panel_right_stick</key>
+ <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
+ <value>
+ <bool>true</bool>
+ </value>
+ </entry>
+ <entry>
+ <key>applets/clock/locked</key>
+ <schema_key>/schemas/apps/panel/objects/locked</schema_key>
+ <value>
+ <bool>true</bool>
+ </value>
+ </entry>
+ <entry>
+ <key>applets/clock/bonobo_iid</key>
+ <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
+ <value>
+ <string>OAFIID:GNOME_ClockApplet</string>
+ </value>
+ </entry>
+
+
<entry><key>applets/clock/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key>
</entry>
+
<entry><key>applets/clock/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
+
<entry><key>applets/clock/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
+
<entry><key>applets/clock/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
+
<entry><key>applets/clock/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
+
<entry><key>applets/clock/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
+
<entry><key>applets/clock/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
+
<entry><key>applets/clock/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
+
+ <!-- System Tray Applet -->
+
+ <entry>
+ <key>applets/systray/object_type</key>
+ <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
+ <value>
+ <string>bonobo-applet</string>
+ </value>
+ </entry>
+ <entry>
+ <key>applets/systray/toplevel_id</key>
+ <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
+ <value>
+ <string>top_panel</string>
+ </value>
+ </entry>
+ <entry>
+ <key>applets/systray/position</key>
+ <schema_key>/schemas/apps/panel/objects/position</schema_key>
+ <value>
+ <int>3</int>
+ </value>
+ </entry>
+ <entry>
+ <key>applets/systray/panel_right_stick</key>
+ <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
+ <value>
+ <bool>true</bool>
+ </value>
+ </entry>
+ <entry>
+ <key>applets/systray/locked</key>
+ <schema_key>/schemas/apps/panel/objects/locked</schema_key>
+ <value>
+ <bool>true</bool>
+ </value>
+ </entry>
+ <entry>
+ <key>applets/systray/bonobo_iid</key>
+ <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
+ <value>
+ <string>OAFIID:GNOME_SystemTrayApplet</string>
+ </value>
+ </entry>
+ <entry>
+ <key>applets/systray/prefs/padding</key>
+
<schema_key>/schemas/apps/notification_area_applet/prefs/padding</schema_key>
+ <value>
+ <int>2</int>
+ </value>
+ </entry>
+
+
<entry><key>applets/systray/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key>
</entry>
+
<entry><key>applets/systray/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
+
<entry><key>applets/systray/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
+
<entry><key>applets/systray/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
+
<entry><key>applets/systray/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
+
<entry><key>applets/systray/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
+
<entry><key>applets/systray/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
+
<entry><key>applets/systray/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
+
+ <!-- Window List Applet -->
+
+ <entry>
+ <key>applets/window_list/object_type</key>
+ <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
+ <value>
+ <string>bonobo-applet</string>
+ </value>
+ </entry>
+ <entry>
+ <key>applets/window_list/toplevel_id</key>
+ <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
+ <value>
+ <string>bottom_panel</string>
+ </value>
+ </entry>
+ <entry>
+ <key>applets/window_list/position</key>
+ <schema_key>/schemas/apps/panel/objects/position</schema_key>
+ <value>
+ <int>1</int>
+ </value>
+ </entry>
+ <entry>
+ <key>applets/window_list/panel_right_stick</key>
+ <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
+ <value>
+ <bool>false</bool>
+ </value>
+ </entry>
+ <entry>
+ <key>applets/window_list/locked</key>
+ <schema_key>/schemas/apps/panel/objects/locked</schema_key>
+ <value>
+ <bool>true</bool>
+ </value>
+ </entry>
+ <entry>
+ <key>applets/window_list/bonobo_iid</key>
+ <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
+ <value>
+ <string>OAFIID:GNOME_WindowListApplet</string>
+ </value>
+ </entry>
+
+
<entry><key>applets/window_list/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key>
</entry>
+
<entry><key>applets/window_list/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
+
<entry><key>applets/window_list/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
+
<entry><key>applets/window_list/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
+
<entry><key>applets/window_list/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
+
<entry><key>applets/window_list/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
+
<entry><key>applets/window_list/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
+
<entry><key>applets/window_list/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
+
+ <!-- Workspace Switcher Applet -->
+
+ <entry>
+ <key>applets/workspace_switcher/object_type</key>
+ <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
+ <value>
+ <string>bonobo-applet</string>
+ </value>
+ </entry>
+ <entry>
+ <key>applets/workspace_switcher/toplevel_id</key>
+ <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
+ <value>
+ <string>bottom_panel</string>
+ </value>
+ </entry>
+ <entry>
+ <key>applets/workspace_switcher/position</key>
+ <schema_key>/schemas/apps/panel/objects/position</schema_key>
+ <value>
+ <int>1</int>
+ </value>
+ </entry>
+ <entry>
+ <key>applets/workspace_switcher/panel_right_stick</key>
+ <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
+ <value>
+ <bool>true</bool>
+ </value>
+ </entry>
+ <entry>
+ <key>applets/workspace_switcher/locked</key>
+ <schema_key>/schemas/apps/panel/objects/locked</schema_key>
+ <value>
+ <bool>true</bool>
+ </value>
+ </entry>
+ <entry>
+ <key>applets/workspace_switcher/bonobo_iid</key>
+ <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
+ <value>
+ <string>OAFIID:GNOME_WorkspaceSwitcherApplet</string>
+ </value>
+ </entry>
+ <entry>
+ <key>applets/workspace_switcher/prefs/num_rows</key>
+
<schema_key>/schemas/apps/workspace_switcher/prefs/num_rows</schema_key>
+ <value>
+ <int>1</int>
+ </value>
+ </entry>
+
+
<entry><key>applets/workspace_switcher/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key>
</entry>
+
<entry><key>applets/workspace_switcher/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
+
<entry><key>applets/workspace_switcher/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
+
<entry><key>applets/workspace_switcher/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
+
<entry><key>applets/workspace_switcher/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
+
<entry><key>applets/workspace_switcher/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
+
<entry><key>applets/workspace_switcher/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
+
<entry><key>applets/workspace_switcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
+
+ <!-- Trash Applet -->
+
+ <entry>
+ <key>applets/trash_applet/object_type</key>
+ <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
+ <value>
+ <string>bonobo-applet</string>
+ </value>
+ </entry>
+ <entry>
+ <key>applets/trash_applet/toplevel_id</key>
+ <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
+ <value>
+ <string>bottom_panel</string>
+ </value>
+ </entry>
+ <entry>
+ <key>applets/trash_applet/position</key>
+ <schema_key>/schemas/apps/panel/objects/position</schema_key>
+ <value>
+ <int>0</int>
+ </value>
+ </entry>
+ <entry>
+ <key>applets/trash_applet/panel_right_stick</key>
+ <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
+ <value>
+ <bool>true</bool>
+ </value>
+ </entry>
+ <entry>
+ <key>applets/trash_applet/locked</key>
+ <schema_key>/schemas/apps/panel/objects/locked</schema_key>
+ <value>
+ <bool>true</bool>
+ </value>
+ </entry>
+ <entry>
+ <key>applets/trash_applet/bonobo_iid</key>
+ <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
+ <value>
+ <string>OAFIID:GNOME_Panel_TrashApplet</string>
+ </value>
+ </entry>
+
+
<entry><key>applets/trash_applet/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key>
</entry>
+
<entry><key>applets/trash_applet/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
+
<entry><key>applets/trash_applet/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
+
<entry><key>applets/trash_applet/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
+
<entry><key>applets/trash_applet/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
+
<entry><key>applets/trash_applet/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
+
<entry><key>applets/trash_applet/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
+
<entry><key>applets/trash_applet/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
+
+ </entrylist>
+
+</gconfentryfile>
diff --git a/sources b/sources
new file mode 100644
index 0000000..c382f1a
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+f394ad73babbce95fd0bb65ec6fd3519 gnome-panel-3.6.2.tar.xz
commit 26ea386096c0cd7de55cc2226c46b63338c0ef39
Author: Kalev Lember <kalevlember(a)gmail.com>
Date: Wed May 1 23:02:10 2013 +0200
Package is retired, replaced by the GNOME Classic session in F19
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 61583cb..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,31 +0,0 @@
-gnome-panel-2.31.4.tar.bz2
-gnome-panel-2.31.6.tar.bz2
-/gnome-panel-2.31.90.tar.bz2
-/gnome-panel-2.31.92.tar.bz2
-/gnome-panel-2.91.6.tar.bz2
-/gnome-panel-2.91.90.tar.bz2
-/gnome-panel-2.91.91.tar.bz2
-/gnome-panel-2.91.92.tar.bz2
-/gnome-panel-2.91.93.tar.bz2
-/gnome-panel-2.91.94.tar.bz2
-/gnome-panel-3.0.0.tar.bz2
-/gnome-panel-3.0.0.1.tar.bz2
-/gnome-panel-3.0.2.tar.bz2
-/gnome-panel-3.1.5.tar.xz
-/gnome-panel-3.1.91.tar.xz
-/gnome-panel-3.1.92.tar.xz
-/gnome-panel-3.2.0.tar.xz
-/gnome-panel-3.2.1.tar.xz
-/gnome-panel-3.3.1.tar.xz
-/gnome-panel-3.3.3.tar.xz
-/gnome-panel-3.3.5.tar.xz
-/gnome-panel-3.3.90.tar.xz
-/gnome-panel-3.3.91.tar.xz
-/gnome-panel-3.3.92.tar.xz
-/gnome-panel-3.4.0.tar.xz
-/gnome-panel-3.4.1.tar.xz
-/gnome-panel-3.4.2.1.tar.xz
-/gnome-panel-3.5.3.tar.xz
-/gnome-panel-3.5.4.tar.xz
-/gnome-panel-3.6.0.tar.xz
-/gnome-panel-3.6.2.tar.xz
diff --git a/Use-16px-menu-icons.patch b/Use-16px-menu-icons.patch
deleted file mode 100644
index 64e94dd..0000000
--- a/Use-16px-menu-icons.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From de049e9a8846270ed643b5c021ecd75fa259e00e Mon Sep 17 00:00:00 2001
-From: William Jon McCann <jmccann(a)redhat.com>
-Date: Mon, 4 Apr 2011 17:48:39 -0400
-Subject: [PATCH] Use 16px menu icons
-
-https://bugzilla.gnome.org/show_bug.cgi?id=646749
----
- gnome-panel/panel-stock-icons.h | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/gnome-panel/panel-stock-icons.h b/gnome-panel/panel-stock-icons.h
-index efac6d4..229d80a 100644
---- a/gnome-panel/panel-stock-icons.h
-+++ b/gnome-panel/panel-stock-icons.h
-@@ -31,7 +31,7 @@
- G_BEGIN_DECLS
-
- /* themeable size - "panel-menu" -- This is used for the icons in the menus
*/
--#define PANEL_DEFAULT_MENU_ICON_SIZE 24
-+#define PANEL_DEFAULT_MENU_ICON_SIZE 16
-
- /* stock icons */
- #define PANEL_STOCK_FORCE_QUIT "gnome-panel-force-quit"
---
-1.7.3.4
\ No newline at end of file
diff --git a/add-translations.sh b/add-translations.sh
deleted file mode 100644
index 9824d5a..0000000
--- a/add-translations.sh
+++ /dev/null
@@ -1,235 +0,0 @@
-cat >>po/bg.po <<EOF
-
-msgid "Suspend"
-msgstr ""
-EOF
-cat >>po/bn_IN.po <<EOF
-
-msgid "Suspend"
-msgstr ""
-EOF
-cat >>po/bn.po <<EOF
-
-msgid "Suspend"
-msgstr ""
-EOF
-cat >>po/ca.po <<EOF
-
-msgid "Suspend"
-msgstr "Atura temporalment"
-EOF
-cat >>po/cs.po <<EOF
-
-msgid "Suspend"
-msgstr "Suspendovat"
-EOF
-cat >>po/de.po <<EOF
-
-msgid "Suspend"
-msgstr "Stromsparmodus"
-EOF
-cat >>po/dz.po <<EOF
-
-msgid "Suspend"
-msgstr ""
-EOF
-cat >>po/el.po <<EOF
-
-msgid "Suspend"
-msgstr ""
-EOF
-cat >>po/en_CA.po <<EOF
-
-msgid "Suspend"
-msgstr "Suspend"
-EOF
-cat >>po/en_GB.po <<EOF
-
-msgid "Suspend"
-msgstr "Suspend"
-EOF
-cat >>po/es.po <<EOF
-
-msgid "Suspend"
-msgstr "Suspender"
-EOF
-cat >>po/et.po <<EOF
-
-msgid "Suspend"
-msgstr ""
-EOF
-cat >>po/eu.po <<EOF
-
-msgid "Suspend"
-msgstr "Eseki"
-EOF
-cat >>po/fi.po <<EOF
-
-msgid "Suspend"
-msgstr "Keskeytystila"
-EOF
-cat >>po/fr.po <<EOF
-
-msgid "Suspend"
-msgstr "Mise en veille prolonge"
-EOF
-cat >>po/gl.po <<EOF
-
-msgid "Suspend"
-msgstr "Suspender"
-EOF
-cat >>po/gu.po <<EOF
-
-msgid "Suspend"
-msgstr ""
-EOF
-cat >>po/hi.po <<EOF
-
-msgid "Suspend"
-msgstr ""
-EOF
-cat >>po/hu.po <<EOF
-
-msgid "Suspend"
-msgstr "Felfggeszts"
-EOF
-cat >>po/it.po <<EOF
-
-msgid "Suspend"
-msgstr "Sospendi"
-EOF
-cat >>po/ja.po <<EOF
-
-msgid "Suspend"
-msgstr ""
-EOF
-cat >>po/ka.po <<EOF
-
-msgid "Suspend"
-msgstr ""
-EOF
-cat >>po/ko.po <<EOF
-
-msgid "Suspend"
-msgstr ""
-EOF
-cat >>po/lt.po <<EOF
-
-msgid "Suspend"
-msgstr "Umigdyti"
-EOF
-cat >>po/lv.po <<EOF
-
-msgid "Suspend"
-msgstr "Prstt"
-EOF
-cat >>po/mg.po <<EOF
-
-msgid "Suspend"
-msgstr "Ahatoy"
-EOF
-cat >>po/mk.po <<EOF
-
-msgid "Suspend"
-msgstr ""
-EOF
-cat >>po/ml.po <<EOF
-
-msgid "Suspend"
-msgstr " "
-EOF
-cat >>po/nb.po <<EOF
-
-msgid "Suspend"
-msgstr "Hvilemodus"
-EOF
-cat >>po/nl.po <<EOF
-
-msgid "Suspend"
-msgstr "Pauzestand"
-EOF
-cat >>po/or.po <<EOF
-
-msgid "Suspend"
-msgstr " "
-EOF
-cat >>po/pa.po <<EOF
-
-msgid "Suspend"
-msgstr ""
-EOF
-cat >>po/pl.po <<EOF
-
-msgid "Suspend"
-msgstr "Wstrzymanie"
-EOF
-cat >>po/pt_BR.po <<EOF
-
-msgid "Suspend"
-msgstr "Suspender"
-EOF
-cat >>po/pt.po <<EOF
-
-msgid "Suspend"
-msgstr "Suspender"
-EOF
-cat >>po/ru.po <<EOF
-
-msgid "Suspend"
-msgstr " "
-EOF
-cat >>po/sk.po <<EOF
-
-msgid "Suspend"
-msgstr ""
-EOF
-cat >>po/sr(a)Latn.po <<EOF
-
-msgid "Suspend"
-msgstr "Privremeno zaustavi"
-EOF
-cat >>po/sr.po <<EOF
-
-msgid "Suspend"
-msgstr " "
-EOF
-cat >>po/sv.po <<EOF
-
-msgid "Suspend"
-msgstr "Vntelge"
-EOF
-cat >>po/ta.po <<EOF
-
-msgid "Suspend"
-msgstr " "
-EOF
-cat >>po/th.po <<EOF
-
-msgid "Suspend"
-msgstr ""
-EOF
-cat >>po/uk.po <<EOF
-
-msgid "Suspend"
-msgstr ""
-EOF
-cat >>po/vi.po <<EOF
-
-msgid "Suspend"
-msgstr "Ngng"
-EOF
-cat >>po/zh_CN.po <<EOF
-
-msgid "Suspend"
-msgstr ""
-EOF
-cat >>po/zh_HK.po <<EOF
-
-msgid "Suspend"
-msgstr ""
-EOF
-cat >>po/zh_TW.po <<EOF
-
-msgid "Suspend"
-msgstr ""
-EOF
diff --git a/applet-error.patch b/applet-error.patch
deleted file mode 100644
index 9a3228a..0000000
--- a/applet-error.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -up gnome-panel-2.25.5/gnome-panel/panel-applet-frame.c.applet-error
gnome-panel-2.25.5/gnome-panel/panel-applet-frame.c
---- gnome-panel-2.25.5/gnome-panel/panel-applet-frame.c.applet-error 2009-01-20
09:04:47.000000000 -0500
-+++ gnome-panel-2.25.5/gnome-panel/panel-applet-frame.c 2009-01-20 14:22:33.000000000
-0500
-@@ -1246,6 +1246,21 @@ panel_applet_frame_event_listener (Bonob
- panel_applet_frame_set_size_hints_from_any (frame, any);
- }
-
-+static gboolean
-+in_default_panel_config (const gchar *id)
-+{
-+ gchar *dir;
-+ gboolean result;
-+
-+ dir = g_strconcat (PANEL_DEFAULTS_DIR, "/applets/", id, NULL);
-+ result = gconf_client_dir_exists (panel_gconf_get_client (),
-+ dir,
-+ NULL);
-+ g_free (dir);
-+
-+ return result;
-+}
-+
- static void
- panel_applet_frame_activated (CORBA_Object object,
- const char *error_reason,
-@@ -1425,7 +1440,9 @@ panel_applet_frame_activated (CORBA_Obje
- return;
-
- error_out:
-- panel_applet_frame_loading_failed (frame, frame_act->id);
-+ if (!in_default_panel_config (frame_act->id)) {
-+ panel_applet_frame_loading_failed (frame, frame_act->id);
-+ }
- if (widget)
- g_object_unref (widget);
- panel_applet_stop_loading (frame_act->id);
diff --git a/bookmarks-submenu.patch b/bookmarks-submenu.patch
deleted file mode 100644
index 90e619f..0000000
--- a/bookmarks-submenu.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up gnome-panel-2.29.5.1/gnome-panel/panel-menu-items.c.bookmarks-submenu
gnome-panel-2.29.5.1/gnome-panel/panel-menu-items.c
---- gnome-panel-2.29.5.1/gnome-panel/panel-menu-items.c.bookmarks-submenu 2010-01-17
18:19:36.000000000 -0500
-+++ gnome-panel-2.29.5.1/gnome-panel/panel-menu-items.c 2010-01-17 18:21:00.466529924
-0500
-@@ -61,7 +61,7 @@
- #define NAMES_DIR "/apps/nautilus/desktop"
- #define HOME_NAME_KEY "/apps/nautilus/desktop/home_icon_name"
- #define COMPUTER_NAME_KEY "/apps/nautilus/desktop/computer_icon_name"
--#define MAX_ITEMS_OR_SUBMENU 5
-+#define MAX_ITEMS_OR_SUBMENU 8
- #define MAX_BOOKMARK_ITEMS 100
-
- G_DEFINE_TYPE (PanelPlaceMenuItem, panel_place_menu_item, GTK_TYPE_IMAGE_MENU_ITEM)
diff --git a/clock-home.patch b/clock-home.patch
deleted file mode 100644
index a4a60e3..0000000
--- a/clock-home.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up gnome-panel-2.28.0/applets/clock/clock.schemas.in.clock-home
gnome-panel-2.28.0/applets/clock/clock.schemas.in
---- gnome-panel-2.28.0/applets/clock/clock.schemas.in.clock-home 2009-07-01
09:06:23.000000000 -0400
-+++ gnome-panel-2.28.0/applets/clock/clock.schemas.in 2009-10-07 22:36:12.298466938
-0400
-@@ -211,7 +211,7 @@
- <key>/schemas/apps/clock_applet/prefs/expand_locations</key>
- <owner>clock-applet</owner>
- <type>bool</type>
-- <default>false</default>
-+ <default>true</default>
- <locale name="C">
- <short>Expand list of locations</short>
- <long>
-@@ -271,7 +271,7 @@
- <owner>clock-applet</owner>
- <type>list</type>
- <list_type>string</list_type>
-- <default>[]</default>
-+ <default>[<location name=""
city="Boston" timezone="America/New_York"
latitude="42.360558" longitude="-71.010559"
code="KBOS" current="true"/>]</default>
- <locale name="C">
- <short>List of locations</short>
- <long>
diff --git a/clock-network.patch b/clock-network.patch
deleted file mode 100644
index db88b82..0000000
--- a/clock-network.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up gnome-panel-2.26.1/applets/clock/clock-location.c.network
gnome-panel-2.26.1/applets/clock/clock-location.c
---- gnome-panel-2.26.1/applets/clock/clock-location.c.network 2009-04-15
17:28:26.760634154 -0400
-+++ gnome-panel-2.26.1/applets/clock/clock-location.c 2009-04-15 17:43:41.869383882
-0400
-@@ -12,6 +12,9 @@
- #include <time.h>
- #include <unistd.h>
- #include <math.h>
-+#include <netinet/in.h>
-+#include <arpa/nameser.h>
-+#include <resolv.h>
-
- #include <glib.h>
- #include <gio/gio.h>
-@@ -695,6 +698,8 @@ state_notify (DBusPendingCall *pending,
- DBUS_TYPE_UINT32, &result,
- DBUS_TYPE_INVALID)) {
- if (result == NM_STATE_CONNECTED) {
-+ /* thank you, glibc */
-+ res_init ();
- update_weather_infos ();
- }
- }
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..ec43253
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Package is retired, replaced by the GNOME Classic session in F19
diff --git a/desktop-file-monitoring.patch b/desktop-file-monitoring.patch
deleted file mode 100644
index adfa5e2..0000000
--- a/desktop-file-monitoring.patch
+++ /dev/null
@@ -1,280 +0,0 @@
-diff -up gnome-panel-2.29.5.1/gnome-panel/launcher.c.desktop-file-monitoring
gnome-panel-2.29.5.1/gnome-panel/launcher.c
---- gnome-panel-2.29.5.1/gnome-panel/launcher.c.desktop-file-monitoring 2010-01-13
22:26:27.000000000 -0500
-+++ gnome-panel-2.29.5.1/gnome-panel/launcher.c 2010-01-17 18:06:14.640537280 -0500
-@@ -237,6 +237,8 @@ static void
- destroy_launcher (GtkWidget *widget,
- Launcher *launcher)
- {
-+ if (launcher->monitor)
-+ g_object_unref (launcher->monitor);
- launcher_properties_destroy (launcher);
- launcher_widget_destroy_open_dialogs (launcher);
- }
-@@ -410,6 +412,37 @@ drag_data_get_cb (GtkWidget *widg
-
- }
-
-+static void setup_button (Launcher *launcher);
-+
-+static void
-+desktop_file_changed (GFileMonitor *monitor,
-+ GFile *file,
-+ GFile *other_file,
-+ GFileMonitorEvent event_type,
-+ gpointer user_data)
-+{
-+ Launcher *launcher = user_data;
-+ GKeyFile *key_file;
-+
-+ if (event_type == G_FILE_MONITOR_EVENT_CHANGED ||
-+ event_type == G_FILE_MONITOR_EVENT_CREATED) {
-+ gchar *path;
-+
-+ path = g_file_get_path (file);
-+
-+ key_file = g_key_file_new ();
-+ if (g_key_file_load_from_file (key_file, path,
-+ G_KEY_FILE_KEEP_COMMENTS|G_KEY_FILE_KEEP_TRANSLATIONS,
-+ NULL)) {
-+ g_key_file_free (launcher->key_file);
-+ launcher->key_file = key_file;
-+ setup_button (launcher);
-+ }
-+
-+ g_free (path);
-+ }
-+}
-+
- static Launcher *
- create_launcher (const char *location)
- {
-@@ -482,6 +515,21 @@ create_launcher (const char *location)
- launcher->key_file = key_file;
- launcher->prop_dialog = NULL;
- launcher->destroy_handler = 0;
-+ launcher->monitor = NULL;
-+
-+ /* Watch for changes to the desktop file. Since we don't want
-+ * to do this for every launcher, we only do it if the desktop
-+ * file contains a X-Panel-Monitor entry.
-+ */
-+ if (g_key_file_get_boolean (key_file, "Desktop Entry",
"X-Panel-Monitor", NULL)) {
-+ GFile *file;
-+
-+ file = g_file_new_for_path (new_location);
-+ launcher->monitor = g_file_monitor_file (file, 0, NULL, NULL);
-+ g_signal_connect (launcher->monitor, "changed",
-+ G_CALLBACK (desktop_file_changed), launcher);
-+ g_object_unref (file);
-+ }
-
- /* Icon will be setup later */
- launcher->button = button_widget_new (NULL /* icon */,
-@@ -612,6 +660,15 @@ static void
- launcher_changed (PanelDItemEditor *dialog,
- Launcher *launcher)
- {
-+ /* If the user manually changes launcher properties,
-+ * we stop monitoring the desktop file to not overwrite
-+ * user changes.
-+ */
-+ if (launcher->monitor) {
-+ g_object_unref (launcher->monitor);
-+ launcher->monitor = NULL;
-+ }
-+
- /* Setup the button look */
- setup_button (launcher);
- }
-@@ -681,6 +738,42 @@ launcher_save_uri (PanelDItemEditor *dia
- return NULL;
- }
-
-+static const char *
-+desktop_file_to_monitor (PanelDItemEditor *editor)
-+{
-+ const char *entry;
-+ GKeyFile *key_file;
-+
-+ /* When the user selects a desktop file in the ditem editor,
-+ * start monitoring the desktop file for changes.
-+ */
-+ entry = panel_ditem_editor_get_orig_desktop_file (editor);
-+ if (entry) {
-+ key_file = g_key_file_new ();
-+ if (!g_key_file_load_from_file (key_file, entry, 0, NULL) ||
-+ !panel_key_file_get_boolean (key_file, "X-Panel-Monitor", FALSE))
-+ entry = NULL;
-+ g_key_file_free (key_file);
-+ }
-+
-+ return entry;
-+}
-+
-+static void
-+start_monitoring (Launcher *launcher)
-+{
-+ GFile *file;
-+
-+ file = g_file_new_for_path (launcher->location);
-+ if (launcher->monitor)
-+ g_object_unref (launcher->monitor);
-+ launcher->monitor = g_file_monitor_file (file, 0, NULL, NULL);
-+ g_signal_connect (launcher->monitor, "changed",
-+ G_CALLBACK (desktop_file_changed),
-+ launcher);
-+ g_object_unref (file);
-+}
-+
- static void
- launcher_saved (GtkWidget *dialog,
- Launcher *launcher)
-@@ -688,11 +781,15 @@ launcher_saved (GtkWidget *dialog,
- const char *uri;
- GConfClient *client;
- const char *key;
-+ const char *path;
-
- uri = panel_ditem_editor_get_uri (PANEL_DITEM_EDITOR (dialog));
- if (panel_launcher_get_filename (uri) != NULL)
- uri = panel_launcher_get_filename (uri);
-
-+ if ((path = desktop_file_to_monitor (PANEL_DITEM_EDITOR (dialog))) != NULL)
-+ uri = path;
-+
- if (uri && launcher->location && strcmp (uri,
launcher->location)) {
- client = panel_gconf_get_client ();
-
-@@ -705,6 +802,9 @@ launcher_saved (GtkWidget *dialog,
- if (launcher->location)
- g_free (launcher->location);
- launcher->location = g_strdup (uri);
-+
-+ if (path)
-+ start_monitoring (launcher);
- }
- }
-
-@@ -871,6 +971,7 @@ launcher_new_saved (GtkWidget *dialog,
- PanelWidget *panel;
- int pos;
- const char *uri;
-+ const char *path;
-
- pos = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (dialog), "pos"));
- panel = g_object_get_data (G_OBJECT (dialog), "panel");
-@@ -878,6 +979,10 @@ launcher_new_saved (GtkWidget *dialog,
- uri = panel_ditem_editor_get_uri (PANEL_DITEM_EDITOR (dialog));
- if (panel_launcher_get_filename (uri) != NULL)
- uri = panel_launcher_get_filename (uri);
-+
-+ if ((path = desktop_file_to_monitor (PANEL_DITEM_EDITOR (dialog))) != NULL)
-+ uri = path;
-+
- panel_launcher_create (panel->toplevel, pos, uri);
- }
-
-diff -up gnome-panel-2.29.5.1/gnome-panel/launcher.h.desktop-file-monitoring
gnome-panel-2.29.5.1/gnome-panel/launcher.h
---- gnome-panel-2.29.5.1/gnome-panel/launcher.h.desktop-file-monitoring 2009-04-19
13:45:09.000000000 -0400
-+++ gnome-panel-2.29.5.1/gnome-panel/launcher.h 2010-01-17 18:06:14.638537025 -0500
-@@ -27,6 +27,8 @@ typedef struct {
- GSList *error_dialogs;
-
- gulong destroy_handler;
-+
-+ GFileMonitor *monitor;
- } Launcher;
-
- void panel_launcher_create (PanelToplevel *toplevel,
-@@ -56,7 +58,6 @@ void launcher_load_from_gconf
- gint position,
- const char *id);
-
--void panel_launcher_delete (Launcher *launcher);
-
- void ask_about_launcher (const char *file,
- PanelWidget *panel,
-diff -up gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c.desktop-file-monitoring
gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c
----
gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c.desktop-file-monitoring 2010-01-17
18:06:14.635278719 -0500
-+++ gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c 2010-01-17 18:11:39.921279627
-0500
-@@ -81,6 +81,8 @@ struct _PanelDItemEditorPrivate
- GtkWidget *close_button;
- GtkWidget *cancel_button;
- GtkWidget *ok_button;
-+
-+ char *orig_desktop_file;
- };
-
- /* Time in seconds after which we save the file on the disk */
-@@ -366,6 +368,10 @@ panel_ditem_editor_destroy (GtkObject *o
- g_free (dialog->priv->uri);
- dialog->priv->uri = NULL;
-
-+ if (dialog->priv->orig_desktop_file != NULL)
-+ g_free (dialog->priv->orig_desktop_file);
-+ dialog->priv->orig_desktop_file = NULL;
-+
- GTK_OBJECT_CLASS (panel_ditem_editor_parent_class)->destroy (object);
- }
-
-@@ -833,6 +839,13 @@ panel_ditem_editor_changed (PanelDItemEd
- TRUE);
- }
-
-+ /* When the user changes any fields, unset the orig_desktop_file
-+ * field since the editor contents are not entirely from a desktop
-+ * file anymore.
-+ */
-+ g_free (dialog->priv->orig_desktop_file);
-+ dialog->priv->orig_desktop_file = NULL;
-+
- dialog->priv->dirty = TRUE;
- g_signal_emit (G_OBJECT (dialog), ditem_edit_signals[CHANGED], 0);
- }
-@@ -992,6 +1005,13 @@ update_editor_from_desktop_file (PanelDI
- */
- setup_icon_chooser (dialog, icon);
-
-+ /* We set the orig_desktop_file field to let the
-+ * launcher know that the editor contents are coming
-+ * directly from a desktop file.
-+ */
-+ g_free (dialog->priv->orig_desktop_file);
-+ dialog->priv->orig_desktop_file = g_strdup (uri);
-+
- g_free (name);
- g_free (comment);
- g_free (icon);
-@@ -1066,6 +1086,7 @@ update_chooser_for_type (PanelDItemEdito
- g_assert_not_reached ();
- }
-
-+
- chooser = dialog->priv->command_browse_filechooser;
-
- gtk_window_set_title (GTK_WINDOW (chooser),
-@@ -1849,3 +1870,12 @@ panel_ditem_register_save_uri_func (Pane
- dialog->priv->save_uri = save_uri;
- dialog->priv->save_uri_data = data;
- }
-+
-+G_CONST_RETURN char *
-+panel_ditem_editor_get_orig_desktop_file (PanelDItemEditor *dialog)
-+{
-+ g_return_val_if_fail (PANEL_IS_DITEM_EDITOR (dialog), NULL);
-+
-+ return dialog->priv->orig_desktop_file;
-+}
-+
-diff -up gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.h.desktop-file-monitoring
gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.h
----
gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.h.desktop-file-monitoring 2009-04-19
13:45:09.000000000 -0400
-+++ gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.h 2010-01-17 18:06:14.638537025
-0500
-@@ -101,6 +101,8 @@ void panel_ditem_editor_set_uri (PanelDI
- const char *uri);
-
- G_CONST_RETURN char *panel_ditem_editor_get_uri (PanelDItemEditor *dialog);
-+G_CONST_RETURN char *panel_ditem_editor_get_orig_desktop_file (PanelDItemEditor
*dialog);
-+
-
- void panel_ditem_register_save_uri_func (PanelDItemEditor *dialog,
- PanelDitemSaveUri save_uri,
diff --git a/drop-gweather-xml-include.patch b/drop-gweather-xml-include.patch
deleted file mode 100644
index 3b3a559..0000000
--- a/drop-gweather-xml-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- applets/clock/clock.c.orig 2012-12-25 14:38:00.101601746 -0600
-+++ applets/clock/clock.c 2012-12-25 14:38:30.331443803 -0600
-@@ -54,7 +54,6 @@
- #define GNOME_DESKTOP_USE_UNSTABLE_API
- #include <libgnome-desktop/gnome-wall-clock.h>
-
--#include <libgweather/gweather-xml.h>
- #include <libgweather/location-entry.h>
- #include <libgweather/timezone-menu.h>
- #include <libgweather/gweather-enum-types.h>
diff --git a/fix-clock-crash.patch b/fix-clock-crash.patch
deleted file mode 100644
index 4a12b60..0000000
--- a/fix-clock-crash.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 58d7ba0359ab128f30b39ea0518a69ed83a4e329 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode(a)redhat.com>
-Date: Tue, 8 Dec 2009 14:48:58 -0500
-Subject: [PATCH] Only call e_passwords_shutdown once
-
-It doesn't appear to support being called multiple times
-in a row.
-
-It appears there was already an attempt to do this with a
-reference counter called clock_numbers:
-
-/* Used to count the number of clock instances. It's there to know when
- * we should free resources that are shared. */
-static int clock_numbers = 0;
-
-But the logic was wrong.
----
- applets/clock/clock.c | 9 +++++++--
- 1 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/applets/clock/clock.c b/applets/clock/clock.c
-index ddbbc16..c06530a 100644
---- a/applets/clock/clock.c
-+++ b/applets/clock/clock.c
-@@ -803,8 +803,11 @@ destroy_clock (GtkWidget * widget, ClockData *cd)
-
- #ifdef HAVE_LIBECAL
- if (clock_numbers > 0) {
-- e_passwords_shutdown ();
- clock_numbers--;
-+
-+ if (clock_numbers == 0) {
-+ e_passwords_shutdown ();
-+ }
- }
- #endif
- }
-@@ -1385,8 +1388,10 @@ static void
- create_clock_widget (ClockData *cd)
- {
- #ifdef HAVE_LIBECAL
-+ if (clock_numbers == 0) {
-+ e_passwords_init ();
-+ }
- clock_numbers++;
-- e_passwords_init ();
- #endif
-
- /* Main toggle button */
---
-1.6.5.2
-
diff --git a/gnome-compiler-flags.m4 b/gnome-compiler-flags.m4
deleted file mode 100644
index 7368178..0000000
--- a/gnome-compiler-flags.m4
+++ /dev/null
@@ -1,141 +0,0 @@
-dnl GNOME_COMPILE_WARNINGS
-dnl Turn on many useful compiler warnings
-dnl For now, only works on GCC
-AC_DEFUN([GNOME_COMPILE_WARNINGS],[
- dnl ******************************
- dnl More compiler warnings
- dnl ******************************
-
- AC_ARG_ENABLE(compile-warnings,
-
AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
- [Turn on compiler warnings]),,
- [enable_compile_warnings="m4_default([$1],[yes])"])
-
- warnCFLAGS=
- if test "x$GCC" != xyes; then
- enable_compile_warnings=no
- fi
-
- warning_flags=
- realsave_CFLAGS="$CFLAGS"
-
- case "$enable_compile_warnings" in
- no)
- warning_flags=
- ;;
- minimum)
- warning_flags="-Wall"
- ;;
- yes)
- warning_flags="-Wall -Wmissing-prototypes"
- ;;
- maximum|error)
- warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
- CFLAGS="$warning_flags $CFLAGS"
- for option in -Wno-sign-compare; do
- SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $option"
- AC_MSG_CHECKING([whether gcc understands $option])
- AC_TRY_COMPILE([], [],
- has_option=yes,
- has_option=no,)
- CFLAGS="$SAVE_CFLAGS"
- AC_MSG_RESULT($has_option)
- if test $has_option = yes; then
- warning_flags="$warning_flags $option"
- fi
- unset has_option
- unset SAVE_CFLAGS
- done
- unset option
- if test "$enable_compile_warnings" = "error" ; then
- warning_flags="$warning_flags -Werror"
- fi
- ;;
- *)
- AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to
--enable-compile-warnings)
- ;;
- esac
- CFLAGS="$realsave_CFLAGS"
- AC_MSG_CHECKING(what warning flags to pass to the C compiler)
- AC_MSG_RESULT($warning_flags)
-
- AC_ARG_ENABLE(iso-c,
- AC_HELP_STRING([--enable-iso-c],
- [Try to warn if code is not ISO C ]),,
- [enable_iso_c=no])
-
- AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
- complCFLAGS=
- if test "x$enable_iso_c" != "xno"; then
- if test "x$GCC" = "xyes"; then
- case " $CFLAGS " in
- *[\ \ ]-ansi[\ \ ]*) ;;
- *) complCFLAGS="$complCFLAGS -ansi" ;;
- esac
- case " $CFLAGS " in
- *[\ \ ]-pedantic[\ \ ]*) ;;
- *) complCFLAGS="$complCFLAGS -pedantic" ;;
- esac
- fi
- fi
- AC_MSG_RESULT($complCFLAGS)
-
- WARN_CFLAGS="$warning_flags $complCFLAGS"
- AC_SUBST(WARN_CFLAGS)
-])
-
-dnl For C++, do basically the same thing.
-
-AC_DEFUN([GNOME_CXX_WARNINGS],[
- AC_ARG_ENABLE(cxx-warnings,
- AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
- [Turn on compiler warnings.]),,
- [enable_cxx_warnings="m4_default([$1],[minimum])"])
-
- AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
- warnCXXFLAGS=
- if test "x$GCC" != xyes; then
- enable_compile_warnings=no
- fi
- if test "x$enable_cxx_warnings" != "xno"; then
- if test "x$GCC" = "xyes"; then
- case " $CXXFLAGS " in
- *[\ \ ]-Wall[\ \ ]*) ;;
- *) warnCXXFLAGS="-Wall -Wno-unused" ;;
- esac
-
- ## -W is not all that useful. And it cannot be controlled
- ## with individual -Wno-xxx flags, unlike -Wall
- if test "x$enable_cxx_warnings" = "xyes"; then
- warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
- fi
- fi
- fi
- AC_MSG_RESULT($warnCXXFLAGS)
-
- AC_ARG_ENABLE(iso-cxx,
- AC_HELP_STRING([--enable-iso-cxx],
- [Try to warn if code is not ISO C++ ]),,
- [enable_iso_cxx=no])
-
- AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
- complCXXFLAGS=
- if test "x$enable_iso_cxx" != "xno"; then
- if test "x$GCC" = "xyes"; then
- case " $CXXFLAGS " in
- *[\ \ ]-ansi[\ \ ]*) ;;
- *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
- esac
-
- case " $CXXFLAGS " in
- *[\ \ ]-pedantic[\ \ ]*) ;;
- *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
- esac
- fi
- fi
- AC_MSG_RESULT($complCXXFLAGS)
-
- WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
- AC_SUBST(WARN_CXXFLAGS)
-])
diff --git a/gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch
b/gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch
deleted file mode 100644
index 3188df4..0000000
--- a/gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch
+++ /dev/null
@@ -1,11 +0,0 @@
----
gnome-panel-2.10.1/applets/fish/fish.schemas.in.speak-to-us-ye-old-wise-fish 2005-04-25
06:52:48.000000000 -0400
-+++ gnome-panel-2.10.1/applets/fish/fish.schemas.in 2005-04-25 06:53:13.000000000 -0400
-@@ -34,7 +34,7 @@
- <key>/schemas/apps/fish_applet/prefs/command</key>
- <owner>fish-applet</owner>
- <type>string</type>
-- <default>fortune</default>
-+ <default>ddate</default>
- <locale name="C">
- <short>Command to execute on click</short>
- <long>
diff --git a/gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
b/gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
deleted file mode 100644
index 8032a80..0000000
--- a/gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -up
gnome-panel-2.21.92/applets/clock/calendar-client.c.allow-spurious-view-done-signals
gnome-panel-2.21.92/applets/clock/calendar-client.c
----
gnome-panel-2.21.92/applets/clock/calendar-client.c.allow-spurious-view-done-signals 2008-02-26
08:17:49.000000000 -0500
-+++ gnome-panel-2.21.92/applets/clock/calendar-client.c 2008-03-03 10:22:57.000000000
-0500
-@@ -1217,6 +1217,13 @@ calendar_client_handle_query_completed (
- {
- CalendarClientQuery *query;
-
-+ if (!source->query_in_progress)
-+ {
-+ g_warning ("Got spurious 'view-done' signal from calendar backend for
query %p\n",
-+ &source->completed_query);
-+ return;
-+ }
-+
- query = goddamn_this_is_crack (source, view, NULL);
-
- dprintf ("Query %p completed: %s\n", query, e_cal_get_error_message
(status));
diff --git a/gnome-panel-about.patch b/gnome-panel-about.patch
deleted file mode 100644
index 3b31508..0000000
--- a/gnome-panel-about.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up gnome-panel-2.27.91/gnome-panel/panel-menu-items.c.about
gnome-panel-2.27.91/gnome-panel/panel-menu-items.c
---- gnome-panel-2.27.91/gnome-panel/panel-menu-items.c.about 2009-08-25
13:32:12.101272238 -0400
-+++ gnome-panel-2.27.91/gnome-panel/panel-menu-items.c 2009-08-25 14:08:21.444015913
-0400
-@@ -1170,7 +1170,8 @@ panel_desktop_menu_item_append_menu (Gtk
- add_menu_separator (menu);
-
- panel_menu_items_append_from_desktop (menu, "gnome-yelp.desktop", NULL,
FALSE);
-- panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL,
FALSE);
-+ if (panel_has_desktop_file ("about-this-computer.desktop"))
-+ panel_menu_items_append_from_desktop (menu, "about-this-computer.desktop",
NULL, FALSE);
-
- if (parent->priv->append_lock_logout)
- panel_menu_items_append_lock_logout (menu);
diff --git a/gnome-panel-libs.patch b/gnome-panel-libs.patch
deleted file mode 100644
index f02dd49..0000000
--- a/gnome-panel-libs.patch
+++ /dev/null
@@ -1,555 +0,0 @@
-diff -up gnome-panel-2.91.6/applets/clock/.libs gnome-panel-2.91.6/applets/clock/
-Only in gnome-panel-2.91.6/applets/clock/: calendar-client.c
-Only in gnome-panel-2.91.6/applets/clock/:
calendar-client.c.allow-spurious-view-done-signals
-Only in gnome-panel-2.91.6/applets/clock/: calendar-client.h
-Only in gnome-panel-2.91.6/applets/clock/: calendar-debug.h
-Only in gnome-panel-2.91.6/applets/clock/: calendar-sources.c
-Only in gnome-panel-2.91.6/applets/clock/: calendar-sources.h
-Only in gnome-panel-2.91.6/applets/clock/: calendar-window.c
-Only in gnome-panel-2.91.6/applets/clock/: calendar-window.h
-Binary files gnome-panel-2.91.6/applets/clock/.libs/clock-applet and
gnome-panel-2.91.6/applets/clock/clock-applet differ
-Only in gnome-panel-2.91.6/applets/clock/: clock_applet-calendar-client.o
-Only in gnome-panel-2.91.6/applets/clock/: clock_applet-calendar-sources.o
-Only in gnome-panel-2.91.6/applets/clock/: clock_applet-calendar-window.o
-Only in gnome-panel-2.91.6/applets/clock/: clock_applet-clock-face.o
-Only in gnome-panel-2.91.6/applets/clock/: clock_applet-clock-location.o
-Only in gnome-panel-2.91.6/applets/clock/: clock_applet-clock-location-tile.o
-Only in gnome-panel-2.91.6/applets/clock/: clock_applet-clock-map.o
-Only in gnome-panel-2.91.6/applets/clock/: clock_applet-clock-marshallers.o
-Only in gnome-panel-2.91.6/applets/clock/: clock_applet-clock.o
-Only in gnome-panel-2.91.6/applets/clock/: clock_applet-clock-sunpos.o
-Only in gnome-panel-2.91.6/applets/clock/: clock_applet-clock-typebuiltins.o
-Only in gnome-panel-2.91.6/applets/clock/: clock_applet-clock-utils.o
-Only in gnome-panel-2.91.6/applets/clock/: clock_applet-set-timezone.o
-Only in gnome-panel-2.91.6/applets/clock/: clock.c
-Only in gnome-panel-2.91.6/applets/clock/: clock.c.fix-clock-crash
-Only in gnome-panel-2.91.6/applets/clock/: clock-face.c
-Only in gnome-panel-2.91.6/applets/clock/: clock-face.h
-Only in gnome-panel-2.91.6/applets/clock/: clock.h
-Only in gnome-panel-2.91.6/applets/clock/: clock-location.c
-Only in gnome-panel-2.91.6/applets/clock/: clock-location.c.clock-network
-Only in gnome-panel-2.91.6/applets/clock/: clock-location.h
-Only in gnome-panel-2.91.6/applets/clock/: clock-location-tile.c
-Only in gnome-panel-2.91.6/applets/clock/: clock-location-tile.h
-Only in gnome-panel-2.91.6/applets/clock/: clock-map.c
-Only in gnome-panel-2.91.6/applets/clock/: clock-map.h
-Only in gnome-panel-2.91.6/applets/clock/: clock-marshallers.c
-Only in gnome-panel-2.91.6/applets/clock/: clock-marshallers.h
-Only in gnome-panel-2.91.6/applets/clock/: clock-marshallers.list
-Only in gnome-panel-2.91.6/applets/clock/: clock-menu.xml
-Only in gnome-panel-2.91.6/applets/clock/: clock.schemas
-Only in gnome-panel-2.91.6/applets/clock/: clock.schemas.in
-Only in gnome-panel-2.91.6/applets/clock/: clock.schemas.in.clock-home
-Only in gnome-panel-2.91.6/applets/clock/: clock-sunpos.c
-Only in gnome-panel-2.91.6/applets/clock/: clock-sunpos.h
-Only in gnome-panel-2.91.6/applets/clock/: clock-typebuiltins.c
-Only in gnome-panel-2.91.6/applets/clock/: clock-typebuiltins.h
-Only in gnome-panel-2.91.6/applets/clock/: clock.ui
-Only in gnome-panel-2.91.6/applets/clock/: clock-utils.c
-Only in gnome-panel-2.91.6/applets/clock/: clock-utils.h
-Only in gnome-panel-2.91.6/applets/clock/: .libs
-Only in gnome-panel-2.91.6/applets/clock/.libs: libsystem-timezone.a
-Only in gnome-panel-2.91.6/applets/clock/: Makefile
-Only in gnome-panel-2.91.6/applets/clock/: Makefile.am
-Only in gnome-panel-2.91.6/applets/clock/: Makefile.in
-Only in gnome-panel-2.91.6/applets/clock/:
org.gnome.panel.applet.ClockAppletFactory.service
-Only in gnome-panel-2.91.6/applets/clock/:
org.gnome.panel.applet.ClockAppletFactory.service.in
-Only in gnome-panel-2.91.6/applets/clock/: org.gnome.panel.ClockApplet.panel-applet
-Only in gnome-panel-2.91.6/applets/clock/: org.gnome.panel.ClockApplet.panel-applet.in
-Only in gnome-panel-2.91.6/applets/clock/:
org.gnome.panel.ClockApplet.panel-applet.in.in
-Only in gnome-panel-2.91.6/applets/clock/: pixmaps
-Only in gnome-panel-2.91.6/applets/clock/: set-timezone.c
-Only in gnome-panel-2.91.6/applets/clock/: set-timezone.h
-Only in gnome-panel-2.91.6/applets/clock/: system-timezone.c
-Only in gnome-panel-2.91.6/applets/clock/: system-timezone.h
-Only in gnome-panel-2.91.6/applets/clock/: system-timezone.lo
-Binary files gnome-panel-2.91.6/applets/clock/.libs/system-timezone.o and
gnome-panel-2.91.6/applets/clock/system-timezone.o differ
-Only in gnome-panel-2.91.6/applets/clock/: test-system-timezone
-Only in gnome-panel-2.91.6/applets/clock/: test-system-timezone.c
-Only in gnome-panel-2.91.6/applets/clock/: test-system-timezone.o
-diff -up gnome-panel-2.91.6/applets/fish/.libs gnome-panel-2.91.6/applets/fish/
-Only in gnome-panel-2.91.6/applets/fish/: fishanim.png
-Binary files gnome-panel-2.91.6/applets/fish/.libs/fish-applet and
gnome-panel-2.91.6/applets/fish/fish-applet differ
-Only in gnome-panel-2.91.6/applets/fish/: fish_applet-fish.o
-Only in gnome-panel-2.91.6/applets/fish/: fish.c
-Only in gnome-panel-2.91.6/applets/fish/: fish-menu.xml
-Only in gnome-panel-2.91.6/applets/fish/: fish.schemas
-Only in gnome-panel-2.91.6/applets/fish/: fish.schemas.in
-Only in gnome-panel-2.91.6/applets/fish/: fish.schemas.in.speak-to-us-ye-old-wise-fish
-Only in gnome-panel-2.91.6/applets/fish/: fish.ui
-Only in gnome-panel-2.91.6/applets/fish/: footguy.png
-Only in gnome-panel-2.91.6/applets/fish/: .libs
-Only in gnome-panel-2.91.6/applets/fish/: Makefile
-Only in gnome-panel-2.91.6/applets/fish/: Makefile.am
-Only in gnome-panel-2.91.6/applets/fish/: Makefile.in
-Only in gnome-panel-2.91.6/applets/fish/: monkey.png
-Only in gnome-panel-2.91.6/applets/fish/: oldwanda.png
-Only in gnome-panel-2.91.6/applets/fish/:
org.gnome.panel.applet.FishAppletFactory.service
-Only in gnome-panel-2.91.6/applets/fish/:
org.gnome.panel.applet.FishAppletFactory.service.in
-Only in gnome-panel-2.91.6/applets/fish/: org.gnome.panel.FishApplet.panel-applet
-Only in gnome-panel-2.91.6/applets/fish/: org.gnome.panel.FishApplet.panel-applet.in
-Only in gnome-panel-2.91.6/applets/fish/: org.gnome.panel.FishApplet.panel-applet.in.in
-Only in gnome-panel-2.91.6/applets/fish/: wanda.png
-Only in gnome-panel-2.91.6/applets/fish/: wanda.svg
-diff -up gnome-panel-2.91.6/applets/notification_area/.libs
gnome-panel-2.91.6/applets/notification_area/
-Only in gnome-panel-2.91.6/applets/notification_area/: fixedtip.c
-Only in gnome-panel-2.91.6/applets/notification_area/: fixedtip.h
-Only in gnome-panel-2.91.6/applets/notification_area/: fixedtip.lo
-Binary files gnome-panel-2.91.6/applets/notification_area/.libs/fixedtip.o and
gnome-panel-2.91.6/applets/notification_area/fixedtip.o differ
-Only in gnome-panel-2.91.6/applets/notification_area/: .libs
-Only in gnome-panel-2.91.6/applets/notification_area/.libs: libtray.a
-Only in gnome-panel-2.91.6/applets/notification_area/: main.c
-Only in gnome-panel-2.91.6/applets/notification_area/: Makefile
-Only in gnome-panel-2.91.6/applets/notification_area/: Makefile.am
-Only in gnome-panel-2.91.6/applets/notification_area/: Makefile.am.libs
-Only in gnome-panel-2.91.6/applets/notification_area/: Makefile.in
-Only in gnome-panel-2.91.6/applets/notification_area/: na-marshal.c
-Only in gnome-panel-2.91.6/applets/notification_area/: na-marshal.h
-Only in gnome-panel-2.91.6/applets/notification_area/: na-marshal.list
-Only in gnome-panel-2.91.6/applets/notification_area/: na-marshal.lo
-Binary files gnome-panel-2.91.6/applets/notification_area/.libs/na-marshal.o and
gnome-panel-2.91.6/applets/notification_area/na-marshal.o differ
-Only in gnome-panel-2.91.6/applets/notification_area/: na-tray.c
-Only in gnome-panel-2.91.6/applets/notification_area/: na-tray-child.c
-Only in gnome-panel-2.91.6/applets/notification_area/: na-tray-child.h
-Only in gnome-panel-2.91.6/applets/notification_area/: na-tray-child.lo
-Binary files gnome-panel-2.91.6/applets/notification_area/.libs/na-tray-child.o and
gnome-panel-2.91.6/applets/notification_area/na-tray-child.o differ
-Only in gnome-panel-2.91.6/applets/notification_area/: na-tray.h
-Only in gnome-panel-2.91.6/applets/notification_area/: na-tray.lo
-Only in gnome-panel-2.91.6/applets/notification_area/: na-tray-manager.c
-Only in gnome-panel-2.91.6/applets/notification_area/: na-tray-manager.h
-Only in gnome-panel-2.91.6/applets/notification_area/: na-tray-manager.lo
-Binary files gnome-panel-2.91.6/applets/notification_area/.libs/na-tray-manager.o and
gnome-panel-2.91.6/applets/notification_area/na-tray-manager.o differ
-Binary files gnome-panel-2.91.6/applets/notification_area/.libs/na-tray.o and
gnome-panel-2.91.6/applets/notification_area/na-tray.o differ
-Only in gnome-panel-2.91.6/applets/notification_area/: notification_area_applet-main.o
-Only in gnome-panel-2.91.6/applets/notification_area/: notification-area-menu.xml
-Only in gnome-panel-2.91.6/applets/notification_area/:
org.gnome.panel.applet.NotificationAreaAppletFactory.service
-Only in gnome-panel-2.91.6/applets/notification_area/:
org.gnome.panel.applet.NotificationAreaAppletFactory.service.in
-Only in gnome-panel-2.91.6/applets/notification_area/:
org.gnome.panel.NotificationAreaApplet.panel-applet
-Only in gnome-panel-2.91.6/applets/notification_area/:
org.gnome.panel.NotificationAreaApplet.panel-applet.in
-Only in gnome-panel-2.91.6/applets/notification_area/:
org.gnome.panel.NotificationAreaApplet.panel-applet.in.in
-Only in gnome-panel-2.91.6/applets/notification_area/: testtray.c
-Only in gnome-panel-2.91.6/applets/notification_area/: testtray.o
-diff -up gnome-panel-2.91.6/applets/notification_area/Makefile.am.libs
gnome-panel-2.91.6/applets/notification_area/Makefile.am
---- gnome-panel-2.91.6/applets/notification_area/Makefile.am.libs 2011-01-31
18:52:27.000000000 -0500
-+++ gnome-panel-2.91.6/applets/notification_area/Makefile.am 2011-02-02
19:45:49.002989988 -0500
-@@ -29,8 +29,8 @@ libtray_la_SOURCES = \
- NOTIFICATION_AREA_SOURCES = main.c
-
- NOTIFICATION_AREA_LDADD = \
-- ../../libpanel-applet/libpanel-applet-4.la \
- $(X_LIBS) \
-+ ../../libpanel-applet/libpanel-applet-4.la \
- $(NOTIFICATION_AREA_LIBS) \
- $(LIBPANEL_APPLET_LIBS) \
- libtray.la
-diff -up gnome-panel-2.91.6/configure.ac.libs gnome-panel-2.91.6/configure.ac
---- gnome-panel-2.91.6/configure.ac.libs 2011-02-01 20:43:03.000000000 -0500
-+++ gnome-panel-2.91.6/configure.ac 2011-02-02 19:45:49.003990000 -0500
-@@ -83,7 +83,7 @@ PKG_CHECK_MODULES(PANEL, gdk-pixbuf-2.0
- AC_SUBST(PANEL_CFLAGS)
- AC_SUBST(PANEL_LIBS)
-
--PKG_CHECK_MODULES(LIBPANEL_APPLET, gtk+-3.0 >= $GTK_REQUIRED cairo-xlib cairo-gobject
gconf-2.0 >= $GCONF_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >=
$GLIB_REQUIRED)
-+PKG_CHECK_MODULES(LIBPANEL_APPLET, gdk-x11-3.0 >= $GTK_REQUIRED gdk-3.0 >=
$GTK_REQUIRED gtk+-x11-3.0 >= $GTK_REQUIRED gtk+-3.0 >= $GTK_REQUIRED cairo-xlib
cairo-gobject gconf-2.0 >= $GCONF_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0
>= $GLIB_REQUIRED)
- AC_SUBST(LIBPANEL_APPLET_CFLAGS)
- AC_SUBST(LIBPANEL_APPLET_LIBS)
-
-@@ -91,11 +91,11 @@ PKG_CHECK_MODULES(FISH, gtk+-3.0 >= $GTK
- AC_SUBST(FISH_CFLAGS)
- AC_SUBST(FISH_LIBS)
-
--PKG_CHECK_MODULES(NOTIFICATION_AREA, gtk+-3.0 >= $GTK_REQUIRED)
-+PKG_CHECK_MODULES(NOTIFICATION_AREA, gdk-x11-3.0 >= $GTK_REQUIRED gdk-3.0 >=
$GTK_REQUIRED gtk+-x11-3.0 >= $GTK_REQUIRED gtk+-3.0 >= $GTK_REQUIRED)
- AC_SUBST(NOTIFICATION_AREA_CFLAGS)
- AC_SUBST(NOTIFICATION_AREA_LIBS)
-
--PKG_CHECK_MODULES(WNCKLET, gtk+-3.0 >= $GTK_REQUIRED libwnck-3.0 >=
$LIBWNCK_REQUIRED)
-+PKG_CHECK_MODULES(WNCKLET, gdk-x11-3.0 >= $GTK_REQUIRED gdk-3.0 >= $GTK_REQUIRED
gtk+-x11-3.0 >= $GTK_REQUIRED gtk+-3.0 >= $GTK_REQUIRED libwnck-3.0 >=
$LIBWNCK_REQUIRED)
- AC_SUBST(WNCKLET_CFLAGS)
- AC_SUBST(WNCKLET_LIBS)
-
-@@ -242,10 +242,15 @@ AC_SUBST(X_LIBS)
-
- dnl X RANDR extension
-
--PKG_CHECK_MODULES(XRANDR, xrandr >= 1.2.0, have_randr=yes, have_randr=no)
--if test "x$have_randr" = "xyes"; then
-+PKG_CHECK_MODULES(XRANDR, xrandr >= 1.2.0, [
- AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library])
--fi
-+ have_randr=yes
-+ X_LIBS="$X_LIBS $XRANDR_LIBS"
-+], [
-+ have_randr=no
-+])
-+
-+AC_SUBST(X_LIBS)
-
- dnl Modules dir
- AC_SUBST([modulesdir],"\$(libdir)/gnome-panel/modules")
-diff -up gnome-panel-2.91.6/gnome-panel/libegg/.libs
gnome-panel-2.91.6/gnome-panel/libegg/
-Only in gnome-panel-2.91.6/gnome-panel/libegg/: eggdesktopfile.c
-Only in gnome-panel-2.91.6/gnome-panel/libegg/: eggdesktopfile.h
-Only in gnome-panel-2.91.6/gnome-panel/libegg/: eggdesktopfile.lo
-Binary files gnome-panel-2.91.6/gnome-panel/libegg/.libs/eggdesktopfile.o and
gnome-panel-2.91.6/gnome-panel/libegg/eggdesktopfile.o differ
-Only in gnome-panel-2.91.6/gnome-panel/libegg/: eggsmclient.c
-Only in gnome-panel-2.91.6/gnome-panel/libegg/: eggsmclient.h
-Only in gnome-panel-2.91.6/gnome-panel/libegg/: eggsmclient.lo
-Binary files gnome-panel-2.91.6/gnome-panel/libegg/.libs/eggsmclient.o and
gnome-panel-2.91.6/gnome-panel/libegg/eggsmclient.o differ
-Only in gnome-panel-2.91.6/gnome-panel/libegg/: eggsmclient-private.h
-Only in gnome-panel-2.91.6/gnome-panel/libegg/: eggsmclient-xsmp.c
-Only in gnome-panel-2.91.6/gnome-panel/libegg/: eggsmclient-xsmp.lo
-Binary files gnome-panel-2.91.6/gnome-panel/libegg/.libs/eggsmclient-xsmp.o and
gnome-panel-2.91.6/gnome-panel/libegg/eggsmclient-xsmp.o differ
-Only in gnome-panel-2.91.6/gnome-panel/libegg/.libs: libegg.a
-Only in gnome-panel-2.91.6/gnome-panel/libegg/: .libs
-Only in gnome-panel-2.91.6/gnome-panel/libegg/: Makefile
-Only in gnome-panel-2.91.6/gnome-panel/libegg/: Makefile.am
-Only in gnome-panel-2.91.6/gnome-panel/libegg/: Makefile.in
-diff -up gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/.libs
gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/.libs:
libpanel-applet-private.a
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/.libs:
libpanel-applet-private-mini.a
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/: .libs
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/: Makefile
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/: Makefile.am
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/: Makefile.in
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/:
panel-applet-container.c
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/:
panel-applet-container.h
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/:
panel-applet-container.lo
-Binary files
gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/.libs/panel-applet-container.o and
gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/panel-applet-container.o differ
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/:
panel-applet-frame-dbus.c
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/:
panel-applet-frame-dbus.h
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/:
panel-applet-frame-dbus.lo
-Binary files
gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/.libs/panel-applet-frame-dbus.o and
gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/panel-applet-frame-dbus.o differ
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/: panel-applet-mini.c
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/: panel-applet-mini.lo
-Binary files
gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/.libs/panel-applet-mini.o and
gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/panel-applet-mini.o differ
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/:
panel-applets-manager-dbus.c
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/:
panel-applets-manager-dbus.h
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/:
panel-applets-manager-dbus.lo
-Binary files
gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/.libs/panel-applets-manager-dbus.o
and gnome-panel-2.91.6/gnome-panel/libpanel-applet-private/panel-applets-manager-dbus.o
differ
-diff -up gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs
gnome-panel-2.91.6/gnome-panel/libpanel-util/
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs: libpanel-util.a
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: .libs
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: Makefile
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: Makefile.am
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: Makefile.in
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-cleanup.c
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-cleanup.h
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-cleanup.lo
-Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-cleanup.o and
gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-cleanup.o differ
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-dbus-service.c
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-dbus-service.h
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-dbus-service.lo
-Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-dbus-service.o and
gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-dbus-service.o differ
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-error.c
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-error.h
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-error.lo
-Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-error.o and
gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-error.o differ
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-glib.c
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-glib.h
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-glib.lo
-Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-glib.o and
gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-glib.o differ
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-gtk.c
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-gtk.h
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-gtk.lo
-Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-gtk.o and
gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-gtk.o differ
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-icon-chooser.c
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-icon-chooser.h
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-icon-chooser.lo
-Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-icon-chooser.o and
gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-icon-chooser.o differ
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-keyfile.c
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-keyfile.h
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-keyfile.lo
-Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-keyfile.o and
gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-keyfile.o differ
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-launch.c
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-launch.h
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-launch.lo
-Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-launch.o and
gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-launch.o differ
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-list.c
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-list.h
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-list.lo
-Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-list.o and
gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-list.o differ
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-session-manager.c
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-session-manager.h
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-session-manager.lo
-Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-session-manager.o
and gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-session-manager.o differ
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-show.c
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-show.h
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-show.lo
-Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-show.o and
gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-show.o differ
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-xdg.c
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-xdg.h
-Only in gnome-panel-2.91.6/gnome-panel/libpanel-util/: panel-xdg.lo
-Binary files gnome-panel-2.91.6/gnome-panel/libpanel-util/.libs/panel-xdg.o and
gnome-panel-2.91.6/gnome-panel/libpanel-util/panel-xdg.o differ
-diff -up gnome-panel-2.91.6/gnome-panel/.libs gnome-panel-2.91.6/gnome-panel/
-Only in gnome-panel-2.91.6/gnome-panel/: applet.c
-Only in gnome-panel-2.91.6/gnome-panel/: applet.h
-Only in gnome-panel-2.91.6/gnome-panel/: button-widget.c
-Only in gnome-panel-2.91.6/gnome-panel/: button-widget.h
-Only in gnome-panel-2.91.6/gnome-panel/: drawer.c
-Only in gnome-panel-2.91.6/gnome-panel/: drawer.h
-Only in gnome-panel-2.91.6/gnome-panel/: gnome-desktop-item-edit
-Only in gnome-panel-2.91.6/gnome-panel/: gnome-desktop-item-edit.c
-Only in gnome-panel-2.91.6/gnome-panel/: gnome-desktop-item-edit.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome-panel
-Only in gnome-panel-2.91.6/gnome-panel/: gnome-panel-add
-Only in gnome-panel-2.91.6/gnome-panel/: gnome-panel-add.in
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-applet.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-button-widget.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome-panel.desktop
-Only in gnome-panel-2.91.6/gnome-panel/: gnome-panel.desktop.in
-Only in gnome-panel-2.91.6/gnome-panel/: gnome-panel.desktop.in.in
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-drawer.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-launcher.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-main.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-menu.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-a11y.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-action-button.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-action-protocol.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-addto.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-applet-frame.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-applet-info.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-applets-manager.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-background-monitor.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-background.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-bindings.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-compatibility.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-config-global.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-context-menu.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-ditem-editor.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-force-quit.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-frame.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-gconf.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-lockdown.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-marshal.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-menu-bar.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-menu-button.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-menu-items.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-modules.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-multiscreen.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-profile.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-properties-dialog.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-recent.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-run-dialog.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-separator.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-session.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-shell.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-stock-icons.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-struts.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-toplevel.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-typebuiltins.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-util.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-widget.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-panel-xutils.o
-Only in gnome-panel-2.91.6/gnome-panel/: gnome_panel-xstuff.o
-Only in gnome-panel-2.91.6/gnome-panel/: launcher.c
-Only in gnome-panel-2.91.6/gnome-panel/: launcher.c.preferred-apps
-Only in gnome-panel-2.91.6/gnome-panel/: launcher.h
-Only in gnome-panel-2.91.6/gnome-panel/: launcher.h.preferred-apps
-Only in gnome-panel-2.91.6/gnome-panel/: libegg
-Only in gnome-panel-2.91.6/gnome-panel/: libpanel-applet-private
-Only in gnome-panel-2.91.6/gnome-panel/: libpanel-util
-Only in gnome-panel-2.91.6/gnome-panel/: .libs
-Only in gnome-panel-2.91.6/gnome-panel/: main.c
-Only in gnome-panel-2.91.6/gnome-panel/: main.c.preferred-apps
-Only in gnome-panel-2.91.6/gnome-panel/: Makefile
-Only in gnome-panel-2.91.6/gnome-panel/: Makefile.am
-Only in gnome-panel-2.91.6/gnome-panel/: Makefile.am.libs
-Only in gnome-panel-2.91.6/gnome-panel/: Makefile.in
-Only in gnome-panel-2.91.6/gnome-panel/: menu.c
-Only in gnome-panel-2.91.6/gnome-panel/: menu.h
-Only in gnome-panel-2.91.6/gnome-panel/: nothing.cP
-Only in gnome-panel-2.91.6/gnome-panel/: nothing.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-a11y.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-a11y.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-action-button.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-action-button.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-action-protocol.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-action-protocol.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-addto.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-addto.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-applet-frame.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-applet-frame.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-applet-info.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-applet-info.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-applets-manager.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-applets-manager.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-background.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-background.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-background-monitor.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-background-monitor.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-bindings.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-bindings.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-compatibility.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-compatibility.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-compatibility.schemas
-Only in gnome-panel-2.91.6/gnome-panel/: panel-config-global.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-config-global.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-context-menu.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-context-menu.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-default-setup.entries
-Only in gnome-panel-2.91.6/gnome-panel/: panel-ditem-editor.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-ditem-editor.c.launcher-desktop-files
-Only in gnome-panel-2.91.6/gnome-panel/: panel-ditem-editor.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-ditem-editor.o
-Only in gnome-panel-2.91.6/gnome-panel/: panel-enums.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-force-quit.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-force-quit.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-frame.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-frame.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-gconf.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-gconf.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-general.schemas
-Only in gnome-panel-2.91.6/gnome-panel/: panel-general.schemas.in
-Only in gnome-panel-2.91.6/gnome-panel/: panel-global.schemas
-Only in gnome-panel-2.91.6/gnome-panel/: panel-global.schemas.in
-Only in gnome-panel-2.91.6/gnome-panel/: panel-globals.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-icon-names.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-lockdown.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-lockdown.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-marshal.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-marshal.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-marshal.list
-Only in gnome-panel-2.91.6/gnome-panel/: panel-marshal.o
-Only in gnome-panel-2.91.6/gnome-panel/: panel-menu-bar.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-menu-bar.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-menu-button.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-menu-button.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-menu-items.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-menu-items.c.bookmarks-submenu
-Only in gnome-panel-2.91.6/gnome-panel/: panel-menu-items.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-modules.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-modules.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-multiscreen.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-multiscreen.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-object.schemas
-Only in gnome-panel-2.91.6/gnome-panel/: panel-object.schemas.in
-Only in gnome-panel-2.91.6/gnome-panel/: panel-profile.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-profile.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-properties-dialog.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-properties-dialog.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-properties-dialog.ui
-Only in gnome-panel-2.91.6/gnome-panel/: panel-recent.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-recent.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-run-dialog.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-run-dialog.c.preferred-apps
-Only in gnome-panel-2.91.6/gnome-panel/: panel-run-dialog.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-run-dialog.h.preferred-apps
-Only in gnome-panel-2.91.6/gnome-panel/: panel-run-dialog.ui
-Only in gnome-panel-2.91.6/gnome-panel/: panel-separator.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-separator.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-session.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-session.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-shell.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-shell.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-stock-icons.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-stock-icons.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-struts.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-struts.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-test-applets
-Only in gnome-panel-2.91.6/gnome-panel/: panel-test-applets.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel_test_applets-panel-applet-info.o
-Only in gnome-panel-2.91.6/gnome-panel/: panel_test_applets-panel-applets-manager.o
-Only in gnome-panel-2.91.6/gnome-panel/: panel_test_applets-panel-marshal.o
-Only in gnome-panel-2.91.6/gnome-panel/: panel_test_applets-panel-modules.o
-Only in gnome-panel-2.91.6/gnome-panel/: panel_test_applets-panel-test-applets.o
-Only in gnome-panel-2.91.6/gnome-panel/: panel-test-applets.ui
-Only in gnome-panel-2.91.6/gnome-panel/: panel-toplevel.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-toplevel.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-toplevel.schemas
-Only in gnome-panel-2.91.6/gnome-panel/: panel-toplevel.schemas.in
-Only in gnome-panel-2.91.6/gnome-panel/: panel-typebuiltins.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-typebuiltins.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-types.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-util.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-util.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-util.o
-Only in gnome-panel-2.91.6/gnome-panel/: panel-widget.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-widget.h
-Only in gnome-panel-2.91.6/gnome-panel/: panel-xutils.c
-Only in gnome-panel-2.91.6/gnome-panel/: panel-xutils.h
-Only in gnome-panel-2.91.6/gnome-panel/: xstuff.c
-Only in gnome-panel-2.91.6/gnome-panel/: xstuff.h
-Only in gnome-panel-2.91.6/gnome-panel/: xstuff.o
-diff -up gnome-panel-2.91.6/gnome-panel/Makefile.am.libs
gnome-panel-2.91.6/gnome-panel/Makefile.am
---- gnome-panel-2.91.6/gnome-panel/Makefile.am.libs 2011-01-31 18:50:19.000000000 -0500
-+++ gnome-panel-2.91.6/gnome-panel/Makefile.am 2011-02-02 19:45:49.003990000 -0500
-@@ -135,6 +135,7 @@ gnome_panel_LDADD = \
- $(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la \
- $(PANEL_LIBS) \
- $(XRANDR_LIBS) \
-+ -lm \
- $(X_LIBS)
-
- gnome_panel_LDFLAGS = -export-dynamic
-@@ -149,7 +150,8 @@ gnome_desktop_item_edit_SOURCES = \
- gnome_desktop_item_edit_LDADD = \
- $(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la \
- $(PANEL_LIBS) \
-- $(X_LIBS)
-+ $(X_LIBS) \
-+ -lm
-
- panel_test_applets_SOURCES = \
- panel-modules.c \
-diff -up gnome-panel-2.91.6/libpanel-applet/.libs gnome-panel-2.91.6/libpanel-applet/
-Only in gnome-panel-2.91.6/libpanel-applet/: libpanelapplet-4.0.pc
-Only in gnome-panel-2.91.6/libpanel-applet/: libpanelapplet-4.0.pc.in
-Only in gnome-panel-2.91.6/libpanel-applet/: libpanelapplet-4.0-uninstalled.pc
-Only in gnome-panel-2.91.6/libpanel-applet/: libpanelapplet-4.0-uninstalled.pc.in
-Only in gnome-panel-2.91.6/libpanel-applet/.libs: libpanel-applet-4.a
-Only in gnome-panel-2.91.6/libpanel-applet/.libs: libpanel-applet-4.lai
-Only in gnome-panel-2.91.6/libpanel-applet/.libs: libpanel-applet-4.so
-Only in gnome-panel-2.91.6/libpanel-applet/.libs: libpanel-applet-4.so.0
-Only in gnome-panel-2.91.6/libpanel-applet/.libs: libpanel-applet-4.so.0.0.0
-Only in gnome-panel-2.91.6/libpanel-applet/: .libs
-Only in gnome-panel-2.91.6/libpanel-applet/: Makefile
-Only in gnome-panel-2.91.6/libpanel-applet/: Makefile.am
-Only in gnome-panel-2.91.6/libpanel-applet/: Makefile.am.libs
-Only in gnome-panel-2.91.6/libpanel-applet/: Makefile.in
-Only in gnome-panel-2.91.6/libpanel-applet/: org.gnome.panel.TestApplet.panel-applet
-Only in gnome-panel-2.91.6/libpanel-applet/: org.gnome.panel.TestApplet.panel-applet.in
-Only in gnome-panel-2.91.6/libpanel-applet/: PanelApplet-4.0.gir
-Only in gnome-panel-2.91.6/libpanel-applet/: PanelApplet-4.0.typelib
-Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet.c
-Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-enums.c
-Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-enums.h
-Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-enums.lo
-Binary files gnome-panel-2.91.6/libpanel-applet/.libs/panel-applet-enums.o and
gnome-panel-2.91.6/libpanel-applet/panel-applet-enums.o differ
-Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-factory.c
-Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-factory.h
-Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-factory.lo
-Binary files gnome-panel-2.91.6/libpanel-applet/.libs/panel-applet-factory.o and
gnome-panel-2.91.6/libpanel-applet/panel-applet-factory.o differ
-Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-gconf.c
-Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-gconf.h
-Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-gconf.lo
-Binary files gnome-panel-2.91.6/libpanel-applet/.libs/panel-applet-gconf.o and
gnome-panel-2.91.6/libpanel-applet/panel-applet-gconf.o differ
-Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet.h
-Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet.lo
-Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-marshal.c
-Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-marshal.h
-Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-marshal.list
-Only in gnome-panel-2.91.6/libpanel-applet/: panel-applet-marshal.lo
-Binary files gnome-panel-2.91.6/libpanel-applet/.libs/panel-applet-marshal.o and
gnome-panel-2.91.6/libpanel-applet/panel-applet-marshal.o differ
-Binary files gnome-panel-2.91.6/libpanel-applet/.libs/panel-applet.o and
gnome-panel-2.91.6/libpanel-applet/panel-applet.o differ
-Binary files gnome-panel-2.91.6/libpanel-applet/.libs/test-dbus-applet and
gnome-panel-2.91.6/libpanel-applet/test-dbus-applet differ
-Only in gnome-panel-2.91.6/libpanel-applet/: test-dbus-applet.c
-Only in gnome-panel-2.91.6/libpanel-applet/: test-dbus-applet.o
-Only in gnome-panel-2.91.6/libpanel-applet/: TODO
-diff -up gnome-panel-2.91.6/libpanel-applet/Makefile.am.libs
gnome-panel-2.91.6/libpanel-applet/Makefile.am
---- gnome-panel-2.91.6/libpanel-applet/Makefile.am.libs 2011-02-02 19:49:30.834702141
-0500
-+++ gnome-panel-2.91.6/libpanel-applet/Makefile.am 2011-02-02 19:49:36.886776132 -0500
-@@ -25,8 +25,8 @@ libpanel_applet_4_la_SOURCES = \
- panel-applet-gconf.h
-
- libpanel_applet_4_la_LIBADD = \
-- $(LIBPANEL_APPLET_LIBS) \
-- $(X_LIBS)
-+ $(X_LIBS) \
-+ $(LIBPANEL_APPLET_LIBS)
-
- libpanel_applet_4_la_LDFLAGS = \
- -version-info $(LIB_PANEL_APPLET_LT_VERSION) \
diff --git a/gnome-panel-search.patch b/gnome-panel-search.patch
deleted file mode 100644
index 277ba9f..0000000
--- a/gnome-panel-search.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-diff -up gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.c.search
gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.c
---- gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.c.search 2009-04-19
13:45:09.000000000 -0400
-+++ gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.c 2009-08-25
11:33:36.666288948 -0400
-@@ -29,6 +29,8 @@
- #include <gdk/gdk.h>
- #include <gtk/gtk.h>
-
-+#include <libgnome/gnome-desktop-item.h>
-+
- #include "panel-error.h"
- #include "panel-glib.h"
-
-@@ -201,6 +203,23 @@ panel_launch_desktop_file (const char *
- }
-
- gboolean
-+panel_has_desktop_file (const char *desktop_file)
-+{
-+ GnomeDesktopItem *ditem;
-+
-+ if (g_path_is_absolute (desktop_file))
-+ ditem = gnome_desktop_item_new_from_file (desktop_file, 0, NULL);
-+ else
-+ ditem = gnome_desktop_item_new_from_basename (desktop_file, 0, NULL);
-+ if (ditem != NULL) {
-+ gnome_desktop_item_unref (ditem);
-+ return TRUE;
-+ }
-+
-+ return FALSE;
-+}
-+
-+gboolean
- panel_launch_desktop_file_with_fallback (const char *desktop_file,
- const char *fallback_exec,
- GdkScreen *screen,
-diff -up gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.h.search
gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.h
---- gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.h.search 2009-04-19
13:45:09.000000000 -0400
-+++ gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.h 2009-08-25
11:33:36.667276923 -0400
-@@ -47,6 +47,8 @@ gboolean panel_launch_key_file (GKeyFile
- GdkScreen *screen,
- GError **error);
-
-+gboolean panel_has_desktop_file (const char *desktop_file);
-+
- gboolean panel_launch_desktop_file (const char *desktop_file,
- GdkScreen *screen,
- GError **error);
-diff -up gnome-panel-2.27.91/gnome-panel/panel-action-button.c.search
gnome-panel-2.27.91/gnome-panel/panel-action-button.c
---- gnome-panel-2.27.91/gnome-panel/panel-action-button.c.search 2009-04-19
13:45:09.000000000 -0400
-+++ gnome-panel-2.27.91/gnome-panel/panel-action-button.c 2009-08-25 11:33:36.671290074
-0400
-@@ -219,9 +219,19 @@ panel_action_search (GtkWidget *widget)
- GdkScreen *screen;
-
- screen = gtk_widget_get_screen (widget);
-- panel_launch_desktop_file_with_fallback ("gnome-search-tool.desktop",
-- "gnome-search-tool",
-- screen, NULL);
-+ if (panel_has_desktop_file ("gnome-beagle-search.desktop")) {
-+ panel_launch_desktop_file ("gnome-beagle-search.desktop",
-+ screen,
-+ NULL);
-+ } else if (panel_has_desktop_file ("fedora-tracker-search-tool.desktop")) {
-+ panel_launch_desktop_file ("fedora-tracker-search-tool.desktop",
-+ screen,
-+ NULL);
-+ } else {
-+ panel_launch_desktop_file ("gnome-search-tool.desktop",
-+ screen,
-+ NULL);
-+ }
- }
-
- /* Force Quit
-diff -up gnome-panel-2.27.91/gnome-panel/panel-menu-items.c.search
gnome-panel-2.27.91/gnome-panel/panel-menu-items.c
---- gnome-panel-2.27.91/gnome-panel/panel-menu-items.c.search 2009-08-25
11:33:36.643267021 -0400
-+++ gnome-panel-2.27.91/gnome-panel/panel-menu-items.c 2009-08-25 11:42:41.517027329
-0400
-@@ -1062,10 +1062,22 @@ panel_place_menu_item_create_menu (Panel
-
- add_menu_separator (places_menu);
-
-- panel_menu_items_append_from_desktop (places_menu,
-- "gnome-search-tool.desktop",
-- NULL,
-- FALSE);
-+ if (panel_has_desktop_file ("gnome-beagle-search.desktop")) {
-+ panel_menu_items_append_from_desktop (places_menu,
-+ "gnome-beagle-search.desktop",
-+ NULL,
-+ FALSE);
-+ } else if (panel_has_desktop_file ("fedora-tracker-search-tool.desktop")) {
-+ panel_menu_items_append_from_desktop (places_menu,
-+ "fedora-tracker-search-tool.desktop",
-+ NULL,
-+ FALSE);
-+ } else {
-+ panel_menu_items_append_from_desktop (places_menu,
-+ "gnome-search-tool.desktop",
-+ NULL,
-+ FALSE);
-+ }
-
- panel_recent_append_documents_menu (places_menu,
- place_item->priv->recent_manager);
diff --git a/gnome-panel-use-gnome-menus.patch b/gnome-panel-use-gnome-menus.patch
deleted file mode 100644
index 87495cc..0000000
--- a/gnome-panel-use-gnome-menus.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -up gnome-panel-3.1.5/gnome-panel/menu.c.menus gnome-panel-3.1.5/gnome-panel/menu.c
---- gnome-panel-3.1.5/gnome-panel/menu.c.menus 2011-08-01 13:39:56.000000000 -0400
-+++ gnome-panel-3.1.5/gnome-panel/menu.c 2011-08-17 18:58:26.341620915 -0400
-@@ -1401,7 +1401,7 @@ create_main_menu (PanelWidget *panel)
- {
- GtkWidget *main_menu;
-
-- main_menu = create_applications_menu ("applications.menu", NULL, TRUE);
-+ main_menu = create_applications_menu ("gnome-applications.menu", NULL,
TRUE);
-
- g_object_set_data (G_OBJECT (main_menu), "menu_panel", panel);
- /* FIXME need to update the panel on parent_set */
-diff -up gnome-panel-3.1.5/gnome-panel/panel-addto.c.menus
gnome-panel-3.1.5/gnome-panel/panel-addto.c
---- gnome-panel-3.1.5/gnome-panel/panel-addto.c.menus 2011-08-01 13:39:56.000000000
-0400
-+++ gnome-panel-3.1.5/gnome-panel/panel-addto.c 2011-08-17 18:59:37.306668576 -0400
-@@ -666,7 +666,7 @@ panel_addto_make_application_model (Pane
- G_TYPE_POINTER,
- G_TYPE_STRING);
-
-- tree = gmenu_tree_new ("applications.menu",
GMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
-+ tree = gmenu_tree_new ("applications-gnome.menu",
GMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
-
- if (!gmenu_tree_load_sync (tree, NULL)) {
- g_object_unref (tree);
-@@ -675,7 +675,7 @@ panel_addto_make_application_model (Pane
-
- if (tree != NULL && (root = gmenu_tree_get_root_directory (tree))) {
- panel_addto_make_application_list (&dialog->application_list,
-- root, "applications.menu",
-+ root, "gnome-applications.menu",
- PANEL_ADDTO_MENU_SHOW_ALL);
- panel_addto_populate_application_model (store, NULL, dialog->application_list);
-
-diff -up gnome-panel-3.1.5/gnome-panel/panel-menu-bar.c.menus
gnome-panel-3.1.5/gnome-panel/panel-menu-bar.c
---- gnome-panel-3.1.5/gnome-panel/panel-menu-bar.c.menus 2011-04-05 06:39:04.000000000
-0400
-+++ gnome-panel-3.1.5/gnome-panel/panel-menu-bar.c 2011-08-17 18:58:26.388620946 -0400
-@@ -129,7 +129,7 @@ panel_menu_bar_init (PanelMenuBar *menub
-
- menubar->priv->info = NULL;
-
-- menubar->priv->applications_menu = create_applications_menu
("applications.menu", NULL, TRUE);
-+ menubar->priv->applications_menu = create_applications_menu
("gnome-applications.menu", NULL, TRUE);
-
- menubar->priv->applications_item = panel_image_menu_item_new ();
- gtk_menu_item_set_label (GTK_MENU_ITEM (menubar->priv->applications_item),
-diff -up gnome-panel-3.1.5/gnome-panel/panel-menu-button.c.menus
gnome-panel-3.1.5/gnome-panel/panel-menu-button.c
---- gnome-panel-3.1.5/gnome-panel/panel-menu-button.c.menus 2011-08-01 13:39:56.000000000
-0400
-+++ gnome-panel-3.1.5/gnome-panel/panel-menu-button.c 2011-08-17 18:58:26.345620917
-0400
-@@ -74,7 +74,7 @@ typedef struct {
- } MenuPathRootItem;
-
- static MenuPathRootItem root_items [] = {
-- { APPLICATIONS_MENU, "applications", "applications.menu" },
-+ { APPLICATIONS_MENU, "applications", "gnome-applications.menu" },
- { GNOMECC_MENU, "gnomecc", "gnomecc.menu" }
- };
-
-diff -up gnome-panel-3.1.5/gnome-panel/panel-run-dialog.c.menus
gnome-panel-3.1.5/gnome-panel/panel-run-dialog.c
---- gnome-panel-3.1.5/gnome-panel/panel-run-dialog.c.menus 2011-08-01 13:39:56.000000000
-0400
-+++ gnome-panel-3.1.5/gnome-panel/panel-run-dialog.c 2011-08-17 18:59:14.635653222 -0400
-@@ -781,7 +781,7 @@ get_all_applications (void)
- GMenuTreeDirectory *root;
- GSList *retval;
-
-- tree = gmenu_tree_new ("applications.menu",
GMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
-+ tree = gmenu_tree_new ("gnome-applications.menu",
GMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
-
- if (!gmenu_tree_load_sync (tree, NULL))
- return NULL;
diff --git a/gnome-panel-vendor.patch b/gnome-panel-vendor.patch
deleted file mode 100644
index e52a18a..0000000
--- a/gnome-panel-vendor.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -up gnome-panel-2.27.91/gnome-panel/panel-menu-items.c.vendor
gnome-panel-2.27.91/gnome-panel/panel-menu-items.c
---- gnome-panel-2.27.91/gnome-panel/panel-menu-items.c.vendor 2009-08-19
15:59:57.000000000 -0400
-+++ gnome-panel-2.27.91/gnome-panel/panel-menu-items.c 2009-08-25 11:32:39.980266025
-0400
-@@ -1038,7 +1038,7 @@ panel_place_menu_item_create_menu (Panel
- COMPUTER_NAME_KEY,
- NULL);
- panel_menu_items_append_from_desktop (places_menu,
-- "nautilus-computer.desktop",
-+ "gnome-nautilus-computer.desktop",
- gconf_name,
- TRUE);
- if (gconf_name)
-@@ -1048,7 +1048,7 @@ panel_place_menu_item_create_menu (Panel
- add_menu_separator (places_menu);
-
- panel_menu_items_append_from_desktop (places_menu,
-- "network-scheme.desktop",
-+ "gnome-network-scheme.desktop",
- NULL,
- TRUE);
- panel_place_menu_item_append_remote_gio (place_item, places_menu);
-@@ -1157,7 +1157,7 @@ panel_desktop_menu_item_append_menu (Gtk
- if (add_separator)
- add_menu_separator (menu);
-
-- panel_menu_items_append_from_desktop (menu, "yelp.desktop", NULL, FALSE);
-+ panel_menu_items_append_from_desktop (menu, "gnome-yelp.desktop", NULL,
FALSE);
- panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL,
FALSE);
-
- if (parent->priv->append_lock_logout)
diff --git a/gnome-panel.spec b/gnome-panel.spec
deleted file mode 100644
index 380feee..0000000
--- a/gnome-panel.spec
+++ /dev/null
@@ -1,1845 +0,0 @@
-%define gettext_package gnome-panel-2.0
-
-%define gnome_desktop_version 2.91.6
-%define glib2_version 2.31.14
-%define gtk3_version 3.3.8
-%define libwnck_version 2.91.6
-%define gnome_menus_version 3.1.4
-%define evolution_data_server_version 3.5.3
-%define cairo_version 1.0.0
-%define dbus_version 1.1.2
-%define dbus_glib_version 0.80
-%define gnome_doc_utils_version 0.3.2
-%define libgweather_version 3.5.1
-
-%define use_evolution_data_server 1
-
-Summary: GNOME panel
-Name: gnome-panel
-Version: 3.6.2
-Release: 6%{?dist}
-URL:
http://www.gnome.org
-#VCS:
git:git://git.gnome.org/gnome-panel
-Source0:
http://download.gnome.org/sources/gnome-panel/3.6/%{name}-%{version}.tar.xz
-
-#
https://bugzilla.gnome.org/show_bug.cgi?id=646749
-Patch0: Use-16px-menu-icons.patch
-
-#
https://bugzilla.redhat.com/show_bug.cgi?id=685142
-Patch1: gnome-panel-use-gnome-menus.patch
-
-#
https://bugzilla.redhat.com/show_bug.cgi?id=890219
-Patch2: drop-gweather-xml-include.patch
-
-#
https://bugzilla.gnome.org/show_bug.cgi?id=690353
-Patch3: na-style-realize.patch
-
-License: GPLv2+ and LGPLv2+ and GFDL
-Group: User Interface/Desktops
-
-Requires: gnome-desktop3 >= %{gnome_desktop_version}
-Requires: libwnck3 >= %{libwnck_version}
-Requires: gnome-menus >= %{gnome_menus_version}
-%if %{use_evolution_data_server}
-Requires: evolution-data-server >= %{evolution_data_server_version}
-%endif
-Requires: gnome-session-xsession
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-
-Requires(post): hicolor-icon-theme
-Requires(post): GConf2
-Requires(pre): GConf2
-Requires(preun): GConf2
-
-BuildRequires: libxml2-python
-BuildRequires: intltool
-BuildRequires: gettext
-BuildRequires: automake
-BuildRequires: autoconf
-BuildRequires: libtool
-BuildRequires: GConf2-devel
-BuildRequires: gtk3-devel >= %{gtk3_version}
-BuildRequires: itstool
-BuildRequires: libxslt
-BuildRequires: libX11-devel
-BuildRequires: libXt-devel
-BuildRequires: pkgconfig(gnome-desktop-3.0) >= %{gnome_desktop_version}
-BuildRequires: pkgconfig(libwnck-3.0) >= %{libwnck_version}
-BuildRequires: dconf-devel
-BuildRequires: gnome-menus-devel >= %{gnome_menus_version}
-BuildRequires: cairo-devel >= %{cairo_version}
-BuildRequires: yelp-tools
-BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
-BuildRequires: gtk-doc
-BuildRequires: pango-devel
-BuildRequires: libXau-devel
-BuildRequires: libXrandr-devel
-%if %{use_evolution_data_server}
-BuildRequires: evolution-data-server-devel >= %{evolution_data_server_version}
-BuildRequires: dbus-devel >= %{dbus_version}
-%endif
-BuildRequires: polkit-devel >= 0.92
-BuildRequires: libgweather-devel >= %{libgweather_version}
-BuildRequires: librsvg2-devel
-BuildRequires: NetworkManager-devel
-BuildRequires: intltool
-BuildRequires: gettext-devel
-BuildRequires: libtool
-BuildRequires: libcanberra-devel
-BuildRequires: desktop-file-utils
-BuildRequires: gobject-introspection-devel
-BuildRequires: gnome-common
-
-Obsoletes: gdm-user-switch-applet < 1:2.91.6
-Conflicts: gnome-power-manager < 2.15.3
-
-Obsoletes: libgail-gnome < 1.20.4
-
-# Obsolete all old applet packages; this is the output of
-# repoquery --whatrequires libpanel-applet-2.so.0 gnome-python2-applet
-# as of Fedora 15 20110428, as well as ones from Fedora 14.
-Obsoletes: deskbar-applet <= 0:2.32.0-5
-Obsoletes: deskbar-applet-devel <= 0:2.32.0-5
-Obsoletes: file-browser-applet <= 0:0.6.6-2
-Obsoletes: glunarclock <= 0:0.34.1-2
-Obsoletes: gnome-applet-bubblemon <= 0:2.0.15-2
-Obsoletes: gnome-applet-cpufire <= 0:1.6-4
-Obsoletes: gnome-applet-globalmenu <= 0:0.7.9-2
-Obsoletes: gnome-applet-grandr <= 0:0.4.1-3
-Obsoletes: gnome-applet-jalali-calendar <= 0:1.7.1-3
-Obsoletes: gnome-applet-music <= 0:2.5.1-6
-Obsoletes: gnome-applet-sensors <= 0:2.2.7-5
-Obsoletes: gnome-applet-sensors-devel <= 0:2.2.7-5
-Obsoletes: gnome-applet-timer <= 0:2.1.4-3
-Obsoletes: gnome-applet-window-picker <= 0:0.5.8-3
-Obsoletes: gnome-applets <= 1:2.32.0-5
-Obsoletes: gnome-netstatus <= 0:2.28.2-2
-Obsoletes: gnome-python2-applet <= 0:2.32.0-2
-Obsoletes: gnome-schedule <= 0:2.0.2-7
-Obsoletes: gnubiff <= 0:2.2.13-5
-Obsoletes: hamster-applet <= 0:2.32.0-5
-Obsoletes: lock-keys-applet <= 0:1.0-22
-Obsoletes: uim-gnome <= 0:1.6.1-2
-Obsoletes: x-tile <= 0:1.8.6-2
-# Other ones that were already retired from Fedora 15
-Obsoletes: gnome-applet-netspeed <= 0.16-6
-Obsoletes: contact-lookup-applet <= 0.17-7
-
-# Also obsolete the now-dead libpanelappletmm
-Obsoletes: libpanelappletmm <= 0:2.26.0-3
-
-%description
-The GNOME panel provides the window list, workspace switcher, menus, and other
-features for the GNOME desktop.
-
-%package libs
-Summary: Libraries for Panel Applets
-License: LGPLv2+
-Group: Development/Libraries
-
-%description libs
-This package contains the libpanel-applet library that
-is needed by Panel Applets.
-
-%package devel
-Summary: Headers and libraries for Panel Applet development
-License: LGPLv2+
-Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
-
-%description devel
-Panel Applet development package. Contains files needed for developing
-Panel Applets using the libpanel-applet library.
-
-%prep
-%setup -q -n %{name}-%{version}
-%patch0 -p1 -b .16px
-%patch1 -p1 -b .menus
-%patch2 -p0 -b .gweather
-%patch3 -p1 -b .na-style
-
-rm -f libtool
-autoreconf -i -f
-%build
-%configure \
- --disable-gtk-doc \
-%if %{use_evolution_data_server}
- --enable-eds=yes
-%else
- --enable-eds=no
-%endif
-
-make %{?_smp_mflags} V=1
-
-
-# truncate NEWS
-awk '/^========/ { seen+=1 }
-{ if (seen < 3) print }
-{ if (seen == 3) { print "For older news, see
http://git.gnome.org/cgit/gnome-panel/plain/NEWS"; exit } }' NEWS > tmp; mv
tmp NEWS
-
-
-%install
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make DESTDIR=$RPM_BUILD_ROOT install
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-
-rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
-find $RPM_BUILD_ROOT -name '*.*a' -delete;
-
-desktop-file-install --delete-original \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- $RPM_BUILD_ROOT%{_datadir}/applications/gnome-panel.desktop
-
-%find_lang %{gettext_package} --all-name --with-gnome
-
-%post
-touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
-
-%postun
-if [ $1 -eq 0 ]; then
- touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
- gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null || :
- glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
-fi
-
-%posttrans
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null || :
-glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
-
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
-
-%files -f %{gettext_package}.lang
-%doc AUTHORS COPYING COPYING.LIB COPYING-DOCS NEWS README
-%{_datadir}/icons/hicolor/16x16/apps/*
-%{_datadir}/icons/hicolor/22x22/apps/*
-%{_datadir}/icons/hicolor/24x24/apps/*
-%{_datadir}/icons/hicolor/32x32/apps/*
-%{_datadir}/icons/hicolor/48x48/apps/*
-%{_datadir}/icons/hicolor/scalable/apps/*
-%{_datadir}/gnome-panel
-%{_datadir}/man/man*/*
-%{_datadir}/applications/gnome-panel.desktop
-%{_bindir}/gnome-panel
-%{_bindir}/gnome-desktop-item-edit
-%{_libexecdir}/*
-
-%{_datadir}/dbus-1/services/org.gnome.panel.applet.ClockAppletFactory.service
-%{_datadir}/dbus-1/services/org.gnome.panel.applet.FishAppletFactory.service
-%{_datadir}/dbus-1/services/org.gnome.panel.applet.NotificationAreaAppletFactory.service
-%{_datadir}/dbus-1/services/org.gnome.panel.applet.WnckletFactory.service
-
-%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.applet.fish.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.applet.window-list.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.applet.workspace-switcher.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.enums.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.launcher.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.menu-button.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.object.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.toplevel.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.applet.clock.gschema.xml
-
-%files libs
-%{_libdir}/*.so.*
-%{_libdir}/girepository-1.0/PanelApplet-4.0.typelib
-
-%files devel
-%{_bindir}/panel-test-applets
-%{_includedir}/gnome-panel-4.0
-%{_libdir}/pkgconfig/*
-%{_libdir}/*.so
-%{_datadir}/gtk-doc
-%{_datadir}/gir-1.0/PanelApplet-4.0.gir
-
-%changelog
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
3.6.2-6
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Sun Dec 30 2012 Daniel Drake <dsd(a)laptop.org> - 3.6.2-5
-- Fix all-black icons in notification area
-
-* Tue Dec 25 2012 Bruno Wolff III <bruno(a)wolff.to> - 3.6.2-4
-- Drop gweather-xml.h include
-- Rebuild for multiple soname bumps
-
-* Thu Dec 20 2012 Kalev Lember <kalevlember(a)gmail.com> - 3.6.2-3
-- Rebuilt for libgnome-desktop3 3.7.3 soname bump
-
-* Tue Nov 20 2012 Milan Crha <mcrha(a)redhat.com> - 3.6.2-2
-- Rebuild against newer evolution-data-server
-
-* Mon Nov 12 2012 Kalev Lember <kalevlember(a)gmail.com> - 3.6.2-1
-- Update to 3.6.2
-- Clean up some obsolete buildrequires
-
-* Thu Nov 1 2012 Daniel Drake <dsd(a)laptop.org> - 3.6.0-2
-- Update for new gnome-menus gnome-applications filename (#868614)
-
-* Fri Oct 26 2012 Kalev Lember <kalevlember(a)gmail.com> - 3.6.0-1
-- Update to 3.6.0
-
-* Thu Oct 25 2012 Milan Crha <mcrha(a)redhat.com> - 3.5.4-5
-- Rebuild against newer evolution-data-server
-
-* Mon Aug 20 2012 Daniel Drake <dsd(a)laptop.org> - 3.5.4-4
-- Rebuild for libcamel-1.2.so.40
-
-* Fri Jul 27 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
3.5.4-3
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Sun Jul 22 2012 Ville Skytt <ville.skytta(a)iki.fi> - 3.5.4-2
-- Move post(un)install ldconfig scriptlets from main to -libs.
-- Escape macros in %%changelog.
-
-* Wed Jul 18 2012 Matthias Clasen <mclasen(a)redhat.com> - 3.5.4-1
-- Update to 3.5.4
-
-* Tue Jun 26 2012 Matthias Clasen <mclasen(a)redhat.com> - 3.5.3-1
-- Update to 3.5.3
-
-* Fri Jun 8 2012 Matthias Clasen <mclasen(a)redhat.com> - 3.4.2.1-2
-- Rebuild against new gnome-desktop
-
-* Fri May 18 2012 Richard Hughes <hughsient(a)gmail.com> - 3.4.2.1-1
-- Update to 3.4.2.1
-
-* Tue May 01 2012 Kalev Lember <kalevlember(a)gmail.com> - 3.4.1-3
-- Rebuilt for evolution-data-server soname bumps
-
-* Tue Apr 24 2012 Kalev Lember <kalevlember(a)gmail.com> - 3.4.1-2
-- Silence rpm scriptlet output
-
-* Mon Apr 16 2012 Richard Hughes <hughsient(a)gmail.com> - 3.4.1-1
-- Update to 3.4.1
-
-* Tue Mar 27 2012 Kalev Lember <kalevlember(a)gmail.com> - 3.4.0-1
-- Update to 3.4.0
-
-* Wed Mar 21 2012 Kalev Lember <kalevlember(a)gmail.com> - 3.3.92-1
-- Update to 3.3.92
-
-* Tue Mar 6 2012 Matthias Clasen <mclasen(a)redhat.com> - 3.3.91-1
-- Update to 3.3.91
-
-* Sun Feb 26 2012 Matthias Clasen <mclasen(a)redhat.com> - 3.3.90-1
-- Update to 3.3.90
-
-* Tue Feb 7 2012 Matthias Clasen <mclasen(a)redhat.com> - 3.3.5-1
-- Update to 3.3.5
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
3.3.3-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Wed Dec 21 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.3.3-1
-- Update to 3.3.3
-
-* Thu Nov 24 2011 Tomas Bzatek <tbzatek(a)redhat.com> - 3.3.1-3
-- Another rebuild for new EDS
-
-* Tue Nov 22 2011 Daniel Drake <dsd(a)laptop.org> - 3.3.1-2
-- Rebuild for libebook-1.2.so.13
-
-* Wed Nov 2 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.3.1-1
-- Update to 3.3.1
-
-* Sun Oct 30 2011 Bruno Wolff III <bruno(a)wolff.to> - 3.2.1-3
-- Rebuild against newer evolution-data-server
-
-* Wed Oct 26 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
3.2.1-2
-- Rebuilt for glibc bug#747377
-
-* Tue Oct 18 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.2.1-1
-- Update to 3.2.1
-
-* Wed Sep 28 2011 Peter Robinson <pbrobinson(a)fedoraproject.org> - 3.2.0-2
-- Fix Source URL, remove no longer needed band-aid - RHBZ 730586
-
-* Tue Sep 27 2011 Ray <rstrode(a)redhat.com> - 3.2.0-1
-- Update to 3.2.0
-
-* Tue Sep 20 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.1.92-1
-- Update to 3.1.92
-
-* Thu Sep 08 2011 Kalev Lember <kalevlember(a)gmail.com> - 3.1.91-3
-- Obsolete additional -devel packages that AutoQA caught
-
-* Wed Sep 7 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.1.91-2
-- Rebuild against newer libcamel
-
-* Tue Sep 6 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.1.91-1
-- Update to 3.1.91
-
-* Tue Aug 30 2011 Milan Crha <mcrha(a)redhat.com> - 3.1.5-5
-- Rebuild against newer evolution-data-server (once again)
-
-* Mon Aug 29 2011 Milan Crha <mcrha(a)redhat.com> - 3.1.5-4
-- Rebuild against newer evolution-data-server
-
-* Wed Aug 24 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.1.5-3
-- Make the -libs dependency archful
-
-* Fri Aug 19 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.1.5-2
-- Rebuild
-
-* Wed Aug 17 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.1.5-1
-- Update to 3.1.5
-
-* Tue Aug 16 2011 Milan Crha <mcrha(a)redhat.com> - 3.0.2-4
-- Rebuild against newer evolution-data-server
-
-* Mon Jul 25 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.0.2-3
-- Rebuild
-
-* Tue Jul 05 2011 Adam Williamson <awilliam(a)redhat.com> - 3.0.2-2
-- rebuild for new e-d-s
-
-* Thu Jun 16 2011 Tomas Bzatek <tbzatek(a)redhat.com> - 3.0.2-1
-- Update to 3.0.2
-
-* Thu May 5 2011 Colin Walters <walters(a)verbum.org> - 3.0.0.1-5
-- Also obsolete libpanelappletmm
-
-* Thu Apr 28 2011 Colin Walters <walters(a)verbum.org> - 3.0.0.1-4
-- Obsolete old applet packages so upgrades proceeed
-
-* Mon Apr 25 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.0.0.1-3
-- Obsolete libgail-gnome (#697795)
-
-* Mon Apr 11 2011 Colin Walters <walters(a)verbum.org> - 3.0.0.1-2
-- Use gnome menu, not redhat-menus
-
-* Wed Apr 6 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.0.0.1-1
-- Update to 3.0.0.1
-
-* Tue Apr 5 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.0.0-2
-- Make icon sizes more uniform
-
-* Mon Apr 4 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.0.0-1
-- Update to 3.0.0
-
-* Fri Apr 1 2011 Matthias Clasen <mclasen(a)redhat.com> - 2.91.94-1
-- Update to 2.91.94
-
-* Tue Mar 29 2011 Matthias Clasen <mclasen(a)redhat.com> - 2.91.93-1
-- Update to 2.91.93
-
-* Wed Mar 23 2011 Matthias Clasen <mclasen(a)redhat.com> - 2.91.92-1
-- Update to 2.91.92
-
-* Mon Mar 7 2011 Matthias Clasen <mclasen(a)redhat.com> - 2.91.91-1
-- Update to 2.91.91
-
-* Thu Feb 24 2011 Colin Walters <walters(a)verbum.org> - 2.91.90-2
-- Require gnome-shell to band aid upgrades
-
-* Tue Feb 22 2011 Matthias Clasen <mclasen(a)redhat.com> 2.91.90-1
-- Update to 2.91.90
-
-* Fri Feb 11 2011 Matthias Clasen <mclasen(a)redhat.com> 2.91.6-5
-- Rebuild against newer gtk
-
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
2.91.6-4
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Wed Feb 02 2011 Ray Strode <rstrode(a)redhat.com> 2.91.6-3
-- Cut out the layers of built up cruft.
-
-* Wed Feb 2 2011 Matthias Clasen <mclasen(a)redhat.com> 2.91.6-2
-- Various build fixes
-
-* Wed Feb 02 2011 Ray Strode <rstrode(a)redhat.com> 2.91.6-1
-- Update to 2.91.6
-
-* Wed Sep 29 2010 jkeating - 2.31.92-2
-- Rebuilt for gcc bug 634757
-
-* Wed Sep 22 2010 Matthias Clasen <mclasen(a)redhat.com> - 2.31.92-1
-- Update to 2.31.92
-
-* Tue Sep 21 2010 Matthias Clasen <mclasen(a)redhat.com> - 2.31.90-3
-- Rebuild against newer gtk3
-
-* Mon Aug 23 2010 Matthias Clasen <mclasen(a)redhat.com> - 2.31.90-2
-- Co-own /usr/share/gtk-doc (#604360)
-
-* Thu Aug 19 2010 Matthias Clasen <mclasen(a)redhat.com> - 2.31.90-1
-- Update to 2.31.90
-
-* Wed Aug 4 2010 Matthias Clasen <mclasen(a)redhat.com> - 2.31.6-1
-- Update to 2.31.6
-
-* Tue Aug 3 2010 Matthias Clasen <mclasen(a)redhat.com> - 2.31.4-4
-- Adapt to GDBus api changes
-
-* Thu Jul 15 2010 Colin Walters <walters(a)verbum.org> - 2.31.4-3
-- Rebuild with new gobject-introspection
-
-* Thu Jul 15 2010 Matthias Clasen <mclasen(a)redhat.com> 2.31.4-2
-- Rebuild against new evolution-data-server
-
-* Wed Jun 30 2010 Matthias Clasen <mclasen(a)redhat.com> 2.31.4-1
-- Update to 2.31.4
-
-* Mon Jun 21 2010 Matthias Clasen <mclasen(a)redhat.com> 2.31.2-4
-- Update for GLib api change
-
-* Thu Jun 17 2010 Dan Hork <dan[at]danny.cz> 2.31.2-3
-- link also with libm
-
-* Sat May 29 2010 Matthias Clasen <mclasen(a)redhat.com> 2.31.2-2
-- Rebuild
-
-* Fri May 28 2010 Matthias Clasen <mclasen(a)redhat.com> 2.31.2-1
-- Update to 2.31.2
-
-* Sun May 09 2010 Matthew Barnes <mbarnes(a)redhat.com> 2.30.0-2
-- Rebuild against newer libedataserver and libedataserverui.
-
-* Mon Mar 29 2010 Matthias Clasen <mclasen(a)redhat.com> 2.30.0-1
-- Update to 2.30.0
-
-* Thu Mar 11 2010 Matthias Clasen <mclasen(a)redhat.com> 2.29.92.1-1
-- Update to 2.29.92.1
-
-* Mon Feb 22 2010 Matthias Clasen <mclasen(a)redhat.com> 2.29.91-1
-- Update to 2.29.91
-
-* Wed Feb 17 2010 Matthias Clasen <mclasen(a)redhat.com> 2.29.6-2
-- Update icon-order patch to sort keyboard, too
-
-* Thu Feb 11 2010 Matthias Clasen <mclasen(a)redhat.com> 2.29.6-1
-- Update to 2.29.6
-
-* Sun Jan 17 2010 Matthias Clasen <mclasen(a)redhat.com> 2.29.5.1-1
-- Update to 2.29.5.1
-
-* Tue Dec 15 2009 Matthias Clasen <mclasen(a)redhat.com> 2.28.0-17
-- Handle errors returned from PolicyKit in the clock applet (#547624)
-- Fix clock crash (bug 537798)
-- Improve the behaviour of the panel when screen resolution
- changes (gnome #341441)
-
-* Thu Oct 29 2009 Matthias Clasen <mclasen(a)redhat.com> 2.28.0-12
-- Make padding work correctly in non-expanded panels (#529614)
-
-* Tue Oct 20 2009 Matthias Clasen <mclasen(a)redhat.com> 2.28.0-11
-- Remove a leftover debugging statement
-
-* Tue Oct 20 2009 Matthias Clasen <mclasen(a)redhat.com> 2.28.0-10
-- Reduce the inter-applet padding
-
-* Mon Oct 19 2009 Ray Strode <rstrode(a)redhat.com> 2.28.0-9
-- Add explicit libs requires (bug 525600)
-
-* Mon Oct 19 2009 Matthias Clasen <mclasen(a)redhat.com> 2.28.0-9
-- Actually set non-zero padding
-
-* Sat Oct 17 2009 Matthias Clasen <mclasen(a)redhat.com> 2.28.0-8
-- Add padding around status icons
-
-* Fri Oct 16 2009 Matthias Clasen <mclasen(a)redhat.com> 2.28.0-6
-- Put status icons in a predictable order
-
-* Wed Oct 14 2009 Matthias Clasen <mclasen(a)redhat.com> 2.28.0-5
-- Tweaks to the default panel configuration
-
-* Thu Oct 8 2009 Matthias Clasen <mclasen(a)redhat.com> 2.28.0-4
-- Fix possible crashes related to randr events
-
-* Thu Oct 8 2009 Matthias Clasen <mclasen(a)redhat.com> 2.28.0-3
-- Accept more bookmarks in the places menu before overflowing
-
-* Wed Oct 7 2009 Matthias Clasen <mclasen(a)redhat.com> 2.28.0-2
-- Add a default location to the clock applet
-
-* Wed Sep 23 2009 Matthias Clasen <mclasen(a)redhat.com> 2.28.0-1
-- Update to 2.28.0
-
-* Wed Sep 9 2009 Matthias Clasen <mclasen(a)redhat.com> 2.27.92-1
-- Update to 2.27.92
-
-* Tue Aug 25 2009 Matthias Clasen <mclasen(a)redhat.com> 2.27.91-1
-- Update to 2.27.91
-
-* Sat Aug 22 2009 Matthias Clasen <mclasen(a)redhat.com> 2.27.4-9
-- Actually apply the 'clear recent' patch
-
-* Thu Aug 13 2009 Matthias Clasen <mclasen(a)redhat.com> 2.27.4-8
-- Stricter clock-applet PolicyKit policy
-
-* Wed Aug 5 2009 Matthias Clasen <mclasen(a)redhat.com> 2.27.4-7
-- Make 'Clear Recent Documents' follow the menu-images setting
-
-* Sun Aug 2 2009 Matthias Clasen <mclasen(a)redhat.com> 2.27.4-6
-- Save some space
-
-* Fri Jul 31 2009 Matthias Clasen <mclasen(a)redhat.com> 2.27.4-5
-- Reduce the excessive 'about'-ing in the System menu
-
-* Mon Jul 27 2009 Matthias Clasen <mclasen(a)redhat.com> 2.27.4-4
-- Drop unneeded direct deps
-
-* Fri Jul 24 2009 Ray Strode <rstrode(a)redhat.com> 2.27.4-3
-- Make my panels show up again on login (gnome bug 589632)
-
-* Wed Jul 22 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.27.4-2
-- Make category icons follow the menu-images setting
-
-* Wed Jul 15 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.27.4-1
-- Update to 2.27.4
-
-* Tue Jun 9 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.26.2-3
-- Port to PolicyKit 1
-
-* Tue Jun 2 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.26.2-2
-- Replace tomboy by gnote in the default panel configuration
-
-* Wed May 20 2009 Ray Strode <rstrode(a)redhat.com> 2.26.2-1
-- Update to 2.26.2
-
-* Mon Apr 27 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.26.1-3
-- Don't drop schemas translations from po files
-
-* Wed Apr 15 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.26.1-2
-- Fix the clock applets network tracking code
-
-* Tue Apr 14 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.26.1-1
-- Update to 2.26.1
-
-* Mon Apr 13 2009 David Zeuthen <davidz(a)redhat.com> - 2.26.0-2
-- Handle emblemed icons (GNOME #578859)
-
-* Tue Mar 17 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.26.0-1
-- Update to 2.26.0
-
-* Tue Mar 3 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.25.92-1
-- Update to 2.25.92
-
-* Fri Feb 27 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.25.91-3
-- Require PolicyKit-authentication-agent
-
-* Mon Feb 23 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.25.91-2
-- Fix panel behaviour on screen size changes
-
-* Thu Feb 19 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.25.91-1
-- Update to 2.25.91
-
-* Tue Feb 3 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.25.90-1
-- Update to 2.25.90
-
-* Fri Jan 23 2009 Ray Strode <rstrode(a)redhat.com> - 2.25.5.1-1
-- Update to 2.25.5.1
-- Fixes bug 481029
-
-* Tue Jan 20 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.25.5-1
-- Update to 2.25.5
-
-* Fri Jan 16 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.25.3-4
-- And don't write %%s into desktop files
-
-* Fri Jan 16 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.25.3-3
-- Fix the 'smart launcher' patch
-
-* Thu Dec 18 2008 - Bastien Nocera <bnocera(a)redhat.com> - 2.25.3-3
-- Remove the mixer from the default panel config as well
-- Update search and preferred apps patches
-
-* Wed Dec 17 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.25.3-2
-- Update to 2.25.3
-- Drop mixer from default config
-
-* Thu Nov 13 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.24.1-6
-- Rebuild
-
-* Sun Nov 9 2008 Ray Strode <rstrode(a)redhat.com> - 2.24.1-4
-- Don't unhide drawers by default. Patch from
- Leszek Matok <lam(a)lac.pl> (bug 470719)
-
-* Mon Nov 3 2008 Ray Strode <rstrode(a)redhat.com> - 2.24.1-3
-- Fix up panel slide in patch to work better with empty panels
-
-* Mon Nov 3 2008 Ray Strode <rstrode(a)redhat.com> - 2.24.1-2
-- Fix up panel slide in patch to
- 1) not have odd effects with vertical panels
- 2) set up struts earlier
-
-* Wed Oct 22 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.24.1-1
-- Update to 2.24.1
-
-* Wed Oct 22 2008 Ray Strode <rstrode(a)redhat.com> - 2.24.0-8
-- Don't make nautilus slide down as the panel slides down,
- instead push nautilus out of the way immediately, and slide
- in the available space.
-
-* Sun Oct 12 2008 Ray Strode <rstrode(a)redhat.com> - 2.24.0-7
-- Update smooth slide patch to be simpler based on feedback
- on gnome bug (554343)
-
-* Thu Oct 9 2008 Ray Strode <rstrode(a)redhat.com> - 2.24.0-6
-- Hide shutdown item if unavailable
-
-* Thu Oct 9 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.24.0-5
-- Don't show menuitems which fail the tryexec test
-
-* Fri Sep 26 2008 Ray Strode <rstrode(a)redhat.com> - 2.24.0-4
-- Try to make initial panel slide-in animation be smooth
-
-* Thu Sep 25 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.24.0-3
-- Save some space
-
-* Thu Sep 25 2008 Ray Strode <rstrode(a)redhat.com> - 2.24.0-2
-- Requires: gnome-session-xsession so it gets pulled in for
- typical GNOME installs.
-
-* Tue Sep 23 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.24.0-1
-- Update to 2.24.0
-
-* Mon Sep 8 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.92-1
-- Update to 2.23.92
-
-* Tue Sep 2 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.91-1
-- Update to 2.23.91
-
-* Sat Aug 23 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.90.1-1
-- Update to 2.23.90.1
-
-* Tue Aug 5 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.6-1
-- Update to 2.23.6
-
-* Wed Jul 23 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.23.5-2
-- fix license tag
-
-* Tue Jul 22 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.5-1
-- Update to 2.23.5
-
-* Fri Jul 18 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.4-5
-- Fix one more icon
-
-* Wed Jul 9 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.4-4
-- Move panel-test-applets to the -devel package
-
-* Wed Jul 9 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.4-3
-- Use more standard icon names
-
-* Tue Jul 8 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.4-2
-- Fix debuginfo generation
-
-* Wed Jun 18 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.4-1
-- Update to 2.23.4
-
-* Tue Jun 10 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.3-2
-- Avoid unnecessary wakeups in the clock for monitoring
- Gentoo config file locations
-
-* Wed Jun 4 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.3-1
-- 2.23.3
-
-* Wed May 14 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.2.1-1
-- Update to 2.23.2.1
-
-* Wed May 14 2008 Adam Tkac <atkac redhat com> - 2.23.1-2
-- rebuild
-
-* Fri Apr 25 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.1-1
-- Update to 2.23.1
-
-* Wed Apr 23 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.1.2-6
-- Remove an erroneous addition in the last patch
-
-* Tue Apr 22 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.1.2-5
-- Add another patch that may fix timezone setting problems (#443415)
-
-* Fri Apr 18 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.1.2-4
-- Use gio to open places
-- Fix a 64bit issue with timezone handling in the clock
-
-* Fri Apr 18 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.1.2-3
-- Move the trash applet back where it belongs, to the corner (#439416)
-
-* Wed Apr 16 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.1.2-2
-- Make help buttons work in clock preferences
-
-* Thu Apr 10 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.1.2-1
-- Update to 2.22.1.2 (significant performance and usability
- improvements for the clock applet)
-
-* Tue Apr 08 2008 - Bastien Nocera <bnocera(a)redhat.com> - 2.22.1.1-1
-- Update to 2.22.1.1
-
-* Mon Apr 7 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.1-1
-- Update to 2.22.1
-
-* Sun Apr 6 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.0-12
-- Fix a typo in the CK shutdown patch, spotted by Kevin Kofler
-
-* Sat Apr 5 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.0-11
-- Handle PolicyKit errors returned from ConsoleKit
-
-* Fri Apr 4 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.0-10
-- Ignore dbus errors when setting the time
-
-* Wed Apr 2 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.0-9
-- Fix a possible crash in the clock applet
-
-* Fri Mar 28 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.0-8
-- Fix editing of locations in the clock applet
-
-* Fri Mar 28 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.0-7
-- Convert the edit and find location windows to dialogs
-
-* Thu Mar 27 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.0-6
-- Improve the time settings window
-
-* Thu Mar 27 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.0-5
-- Make the find-location window of the clock larger
-
-* Sat Mar 15 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.0-4
-- Only save the session when the users wants it
-
-* Fri Mar 14 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.0-3
-- Populate the location list before showing the preference window
-
-* Mon Mar 10 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.0-2
-- Bump revision
-
-* Mon Mar 10 2008 Jon McCann <jmccann(a)redhat.com> - 2.22.0-1
-- Update to 2.22.0
-
-* Sat Mar 8 2008 Will Woods <wwoods(a)redhat.com> - 2.21.92-6
-- Add "About This Computer" item to System menu if it exists
-
-* Mon Mar 3 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.92-5
-- Fix a redraw problem with the clock map
-
-* Mon Mar 3 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.92-4
-- Make the clock applet handle multiple locations in the
- same timezone meaningfully
-
-* Mon Mar 3 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.92-3
-- Some upstream clock applet fixes
-
-* Mon Mar 3 2008 Ray Strode <rstrode(a)redhat.com> - 2.21.92-2
-- Don't crash with Zimbra connector (bug 435355)
-
-* Tue Feb 26 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.92-1
-- Update to 2.21.92
-
-* Fri Feb 22 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.91-9
-- Report sunrise/sunset times in local time
-
-* Thu Feb 21 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.91-8
-- Make drawers open again
-
-* Wed Feb 20 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.91-7
-- Make the last patch work
-
-* Wed Feb 20 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.91-6
-- Try harder to avoid resizing the popup
-
-* Tue Feb 19 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.91-5
-- Take daylight savings time into account when calculating offsets
-
-* Mon Feb 18 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.91-4
-- Another round of intlclock fixes
-
-* Sun Feb 17 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.91-3
-- First round of intlclock fixes
-
-* Fri Feb 15 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.91-2
-- Drop gnome-vfs BR
-
-* Wed Feb 12 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.91-1
-- Update to 2.21.91
-- Update patches
-
-* Sun Feb 3 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.90-3
-- Ensure the logout dialog gets focus.
-
-* Tue Jan 29 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.90-1
-- Update to 2.21.90
-- Drop upstreamed patch
-
-* Fri Jan 25 2008 Jon McCann <jmccann(a)redhat.com> - 2.21.5-2
-- Add ConsoleKit restart/shutdown support
-
-* Wed Jan 16 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.5-1
-- Update to 2.21.5
-- Drop separate intlclock
-
-* Thu Dec 13 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.2-2
-- Adapt to libgweather api changes
-
-* Tue Nov 27 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.2-1
-- Update to 2.20.2 (translation updates)
-
-* Tue Nov 13 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.1-7
-- Fix a problem with the intlclock GConf schema
-
-* Tue Nov 13 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.1-6
-- Reenable intlclock
-
-* Tue Nov 13 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.1-5
-- Split off a libs subpackage to break a cyclic dependency
-- Build without intlclock for bootstrapping purposes
-
-* Mon Oct 29 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.1-4
-- Intlclock: make default units work correctly
-
-* Sun Oct 28 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.1-3
-- Intlclock: add weather preferences, show temperature in panel
-
-* Sat Oct 20 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.1-2
-- Fix some issues with the offset display in the intlclock
-
-* Mon Oct 15 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.1-1
-- Update to 2.20.1
-
-* Sun Oct 14 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.0.1-9
-- Install the right intlclock icons, and the right gconf schema
-
-* Sun Oct 14 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.0.1-8
-- Add network monitoring to the intlclock
-
-* Sat Oct 13 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.0.1-7
-- Another round of intlclock updates
- * show offsets in popup
- * vary clock faces throughout the day
-
-* Fri Oct 12 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.0.1-6
-- Sharper icons
-
-* Tue Oct 9 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.0.1-5
-- Some intlclock updates
-
-* Fri Oct 5 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.0.1-4
-- Replace clock by intlclock
-
-* Wed Oct 3 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.0.1-3
-- Make it possible to start s-c-d from the clock menu again (#316921)
-
-* Fri Sep 21 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.0.1-2
-- Don't pop up an error if an applet from the default
- configuration is missing
-
-* Tue Sep 18 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.0.1-1
-- Update to 2.20.0.1
-
-* Mon Sep 17 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.0-1
-- Update to 2.20.0
-
-* Mon Sep 17 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.19.92-7
-- Can't require tomboy where there's no mono
-
-* Mon Sep 17 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.19.92-6
-- Turns out we need requires for applets in the default config (#293261)
-
-* Mon Sep 17 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.19.92-5
-- Drop the requires for fast-user-switch-applet (#253831)
-
-* Thu Sep 13 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.19.92-4
-- Fix some memleaks
-- Remove OpenOffice launchers from the default configuration
-- Add Tomboy to the default configuration
-
-* Mon Sep 10 2007 Ray Strode <rstrode(a)redhat.com> - 2.19.92-3
-- create ~/.local/share/applications before writing out
- preferred app launchers
-
-* Thu Sep 6 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.19.92-2
-- Improve the handling of preferred apps in launchers
-
-* Tue Sep 4 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.19.92-1
-- Update to 2.19.92
-
-* Thu Aug 23 2007 Adam Jackson <ajax(a)redhat.com> - 2.19.6-2
-- Rebuild for build ID
-
-* Mon Aug 13 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.19.6-1
-- Update to 2.19.6
-
-* Mon Aug 6 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.19.5-7
-- Update license field again
-- Use %%find_lang for help files, too
-
-* Sat Aug 4 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.19.5-6
-- Update license field
-
-* Wed Jul 25 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.19.5-5
-- Make the panel talk to gnome-power-manager again.
-- Drop the patch to add suspend to the menu, it was
- rejected by upstream
-
-* Wed Jul 25 2007 Jesse Keating <jkeating(a)redhat.com> - 2.19.5-4
-- Rebuild for RH #249435
-
-* Tue Jul 24 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.19.5-3
-- Fix launcher tooltips to react to changes. (#212164)
-
-* Thu Jul 12 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.19.5-2
-- Fix a crash in the new timezone code in the clock applet
-
-* Sun Jul 8 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.19.5-1
-- Update to 2.19.5
-
-* Sat Jul 7 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.19.4-2
-- Fix directory ownership issues
-
-* Sun Jun 17 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.19.4-1
-- Update to 2.19.4
-
-* Tue Jun 5 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.19.3-3
-- Rebuild again
-
-* Mon Jun 4 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.19.3-2
-- Rebuild against new libwnck
-
-* Mon Jun 04 2007 - Bastien Nocera <bnocera(a)redhat.com> - 2.19.3-1
-- Update to 2.19.3
-
-* Tue May 22 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.19.2-2
-- Don't ship a pointless empty file in /usr/share
-
-* Sun May 20 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.19.2-1
-- Update to 2.19.2
-
-* Fri Apr 13 2007 Ray Strode <rstrode(a)redhat.com> - 2.18.0-9
-- Apply upstream patch from Ross Burton (upstream bug 416120)
- to show completed tasks in the clock applet as completed.
-
-* Wed Apr 4 2007 Ray Strode <rstrode(a)redhat.com> - 2.18.0-8
-- fix invalid read and potentially fix 234544
-
-* Wed Apr 4 2007 Ray Strode <rstrode(a)redhat.com> - 2.18.0-7
-- Allow users to correct desktop launchers when given an
- error initially (bug 233015)
-
-* Tue Apr 3 2007 Ray Strode <rstrode(a)redhat.com> - 2.18.0-6
-- update the clock after timezone changes (bug 230832)
-
-* Sat Mar 31 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.18.0-5
-- Remove the bug-buddy patch again; fixed better in libgnome
-
-* Fri Mar 30 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.18.0-4
-- Fix bug-buddy support in the other applets
-
-* Fri Mar 30 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.18.0-3
-- Fix bug-buddy support in the clock applet
-
-* Fri Mar 30 2007 Ray Strode <rstrode(a)redhat.com> - 2.18.0-2
-- hide "Lock Screen" menu item when logged in as root
-
-* Tue Mar 13 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.18.0-1
-- Update to 2.18.0
-
-* Tue Mar 6 2007 Alexander Larsson <alexl(a)redhat.com> - 2.17.92-1
-- Add xdg-user-dirs patch
-
-* Wed Feb 28 2007 Matthias Clasen <mclasen(a)redhat.com> 2.17.92-1
-- Update to 2.17.92
-
-* Tue Feb 13 2007 Matthias Clasen <mclasen(a)redhat.com> 2.17.91-6
-- Put the fast user switch applet in the default panel configuration
-
-* Tue Feb 13 2007 Matthias Clasen <mclasen(a)redhat.com> 2.17.91-5
-- Update to 2.17.91
-
-* Sat Feb 10 2007 Matthias Clasen <mclasen(a)redhat.com> 2.17.91-4.svn20070207
-- Run autoheader since HAVE_LANGINFO_H is missing in config.h.in
-
-* Fri Feb 9 2007 Kristian Hgsberg <krh(a)redhat.com> 2.17.91-3.svn20070207
-- Update compiz support patch (#227986).
-
-* Thu Feb 8 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.17.91-2.svn20070207
-- Hide the "Switch User" button on the logout dialog again
-
-* Mon Jan 22 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.17.90-1
-- Update to 2.17.90
-- Clean up BuildRequires
-- Allow user switching from the logout dialog
-
-* Sun Jan 14 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.16.2-2
-- Check for the right tracker desktop file
-
-* Tue Dec 5 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.16.2-1
-- Update to 2.16.2
-- Drop upstreamed patches
-
-* Wed Nov 29 2006 Ray Strode <rstrode(a)redhat.com> - 2.16.1-8
-- don't ask user if they want to logout if they've set the
- preference not to
-
-* Wed Nov 29 2006 Stepan Kasal <skasal(a)redhat.com> - 2.16.1-7
-- Add BuildRequires: libtool; without it, the aclocal call failed.
-
-* Tue Nov 21 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.16.1-6
-- Support tracker
-
-* Thu Nov 16 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.16.1-5
-- Fix previous patch and also include the fix
- for gnome bug 359707
-
-* Tue Nov 14 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.16.1-4
-- Fix copying of launchers by DND, bug 214334
-
-* Tue Nov 14 2006 Ray Strode <rstrode(a)redhat.com> - 2.16.1-3
-- fix "Add this launcher to panel" chinese translation.
- Patch by Caius Chance (bug 211569)
-
-* Fri Oct 27 2006 Matthew Barnes <mbarnes(a)redhat.com> - 2.16.1-2
-- Update BuildRequires for evolution-data-server-devel.
-- Rebuild against evolution-data-server-1.9.1.
-
-* Sat Oct 21 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.16.1-1
-- Update to 2.16.1
-
-* Wed Oct 18 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.16.0-5
-- Fix scripts according to packaging guidelines
-
-* Wed Sep 27 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.16.0-4.fc6
-- Copy translations for "Suspend" menu item from
- gnome-power-manager
-
-* Tue Sep 19 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.16.0-3.fc6
-- Fix some directory ownership issues
-- Add a %%preun to uninstall gconf schemas
-- Require hicolor-icon-theme (#204237)
-
-* Mon Sep 18 2006 Soren Sandmann <sandmann(a)redhat.com> - 2.16.0-2.fc6
-- Add patch to make the pager preference box deal with viewports when compiz
- is running. (Bug 205905).
-
-* Mon Sep 4 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.16.0-1.fc6
-- Update to 2.16.0
-
-* Fri Sep 1 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.15.92-3.fc6
-- Avoid unneeded wakeups in the clock applet (204862)
-
-* Fri Aug 25 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.15.92-2.fc6
-- Install omf files in the proper location (#201034)
-
-* Mon Aug 21 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.15.92-1.fc6
-- Update to 2.15.92
-- Require pkgconfig in the -devel package
-- Drop upstreamed patches
-- Drop stale code from .spec
-
-* Fri Aug 18 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.15.91-4.fc6
-- Make clearing recent files work more than once
-
-* Wed Aug 16 2006 Ray Strode <rstrode(a)redhat.com> - 2.15.91-3.fc6
-- add more complete fix for bug 201439
-
-* Fri Aug 15 2006 Alexander Larsson <alexl(a)redhat.com> - 2.15.91-2.fc6
-- Also use beagle for search actions (#201424)
-
-* Sun Aug 13 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.15.91-1.fc6
-- Update to 2.15.91
-
-* Wed Aug 9 2006 Ray Strode <rstrode(a)redhat.com> - 2.15.90-5
-- remove suspend from logout dialog
-
--* Mon Aug 7 2006 Matthew Barnes <mbarnes(a)redhat.com> - 2.15.90-4
-- Rebuild against evolution-data-server-1.7.91
-
-* Mon Aug 7 2006 Ray Strode <rstrode(a)redhat.com> - 2.15.90-3
-- fix double free in menu editor launcher (bug 201439)
-
-* Fri Aug 4 2006 Ray Strode <rstrode(a)redhat.com> - 2.15.90-2
-- move suspend to menu again
-- remove autogenerated panel-typebuiltins.c from move-suspend-to-menu (caolanm)
-
-* Fri Aug 4 2006 Ray Strode <rstrode(a)redhat.com> - 2.15.90-1
-- update to 2.15.90
-
-* Fri Jul 28 2006 Ray Strode <rstrode(a)redhat.com> - 2.14.2-8
-- don't get stuck in infinite recursion loop from previous
- fix. Patch by Fredric Crozat
-
-* Wed Jul 26 2006 Ray Strode <rstrode(a)redhat.com> - 2.14.2-7
-- don't try to talk to X if the connection is dead (bug 200149)
-
-* Tue Jul 18 2006 Ray Strode <rstrode(a)redhat.com> - 2.14.2-6
-- change "Suspend" to "Hibernate" where appropriate (bug 190791)
-
-* Wed Jul 12 2006 Jesse Keating <jkeating(a)redhat.com> - 2.14.2-5.1
-- rebuild
-
-* Mon Jun 19 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.14.2-5
-- Add a patch to support transparent backgrounds in the
- notification area
-
-* Wed Jun 14 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.14.2-4
-- Update to new gnome-power-manager interface
-- Conflict with gnome-power-manager < 2.15.3
-
-* Fri Jun 9 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.14.2-3
-- Add missing BuildRequires
-
-* Mon May 29 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.14.2-2
-- Update to 2.14.2
-- Drop upstreamed patches
-
-* Mon May 22 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.14.1-4
-- Make it build in mock
-
-* Fri May 12 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.14.1-3
-- Close the about dialog
-
-* Mon Apr 10 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.14.1-2
-- Update to 2.14.1
-- Update patches
-
-* Mon Mar 13 2006 Ray Strode <rstrode(a)redhat.com> - 2.14.0-1
-- update to 2.14.0
-
-* Tue Feb 28 2006 Karsten Hopp <karsten(a)redhat.de> 2.13.91-5
-- Buildrequires: ORBit2-devel, which, libxml2-python, libX11-devel,
- libXt-devel, gnome-doc-utils, dbus-devel
-
-* Mon Feb 27 2006 Ray Strode <rstrode(a)redhat.com> - 2.13.91-4
-- ignore unknown options (bug 182734)
-
-* Sun Feb 19 2006 Ray Strode <rstrode(a)redhat.com> - 2.13.91-3
-- bring back shutdown menu item
-
-* Wed Feb 15 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.13.91-2
-- fix up the gnome-power-manager integration patch
-
-* Mon Feb 13 2006 Matthias Clasen <mclasen(a)redhat.com> - 2.13.91-1
-- update to 2.13.91
-
-* Mon Feb 13 2006 Ray Strode <rstrode(a)redhat.com> - 2.13.90-3
-- use beagle if available for search tool
-
-* Sun Feb 12 2006 Ray Strode <rstrode(a)redhat.com> - 2.13.90-2
-- add first pass at gnome power manager integration
-
-* Fri Feb 10 2006 Jesse Keating <jkeating(a)redhat.com> - 2.13.90-1.2
-- bump again for double-long bug on ppc(64)
-
-* Tue Feb 07 2006 Jesse Keating <jkeating(a)redhat.com> - 2.13.90-1.1
-- rebuilt for new gcc4.1 snapshot and glibc changes
-
-* Fri Jan 27 2006 Matthias Clasen <mclasen(a)redhat.com> 2.13.90-1
-- Update to 2.13.90
-
-* Fri Jan 20 2006 Matthias Clasen <mclasen(a)redhat.com> 2.13.5-2
-- Remove "Switch user" button
-
-* Tue Jan 17 2006 Matthias Clasen <mclasen(a)redhat.com> 2.13.5-1
-- Update to 2.13.5
-
-* Thu Jan 5 2006 Matthias Clasen <mclasen(a)redhat.com> 2.13.4-1
-- Update to 2.13.4
-- reinstate the desktop-menu-renaming
-
-* Wed Dec 21 2005 Ray Strode <rstrode(a)redhat.com> 2.13.3-3
-- add patch from cvs to fix crasher bug
-
-* Tue Dec 20 2005 Matthias Clasen <mclasen(a)redhat.com> 2.13.3-2
-- Rebuild against new libedataserver
-
-* Thu Dec 15 2005 Matthias Clasen <mclasen(a)redhat.com> 2.13.3-1
-- Update to 2.13.3
-- Use sed rather than patch for po files
-
-* Fri Dec 09 2005 Jesse Keating <jkeating(a)redhat.com>
-- rebuilt
-
-* Fri Dec 2 2005 Matthias Clasen <mclasen(a)redhat.com> 2.13.2-1
-- Update to 2.13.2
-
-* Sun Nov 13 2005 John (J5) Palmieri <johnp(a)redhat.com> 2.12.1-7
-- Fix patch to refrence about-fedora.desktop and not fedora-about.desktop
-
-* Sun Nov 13 2005 John (J5) Palmieri <johnp(a)redhat.com> 2.12.1-6
-- add about fedora menu item
-- readd gnome-main-menu.png as fedora-logo now installs it to
- the Bluecurve theme
-
-* Sat Nov 12 2005 Florian La Roche <laroche(a)redhat.com>
-- remove gnome-main-menu.png as this is part of fedora-logos
-
-* Tue Nov 1 2005 Ray Strode <rstrode(a)redhat.com> 2.12.1-4
-- rename "Desktop" menu to "System" menu (bug 170812)
-
-* Thu Oct 20 2005 Matthias Clasen <mclasen(a)redhat.com> 2.12.1-3
-- Add trash applet to the default setup
-
-* Mon Oct 17 2005 Matthias Clasen <mclasen(a)redhat.com> 2.12.1-2
-- Change the "Cancel" button on the "add to" dialog to
"Close"
-
-* Thu Oct 6 2005 Matthias Clasen <mclasen(a)redhat.com> 2.12.1-1
-- Update to 2.12.1
-- Update patches
-
-* Fri Sep 30 2005 Mark McLoughlin <markmc(a)redhat.com> 2.12.0-3
-- Remove hacks to add battery applet to default panel configuration
- where ACPI/APM is available (#169621) and GIMLET in CJK locales (#169430)
-
-* Wed Sep 14 2005 Jeremy Katz <katzj(a)redhat.com> - 2.12.0-2
-- we have mozilla (and e-d-s) on ppc64 now
-
-* Tue Sep 6 2005 Mark McLoughlin <markmc(a)redhat.com> 2.12.0-1
-- Update to 2.12.0
-
-* Mon Aug 22 2005 Mark McLoughlin <markmc(a)redhat.com> 2.11.92-1
-- Update to 2.11.92.
-
-* Tue Aug 16 2005 Mark McLoughlin <markmc(a)redhat.com> 2.11.91-3
-- Rebuild for new cairo
-
-* Wed Aug 10 2005 Mark McLoughlin <markmc(a)redhat.com> 2.11.91-2
-- Fix "Adjust Date & Time" (#165586)
-
-* Wed Aug 10 2005 Mark McLoughlin <markmc(a)redhat.com> 2.11.91-1
-- Update to 2.11.91
-
-* Wed Aug 10 2005 Mark McLoughlin <markmc(a)redhat.com> 2.11.90-2
-- Bump gtk2 req to 2.7.1
-- Remove bogus/stale reqs: libxslt-devel, startup-notification-devel,
- gnome-keyring, libpng-devel, fontconfig-devel, libtool, automake,
- autoconf ...
-
-* Thu Aug 4 2005 Matthias Clasen <mclasen(a)redhat.com> 2.11.90-1
-- New upstream version
-
-* Tue Jul 26 2005 Mark McLoughlin <markmc(a)redhat.com> 2.11.4-3
-- Rebuild
-
-* Tue Jul 12 2005 Matthias Clasen <mclasen(a)redhat.com> 2.11.4-2
-- Rebuild
-
-* Fri Jul 8 2005 Matthias Clasen <mclasen(a)redhat.com> 2.11.4-1
-- Update to 2.11.4
-
-* Mon Jun 27 2005 Mark McLoughlin <markmc(a)redhat.com> 2.10.1-11
-- Fix "panel doesn't notice new screen size" issue (bug #160439)
-
-* Wed May 11 2005 Mark McLoughlin <markmc(a)redhat.com> 2.10.1-10
-- Fix "dialogs pop up under panel dialogs" issue (bug #156425)
-
-* Wed May 4 2005 Mark McLoughlin <markmc(a)redhat.com> 2.10.1-9
-- Fix crash with "Recent Documents" menu (bug #156633)
-
-* Mon May 2 2005 Mark McLoughlin <markmc(a)redhat.com> 2.10.1-8
-- Update to new
OpenOffice.org .desktop file locations in
- openoffice.org-1.9.97-3 (bug #156064)
-
-* Wed Apr 27 2005 Mark McLoughlin <markmc(a)redhat.com> - 2.10.1-7
-- Add patch to clamp the size of the icons on the panel at 48x48. Fixes
- "moved the panel to the side, can't move it back" issue (rh #141743)
-
-* Wed Apr 27 2005 Mark McLoughlin <markmc(a)redhat.com> 2.10.1-6
-- Reference the
OpenOffice.org Impress .desktop file correctly
-
-* Wed Apr 27 2005 Mark McLoughlin <markmc(a)redhat.com> 2.10.1-5
-- Update launcher locations for
OpenOffice.org icons
-
-* Wed Apr 27 2005 Jeremy Katz <katzj(a)redhat.com> - 2.10.1-4
-- silence %%post
-
-* Mon Apr 25 2005 Mark McLoughlin <markmc(a)redhat.com> 2.10.1-3
-- Add patch to make Wanda not use non-existent fortune
- command (rh #152948)
-
-* Mon Apr 18 2005 Mark McLoughlin <markmc(a)redhat.com> 2.10.1-2
-- Add the battery applet to the panel in %%post if ACPI is
- available (bug #143828)
-
-* Mon Apr 4 2005 Mark McLoughlin <markmc(a)redhat.com> 2.10.1-1
-- Update to 2.10.1
-
-* Mon Mar 28 2005 Christopher Aillon <caillon(a)redhat.com>
-- rebuilt
-
-* Fri Mar 25 2005 Christopher Aillon <caillon(a)redhat.com> 2.10.0-2
-- Update the GTK+ theme icon cache on (un)install
-
-* Mon Mar 14 2005 Matthias Clasen <mclasen(a)redhat.com> 2.10.0-1
-- Update to 2.10.0
-- Bump BuildRequires for libwnck
-- Update patches
-
-* Wed Mar 4 2005 Mark McLoughlin <markmc(a)redhat.com> 2.9.91-4
-- Fix a BuildRequires
-
-* Wed Mar 2 2005 Mark McLoughlin <markmc(a)redhat.com> 2.9.91-3
-- Rebuild with gcc4
-
-* Thu Feb 10 2005 Mark McLoughlin <markmc(a)redhat.com> - 2.9.91-2
-- Require gnome-desktop 2.9.91
-
-* Wed Feb 9 2005 Matthias Clasen <mclasen(a)redhat.com> - 2.9.91-1
-- Update to 2.9.91
-
-* Mon Feb 7 2005 Mark McLoughlin <markmc(a)redhat.com> - 2.9.90-4
-- Don't use --makefile-install-rule to install .entries files (#147112)
-
-* Fri Feb 4 2005 Mark McLoughlin <markmc(a)redhat.com> - 2.9.90-3
-- Update schemas list (#147112)
-
-* Thu Feb 3 2005 Matthias Clasen <mclasen(a)redhat.com> - 2.9.90-2
-- Look for vendor-prefixed .desktop files
-
-* Mon Jan 31 2005 Matthias Clasen <mclasen(a)redhat.com> - 2.9.90
-- Update to 2.9.90
-
-* Fri Jan 28 2005 Florian La Roche <laroche(a)redhat.com>
-- rebuild
-
-* Thu Jan 27 2005 Jeremy Katz <katzj(a)redhat.com> - 2.8.1-8
-- really disable e-d-s support
-
-* Wed Jan 26 2005 David Malcolm <dmalcolm(a)redhat.com> - 2.8.1-7
-- Make the evolution-data-server dependency optional at packaging time.
-- Disable it for now to ease transition to Evolution 2.2 (bug #146283)
-
-* Fri Nov 26 2004 Mark McLoughlin <markmc(a)redhat.com> - 2.8.1-6
-- Add patch to fix launcher animation artifact (bug #136938)
-
-* Fri Nov 12 2004 Mark McLoughlin <markmc(a)redhat.com> - 2.8.1-5
-- Use /apps/panel for configuration so that homedir sharing with
- previous versions works reasonably well. This is the location
- upstream is using from GNOME 2.10 onwards.
-- Install old pager.schemas and tasklist.schemas so that
- old configurations which reference the old schema names
- continue to work
-
-* Mon Nov 1 2004 Mark McLoughlin <markmc(a)redhat.com> - 2.8.1-4
-- Fix use-correct-applications-uri patch to not crash on
- ia64 - fix from Dave Malcolm (#136908)
-
-* Mon Oct 18 2004 <jrb(a)redhat.com> - 2.8.1-3
-- change redhat-web.desktop and redhat-email.desktop to be in /usr/share instead of using
the menu path
-
-* Fri Oct 15 2004 Matthias Clasen <mclasen(a)redhat.com>
-- Make dropping non-ASCII uris work. (#135874)
-
-* Tue Oct 12 2004 Mark McLoughlin <markmc(a)redhat.com>
-- Update to 2.8.1
-- Change the default no. pager rows back to 1
-- Add a new tamil translation
-
-* Thu Oct 7 2004 Mark McLoughlin <markmc(a)redhat.com> 2.8.0.1-3
-- Add the Input Method Switcher applet in certain locales (#134659)
-
-* Fri Oct 1 2004 Mark McLoughlin <markmc(a)redhat.com> 2.8.0.1-2
-- New panel layout from Bryan and Seth
-
-* Wed Sep 29 2004 Mark McLoughlin <markmc(a)redhat.com> 2.8.0.1-1
-- Update to 2.8.0.1
-
-* Tue Sep 21 2004 Mark McLoughlin <markmc(a)redhat.com> 2.8.0-2
-- Remove the print launcher from the default setup - it was removed
- from the desktop-printing package a while ago
-
-* Tue Sep 21 2004 Mark McLoughlin <markmc(a)redhat.com> 2.8.0-1
-- Update to 2.8.0
-
-* Tue Aug 31 2004 Mark McLoughlin <markmc(a)redhat.com> 2.7.92.1-1
-- Update to 2.7.92.1
-
-* Mon Aug 30 2004 Mark McLoughlin <markmc(a)redhat.com> 2.7.92-1
-- Update to 2.7.92
-
-* Wed Aug 25 2004 Mark McLoughlin <markmc(a)redhat.com> 2.7.91.1-2
-- Pipe gconftool stdout to /dev/null - fixes bug #130506
-
-* Thu Aug 19 2004 Mark McLoughlin <markmc(a)redhat.com> 2.7.91.1-1
-- Update to 2.7.91.1
-
-* Wed Aug 18 2004 Mark McLoughlin <markmc(a)redhat.com> 2.7.91-1
-- Update to 2.7.91
-
-* Tue Aug 10 2004 Mark McLoughlin <markmc(a)redhat.com> - 2.7.90-1
-- Update to 2.7.90 and remove a bunch of patches
-
-* Mon Aug 2 2004 David Malcolm <dmalcolm(a)redhat.com> - 2.6.0-11
-- added dependency on evolution-data-server and rebuilt
-
-* Tue Jun 15 2004 Elliot Lee <sopwith(a)redhat.com>
-- rebuilt
-
-* Mon Apr 19 2004 Mark McLoughlin <markmc(a)redhat.com> 2.6.0-9
-- Install battstat on the default panel on ppc too
-
-* Mon Apr 19 2004 Mark McLoughlin <markmc(a)redhat.com> 2.6.0-8
-- Only put the battstat applet on the default panel on ix86 (i.e. the
- platforms where apmd is built) - bug #121098
-
-* Thu Apr 15 2004 Mark McLoughlin <markmc(a)redhat.com> 2.6.0-7
-- Fix typo with laptop battery detection scriptlet - bug #120921
-
-* Thu Apr 15 2004 Mark McLoughlin <markmc(a)redhat.com> 2.6.0-6
-- Overwrite panel-compatibility.schemas with
- redhat-panel-backwards-compat-config.schemas and install that so
- it doesn't seem like we've forgotten panel-compatibility.schemas
-
-* Thu Apr 8 2004 Mark McLoughlin <markmc(a)redhat.com> 2.6.0-5
-- Fix problem with apm detection in %%post on machines whose
- APM bios doesn't have battery lifetime support
-
-* Wed Apr 7 2004 Mark McLoughlin <markmc(a)redhat.com> - 2.6.0-4
-- Add patch to make the applications list in the run dialog work
- correctly with the new vfs menu module. Bug #118305.
-
-* Mon Apr 5 2004 Mark McLoughlin <markmc(a)redhat.com> 2.6.0-3
-- Fix "vailed to parse hour_format" warnings on install (bug #119956)
-
-* Fri Apr 5 2004 Mark McLoughlin <markmc(a)redhat.com> - 2.6.0-2
-- Add patches to fixup how we install the default setup
-- Require GConf2-2.6.0-2 for gconftool-2 --load fix
-
-* Wed Mar 31 2004 Mark McLoughlin <markmc(a)redhat.com> 2.6.0-1
-- Update to 2.6.0
-
-* Wed Mar 10 2004 Mark McLoughlin <markmc(a)redhat.com>
-- Update to 2.5.92
-
-* Wed Mar 03 2004 Mark McLoughlin <markmc(a)redhat.com> 2.5.91-2
-- Use the main menu icon in the menu bar (#100407)
-
-* Tue Mar 02 2004 Elliot Lee <sopwith(a)redhat.com>
-- rebuilt
-
-* Tue Mar 02 2004 Mark McLoughlin <markmc(a)redhat.com> 2.5.91-1
-- Update to 2.5.91
-- Split off a -devel package (#108618)
-- Add a scrollkeeper PreReq and scrollkeeper, intltool and
- libpng-devel BuildRequires. (#110928, Maxim Dzumanenko)
-
-* Fri Feb 27 2004 Mark McLoughlin <markmc(a)redhat.com> 2.5.90-1
-- Update to 2.5.90
-- Resolve conflicts with the lockf patch and re-work slightly
-
-* Thu Feb 19 2004 Jeremy Katz <katzj(a)redhat.com> - 2.5.3.1-6
-- and again for real this time
-
-* Wed Feb 18 2004 Jeremy Katz <katzj(a)redhat.com> - 2.5.3.1-5
-- rebuild without e-d-s
-
-* Fri Feb 13 2004 Elliot Lee <sopwith(a)redhat.com>
-- rebuilt
-
-* Fri Feb 06 2004 Dan Williams <dcbw(a)redhat.com> 2.5.3.1-3
-- Add in file locking retries for egg-recent-model stuff, as with
- gedit. Makes gnome-panel and other apps like gedit not fight
- for recent files list on NFS home directories
-
-* Tue Jan 27 2004 Alexander Larsson <alexl(a)redhat.com> 2.5.3.1-2
-- Add evolution-data-server dependency and rebuild
-
-* Thu Oct 9 2003 Owen Taylor <otaylor(a)redhat.com> 2.4.0-2
-- Look up the largest size available when picking default images for
- panel stock icons (#106673)
-
-* Thu Sep 4 2003 Alexander Larsson <alexl(a)redhat.com> 2.3.90-1
-- update to 2.3.90
-- Add backwards compat panel config schemas
-
-* Wed Aug 27 2003 Alexander Larsson <alexl(a)redhat.com> 2.3.7-1
-- update to 2.3.7
-- patch the right icon for the main menu (#102672)
-- PreReq a new gconf (#102530)
-
-* Mon Aug 25 2003 Alexander Larsson <alexl(a)redhat.com> 2.3.6.2-4
-- Don't lock all objects on panel
-- use "make DESTDIR=... install" so gconf rules are right
-
-* Mon Aug 18 2003 Alexander Larsson <alexl(a)redhat.com> 2.3.6.2-3
-- Update the default panel setup handling to the new way
-
-* Thu Aug 14 2003 Jonathan Blandford <jrb(a)redhat.com> 2.3.6.2-1
-- remove the right .la files.
-
-* Thu Aug 14 2003 Alexander Larsson <alexl(a)redhat.com> 2.3.6.2-1
-- update for gnome 2.3
-
-* Tue Jul 29 2003 Havoc Pennington <hp(a)redhat.com> 2.2.2.1-3
-- disable gtk doc
-
-* Mon Jul 28 2003 Havoc Pennington <hp(a)redhat.com> 2.2.2.1-3
-- rebuild
-
-* Wed Jul 9 2003 Alexander Larsson <alexl(a)redhat.com> 2.2.2.1-2
-- Fix redhat menu icon
-
-* Mon Jul 7 2003 Havoc Pennington <hp(a)redhat.com> 2.2.2.1-1
-- 2.2.2.1
-- remove memleaks patch, now upstream
-- remove applet-sm patch now upstream
-- remove "null" patch, now upstream
-- remove recent-monitor patch now upstream
-- remove notification area crash fix, now upstream
-
-* Wed Jun 04 2003 Elliot Lee <sopwith(a)redhat.com>
-- rebuilt
-
-* Mon Feb 24 2003 Elliot Lee <sopwith(a)redhat.com>
-- debuginfo rebuild
-
-* Mon Feb 24 2003 Elliot Lee <sopwith(a)redhat.com> 2.2.0.1-8
-- Rebuild with an updated libtool to fix #84742
-
-* Thu Feb 20 2003 Havoc Pennington <hp(a)redhat.com> 2.2.0.1-6
-- fix memleaks, #84489 #84467
-- use icon theme for button widgets instead of stock ID #82301
-
-* Fri Feb 14 2003 Havoc Pennington <hp(a)redhat.com> 2.2.0.1-5
-- disable session management for all applets
-
-* Tue Feb 11 2003 Havoc Pennington <hp(a)redhat.com> 2.2.0.1-4
-- fix #83683 for real, very embarassing bug in the end
-
-* Tue Feb 11 2003 Havoc Pennington <hp(a)redhat.com> 2.2.0.1-3
-- add assertions to try to narrow down #83683 more
-
-* Tue Feb 11 2003 Tim Waugh <twaugh(a)redhat.com> 2.2.0.1-2
-- Fix notification area crash (bug #83683).
-
-* Wed Feb 5 2003 Havoc Pennington <hp(a)redhat.com> 2.2.0.1-1
-- 2.2.0.1
-
-* Mon Feb 3 2003 Matt Wilson <msw(a)redhat.com> 2.2.0-2
-- added gnome-panel-2.1.90.1-null.patch to avoid segv on 64 bit platforms
- #82978
-
-* Mon Feb 3 2003 Alexander Larsson <alexl(a)redhat.com> 2.2.0-1
-- Update to 2.2.0
-- Add patch to disable monitoring in recent-files, since it made you not able to unmount
cds.
-
-* Thu Jan 30 2003 Matt Wilson <msw(a)redhat.com> 2.1.90.1-6
-- disable optimizations on x86_64 to work around gcc bug
-
-* Wed Jan 22 2003 Tim Powers <timp(a)redhat.com>
-- rebuilt
-
-* Mon Jan 13 2003 Jonathan Blandford <jrb(a)redhat.com>
-- put the control-center second
-
-* Sat Jan 11 2003 Havoc Pennington <hp(a)redhat.com>
-- fix the extra separator left when we lack screenshot menuitem
-
-* Fri Jan 10 2003 Havoc Pennington <hp(a)redhat.com>
-- fix the clock
-
-* Thu Jan 9 2003 Havoc Pennington <hp(a)redhat.com>
-- remove enhanced-errors patch now upstream
-- change how we're doing the laptop-specific config to avoid cut-and-paste
-- update clock-addons patch
-- remove hardcoded change to default panel icon size, we'll put it in bluecurve
- theme.
-- run xscreensaver fortune instead of just "fortune" from the fish
-- add printer icon to panel
-
-* Wed Jan 8 2003 Havoc Pennington <hp(a)redhat.com>
-- 2.1.90.1
-
-* Mon Dec 16 2002 Tim Powers <timp(a)redhat.com> 2.1.4-4
-- rebuild
-
-* Mon Dec 16 2002 Havoc Pennington <hp(a)redhat.com>
-- rebuild
-
-* Sat Dec 14 2002 Havoc Pennington <hp(a)redhat.com>
-- require gnome-desktop 2.1.4
-- include datadir/fish
-
-* Fri Dec 13 2002 Havoc Pennington <hp(a)redhat.com>
-- 2.1.4
-
-* Mon Dec 2 2002 Havoc Pennington <hp(a)redhat.com>
-- 2.1.3
-- build req startup-notification-devel
-
-* Wed Nov 13 2002 Havoc Pennington <hp(a)redhat.com>
-- 2.1.2
-- system tray is now in the main gnome-panel package
-
-* Wed Oct 23 2002 Havoc Pennington <hp(a)redhat.com>
-- 2.0.10
-- remove memleaks-and-clock-format patch, should be upstream
-- remove WIN_POS_MOUSE purge, done upstream
-
-* Mon Oct 14 2002 Florian La Roche <Florian.LaRoche(a)redhat.de>
-- fix postun script
-
-* Tue Oct 8 2002 Havoc Pennington <hp(a)redhat.com>
-- 2.0.9 with menu edit stuff
-- system-tray-applet 0.15 that doesn't crash all the time
-- merge/remove patches as appropriate
-
-* Wed Aug 28 2002 Owen Taylor <otaylor(a)redhat.com>
-- Fix problem with "hold down print screen" (71432)
-
-* Tue Aug 27 2002 Jonathan Blandford <jrb(a)redhat.com>
-- panel-properties OnlyShowIn=GNOME;
-- somehow the po file got screwed up. Works now
-- update po files
-
-* Sun Aug 25 2002 Havoc Pennington <hp(a)redhat.com>
-- fix from #71762 for clock applet popdown key
-- no WIN_POS_MOUSE fixes #72167
-- fix for #72540 from George
-
-* Wed Aug 21 2002 Havoc Pennington <hp(a)redhat.com>
-- system tray applet 0.11 with a small memleak fix and a couple translations
-
-* Thu Aug 15 2002 Jonathan Blandford <jrb(a)redhat.com>
-- menu tweaks
-
-* Wed Aug 14 2002 Tim Powers <timp(a)redhat.com>
-- bump release
-
-* Wed Aug 14 2002 Preston Brown <pbrown(a)redhat.com>
-- put battery applet on panel for laptops (#67296)
-
-* Mon Aug 12 2002 Havoc Pennington <hp(a)redhat.com>
-- 2.0.6 final from gnome 2.0.1
-- remove gnome-panel-screenshot patch now upstream
-
-* Thu Aug 8 2002 Jonathan Blandford <jrb(a)redhat.com>
-- new system-tray-applet version
-- Fix gnome-panel-screenshot
-
-* Tue Aug 6 2002 Havoc Pennington <hp(a)redhat.com>
-- 2.0.4
-- replace gnome-logo-icon-transparent.png with redhat-main-menu.png
- for the foot menu
-
-* Fri Aug 2 2002 Havoc Pennington <hp(a)redhat.com>
-- fix desktop (logout/lock) menu item location
- in Alt+F1 and in new menu applets
-- remove Screenshot... menu item
-
-* Fri Aug 2 2002 Havoc Pennington <hp(a)redhat.com>
-- move around default applets, remove some of them
-- system tray 0.9
-- change default menu flags
-- blow unpackaged files out of build root
-
-* Wed Jul 31 2002 Havoc Pennington <hp(a)redhat.com>
-- 2.0.3
-- own libexecdir stuff
-
-* Thu Jul 25 2002 Havoc Pennington <hp(a)redhat.com>
-- new system tray that's prettier and doesn't clip the icon
-
-* Wed Jul 24 2002 Havoc Pennington <hp(a)redhat.com>
-- system tray 0.7 that doesn't crash on startup
-- get Mozilla desktop file right so we get web browser launcher
-
-* Wed Jul 24 2002 Havoc Pennington <hp(a)redhat.com>
-- system tray 0.6 with server file fixed (work dammit)
-
-* Tue Jul 23 2002 Havoc Pennington <hp(a)redhat.com>
-- tweak applet positions but I think it's just broken
-- system tray 0.5 moved back to libdir not libexecdir
-
-* Tue Jul 23 2002 Havoc Pennington <hp(a)redhat.com>
-- remove ltmain.sh hack
-- new system-tray-applet that works
-
-* Tue Jul 23 2002 Havoc Pennington <hp(a)redhat.com>
-- put office suite stuff on the panel
-
-* Tue Jul 23 2002 Havoc Pennington <hp(a)redhat.com>
-- 2.0.2.90 cvs snap
-
-* Wed Jul 10 2002 Havoc Pennington <hp(a)redhat.com>
-- update the clock patch to be a little smarter in a couple ways
-
-* Thu Jun 27 2002 Owen Taylor <otaylor(a)redhat.com>
-- Fix problem where system tray applet was being looked for in /unst
-- Fix a crash in the system tray applet
-
-* Wed Jun 26 2002 Owen Taylor <otaylor(a)redhat.com>
-- Fix typo in the pt_BR translation that was causing GConf problems
-
-* Mon Jun 24 2002 Havoc Pennington <hp(a)redhat.com>
-- add the system tray applet
-- add system tray applet by default
-- add more launcher by default
-
-* Fri Jun 21 2002 Tim Powers <timp(a)redhat.com>
-- automated rebuild
-
-* Thu Jun 20 2002 Havoc Pennington <hp(a)redhat.com>
-- use correct gettext package name, and add check for missing translations
-
-* Mon Jun 17 2002 Havoc Pennington <hp(a)redhat.com>
-- add the calendar and configuration patch
-
-* Sun Jun 16 2002 Havoc Pennington <hp(a)redhat.com>
-- 2.0.0
-- add control center desktop file to file list
-- add gnome-panelrc to file list
-- try fixing panel size (blind, no text box at home)
-
-* Tue Jun 11 2002 Havoc Pennington <hp(a)redhat.com>
-- rebuild in different environment
-
-* Tue Jun 11 2002 Havoc Pennington <hp(a)redhat.com>
-- updates to default configuration
-
-* Tue Jun 11 2002 Havoc Pennington <hp(a)redhat.com>
-- fix schemas installation
-
-* Tue Jun 11 2002 Havoc Pennington <hp(a)redhat.com>
-- unset old panel schemas when installing new ones
-- put in a broken panel config to see errors about
-- add a patch to give some decent error messages about what's wrong
- with the default panel config
-
-* Sun Jun 09 2002 Havoc Pennington <hp(a)redhat.com>
-- rebuild in different environment
-
-* Sun Jun 9 2002 Havoc Pennington <hp(a)redhat.com>
-- don't provide/obsolete gnome-core
-
-* Fri Jun 07 2002 Havoc Pennington <hp(a)redhat.com>
-- rebuild in different environment
-
-* Wed Jun 5 2002 Havoc Pennington <hp(a)redhat.com>
-- 1.5.24
-- ldconfig
-
-* Mon Jun 03 2002 Havoc Pennington <hp(a)redhat.com>
-- rebuild in different environment
-
-* Fri May 31 2002 Havoc Pennington <hp(a)redhat.com>
-- 1.5.23
-
-* Sun May 26 2002 Tim Powers <timp(a)redhat.com>
-- automated rebuild
-
-* Tue May 21 2002 Havoc Pennington <hp(a)redhat.com>
-- rebuild in different environment
-
-* Tue May 21 2002 Havoc Pennington <hp(a)redhat.com>
-- 1.5.22
-- provide gnome-core
-- add a bunch of extra build requires so build system
- won't get confused
-
-* Fri May 3 2002 Havoc Pennington <hp(a)redhat.com>
-- 1.5.19
-
-* Fri Apr 19 2002 Havoc Pennington <hp(a)redhat.com>
-- add the keep-libtool-from-relinking hack so
- we get the gen util applet
-
-* Fri Apr 19 2002 Havoc Pennington <hp(a)redhat.com>
-- obsoletes gnome-core-devel
-- include libdir/*.so
-
-* Fri Apr 19 2002 Havoc Pennington <hp(a)redhat.com>
-- get libpanel-applet in the package
-
-* Tue Apr 16 2002 Havoc Pennington <hp(a)redhat.com>
-- Initial build.
-
-
diff --git a/icon-padding.patch b/icon-padding.patch
deleted file mode 100644
index 5ccf4c0..0000000
--- a/icon-padding.patch
+++ /dev/null
@@ -1,255 +0,0 @@
-diff -u -r gnome-panel-2.28.0/applets/notification_area/main.c
hacked/applets/notification_area/main.c
---- gnome-panel-2.28.0/applets/notification_area/main.c 2009-07-01 09:06:23.000000000
-0400
-+++ hacked/applets/notification_area/main.c 2009-10-17 23:06:01.001313433 -0400
-@@ -25,6 +25,7 @@
-
- #include <panel-applet.h>
- #include <panel-applet-gconf.h>
-+#include <gconf/gconf-client.h>
-
- #include <glib/gi18n.h>
- #include <gtk/gtk.h>
-@@ -34,6 +35,7 @@
- #include "fixedtip.h"
-
- #define NOTIFICATION_AREA_ICON "gnome-panel-notification-area"
-+#define SCHEMA_DIR "/schemas/apps/notification_area_applet/prefs"
-
- typedef struct
- {
-@@ -231,6 +233,39 @@
- gtk_widget_set_name (widget, "na-tray");
- }
-
-+static void
-+padding_changed (GConfClient *client,
-+ guint cnxn_id,
-+ GConfEntry *entry,
-+ gpointer user_data)
-+{
-+ AppletData *data = user_data;
-+ gint value;
-+
-+ if (!entry->value || entry->value->type != GCONF_VALUE_INT)
-+ return;
-+
-+ value = gconf_value_get_int (entry->value);
-+
-+ na_tray_set_padding (data->tray, value);
-+}
-+
-+static void
-+setup_gconf (AppletData *data)
-+{
-+ GConfClient *client;
-+ char *key;
-+ int value;
-+
-+ client = gconf_client_get_default ();
-+ key = panel_applet_gconf_get_full_key (data->applet, "padding");
-+ value = gconf_client_get_int (client, key, NULL);
-+ na_tray_set_padding (data->tray, value);
-+ gconf_client_notify_add (client, key, padding_changed, data, NULL, NULL);
-+ g_free (key);
-+ g_object_unref (client);
-+}
-+
- static gboolean
- applet_factory (PanelApplet *applet,
- const gchar *iid,
-@@ -260,9 +295,10 @@
- atko = gtk_widget_get_accessible (GTK_WIDGET (applet));
- atk_object_set_name (atko, _("Panel Notification Area"));
-
-+ panel_applet_add_preferences (applet, SCHEMA_DIR, NULL);
- panel_applet_set_flags (applet,
- PANEL_APPLET_HAS_HANDLE|PANEL_APPLET_EXPAND_MINOR);
--
-+
- g_signal_connect (applet, "change_orient",
- G_CALLBACK (applet_change_orientation), data);
- g_signal_connect (applet, "change_background",
-@@ -270,6 +306,8 @@
- g_signal_connect (applet, "destroy",
- G_CALLBACK (applet_destroy), data);
-
-+ setup_gconf (data);
-+
- panel_applet_set_background_widget (applet, GTK_WIDGET (applet));
-
- gtk_container_add (GTK_CONTAINER (applet), GTK_WIDGET (tray));
-diff -u -r gnome-panel-2.28.0/applets/notification_area/Makefile.am
hacked/applets/notification_area/Makefile.am
---- gnome-panel-2.28.0/applets/notification_area/Makefile.am 2009-07-21
13:25:43.000000000 -0400
-+++ hacked/applets/notification_area/Makefile.am 2009-10-17 23:16:42.401072682 -0400
-@@ -66,6 +66,24 @@
-
- @INTLTOOL_SERVER_RULE@
-
-+schemasdir = $(GCONF_SCHEMA_FILE_DIR)
-+schemas_in_files = notification_area_applet.schemas.in
-+schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
-+
-+@INTLTOOL_SCHEMAS_RULE@
-+
-+if GCONF_SCHEMAS_INSTALL
-+# don't do this if we are building in eg. rpm
-+install-data-local:
-+ if test -z "$(DESTDIR)" ; then \
-+ for p in $(schemas_DATA) ; do \
-+ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL)
--makefile-install-rule $(top_builddir)/applets/notification_area/$$p ; \
-+ done \
-+ fi
-+else
-+install-data-local:
-+endif
-+
- uidir = $(datadir)/gnome-2.0/ui
- ui_DATA = GNOME_NotificationAreaApplet.xml
-
-diff -u -r gnome-panel-2.28.0/applets/notification_area/na-tray.c
hacked/applets/notification_area/na-tray.c
---- gnome-panel-2.28.0/applets/notification_area/na-tray.c 2009-10-17 23:22:01.095308064
-0400
-+++ hacked/applets/notification_area/na-tray.c 2009-10-17 23:00:01.304062848 -0400
-@@ -602,6 +602,8 @@
- {
- trays_screens [screen_number].tray_manager = tray_manager;
-
-+ na_tray_manager_set_padding (tray_manager, 0);
-+
- g_signal_connect (tray_manager, "tray_icon_added",
- G_CALLBACK (tray_added),
- &trays_screens [screen_number]);
-@@ -804,6 +806,16 @@
- }
-
- void
-+na_tray_set_padding (NaTray *tray,
-+ gint padding)
-+{
-+ NaTrayPrivate *priv = tray->priv;
-+
-+ if (get_tray (priv->trays_screen) == tray)
-+ na_tray_manager_set_padding (priv->trays_screen->tray_manager, padding);
-+}
-+
-+void
- na_tray_force_redraw (NaTray *tray)
- {
- NaTrayPrivate *priv = tray->priv;
-diff -u -r gnome-panel-2.28.0/applets/notification_area/na-tray.h
hacked/applets/notification_area/na-tray.h
---- gnome-panel-2.28.0/applets/notification_area/na-tray.h 2009-04-19 13:45:09.000000000
-0400
-+++ hacked/applets/notification_area/na-tray.h 2009-10-17 23:00:30.491375187 -0400
-@@ -60,6 +60,8 @@
- void na_tray_set_orientation (NaTray *tray,
- GtkOrientation orientation);
- GtkOrientation na_tray_get_orientation (NaTray *tray);
-+void na_tray_set_padding (NaTray *tray,
-+ gint padding);
- void na_tray_force_redraw (NaTray *tray);
-
- G_END_DECLS
-diff -u -r gnome-panel-2.28.0/applets/notification_area/na-tray-manager.c
hacked/applets/notification_area/na-tray-manager.c
---- gnome-panel-2.28.0/applets/notification_area/na-tray-manager.c 2009-07-27
08:01:39.000000000 -0400
-+++ hacked/applets/notification_area/na-tray-manager.c 2009-10-17 21:55:00.582062966
-0400
-@@ -653,6 +653,32 @@
- #endif
- }
-
-+static void
-+na_tray_manager_set_padding_property (NaTrayManager *manager)
-+{
-+#ifdef GDK_WINDOWING_X11
-+ GdkDisplay *display;
-+ Atom orientation_atom;
-+ gulong data[1];
-+
-+ if (!manager->invisible || !manager->invisible->window)
-+ return;
-+
-+ display = gtk_widget_get_display (manager->invisible);
-+ orientation_atom = gdk_x11_get_xatom_by_name_for_display (display,
-+
"_NET_SYSTEM_TRAY_PADDING");
-+
-+ data[0] = manager->padding;
-+
-+ XChangeProperty (GDK_DISPLAY_XDISPLAY (display),
-+ GDK_WINDOW_XWINDOW (manager->invisible->window),
-+ orientation_atom,
-+ XA_CARDINAL, 32,
-+ PropModeReplace,
-+ (guchar *) &data, 1);
-+#endif
-+}
-+
- #ifdef GDK_WINDOWING_X11
-
- static gboolean
-@@ -697,6 +723,7 @@
-
- na_tray_manager_set_orientation_property (manager);
- na_tray_manager_set_visual_property (manager);
-+ na_tray_manager_set_padding_property (manager);
-
- timestamp = gdk_x11_get_server_time (invisible->window);
-
-@@ -836,6 +863,20 @@
- }
- }
-
-+void
-+na_tray_manager_set_padding (NaTrayManager *manager,
-+ gint padding)
-+{
-+ g_return_if_fail (NA_IS_TRAY_MANAGER (manager));
-+
-+ if (manager->padding != padding)
-+ {
-+ manager->padding = padding;
-+
-+ na_tray_manager_set_padding_property (manager);
-+ }
-+}
-+
- GtkOrientation
- na_tray_manager_get_orientation (NaTrayManager *manager)
- {
-diff -u -r gnome-panel-2.28.0/applets/notification_area/na-tray-manager.h
hacked/applets/notification_area/na-tray-manager.h
---- gnome-panel-2.28.0/applets/notification_area/na-tray-manager.h 2009-04-19
13:45:09.000000000 -0400
-+++ hacked/applets/notification_area/na-tray-manager.h 2009-10-17 21:55:42.646312700
-0400
-@@ -55,6 +55,7 @@
- GtkWidget *invisible;
- GdkScreen *screen;
- GtkOrientation orientation;
-+ gint padding;
-
- GList *messages;
- GHashTable *socket_table;
-@@ -91,6 +92,8 @@
- void na_tray_manager_set_orientation (NaTrayManager *manager,
- GtkOrientation orientation);
- GtkOrientation na_tray_manager_get_orientation (NaTrayManager *manager);
-+void na_tray_manager_set_padding (NaTrayManager *manager,
-+ gint padding);
-
- G_END_DECLS
-
-diff -u -r
gnome-panel-2.28.0/applets/notification_area/notification_area_applet.schemas.in
hacked/applets/notification_area/notification_area_applet.schemas.in
----
gnome-panel-2.28.0/applets/notification_area/notification_area_applet.schemas.in 2009-10-17
23:23:41.071058057 -0400
-+++ hacked/applets/notification_area/notification_area_applet.schemas.in 2009-10-17
23:21:38.588316399 -0400
-@@ -0,0 +1,17 @@
-+<?xml version="1.0"?>
-+<gconfschemafile>
-+ <schemalist>
-+ <schema>
-+ <key>/schemas/apps/notification_area_applet/prefs/padding</key>
-+ <owner>notification-area-applet</owner>
-+ <type>int</type>
-+ <default>3</default>
-+ <locale name="C">
-+ <short>Padding</short>
-+ <long>
-+ This key specifies padding to be put around status icons.
-+ </long>
-+ </locale>
-+ </schema>
-+ </schemalist>
-+</gconfschemafile>
diff --git a/launcher-desktop-files.patch b/launcher-desktop-files.patch
deleted file mode 100644
index ab2d715..0000000
--- a/launcher-desktop-files.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff -up gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c.launcher-desktop-files
gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c
----
gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c.launcher-desktop-files 2010-01-13
22:26:27.000000000 -0500
-+++ gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c 2010-01-17 18:05:34.492279538
-0500
-@@ -960,6 +960,51 @@ panel_ditem_editor_icon_changed (PanelDI
- icon);
- }
-
-+static gboolean
-+update_editor_from_desktop_file (PanelDItemEditor *dialog,
-+ const gchar *uri)
-+{
-+ GKeyFile *key_file;
-+ char *name;
-+ char *comment;
-+ char *exec;
-+ char *icon;
-+ gboolean retval = FALSE;
-+
-+ key_file = g_key_file_new ();
-+ if (g_key_file_load_from_file (key_file, uri, 0, NULL)) {
-+ if (panel_key_file_get_boolean (key_file, "Terminal", FALSE))
-+ gtk_combo_box_set_active (GTK_COMBO_BOX
(dialog->priv->type_combo), 1);
-+ else
-+ gtk_combo_box_set_active (GTK_COMBO_BOX
(dialog->priv->type_combo), 0);
-+
-+ name = panel_key_file_get_locale_string (key_file, "Name");
-+ comment = panel_key_file_get_locale_string (key_file,
"Comment");
-+ icon = panel_key_file_get_locale_string (key_file, "Icon");
-+ exec = panel_key_file_get_string (key_file, "Exec");
-+
-+ gtk_entry_set_text (GTK_ENTRY (dialog->priv->name_entry), name ?
name : "");
-+ gtk_entry_set_text (GTK_ENTRY (dialog->priv->comment_entry),
comment ? comment : "");
-+ gtk_entry_set_text (GTK_ENTRY (dialog->priv->command_entry), exec ?
exec : "");
-+
-+ /* Note: we need to set the icon last, since the editor
-+ * tries to guess the icon when the command is modified
-+ */
-+ setup_icon_chooser (dialog, icon);
-+
-+ g_free (name);
-+ g_free (comment);
-+ g_free (icon);
-+ g_free (exec);
-+
-+ retval = TRUE;
-+ }
-+
-+ g_key_file_free (key_file);
-+
-+ return retval;
-+}
-+
- static void
- command_browse_chooser_response (GtkFileChooser *chooser,
- gint response_id,
-@@ -973,7 +1018,11 @@ command_browse_chooser_response (GtkFile
- case PANEL_DITEM_EDITOR_TYPE_APPLICATION:
- case PANEL_DITEM_EDITOR_TYPE_TERMINAL_APPLICATION:
- text = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (chooser));
-- uri = panel_util_make_exec_uri_for_desktop (text);
-+ if (g_str_has_suffix (text, ".desktop") &&
-+ update_editor_from_desktop_file (dialog, text))
-+ uri = NULL;
-+ else
-+ uri = panel_util_make_exec_uri_for_desktop (text);
- g_free (text);
- break;
- case PANEL_DITEM_EDITOR_TYPE_LINK:
-@@ -983,8 +1032,9 @@ command_browse_chooser_response (GtkFile
- g_assert_not_reached ();
- }
-
-- gtk_entry_set_text (GTK_ENTRY (dialog->priv->command_entry),
-- uri);
-+ if (uri)
-+ gtk_entry_set_text (GTK_ENTRY (dialog->priv->command_entry),
-+ uri);
- g_free (uri);
- }
-
diff --git a/na-style-realize.patch b/na-style-realize.patch
deleted file mode 100644
index fb7bd40..0000000
--- a/na-style-realize.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From f1652b60a9fa0580c5fc60758c3ccdfcf691b5c2 Mon Sep 17 00:00:00 2001
-From: Daniel Drake <dsd(a)laptop.org>
-Date: Mon, 17 Dec 2012 14:58:20 +0000
-Subject: [PATCH] na: apply style after realize
-
-Under Fedora 18 (GTK-3.6.2), notification icons such as the battery/power
-icon from gnome-settings-daemon are appearing all-black on top of a black
-background.
-
-This is because style_updated is being called before the tray applet
-is realized, meaning that the following code in
-na_tray_applet_style_updated() causes a bail-out:
-
- if (!applet->priv->tray)
- return;
-
-and the style is never applied.
-
-Fix this by updating the style explicitly after realizing the widget.
----
- applets/notification_area/main.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/applets/notification_area/main.c b/applets/notification_area/main.c
-index 5fc4d1d..0d5de70 100644
---- a/applets/notification_area/main.c
-+++ b/applets/notification_area/main.c
-@@ -36,6 +36,8 @@
-
- #define NOTIFICATION_AREA_ICON "gnome-panel-notification-area"
-
-+static void na_tray_applet_style_updated (GtkWidget *widget);
-+
- struct _NaTrayAppletPrivate
- {
- NaTray *tray;
-@@ -79,6 +81,7 @@ na_tray_applet_realize (GtkWidget *widget)
-
- gtk_container_add (GTK_CONTAINER (widget), GTK_WIDGET (applet->priv->tray));
- gtk_widget_show (GTK_WIDGET (applet->priv->tray));
-+ na_tray_applet_style_updated (widget);
- }
-
- static void
---
-1.8.0.1
-
diff --git a/panel-padding.patch b/panel-padding.patch
deleted file mode 100644
index 90dad4b..0000000
--- a/panel-padding.patch
+++ /dev/null
@@ -1,343 +0,0 @@
-diff -up gnome-panel-2.28.0/gnome-panel/panel-profile.c.panel-padding
gnome-panel-2.28.0/gnome-panel/panel-profile.c
---- gnome-panel-2.28.0/gnome-panel/panel-profile.c.panel-padding 2009-09-21
12:29:33.000000000 -0400
-+++ gnome-panel-2.28.0/gnome-panel/panel-profile.c 2009-10-29 09:57:25.285484907 -0400
-@@ -638,6 +638,7 @@ TOPLEVEL_IS_WRITABLE_FUNC ("orientation"
-
- TOPLEVEL_GET_SET_FUNCS ("size", toplevel, int, size,
int)
- TOPLEVEL_GET_SET_FUNCS ("expand", toplevel, bool, expand,
gboolean)
-+TOPLEVEL_GET_SET_FUNCS ("padding", toplevel, int, padding,
int)
- TOPLEVEL_GET_SET_FUNCS ("auto_hide", toplevel, bool, auto_hide,
gboolean)
- TOPLEVEL_GET_SET_FUNCS ("enable_buttons", toplevel, bool,
enable_buttons, gboolean)
- TOPLEVEL_GET_SET_FUNCS ("enable_arrows", toplevel, bool, enable_arrows,
gboolean)
-@@ -1185,6 +1186,7 @@ panel_profile_toplevel_change_notify (GC
- else UPDATE_INT ("monitor", monitor)
- else UPDATE_STRING ("name", name)
- else UPDATE_BOOL ("expand", expand)
-+ else UPDATE_INT ("padding", padding)
- else UPDATE_STRING ("orientation", orientation)
- else UPDATE_INT ("size", size)
- else UPDATE_POS ("x", x, x_right)
-@@ -1706,6 +1708,7 @@ panel_profile_load_toplevel (GConfClient
- GET_STRING ("name", name);
- GET_INT ("monitor", monitor);
- GET_BOOL ("expand", expand);
-+ GET_INT ("padding", padding);
- GET_STRING ("orientation", orientation);
- GET_INT ("size", size);
- GET_BOOL ("auto_hide", auto_hide);
-diff -up gnome-panel-2.28.0/gnome-panel/panel-profile.h.panel-padding
gnome-panel-2.28.0/gnome-panel/panel-profile.h
---- gnome-panel-2.28.0/gnome-panel/panel-profile.h.panel-padding 2009-04-19
13:45:09.000000000 -0400
-+++ gnome-panel-2.28.0/gnome-panel/panel-profile.h 2009-10-29 09:57:25.285484907 -0400
-@@ -92,7 +92,10 @@ void panel_profile_set_toplevel_e
- gboolean expand);
- gboolean panel_profile_get_toplevel_expand (PanelToplevel *toplevel);
- gboolean panel_profile_is_writable_toplevel_expand (PanelToplevel *toplevel);
--
-+void panel_profile_set_toplevel_padding (PanelToplevel *toplevel,
-+ int padding);
-+int panel_profile_get_toplevel_padding (PanelToplevel *padding);
-+gboolean panel_profile_is_writable_toplevel_padding (PanelToplevel *toplevel);
- void panel_profile_set_toplevel_auto_hide (PanelToplevel *toplevel,
- gboolean auto_hide);
- gboolean panel_profile_get_toplevel_auto_hide (PanelToplevel *toplevel);
-diff -up gnome-panel-2.28.0/gnome-panel/panel-toplevel.c.panel-padding
gnome-panel-2.28.0/gnome-panel/panel-toplevel.c
---- gnome-panel-2.28.0/gnome-panel/panel-toplevel.c.panel-padding 2009-08-21
06:31:49.000000000 -0400
-+++ gnome-panel-2.28.0/gnome-panel/panel-toplevel.c 2009-10-29 09:57:25.287500667 -0400
-@@ -79,6 +79,7 @@ struct _PanelToplevelPrivate {
- gboolean expand;
- PanelOrientation orientation;
- int size;
-+ int padding;
-
- /* relative to the monitor origin */
- int x;
-@@ -213,6 +214,7 @@ enum {
- PROP_0,
- PROP_NAME,
- PROP_EXPAND,
-+ PROP_PADDING,
- PROP_ORIENTATION,
- PROP_SIZE,
- PROP_X,
-@@ -3862,6 +3864,9 @@ panel_toplevel_set_property (GObject
- case PROP_EXPAND:
- panel_toplevel_set_expand (toplevel, g_value_get_boolean (value));
- break;
-+ case PROP_PADDING:
-+ panel_toplevel_set_padding (toplevel, g_value_get_int (value));
-+ break;
- case PROP_ORIENTATION:
- panel_toplevel_set_orientation (toplevel, g_value_get_enum (value));
- break;
-@@ -3956,6 +3961,9 @@ panel_toplevel_get_property (GObject
- case PROP_EXPAND:
- g_value_set_boolean (value, toplevel->priv->expand);
- break;
-+ case PROP_PADDING:
-+ g_value_set_int (value, toplevel->priv->padding);
-+ break;
- case PROP_ORIENTATION:
- g_value_set_enum (value, toplevel->priv->orientation);
- break;
-@@ -4118,6 +4126,18 @@ panel_toplevel_class_init (PanelToplevel
-
- g_object_class_install_property (
- gobject_class,
-+ PROP_PADDING,
-+ g_param_spec_int (
-+ "padding",
-+ "Padding",
-+ "Padding that is inserted between objects",
-+ 0,
-+ G_MAXINT,
-+ 0,
-+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
-+
-+ g_object_class_install_property (
-+ gobject_class,
- PROP_ORIENTATION,
- g_param_spec_enum (
- "orientation",
-@@ -4698,6 +4718,30 @@ panel_toplevel_get_expand (PanelToplevel
- return toplevel->priv->expand;
- }
-
-+void
-+panel_toplevel_set_padding (PanelToplevel *toplevel,
-+ int padding)
-+{
-+ g_return_if_fail (PANEL_IS_TOPLEVEL (toplevel));
-+
-+ if (toplevel->priv->padding == padding)
-+ return;
-+
-+ toplevel->priv->padding = padding;
-+
-+ gtk_widget_queue_resize (GTK_WIDGET (toplevel));
-+
-+ g_object_notify (G_OBJECT (toplevel), "padding");
-+}
-+
-+int
-+panel_toplevel_get_padding (PanelToplevel *toplevel)
-+{
-+ g_return_val_if_fail (PANEL_IS_TOPLEVEL (toplevel), 0);
-+
-+ return toplevel->priv->padding;
-+}
-+
- gboolean
- panel_toplevel_get_is_floating (PanelToplevel *toplevel)
- {
-diff -up gnome-panel-2.28.0/gnome-panel/panel-toplevel.h.panel-padding
gnome-panel-2.28.0/gnome-panel/panel-toplevel.h
---- gnome-panel-2.28.0/gnome-panel/panel-toplevel.h.panel-padding 2009-08-19
11:28:09.000000000 -0400
-+++ gnome-panel-2.28.0/gnome-panel/panel-toplevel.h 2009-10-29 09:57:25.288484940 -0400
-@@ -83,6 +83,9 @@ G_CONST_RETURN char *panel_toplevel_get_
- void panel_toplevel_set_expand (PanelToplevel
*toplevel,
- gboolean expand);
- gboolean panel_toplevel_get_expand (PanelToplevel
*toplevel);
-+void panel_toplevel_set_padding (PanelToplevel
*toplevel,
-+ int
padding);
-+int panel_toplevel_get_padding (PanelToplevel
*toplevel);
- void panel_toplevel_set_orientation (PanelToplevel
*toplevel,
- PanelOrientation orientation);
- PanelOrientation panel_toplevel_get_orientation (PanelToplevel
*toplevel);
-diff -up gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in.panel-padding
gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in
---- gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in.panel-padding 2009-07-01
09:06:23.000000000 -0400
-+++ gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in 2009-10-29
09:57:25.288484940 -0400
-@@ -103,6 +103,19 @@
- </schema>
-
- <schema>
-+ <key>/schemas/apps/panel/toplevels/padding</key>
-+ <owner>panel</owner>
-+ <type>int</type>
-+ <default>0</default>
-+ <locale name="C">
-+ <short>Padding</short>
-+ <long>
-+ Padding that will be inserted between objects on this panel.
-+ </long>
-+ </locale>
-+ </schema>
-+
-+ <schema>
- <key>/schemas/apps/panel/toplevels/x</key>
- <owner>panel</owner>
- <type>int</type>
-diff -up gnome-panel-2.28.0/gnome-panel/panel-widget.c.panel-padding
gnome-panel-2.28.0/gnome-panel/panel-widget.c
---- gnome-panel-2.28.0/gnome-panel/panel-widget.c.panel-padding 2009-08-11
07:32:38.000000000 -0400
-+++ gnome-panel-2.28.0/gnome-panel/panel-widget.c 2009-10-29 10:10:43.531226534 -0400
-@@ -710,9 +710,12 @@ panel_widget_switch_applet_right (PanelW
- {
- AppletData *ad;
- AppletData *nad = NULL;
--
-+ gint padding;
-+
- g_assert (list != NULL);
-
-+ padding = panel_toplevel_get_padding (panel->toplevel);
-+
- ad = list->data;
- if (ad->constrained + ad->min_cells >= panel->size)
- return;
-@@ -720,8 +723,8 @@ panel_widget_switch_applet_right (PanelW
- if (list->next)
- nad = list->next->data;
-
-- if (!nad || nad->constrained >= ad->constrained + ad->min_cells +
MOVE_INCREMENT) {
-- ad->pos = ad->constrained += MOVE_INCREMENT;
-+ if (!nad || nad->constrained >= ad->constrained + ad->min_cells +
MOVE_INCREMENT + padding) {
-+ ad->pos = ad->constrained += MOVE_INCREMENT + padding;
- gtk_widget_queue_resize (GTK_WIDGET (panel));
- emit_applet_moved (panel, ad);
- return;
-@@ -786,6 +789,9 @@ panel_widget_switch_applet_left (PanelWi
- {
- AppletData *ad;
- AppletData *pad = NULL;
-+ gint padding;
-+
-+ padding = panel_toplevel_get_padding (panel->toplevel);
-
- ad = list->data;
- if (ad->constrained <= 0)
-@@ -794,8 +800,8 @@ panel_widget_switch_applet_left (PanelWi
- if (list->prev)
- pad = list->prev->data;
-
-- if (!pad || pad->constrained + pad->min_cells <= ad->constrained -
MOVE_INCREMENT) {
-- ad->pos = ad->constrained -= MOVE_INCREMENT;
-+ if (!pad || pad->constrained + pad->min_cells <= ad->constrained -
MOVE_INCREMENT - padding) {
-+ ad->pos = ad->constrained -= MOVE_INCREMENT + padding;
- gtk_widget_queue_resize (GTK_WIDGET (panel));
- emit_applet_moved (panel, ad);
- return;
-@@ -874,15 +880,18 @@ panel_widget_get_right_switch_pos (Panel
- {
- AppletData *ad;
- AppletData *nad = NULL;
-+ gint padding;
-
- g_assert (list != NULL);
-
-+ padding = panel_toplevel_get_padding (panel->toplevel);
-+
- ad = list->data;
- if (list->next)
- nad = list->next->data;
-
-- if (!nad || nad->constrained >= ad->constrained + ad->min_cells +
MOVE_INCREMENT)
-- return ad->constrained + MOVE_INCREMENT;
-+ if (!nad || nad->constrained >= ad->constrained + ad->min_cells +
MOVE_INCREMENT + padding)
-+ return ad->constrained + MOVE_INCREMENT + padding;
-
- if (nad->locked)
- return panel_widget_get_right_jump_pos (panel,
-@@ -948,15 +957,18 @@ panel_widget_get_left_switch_pos (PanelW
- {
- AppletData *ad;
- AppletData *pad = NULL;
-+ gint padding;
-
- g_assert (list != NULL);
-
-+ padding = panel_toplevel_get_padding (panel->toplevel);
-+
- ad = list->data;
- if (list->prev)
- pad = list->prev->data;
-
-- if (!pad || pad->constrained + pad->min_cells <= ad->constrained -
MOVE_INCREMENT)
-- return ad->constrained - MOVE_INCREMENT;
-+ if (!pad || pad->constrained + pad->min_cells <= ad->constrained -
MOVE_INCREMENT - padding)
-+ return ad->constrained - MOVE_INCREMENT - padding;
-
- if (pad->locked)
- return panel_widget_get_left_jump_pos (panel,
-@@ -1195,12 +1207,15 @@ panel_widget_size_request(GtkWidget *wid
- GList *list;
- GList *ad_with_hints;
- gboolean dont_fill;
-+ gint padding;
-
- g_return_if_fail(PANEL_IS_WIDGET(widget));
- g_return_if_fail(requisition!=NULL);
-
- panel = PANEL_WIDGET(widget);
-
-+ padding = panel_toplevel_get_padding (panel->toplevel);
-+
- if(panel->orient == GTK_ORIENTATION_HORIZONTAL) {
- requisition->width = 0;
- requisition->height = panel->sz;
-@@ -1224,8 +1239,11 @@ panel_widget_size_request(GtkWidget *wid
- ad_with_hints = g_list_prepend (ad_with_hints,
- ad);
-
-- else if (panel->packed)
-+ else if (panel->packed) {
-+ if (list != panel->applet_list)
-+ requisition->width += padding;
- requisition->width += chreq.width;
-+ }
- } else {
- if (requisition->width < chreq.width && !ad->size_constrained)
- requisition->width = chreq.width;
-@@ -1234,8 +1252,11 @@ panel_widget_size_request(GtkWidget *wid
- ad_with_hints = g_list_prepend (ad_with_hints,
- ad);
-
-- else if (panel->packed)
-+ else if (panel->packed) {
-+ if (list != panel->applet_list)
-+ requisition->height += padding;
- requisition->height += chreq.height;
-+ }
- }
- }
-
-@@ -1333,12 +1354,15 @@ panel_widget_size_allocate(GtkWidget *wi
- int i;
- int old_size;
- gboolean ltr;
-+ gint padding;
-
- g_return_if_fail(PANEL_IS_WIDGET(widget));
- g_return_if_fail(allocation!=NULL);
-
- panel = PANEL_WIDGET(widget);
-
-+ padding = panel_toplevel_get_padding (panel->toplevel);
-+
- old_size = panel->size;
- ltr = gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR;
-
-@@ -1404,7 +1428,7 @@ panel_widget_size_allocate(GtkWidget *wi
- }
- ad->min_cells = ad->cells;
- gtk_widget_size_allocate(ad->applet,&challoc);
-- i += ad->cells;
-+ i += ad->cells + padding;
- }
-
- /* EEEEK, there might be not enough room and we don't handle
-@@ -1439,7 +1463,7 @@ panel_widget_size_allocate(GtkWidget *wi
- if (ad->constrained < i)
- ad->constrained = i;
-
-- i = ad->constrained + ad->cells;
-+ i = ad->constrained + ad->cells + padding;
- }
-
- /* Now expand from the right */
-@@ -1464,7 +1488,7 @@ panel_widget_size_allocate(GtkWidget *wi
- ad->cells = cells;
- }
-
-- i = ad->constrained;
-+ i = ad->constrained - padding;
- }
-
- /* EEEEK, there's not enough room, so shift applets even
diff --git a/preferred-apps.patch b/preferred-apps.patch
deleted file mode 100644
index 8f755d9..0000000
--- a/preferred-apps.patch
+++ /dev/null
@@ -1,272 +0,0 @@
-diff -up gnome-panel-2.25.3/gnome-panel/launcher.c.preferred-apps
gnome-panel-2.25.3/gnome-panel/launcher.c
---- gnome-panel-2.25.3/gnome-panel/launcher.c.preferred-apps 2009-01-16
14:15:17.000000000 -0500
-+++ gnome-panel-2.25.3/gnome-panel/launcher.c 2009-01-16 14:24:06.000000000 -0500
-@@ -21,6 +21,7 @@
- #include <glib/gi18n.h>
- #include <gio/gio.h>
- #include <gdk/gdkx.h>
-+#include <gmenu-tree.h>
-
- #include <libpanel-util/panel-error.h>
- #include <libpanel-util/panel-glib.h>
-@@ -44,6 +45,7 @@
- #include "panel-compatibility.h"
- #include "panel-ditem-editor.h"
- #include "panel-icon-names.h"
-+#include "panel-run-dialog.h"
-
- static GdkScreen *
- launcher_get_screen (Launcher *launcher)
-@@ -1215,3 +1217,189 @@ panel_launcher_set_dnd_enabled (Launcher
- } else
- gtk_drag_source_unset (launcher->button);
- }
-+
-+static gchar *
-+find_desktop_file_from_exec (const gchar *exec)
-+{
-+ GSList *all_applications, *l;
-+ gchar *path = NULL;
-+ gchar **tokens, **tokens2;
-+ gint i, match = 0;
-+
-+ /* FIXME no need to construct a humongous list here */
-+ all_applications = get_all_applications ();
-+
-+ for (l = all_applications; l; l = l->next) {
-+ GMenuTreeEntry *entry = l->data;
-+ const char *entry_exec;
-+
-+ entry_exec = gmenu_tree_entry_get_exec (entry);
-+
-+ if (strcmp (exec, entry_exec) == 0) {
-+ path = gmenu_tree_entry_get_desktop_file_path (entry);
-+ break;
-+ }
-+
-+ tokens = g_strsplit (exec, " ", -1);
-+ tokens2 = g_strsplit (entry_exec, " ", -1);
-+
-+ for (i = 0; tokens[i] && tokens2[i]; i++) {
-+ if (strcmp (tokens[i], tokens2[i]) != 0)
-+ break;
-+ }
-+ if (i > match) {
-+ match = i;
-+ path = gmenu_tree_entry_get_desktop_file_path (entry);
-+ }
-+
-+ g_strfreev (tokens);
-+ g_strfreev (tokens2);
-+ }
-+
-+ path = g_strdup (path);
-+ g_slist_free (all_applications);
-+
-+ return path;
-+}
-+
-+static void
-+update_preferred_app (const gchar *filename,
-+ const gchar *key,
-+ const gchar *exec)
-+{
-+ gchar *location;
-+ GKeyFile *key_file;
-+ GError *error = NULL;
-+ gchar *data;
-+ gsize len;
-+ gboolean needs_terminal;
-+
-+ location = find_desktop_file_from_exec (exec);
-+ key_file = g_key_file_new ();
-+ if (!panel_key_file_load_from_uri (key_file, location,
-+ G_KEY_FILE_KEEP_COMMENTS|G_KEY_FILE_KEEP_TRANSLATIONS,
-+ NULL)) {
-+ /* FIXME would be much better if preferred apps were backed by desktop files */
-+ g_key_file_set_string (key_file, "Desktop Entry", "Version",
"1.0");
-+ g_key_file_set_string (key_file, "Desktop Entry", "Encoding",
"UTF-8");
-+ g_key_file_set_string (key_file, "Desktop Entry", "Type",
"Application");
-+ g_key_file_set_string (key_file, "Desktop Entry", "Exec", exec);
-+ if (strstr (key, "http")) {
-+ g_key_file_set_string (key_file, "Desktop Entry", "Name",
"Preferred Web Browser");
-+ g_key_file_set_string (key_file, "Desktop Entry", "GenericName",
"Web Browser");
-+ g_key_file_set_string (key_file, "Desktop Entry", "Comment",
"Browse the Web");
-+ g_key_file_set_string (key_file, "Desktop Entry", "Icon",
"redhat-web-browser.png");
-+ if (strstr (exec, "%s")) {
-+ gchar *exec2, *s;
-+
-+ exec2 = g_strdup (exec);
-+ s = strstr (exec2, "%s");
-+ s[1] = 'u';
-+
-+ g_key_file_set_string (key_file, "Desktop Entry", "Exec",
exec2);
-+ g_free (exec2);
-+
-+ }
-+ }
-+ else if (strstr (key, "mailto")) {
-+ g_key_file_set_string (key_file, "Desktop Entry", "Name",
"Preferred Mail Reader");
-+ g_key_file_set_string (key_file, "Desktop Entry", "GenericName",
"Mail Reader");
-+ g_key_file_set_string (key_file, "Desktop Entry", "Comment",
"Send email");
-+ g_key_file_set_string (key_file, "Desktop Entry", "Icon",
"redhat-email.png");
-+ }
-+ if (g_str_has_suffix (key, "command")) {
-+ int len;
-+ char *key2;
-+
-+ len = strlen (key);
-+ key2 = g_new (char, len - strlen ("command") + strlen
("needs_terminal") + 1);
-+ strncpy (key2, key, len - strlen ("command"));
-+ strcpy (key2 + len - strlen ("command"), "needs_terminal");
-+ needs_terminal = gconf_client_get_bool (panel_gconf_get_client (),
-+ key2,
-+ NULL);
-+ g_free (key2);
-+ }
-+ else
-+ needs_terminal = FALSE;
-+ g_key_file_set_boolean (key_file, "Desktop Entry", "Terminal",
needs_terminal);
-+ }
-+
-+ g_free (location);
-+
-+ g_key_file_set_boolean (key_file, "Desktop Entry",
"X-Panel-Monitor", TRUE);
-+ g_key_file_set_boolean (key_file, "Desktop Entry", "NoDisplay",
TRUE);
-+
-+ data = g_key_file_to_data (key_file, &len, &error);
-+ if (error) {
-+ g_printerr (_("Failed to convert data for '%s': %s"),
-+ filename, error->message);
-+ g_error_free (error);
-+ g_key_file_free (key_file);
-+
-+ return;
-+ }
-+ if (!g_file_set_contents (filename, data, len, &error)) {
-+ g_printerr (_("Failed to save '%s': %s"),
-+ filename, error->message);
-+ g_error_free (error);
-+ }
-+
-+ g_key_file_free (key_file);
-+ g_free (data);
-+}
-+
-+static void
-+preferred_app_changed (GConfClient *client,
-+ gint notify_id,
-+ GConfEntry *entry,
-+ const gchar *filename)
-+{
-+ update_preferred_app (filename,
-+ gconf_entry_get_key (entry),
-+ gconf_value_get_string (entry->value));
-+}
-+
-+void
-+panel_preferred_apps_init (void)
-+{
-+ GConfClient *client;
-+ gchar *dirname, *filename, *exec;
-+ gint i;
-+
-+ const gchar *keys[] = {
-+ "/desktop/gnome/url-handlers/http/command",
-+ "/desktop/gnome/url-handlers/mailto/command",
-+ NULL };
-+ const gchar *files[] = {
-+ "preferred-web-browser.desktop",
-+ "preferred-mail-reader.desktop",
-+ NULL };
-+
-+ client = panel_gconf_get_client ();
-+
-+ gconf_client_add_dir (client,
-+ "/desktop/gnome/url-handlers",
-+ GCONF_CLIENT_PRELOAD_NONE,
-+ NULL);
-+
-+ for (i = 0; keys[i]; i++) {
-+ dirname = g_build_filename (g_get_user_data_dir (),
-+ "applications", NULL);
-+ filename = g_build_filename (dirname, files[i], NULL);
-+ if (!g_file_test (filename, G_FILE_TEST_EXISTS)) {
-+
-+ if (!g_file_test (dirname, G_FILE_TEST_EXISTS))
-+ g_mkdir_with_parents (dirname, 0755);
-+
-+ exec = gconf_client_get_string (client, keys[i], NULL);
-+ update_preferred_app (filename, keys[i], exec);
-+ g_free (exec);
-+ }
-+ g_free (dirname);
-+
-+ gconf_client_notify_add (client, keys[i],
-+ (GConfClientNotifyFunc) preferred_app_changed,
-+ filename, g_free, NULL);
-+ }
-+}
-diff -up gnome-panel-2.25.3/gnome-panel/launcher.h.preferred-apps
gnome-panel-2.25.3/gnome-panel/launcher.h
---- gnome-panel-2.25.3/gnome-panel/launcher.h.preferred-apps 2009-01-16
14:15:17.000000000 -0500
-+++ gnome-panel-2.25.3/gnome-panel/launcher.h 2009-01-16 14:15:17.000000000 -0500
-@@ -14,6 +14,8 @@
- #include "applet.h"
- #include "panel-widget.h"
-
-+#include <gio/gio.h>
-+
- G_BEGIN_DECLS
-
- typedef struct {
-@@ -71,6 +73,7 @@ void launcher_properties_dest
- void panel_launcher_set_dnd_enabled (Launcher *launcher,
- gboolean dnd_enabled);
-
-+void panel_preferred_apps_init (void);
-
- G_END_DECLS
-
-diff -up gnome-panel-2.25.3/gnome-panel/main.c.preferred-apps
gnome-panel-2.25.3/gnome-panel/main.c
---- gnome-panel-2.25.3/gnome-panel/main.c.preferred-apps 2008-12-09 07:32:37.000000000
-0500
-+++ gnome-panel-2.25.3/gnome-panel/main.c 2009-01-16 14:15:17.000000000 -0500
-@@ -27,6 +27,7 @@
- #include "panel-action-protocol.h"
- #include "panel-lockdown.h"
- #include "panel-icon-names.h"
-+#include "launcher.h"
- #include "xstuff.h"
-
- #include "nothing.cP"
-@@ -86,6 +87,7 @@ main (int argc, char **argv)
- GCONF_CLIENT_PRELOAD_NONE,
- NULL);
-
-+ panel_preferred_apps_init ();
- panel_global_config_load ();
- panel_lockdown_init ();
- panel_profile_load ();
-diff -up gnome-panel-2.25.3/gnome-panel/panel-run-dialog.c.preferred-apps
gnome-panel-2.25.3/gnome-panel/panel-run-dialog.c
---- gnome-panel-2.25.3/gnome-panel/panel-run-dialog.c.preferred-apps 2008-12-11
12:03:03.000000000 -0500
-+++ gnome-panel-2.25.3/gnome-panel/panel-run-dialog.c 2009-01-16 14:15:17.000000000
-0500
-@@ -789,7 +789,7 @@ get_all_applications_from_dir (GMenuTree
- return list;
- }
-
--static GSList *
-+GSList *
- get_all_applications (void)
- {
- GMenuTree *tree;
-diff -up gnome-panel-2.25.3/gnome-panel/panel-run-dialog.h.preferred-apps
gnome-panel-2.25.3/gnome-panel/panel-run-dialog.h
---- gnome-panel-2.25.3/gnome-panel/panel-run-dialog.h.preferred-apps 2008-11-08
19:27:01.000000000 -0500
-+++ gnome-panel-2.25.3/gnome-panel/panel-run-dialog.h 2009-01-16 14:15:17.000000000
-0500
-@@ -32,6 +32,8 @@ G_BEGIN_DECLS
- void panel_run_dialog_present (GdkScreen *screen,
- guint32 activate_time);
-
-+GSList *get_all_applications (void);
-+
- G_END_DECLS
-
- #endif /* __PANEL_RUN_DIALOG_H__ */
diff --git a/redhat-panel-backwards-compat-config.schemas
b/redhat-panel-backwards-compat-config.schemas
deleted file mode 100644
index 2cdaf44..0000000
--- a/redhat-panel-backwards-compat-config.schemas
+++ /dev/null
@@ -1,1473 +0,0 @@
-<?xml version="1.0"?>
-<gconfschemafile>
-
-<!--
-These are the factory defaults for what's on the panel. To change them
-locally, you can edit this file and rebuild the RPM, or you can just
-set values in the /etc/gconf/gconf.xml.defaults source using gconftool -
-see
http://www.gnome.org/projects/gconf/
--->
-
- <schemalist>
-
-
-
-<!--
-*********************************************************************************
-** Small Screen Setup: 1 edge panel of size 24 **
-*********************************************************************************
--->
-
-<!-- ********************************* -->
-<!-- General panel properties :: START -->
-<!-- ********************************* -->
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/small/general/show_program_list</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short>Show the program listing in the Run box</short>
- <long>Show the program listing by default when opening the Run
box</long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/small/general/enable_program_list</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>true</default>
- <locale name="C">
- <short>Enable the program listing in the run box</short>
- <long>Enable the program listing in the run box</long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/small/general/panel_id_list</key>
- <owner>panel</owner>
- <type>list</type>
- <list_type>string</list_type>
- <default>[bottom_panel]</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/small/general/applet_id_list</key>
- <owner>panel</owner>
- <type>list</type>
- <list_type>string</list_type>
- <default>[]</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/small/general/object_id_list</key>
- <owner>panel</owner>
- <type>list</type>
- <list_type>string</list_type>
- <default>[]</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
-<!-- ******************************* -->
-<!-- General panel properties :: END -->
-<!-- ******************************* -->
-
-<!-- ****************************** -->
-<!-- Edge panel properties :: START -->
-<!-- ****************************** -->
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/panel_type</key>
- <owner>panel</owner>
- <type>string</type>
- <default>edge-panel</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/panel_size</key>
- <owner>panel</owner>
- <type>string</type>
- <default>panel-size-small</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/panel_hide_mode</key>
- <owner>panel</owner>
- <type>int</type>
- <default>0</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/panel_hide_state</key>
- <owner>panel</owner>
- <type>int</type>
- <default>0</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/screen_id</key>
- <owner>panel</owner>
- <type>int</type>
- <default>0</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/screen_edge</key>
- <owner>panel</owner>
- <type>string</type>
- <default>panel-edge-bottom</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/hide_buttons_enabled</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/hide_button_pixmaps_enabled</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>true</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/panel_background_type</key>
- <owner>panel</owner>
- <type>string</type>
- <default>no-background</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/panel_background_pixmap</key>
- <owner>panel</owner>
- <type>string</type>
- <default></default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/panel_background_pixmap_fit</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>true</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/panel_background_pixmap_stretch</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/panel_background_pixmap_rotate</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>true</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/small/panels/bottom_panel/panel_background_color</key>
- <owner>panel</owner>
- <type>string</type>
- <default>#000000</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
-<!-- **************************** -->
-<!-- Edge panel properties :: END -->
-<!-- **************************** -->
-
-
-<!--
-******************************************************************************************
-** Medium Screen Setup: 1 edge panel of size 36, 1 menu panel of size 24
**
-******************************************************************************************
--->
-
-<!-- ********************************* -->
-<!-- General panel properties :: START -->
-<!-- ********************************* -->
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/general/advanced_run_dialog</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/general/panel_id_list</key>
- <owner>panel</owner>
- <type>list</type>
- <list_type>string</list_type>
- <default>[bottom_panel]</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/general/applet_id_list</key>
- <owner>panel</owner>
- <type>list</type>
- <list_type>string</list_type>
-
<default>[tasklist_applet,pager_applet,tray_applet,clock_applet]</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/general/object_id_list</key>
- <owner>panel</owner>
- <type>list</type>
- <list_type>string</list_type>
-
<default>[main_menu,web_browser_launcher,email_launcher,wordprocessor_launcher,presentations_launcher,spreadsheet_launcher,print_launcher]</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
-<!-- ******************************* -->
-<!-- General panel properties :: END -->
-<!-- ******************************* -->
-
-<!-- ****************************** -->
-<!-- Edge panel properties :: START -->
-<!-- ****************************** -->
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_type</key>
- <owner>panel</owner>
- <type>string</type>
- <default>edge-panel</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_size</key>
- <owner>panel</owner>
- <type>string</type>
- <default>panel-size-medium</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_hide_mode</key>
- <owner>panel</owner>
- <type>int</type>
- <default>0</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_hide_state</key>
- <owner>panel</owner>
- <type>int</type>
- <default>0</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/screen_id</key>
- <owner>panel</owner>
- <type>int</type>
- <default>0</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/screen_edge</key>
- <owner>panel</owner>
- <type>string</type>
- <default>panel-edge-bottom</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/hide_buttons_enabled</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/hide_button_pixmaps_enabled</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_background_type</key>
- <owner>panel</owner>
- <type>string</type>
- <default>no-background</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_background_pixmap</key>
- <owner>panel</owner>
- <type>string</type>
- <default></default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_background_pixmap_fit</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>true</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_background_pixmap_stretch</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_background_pixmap_rotate</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>true</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/panels/bottom_panel/panel_background_color</key>
- <owner>panel</owner>
- <type>string</type>
- <default>#000000</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <!-- Main Menu -->
-
- <!-- add custom_icon and custom_icon_file keys to replace icon -->
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/main_menu/object_type</key>
- <owner>panel</owner>
- <type>string</type>
- <default>menu-object</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/main_menu/panel_id</key>
- <owner>panel</owner>
- <type>string</type>
- <default>bottom_panel</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/main_menu/path</key>
- <owner>panel</owner>
- <type>string</type>
- <default>applications:///</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/main_menu/main-menu</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>true</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/main_menu/global-menu</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <!-- The person who made this a bitfield stored as an int needs some buttkicking
-->
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/main_menu/main-menu-flags</key>
- <owner>panel</owner>
- <type>int</type>
- <default>24580</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <!-- Launchers -->
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/web_browser_launcher/object_type</key>
- <owner>panel</owner>
- <type>string</type>
- <default>launcher-object</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/web_browser_launcher/launcher_location</key>
- <owner>panel</owner>
- <type>string</type>
- <default>applications:///Internet/redhat-web.desktop</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/web_browser_launcher/panel_id</key>
- <owner>panel</owner>
- <type>string</type>
- <default>bottom_panel</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/web_browser_launcher/position</key>
- <owner>panel</owner>
- <type>int</type>
- <default>50</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/web_browser_launcher/panel_right_stick</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/terminal_launcher/object_type</key>
- <owner>panel</owner>
- <type>string</type>
- <default>launcher-object</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/terminal_launcher/launcher_location</key>
- <owner>panel</owner>
- <type>string</type>
- <default>applications:///System/gnome-terminal.desktop</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/terminal_launcher/panel_id</key>
- <owner>panel</owner>
- <type>string</type>
- <default>bottom_panel</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/terminal_launcher/position</key>
- <owner>panel</owner>
- <type>int</type>
- <default>300</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/terminal_launcher/panel_stick</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/email_launcher/object_type</key>
- <owner>panel</owner>
- <type>string</type>
- <default>launcher-object</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/email_launcher/launcher_location</key>
- <owner>panel</owner>
- <type>string</type>
- <default>applications:///Internet/redhat-email.desktop</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/email_launcher/panel_id</key>
- <owner>panel</owner>
- <type>string</type>
- <default>bottom_panel</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/email_launcher/position</key>
- <owner>panel</owner>
- <type>int</type>
- <default>100</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/email_launcher/panel_right_stick</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <!-- start -->
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/wordprocessor_launcher/object_type</key>
- <owner>panel</owner>
- <type>string</type>
- <default>launcher-object</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/wordprocessor_launcher/launcher_location</key>
- <owner>panel</owner>
- <type>string</type>
-
<default>applications:///Office/redhat-word-processor.desktop</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/wordprocessor_launcher/panel_id</key>
- <owner>panel</owner>
- <type>string</type>
- <default>bottom_panel</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/wordprocessor_launcher/position</key>
- <owner>panel</owner>
- <type>int</type>
- <default>150</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/wordprocessor_launcher/panel_right_stick</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <!-- end -->
-
-
-
- <!-- start -->
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/presentations_launcher/object_type</key>
- <owner>panel</owner>
- <type>string</type>
- <default>launcher-object</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/presentations_launcher/launcher_location</key>
- <owner>panel</owner>
- <type>string</type>
-
<default>applications:///Office/redhat-presentations.desktop</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/presentations_launcher/panel_id</key>
- <owner>panel</owner>
- <type>string</type>
- <default>bottom_panel</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/presentations_launcher/position</key>
- <owner>panel</owner>
- <type>int</type>
- <default>200</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/presentations_launcher/panel_right_stick</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <!-- end -->
-
-
-
- <!-- start -->
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/spreadsheet_launcher/object_type</key>
- <owner>panel</owner>
- <type>string</type>
- <default>launcher-object</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/spreadsheet_launcher/launcher_location</key>
- <owner>panel</owner>
- <type>string</type>
- <default>applications:///Office/redhat-spreadsheet.desktop</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/spreadsheet_launcher/panel_id</key>
- <owner>panel</owner>
- <type>string</type>
- <default>bottom_panel</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/spreadsheet_launcher/position</key>
- <owner>panel</owner>
- <type>int</type>
- <default>250</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/spreadsheet_launcher/panel_right_stick</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <!-- end -->
-
-
- <!-- start -->
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/print_launcher/object_type</key>
- <owner>panel</owner>
- <type>string</type>
- <default>launcher-object</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/print_launcher/launcher_location</key>
- <owner>panel</owner>
- <type>string</type>
- <default>applications:///Accessories/redhat-print.desktop</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/print_launcher/panel_id</key>
- <owner>panel</owner>
- <type>string</type>
- <default>bottom_panel</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/print_launcher/position</key>
- <owner>panel</owner>
- <type>int</type>
- <default>260</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/print_launcher/panel_right_stick</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <!-- end -->
-
-
-
-
- <!-- start -->
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/help_launcher/object_type</key>
- <owner>panel</owner>
- <type>string</type>
- <default>launcher-object</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/help_launcher/launcher_location</key>
- <owner>panel</owner>
- <type>string</type>
- <default>applications:///gnome-yelp.desktop</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/help_launcher/panel_id</key>
- <owner>panel</owner>
- <type>string</type>
- <default>bottom_panel</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/help_launcher/position</key>
- <owner>panel</owner>
- <type>int</type>
- <default>300</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/objects/help_launcher/panel_right_stick</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <!-- end -->
-
-
- <!-- Applets -->
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/applets/tasklist_applet/object_type</key>
- <owner>panel</owner>
- <type>string</type>
- <default>bonobo-applet</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/applets/tasklist_applet/panel_id</key>
- <owner>panel</owner>
- <type>string</type>
- <default>bottom_panel</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/applets/tasklist_applet/position</key>
- <owner>panel</owner>
- <type>int</type>
- <default>375</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/applets/tasklist_applet/bonobo_iid</key>
- <owner>panel</owner>
- <type>string</type>
- <default>OAFIID:GNOME_TasklistApplet</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/applets/tasklist_applet/panel_right_stick</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/applets/pager_applet/object_type</key>
- <owner>panel</owner>
- <type>string</type>
- <default>bonobo-applet</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/applets/pager_applet/panel_id</key>
- <owner>panel</owner>
- <type>string</type>
- <default>bottom_panel</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/applets/pager_applet/position</key>
- <owner>panel</owner>
- <type>int</type>
- <default>325</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/applets/pager_applet/bonobo_iid</key>
- <owner>panel</owner>
- <type>string</type>
- <default>OAFIID:GNOME_PagerApplet</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/applets/pager_applet/panel_right_stick</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <!-- clock -->
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/applets/clock_applet/object_type</key>
- <owner>panel</owner>
- <type>string</type>
- <default>bonobo-applet</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/applets/clock_applet/panel_id</key>
- <owner>panel</owner>
- <type>string</type>
- <default>bottom_panel</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/applets/clock_applet/position</key>
- <owner>panel</owner>
- <type>int</type>
- <default>0</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/applets/clock_applet/bonobo_iid</key>
- <owner>panel</owner>
- <type>string</type>
- <default>OAFIID:GNOME_ClockApplet</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/applets/clock_applet/panel_right_stick</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>true</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
-
- <!-- tray -->
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/applets/tray_applet/object_type</key>
- <owner>panel</owner>
- <type>string</type>
- <default>bonobo-applet</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/applets/tray_applet/panel_id</key>
- <owner>panel</owner>
- <type>string</type>
- <default>bottom_panel</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/applets/tray_applet/position</key>
- <owner>panel</owner>
- <type>int</type>
- <default>70</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/applets/tray_applet/bonobo_iid</key>
- <owner>panel</owner>
- <type>string</type>
- <default>OAFIID:GNOME_SystemTrayApplet</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/applets/tray_applet/panel_right_stick</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>true</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
-
-<!-- *********************************** -->
-<!-- Panel Items for Edge Panel :: END -->
-<!-- *********************************** -->
-
-<!-- **************************** -->
-<!-- Edge panel properties :: END -->
-<!-- **************************** -->
-
-<!--
-***********************************************************************************
-** Large Screen Setup: 1 edge panel of size 48, 1 menu panel of size 36 **
-***********************************************************************************
--->
-
-<!-- ********************************* -->
-<!-- General panel properties :: START -->
-<!-- ********************************* -->
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/large/general/advanced_run_dialog</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/large/general/panel_id_list</key>
- <owner>panel</owner>
- <type>list</type>
- <list_type>string</list_type>
- <default>[bottom_panel]</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/large/general/applet_id_list</key>
- <owner>panel</owner>
- <type>list</type>
- <list_type>string</list_type>
- <default>[]</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/large/general/object_id_list</key>
- <owner>panel</owner>
- <type>list</type>
- <list_type>string</list_type>
- <default>[]</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
-<!-- ******************************* -->
-<!-- General panel properties :: END -->
-<!-- ******************************* -->
-
-<!-- ****************************** -->
-<!-- Edge panel properties :: START -->
-<!-- ****************************** -->
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/panel_type</key>
- <owner>panel</owner>
- <type>string</type>
- <default>edge-panel</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/panel_size</key>
- <owner>panel</owner>
- <type>string</type>
- <default>panel-size-medium</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/panel_hide_mode</key>
- <owner>panel</owner>
- <type>int</type>
- <default>0</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/panel_hide_state</key>
- <owner>panel</owner>
- <type>int</type>
- <default>0</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/screen_id</key>
- <owner>panel</owner>
- <type>int</type>
- <default>0</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/screen_edge</key>
- <owner>panel</owner>
- <type>string</type>
- <default>panel-edge-bottom</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/hide_buttons_enabled</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/hide_button_pixmaps_enabled</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>true</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/panel_background_type</key>
- <owner>panel</owner>
- <type>string</type>
- <default>no-background</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/panel_background_pixmap</key>
- <owner>panel</owner>
- <type>string</type>
- <default> </default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/panel_background_pixmap_fit</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>true</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/panel_background_pixmap_stretch</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/panel_background_pixmap_rotate</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>true</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/large/panels/bottom_panel/panel_background_color</key>
- <owner>panel</owner>
- <type>string</type>
- <default>#000000</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
-<!-- **************************** -->
-<!-- Edge panel properties :: END -->
-<!-- **************************** -->
-
-
- </schemalist>
-
-</gconfschemafile>
diff --git a/redhat-panel-default-setup.entries b/redhat-panel-default-setup.entries
deleted file mode 100644
index 4864563..0000000
--- a/redhat-panel-default-setup.entries
+++ /dev/null
@@ -1,742 +0,0 @@
-<gconfentryfile>
-
- <entrylist base="/apps/panel/default_setup">
-
- <!-- List of toplevels -->
-
- <entry>
- <key>general/toplevel_id_list</key>
- <schema_key>/schemas/apps/panel/general/toplevel_id_list</schema_key>
- <value>
- <list type="string">
- <value>
- <string>top_panel</string>
- </value>
- <value>
- <string>bottom_panel</string>
- </value>
- </list>
- </value>
- </entry>
-
- <!-- List of objects -->
-
- <entry>
- <key>general/object_id_list</key>
- <schema_key>/schemas/apps/panel/general/object_id_list</schema_key>
- <value>
- <list type="string">
- <value>
- <string>menu_bar</string>
- </value>
- <value>
- <string>web_launcher</string>
- </value>
- <value>
- <string>email_launcher</string>
- </value>
- </list>
- </value>
- </entry>
-
- <!-- List of applets -->
-
- <entry>
- <key>general/applet_id_list</key>
- <schema_key>/schemas/apps/panel/general/applet_id_list</schema_key>
- <value>
- <list type="string">
- <value>
- <string>gnote</string>
- </value>
- <value>
- <string>clock</string>
- </value>
- <value>
- <string>systray</string>
- </value>
- <value>
- <string>window_list</string>
- </value>
- <value>
- <string>workspace_switcher</string>
- </value>
- <value>
- <string>trash_applet</string>
- </value>
- <value>
- <string>fast_user_switch_applet</string>
- </value>
- </list>
- </value>
- </entry>
-
- <!-- Top Panel -->
-
- <entry>
- <key>toplevels/top_panel/name</key>
- <schema_key>/schemas/apps/panel/toplevels/name</schema_key>
- <value>
- <string>Top Panel</string>
- </value>
- </entry>
- <entry>
- <key>toplevels/top_panel/expand</key>
- <schema_key>/schemas/apps/panel/toplevels/expand</schema_key>
- <value>
- <bool>true</bool>
- </value>
- </entry>
- <entry>
- <key>toplevels/top_panel/padding</key>
- <schema_key>/schemas/apps/panel/toplevels/padding</schema_key>
- <value>
- <int>8</int>
- </value>
- </entry>
- <entry>
- <key>toplevels/top_panel/orientation</key>
- <schema_key>/schemas/apps/panel/toplevels/orientation</schema_key>
- <value>
- <string>top</string>
- </value>
- </entry>
- <entry>
- <key>toplevels/top_panel/size</key>
- <schema_key>/schemas/apps/panel/toplevels/size</schema_key>
- <value>
- <int>24</int>
- </value>
- </entry>
-
-
<entry><key>toplevels/top_panel/screen</key><schema_key>/schemas/apps/panel/toplevels/screen</schema_key></entry>
-
<entry><key>toplevels/top_panel/monitor</key><schema_key>/schemas/apps/panel/toplevels/monitor</schema_key></entry>
-
<entry><key>toplevels/top_panel/x</key><schema_key>/schemas/apps/panel/toplevels/x</schema_key></entry>
-
<entry><key>toplevels/top_panel/y</key><schema_key>/schemas/apps/panel/toplevels/y</schema_key></entry>
-
<entry><key>toplevels/top_panel/x_centered</key><schema_key>/schemas/apps/panel/toplevels/x_centered</schema_key></entry>
-
<entry><key>toplevels/top_panel/y_centered</key><schema_key>/schemas/apps/panel/toplevels/y_centered</schema_key></entry>
-
<entry><key>toplevels/top_panel/auto_hide</key><schema_key>/schemas/apps/panel/toplevels/auto_hide</schema_key></entry>
-
<entry><key>toplevels/top_panel/enable_animations</key><schema_key>/schemas/apps/panel/toplevels/enable_animations</schema_key></entry>
-
<entry><key>toplevels/top_panel/enable_buttons</key><schema_key>/schemas/apps/panel/toplevels/enable_buttons</schema_key></entry>
-
<entry><key>toplevels/top_panel/enable_arrows</key><schema_key>/schemas/apps/panel/toplevels/enable_arrows</schema_key></entry>
-
<entry><key>toplevels/top_panel/hide_delay</key><schema_key>/schemas/apps/panel/toplevels/hide_delay</schema_key></entry>
-
<entry><key>toplevels/top_panel/unhide_delay</key><schema_key>/schemas/apps/panel/toplevels/unhide_delay</schema_key></entry>
-
<entry><key>toplevels/top_panel/auto_hide_size</key><schema_key>/schemas/apps/panel/toplevels/auto_hide_size</schema_key></entry>
-
<entry><key>toplevels/top_panel/background/type</key><schema_key>/schemas/apps/panel/toplevels/background/type</schema_key></entry>
-
<entry><key>toplevels/top_panel/background/color</key><schema_key>/schemas/apps/panel/toplevels/background/color</schema_key></entry>
-
<entry><key>toplevels/top_panel/background/opacity</key><schema_key>/schemas/apps/panel/toplevels/background/opacity</schema_key></entry>
-
<entry><key>toplevels/top_panel/background/image</key><schema_key>/schemas/apps/panel/toplevels/background/image</schema_key></entry>
-
<entry><key>toplevels/top_panel/background/fit</key><schema_key>/schemas/apps/panel/toplevels/background/fit</schema_key></entry>
-
<entry><key>toplevels/top_panel/background/stretch</key><schema_key>/schemas/apps/panel/toplevels/background/stretch</schema_key></entry>
-
<entry><key>toplevels/top_panel/background/rotate</key><schema_key>/schemas/apps/panel/toplevels/background/rotate</schema_key></entry>
-
- <!-- Bottom Panel -->
-
- <entry>
- <key>toplevels/bottom_panel/name</key>
- <schema_key>/schemas/apps/panel/toplevels/name</schema_key>
- <value>
- <string>Bottom Panel</string>
- </value>
- </entry>
- <entry>
- <key>toplevels/bottom_panel/expand</key>
- <schema_key>/schemas/apps/panel/toplevels/expand</schema_key>
- <value>
- <bool>true</bool>
- </value>
- </entry>
- <entry>
- <key>toplevels/bottom_panel/padding</key>
- <schema_key>/schemas/apps/panel/toplevels/padding</schema_key>
- <value>
- <int>8</int>
- </value>
- </entry>
- <entry>
- <key>toplevels/bottom_panel/orientation</key>
- <schema_key>/schemas/apps/panel/toplevels/orientation</schema_key>
- <value>
- <string>bottom</string>
- </value>
- </entry>
- <entry>
- <key>toplevels/bottom_panel/size</key>
- <schema_key>/schemas/apps/panel/toplevels/size</schema_key>
- <value>
- <int>24</int>
- </value>
- </entry>
-
-
<entry><key>toplevels/bottom_panel/screen</key><schema_key>/schemas/apps/panel/toplevels/screen</schema_key></entry>
-
<entry><key>toplevels/bottom_panel/monitor</key><schema_key>/schemas/apps/panel/toplevels/monitor</schema_key></entry>
-
<entry><key>toplevels/bottom_panel/x</key><schema_key>/schemas/apps/panel/toplevels/x</schema_key></entry>
-
<entry><key>toplevels/bottom_panel/y</key><schema_key>/schemas/apps/panel/toplevels/y</schema_key></entry>
-
<entry><key>toplevels/bottom_panel/x_centered</key><schema_key>/schemas/apps/panel/toplevels/x_centered</schema_key></entry>
-
<entry><key>toplevels/bottom_panel/y_centered</key><schema_key>/schemas/apps/panel/toplevels/y_centered</schema_key></entry>
-
<entry><key>toplevels/bottom_panel/auto_hide</key><schema_key>/schemas/apps/panel/toplevels/auto_hide</schema_key></entry>
-
<entry><key>toplevels/bottom_panel/enable_animations</key><schema_key>/schemas/apps/panel/toplevels/enable_animations</schema_key></entry>
-
<entry><key>toplevels/bottom_panel/enable_buttons</key><schema_key>/schemas/apps/panel/toplevels/enable_buttons</schema_key></entry>
-
<entry><key>toplevels/bottom_panel/enable_arrows</key><schema_key>/schemas/apps/panel/toplevels/enable_arrows</schema_key></entry>
-
<entry><key>toplevels/bottom_panel/hide_delay</key><schema_key>/schemas/apps/panel/toplevels/hide_delay</schema_key></entry>
-
<entry><key>toplevels/bottom_panel/unhide_delay</key><schema_key>/schemas/apps/panel/toplevels/unhide_delay</schema_key></entry>
-
<entry><key>toplevels/bottom_panel/auto_hide_size</key><schema_key>/schemas/apps/panel/toplevels/auto_hide_size</schema_key></entry>
-
<entry><key>toplevels/bottom_panel/background/type</key><schema_key>/schemas/apps/panel/toplevels/background/type</schema_key></entry>
-
<entry><key>toplevels/bottom_panel/background/color</key><schema_key>/schemas/apps/panel/toplevels/background/color</schema_key></entry>
-
<entry><key>toplevels/bottom_panel/background/opacity</key><schema_key>/schemas/apps/panel/toplevels/background/opacity</schema_key></entry>
-
<entry><key>toplevels/bottom_panel/background/image</key><schema_key>/schemas/apps/panel/toplevels/background/image</schema_key></entry>
-
<entry><key>toplevels/bottom_panel/background/fit</key><schema_key>/schemas/apps/panel/toplevels/background/fit</schema_key></entry>
-
<entry><key>toplevels/bottom_panel/background/stretch</key><schema_key>/schemas/apps/panel/toplevels/background/stretch</schema_key></entry>
-
<entry><key>toplevels/bottom_panel/background/rotate</key><schema_key>/schemas/apps/panel/toplevels/background/rotate</schema_key></entry>
-
- <!-- Menu Bar -->
-
- <entry>
- <key>objects/menu_bar/object_type</key>
- <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
- <value>
- <string>menu-bar</string>
- </value>
- </entry>
- <entry>
- <key>objects/menu_bar/toplevel_id</key>
- <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
- <value>
- <string>top_panel</string>
- </value>
- </entry>
- <entry>
- <key>objects/menu_bar/position</key>
- <schema_key>/schemas/apps/panel/objects/position</schema_key>
- <value>
- <int>0</int>
- </value>
- </entry>
- <entry>
- <key>objects/menu_bar/panel_right_stick</key>
- <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
- <value>
- <bool>false</bool>
- </value>
- </entry>
- <entry>
- <key>objects/menu_bar/locked</key>
- <schema_key>/schemas/apps/panel/objects/locked</schema_key>
- <value>
- <bool>true</bool>
- </value>
- </entry>
-
-
<entry><key>objects/menu_bar/bonobo_iid</key><schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key></entry>
-
<entry><key>objects/menu_bar/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key>
</entry>
-
<entry><key>objects/menu_bar/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-
<entry><key>objects/menu_bar/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-
<entry><key>objects/menu_bar/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-
<entry><key>objects/menu_bar/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-
<entry><key>objects/menu_bar/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-
<entry><key>objects/menu_bar/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
-
<entry><key>objects/menu_bar/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
-
- <!-- Web Launcher -->
-
- <entry>
- <key>objects/web_launcher/object_type</key>
- <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
- <value>
- <string>launcher-object</string>
- </value>
- </entry>
- <entry>
- <key>objects/web_launcher/toplevel_id</key>
- <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
- <value>
- <string>top_panel</string>
- </value>
- </entry>
- <entry>
- <key>objects/web_launcher/position</key>
- <schema_key>/schemas/apps/panel/objects/position</schema_key>
- <value>
- <int>1</int>
- </value>
- </entry>
- <entry>
- <key>objects/web_launcher/panel_right_stick</key>
- <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
- <value>
- <bool>false</bool>
- </value>
- </entry>
- <entry>
- <key>objects/web_launcher/locked</key>
- <schema_key>/schemas/apps/panel/objects/locked</schema_key>
- <value>
- <bool>true</bool>
- </value>
- </entry>
- <entry>
- <key>objects/web_launcher/launcher_location</key>
- <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
- <value>
- <string>preferred-web-browser.desktop</string>
- </value>
- </entry>
-
-
<entry><key>objects/web_launcher/bonobo_iid</key><schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key></entry>
-
<entry><key>objects/web_launcher/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key>
</entry>
-
<entry><key>objects/web_launcher/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-
<entry><key>objects/web_launcher/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-
<entry><key>objects/web_launcher/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-
<entry><key>objects/web_launcher/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-
<entry><key>objects/web_launcher/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-
<entry><key>objects/web_launcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
-
- <!-- Email Launcher -->
-
- <entry>
- <key>objects/email_launcher/object_type</key>
- <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
- <value>
- <string>launcher-object</string>
- </value>
- </entry>
- <entry>
- <key>objects/email_launcher/toplevel_id</key>
- <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
- <value>
- <string>top_panel</string>
- </value>
- </entry>
- <entry>
- <key>objects/email_launcher/position</key>
- <schema_key>/schemas/apps/panel/objects/position</schema_key>
- <value>
- <int>2</int>
- </value>
- </entry>
- <entry>
- <key>objects/email_launcher/panel_right_stick</key>
- <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
- <value>
- <bool>false</bool>
- </value>
- </entry>
- <entry>
- <key>objects/email_launcher/locked</key>
- <schema_key>/schemas/apps/panel/objects/locked</schema_key>
- <value>
- <bool>true</bool>
- </value>
- </entry>
- <entry>
- <key>objects/email_launcher/launcher_location</key>
- <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
- <value>
- <string>preferred-mail-reader.desktop</string>
- </value>
- </entry>
-
-
<entry><key>objects/email_launcher/bonobo_iid</key><schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key></entry>
-
<entry><key>objects/email_launcher/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key>
</entry>
-
<entry><key>objects/email_launcher/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-
<entry><key>objects/email_launcher/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-
<entry><key>objects/email_launcher/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-
<entry><key>objects/email_launcher/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-
<entry><key>objects/email_launcher/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-
<entry><key>objects/email_launcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
-
- <!-- GNote -->
-
- <entry>
- <key>applets/gnote/object_type</key>
- <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
- <value>
- <string>bonobo-applet</string>
- </value>
- </entry>
- <entry>
- <key>applets/gnote/toplevel_id</key>
- <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
- <value>
- <string>top_panel</string>
- </value>
- </entry>
- <entry>
- <key>applets/gnote/position</key>
- <schema_key>/schemas/apps/panel/objects/position</schema_key>
- <value>
- <int>3</int>
- </value>
- </entry>
- <entry>
- <key>applets/gnote/panel_right_stick</key>
- <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
- <value>
- <bool>false</bool>
- </value>
- </entry>
- <entry>
- <key>applets/gnote/locked</key>
- <schema_key>/schemas/apps/panel/objects/locked</schema_key>
- <value>
- <bool>true</bool>
- </value>
- </entry>
- <entry>
- <key>applets/gnote/bonobo_iid</key>
- <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
- <value>
- <string>OAFIID:GnoteApplet</string>
- </value>
- </entry>
-
-
<entry><key>applets/gnote/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key>
</entry>
-
<entry><key>applets/gnote/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-
<entry><key>applets/gnote/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-
<entry><key>applets/gnote/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-
<entry><key>applets/gnote/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-
<entry><key>applets/gnote/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-
<entry><key>applets/gnote/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
-
<entry><key>applets/gnote/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
-
- <!-- Fast User Switch Applet -->
-
- <entry>
- <key>applets/fast_user_switch_applet/object_type</key>
- <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
- <value>
- <string>bonobo-applet</string>
- </value>
- </entry>
- <entry>
- <key>applets/fast_user_switch_applet/toplevel_id</key>
- <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
- <value>
- <string>top_panel</string>
- </value>
- </entry>
- <entry>
- <key>applets/fast_user_switch_applet/position</key>
- <schema_key>/schemas/apps/panel/objects/position</schema_key>
- <value>
- <int>0</int>
- </value>
- </entry>
- <entry>
- <key>applets/fast_user_switch_applet/panel_right_stick</key>
- <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
- <value>
- <bool>true</bool>
- </value>
- </entry>
- <entry>
- <key>applets/fast_user_switch_applet/locked</key>
- <schema_key>/schemas/apps/panel/objects/locked</schema_key>
- <value>
- <bool>true</bool>
- </value>
- </entry>
- <entry>
- <key>applets/fast_user_switch_applet/bonobo_iid</key>
- <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
- <value>
- <string>OAFIID:GNOME_FastUserSwitchApplet</string>
- </value>
- </entry>
-
-
<entry><key>applets/fast_user_switch_applet/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key>
</entry>
-
<entry><key>applets/fast_user_switch_applet/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-
<entry><key>applets/fast_user_switch_applet/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-
<entry><key>applets/fast_user_switch_applet/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-
<entry><key>applets/fast_user_switch_applet/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-
<entry><key>applets/fast_user_switch_applet/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-
<entry><key>applets/fast_user_switch_applet/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
-
<entry><key>applets/fast_user_switch_applet/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
-
- <!-- Clock Applet -->
-
- <entry>
- <key>applets/clock/object_type</key>
- <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
- <value>
- <string>bonobo-applet</string>
- </value>
- </entry>
- <entry>
- <key>applets/clock/toplevel_id</key>
- <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
- <value>
- <string>top_panel</string>
- </value>
- </entry>
- <entry>
- <key>applets/clock/position</key>
- <schema_key>/schemas/apps/panel/objects/position</schema_key>
- <value>
- <int>1</int>
- </value>
- </entry>
- <entry>
- <key>applets/clock/panel_right_stick</key>
- <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
- <value>
- <bool>true</bool>
- </value>
- </entry>
- <entry>
- <key>applets/clock/locked</key>
- <schema_key>/schemas/apps/panel/objects/locked</schema_key>
- <value>
- <bool>true</bool>
- </value>
- </entry>
- <entry>
- <key>applets/clock/bonobo_iid</key>
- <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
- <value>
- <string>OAFIID:GNOME_ClockApplet</string>
- </value>
- </entry>
-
-
<entry><key>applets/clock/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key>
</entry>
-
<entry><key>applets/clock/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-
<entry><key>applets/clock/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-
<entry><key>applets/clock/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-
<entry><key>applets/clock/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-
<entry><key>applets/clock/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-
<entry><key>applets/clock/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
-
<entry><key>applets/clock/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
-
- <!-- System Tray Applet -->
-
- <entry>
- <key>applets/systray/object_type</key>
- <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
- <value>
- <string>bonobo-applet</string>
- </value>
- </entry>
- <entry>
- <key>applets/systray/toplevel_id</key>
- <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
- <value>
- <string>top_panel</string>
- </value>
- </entry>
- <entry>
- <key>applets/systray/position</key>
- <schema_key>/schemas/apps/panel/objects/position</schema_key>
- <value>
- <int>3</int>
- </value>
- </entry>
- <entry>
- <key>applets/systray/panel_right_stick</key>
- <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
- <value>
- <bool>true</bool>
- </value>
- </entry>
- <entry>
- <key>applets/systray/locked</key>
- <schema_key>/schemas/apps/panel/objects/locked</schema_key>
- <value>
- <bool>true</bool>
- </value>
- </entry>
- <entry>
- <key>applets/systray/bonobo_iid</key>
- <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
- <value>
- <string>OAFIID:GNOME_SystemTrayApplet</string>
- </value>
- </entry>
- <entry>
- <key>applets/systray/prefs/padding</key>
-
<schema_key>/schemas/apps/notification_area_applet/prefs/padding</schema_key>
- <value>
- <int>2</int>
- </value>
- </entry>
-
-
<entry><key>applets/systray/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key>
</entry>
-
<entry><key>applets/systray/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-
<entry><key>applets/systray/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-
<entry><key>applets/systray/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-
<entry><key>applets/systray/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-
<entry><key>applets/systray/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-
<entry><key>applets/systray/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
-
<entry><key>applets/systray/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
-
- <!-- Window List Applet -->
-
- <entry>
- <key>applets/window_list/object_type</key>
- <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
- <value>
- <string>bonobo-applet</string>
- </value>
- </entry>
- <entry>
- <key>applets/window_list/toplevel_id</key>
- <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
- <value>
- <string>bottom_panel</string>
- </value>
- </entry>
- <entry>
- <key>applets/window_list/position</key>
- <schema_key>/schemas/apps/panel/objects/position</schema_key>
- <value>
- <int>1</int>
- </value>
- </entry>
- <entry>
- <key>applets/window_list/panel_right_stick</key>
- <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
- <value>
- <bool>false</bool>
- </value>
- </entry>
- <entry>
- <key>applets/window_list/locked</key>
- <schema_key>/schemas/apps/panel/objects/locked</schema_key>
- <value>
- <bool>true</bool>
- </value>
- </entry>
- <entry>
- <key>applets/window_list/bonobo_iid</key>
- <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
- <value>
- <string>OAFIID:GNOME_WindowListApplet</string>
- </value>
- </entry>
-
-
<entry><key>applets/window_list/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key>
</entry>
-
<entry><key>applets/window_list/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-
<entry><key>applets/window_list/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-
<entry><key>applets/window_list/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-
<entry><key>applets/window_list/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-
<entry><key>applets/window_list/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-
<entry><key>applets/window_list/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
-
<entry><key>applets/window_list/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
-
- <!-- Workspace Switcher Applet -->
-
- <entry>
- <key>applets/workspace_switcher/object_type</key>
- <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
- <value>
- <string>bonobo-applet</string>
- </value>
- </entry>
- <entry>
- <key>applets/workspace_switcher/toplevel_id</key>
- <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
- <value>
- <string>bottom_panel</string>
- </value>
- </entry>
- <entry>
- <key>applets/workspace_switcher/position</key>
- <schema_key>/schemas/apps/panel/objects/position</schema_key>
- <value>
- <int>1</int>
- </value>
- </entry>
- <entry>
- <key>applets/workspace_switcher/panel_right_stick</key>
- <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
- <value>
- <bool>true</bool>
- </value>
- </entry>
- <entry>
- <key>applets/workspace_switcher/locked</key>
- <schema_key>/schemas/apps/panel/objects/locked</schema_key>
- <value>
- <bool>true</bool>
- </value>
- </entry>
- <entry>
- <key>applets/workspace_switcher/bonobo_iid</key>
- <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
- <value>
- <string>OAFIID:GNOME_WorkspaceSwitcherApplet</string>
- </value>
- </entry>
- <entry>
- <key>applets/workspace_switcher/prefs/num_rows</key>
-
<schema_key>/schemas/apps/workspace_switcher/prefs/num_rows</schema_key>
- <value>
- <int>1</int>
- </value>
- </entry>
-
-
<entry><key>applets/workspace_switcher/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key>
</entry>
-
<entry><key>applets/workspace_switcher/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-
<entry><key>applets/workspace_switcher/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-
<entry><key>applets/workspace_switcher/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-
<entry><key>applets/workspace_switcher/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-
<entry><key>applets/workspace_switcher/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-
<entry><key>applets/workspace_switcher/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
-
<entry><key>applets/workspace_switcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
-
- <!-- Trash Applet -->
-
- <entry>
- <key>applets/trash_applet/object_type</key>
- <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
- <value>
- <string>bonobo-applet</string>
- </value>
- </entry>
- <entry>
- <key>applets/trash_applet/toplevel_id</key>
- <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
- <value>
- <string>bottom_panel</string>
- </value>
- </entry>
- <entry>
- <key>applets/trash_applet/position</key>
- <schema_key>/schemas/apps/panel/objects/position</schema_key>
- <value>
- <int>0</int>
- </value>
- </entry>
- <entry>
- <key>applets/trash_applet/panel_right_stick</key>
- <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
- <value>
- <bool>true</bool>
- </value>
- </entry>
- <entry>
- <key>applets/trash_applet/locked</key>
- <schema_key>/schemas/apps/panel/objects/locked</schema_key>
- <value>
- <bool>true</bool>
- </value>
- </entry>
- <entry>
- <key>applets/trash_applet/bonobo_iid</key>
- <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
- <value>
- <string>OAFIID:GNOME_Panel_TrashApplet</string>
- </value>
- </entry>
-
-
<entry><key>applets/trash_applet/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key>
</entry>
-
<entry><key>applets/trash_applet/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-
<entry><key>applets/trash_applet/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-
<entry><key>applets/trash_applet/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-
<entry><key>applets/trash_applet/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-
<entry><key>applets/trash_applet/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-
<entry><key>applets/trash_applet/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
-
<entry><key>applets/trash_applet/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
-
- </entrylist>
-
-</gconfentryfile>
diff --git a/sources b/sources
deleted file mode 100644
index c382f1a..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-f394ad73babbce95fd0bb65ec6fd3519 gnome-panel-3.6.2.tar.xz
commit c2b77a726bef547662f89b34e32dca592f5d23e9
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Wed Feb 13 18:02:16 2013 -0600
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/gnome-panel.spec b/gnome-panel.spec
index c58911e..380feee 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -17,7 +17,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 3.6.2
-Release: 5%{?dist}
+Release: 6%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
Source0:
http://download.gnome.org/sources/gnome-panel/3.6/%{name}-%{version}.tar.xz
@@ -254,6 +254,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null
|| :
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
3.6.2-6
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
* Sun Dec 30 2012 Daniel Drake <dsd(a)laptop.org> - 3.6.2-5
- Fix all-black icons in notification area
commit 93d945973968207a6fb537b086e9ee89cdffb2b7
Author: Daniel Drake <dsd(a)laptop.org>
Date: Sun Dec 30 12:14:02 2012 +0000
Fix all-black icons in notification area
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 174e897..c58911e 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -17,7 +17,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 3.6.2
-Release: 4%{?dist}
+Release: 5%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
Source0:
http://download.gnome.org/sources/gnome-panel/3.6/%{name}-%{version}.tar.xz
@@ -31,6 +31,9 @@ Patch1: gnome-panel-use-gnome-menus.patch
#
https://bugzilla.redhat.com/show_bug.cgi?id=890219
Patch2: drop-gweather-xml-include.patch
+#
https://bugzilla.gnome.org/show_bug.cgi?id=690353
+Patch3: na-style-realize.patch
+
License: GPLv2+ and LGPLv2+ and GFDL
Group: User Interface/Desktops
@@ -153,6 +156,7 @@ Panel Applets using the libpanel-applet library.
%patch0 -p1 -b .16px
%patch1 -p1 -b .menus
%patch2 -p0 -b .gweather
+%patch3 -p1 -b .na-style
rm -f libtool
autoreconf -i -f
@@ -250,6 +254,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null
|| :
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Sun Dec 30 2012 Daniel Drake <dsd(a)laptop.org> - 3.6.2-5
+- Fix all-black icons in notification area
+
* Tue Dec 25 2012 Bruno Wolff III <bruno(a)wolff.to> - 3.6.2-4
- Drop gweather-xml.h include
- Rebuild for multiple soname bumps
diff --git a/na-style-realize.patch b/na-style-realize.patch
new file mode 100644
index 0000000..fb7bd40
--- /dev/null
+++ b/na-style-realize.patch
@@ -0,0 +1,47 @@
+From f1652b60a9fa0580c5fc60758c3ccdfcf691b5c2 Mon Sep 17 00:00:00 2001
+From: Daniel Drake <dsd(a)laptop.org>
+Date: Mon, 17 Dec 2012 14:58:20 +0000
+Subject: [PATCH] na: apply style after realize
+
+Under Fedora 18 (GTK-3.6.2), notification icons such as the battery/power
+icon from gnome-settings-daemon are appearing all-black on top of a black
+background.
+
+This is because style_updated is being called before the tray applet
+is realized, meaning that the following code in
+na_tray_applet_style_updated() causes a bail-out:
+
+ if (!applet->priv->tray)
+ return;
+
+and the style is never applied.
+
+Fix this by updating the style explicitly after realizing the widget.
+---
+ applets/notification_area/main.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/applets/notification_area/main.c b/applets/notification_area/main.c
+index 5fc4d1d..0d5de70 100644
+--- a/applets/notification_area/main.c
++++ b/applets/notification_area/main.c
+@@ -36,6 +36,8 @@
+
+ #define NOTIFICATION_AREA_ICON "gnome-panel-notification-area"
+
++static void na_tray_applet_style_updated (GtkWidget *widget);
++
+ struct _NaTrayAppletPrivate
+ {
+ NaTray *tray;
+@@ -79,6 +81,7 @@ na_tray_applet_realize (GtkWidget *widget)
+
+ gtk_container_add (GTK_CONTAINER (widget), GTK_WIDGET (applet->priv->tray));
+ gtk_widget_show (GTK_WIDGET (applet->priv->tray));
++ na_tray_applet_style_updated (widget);
+ }
+
+ static void
+--
+1.8.0.1
+
commit 01c9240c0c4656ed20a21b3ae590327fb42dbc93
Author: Bruno Wolff III <bruno(a)wolff.to>
Date: Tue Dec 25 14:54:37 2012 -0600
Drop obsolete include of gweather-xml.h
diff --git a/drop-gweather-xml-include.patch b/drop-gweather-xml-include.patch
new file mode 100644
index 0000000..3b3a559
--- /dev/null
+++ b/drop-gweather-xml-include.patch
@@ -0,0 +1,10 @@
+--- applets/clock/clock.c.orig 2012-12-25 14:38:00.101601746 -0600
++++ applets/clock/clock.c 2012-12-25 14:38:30.331443803 -0600
+@@ -54,7 +54,6 @@
+ #define GNOME_DESKTOP_USE_UNSTABLE_API
+ #include <libgnome-desktop/gnome-wall-clock.h>
+
+-#include <libgweather/gweather-xml.h>
+ #include <libgweather/location-entry.h>
+ #include <libgweather/timezone-menu.h>
+ #include <libgweather/gweather-enum-types.h>
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 01d54f5..174e897 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -17,7 +17,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 3.6.2
-Release: 3%{?dist}
+Release: 4%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
Source0:
http://download.gnome.org/sources/gnome-panel/3.6/%{name}-%{version}.tar.xz
@@ -28,6 +28,9 @@ Patch0: Use-16px-menu-icons.patch
#
https://bugzilla.redhat.com/show_bug.cgi?id=685142
Patch1: gnome-panel-use-gnome-menus.patch
+#
https://bugzilla.redhat.com/show_bug.cgi?id=890219
+Patch2: drop-gweather-xml-include.patch
+
License: GPLv2+ and LGPLv2+ and GFDL
Group: User Interface/Desktops
@@ -149,6 +152,7 @@ Panel Applets using the libpanel-applet library.
%setup -q -n %{name}-%{version}
%patch0 -p1 -b .16px
%patch1 -p1 -b .menus
+%patch2 -p0 -b .gweather
rm -f libtool
autoreconf -i -f
@@ -246,6 +250,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null
|| :
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Tue Dec 25 2012 Bruno Wolff III <bruno(a)wolff.to> - 3.6.2-4
+- Drop gweather-xml.h include
+- Rebuild for multiple soname bumps
+
* Thu Dec 20 2012 Kalev Lember <kalevlember(a)gmail.com> - 3.6.2-3
- Rebuilt for libgnome-desktop3 3.7.3 soname bump
commit 1d95967f78b54f51b17800ffaa960d1b5d4dc013
Author: Kalev Lember <kalevlember(a)gmail.com>
Date: Thu Dec 20 21:48:38 2012 +0100
Rebuilt for libgnome-desktop3 3.7.3 soname bump
diff --git a/gnome-panel.spec b/gnome-panel.spec
index cf2823f..01d54f5 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -17,7 +17,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 3.6.2
-Release: 2%{?dist}
+Release: 3%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
Source0:
http://download.gnome.org/sources/gnome-panel/3.6/%{name}-%{version}.tar.xz
@@ -246,6 +246,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null
|| :
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Thu Dec 20 2012 Kalev Lember <kalevlember(a)gmail.com> - 3.6.2-3
+- Rebuilt for libgnome-desktop3 3.7.3 soname bump
+
* Tue Nov 20 2012 Milan Crha <mcrha(a)redhat.com> - 3.6.2-2
- Rebuild against newer evolution-data-server
commit ed8d3d51b14d8d4d3e45f3ce4a985d3f575b5e37
Author: Milan Crha <mcrha(a)redhat.com>
Date: Tue Nov 20 18:06:10 2012 +0100
Rebuild against newer evolution-data-server
diff --git a/gnome-panel.spec b/gnome-panel.spec
index da72a69..cf2823f 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -17,7 +17,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 3.6.2
-Release: 1%{?dist}
+Release: 2%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
Source0:
http://download.gnome.org/sources/gnome-panel/3.6/%{name}-%{version}.tar.xz
@@ -246,6 +246,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null
|| :
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Tue Nov 20 2012 Milan Crha <mcrha(a)redhat.com> - 3.6.2-2
+- Rebuild against newer evolution-data-server
+
* Mon Nov 12 2012 Kalev Lember <kalevlember(a)gmail.com> - 3.6.2-1
- Update to 3.6.2
- Clean up some obsolete buildrequires
commit a9a543fd0d29c44e82ac58db00f9e73b40d2b142
Author: Kalev Lember <kalevlember(a)gmail.com>
Date: Mon Nov 12 22:51:15 2012 +0100
Clean up some obsolete buildrequires
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 005afa1..da72a69 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -1,20 +1,16 @@
%define gettext_package gnome-panel-2.0
%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 glib2_version 2.31.14
+%define gtk3_version 3.3.8
%define libwnck_version 2.91.6
-%define gnome_menus_version 2.27.92
-%define evolution_data_server_version 1.9.1
+%define gnome_menus_version 3.1.4
+%define evolution_data_server_version 3.5.3
%define cairo_version 1.0.0
-%define dbus_version 0.60
-%define dbus_glib_version 0.60
+%define dbus_version 1.1.2
+%define dbus_glib_version 0.80
%define gnome_doc_utils_version 0.3.2
-%define libgweather_version 2.91.0
+%define libgweather_version 3.5.1
%define use_evolution_data_server 1
@@ -55,16 +51,13 @@ BuildRequires: gettext
BuildRequires: automake
BuildRequires: autoconf
BuildRequires: libtool
+BuildRequires: GConf2-devel
+BuildRequires: gtk3-devel >= %{gtk3_version}
BuildRequires: itstool
-BuildRequires: scrollkeeper
BuildRequires: libxslt
BuildRequires: libX11-devel
BuildRequires: libXt-devel
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: pkgconfig(libwnck-3.0) >= %{libwnck_version}
BuildRequires: dconf-devel
BuildRequires: gnome-menus-devel >= %{gnome_menus_version}
@@ -73,12 +66,10 @@ BuildRequires: yelp-tools
BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
BuildRequires: gtk-doc
BuildRequires: pango-devel
-BuildRequires: libbonobo-devel
BuildRequires: libXau-devel
BuildRequires: libXrandr-devel
%if %{use_evolution_data_server}
BuildRequires: evolution-data-server-devel >= %{evolution_data_server_version}
-BuildRequires: ORBit2-devel >= %{orbit_version}
BuildRequires: dbus-devel >= %{dbus_version}
%endif
BuildRequires: polkit-devel >= 0.92
@@ -164,7 +155,6 @@ autoreconf -i -f
%build
%configure \
--disable-gtk-doc \
- --disable-scrollkeeper \
%if %{use_evolution_data_server}
--enable-eds=yes
%else
@@ -258,6 +248,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null
|| :
%changelog
* Mon Nov 12 2012 Kalev Lember <kalevlember(a)gmail.com> - 3.6.2-1
- Update to 3.6.2
+- Clean up some obsolete buildrequires
* Thu Nov 1 2012 Daniel Drake <dsd(a)laptop.org> - 3.6.0-2
- Update for new gnome-menus gnome-applications filename (#868614)
commit 94b4bb0f984cfce983b1c81cbbb50149e773c9fa
Author: Kalev Lember <kalevlember(a)gmail.com>
Date: Mon Nov 12 22:37:10 2012 +0100
Update to 3.6.2
diff --git a/.gitignore b/.gitignore
index 10df3db..61583cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@ gnome-panel-2.31.6.tar.bz2
/gnome-panel-3.5.3.tar.xz
/gnome-panel-3.5.4.tar.xz
/gnome-panel-3.6.0.tar.xz
+/gnome-panel-3.6.2.tar.xz
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 6f095f5..005afa1 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -20,8 +20,8 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 3.6.0
-Release: 2%{?dist}
+Version: 3.6.2
+Release: 1%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
Source0:
http://download.gnome.org/sources/gnome-panel/3.6/%{name}-%{version}.tar.xz
@@ -256,6 +256,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null
|| :
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Mon Nov 12 2012 Kalev Lember <kalevlember(a)gmail.com> - 3.6.2-1
+- Update to 3.6.2
+
* Thu Nov 1 2012 Daniel Drake <dsd(a)laptop.org> - 3.6.0-2
- Update for new gnome-menus gnome-applications filename (#868614)
diff --git a/sources b/sources
index 5a4d0b9..c382f1a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6642c9f36bd2b8dddfac6255ef11e9b6 gnome-panel-3.6.0.tar.xz
+f394ad73babbce95fd0bb65ec6fd3519 gnome-panel-3.6.2.tar.xz
commit 65593fe8aefb7728bb3db7ded582e882a8eb57f1
Author: Daniel Drake <dsd(a)laptop.org>
Date: Thu Nov 1 11:16:46 2012 -0600
Fix for gnome-menus path change
diff --git a/gnome-panel-use-gnome-menus.patch b/gnome-panel-use-gnome-menus.patch
index 320e7d1..87495cc 100644
--- a/gnome-panel-use-gnome-menus.patch
+++ b/gnome-panel-use-gnome-menus.patch
@@ -6,7 +6,7 @@ diff -up gnome-panel-3.1.5/gnome-panel/menu.c.menus
gnome-panel-3.1.5/gnome-pane
GtkWidget *main_menu;
- main_menu = create_applications_menu ("applications.menu", NULL, TRUE);
-+ main_menu = create_applications_menu ("applications-gnome.menu", NULL,
TRUE);
++ main_menu = create_applications_menu ("gnome-applications.menu", NULL,
TRUE);
g_object_set_data (G_OBJECT (main_menu), "menu_panel", panel);
/* FIXME need to update the panel on parent_set */
@@ -27,7 +27,7 @@ diff -up gnome-panel-3.1.5/gnome-panel/panel-addto.c.menus
gnome-panel-3.1.5/gno
if (tree != NULL && (root = gmenu_tree_get_root_directory (tree))) {
panel_addto_make_application_list (&dialog->application_list,
- root, "applications.menu",
-+ root, "applications-gnome.menu",
++ root, "gnome-applications.menu",
PANEL_ADDTO_MENU_SHOW_ALL);
panel_addto_populate_application_model (store, NULL, dialog->application_list);
@@ -39,7 +39,7 @@ diff -up gnome-panel-3.1.5/gnome-panel/panel-menu-bar.c.menus
gnome-panel-3.1.5/
menubar->priv->info = NULL;
- menubar->priv->applications_menu = create_applications_menu
("applications.menu", NULL, TRUE);
-+ menubar->priv->applications_menu = create_applications_menu
("applications-gnome.menu", NULL, TRUE);
++ menubar->priv->applications_menu = create_applications_menu
("gnome-applications.menu", NULL, TRUE);
menubar->priv->applications_item = panel_image_menu_item_new ();
gtk_menu_item_set_label (GTK_MENU_ITEM (menubar->priv->applications_item),
@@ -51,7 +51,7 @@ diff -up gnome-panel-3.1.5/gnome-panel/panel-menu-button.c.menus
gnome-panel-3.1
static MenuPathRootItem root_items [] = {
- { APPLICATIONS_MENU, "applications", "applications.menu" },
-+ { APPLICATIONS_MENU, "applications", "applications-gnome.menu" },
++ { APPLICATIONS_MENU, "applications", "gnome-applications.menu" },
{ GNOMECC_MENU, "gnomecc", "gnomecc.menu" }
};
@@ -63,7 +63,7 @@ diff -up gnome-panel-3.1.5/gnome-panel/panel-run-dialog.c.menus
gnome-panel-3.1.
GSList *retval;
- tree = gmenu_tree_new ("applications.menu",
GMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
-+ tree = gmenu_tree_new ("applications-gnome.menu",
GMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
++ tree = gmenu_tree_new ("gnome-applications.menu",
GMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
if (!gmenu_tree_load_sync (tree, NULL))
return NULL;
diff --git a/gnome-panel.spec b/gnome-panel.spec
index e1ea97c..6f095f5 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,7 +21,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 3.6.0
-Release: 1%{?dist}
+Release: 2%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
Source0:
http://download.gnome.org/sources/gnome-panel/3.6/%{name}-%{version}.tar.xz
@@ -256,6 +256,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null
|| :
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Thu Nov 1 2012 Daniel Drake <dsd(a)laptop.org> - 3.6.0-2
+- Update for new gnome-menus gnome-applications filename (#868614)
+
* Fri Oct 26 2012 Kalev Lember <kalevlember(a)gmail.com> - 3.6.0-1
- Update to 3.6.0
commit a933fb316abae2c11000be85382ab7062817554f
Author: Kalev Lember <kalevlember(a)gmail.com>
Date: Fri Oct 26 21:09:51 2012 +0200
Sync with F18
diff --git a/.gitignore b/.gitignore
index 88dadd9..10df3db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@ gnome-panel-2.31.6.tar.bz2
/gnome-panel-3.4.2.1.tar.xz
/gnome-panel-3.5.3.tar.xz
/gnome-panel-3.5.4.tar.xz
+/gnome-panel-3.6.0.tar.xz
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 48e9e8d..e1ea97c 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -20,11 +20,11 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 3.5.4
-Release: 5%{?dist}
+Version: 3.6.0
+Release: 1%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
-Source0:
http://download.gnome.org/sources/gnome-panel/3.5/%{name}-%{version}.tar.xz
+Source0:
http://download.gnome.org/sources/gnome-panel/3.6/%{name}-%{version}.tar.xz
#
https://bugzilla.gnome.org/show_bug.cgi?id=646749
Patch0: Use-16px-menu-icons.patch
@@ -55,6 +55,7 @@ BuildRequires: gettext
BuildRequires: automake
BuildRequires: autoconf
BuildRequires: libtool
+BuildRequires: itstool
BuildRequires: scrollkeeper
BuildRequires: libxslt
BuildRequires: libX11-devel
@@ -68,7 +69,7 @@ BuildRequires: pkgconfig(libwnck-3.0) >= %{libwnck_version}
BuildRequires: dconf-devel
BuildRequires: gnome-menus-devel >= %{gnome_menus_version}
BuildRequires: cairo-devel >= %{cairo_version}
-BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
+BuildRequires: yelp-tools
BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
BuildRequires: gtk-doc
BuildRequires: pango-devel
@@ -255,6 +256,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null
|| :
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Fri Oct 26 2012 Kalev Lember <kalevlember(a)gmail.com> - 3.6.0-1
+- Update to 3.6.0
+
* Thu Oct 25 2012 Milan Crha <mcrha(a)redhat.com> - 3.5.4-5
- Rebuild against newer evolution-data-server
diff --git a/sources b/sources
index c24c4ac..5a4d0b9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a7030c4b6718407bf003395f8a645d28 gnome-panel-3.5.4.tar.xz
+6642c9f36bd2b8dddfac6255ef11e9b6 gnome-panel-3.6.0.tar.xz
commit 05da42863fef5d4c9c2b92950bd9d1a194f450a3
Author: Milan Crha <mcrha(a)redhat.com>
Date: Thu Oct 25 17:46:31 2012 +0200
Rebuild against newer evolution-data-server
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 41da60f..48e9e8d 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,7 +21,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 3.5.4
-Release: 4%{?dist}
+Release: 5%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
Source0:
http://download.gnome.org/sources/gnome-panel/3.5/%{name}-%{version}.tar.xz
@@ -255,6 +255,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null
|| :
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Thu Oct 25 2012 Milan Crha <mcrha(a)redhat.com> - 3.5.4-5
+- Rebuild against newer evolution-data-server
+
* Mon Aug 20 2012 Daniel Drake <dsd(a)laptop.org> - 3.5.4-4
- Rebuild for libcamel-1.2.so.40
commit 72b8604588fd510a95fb5e07f9edef30cf5bd652
Author: Daniel Drake <dsd(a)laptop.org>
Date: Mon Aug 20 19:43:00 2012 -0600
Rebuild for new libcamel
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 793d6de..41da60f 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,7 +21,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 3.5.4
-Release: 3%{?dist}
+Release: 4%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
Source0:
http://download.gnome.org/sources/gnome-panel/3.5/%{name}-%{version}.tar.xz
@@ -255,6 +255,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null
|| :
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Mon Aug 20 2012 Daniel Drake <dsd(a)laptop.org> - 3.5.4-4
+- Rebuild for libcamel-1.2.so.40
+
* Fri Jul 27 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
3.5.4-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
commit c7468df9903ce197b384cd8d225a6f2bb0bf2c41
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Fri Jul 27 00:25:30 2012 -0500
Rebuilt for
https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/gnome-panel.spec b/gnome-panel.spec
index a20cf06..793d6de 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,7 +21,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 3.5.4
-Release: 2%{?dist}
+Release: 3%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
Source0:
http://download.gnome.org/sources/gnome-panel/3.5/%{name}-%{version}.tar.xz
@@ -255,6 +255,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null
|| :
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Fri Jul 27 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
3.5.4-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
* Sun Jul 22 2012 Ville Skytt <ville.skytta(a)iki.fi> - 3.5.4-2
- Move post(un)install ldconfig scriptlets from main to -libs.
- Escape macros in %%changelog.
commit ad53fff5260af9820b4703727073550e4987842d
Author: Ville Skytt <ville.skytta(a)iki.fi>
Date: Sun Jul 22 15:49:25 2012 +0300
Move post(un)install ldconfig scriptlets from main to -libs.
- Escape macros in %changelog.
diff --git a/gnome-panel.spec b/gnome-panel.spec
index b8c5fce..a20cf06 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,7 +21,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 3.5.4
-Release: 1%{?dist}
+Release: 2%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
Source0:
http://download.gnome.org/sources/gnome-panel/3.5/%{name}-%{version}.tar.xz
@@ -195,10 +195,8 @@ desktop-file-install --delete-original \
%post
touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
-/sbin/ldconfig
%postun
-/sbin/ldconfig
if [ $1 -eq 0 ]; then
touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null || :
@@ -209,6 +207,9 @@ fi
gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null || :
glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
%files -f %{gettext_package}.lang
%doc AUTHORS COPYING COPYING.LIB COPYING-DOCS NEWS README
@@ -254,6 +255,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null
|| :
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Sun Jul 22 2012 Ville Skytt <ville.skytta(a)iki.fi> - 3.5.4-2
+- Move post(un)install ldconfig scriptlets from main to -libs.
+- Escape macros in %%changelog.
+
* Wed Jul 18 2012 Matthias Clasen <mclasen(a)redhat.com> - 3.5.4-1
- Update to 3.5.4
@@ -598,7 +603,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null
|| :
- Update to 2.25.5
* Fri Jan 16 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.25.3-4
-- And don't write %s into desktop files
+- And don't write %%s into desktop files
* Fri Jan 16 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.25.3-3
- Fix the 'smart launcher' patch
@@ -1307,7 +1312,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null
|| :
command (rh #152948)
* Mon Apr 18 2005 Mark McLoughlin <markmc(a)redhat.com> 2.10.1-2
-- Add the battery applet to the panel in %post if ACPI is
+- Add the battery applet to the panel in %%post if ACPI is
available (bug #143828)
* Mon Apr 4 2005 Mark McLoughlin <markmc(a)redhat.com> 2.10.1-1
@@ -1440,7 +1445,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null
|| :
it doesn't seem like we've forgotten panel-compatibility.schemas
* Thu Apr 8 2004 Mark McLoughlin <markmc(a)redhat.com> 2.6.0-5
-- Fix problem with apm detection in %post on machines whose
+- Fix problem with apm detection in %%post on machines whose
APM bios doesn't have battery lifetime support
* Wed Apr 7 2004 Mark McLoughlin <markmc(a)redhat.com> - 2.6.0-4
commit c68cd8317c9bd17aab2b85f18be02290dd2adcb4
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Wed Jul 18 15:03:04 2012 -0400
3.5.4
diff --git a/.gitignore b/.gitignore
index 0a098d2..88dadd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@ gnome-panel-2.31.6.tar.bz2
/gnome-panel-3.4.1.tar.xz
/gnome-panel-3.4.2.1.tar.xz
/gnome-panel-3.5.3.tar.xz
+/gnome-panel-3.5.4.tar.xz
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 2065809..b8c5fce 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -20,7 +20,7 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 3.5.3
+Version: 3.5.4
Release: 1%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
@@ -254,6 +254,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null
|| :
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Wed Jul 18 2012 Matthias Clasen <mclasen(a)redhat.com> - 3.5.4-1
+- Update to 3.5.4
+
* Tue Jun 26 2012 Matthias Clasen <mclasen(a)redhat.com> - 3.5.3-1
- Update to 3.5.3
diff --git a/sources b/sources
index 7a957fb..c24c4ac 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a4af95f553698be19efcf854cbfb9664 gnome-panel-3.5.3.tar.xz
+a7030c4b6718407bf003395f8a645d28 gnome-panel-3.5.4.tar.xz
commit f8852d29123f1e19bcf7f4840f039a79e0d5f1e5
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Wed Jun 27 08:40:05 2012 -0400
more clock config fixes
diff --git a/gnome-panel.spec b/gnome-panel.spec
index a8d8a9f..2065809 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -239,7 +239,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null
|| :
%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.menu-button.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.object.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.toplevel.gschema.xml
-
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.applet.clock.gschema.xml
%files libs
%{_libdir}/*.so.*
commit 3adadd1805dc00fad9372a7c76cac4916879f0a5
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Wed Jun 27 08:15:30 2012 -0400
no more gconf for the clock
diff --git a/gnome-panel.spec b/gnome-panel.spec
index e356552..a8d8a9f 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -193,14 +193,7 @@ desktop-file-install --delete-original \
%find_lang %{gettext_package} --all-name --with-gnome
-%pre
-%gconf_schema_prepare clock
-
-%preun
-%gconf_schema_remove clock
-
%post
-%gconf_schema_upgrade clock
touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
/sbin/ldconfig
@@ -237,8 +230,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null
|| :
%{_datadir}/dbus-1/services/org.gnome.panel.applet.NotificationAreaAppletFactory.service
%{_datadir}/dbus-1/services/org.gnome.panel.applet.WnckletFactory.service
-%{_sysconfdir}/gconf/schemas/clock.schemas
-
%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.applet.fish.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.applet.window-list.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.applet.workspace-switcher.gschema.xml
commit a686208075234c20ea906f610e122605bc8321cf
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Tue Jun 26 22:05:06 2012 -0400
3.5.3
diff --git a/.gitignore b/.gitignore
index 3cbe8df..0a098d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@ gnome-panel-2.31.6.tar.bz2
/gnome-panel-3.4.0.tar.xz
/gnome-panel-3.4.1.tar.xz
/gnome-panel-3.4.2.1.tar.xz
+/gnome-panel-3.5.3.tar.xz
diff --git a/gnome-panel.spec b/gnome-panel.spec
index a0c4414..e356552 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -20,11 +20,11 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 3.4.2.1
-Release: 2%{?dist}
+Version: 3.5.3
+Release: 1%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
-Source0:
http://download.gnome.org/sources/gnome-panel/3.4/%{name}-%{version}.tar.xz
+Source0:
http://download.gnome.org/sources/gnome-panel/3.5/%{name}-%{version}.tar.xz
#
https://bugzilla.gnome.org/show_bug.cgi?id=646749
Patch0: Use-16px-menu-icons.patch
@@ -263,6 +263,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null
|| :
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Tue Jun 26 2012 Matthias Clasen <mclasen(a)redhat.com> - 3.5.3-1
+- Update to 3.5.3
+
* Fri Jun 8 2012 Matthias Clasen <mclasen(a)redhat.com> - 3.4.2.1-2
- Rebuild against new gnome-desktop
diff --git a/sources b/sources
index 0671e8a..7a957fb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1a7c12b22b7e5f61ce7ab90608b2c2c8 gnome-panel-3.4.2.1.tar.xz
+a4af95f553698be19efcf854cbfb9664 gnome-panel-3.5.3.tar.xz
commit e4a816143ec5aa236d2d00ddf9a8dc3b64465e2e
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Fri Jun 8 14:43:18 2012 -0400
rebuild
diff --git a/gnome-panel.spec b/gnome-panel.spec
index aa96c60..a0c4414 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,7 +21,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 3.4.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
Source0:
http://download.gnome.org/sources/gnome-panel/3.4/%{name}-%{version}.tar.xz
@@ -263,6 +263,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null
|| :
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Fri Jun 8 2012 Matthias Clasen <mclasen(a)redhat.com> - 3.4.2.1-2
+- Rebuild against new gnome-desktop
+
* Fri May 18 2012 Richard Hughes <hughsient(a)gmail.com> - 3.4.2.1-1
- Update to 3.4.2.1
commit 6d6b40ef6f4db378f878a56e65d86fa0498957d1
Author: Richard Hughes <richard(a)hughsie.com>
Date: Fri May 18 16:53:55 2012 +0100
Update to 3.4.2.1
diff --git a/.gitignore b/.gitignore
index 31cd7f5..3cbe8df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@ gnome-panel-2.31.6.tar.bz2
/gnome-panel-3.3.92.tar.xz
/gnome-panel-3.4.0.tar.xz
/gnome-panel-3.4.1.tar.xz
+/gnome-panel-3.4.2.1.tar.xz
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 7ef7775..aa96c60 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -20,8 +20,8 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 3.4.1
-Release: 3%{?dist}
+Version: 3.4.2.1
+Release: 1%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
Source0:
http://download.gnome.org/sources/gnome-panel/3.4/%{name}-%{version}.tar.xz
@@ -263,6 +263,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null
|| :
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Fri May 18 2012 Richard Hughes <hughsient(a)gmail.com> - 3.4.2.1-1
+- Update to 3.4.2.1
+
* Tue May 01 2012 Kalev Lember <kalevlember(a)gmail.com> - 3.4.1-3
- Rebuilt for evolution-data-server soname bumps
diff --git a/sources b/sources
index de6f477..0671e8a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-798d185f12cf64345caebe2c319a2dbe gnome-panel-3.4.1.tar.xz
+1a7c12b22b7e5f61ce7ab90608b2c2c8 gnome-panel-3.4.2.1.tar.xz
commit 9c645da8d6c86f76666d358440385e51cc171b5e
Author: Kalev Lember <kalevlember(a)gmail.com>
Date: Tue May 1 21:06:27 2012 +0300
Rebuilt for evolution-data-server soname bumps
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 93e19f7..7ef7775 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,7 +21,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 3.4.1
-Release: 2%{?dist}
+Release: 3%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
Source0:
http://download.gnome.org/sources/gnome-panel/3.4/%{name}-%{version}.tar.xz
@@ -263,6 +263,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null
|| :
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Tue May 01 2012 Kalev Lember <kalevlember(a)gmail.com> - 3.4.1-3
+- Rebuilt for evolution-data-server soname bumps
+
* Tue Apr 24 2012 Kalev Lember <kalevlember(a)gmail.com> - 3.4.1-2
- Silence rpm scriptlet output
commit a21e0f8f6b85aa406fec37e6b8cc405f752ffd0c
Author: Kalev Lember <kalevlember(a)gmail.com>
Date: Tue Apr 24 18:19:26 2012 +0300
Silence rpm scriptlet output
Redirect it to /dev/null; end users aren't supposed to see the warnings
generated by e.g. glib-compile-schemas.
http://fedoraproject.org/wiki/Packaging:ScriptletSnippets
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 716a6a1..93e19f7 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,7 +21,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 3.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
Source0:
http://download.gnome.org/sources/gnome-panel/3.4/%{name}-%{version}.tar.xz
@@ -209,12 +209,12 @@ touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
if [ $1 -eq 0 ]; then
touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null || :
- glib-compile-schemas %{_datadir}/glib-2.0/schemas
+ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
fi
%posttrans
gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null || :
-glib-compile-schemas %{_datadir}/glib-2.0/schemas
+glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
%files -f %{gettext_package}.lang
@@ -263,6 +263,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Tue Apr 24 2012 Kalev Lember <kalevlember(a)gmail.com> - 3.4.1-2
+- Silence rpm scriptlet output
+
* Mon Apr 16 2012 Richard Hughes <hughsient(a)gmail.com> - 3.4.1-1
- Update to 3.4.1
commit 44b4c9bd22da160170c876232165318dbf59f645
Author: Richard Hughes <richard(a)hughsie.com>
Date: Mon Apr 16 16:33:32 2012 +0100
Update to 3.4.1
diff --git a/.gitignore b/.gitignore
index ccd0818..31cd7f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@ gnome-panel-2.31.6.tar.bz2
/gnome-panel-3.3.91.tar.xz
/gnome-panel-3.3.92.tar.xz
/gnome-panel-3.4.0.tar.xz
+/gnome-panel-3.4.1.tar.xz
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 99b5c57..716a6a1 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -20,7 +20,7 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 3.4.0
+Version: 3.4.1
Release: 1%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
@@ -263,6 +263,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Mon Apr 16 2012 Richard Hughes <hughsient(a)gmail.com> - 3.4.1-1
+- Update to 3.4.1
+
* Tue Mar 27 2012 Kalev Lember <kalevlember(a)gmail.com> - 3.4.0-1
- Update to 3.4.0
diff --git a/sources b/sources
index dca6d96..de6f477 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cbb5882c0898789fc0bec343102e46bf gnome-panel-3.4.0.tar.xz
+798d185f12cf64345caebe2c319a2dbe gnome-panel-3.4.1.tar.xz
commit 98ea8034527671124e7185539654c504c7d74a7b
Author: Kalev Lember <kalevlember(a)gmail.com>
Date: Tue Mar 27 01:30:52 2012 +0300
3.4.0
diff --git a/.gitignore b/.gitignore
index 50680ea..ccd0818 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ gnome-panel-2.31.6.tar.bz2
/gnome-panel-3.3.90.tar.xz
/gnome-panel-3.3.91.tar.xz
/gnome-panel-3.3.92.tar.xz
+/gnome-panel-3.4.0.tar.xz
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 813b21e..99b5c57 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -20,11 +20,11 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 3.3.92
+Version: 3.4.0
Release: 1%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
-Source0:
http://download.gnome.org/sources/gnome-panel/3.3/%{name}-%{version}.tar.xz
+Source0:
http://download.gnome.org/sources/gnome-panel/3.4/%{name}-%{version}.tar.xz
#
https://bugzilla.gnome.org/show_bug.cgi?id=646749
Patch0: Use-16px-menu-icons.patch
@@ -263,6 +263,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Tue Mar 27 2012 Kalev Lember <kalevlember(a)gmail.com> - 3.4.0-1
+- Update to 3.4.0
+
* Wed Mar 21 2012 Kalev Lember <kalevlember(a)gmail.com> - 3.3.92-1
- Update to 3.3.92
diff --git a/sources b/sources
index 014a9e7..dca6d96 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c0cbe84fdf0fdc4926429988332bb8d9 gnome-panel-3.3.92.tar.xz
+cbb5882c0898789fc0bec343102e46bf gnome-panel-3.4.0.tar.xz
commit 5008984bc2c5585e0f8960787a56769602778d05
Author: Kalev Lember <kalevlember(a)gmail.com>
Date: Wed Mar 21 01:13:58 2012 +0200
3.3.92
diff --git a/.gitignore b/.gitignore
index 2215de4..50680ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ gnome-panel-2.31.6.tar.bz2
/gnome-panel-3.3.5.tar.xz
/gnome-panel-3.3.90.tar.xz
/gnome-panel-3.3.91.tar.xz
+/gnome-panel-3.3.92.tar.xz
diff --git a/gnome-panel.spec b/gnome-panel.spec
index fb840ae..813b21e 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -20,7 +20,7 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 3.3.91
+Version: 3.3.92
Release: 1%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
@@ -263,6 +263,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Wed Mar 21 2012 Kalev Lember <kalevlember(a)gmail.com> - 3.3.92-1
+- Update to 3.3.92
+
* Tue Mar 6 2012 Matthias Clasen <mclasen(a)redhat.com> - 3.3.91-1
- Update to 3.3.91
diff --git a/sources b/sources
index 62774fc..014a9e7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b0d648467d7855af79971f7f0729bc9e gnome-panel-3.3.91.tar.xz
+c0cbe84fdf0fdc4926429988332bb8d9 gnome-panel-3.3.92.tar.xz
commit 9c447617b6036070dbbac065aa38ed3020417a95
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Tue Mar 6 07:08:30 2012 -0500
forgotten sources
diff --git a/.gitignore b/.gitignore
index 0ce7089..2215de4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ gnome-panel-2.31.6.tar.bz2
/gnome-panel-3.3.3.tar.xz
/gnome-panel-3.3.5.tar.xz
/gnome-panel-3.3.90.tar.xz
+/gnome-panel-3.3.91.tar.xz
diff --git a/sources b/sources
index 9380dd7..62774fc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8668ebe9a334d62d81249adf9204d4af gnome-panel-3.3.90.tar.xz
+b0d648467d7855af79971f7f0729bc9e gnome-panel-3.3.91.tar.xz
commit 07cdb2d9f933c355920294233731fa65c1baf12f
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Tue Mar 6 06:48:18 2012 -0500
3.3.91
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 3aae3e9..fb840ae 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -20,7 +20,7 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 3.3.90
+Version: 3.3.91
Release: 1%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
@@ -263,6 +263,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Tue Mar 6 2012 Matthias Clasen <mclasen(a)redhat.com> - 3.3.91-1
+- Update to 3.3.91
+
* Sun Feb 26 2012 Matthias Clasen <mclasen(a)redhat.com> - 3.3.90-1
- Update to 3.3.90
commit 95d7ec34bbbfcf54d37550307e94d72cfccdd418
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Sun Feb 26 11:23:29 2012 -0500
3.3.90
diff --git a/.gitignore b/.gitignore
index 1113d48..0ce7089 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ gnome-panel-2.31.6.tar.bz2
/gnome-panel-3.3.1.tar.xz
/gnome-panel-3.3.3.tar.xz
/gnome-panel-3.3.5.tar.xz
+/gnome-panel-3.3.90.tar.xz
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 0499d91..3aae3e9 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -20,7 +20,7 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 3.3.5
+Version: 3.3.90
Release: 1%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
@@ -263,6 +263,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Sun Feb 26 2012 Matthias Clasen <mclasen(a)redhat.com> - 3.3.90-1
+- Update to 3.3.90
+
* Tue Feb 7 2012 Matthias Clasen <mclasen(a)redhat.com> - 3.3.5-1
- Update to 3.3.5
diff --git a/sources b/sources
index 8bcaadc..9380dd7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-63373bc5eb9b62e3a3c2df8c220cd8cd gnome-panel-3.3.5.tar.xz
+8668ebe9a334d62d81249adf9204d4af gnome-panel-3.3.90.tar.xz
commit a1d92159a0b62fc4d618b26c7757b259f1e51a31
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Tue Feb 7 17:09:43 2012 -0500
3.3.5
diff --git a/.gitignore b/.gitignore
index b350490..1113d48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ gnome-panel-2.31.6.tar.bz2
/gnome-panel-3.2.1.tar.xz
/gnome-panel-3.3.1.tar.xz
/gnome-panel-3.3.3.tar.xz
+/gnome-panel-3.3.5.tar.xz
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 0c46349..0499d91 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -20,8 +20,8 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 3.3.3
-Release: 2%{?dist}
+Version: 3.3.5
+Release: 1%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
Source0:
http://download.gnome.org/sources/gnome-panel/3.3/%{name}-%{version}.tar.xz
@@ -263,6 +263,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Tue Feb 7 2012 Matthias Clasen <mclasen(a)redhat.com> - 3.3.5-1
+- Update to 3.3.5
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
3.3.3-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources
index 5afe9bf..8bcaadc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-28deca47490c25a3f1156c6aa891bf74 gnome-panel-3.3.3.tar.xz
+63373bc5eb9b62e3a3c2df8c220cd8cd gnome-panel-3.3.5.tar.xz
commit 91391a25181765eaee003d2b4271e00b02850635
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Thu Jan 12 21:53:01 2012 -0600
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 5471b97..0c46349 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,7 +21,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 3.3.3
-Release: 1%{?dist}
+Release: 2%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
Source0:
http://download.gnome.org/sources/gnome-panel/3.3/%{name}-%{version}.tar.xz
@@ -263,6 +263,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
3.3.3-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
* Wed Dec 21 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.3.3-1
- Update to 3.3.3
commit 0271e772c0abdfa9e775ed07db1b7f8ca43a2b33
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Wed Dec 21 00:34:08 2011 -0500
3.3.3
diff --git a/.gitignore b/.gitignore
index cce59ac..b350490 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ gnome-panel-2.31.6.tar.bz2
/gnome-panel-3.2.0.tar.xz
/gnome-panel-3.2.1.tar.xz
/gnome-panel-3.3.1.tar.xz
+/gnome-panel-3.3.3.tar.xz
diff --git a/gnome-panel.spec b/gnome-panel.spec
index c5546f4..5471b97 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -20,8 +20,8 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 3.3.1
-Release: 3%{?dist}
+Version: 3.3.3
+Release: 1%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
Source0:
http://download.gnome.org/sources/gnome-panel/3.3/%{name}-%{version}.tar.xz
@@ -263,6 +263,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Wed Dec 21 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.3.3-1
+- Update to 3.3.3
+
* Thu Nov 24 2011 Tomas Bzatek <tbzatek(a)redhat.com> - 3.3.1-3
- Another rebuild for new EDS
diff --git a/sources b/sources
index 0bcea15..5afe9bf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-65daa4bb86283b170701adac65e42f49 gnome-panel-3.3.1.tar.xz
+28deca47490c25a3f1156c6aa891bf74 gnome-panel-3.3.3.tar.xz
commit 9fe7218e1fa3a6b6a744dec6cccb62fe279286e4
Author: Tomas Bzatek <tbzatek(a)redhat.com>
Date: Thu Nov 24 19:02:35 2011 +0100
Another rebuild for new EDS
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 11c2c21..c5546f4 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,7 +21,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 3.3.1
-Release: 2%{?dist}
+Release: 3%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
Source0:
http://download.gnome.org/sources/gnome-panel/3.3/%{name}-%{version}.tar.xz
@@ -263,6 +263,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Thu Nov 24 2011 Tomas Bzatek <tbzatek(a)redhat.com> - 3.3.1-3
+- Another rebuild for new EDS
+
* Tue Nov 22 2011 Daniel Drake <dsd(a)laptop.org> - 3.3.1-2
- Rebuild for libebook-1.2.so.13
commit 28876c327d6aa2df30a04dbd71e714df96e70bb7
Author: Daniel Drake <dsd(a)laptop.org>
Date: Tue Nov 22 15:35:18 2011 -0600
rebuild for evolution-data-server libebook bump
diff --git a/gnome-panel.spec b/gnome-panel.spec
index c24ca53..11c2c21 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,7 +21,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 3.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
Source0:
http://download.gnome.org/sources/gnome-panel/3.3/%{name}-%{version}.tar.xz
@@ -263,6 +263,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Tue Nov 22 2011 Daniel Drake <dsd(a)laptop.org> - 3.3.1-2
+- Rebuild for libebook-1.2.so.13
+
* Wed Nov 2 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.3.1-1
- Update to 3.3.1
commit 60c0206c0355fc4039e2578c7f05702730310f54
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Wed Nov 2 21:08:37 2011 -0400
3.3.1
diff --git a/.gitignore b/.gitignore
index 5b60950..cce59ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ gnome-panel-2.31.6.tar.bz2
/gnome-panel-3.1.92.tar.xz
/gnome-panel-3.2.0.tar.xz
/gnome-panel-3.2.1.tar.xz
+/gnome-panel-3.3.1.tar.xz
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 0062da1..c24ca53 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -20,11 +20,11 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 3.2.1
-Release: 3%{?dist}
+Version: 3.3.1
+Release: 1%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
-Source0:
http://download.gnome.org/sources/gnome-panel/3.2/%{name}-%{version}.tar.xz
+Source0:
http://download.gnome.org/sources/gnome-panel/3.3/%{name}-%{version}.tar.xz
#
https://bugzilla.gnome.org/show_bug.cgi?id=646749
Patch0: Use-16px-menu-icons.patch
@@ -263,6 +263,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Wed Nov 2 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.3.1-1
+- Update to 3.3.1
+
* Sun Oct 30 2011 Bruno Wolff III <bruno(a)wolff.to> - 3.2.1-3
- Rebuild against newer evolution-data-server
diff --git a/sources b/sources
index 530714b..0bcea15 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cc2c18e18396d728cc10c58596db2f9a gnome-panel-3.2.1.tar.xz
+65daa4bb86283b170701adac65e42f49 gnome-panel-3.3.1.tar.xz
commit d5dc1226fa22dda16923aea4b923603c67f83f09
Author: Bruno Wolff III <bruno(a)wolff.to>
Date: Sun Oct 30 11:36:06 2011 -0500
Rebuild against newer evolution-data-server
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 146583c..0062da1 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,7 +21,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 3.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
Source0:
http://download.gnome.org/sources/gnome-panel/3.2/%{name}-%{version}.tar.xz
@@ -263,6 +263,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Sun Oct 30 2011 Bruno Wolff III <bruno(a)wolff.to> - 3.2.1-3
+- Rebuild against newer evolution-data-server
+
* Wed Oct 26 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
3.2.1-2
- Rebuilt for glibc bug#747377
commit a33df96d7b89958ed89335088c02dfdfe946621b
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Wed Oct 26 18:54:28 2011 -0500
- Rebuilt for glibc bug#747377
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 8c5a895..146583c 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,7 +21,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 3.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
Source0:
http://download.gnome.org/sources/gnome-panel/3.2/%{name}-%{version}.tar.xz
@@ -263,6 +263,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Wed Oct 26 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
3.2.1-2
+- Rebuilt for glibc bug#747377
+
* Tue Oct 18 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.2.1-1
- Update to 3.2.1
commit 87cd4a0fc157494d21d339ad124a4080a83aff0d
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Tue Oct 18 22:50:14 2011 -0400
3.2.1
diff --git a/.gitignore b/.gitignore
index c5ff347..5b60950 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ gnome-panel-2.31.6.tar.bz2
/gnome-panel-3.1.91.tar.xz
/gnome-panel-3.1.92.tar.xz
/gnome-panel-3.2.0.tar.xz
+/gnome-panel-3.2.1.tar.xz
diff --git a/gnome-panel.spec b/gnome-panel.spec
index ced3f52..8c5a895 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -20,8 +20,8 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 3.2.0
-Release: 2%{?dist}
+Version: 3.2.1
+Release: 1%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
Source0:
http://download.gnome.org/sources/gnome-panel/3.2/%{name}-%{version}.tar.xz
@@ -263,6 +263,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Tue Oct 18 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.2.1-1
+- Update to 3.2.1
+
* Wed Sep 28 2011 Peter Robinson <pbrobinson(a)fedoraproject.org> - 3.2.0-2
- Fix Source URL, remove no longer needed band-aid - RHBZ 730586
@@ -272,17 +275,29 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
* Tue Sep 20 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.1.92-1
- Update to 3.1.92
+* Thu Sep 08 2011 Kalev Lember <kalevlember(a)gmail.com> - 3.1.91-3
+- Obsolete additional -devel packages that AutoQA caught
+
+* Wed Sep 7 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.1.91-2
+- Rebuild against newer libcamel
+
* Tue Sep 6 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.1.91-1
- Update to 3.1.91
* Tue Aug 30 2011 Milan Crha <mcrha(a)redhat.com> - 3.1.5-5
-- Sync version with f16 branch
+- Rebuild against newer evolution-data-server (once again)
* Mon Aug 29 2011 Milan Crha <mcrha(a)redhat.com> - 3.1.5-4
- Rebuild against newer evolution-data-server
* Wed Aug 24 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.1.5-3
-- Sync with F16
+- Make the -libs dependency archful
+
+* Fri Aug 19 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.1.5-2
+- Rebuild
+
+* Wed Aug 17 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.1.5-1
+- Update to 3.1.5
* Tue Aug 16 2011 Milan Crha <mcrha(a)redhat.com> - 3.0.2-4
- Rebuild against newer evolution-data-server
diff --git a/sources b/sources
index 2ca5bca..530714b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e5c0b457b75fe50a006955ed887df6b1 gnome-panel-3.2.0.tar.xz
+cc2c18e18396d728cc10c58596db2f9a gnome-panel-3.2.1.tar.xz
commit 47b5d884a6816065d6a810f797fe62564bcf4e3a
Author: Peter Robinson <pbrobinson(a)gmail.com>
Date: Wed Sep 28 13:06:36 2011 +0100
Fix Source URL, remove no longer needed band-aid
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 86a863d..ced3f52 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,10 +21,10 @@
Summary: GNOME panel
Name: gnome-panel
Version: 3.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
-Source0:
http://download.gnome.org/sources/gnome-panel/3.1/%{name}-%{version}.tar.xz
+Source0:
http://download.gnome.org/sources/gnome-panel/3.2/%{name}-%{version}.tar.xz
#
https://bugzilla.gnome.org/show_bug.cgi?id=646749
Patch0: Use-16px-menu-icons.patch
@@ -44,9 +44,6 @@ Requires: evolution-data-server >= %{evolution_data_server_version}
Requires: gnome-session-xsession
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-# Band aid for "yum upgrade"
-Requires: gnome-shell
-
Requires(post): hicolor-icon-theme
Requires(post): GConf2
Requires(pre): GConf2
@@ -266,6 +263,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Wed Sep 28 2011 Peter Robinson <pbrobinson(a)fedoraproject.org> - 3.2.0-2
+- Fix Source URL, remove no longer needed band-aid - RHBZ 730586
+
* Tue Sep 27 2011 Ray <rstrode(a)redhat.com> - 3.2.0-1
- Update to 3.2.0
commit d17abf1732e9d06af3c5bb66dcdc26c0d5576e60
Author: Ray Strode <rstrode(a)redhat.com>
Date: Tue Sep 27 21:27:31 2011 -0400
Update to 3.2.0
diff --git a/.gitignore b/.gitignore
index cf903a7..c5ff347 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ gnome-panel-2.31.6.tar.bz2
/gnome-panel-3.1.5.tar.xz
/gnome-panel-3.1.91.tar.xz
/gnome-panel-3.1.92.tar.xz
+/gnome-panel-3.2.0.tar.xz
diff --git a/gnome-panel.spec b/gnome-panel.spec
index b69425b..86a863d 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -20,7 +20,7 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 3.1.92
+Version: 3.2.0
Release: 1%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
@@ -266,6 +266,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Tue Sep 27 2011 Ray <rstrode(a)redhat.com> - 3.2.0-1
+- Update to 3.2.0
+
* Tue Sep 20 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.1.92-1
- Update to 3.1.92
diff --git a/sources b/sources
index cadce8f..2ca5bca 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-330c822bb0015029bd01ecb7bfa16f0a gnome-panel-3.1.92.tar.xz
+e5c0b457b75fe50a006955ed887df6b1 gnome-panel-3.2.0.tar.xz
commit 05deb5f6214dbf659d36116ba54ef0e1d74a6466
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Tue Sep 20 17:52:17 2011 -0400
3.1.92
diff --git a/.gitignore b/.gitignore
index 26820d2..cf903a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ gnome-panel-2.31.6.tar.bz2
/gnome-panel-3.0.2.tar.bz2
/gnome-panel-3.1.5.tar.xz
/gnome-panel-3.1.91.tar.xz
+/gnome-panel-3.1.92.tar.xz
diff --git a/gnome-panel.spec b/gnome-panel.spec
index a3b73ce..b69425b 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -20,7 +20,7 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 3.1.91
+Version: 3.1.92
Release: 1%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
@@ -104,6 +104,7 @@ Obsoletes: libgail-gnome < 1.20.4
# repoquery --whatrequires libpanel-applet-2.so.0 gnome-python2-applet
# as of Fedora 15 20110428, as well as ones from Fedora 14.
Obsoletes: deskbar-applet <= 0:2.32.0-5
+Obsoletes: deskbar-applet-devel <= 0:2.32.0-5
Obsoletes: file-browser-applet <= 0:0.6.6-2
Obsoletes: glunarclock <= 0:0.34.1-2
Obsoletes: gnome-applet-bubblemon <= 0:2.0.15-2
@@ -113,6 +114,7 @@ Obsoletes: gnome-applet-grandr <= 0:0.4.1-3
Obsoletes: gnome-applet-jalali-calendar <= 0:1.7.1-3
Obsoletes: gnome-applet-music <= 0:2.5.1-6
Obsoletes: gnome-applet-sensors <= 0:2.2.7-5
+Obsoletes: gnome-applet-sensors-devel <= 0:2.2.7-5
Obsoletes: gnome-applet-timer <= 0:2.1.4-3
Obsoletes: gnome-applet-window-picker <= 0:0.5.8-3
Obsoletes: gnome-applets <= 1:2.32.0-5
@@ -264,6 +266,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Tue Sep 20 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.1.92-1
+- Update to 3.1.92
+
* Tue Sep 6 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.1.91-1
- Update to 3.1.91
diff --git a/sources b/sources
index 47f6665..cadce8f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fd44216dc05b72fde43d8790c33bc8df gnome-panel-3.1.91.tar.xz
+330c822bb0015029bd01ecb7bfa16f0a gnome-panel-3.1.92.tar.xz
commit e8eae72c41b27a7512aa7b1797ee39b94076862b
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Tue Sep 6 13:52:55 2011 -0400
3.1.91
diff --git a/.gitignore b/.gitignore
index 126fd1f..26820d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ gnome-panel-2.31.6.tar.bz2
/gnome-panel-3.0.0.1.tar.bz2
/gnome-panel-3.0.2.tar.bz2
/gnome-panel-3.1.5.tar.xz
+/gnome-panel-3.1.91.tar.xz
diff --git a/gnome-panel.spec b/gnome-panel.spec
index e99b174..a3b73ce 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -20,8 +20,8 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 3.1.5
-Release: 5%{?dist}
+Version: 3.1.91
+Release: 1%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
Source0:
http://download.gnome.org/sources/gnome-panel/3.1/%{name}-%{version}.tar.xz
@@ -264,6 +264,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Tue Sep 6 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.1.91-1
+- Update to 3.1.91
+
* Tue Aug 30 2011 Milan Crha <mcrha(a)redhat.com> - 3.1.5-5
- Sync version with f16 branch
diff --git a/sources b/sources
index 5657e22..47f6665 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-36c8df6e3dd3041d3228b8354bb0dd29 gnome-panel-3.1.5.tar.xz
+fd44216dc05b72fde43d8790c33bc8df gnome-panel-3.1.91.tar.xz
commit ffcf8a27b2c87ef3f306a4edadbfb003269faeb9
Author: Milan Crha <mcrha(a)redhat.com>
Date: Tue Aug 30 13:05:44 2011 +0200
Sync version with f16 branch
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 397de85..e99b174 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,7 +21,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 3.1.5
-Release: 4%{?dist}
+Release: 5%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
Source0:
http://download.gnome.org/sources/gnome-panel/3.1/%{name}-%{version}.tar.xz
@@ -264,6 +264,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Tue Aug 30 2011 Milan Crha <mcrha(a)redhat.com> - 3.1.5-5
+- Sync version with f16 branch
+
* Mon Aug 29 2011 Milan Crha <mcrha(a)redhat.com> - 3.1.5-4
- Rebuild against newer evolution-data-server
commit db7e9026906183d8f1b1746d8776bc17f2d673ec
Author: Milan Crha <mcrha(a)redhat.com>
Date: Mon Aug 29 14:22:55 2011 +0200
Rebuild against newer evolution-data-server
diff --git a/gnome-panel.spec b/gnome-panel.spec
index ef456c5..397de85 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,7 +21,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 3.1.5
-Release: 3%{?dist}
+Release: 4%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
Source0:
http://download.gnome.org/sources/gnome-panel/3.1/%{name}-%{version}.tar.xz
@@ -264,6 +264,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Mon Aug 29 2011 Milan Crha <mcrha(a)redhat.com> - 3.1.5-4
+- Rebuild against newer evolution-data-server
+
* Wed Aug 24 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.1.5-3
- Sync with F16
commit 126c5e132fa90843b0813d3aca8ddb09902797ea
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Wed Aug 24 16:24:15 2011 -0400
sync with f16
diff --git a/.gitignore b/.gitignore
index 217e5e6..126fd1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ gnome-panel-2.31.6.tar.bz2
/gnome-panel-3.0.0.tar.bz2
/gnome-panel-3.0.0.1.tar.bz2
/gnome-panel-3.0.2.tar.bz2
+/gnome-panel-3.1.5.tar.xz
diff --git a/gnome-panel-use-gnome-menus.patch b/gnome-panel-use-gnome-menus.patch
index b2584d6..320e7d1 100644
--- a/gnome-panel-use-gnome-menus.patch
+++ b/gnome-panel-use-gnome-menus.patch
@@ -1,6 +1,7 @@
---- gnome-panel/menu.c~ 2011-03-29 10:20:47.000000000 -0400
-+++ gnome-panel/menu.c 2011-04-11 13:51:30.624874438 -0400
-@@ -1383,7 +1383,7 @@
+diff -up gnome-panel-3.1.5/gnome-panel/menu.c.menus gnome-panel-3.1.5/gnome-panel/menu.c
+--- gnome-panel-3.1.5/gnome-panel/menu.c.menus 2011-08-01 13:39:56.000000000 -0400
++++ gnome-panel-3.1.5/gnome-panel/menu.c 2011-08-17 18:58:26.341620915 -0400
+@@ -1401,7 +1401,7 @@ create_main_menu (PanelWidget *panel)
{
GtkWidget *main_menu;
@@ -9,31 +10,31 @@
g_object_set_data (G_OBJECT (main_menu), "menu_panel", panel);
/* FIXME need to update the panel on parent_set */
---- gnome-panel/panel-menu-button.c~ 2011-04-04 12:09:04.000000000 -0400
-+++ gnome-panel/panel-menu-button.c 2011-04-11 13:51:45.021693156 -0400
-@@ -74,7 +74,7 @@
- } MenuPathRootItem;
+diff -up gnome-panel-3.1.5/gnome-panel/panel-addto.c.menus
gnome-panel-3.1.5/gnome-panel/panel-addto.c
+--- gnome-panel-3.1.5/gnome-panel/panel-addto.c.menus 2011-08-01 13:39:56.000000000
-0400
++++ gnome-panel-3.1.5/gnome-panel/panel-addto.c 2011-08-17 18:59:37.306668576 -0400
+@@ -666,7 +666,7 @@ panel_addto_make_application_model (Pane
+ G_TYPE_POINTER,
+ G_TYPE_STRING);
- static MenuPathRootItem root_items [] = {
-- { APPLICATIONS_MENU, "applications", "applications.menu" },
-+ { APPLICATIONS_MENU, "applications", "applications-gnome.menu" },
- { GNOMECC_MENU, "gnomecc", "gnomecc.menu" }
- };
+- tree = gmenu_tree_new ("applications.menu",
GMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
++ tree = gmenu_tree_new ("applications-gnome.menu",
GMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
---- gnome-panel/panel-run-dialog.c~ 2011-03-28 17:08:42.000000000 -0400
-+++ gnome-panel/panel-run-dialog.c 2011-04-11 13:52:56.978793618 -0400
-@@ -867,7 +867,7 @@
- GMenuTreeDirectory *root;
- GSList *retval;
+ if (!gmenu_tree_load_sync (tree, NULL)) {
+ g_object_unref (tree);
+@@ -675,7 +675,7 @@ panel_addto_make_application_model (Pane
-- tree = gmenu_tree_lookup ("applications.menu", GMENU_TREE_FLAGS_NONE);
-+ tree = gmenu_tree_lookup ("applications-gnome.menu", GMENU_TREE_FLAGS_NONE);
- gmenu_tree_set_sort_key (tree, GMENU_TREE_SORT_DISPLAY_NAME);
+ if (tree != NULL && (root = gmenu_tree_get_root_directory (tree))) {
+ panel_addto_make_application_list (&dialog->application_list,
+- root, "applications.menu",
++ root, "applications-gnome.menu",
+ PANEL_ADDTO_MENU_SHOW_ALL);
+ panel_addto_populate_application_model (store, NULL, dialog->application_list);
- root = gmenu_tree_get_root_directory (tree);
---- gnome-panel/panel-menu-bar.c~ 2011-04-05 06:39:04.000000000 -0400
-+++ gnome-panel/panel-menu-bar.c 2011-04-11 13:51:57.430534186 -0400
-@@ -129,7 +129,7 @@
+diff -up gnome-panel-3.1.5/gnome-panel/panel-menu-bar.c.menus
gnome-panel-3.1.5/gnome-panel/panel-menu-bar.c
+--- gnome-panel-3.1.5/gnome-panel/panel-menu-bar.c.menus 2011-04-05 06:39:04.000000000
-0400
++++ gnome-panel-3.1.5/gnome-panel/panel-menu-bar.c 2011-08-17 18:58:26.388620946 -0400
+@@ -129,7 +129,7 @@ panel_menu_bar_init (PanelMenuBar *menub
menubar->priv->info = NULL;
@@ -42,20 +43,27 @@
menubar->priv->applications_item = panel_image_menu_item_new ();
gtk_menu_item_set_label (GTK_MENU_ITEM (menubar->priv->applications_item),
---- gnome-panel/panel-addto.c~ 2011-04-01 06:39:58.000000000 -0400
-+++ gnome-panel/panel-addto.c 2011-04-11 13:52:08.655397696 -0400
-@@ -714,12 +714,12 @@
- G_TYPE_POINTER,
- G_TYPE_STRING);
+diff -up gnome-panel-3.1.5/gnome-panel/panel-menu-button.c.menus
gnome-panel-3.1.5/gnome-panel/panel-menu-button.c
+--- gnome-panel-3.1.5/gnome-panel/panel-menu-button.c.menus 2011-08-01 13:39:56.000000000
-0400
++++ gnome-panel-3.1.5/gnome-panel/panel-menu-button.c 2011-08-17 18:58:26.345620917
-0400
+@@ -74,7 +74,7 @@ typedef struct {
+ } MenuPathRootItem;
-- tree = gmenu_tree_lookup ("applications.menu", GMENU_TREE_FLAGS_NONE);
-+ tree = gmenu_tree_lookup ("applications-gnome.menu", GMENU_TREE_FLAGS_NONE);
- gmenu_tree_set_sort_key (tree, GMENU_TREE_SORT_DISPLAY_NAME);
+ static MenuPathRootItem root_items [] = {
+- { APPLICATIONS_MENU, "applications", "applications.menu" },
++ { APPLICATIONS_MENU, "applications", "applications-gnome.menu" },
+ { GNOMECC_MENU, "gnomecc", "gnomecc.menu" }
+ };
- if ((root = gmenu_tree_get_root_directory (tree))) {
- panel_addto_make_application_list (&dialog->application_list,
-- root, "applications.menu",
-+ root, "applications-gnome.menu",
- PANEL_ADDTO_MENU_SHOW_ALL);
- panel_addto_populate_application_model (store, NULL, dialog->application_list);
+diff -up gnome-panel-3.1.5/gnome-panel/panel-run-dialog.c.menus
gnome-panel-3.1.5/gnome-panel/panel-run-dialog.c
+--- gnome-panel-3.1.5/gnome-panel/panel-run-dialog.c.menus 2011-08-01 13:39:56.000000000
-0400
++++ gnome-panel-3.1.5/gnome-panel/panel-run-dialog.c 2011-08-17 18:59:14.635653222 -0400
+@@ -781,7 +781,7 @@ get_all_applications (void)
+ GMenuTreeDirectory *root;
+ GSList *retval;
+
+- tree = gmenu_tree_new ("applications.menu",
GMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
++ tree = gmenu_tree_new ("applications-gnome.menu",
GMENU_TREE_FLAGS_SORT_DISPLAY_NAME);
+ if (!gmenu_tree_load_sync (tree, NULL))
+ return NULL;
diff --git a/gnome-panel.spec b/gnome-panel.spec
index ac592cf..ef456c5 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -20,11 +20,11 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 3.0.2
-Release: 4%{?dist}
+Version: 3.1.5
+Release: 3%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
-Source0:
http://download.gnome.org/sources/gnome-panel/3.0/%{name}-%{version}.tar.bz2
+Source0:
http://download.gnome.org/sources/gnome-panel/3.1/%{name}-%{version}.tar.xz
#
https://bugzilla.gnome.org/show_bug.cgi?id=646749
Patch0: Use-16px-menu-icons.patch
@@ -42,7 +42,7 @@ Requires: gnome-menus >= %{gnome_menus_version}
Requires: evolution-data-server >= %{evolution_data_server_version}
%endif
Requires: gnome-session-xsession
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
# Band aid for "yum upgrade"
Requires: gnome-shell
@@ -157,7 +157,7 @@ Panel Applets using the libpanel-applet library.
%prep
%setup -q -n %{name}-%{version}
%patch0 -p1 -b .16px
-%patch1 -p0
+%patch1 -p1 -b .menus
rm -f libtool
autoreconf -i -f
@@ -219,7 +219,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%files -f %{gettext_package}.lang
-%defattr(-,root,root)
%doc AUTHORS COPYING COPYING.LIB COPYING-DOCS NEWS README
%{_datadir}/icons/hicolor/16x16/apps/*
%{_datadir}/icons/hicolor/22x22/apps/*
@@ -257,7 +256,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%{_libdir}/girepository-1.0/PanelApplet-4.0.typelib
%files devel
-%defattr(-, root, root)
%{_bindir}/panel-test-applets
%{_includedir}/gnome-panel-4.0
%{_libdir}/pkgconfig/*
@@ -266,6 +264,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Wed Aug 24 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.1.5-3
+- Sync with F16
+
* Tue Aug 16 2011 Milan Crha <mcrha(a)redhat.com> - 3.0.2-4
- Rebuild against newer evolution-data-server
diff --git a/sources b/sources
index 644e021..5657e22 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0f2f644dc4081b72f6df7a65282af7c6 gnome-panel-3.0.2.tar.bz2
+36c8df6e3dd3041d3228b8354bb0dd29 gnome-panel-3.1.5.tar.xz
commit 1ad42596d0fb5687d62286cf3390ab6c3ab30026
Author: Milan Crha <mcrha(a)redhat.com>
Date: Tue Aug 16 20:03:04 2011 +0200
Rebuild against newer evolution-data-server
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 561d3b6..ac592cf 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,7 +21,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 3.0.2
-Release: 3%{?dist}
+Release: 4%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
Source0:
http://download.gnome.org/sources/gnome-panel/3.0/%{name}-%{version}.tar.bz2
@@ -266,6 +266,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Tue Aug 16 2011 Milan Crha <mcrha(a)redhat.com> - 3.0.2-4
+- Rebuild against newer evolution-data-server
+
* Mon Jul 25 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.0.2-3
- Rebuild
commit fd080b9fa7cf53a0ae7b2071f955a7da854be18b
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Mon Jul 25 08:13:39 2011 -0400
rebuild
diff --git a/gnome-panel.spec b/gnome-panel.spec
index d866994..561d3b6 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,7 +21,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 3.0.2
-Release: 2%{?dist}
+Release: 3%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
Source0:
http://download.gnome.org/sources/gnome-panel/3.0/%{name}-%{version}.tar.bz2
@@ -266,6 +266,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Mon Jul 25 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.0.2-3
+- Rebuild
+
* Tue Jul 05 2011 Adam Williamson <awilliam(a)redhat.com> - 3.0.2-2
- rebuild for new e-d-s
commit c4d6b76447bb850a2bb305c194f8c3e263866bb7
Author: Adam Williamson <awilliam(a)redhat.com>
Date: Tue Jul 5 10:56:05 2011 -0700
rebuild for new e-d-s
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 221f6c8..d866994 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,7 +21,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 3.0.2
-Release: 1%{?dist}
+Release: 2%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
Source0:
http://download.gnome.org/sources/gnome-panel/3.0/%{name}-%{version}.tar.bz2
@@ -266,6 +266,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Tue Jul 05 2011 Adam Williamson <awilliam(a)redhat.com> - 3.0.2-2
+- rebuild for new e-d-s
+
* Thu Jun 16 2011 Tomas Bzatek <tbzatek(a)redhat.com> - 3.0.2-1
- Update to 3.0.2
commit 4a66a7df2e4542b7c6e0ebd50476aecdd98b588c
Author: Tomas Bzatek <tbzatek(a)redhat.com>
Date: Thu Jun 16 14:23:09 2011 +0200
Update to 3.0.2
diff --git a/.gitignore b/.gitignore
index 7ff122f..217e5e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ gnome-panel-2.31.6.tar.bz2
/gnome-panel-2.91.94.tar.bz2
/gnome-panel-3.0.0.tar.bz2
/gnome-panel-3.0.0.1.tar.bz2
+/gnome-panel-3.0.2.tar.bz2
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 13c445b..221f6c8 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -20,8 +20,8 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 3.0.0.1
-Release: 5%{?dist}
+Version: 3.0.2
+Release: 1%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
Source0:
http://download.gnome.org/sources/gnome-panel/3.0/%{name}-%{version}.tar.bz2
@@ -266,6 +266,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Thu Jun 16 2011 Tomas Bzatek <tbzatek(a)redhat.com> - 3.0.2-1
+- Update to 3.0.2
+
* Thu May 5 2011 Colin Walters <walters(a)verbum.org> - 3.0.0.1-5
- Also obsolete libpanelappletmm
diff --git a/sources b/sources
index dfa0e4b..644e021 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ed8288be1fd69ffcd1e1fde87dcdb615 gnome-panel-3.0.0.1.tar.bz2
+0f2f644dc4081b72f6df7a65282af7c6 gnome-panel-3.0.2.tar.bz2
commit a8fcbd2b7cade2a770dcd90900aeebbc006860bf
Author: Colin Walters <walters(a)verbum.org>
Date: Thu May 5 14:23:29 2011 -0400
Also obsolete libpanelappletmm
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 9a79e2f..13c445b 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,7 +21,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 3.0.0.1
-Release: 4%{?dist}
+Release: 5%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
Source0:
http://download.gnome.org/sources/gnome-panel/3.0/%{name}-%{version}.tar.bz2
@@ -128,6 +128,9 @@ Obsoletes: x-tile <= 0:1.8.6-2
Obsoletes: gnome-applet-netspeed <= 0.16-6
Obsoletes: contact-lookup-applet <= 0.17-7
+# Also obsolete the now-dead libpanelappletmm
+Obsoletes: libpanelappletmm <= 0:2.26.0-3
+
%description
The GNOME panel provides the window list, workspace switcher, menus, and other
features for the GNOME desktop.
@@ -263,6 +266,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Thu May 5 2011 Colin Walters <walters(a)verbum.org> - 3.0.0.1-5
+- Also obsolete libpanelappletmm
+
* Thu Apr 28 2011 Colin Walters <walters(a)verbum.org> - 3.0.0.1-4
- Obsolete old applet packages so upgrades proceeed
commit 9eada3362c4a9d0953ea44de8db6d96ec5d2d748
Author: Colin Walters <walters(a)verbum.org>
Date: Thu Apr 28 16:13:39 2011 -0400
Obsolete old applet packages so upgrades proceeed
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 8a41e9f..9a79e2f 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,7 +21,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 3.0.0.1
-Release: 3%{?dist}
+Release: 4%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
Source0:
http://download.gnome.org/sources/gnome-panel/3.0/%{name}-%{version}.tar.bz2
@@ -100,6 +100,34 @@ Conflicts: gnome-power-manager < 2.15.3
Obsoletes: libgail-gnome < 1.20.4
+# Obsolete all old applet packages; this is the output of
+# repoquery --whatrequires libpanel-applet-2.so.0 gnome-python2-applet
+# as of Fedora 15 20110428, as well as ones from Fedora 14.
+Obsoletes: deskbar-applet <= 0:2.32.0-5
+Obsoletes: file-browser-applet <= 0:0.6.6-2
+Obsoletes: glunarclock <= 0:0.34.1-2
+Obsoletes: gnome-applet-bubblemon <= 0:2.0.15-2
+Obsoletes: gnome-applet-cpufire <= 0:1.6-4
+Obsoletes: gnome-applet-globalmenu <= 0:0.7.9-2
+Obsoletes: gnome-applet-grandr <= 0:0.4.1-3
+Obsoletes: gnome-applet-jalali-calendar <= 0:1.7.1-3
+Obsoletes: gnome-applet-music <= 0:2.5.1-6
+Obsoletes: gnome-applet-sensors <= 0:2.2.7-5
+Obsoletes: gnome-applet-timer <= 0:2.1.4-3
+Obsoletes: gnome-applet-window-picker <= 0:0.5.8-3
+Obsoletes: gnome-applets <= 1:2.32.0-5
+Obsoletes: gnome-netstatus <= 0:2.28.2-2
+Obsoletes: gnome-python2-applet <= 0:2.32.0-2
+Obsoletes: gnome-schedule <= 0:2.0.2-7
+Obsoletes: gnubiff <= 0:2.2.13-5
+Obsoletes: hamster-applet <= 0:2.32.0-5
+Obsoletes: lock-keys-applet <= 0:1.0-22
+Obsoletes: uim-gnome <= 0:1.6.1-2
+Obsoletes: x-tile <= 0:1.8.6-2
+# Other ones that were already retired from Fedora 15
+Obsoletes: gnome-applet-netspeed <= 0.16-6
+Obsoletes: contact-lookup-applet <= 0.17-7
+
%description
The GNOME panel provides the window list, workspace switcher, menus, and other
features for the GNOME desktop.
@@ -235,6 +263,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Thu Apr 28 2011 Colin Walters <walters(a)verbum.org> - 3.0.0.1-4
+- Obsolete old applet packages so upgrades proceeed
+
* Mon Apr 25 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.0.0.1-3
- Obsolete libgail-gnome (#697795)
commit 41abf032065135313acb834cd9a0ccf5a2c354b9
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Mon Apr 25 14:40:53 2011 -0400
Obsolete libgail-gnome
diff --git a/gnome-panel.spec b/gnome-panel.spec
index a09e21f..8a41e9f 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,7 +21,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 3.0.0.1
-Release: 2%{?dist}
+Release: 3%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
Source0:
http://download.gnome.org/sources/gnome-panel/3.0/%{name}-%{version}.tar.bz2
@@ -98,6 +98,8 @@ BuildRequires: gnome-common
Obsoletes: gdm-user-switch-applet < 1:2.91.6
Conflicts: gnome-power-manager < 2.15.3
+Obsoletes: libgail-gnome < 1.20.4
+
%description
The GNOME panel provides the window list, workspace switcher, menus, and other
features for the GNOME desktop.
@@ -233,6 +235,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Mon Apr 25 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.0.0.1-3
+- Obsolete libgail-gnome (#697795)
+
* Mon Apr 11 2011 Colin Walters <walters(a)verbum.org> - 3.0.0.1-2
- Use gnome menu, not redhat-menus
commit 8498d1f76e8d6af021f230bd8cd1c1ee4b323473
Author: Colin Walters <walters(a)verbum.org>
Date: Tue Apr 12 16:54:21 2011 -0400
Use gnome menu, not redhat-menus
diff --git a/gnome-panel-use-gnome-menus.patch b/gnome-panel-use-gnome-menus.patch
new file mode 100644
index 0000000..b2584d6
--- /dev/null
+++ b/gnome-panel-use-gnome-menus.patch
@@ -0,0 +1,61 @@
+--- gnome-panel/menu.c~ 2011-03-29 10:20:47.000000000 -0400
++++ gnome-panel/menu.c 2011-04-11 13:51:30.624874438 -0400
+@@ -1383,7 +1383,7 @@
+ {
+ GtkWidget *main_menu;
+
+- main_menu = create_applications_menu ("applications.menu", NULL, TRUE);
++ main_menu = create_applications_menu ("applications-gnome.menu", NULL,
TRUE);
+
+ g_object_set_data (G_OBJECT (main_menu), "menu_panel", panel);
+ /* FIXME need to update the panel on parent_set */
+--- gnome-panel/panel-menu-button.c~ 2011-04-04 12:09:04.000000000 -0400
++++ gnome-panel/panel-menu-button.c 2011-04-11 13:51:45.021693156 -0400
+@@ -74,7 +74,7 @@
+ } MenuPathRootItem;
+
+ static MenuPathRootItem root_items [] = {
+- { APPLICATIONS_MENU, "applications", "applications.menu" },
++ { APPLICATIONS_MENU, "applications", "applications-gnome.menu" },
+ { GNOMECC_MENU, "gnomecc", "gnomecc.menu" }
+ };
+
+--- gnome-panel/panel-run-dialog.c~ 2011-03-28 17:08:42.000000000 -0400
++++ gnome-panel/panel-run-dialog.c 2011-04-11 13:52:56.978793618 -0400
+@@ -867,7 +867,7 @@
+ GMenuTreeDirectory *root;
+ GSList *retval;
+
+- tree = gmenu_tree_lookup ("applications.menu", GMENU_TREE_FLAGS_NONE);
++ tree = gmenu_tree_lookup ("applications-gnome.menu", GMENU_TREE_FLAGS_NONE);
+ gmenu_tree_set_sort_key (tree, GMENU_TREE_SORT_DISPLAY_NAME);
+
+ root = gmenu_tree_get_root_directory (tree);
+--- gnome-panel/panel-menu-bar.c~ 2011-04-05 06:39:04.000000000 -0400
++++ gnome-panel/panel-menu-bar.c 2011-04-11 13:51:57.430534186 -0400
+@@ -129,7 +129,7 @@
+
+ menubar->priv->info = NULL;
+
+- menubar->priv->applications_menu = create_applications_menu
("applications.menu", NULL, TRUE);
++ menubar->priv->applications_menu = create_applications_menu
("applications-gnome.menu", NULL, TRUE);
+
+ menubar->priv->applications_item = panel_image_menu_item_new ();
+ gtk_menu_item_set_label (GTK_MENU_ITEM (menubar->priv->applications_item),
+--- gnome-panel/panel-addto.c~ 2011-04-01 06:39:58.000000000 -0400
++++ gnome-panel/panel-addto.c 2011-04-11 13:52:08.655397696 -0400
+@@ -714,12 +714,12 @@
+ G_TYPE_POINTER,
+ G_TYPE_STRING);
+
+- tree = gmenu_tree_lookup ("applications.menu", GMENU_TREE_FLAGS_NONE);
++ tree = gmenu_tree_lookup ("applications-gnome.menu", GMENU_TREE_FLAGS_NONE);
+ gmenu_tree_set_sort_key (tree, GMENU_TREE_SORT_DISPLAY_NAME);
+
+ if ((root = gmenu_tree_get_root_directory (tree))) {
+ panel_addto_make_application_list (&dialog->application_list,
+- root, "applications.menu",
++ root, "applications-gnome.menu",
+ PANEL_ADDTO_MENU_SHOW_ALL);
+ panel_addto_populate_application_model (store, NULL, dialog->application_list);
+
commit 21efec3e1571586e594ebab81c6bf37e05f1d7fd
Author: Colin Walters <walters(a)verbum.org>
Date: Tue Apr 12 10:03:14 2011 -0400
Use gnome menu, not redhat-menus
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 13f381e..a09e21f 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,7 +21,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 3.0.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
Source0:
http://download.gnome.org/sources/gnome-panel/3.0/%{name}-%{version}.tar.bz2
@@ -29,6 +29,9 @@ Source0:
http://download.gnome.org/sources/gnome-panel/3.0/%{name}-%{version}.ta
#
https://bugzilla.gnome.org/show_bug.cgi?id=646749
Patch0: Use-16px-menu-icons.patch
+#
https://bugzilla.redhat.com/show_bug.cgi?id=685142
+Patch1: gnome-panel-use-gnome-menus.patch
+
License: GPLv2+ and LGPLv2+ and GFDL
Group: User Interface/Desktops
@@ -121,6 +124,7 @@ Panel Applets using the libpanel-applet library.
%prep
%setup -q -n %{name}-%{version}
%patch0 -p1 -b .16px
+%patch1 -p0
rm -f libtool
autoreconf -i -f
@@ -229,6 +233,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Mon Apr 11 2011 Colin Walters <walters(a)verbum.org> - 3.0.0.1-2
+- Use gnome menu, not redhat-menus
+
* Wed Apr 6 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.0.0.1-1
- Update to 3.0.0.1
commit 27bb58ce2c158c8f92bc0180d8f003d550caec0b
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Wed Apr 6 08:19:54 2011 -0400
3.0.0.1
diff --git a/.gitignore b/.gitignore
index 909110a..7ff122f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ gnome-panel-2.31.6.tar.bz2
/gnome-panel-2.91.93.tar.bz2
/gnome-panel-2.91.94.tar.bz2
/gnome-panel-3.0.0.tar.bz2
+/gnome-panel-3.0.0.1.tar.bz2
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 48fe27d..13f381e 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -20,8 +20,8 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 3.0.0
-Release: 2%{?dist}
+Version: 3.0.0.1
+Release: 1%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
Source0:
http://download.gnome.org/sources/gnome-panel/3.0/%{name}-%{version}.tar.bz2
@@ -229,6 +229,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Wed Apr 6 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.0.0.1-1
+- Update to 3.0.0.1
+
* Tue Apr 5 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.0.0-2
- Make icon sizes more uniform
diff --git a/sources b/sources
index 5614d33..dfa0e4b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b44c869cc8383cbbbadc1df91984064b gnome-panel-3.0.0.tar.bz2
+ed8288be1fd69ffcd1e1fde87dcdb615 gnome-panel-3.0.0.1.tar.bz2
commit 2cbc1045cf5a56f6b682b1e013eb451a29490b07
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Tue Apr 5 14:24:38 2011 -0400
fix spec
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 1f1d447..48fe27d 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -120,7 +120,7 @@ Panel Applets using the libpanel-applet library.
%prep
%setup -q -n %{name}-%{version}
-%patch -p1 -b .16px
+%patch0 -p1 -b .16px
rm -f libtool
autoreconf -i -f
commit 36b74cfc5c39073cb6390bea04d75bcfd6b2d512
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Tue Apr 5 14:19:36 2011 -0400
Make icon sizes more uniform
diff --git a/Use-16px-menu-icons.patch b/Use-16px-menu-icons.patch
new file mode 100644
index 0000000..64e94dd
--- /dev/null
+++ b/Use-16px-menu-icons.patch
@@ -0,0 +1,25 @@
+From de049e9a8846270ed643b5c021ecd75fa259e00e Mon Sep 17 00:00:00 2001
+From: William Jon McCann <jmccann(a)redhat.com>
+Date: Mon, 4 Apr 2011 17:48:39 -0400
+Subject: [PATCH] Use 16px menu icons
+
+https://bugzilla.gnome.org/show_bug.cgi?id=646749
+---
+ gnome-panel/panel-stock-icons.h | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/gnome-panel/panel-stock-icons.h b/gnome-panel/panel-stock-icons.h
+index efac6d4..229d80a 100644
+--- a/gnome-panel/panel-stock-icons.h
++++ b/gnome-panel/panel-stock-icons.h
+@@ -31,7 +31,7 @@
+ G_BEGIN_DECLS
+
+ /* themeable size - "panel-menu" -- This is used for the icons in the menus
*/
+-#define PANEL_DEFAULT_MENU_ICON_SIZE 24
++#define PANEL_DEFAULT_MENU_ICON_SIZE 16
+
+ /* stock icons */
+ #define PANEL_STOCK_FORCE_QUIT "gnome-panel-force-quit"
+--
+1.7.3.4
\ No newline at end of file
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 48b0cf4..1f1d447 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,11 +21,14 @@
Summary: GNOME panel
Name: gnome-panel
Version: 3.0.0
-Release: 1%{?dist}
+Release: 2%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
Source0:
http://download.gnome.org/sources/gnome-panel/3.0/%{name}-%{version}.tar.bz2
+#
https://bugzilla.gnome.org/show_bug.cgi?id=646749
+Patch0: Use-16px-menu-icons.patch
+
License: GPLv2+ and LGPLv2+ and GFDL
Group: User Interface/Desktops
@@ -117,6 +120,7 @@ Panel Applets using the libpanel-applet library.
%prep
%setup -q -n %{name}-%{version}
+%patch -p1 -b .16px
rm -f libtool
autoreconf -i -f
@@ -225,6 +229,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Tue Apr 5 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.0.0-2
+- Make icon sizes more uniform
+
* Mon Apr 4 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.0.0-1
- Update to 3.0.0
commit 33cd62854d5c4abc933d59fefaec836ebf6292c7
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Mon Apr 4 19:42:58 2011 -0400
3.0.0
diff --git a/.gitignore b/.gitignore
index d1613c9..909110a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ gnome-panel-2.31.6.tar.bz2
/gnome-panel-2.91.92.tar.bz2
/gnome-panel-2.91.93.tar.bz2
/gnome-panel-2.91.94.tar.bz2
+/gnome-panel-3.0.0.tar.bz2
diff --git a/gnome-panel.spec b/gnome-panel.spec
index f759a61..48b0cf4 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -20,11 +20,11 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.91.94
+Version: 3.0.0
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.91/%{name}-%{version}.tar...
+Source0:
http://download.gnome.org/sources/gnome-panel/3.0/%{name}-%{version}.tar.bz2
License: GPLv2+ and LGPLv2+ and GFDL
Group: User Interface/Desktops
@@ -225,6 +225,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Mon Apr 4 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.0.0-1
+- Update to 3.0.0
+
* Fri Apr 1 2011 Matthias Clasen <mclasen(a)redhat.com> - 2.91.94-1
- Update to 2.91.94
diff --git a/sources b/sources
index b8f27e0..5614d33 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4064823454834df6df62412c2d9ad6f6 gnome-panel-2.91.94.tar.bz2
+b44c869cc8383cbbbadc1df91984064b gnome-panel-3.0.0.tar.bz2
commit e4db5bd1f2509213ffe5be3a88f43ba2b4ea368b
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Fri Apr 1 08:43:22 2011 -0400
try again
diff --git a/sources b/sources
index 48b769c..b8f27e0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
4064823454834df6df62412c2d9ad6f6 gnome-panel-2.91.94.tar.bz2
-
commit 5dc7b804d6557c4f5159cf477d1814691b0a8ab5
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Fri Apr 1 08:24:02 2011 -0400
try again
diff --git a/sources b/sources
index b8f27e0..48b769c 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
4064823454834df6df62412c2d9ad6f6 gnome-panel-2.91.94.tar.bz2
+
commit 64990a56c811b61c4abcd5e915fa252020465f51
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Fri Apr 1 08:02:10 2011 -0400
2.91.94
diff --git a/.gitignore b/.gitignore
index 36c3e9e..d1613c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ gnome-panel-2.31.6.tar.bz2
/gnome-panel-2.91.91.tar.bz2
/gnome-panel-2.91.92.tar.bz2
/gnome-panel-2.91.93.tar.bz2
+/gnome-panel-2.91.94.tar.bz2
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 10079e6..f759a61 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -20,7 +20,7 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.91.93
+Version: 2.91.94
Release: 1%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
@@ -225,6 +225,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Fri Apr 1 2011 Matthias Clasen <mclasen(a)redhat.com> - 2.91.94-1
+- Update to 2.91.94
+
* Tue Mar 29 2011 Matthias Clasen <mclasen(a)redhat.com> - 2.91.93-1
- Update to 2.91.93
diff --git a/sources b/sources
index 033d996..b8f27e0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d1275b55c6ec4348a3314d4767923d08 gnome-panel-2.91.93.tar.bz2
+4064823454834df6df62412c2d9ad6f6 gnome-panel-2.91.94.tar.bz2
commit 21e951e953aa69abc44925998790205262406af5
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Tue Mar 29 01:15:36 2011 -0400
2.91.93
diff --git a/.gitignore b/.gitignore
index a08aa50..36c3e9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ gnome-panel-2.31.6.tar.bz2
/gnome-panel-2.91.90.tar.bz2
/gnome-panel-2.91.91.tar.bz2
/gnome-panel-2.91.92.tar.bz2
+/gnome-panel-2.91.93.tar.bz2
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 92bdb42..10079e6 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -8,7 +8,6 @@
%define libbonoboui_version 2.3.0
%define orbit_version 2.4.0
%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
%define cairo_version 1.0.0
@@ -21,7 +20,7 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.91.92
+Version: 2.91.93
Release: 1%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
@@ -42,10 +41,10 @@ Requires: %{name}-libs = %{version}-%{release}
# Band aid for "yum upgrade"
Requires: gnome-shell
-Requires(post): GConf2 >= %{gconf_version}
Requires(post): hicolor-icon-theme
-Requires(pre): GConf2 >= %{gconf_version}
-Requires(preun): GConf2 >= %{gconf_version}
+Requires(post): GConf2
+Requires(pre): GConf2
+Requires(preun): GConf2
BuildRequires: libxml2-python
BuildRequires: intltool
@@ -63,7 +62,7 @@ BuildRequires: libgnome-devel >= %{libgnome_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
BuildRequires: pkgconfig(libwnck-3.0) >= %{libwnck_version}
-BuildRequires: GConf2-devel >= %{gconf_version}
+BuildRequires: dconf-devel
BuildRequires: gnome-menus-devel >= %{gnome_menus_version}
BuildRequires: cairo-devel >= %{cairo_version}
BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
@@ -111,9 +110,6 @@ Summary: Headers and libraries for Panel Applet development
License: LGPLv2+
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
-Requires: gtk2-devel >= %{gtk2_version}
-Requires: libbonoboui-devel >= %{libbonoboui_version}
-Requires: libgnomeui-devel >= %{libgnomeui_version}
%description devel
Panel Applet development package. Contains files needed for developing
@@ -148,14 +144,6 @@ export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make DESTDIR=$RPM_BUILD_ROOT install
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-#
-# Create pager and tasklist schemas for compatibility with older
-# configurations which reference the old schema names
-#
-sed -e
's|/schemas/apps/window_list_applet/prefs/|/schemas/apps/tasklist_applet/prefs/|'
$RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/window-list.schemas >
$RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/tasklist.schemas
-sed -e
's|/schemas/apps/workspace_switcher_applet/prefs/|/schemas/apps/pager_applet/prefs/|;
s|<default>1</default>|<default>2</default>|'
$RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/workspace-switcher.schemas >
$RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/pager.schemas
-
-## blow away stuff we don't want
rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
find $RPM_BUILD_ROOT -name '*.*a' -delete;
@@ -165,95 +153,29 @@ desktop-file-install --delete-original \
%find_lang %{gettext_package} --all-name --with-gnome
-%post
-touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
-
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-
-#
-# Clear out the old defaults
-#
-gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --recursive-unset /apps/panel
> /dev/null || :
-gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --recursive-unset
/schemas/apps/panel > /dev/null || :
-
-#
-# Install the schemas
-#
-gconftool-2 --makefile-install-rule \
- %{_sysconfdir}/gconf/schemas/clock.schemas \
- %{_sysconfdir}/gconf/schemas/fish.schemas \
- %{_sysconfdir}/gconf/schemas/pager.schemas \
- %{_sysconfdir}/gconf/schemas/panel-compatibility.schemas \
- %{_sysconfdir}/gconf/schemas/panel-general.schemas \
- %{_sysconfdir}/gconf/schemas/panel-global.schemas \
- %{_sysconfdir}/gconf/schemas/panel-object.schemas \
- %{_sysconfdir}/gconf/schemas/panel-toplevel.schemas \
- %{_sysconfdir}/gconf/schemas/tasklist.schemas \
- %{_sysconfdir}/gconf/schemas/window-list.schemas \
- %{_sysconfdir}/gconf/schemas/workspace-switcher.schemas \
- > /dev/null || :
-
-#
-# Install the default setup into /apps/panel and /apps/panel/default_setup
-#
-gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --load
%{_sysconfdir}/gconf/schemas/panel-default-setup.entries > /dev/null || :
-gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --load
%{_sysconfdir}/gconf/schemas/panel-default-setup.entries /apps/panel > /dev/null || :
-
-/sbin/ldconfig
-
%pre
-if [ "$1" -gt 1 ]; then
- export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
- gconftool-2 --makefile-uninstall-rule \
- %{_sysconfdir}/gconf/schemas/clock.schemas \
- %{_sysconfdir}/gconf/schemas/fish.schemas \
- %{_sysconfdir}/gconf/schemas/pager.schemas \
- %{_sysconfdir}/gconf/schemas/panel-compatibility.schemas \
- %{_sysconfdir}/gconf/schemas/panel-general.schemas \
- %{_sysconfdir}/gconf/schemas/panel-global.schemas \
- %{_sysconfdir}/gconf/schemas/panel-object.schemas \
- %{_sysconfdir}/gconf/schemas/panel-toplevel.schemas \
- %{_sysconfdir}/gconf/schemas/tasklist.schemas \
- %{_sysconfdir}/gconf/schemas/window-list.schemas \
- %{_sysconfdir}/gconf/schemas/workspace-switcher.schemas \
- > /dev/null || :
- if [ -f %{_sysconfdir}/gconf/schemas/notification_area_applet.schemas ]; then
- gconftool-2 --makefile-uninstall-rule \
- %{_sysconfdir}/gconf/schemas/notification_area_applet.schemas > /dev/null || :
- fi
-fi
+%gconf_schema_prepare clock
%preun
-if [ "$1" -eq 0 ]; then
- export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
- gconftool-2 --makefile-uninstall-rule \
- %{_sysconfdir}/gconf/schemas/clock.schemas \
- %{_sysconfdir}/gconf/schemas/fish.schemas \
- %{_sysconfdir}/gconf/schemas/pager.schemas \
- %{_sysconfdir}/gconf/schemas/panel-compatibility.schemas \
- %{_sysconfdir}/gconf/schemas/panel-general.schemas \
- %{_sysconfdir}/gconf/schemas/panel-global.schemas \
- %{_sysconfdir}/gconf/schemas/panel-object.schemas \
- %{_sysconfdir}/gconf/schemas/panel-toplevel.schemas \
- %{_sysconfdir}/gconf/schemas/tasklist.schemas \
- %{_sysconfdir}/gconf/schemas/window-list.schemas \
- %{_sysconfdir}/gconf/schemas/workspace-switcher.schemas \
- > /dev/null || :
- if [ -f %{_sysconfdir}/gconf/schemas/notification_area_applet.schemas ]; then
- gconftool-2 --makefile-uninstall-rule \
- %{_sysconfdir}/gconf/schemas/notification_area_applet.schemas > /dev/null || :
- fi
-fi
+%gconf_schema_remove clock
+
+%post
+%gconf_schema_upgrade clock
+touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
+/sbin/ldconfig
%postun
/sbin/ldconfig
if [ $1 -eq 0 ]; then
touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null || :
+ glib-compile-schemas %{_datadir}/glib-2.0/schemas
fi
%posttrans
gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null || :
+glib-compile-schemas %{_datadir}/glib-2.0/schemas
+
%files -f %{gettext_package}.lang
%defattr(-,root,root)
@@ -270,14 +192,25 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor
>&/dev/null || :
%{_bindir}/gnome-panel
%{_bindir}/gnome-desktop-item-edit
%{_libexecdir}/*
-%{_sysconfdir}/gconf/schemas/*.schemas
-%{_sysconfdir}/gconf/schemas/*.entries
%{_datadir}/dbus-1/services/org.gnome.panel.applet.ClockAppletFactory.service
%{_datadir}/dbus-1/services/org.gnome.panel.applet.FishAppletFactory.service
%{_datadir}/dbus-1/services/org.gnome.panel.applet.NotificationAreaAppletFactory.service
%{_datadir}/dbus-1/services/org.gnome.panel.applet.WnckletFactory.service
+%{_sysconfdir}/gconf/schemas/clock.schemas
+
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.applet.fish.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.applet.window-list.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.applet.workspace-switcher.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.enums.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.launcher.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.menu-button.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.object.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.toplevel.gschema.xml
+
+
%files libs
%{_libdir}/*.so.*
%{_libdir}/girepository-1.0/PanelApplet-4.0.typelib
@@ -292,6 +225,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null
|| :
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Tue Mar 29 2011 Matthias Clasen <mclasen(a)redhat.com> - 2.91.93-1
+- Update to 2.91.93
+
* Wed Mar 23 2011 Matthias Clasen <mclasen(a)redhat.com> - 2.91.92-1
- Update to 2.91.92
diff --git a/sources b/sources
index 69c0ef3..033d996 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-38a75aeec70f1ffa5673dc06fe05ba28 gnome-panel-2.91.92.tar.bz2
+d1275b55c6ec4348a3314d4767923d08 gnome-panel-2.91.93.tar.bz2
commit 4bc45a189389039f64571c34e43ee0ac09b1f69e
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Wed Mar 23 19:34:32 2011 -0400
2.91.92
diff --git a/.gitignore b/.gitignore
index 3473d9e..a08aa50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ gnome-panel-2.31.6.tar.bz2
/gnome-panel-2.91.6.tar.bz2
/gnome-panel-2.91.90.tar.bz2
/gnome-panel-2.91.91.tar.bz2
+/gnome-panel-2.91.92.tar.bz2
diff --git a/gnome-panel.spec b/gnome-panel.spec
index a0bedde..92bdb42 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,7 +21,7 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.91.91
+Version: 2.91.92
Release: 1%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
@@ -292,6 +292,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null
|| :
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Wed Mar 23 2011 Matthias Clasen <mclasen(a)redhat.com> - 2.91.92-1
+- Update to 2.91.92
+
* Mon Mar 7 2011 Matthias Clasen <mclasen(a)redhat.com> - 2.91.91-1
- Update to 2.91.91
diff --git a/sources b/sources
index 491fdde..69c0ef3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c0f6a56db27414d8390c9462abaf6db4 gnome-panel-2.91.91.tar.bz2
+38a75aeec70f1ffa5673dc06fe05ba28 gnome-panel-2.91.92.tar.bz2
commit b5394245c58f1d16bb7262644d716e0b8757d5b2
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Mon Mar 7 23:49:24 2011 -0500
2.91.91
diff --git a/.gitignore b/.gitignore
index 37b0db5..3473d9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ gnome-panel-2.31.6.tar.bz2
/gnome-panel-2.31.92.tar.bz2
/gnome-panel-2.91.6.tar.bz2
/gnome-panel-2.91.90.tar.bz2
+/gnome-panel-2.91.91.tar.bz2
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 6273ea1..a0bedde 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,8 +21,8 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.91.90
-Release: 2%{?dist}
+Version: 2.91.91
+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.91/%{name}-%{version}.tar...
@@ -292,6 +292,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null
|| :
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Mon Mar 7 2011 Matthias Clasen <mclasen(a)redhat.com> - 2.91.91-1
+- Update to 2.91.91
+
* Thu Feb 24 2011 Colin Walters <walters(a)verbum.org> - 2.91.90-2
- Require gnome-shell to band aid upgrades
diff --git a/sources b/sources
index 3c3e789..491fdde 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f4f6256a8df088c7cd47239fd5197b6f gnome-panel-2.91.90.tar.bz2
+c0f6a56db27414d8390c9462abaf6db4 gnome-panel-2.91.91.tar.bz2
commit 463b883d9d3692980bc8610348b48092a252fa8e
Author: Colin Walters <walters(a)verbum.org>
Date: Thu Feb 24 13:39:17 2011 -0500
Require gnome-shell to band aid upgrades
diff --git a/gnome-panel.spec b/gnome-panel.spec
index f84f973..6273ea1 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.91.90
-Release: 1%{?dist}
+Release: 2%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
Source0:
http://download.gnome.org/sources/gnome-panel/2.91/%{name}-%{version}.tar...
@@ -39,6 +39,9 @@ Requires: evolution-data-server >= %{evolution_data_server_version}
Requires: gnome-session-xsession
Requires: %{name}-libs = %{version}-%{release}
+# Band aid for "yum upgrade"
+Requires: gnome-shell
+
Requires(post): GConf2 >= %{gconf_version}
Requires(post): hicolor-icon-theme
Requires(pre): GConf2 >= %{gconf_version}
@@ -289,6 +292,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null
|| :
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Thu Feb 24 2011 Colin Walters <walters(a)verbum.org> - 2.91.90-2
+- Require gnome-shell to band aid upgrades
+
* Tue Feb 22 2011 Matthias Clasen <mclasen(a)redhat.com> 2.91.90-1
- Update to 2.91.90
commit 739e69d5c6849f80a2921c7212f59dfabeec3d1b
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Tue Feb 22 21:59:35 2011 -0500
2.91.90
diff --git a/.gitignore b/.gitignore
index 89cb3d3..37b0db5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ gnome-panel-2.31.6.tar.bz2
/gnome-panel-2.31.90.tar.bz2
/gnome-panel-2.31.92.tar.bz2
/gnome-panel-2.91.6.tar.bz2
+/gnome-panel-2.91.90.tar.bz2
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 4772ac3..f84f973 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,8 +21,8 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.91.6
-Release: 5%{?dist}
+Version: 2.91.90
+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.91/%{name}-%{version}.tar...
@@ -289,6 +289,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null
|| :
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Tue Feb 22 2011 Matthias Clasen <mclasen(a)redhat.com> 2.91.90-1
+- Update to 2.91.90
+
* Fri Feb 11 2011 Matthias Clasen <mclasen(a)redhat.com> 2.91.6-5
- Rebuild against newer gtk
diff --git a/sources b/sources
index dbe1f73..3c3e789 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4bc500a5c877c45f99d293dc7d102ae8 gnome-panel-2.91.6.tar.bz2
+f4f6256a8df088c7cd47239fd5197b6f gnome-panel-2.91.90.tar.bz2
commit 48d59d94c3aec0c2344e062be966cc01dda33c35
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Fri Feb 11 00:24:48 2011 -0500
rebuild
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 1c5c969..4772ac3 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.91.6
-Release: 4%{?dist}
+Release: 5%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
Source0:
http://download.gnome.org/sources/gnome-panel/2.91/%{name}-%{version}.tar...
@@ -289,6 +289,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null
|| :
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Fri Feb 11 2011 Matthias Clasen <mclasen(a)redhat.com> 2.91.6-5
+- Rebuild against newer gtk
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
2.91.6-4
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
commit ca0af868ec3041966423f9acdd627a7fc10444dd
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Tue Feb 8 22:18:43 2011 -0600
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 3104b82..1c5c969 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.91.6
-Release: 3%{?dist}
+Release: 4%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
Source0:
http://download.gnome.org/sources/gnome-panel/2.91/%{name}-%{version}.tar...
@@ -289,6 +289,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null
|| :
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
2.91.6-4
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
* Wed Feb 02 2011 Ray Strode <rstrode(a)redhat.com> 2.91.6-3
- Cut out the layers of built up cruft.
commit e9855d1c270dab41c028e34d7eb123dae13aa99c
Author: Ray Strode <rstrode(a)redhat.com>
Date: Wed Feb 2 22:40:11 2011 -0500
Requires gnome-common
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 3613237..3104b82 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -85,6 +85,7 @@ BuildRequires: libtool
BuildRequires: libcanberra-devel
BuildRequires: desktop-file-utils
BuildRequires: gobject-introspection-devel
+BuildRequires: gnome-common
Obsoletes: gdm-user-switch-applet < 1:2.91.6
Conflicts: gnome-power-manager < 2.15.3
commit cadfd2dc227f31b4e834f54e919bb44b12db8b01
Author: Ray Strode <rstrode(a)redhat.com>
Date: Wed Feb 2 21:54:03 2011 -0500
Clean out the cruft
The panel has really built up a lot of patches.
This isn't good for anyone. Time to play the
aggresive role of cutting everything out, and then
adding back anything that we really deem necessary
with a very conservative view of "necessary".
diff --git a/gnome-panel.spec b/gnome-panel.spec
index a3d2304..3613237 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,19 +22,15 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.91.6
-Release: 2%{?dist}
+Release: 3%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
Source0:
http://download.gnome.org/sources/gnome-panel/2.91/%{name}-%{version}.tar...
-Source3: redhat-panel-default-setup.entries
-Source4: gnome-compiler-flags.m4
-Source5: redhat-panel-backwards-compat-config.schemas
-Source6: add-translations.sh
License: GPLv2+ and LGPLv2+ and GFDL
Group: User Interface/Desktops
-Requires: gnome-desktop >= %{gnome_desktop_version}
+Requires: gnome-desktop3 >= %{gnome_desktop_version}
Requires: libwnck3 >= %{libwnck_version}
Requires: gnome-menus >= %{gnome_menus_version}
%if %{use_evolution_data_server}
@@ -91,34 +87,6 @@ BuildRequires: desktop-file-utils
BuildRequires: gobject-introspection-devel
Obsoletes: gdm-user-switch-applet < 1:2.91.6
-
-Patch1: gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.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
-Patch10: preferred-apps.patch
-
-# don't pop up an error dialog if an applet from the
-# default configuration is missing; we don't want to
-# add a hard dependency on e.g. tomboy
-#Patch11: applet-error.patch
-
-#
http://bugzilla.gnome.org/show_bug.cgi?id=520111
-Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
-
-#
http://bugzilla.gnome.org/show_bug.cgi?id=579092
-Patch38: clock-network.patch
-
-Patch40: clock-home.patch
-Patch41: bookmarks-submenu.patch
-
-#
https://bugzilla.redhat.com/show_bug.cgi?id=537798
-Patch47: fix-clock-crash.patch
-
-Patch48: gnome-panel-libs.patch
-
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -149,24 +117,9 @@ Panel Applets using the libpanel-applet library.
%prep
%setup -q -n %{name}-%{version}
-%patch1 -p1 -b .speak-to-us-ye-old-wise-fish
-%patch8 -p1 -b .launcher-desktop-files
-#%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
-%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-gtk-doc \
@@ -200,8 +153,7 @@ sed -e
's|/schemas/apps/workspace_switcher_applet/prefs/|/schemas/apps/pager_app
## blow away stuff we don't want
rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
-rm -f $RPM_BUILD_ROOT%{_libdir}/libpanel-applet-4.*a
-
+find $RPM_BUILD_ROOT -name '*.*a' -delete;
desktop-file-install --delete-original \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -235,7 +187,6 @@ gconftool-2 --makefile-install-rule \
%{_sysconfdir}/gconf/schemas/tasklist.schemas \
%{_sysconfdir}/gconf/schemas/window-list.schemas \
%{_sysconfdir}/gconf/schemas/workspace-switcher.schemas \
- %{_sysconfdir}/gconf/schemas/notification_area_applet.schemas \
/dev/null || :
#
@@ -322,10 +273,10 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor
>&/dev/null || :
%{_datadir}/dbus-1/services/org.gnome.panel.applet.FishAppletFactory.service
%{_datadir}/dbus-1/services/org.gnome.panel.applet.NotificationAreaAppletFactory.service
%{_datadir}/dbus-1/services/org.gnome.panel.applet.WnckletFactory.service
-%{_libdir}/girepository-1.0/PanelApplet-4.0.typelib
%files libs
%{_libdir}/*.so.*
+%{_libdir}/girepository-1.0/PanelApplet-4.0.typelib
%files devel
%defattr(-, root, root)
@@ -337,6 +288,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null
|| :
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Wed Feb 02 2011 Ray Strode <rstrode(a)redhat.com> 2.91.6-3
+- Cut out the layers of built up cruft.
+
* Wed Feb 2 2011 Matthias Clasen <mclasen(a)redhat.com> 2.91.6-2
- Various build fixes
commit af74a17d438e1ad0158c561ebcf36f5d92de9839
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Wed Feb 2 21:45:10 2011 -0500
filelist fixes
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 76e0463..a3d2304 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -200,8 +200,7 @@ sed -e
's|/schemas/apps/workspace_switcher_applet/prefs/|/schemas/apps/pager_app
## blow away stuff we don't want
rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
-rm -f $RPM_BUILD_ROOT%{_libdir}/libpanel-applet-2.*a
-rm -f $RPM_BUILD_ROOT%{_libdir}/libpanel-applet-3.*a
+rm -f $RPM_BUILD_ROOT%{_libdir}/libpanel-applet-4.*a
desktop-file-install --delete-original \
@@ -323,6 +322,7 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null
|| :
%{_datadir}/dbus-1/services/org.gnome.panel.applet.FishAppletFactory.service
%{_datadir}/dbus-1/services/org.gnome.panel.applet.NotificationAreaAppletFactory.service
%{_datadir}/dbus-1/services/org.gnome.panel.applet.WnckletFactory.service
+%{_libdir}/girepository-1.0/PanelApplet-4.0.typelib
%files libs
%{_libdir}/*.so.*
@@ -330,9 +330,11 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null
|| :
%files devel
%defattr(-, root, root)
%{_bindir}/panel-test-applets
+%{_includedir}/gnome-panel-4.0
%{_libdir}/pkgconfig/*
%{_libdir}/*.so
%{_datadir}/gtk-doc
+%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
* Wed Feb 2 2011 Matthias Clasen <mclasen(a)redhat.com> 2.91.6-2
commit a16899e40cfb3ef162140f4af663ab0b394c9de1
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Wed Feb 2 21:31:37 2011 -0500
try again
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 737d232..76e0463 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.91.6
-Release: 1%{?dist}
+Release: 2%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
Source0:
http://download.gnome.org/sources/gnome-panel/2.91/%{name}-%{version}.tar...
@@ -88,6 +88,7 @@ BuildRequires: gettext-devel
BuildRequires: libtool
BuildRequires: libcanberra-devel
BuildRequires: desktop-file-utils
+BuildRequires: gobject-introspection-devel
Obsoletes: gdm-user-switch-applet < 1:2.91.6
@@ -329,15 +330,14 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor
>&/dev/null || :
%files devel
%defattr(-, root, root)
%{_bindir}/panel-test-applets
-%{_bindir}/panel-test-applets-bonobo
%{_libdir}/pkgconfig/*
-%{_includedir}/gnome-panel-3.0/libpanel-applet
-%{_includedir}/panel-2.0
%{_libdir}/*.so
%{_datadir}/gtk-doc
-%{_datadir}/gir-1.0/PanelApplet-3.0.gir
%changelog
+* Wed Feb 2 2011 Matthias Clasen <mclasen(a)redhat.com> 2.91.6-2
+- Various build fixes
+
* Wed Feb 02 2011 Ray Strode <rstrode(a)redhat.com> 2.91.6-1
- Update to 2.91.6
commit 11d60c7bb7167c96c877606d0e0decc036395786
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Wed Feb 2 21:20:34 2011 -0500
file list fixes
diff --git a/gnome-panel.spec b/gnome-panel.spec
index d8aedcc..737d232 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -310,9 +310,6 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null
|| :
%{_datadir}/icons/hicolor/48x48/apps/*
%{_datadir}/icons/hicolor/scalable/apps/*
%{_datadir}/gnome-panel
-%exclude %{_datadir}/gnome-panelrc
-%{_datadir}/idl/gnome-panel-2.0
-%{_datadir}/gnome-2.0/ui/*.xml
%{_datadir}/man/man*/*
%{_datadir}/applications/gnome-panel.desktop
%{_bindir}/gnome-panel
@@ -320,15 +317,12 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor
>&/dev/null || :
%{_libexecdir}/*
%{_sysconfdir}/gconf/schemas/*.schemas
%{_sysconfdir}/gconf/schemas/*.entries
-%{_libdir}/gnome-panel
%{_datadir}/dbus-1/services/org.gnome.panel.applet.ClockAppletFactory.service
%{_datadir}/dbus-1/services/org.gnome.panel.applet.FishAppletFactory.service
%{_datadir}/dbus-1/services/org.gnome.panel.applet.NotificationAreaAppletFactory.service
%{_datadir}/dbus-1/services/org.gnome.panel.applet.WnckletFactory.service
-%{_libdir}/girepository-1.0/PanelApplet-3.0.typelib
-
%files libs
%{_libdir}/*.so.*
commit de99213f6a9db46a0f7b675ec699cb3e420d8b18
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Wed Feb 2 21:10:44 2011 -0500
closer to a working build
diff --git a/gnome-panel.spec b/gnome-panel.spec
index fb7b2ee..d8aedcc 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -87,6 +87,7 @@ BuildRequires: intltool
BuildRequires: gettext-devel
BuildRequires: libtool
BuildRequires: libcanberra-devel
+BuildRequires: desktop-file-utils
Obsoletes: gdm-user-switch-applet < 1:2.91.6
@@ -175,10 +176,6 @@ autoreconf -i -f
--enable-eds=no
%endif
-# drop unneeded direct library deps with --as-needed
-# libtool doesn't make this easy, so we do it the hard way
-#sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test
"$export_dynamic" = yes && test -n
"$export_dynamic_flag_spec"; then/ func_append compile_command "
-Wl,-O1,--as-needed"\n func_append finalize_command "
-Wl,-O1,--as-needed"\n\0/' libtool
-
make %{?_smp_mflags} V=1
commit 6a9c9aeff17b0b56ad4902712507c7d2b810b83d
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Wed Feb 2 20:53:43 2011 -0500
Drop --as-needed hack
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 6cf156b..fb7b2ee 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -177,7 +177,7 @@ autoreconf -i -f
# drop unneeded direct library deps with --as-needed
# libtool doesn't make this easy, so we do it the hard way
-sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test
"$export_dynamic" = yes && test -n
"$export_dynamic_flag_spec"; then/ func_append compile_command "
-Wl,-O1,--as-needed"\n func_append finalize_command "
-Wl,-O1,--as-needed"\n\0/' libtool
+#sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test
"$export_dynamic" = yes && test -n
"$export_dynamic_flag_spec"; then/ func_append compile_command "
-Wl,-O1,--as-needed"\n func_append finalize_command "
-Wl,-O1,--as-needed"\n\0/' libtool
make %{?_smp_mflags} V=1
commit 516b25b53659943afb5b751f0dc6529059e77660
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Wed Feb 2 20:51:31 2011 -0500
V=1
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 1978c3a..6cf156b 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -179,7 +179,7 @@ autoreconf -i -f
# libtool doesn't make this easy, so we do it the hard way
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test
"$export_dynamic" = yes && test -n
"$export_dynamic_flag_spec"; then/ func_append compile_command "
-Wl,-O1,--as-needed"\n func_append finalize_command "
-Wl,-O1,--as-needed"\n\0/' libtool
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
# truncate NEWS
commit 95b8a0350963a077e906739a088f8c80e29528f5
Author: Ray Strode <rstrode(a)redhat.com>
Date: Wed Feb 2 20:24:45 2011 -0500
add obsoletes for user switch applet
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 9b349d8..1978c3a 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -88,6 +88,8 @@ BuildRequires: gettext-devel
BuildRequires: libtool
BuildRequires: libcanberra-devel
+Obsoletes: gdm-user-switch-applet < 1:2.91.6
+
Patch1: gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch
# the next three patches belong together
commit 86d09e7e1212b2bf65a0911dc5c716f60535742d
Author: Ray Strode <rstrode(a)redhat.com>
Date: Wed Feb 2 19:53:36 2011 -0500
try to move to latest release
this is wip in case mclasen gets motivation to finish my work
before i get back to it
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(a)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"><b>Switcher</b></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"><b>Switcher</b></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"><b>Workspaces</b></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"><b>Workspaces</b></property>
-+ <property name="label"
translatable="yes"><b>Desktop
Size</b></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...
+Source0:
http://download.gnome.org/sources/gnome-panel/2.91/%{name}-%{version}.tar...
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(a)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(a)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
commit 1583e1e2a3817d3af490662b0f1f2ff735f04319
Author: Jesse Keating <jkeating(a)redhat.com>
Date: Wed Sep 29 14:19:56 2010 -0700
- Rebuilt for gcc bug 634757
diff --git a/gnome-panel.spec b/gnome-panel.spec
index e9a10c4..091a40e 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.31.92
-Release: 1%{?dist}
+Release: 2%{?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...
@@ -361,6 +361,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null
|| :
%{_datadir}/gir-1.0/PanelApplet-3.0.gir
%changelog
+* Wed Sep 29 2010 jkeating - 2.31.92-2
+- Rebuilt for gcc bug 634757
+
* Wed Sep 22 2010 Matthias Clasen <mclasen(a)redhat.com> - 2.31.92-1
- Update to 2.31.92
commit ac78f5584c421abebeb0cdae1de6d8fa12361cb3
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Wed Sep 22 00:54:55 2010 -0400
update a patch
diff --git a/gnome-panel-libs.patch b/gnome-panel-libs.patch
index 90ba286..f77f454 100644
--- a/gnome-panel-libs.patch
+++ b/gnome-panel-libs.patch
@@ -1,31 +1,15 @@
-diff -up gnome-panel-2.31.2/configure.in.libs gnome-panel-2.31.2/configure.in
---- gnome-panel-2.31.2/configure.in.libs 2010-05-26 14:17:31.000000000 -0400
-+++ gnome-panel-2.31.2/configure.in 2010-05-28 01:06:01.347433767 -0400
-@@ -72,7 +72,7 @@ dnl pkg-config dependency checks
+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)
- PKG_CHECK_MODULES(EGG_SMCLIENT, ice sm gtk+-2.0)
-
--PKG_CHECK_MODULES(PANEL, gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >=
$PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >=
$GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-2.0 >=
$LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >=
$LIBGNOME_MENU_REQUIRED libcanberra-gtk)
-+PKG_CHECK_MODULES(PANEL, gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >=
$PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >=
$GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-2.0 >=
$LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >=
$LIBGNOME_MENU_REQUIRED libcanberra-gtk dbus-glib-1 dbus-1)
- AC_SUBST(PANEL_CFLAGS)
- AC_SUBST(PANEL_LIBS)
-
-@@ -256,16 +256,17 @@ PKG_CHECK_MODULES(X, x11 xau, :, [
- X_LIBS="$X_PRE_LIBS $X_LIBS -lX11 -lXau $X_EXTRA_LIBS"
- ])
-
--AC_SUBST(X_LIBS)
--
dnl X RANDR extension
--if $PKG_CONFIG --exists "xrandr >= 1.2.0" ; then
-- AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library])
-- have_randr=yes
--else
-- have_randr=no
--fi
+-PKG_CHECK_MODULES(XRANDR, xrandr >= 1.2.0, have_randr=yes, have_randr=no)
+-if test "x$have_randr" = "xyes"; then
+PKG_CHECK_MODULES(XRANDR, xrandr >= 1.2.0, [
-+ AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library])
+ AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library])
+-fi
+ have_randr=yes
+ X_LIBS="$X_LIBS $XRANDR_LIBS"
+], [
@@ -36,18 +20,18 @@ diff -up gnome-panel-2.31.2/configure.in.libs
gnome-panel-2.31.2/configure.in
dnl Modules dir
AC_SUBST([modulesdir],"\$(libdir)/gnome-panel/modules")
-diff -up gnome-panel-2.31.2/gnome-panel/Makefile.am.libs
gnome-panel-2.31.2/gnome-panel/Makefile.am
---- gnome-panel-2.31.2/gnome-panel/Makefile.am.libs 2010-05-26 11:13:52.000000000 -0400
-+++ gnome-panel-2.31.2/gnome-panel/Makefile.am 2010-05-28 01:01:38.674674304 -0400
-@@ -152,6 +152,7 @@ gnome_panel_LDADD = \
- $(top_builddir)/gnome-panel/libpanel-applet-private/libpanel-applet-private.la \
+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 = \
$(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la \
$(PANEL_LIBS) \
-+ -lm \
+ $(XRANDR_LIBS) \
++ -lm \
$(X_LIBS)
gnome_panel_LDFLAGS = -export-dynamic
-@@ -168,6 +169,7 @@ gnome_desktop_item_edit_LDFLAGS = -expor
+@@ -170,6 +171,7 @@ gnome_desktop_item_edit_LDFLAGS = -expor
gnome_desktop_item_edit_LDADD = \
$(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la \
$(PANEL_LIBS) \
commit d194ffe79967ab7f1d6c5f262fb9e6a369c2bb62
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Wed Sep 22 00:40:58 2010 -0400
2.31.92
diff --git a/.gitignore b/.gitignore
index d1a41bd..fd9de86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,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
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 17f0702..e9a10c4 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,8 +21,8 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.31.90
-Release: 4%{?dist}
+Version: 2.31.92
+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...
@@ -361,8 +361,8 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null
|| :
%{_datadir}/gir-1.0/PanelApplet-3.0.gir
%changelog
-* Wed Sep 22 2010 Matthias Clasen <mclasen(a)redhat.com> - 2.31.90-4
-- Bump rev to stay ahead of F14
+* Wed Sep 22 2010 Matthias Clasen <mclasen(a)redhat.com> - 2.31.92-1
+- Update to 2.31.92
* Tue Sep 21 2010 Matthias Clasen <mclasen(a)redhat.com> - 2.31.90-3
- Rebuild against newer gtk3
diff --git a/sources b/sources
index 3feda9b..2439508 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0ced6cb95c57d156cc86d78d34c0325c gnome-panel-2.31.90.tar.bz2
+b3c9235fcf339e1858bac82bc08b1310 gnome-panel-2.31.92.tar.bz2
commit 0f08248f281996579b0e7e797e1612738f5b93e8
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Wed Sep 22 00:29:08 2010 -0400
Bump rev
diff --git a/gnome-panel.spec b/gnome-panel.spec
index a4f7662..17f0702 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.31.90
-Release: 3%{?dist}
+Release: 4%{?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...
@@ -361,6 +361,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null
|| :
%{_datadir}/gir-1.0/PanelApplet-3.0.gir
%changelog
+* Wed Sep 22 2010 Matthias Clasen <mclasen(a)redhat.com> - 2.31.90-4
+- Bump rev to stay ahead of F14
+
* Tue Sep 21 2010 Matthias Clasen <mclasen(a)redhat.com> - 2.31.90-3
- Rebuild against newer gtk3
commit 85ae4de2ac02ca828646d1d82b8f45522d00825a
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Tue Sep 21 09:12:24 2010 -0400
rebuild
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 57201c3..a4f7662 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.31.90
-Release: 2%{?dist}
+Release: 3%{?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...
@@ -361,6 +361,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null
|| :
%{_datadir}/gir-1.0/PanelApplet-3.0.gir
%changelog
+* Tue Sep 21 2010 Matthias Clasen <mclasen(a)redhat.com> - 2.31.90-3
+- Rebuild against newer gtk3
+
* Mon Aug 23 2010 Matthias Clasen <mclasen(a)redhat.com> - 2.31.90-2
- Co-own /usr/share/gtk-doc (#604360)
commit 8337bdd88fd9d0f0756b347cef0ce0aeb5ed0d6f
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Mon Aug 23 19:35:40 2010 -0400
drop gtk-doc dep
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 426b9f7..57201c3 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.31.90
-Release: 1%{?dist}
+Release: 2%{?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...
@@ -147,9 +147,6 @@ Requires: %{name}-libs = %{version}-%{release}
Requires: gtk2-devel >= %{gtk2_version}
Requires: libbonoboui-devel >= %{libbonoboui_version}
Requires: libgnomeui-devel >= %{libgnomeui_version}
-Requires: pkgconfig
-# for /usr/share/gtk-doc/html
-Requires: gtk-doc
%description devel
Panel Applet development package. Contains files needed for developing
@@ -360,10 +357,13 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor
>&/dev/null || :
%{_includedir}/gnome-panel-3.0/libpanel-applet
%{_includedir}/panel-2.0
%{_libdir}/*.so
-%{_datadir}/gtk-doc/html/*
+%{_datadir}/gtk-doc
%{_datadir}/gir-1.0/PanelApplet-3.0.gir
%changelog
+* Mon Aug 23 2010 Matthias Clasen <mclasen(a)redhat.com> - 2.31.90-2
+- Co-own /usr/share/gtk-doc (#604360)
+
* Thu Aug 19 2010 Matthias Clasen <mclasen(a)redhat.com> - 2.31.90-1
- Update to 2.31.90
commit 8fb223c7908e34643a7cf6a8febf367e6db6f2af
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Thu Aug 19 13:25:16 2010 -0400
fix file lists
diff --git a/gnome-panel.spec b/gnome-panel.spec
index fe5c278..426b9f7 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -342,10 +342,6 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null
|| :
%{_sysconfdir}/gconf/schemas/*.entries
%{_libdir}/gnome-panel
-%{_sysconfdir}/dbus-1/system.d/org.gnome.ClockApplet.Mechanism.conf
-%{_datadir}/dbus-1/system-services/org.gnome.ClockApplet.Mechanism.service
-%{_datadir}/polkit-1/actions/org.gnome.clockapplet.mechanism.policy
-
%{_datadir}/dbus-1/services/org.gnome.panel.applet.ClockAppletFactory.service
%{_datadir}/dbus-1/services/org.gnome.panel.applet.FishAppletFactory.service
%{_datadir}/dbus-1/services/org.gnome.panel.applet.NotificationAreaAppletFactory.service
commit 5cd1b2f25d7bba880411bd2c6acc7c39d3329899
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Thu Aug 19 12:47:02 2010 -0400
2.31.90
diff --git a/.gitignore b/.gitignore
index 6f31894..d1a41bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
gnome-panel-2.31.4.tar.bz2
gnome-panel-2.31.6.tar.bz2
+/gnome-panel-2.31.90.tar.bz2
diff --git a/gnome-panel.spec b/gnome-panel.spec
index b26d06e..fe5c278 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,7 +21,7 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.31.6
+Version: 2.31.90
Release: 1%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
@@ -368,6 +368,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null
|| :
%{_datadir}/gir-1.0/PanelApplet-3.0.gir
%changelog
+* Thu Aug 19 2010 Matthias Clasen <mclasen(a)redhat.com> - 2.31.90-1
+- Update to 2.31.90
+
* Wed Aug 4 2010 Matthias Clasen <mclasen(a)redhat.com> - 2.31.6-1
- Update to 2.31.6
diff --git a/sources b/sources
index 8fb885f..3feda9b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-772d2c96debfe07d9d9ed996f0bfd01a gnome-panel-2.31.6.tar.bz2
+0ced6cb95c57d156cc86d78d34c0325c gnome-panel-2.31.90.tar.bz2
commit ab2da26b98b431f51dd60c6eddb62e9f1107fd29
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Wed Aug 4 08:30:08 2010 -0400
2.31.6
diff --git a/.gitignore b/.gitignore
index ed8cf47..6f31894 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
gnome-panel-2.31.4.tar.bz2
+gnome-panel-2.31.6.tar.bz2
diff --git a/gnome-panel.spec b/gnome-panel.spec
index de3a438..b26d06e 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,8 +21,8 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.31.4
-Release: 4%{?dist}
+Version: 2.31.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...
@@ -124,8 +124,6 @@ Patch47: fix-clock-crash.patch
Patch48: gnome-panel-libs.patch
-Patch49: gnome-panel-gdbus.patch
-
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -176,7 +174,6 @@ Panel Applets using the libpanel-applet library.
#%patch45 -p1 -b .icon-padding
%patch47 -p1 -b .fix-clock-crash
%patch48 -p1 -b .libs
-%patch49 -p1 -b .gdbus
cp -f %{SOURCE3} gnome-panel/panel-default-setup.entries
cp -f %{SOURCE4} m4
@@ -371,6 +368,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null
|| :
%{_datadir}/gir-1.0/PanelApplet-3.0.gir
%changelog
+* Wed Aug 4 2010 Matthias Clasen <mclasen(a)redhat.com> - 2.31.6-1
+- Update to 2.31.6
+
* Tue Aug 3 2010 Matthias Clasen <mclasen(a)redhat.com> - 2.31.4-4
- Adapt to GDBus api changes
diff --git a/sources b/sources
index 9f47033..8fb885f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-aae14afb23201e893ae979fff30bf168 gnome-panel-2.31.4.tar.bz2
+772d2c96debfe07d9d9ed996f0bfd01a gnome-panel-2.31.6.tar.bz2
commit 5977e245b59b75616b7577301f4641a993f5e44e
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Tue Aug 3 12:47:08 2010 -0400
Forgotten patch
diff --git a/gnome-panel-gdbus.patch b/gnome-panel-gdbus.patch
new file mode 100644
index 0000000..6c99426
--- /dev/null
+++ b/gnome-panel-gdbus.patch
@@ -0,0 +1,22 @@
+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;
commit 9b76c4244b5ea82b94e916e6a85b35cc5e03a698
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Tue Aug 3 12:23:57 2010 -0400
fix crashes
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 9e4a423..de3a438 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.31.4
-Release: 3%{?dist}
+Release: 4%{?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...
@@ -124,6 +124,8 @@ Patch47: fix-clock-crash.patch
Patch48: gnome-panel-libs.patch
+Patch49: gnome-panel-gdbus.patch
+
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -174,6 +176,7 @@ Panel Applets using the libpanel-applet library.
#%patch45 -p1 -b .icon-padding
%patch47 -p1 -b .fix-clock-crash
%patch48 -p1 -b .libs
+%patch49 -p1 -b .gdbus
cp -f %{SOURCE3} gnome-panel/panel-default-setup.entries
cp -f %{SOURCE4} m4
@@ -368,6 +371,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null
|| :
%{_datadir}/gir-1.0/PanelApplet-3.0.gir
%changelog
+* Tue Aug 3 2010 Matthias Clasen <mclasen(a)redhat.com> - 2.31.4-4
+- Adapt to GDBus api changes
+
* Thu Jul 15 2010 Colin Walters <walters(a)verbum.org> - 2.31.4-3
- Rebuild with new gobject-introspection
commit 673dce536c04b08b6c9bc8f7d49d9f9f4e0c9eae
Author: Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org>
Date: Wed Jul 28 16:23:18 2010 +0000
dist-git conversion
diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index ed8cf47..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-gnome-panel-2.31.4.tar.bz2
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ed8cf47
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+gnome-panel-2.31.4.tar.bz2
diff --git a/Makefile b/Makefile
deleted file mode 100644
index f459914..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: gnome-panel
-# $Id: Makefile,v 1.2 2007/10/15 18:48:49 notting Exp $
-NAME := gnome-panel
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f
$$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo
"$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo
"common/Makefile.common" ; } || { echo "ERROR: I can't figure out how
to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
commit 7cff1cf8a5481fb2d37126dda78d5abb232fa75f
Author: Colin Walters <walters(a)fedoraproject.org>
Date: Thu Jul 15 18:53:08 2010 +0000
- Rebuild with new gobject-introspection
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 93b8a2c..9e4a423 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.31.4
-Release: 2%{?dist}
+Release: 3%{?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...
@@ -368,6 +368,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null
|| :
%{_datadir}/gir-1.0/PanelApplet-3.0.gir
%changelog
+* Thu Jul 15 2010 Colin Walters <walters(a)verbum.org> - 2.31.4-3
+- Rebuild with new gobject-introspection
+
* Thu Jul 15 2010 Matthias Clasen <mclasen(a)redhat.com> 2.31.4-2
- Rebuild against new evolution-data-server
commit 71aaa88f30902f88fcd06a2e485726e767160597
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Jul 15 11:42:37 2010 +0000
rebuild
diff --git a/gnome-panel.spec b/gnome-panel.spec
index da430bb..93b8a2c 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.31.4
-Release: 1%{?dist}
+Release: 2%{?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...
@@ -368,6 +368,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null
|| :
%{_datadir}/gir-1.0/PanelApplet-3.0.gir
%changelog
+* Thu Jul 15 2010 Matthias Clasen <mclasen(a)redhat.com> 2.31.4-2
+- Rebuild against new evolution-data-server
+
* Wed Jun 30 2010 Matthias Clasen <mclasen(a)redhat.com> 2.31.4-1
- Update to 2.31.4
commit 66a3e8bb2e38165557d57666d05cb894e9d2f118
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Jul 1 03:39:19 2010 +0000
fix file lists
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 8a4dacf..da430bb 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -333,8 +333,6 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null
|| :
%exclude %{_datadir}/gnome-panelrc
%{_datadir}/idl/gnome-panel-2.0
%{_datadir}/gnome-2.0/ui/*.xml
-%dir %{_datadir}/omf/clock
-%dir %{_datadir}/omf/fish
%{_datadir}/man/man*/*
%{_datadir}/applications/gnome-panel.desktop
%{_bindir}/gnome-panel
@@ -353,6 +351,8 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null
|| :
%{_datadir}/dbus-1/services/org.gnome.panel.applet.NotificationAreaAppletFactory.service
%{_datadir}/dbus-1/services/org.gnome.panel.applet.WnckletFactory.service
+%{_libdir}/girepository-1.0/PanelApplet-3.0.typelib
+
%files libs
%{_libdir}/*.so.*
@@ -365,6 +365,7 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null
|| :
%{_includedir}/panel-2.0
%{_libdir}/*.so
%{_datadir}/gtk-doc/html/*
+%{_datadir}/gir-1.0/PanelApplet-3.0.gir
%changelog
* Wed Jun 30 2010 Matthias Clasen <mclasen(a)redhat.com> 2.31.4-1
commit 81f1b7ae98f8c956713c403d3818c262950a4dd6
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Jun 30 04:49:15 2010 +0000
2.31.4
diff --git a/.cvsignore b/.cvsignore
index d2ffb67..ed8cf47 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.31.2.tar.bz2
+gnome-panel-2.31.4.tar.bz2
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 737b4b4..8a4dacf 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,8 +21,8 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.31.2
-Release: 4%{?dist}
+Version: 2.31.4
+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...
@@ -124,12 +124,6 @@ Patch47: fix-clock-crash.patch
Patch48: gnome-panel-libs.patch
-#
https://bugzilla.gnome.org/show_bug.cgi?id=621864
-Patch49: gnome-panel-2.31.2-libm.patch
-
-# upstream fix
-Patch50: 0001-Update-to-GDBus-API-change.patch
-
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -180,8 +174,6 @@ Panel Applets using the libpanel-applet library.
#%patch45 -p1 -b .icon-padding
%patch47 -p1 -b .fix-clock-crash
%patch48 -p1 -b .libs
-%patch49 -p1 -b .libm
-%patch50 -p1 -b .gdbus
cp -f %{SOURCE3} gnome-panel/panel-default-setup.entries
cp -f %{SOURCE4} m4
@@ -375,6 +367,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null
|| :
%{_datadir}/gtk-doc/html/*
%changelog
+* Wed Jun 30 2010 Matthias Clasen <mclasen(a)redhat.com> 2.31.4-1
+- Update to 2.31.4
+
* Mon Jun 21 2010 Matthias Clasen <mclasen(a)redhat.com> 2.31.2-4
- Update for GLib api change
diff --git a/sources b/sources
index 4c8f3bf..9f47033 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-17faacecd3081453b7e3fa8418a46058 gnome-panel-2.31.2.tar.bz2
+aae14afb23201e893ae979fff30bf168 gnome-panel-2.31.4.tar.bz2
commit b983e9ab6113c9b00183ec4d0712b3adb294fb13
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Jun 21 21:26:33 2010 +0000
make the panel work with glib 2.25.9
diff --git a/0001-Update-to-GDBus-API-change.patch
b/0001-Update-to-GDBus-API-change.patch
new file mode 100644
index 0000000..2e1ed5b
--- /dev/null
+++ b/0001-Update-to-GDBus-API-change.patch
@@ -0,0 +1,160 @@
+From eb9b57ea502c268f2e4eddacc1c2cfb5283a407d Mon Sep 17 00:00:00 2001
+From: Carlos Garcia Campos <carlosgc(a)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/gnome-panel.spec b/gnome-panel.spec
index 1a08c2e..737b4b4 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -1,7 +1,7 @@
%define gettext_package gnome-panel-2.0
%define gnome_desktop_version 2.11.1
-%define glib2_version 2.15.5
+%define glib2_version 2.25.9
%define gtk2_version 2.11.3
%define libgnome_version 2.13.0
%define libgnomeui_version 2.5.4
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.31.2
-Release: 3%{?dist}
+Release: 4%{?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...
@@ -127,6 +127,9 @@ Patch48: gnome-panel-libs.patch
#
https://bugzilla.gnome.org/show_bug.cgi?id=621864
Patch49: gnome-panel-2.31.2-libm.patch
+# upstream fix
+Patch50: 0001-Update-to-GDBus-API-change.patch
+
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -178,6 +181,7 @@ Panel Applets using the libpanel-applet library.
%patch47 -p1 -b .fix-clock-crash
%patch48 -p1 -b .libs
%patch49 -p1 -b .libm
+%patch50 -p1 -b .gdbus
cp -f %{SOURCE3} gnome-panel/panel-default-setup.entries
cp -f %{SOURCE4} m4
@@ -371,6 +375,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null
|| :
%{_datadir}/gtk-doc/html/*
%changelog
+* Mon Jun 21 2010 Matthias Clasen <mclasen(a)redhat.com> 2.31.2-4
+- Update for GLib api change
+
* Thu Jun 17 2010 Dan Hork <dan[at]danny.cz> 2.31.2-3
- link also with libm
commit 7ac1e4ae1796389e001503f097709caca07704e8
Author: Dan Hork <sharkcz(a)fedoraproject.org>
Date: Thu Jun 17 09:00:03 2010 +0000
- link also with libm
diff --git a/gnome-panel-2.31.2-libm.patch b/gnome-panel-2.31.2-libm.patch
new file mode 100644
index 0000000..97b2991
--- /dev/null
+++ b/gnome-panel-2.31.2-libm.patch
@@ -0,0 +1,12 @@
+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.spec b/gnome-panel.spec
index 18e7c7b..1a08c2e 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.31.2
-Release: 2%{?dist}
+Release: 3%{?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...
@@ -124,6 +124,9 @@ Patch47: fix-clock-crash.patch
Patch48: gnome-panel-libs.patch
+#
https://bugzilla.gnome.org/show_bug.cgi?id=621864
+Patch49: gnome-panel-2.31.2-libm.patch
+
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -174,6 +177,7 @@ Panel Applets using the libpanel-applet library.
#%patch45 -p1 -b .icon-padding
%patch47 -p1 -b .fix-clock-crash
%patch48 -p1 -b .libs
+%patch49 -p1 -b .libm
cp -f %{SOURCE3} gnome-panel/panel-default-setup.entries
cp -f %{SOURCE4} m4
@@ -367,6 +371,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null
|| :
%{_datadir}/gtk-doc/html/*
%changelog
+* Thu Jun 17 2010 Dan Hork <dan[at]danny.cz> 2.31.2-3
+- link also with libm
+
* Sat May 29 2010 Matthias Clasen <mclasen(a)redhat.com> 2.31.2-2
- Rebuild
commit 129b14e0f65e7cf85e449568109f5b60d07466c4
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sat May 29 15:51:02 2010 +0000
Rebuild
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 724d9cb..18e7c7b 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.31.2
-Release: 1%{?dist}
+Release: 2%{?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...
@@ -367,6 +367,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null
|| :
%{_datadir}/gtk-doc/html/*
%changelog
+* Sat May 29 2010 Matthias Clasen <mclasen(a)redhat.com> 2.31.2-2
+- Rebuild
+
* Fri May 28 2010 Matthias Clasen <mclasen(a)redhat.com> 2.31.2-1
- Update to 2.31.2
commit 5feb0764784f562bc14578ab37d83988695104c4
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri May 28 05:32:11 2010 +0000
2.31.2
diff --git a/.cvsignore b/.cvsignore
index 769a13c..d2ffb67 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.30.0.tar.bz2
+gnome-panel-2.31.2.tar.bz2
diff --git a/gnome-panel-libs.patch b/gnome-panel-libs.patch
index b3b57ad..90ba286 100644
--- a/gnome-panel-libs.patch
+++ b/gnome-panel-libs.patch
@@ -1,42 +1,16 @@
-diff -up gnome-panel-2.29.92.1/applets/clock/Makefile.am.libs
gnome-panel-2.29.92.1/applets/clock/Makefile.am
---- gnome-panel-2.29.92.1/applets/clock/Makefile.am.libs 2010-03-11 22:23:51.692914036
-0500
-+++ gnome-panel-2.29.92.1/applets/clock/Makefile.am 2010-03-11 22:38:20.988697805 -0500
-@@ -65,8 +65,9 @@ CLOCK_LDADD = \
- ../../libpanel-applet/libpanel-applet-2.la \
- $(CLOCK_LIBS) \
- $(LIBPANEL_APPLET_LIBS) \
-- $(POLKIT_LIBS) \
-- -lgweather
-+ $(POLKIT_LIBS) \
-+ -lgweather \
-+ -lm
+diff -up gnome-panel-2.31.2/configure.in.libs gnome-panel-2.31.2/configure.in
+--- gnome-panel-2.31.2/configure.in.libs 2010-05-26 14:17:31.000000000 -0400
++++ gnome-panel-2.31.2/configure.in 2010-05-28 01:06:01.347433767 -0400
+@@ -72,7 +72,7 @@ dnl pkg-config dependency checks
- BUILT_SOURCES = \
- clock-marshallers.c \
-@@ -134,7 +135,8 @@ gnome_clock_applet_mechanism_INCLUDES =
-
- gnome_clock_applet_mechanism_LDADD = \
- $(CLOCK_MECHANISM_LIBS) \
-- $(POLKIT_LIBS)
-+ $(POLKIT_LIBS) \
-+ -lm
-
- if CLOCK_INPROCESS
- APPLET_TYPE = shlib
-diff -up gnome-panel-2.29.92.1/configure.in.libs gnome-panel-2.29.92.1/configure.in
---- gnome-panel-2.29.92.1/configure.in.libs 2010-03-11 21:31:25.628657996 -0500
-+++ gnome-panel-2.29.92.1/configure.in 2010-03-11 22:11:11.098665958 -0500
-@@ -72,6 +72,9 @@ dnl pkg-config dependency checks
PKG_CHECK_MODULES(EGG_SMCLIENT, ice sm gtk+-2.0)
- PKG_CHECK_MODULES(PANEL, ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >=
$GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0
>= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED
libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >=
$LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >=
$LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED libcanberra-gtk)
-+
-+PANEL_LIBS="$PANEL_LIBS -lm"
-+
+-PKG_CHECK_MODULES(PANEL, gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >=
$PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >=
$GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-2.0 >=
$LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >=
$LIBGNOME_MENU_REQUIRED libcanberra-gtk)
++PKG_CHECK_MODULES(PANEL, gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >=
$PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >=
$GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-2.0 >=
$LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >=
$LIBGNOME_MENU_REQUIRED libcanberra-gtk dbus-glib-1 dbus-1)
AC_SUBST(PANEL_CFLAGS)
AC_SUBST(PANEL_LIBS)
-@@ -256,16 +259,17 @@ PKG_CHECK_MODULES(X, x11 xau, :, [
+@@ -256,16 +256,17 @@ PKG_CHECK_MODULES(X, x11 xau, :, [
X_LIBS="$X_PRE_LIBS $X_LIBS -lX11 -lXau $X_EXTRA_LIBS"
])
@@ -60,6 +34,24 @@ diff -up gnome-panel-2.29.92.1/configure.in.libs
gnome-panel-2.29.92.1/configure
+
+AC_SUBST(X_LIBS)
- dnl IDL directories
-
-diff -up gnome-panel-2.29.92.1/gnome-panel/Makefile.am.libs
gnome-panel-2.29.92.1/gnome-panel/Makefile.am
+ dnl Modules dir
+ AC_SUBST([modulesdir],"\$(libdir)/gnome-panel/modules")
+diff -up gnome-panel-2.31.2/gnome-panel/Makefile.am.libs
gnome-panel-2.31.2/gnome-panel/Makefile.am
+--- gnome-panel-2.31.2/gnome-panel/Makefile.am.libs 2010-05-26 11:13:52.000000000 -0400
++++ gnome-panel-2.31.2/gnome-panel/Makefile.am 2010-05-28 01:01:38.674674304 -0400
+@@ -152,6 +152,7 @@ gnome_panel_LDADD = \
+ $(top_builddir)/gnome-panel/libpanel-applet-private/libpanel-applet-private.la \
+ $(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la \
+ $(PANEL_LIBS) \
++ -lm \
+ $(X_LIBS)
+
+ gnome_panel_LDFLAGS = -export-dynamic
+@@ -168,6 +169,7 @@ gnome_desktop_item_edit_LDFLAGS = -expor
+ gnome_desktop_item_edit_LDADD = \
+ $(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la \
+ $(PANEL_LIBS) \
++ -lm \
+ $(X_LIBS)
+
+ uidir = $(datadir)/gnome-panel/ui
diff --git a/gnome-panel.spec b/gnome-panel.spec
index c2cc784..724d9cb 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,11 +21,11 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.30.0
-Release: 2%{?dist}
+Version: 2.31.2
+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.30/%{name}-%{version}.tar...
+Source0:
http://download.gnome.org/sources/gnome-panel/2.31/%{name}-%{version}.tar...
Source3: redhat-panel-default-setup.entries
Source4: gnome-compiler-flags.m4
@@ -102,7 +102,7 @@ Patch10: preferred-apps.patch
# don't pop up an error dialog if an applet from the
# default configuration is missing; we don't want to
# add a hard dependency on e.g. tomboy
-Patch11: applet-error.patch
+#Patch11: applet-error.patch
#
http://bugzilla.gnome.org/show_bug.cgi?id=520111
Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
@@ -165,39 +165,21 @@ Panel Applets using the libpanel-applet library.
%patch8 -p1 -b .launcher-desktop-files
%patch9 -p1 -b .desktop-file-monitoring
%patch10 -p1 -b .preferred-apps
-%patch11 -p1 -b .applet-error
+#%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
+#%patch45 -p1 -b .icon-padding
%patch47 -p1 -b .fix-clock-crash
%patch48 -p1 -b .libs
-. %{SOURCE6}
-
cp -f %{SOURCE3} gnome-panel/panel-default-setup.entries
cp -f %{SOURCE4} m4
cp -f %{SOURCE5} gnome-panel/panel-compatibility.schemas
-libtoolize -f
-aclocal -I m4
-automake
-autoconf
-
-# strip unneeded translations from .mo files
-# ideally intltool (ha!) would do that for us
-#
http://bugzilla.gnome.org/show_bug.cgi?id=474987
-cd po
-grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$\|.*[.]policy[.]in$"
POTFILES.in > POTFILES.keep
-mv POTFILES.keep POTFILES.in
-intltool-update --pot
-for p in *.po; do
- msgmerge $p %{gettext_package}.pot > $p.out
- msgfmt -o `basename $p .po`.gmo $p.out
-done
-
+autoreconf -i -f
%build
%configure \
@@ -236,8 +218,10 @@ sed -e
's|/schemas/apps/window_list_applet/prefs/|/schemas/apps/tasklist_applet/
sed -e
's|/schemas/apps/workspace_switcher_applet/prefs/|/schemas/apps/pager_applet/prefs/|;
s|<default>1</default>|<default>2</default>|'
$RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/workspace-switcher.schemas >
$RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/pager.schemas
## blow away stuff we don't want
-/bin/rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
-/bin/rm -f $RPM_BUILD_ROOT%{_libdir}/libpanel-applet-2.*a
+rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
+rm -f $RPM_BUILD_ROOT%{_libdir}/libpanel-applet-2.*a
+rm -f $RPM_BUILD_ROOT%{_libdir}/libpanel-applet-3.*a
+
desktop-file-install --delete-original \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -245,9 +229,6 @@ desktop-file-install --delete-original \
%find_lang %{gettext_package} --all-name --with-gnome
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%post
touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
@@ -359,26 +340,36 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor
>&/dev/null || :
%{_bindir}/gnome-panel
%{_bindir}/gnome-desktop-item-edit
%{_libexecdir}/*
-%{_libdir}/bonobo/servers/*.server
%{_sysconfdir}/gconf/schemas/*.schemas
%{_sysconfdir}/gconf/schemas/*.entries
+%{_libdir}/gnome-panel
%{_sysconfdir}/dbus-1/system.d/org.gnome.ClockApplet.Mechanism.conf
%{_datadir}/dbus-1/system-services/org.gnome.ClockApplet.Mechanism.service
%{_datadir}/polkit-1/actions/org.gnome.clockapplet.mechanism.policy
+%{_datadir}/dbus-1/services/org.gnome.panel.applet.ClockAppletFactory.service
+%{_datadir}/dbus-1/services/org.gnome.panel.applet.FishAppletFactory.service
+%{_datadir}/dbus-1/services/org.gnome.panel.applet.NotificationAreaAppletFactory.service
+%{_datadir}/dbus-1/services/org.gnome.panel.applet.WnckletFactory.service
+
%files libs
%{_libdir}/*.so.*
%files devel
%defattr(-, root, root)
%{_bindir}/panel-test-applets
+%{_bindir}/panel-test-applets-bonobo
%{_libdir}/pkgconfig/*
+%{_includedir}/gnome-panel-3.0/libpanel-applet
%{_includedir}/panel-2.0
%{_libdir}/*.so
%{_datadir}/gtk-doc/html/*
%changelog
+* Fri May 28 2010 Matthias Clasen <mclasen(a)redhat.com> 2.31.2-1
+- Update to 2.31.2
+
* Sun May 09 2010 Matthew Barnes <mbarnes(a)redhat.com> 2.30.0-2
- Rebuild against newer libedataserver and libedataserverui.
diff --git a/sources b/sources
index 995a6f3..4c8f3bf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e17f25417b2c9011ed1c3ebd75706de6 gnome-panel-2.30.0.tar.bz2
+17faacecd3081453b7e3fa8418a46058 gnome-panel-2.31.2.tar.bz2
commit e77fa76031e5dfb71faa3601c36af5990d50f999
Author: Matthew Barnes <mbarnes(a)fedoraproject.org>
Date: Sun May 9 15:36:41 2010 +0000
- Rebuild against newer libedataserver and libedataserverui.
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 3058375..c2cc784 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.30.0
-Release: 1%{?dist}
+Release: 2%{?dist}
URL:
http://www.gnome.org
#VCS:
git:git://git.gnome.org/gnome-panel
Source0:
http://download.gnome.org/sources/gnome-panel/2.30/%{name}-%{version}.tar...
@@ -379,6 +379,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null
|| :
%{_datadir}/gtk-doc/html/*
%changelog
+* Sun May 09 2010 Matthew Barnes <mbarnes(a)redhat.com> 2.30.0-2
+- Rebuild against newer libedataserver and libedataserverui.
+
* Mon Mar 29 2010 Matthias Clasen <mclasen(a)redhat.com> 2.30.0-1
- Update to 2.30.0
commit eb4c8cfb095c69baf76b6863ea348487bd0d7cf6
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Mar 30 02:07:59 2010 +0000
2.30.0
diff --git a/.cvsignore b/.cvsignore
index 9f660d4..769a13c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.29.92.1.tar.bz2
+gnome-panel-2.30.0.tar.bz2
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 664464a..3058375 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,11 +21,11 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.29.92.1
+Version: 2.30.0
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.29/%{name}-%{version}.tar...
+Source0:
http://download.gnome.org/sources/gnome-panel/2.30/%{name}-%{version}.tar...
Source3: redhat-panel-default-setup.entries
Source4: gnome-compiler-flags.m4
@@ -379,6 +379,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null
|| :
%{_datadir}/gtk-doc/html/*
%changelog
+* Mon Mar 29 2010 Matthias Clasen <mclasen(a)redhat.com> 2.30.0-1
+- Update to 2.30.0
+
* Thu Mar 11 2010 Matthias Clasen <mclasen(a)redhat.com> 2.29.92.1-1
- Update to 2.29.92.1
diff --git a/sources b/sources
index e16960d..995a6f3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8da6241b6850e702c739e338f78b39f9 gnome-panel-2.29.92.1.tar.bz2
+e17f25417b2c9011ed1c3ebd75706de6 gnome-panel-2.30.0.tar.bz2
commit cb6b679b58b9be07558919567c32ac86fbad06d4
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Mar 12 03:40:33 2010 +0000
more libs
diff --git a/gnome-panel-libs.patch b/gnome-panel-libs.patch
index ef90cbd..b3b57ad 100644
--- a/gnome-panel-libs.patch
+++ b/gnome-panel-libs.patch
@@ -1,7 +1,19 @@
diff -up gnome-panel-2.29.92.1/applets/clock/Makefile.am.libs
gnome-panel-2.29.92.1/applets/clock/Makefile.am
--- gnome-panel-2.29.92.1/applets/clock/Makefile.am.libs 2010-03-11 22:23:51.692914036
-0500
-+++ gnome-panel-2.29.92.1/applets/clock/Makefile.am 2010-03-11 22:24:24.302662466 -0500
-@@ -134,7 +134,8 @@ gnome_clock_applet_mechanism_INCLUDES =
++++ gnome-panel-2.29.92.1/applets/clock/Makefile.am 2010-03-11 22:38:20.988697805 -0500
+@@ -65,8 +65,9 @@ CLOCK_LDADD = \
+ ../../libpanel-applet/libpanel-applet-2.la \
+ $(CLOCK_LIBS) \
+ $(LIBPANEL_APPLET_LIBS) \
+- $(POLKIT_LIBS) \
+- -lgweather
++ $(POLKIT_LIBS) \
++ -lgweather \
++ -lm
+
+ BUILT_SOURCES = \
+ clock-marshallers.c \
+@@ -134,7 +135,8 @@ gnome_clock_applet_mechanism_INCLUDES =
gnome_clock_applet_mechanism_LDADD = \
$(CLOCK_MECHANISM_LIBS) \
commit c17e0a623c87e09c21e7dc7f76f54390efca9b1d
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Mar 12 03:26:51 2010 +0000
more libs
diff --git a/gnome-panel-libs.patch b/gnome-panel-libs.patch
index d297bc9..ef90cbd 100644
--- a/gnome-panel-libs.patch
+++ b/gnome-panel-libs.patch
@@ -1,3 +1,16 @@
+diff -up gnome-panel-2.29.92.1/applets/clock/Makefile.am.libs
gnome-panel-2.29.92.1/applets/clock/Makefile.am
+--- gnome-panel-2.29.92.1/applets/clock/Makefile.am.libs 2010-03-11 22:23:51.692914036
-0500
++++ gnome-panel-2.29.92.1/applets/clock/Makefile.am 2010-03-11 22:24:24.302662466 -0500
+@@ -134,7 +134,8 @@ gnome_clock_applet_mechanism_INCLUDES =
+
+ gnome_clock_applet_mechanism_LDADD = \
+ $(CLOCK_MECHANISM_LIBS) \
+- $(POLKIT_LIBS)
++ $(POLKIT_LIBS) \
++ -lm
+
+ if CLOCK_INPROCESS
+ APPLET_TYPE = shlib
diff -up gnome-panel-2.29.92.1/configure.in.libs gnome-panel-2.29.92.1/configure.in
--- gnome-panel-2.29.92.1/configure.in.libs 2010-03-11 21:31:25.628657996 -0500
+++ gnome-panel-2.29.92.1/configure.in 2010-03-11 22:11:11.098665958 -0500
commit 83d3043e958dd0429e60904b265b8272044935f9
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Mar 12 03:14:04 2010 +0000
more libs
diff --git a/gnome-panel-libs.patch b/gnome-panel-libs.patch
index 2d53d21..d297bc9 100644
--- a/gnome-panel-libs.patch
+++ b/gnome-panel-libs.patch
@@ -1,7 +1,17 @@
diff -up gnome-panel-2.29.92.1/configure.in.libs gnome-panel-2.29.92.1/configure.in
--- gnome-panel-2.29.92.1/configure.in.libs 2010-03-11 21:31:25.628657996 -0500
-+++ gnome-panel-2.29.92.1/configure.in 2010-03-11 21:34:12.907695990 -0500
-@@ -256,16 +256,17 @@ PKG_CHECK_MODULES(X, x11 xau, :, [
++++ gnome-panel-2.29.92.1/configure.in 2010-03-11 22:11:11.098665958 -0500
+@@ -72,6 +72,9 @@ dnl pkg-config dependency checks
+ PKG_CHECK_MODULES(EGG_SMCLIENT, ice sm gtk+-2.0)
+
+ PKG_CHECK_MODULES(PANEL, ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >=
$GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0
>= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED
libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED gnome-desktop-2.0 >=
$LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >=
$LIBGNOME_MENU_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED libcanberra-gtk)
++
++PANEL_LIBS="$PANEL_LIBS -lm"
++
+ AC_SUBST(PANEL_CFLAGS)
+ AC_SUBST(PANEL_LIBS)
+
+@@ -256,16 +259,17 @@ PKG_CHECK_MODULES(X, x11 xau, :, [
X_LIBS="$X_PRE_LIBS $X_LIBS -lX11 -lXau $X_EXTRA_LIBS"
])
@@ -27,3 +37,4 @@ diff -up gnome-panel-2.29.92.1/configure.in.libs
gnome-panel-2.29.92.1/configure
dnl IDL directories
+diff -up gnome-panel-2.29.92.1/gnome-panel/Makefile.am.libs
gnome-panel-2.29.92.1/gnome-panel/Makefile.am
commit bfd3c8ee39577ee23e816b2aa1337e150d5ed080
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Mar 12 02:54:57 2010 +0000
fix patches
diff --git a/gnome-panel-libs.patch b/gnome-panel-libs.patch
index 9d0b7be..2d53d21 100644
--- a/gnome-panel-libs.patch
+++ b/gnome-panel-libs.patch
@@ -15,7 +15,7 @@ diff -up gnome-panel-2.29.92.1/configure.in.libs
gnome-panel-2.29.92.1/configure
-else
- have_randr=no
-fi
-+PKG_CHECK_MODULES(xrandr >= 1.2.0, [
++PKG_CHECK_MODULES(XRANDR, xrandr >= 1.2.0, [
+ AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library])
+ have_randr=yes
+ X_LIBS="$X_LIBS $XRANDR_LIBS"
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 894a6a8..664464a 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -173,7 +173,7 @@ Panel Applets using the libpanel-applet library.
%patch43 -p1 -b .panel-padding
%patch45 -p1 -b .icon-padding
%patch47 -p1 -b .fix-clock-crash
-%patch48 -p1 -b .libss
+%patch48 -p1 -b .libs
. %{SOURCE6}
commit 15b5f5fc3f346b4073e7bed0646ba28698da80fc
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Mar 12 02:40:07 2010 +0000
fix linking
diff --git a/gnome-panel-libs.patch b/gnome-panel-libs.patch
index 1ef5f7f..9d0b7be 100644
--- a/gnome-panel-libs.patch
+++ b/gnome-panel-libs.patch
@@ -1,7 +1,7 @@
-diff -up gnome-panel-2.29.6/configure.in.libs gnome-panel-2.29.6/configure.in
---- gnome-panel-2.29.6/configure.in.libs 2010-02-11 23:09:20.086009297 -0500
-+++ gnome-panel-2.29.6/configure.in 2010-02-11 23:35:24.292035257 -0500
-@@ -251,14 +251,18 @@ PKG_CHECK_MODULES(X, x11 xau, :, [
+diff -up gnome-panel-2.29.92.1/configure.in.libs gnome-panel-2.29.92.1/configure.in
+--- gnome-panel-2.29.92.1/configure.in.libs 2010-03-11 21:31:25.628657996 -0500
++++ gnome-panel-2.29.92.1/configure.in 2010-03-11 21:34:12.907695990 -0500
+@@ -256,16 +256,17 @@ PKG_CHECK_MODULES(X, x11 xau, :, [
X_LIBS="$X_PRE_LIBS $X_LIBS -lX11 -lXau $X_EXTRA_LIBS"
])
@@ -9,16 +9,21 @@ diff -up gnome-panel-2.29.6/configure.in.libs
gnome-panel-2.29.6/configure.in
-
dnl X RANDR extension
- if $PKG_CONFIG --exists "xrandr >= 1.2.0" ; then
- AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library])
-+ PKG_CHECK_MODULES(RANDR, xrandr)
-+ X_LIBS="$X_LIBS $RANDR_LIBS"
- fi
-
-+AC_SUBST(X_LIBS)
-+
-+LIBS="$LIBS -lm"
+-if $PKG_CONFIG --exists "xrandr >= 1.2.0" ; then
+- AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library])
+- have_randr=yes
+-else
+- have_randr=no
+-fi
++PKG_CHECK_MODULES(xrandr >= 1.2.0, [
++ AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library])
++ have_randr=yes
++ X_LIBS="$X_LIBS $XRANDR_LIBS"
++], [
++ have_randr=no
++])
+
++AC_SUBST(X_LIBS)
+
dnl IDL directories
- ORBIT_IDL="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`"
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 15c9c37..894a6a8 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -122,6 +122,8 @@ Patch45: icon-padding.patch
#
https://bugzilla.redhat.com/show_bug.cgi?id=537798
Patch47: fix-clock-crash.patch
+Patch48: gnome-panel-libs.patch
+
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -171,6 +173,7 @@ Panel Applets using the libpanel-applet library.
%patch43 -p1 -b .panel-padding
%patch45 -p1 -b .icon-padding
%patch47 -p1 -b .fix-clock-crash
+%patch48 -p1 -b .libss
. %{SOURCE6}
commit 5535be79f477d1d47f2e627729650d1e35d04985
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Mar 12 01:30:00 2010 +0000
fix BRs
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 5b57afc..15c9c37 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -73,6 +73,7 @@ BuildRequires: gtk-doc
BuildRequires: pango-devel
BuildRequires: libbonobo-devel
BuildRequires: libXau-devel
+BuildRequires: libXrandr-devel
%if %{use_evolution_data_server}
BuildRequires: evolution-data-server-devel >= %{evolution_data_server_version}
BuildRequires: ORBit2-devel >= %{orbit_version}
commit 891aef4da31e109c0f387bce1138f478f29b48f8
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Mar 12 01:04:12 2010 +0000
2.29.92.1
diff --git a/.cvsignore b/.cvsignore
index f03c2b7..9f660d4 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.29.91.tar.bz2
+gnome-panel-2.29.92.1.tar.bz2
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 781d6c4..5b57afc 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -115,20 +115,12 @@ 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=583115
-Patch44: icon-order.patch
-
#
https://bugzilla.gnome.org/show_bug.cgi?id=583273
Patch45: icon-padding.patch
-#
https://bugzilla.gnome.org/show_bug.cgi?id=341441
-Patch46: resolution-change.patch
-
#
https://bugzilla.redhat.com/show_bug.cgi?id=537798
Patch47: fix-clock-crash.patch
-Patch48: gnome-panel-libs.patch
-
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -176,11 +168,8 @@ Panel Applets using the libpanel-applet library.
%patch40 -p1 -b .clock-home
%patch41 -p1 -b .bookmarks-submenu
%patch43 -p1 -b .panel-padding
-%patch44 -p1 -b .icon-order
%patch45 -p1 -b .icon-padding
-%patch46 -p1 -b .resolution-change
%patch47 -p1 -b .fix-clock-crash
-%patch48 -p1 -b .libs
. %{SOURCE6}
diff --git a/sources b/sources
index de3793d..e16960d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7c7f8b0e4f540333545d9a01ec770194 gnome-panel-2.29.91.tar.bz2
+8da6241b6850e702c739e338f78b39f9 gnome-panel-2.29.92.1.tar.bz2
commit a80a5ee0ad6fc00ff12baf92e65081f50dfc503c
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Mar 12 00:10:46 2010 +0000
2.29.92.1
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 80c1166..781d6c4 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,9 +21,10 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.29.91
+Version: 2.29.92.1
Release: 1%{?dist}
URL:
http://www.gnome.org
+#VCS:
git:git://git.gnome.org/gnome-panel
Source0:
http://download.gnome.org/sources/gnome-panel/2.29/%{name}-%{version}.tar...
Source3: redhat-panel-default-setup.entries
@@ -43,11 +44,9 @@ Requires: gnome-session-xsession
Requires: %{name}-libs = %{version}-%{release}
Requires(post): GConf2 >= %{gconf_version}
-Requires(post): scrollkeeper
Requires(post): hicolor-icon-theme
Requires(pre): GConf2 >= %{gconf_version}
Requires(preun): GConf2 >= %{gconf_version}
-Requires(postun): scrollkeeper
BuildRequires: libxml2-python
BuildRequires: intltool
@@ -232,8 +231,6 @@ awk '/^========/ { seen+=1 }
%install
-rm -rf $RPM_BUILD_ROOT
-
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make DESTDIR=$RPM_BUILD_ROOT install
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
@@ -259,10 +256,7 @@ desktop-file-install --delete-original \
rm -rf $RPM_BUILD_ROOT
%post
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
- gtk-update-icon-cache -q %{_datadir}/icons/hicolor
-fi
+touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -344,11 +338,14 @@ fi
%postun
/sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
- gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+if [ $1 -eq 0 ]; then
+ touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
+ gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null || :
fi
+%posttrans
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null || :
+
%files -f %{gettext_package}.lang
%defattr(-,root,root)
%doc AUTHORS COPYING COPYING.LIB COPYING-DOCS NEWS README
@@ -389,6 +386,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Thu Mar 11 2010 Matthias Clasen <mclasen(a)redhat.com> 2.29.92.1-1
+- Update to 2.29.92.1
+
* Mon Feb 22 2010 Matthias Clasen <mclasen(a)redhat.com> 2.29.91-1
- Update to 2.29.91
commit 961595bd7262b1793e28e5ce1ca8cc87a51bcf1e
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Feb 23 00:26:08 2010 +0000
2.29.91
diff --git a/.cvsignore b/.cvsignore
index 571531d..f03c2b7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.29.6.tar.bz2
+gnome-panel-2.29.91.tar.bz2
diff --git a/gnome-panel.spec b/gnome-panel.spec
index c40f181..80c1166 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,8 +21,8 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.29.6
-Release: 2%{?dist}
+Version: 2.29.91
+Release: 1%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.29/%{name}-%{version}.tar...
@@ -32,7 +32,6 @@ Source5: redhat-panel-backwards-compat-config.schemas
Source6: add-translations.sh
License: GPLv2+ and LGPLv2+ and GFDL
Group: User Interface/Desktops
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: gnome-desktop >= %{gnome_desktop_version}
Requires: libwnck >= %{libwnck_version}
@@ -390,6 +389,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Mon Feb 22 2010 Matthias Clasen <mclasen(a)redhat.com> 2.29.91-1
+- Update to 2.29.91
+
* Wed Feb 17 2010 Matthias Clasen <mclasen(a)redhat.com> 2.29.6-2
- Update icon-order patch to sort keyboard, too
diff --git a/sources b/sources
index 62009b1..de3793d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c798236a3c8168f417fef010d45359c2 gnome-panel-2.29.6.tar.bz2
+7c7f8b0e4f540333545d9a01ec770194 gnome-panel-2.29.91.tar.bz2
commit 3b599a143c296083e42fa077bfdf0aa814e7ec8d
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Feb 18 00:17:11 2010 +0000
update a patch
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 679f67c..c40f181 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.29.6
-Release: 1%{?dist}
+Release: 2%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.29/%{name}-%{version}.tar...
@@ -390,6 +390,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Wed Feb 17 2010 Matthias Clasen <mclasen(a)redhat.com> 2.29.6-2
+- Update icon-order patch to sort keyboard, too
+
* Thu Feb 11 2010 Matthias Clasen <mclasen(a)redhat.com> 2.29.6-1
- Update to 2.29.6
diff --git a/icon-order.patch b/icon-order.patch
index 91325cf..fa5503b 100644
--- a/icon-order.patch
+++ b/icon-order.patch
@@ -1,6 +1,7 @@
---- gnome-panel-2.28.0/applets/notification_area/na-tray-child.c 2009-08-11
12:56:35.000000000 -0400
-+++ hacked/applets/notification_area/na-tray-child.c 2009-10-16 00:18:25.057041777 -0400
-@@ -428,3 +428,84 @@
+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
}
}
@@ -85,9 +86,10 @@
+ res_class,
+ res_name);
+}
---- gnome-panel-2.28.0/applets/notification_area/na-tray-child.h 2009-08-11
12:55:28.000000000 -0400
-+++ hacked/applets/notification_area/na-tray-child.h 2009-10-16 00:19:19.841050913 -0400
-@@ -61,7 +61,10 @@
+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);
@@ -99,9 +101,10 @@
G_END_DECLS
---- gnome-panel-2.28.0/applets/notification_area/na-tray.c 2009-08-11 16:27:41.000000000
-0400
-+++ hacked/applets/notification_area/na-tray.c 2009-10-16 01:38:03.211041558 -0400
-@@ -117,6 +117,51 @@
+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;
}
@@ -119,6 +122,7 @@
+ "Gnome-volume-control-applet", "volume",
+ "Nm-applet", "network",
+ "Gnome-power-manager", "battery",
++ "keyboard", "keyboard",
+ NULL,
+};
+
@@ -153,7 +157,7 @@
static void
tray_added (NaTrayManager *manager,
GtkWidget *icon,
-@@ -124,6 +169,11 @@
+@@ -124,6 +170,11 @@ tray_added (NaTrayManager *manager,
{
NaTray *tray;
NaTrayPrivate *priv;
@@ -165,7 +169,7 @@
tray = get_tray (trays_screen);
if (tray == NULL)
-@@ -132,10 +182,45 @@
+@@ -132,10 +183,45 @@ tray_added (NaTrayManager *manager,
priv = tray->priv;
g_assert (priv->trays_screen == trays_screen);
commit f039e5e332bc775cfbe5bc259775715735ab9ee6
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Feb 12 04:37:43 2010 +0000
more link fixes
diff --git a/gnome-panel-libs.patch b/gnome-panel-libs.patch
index 51bd93f..1ef5f7f 100644
--- a/gnome-panel-libs.patch
+++ b/gnome-panel-libs.patch
@@ -1,7 +1,7 @@
diff -up gnome-panel-2.29.6/configure.in.libs gnome-panel-2.29.6/configure.in
--- gnome-panel-2.29.6/configure.in.libs 2010-02-11 23:09:20.086009297 -0500
-+++ gnome-panel-2.29.6/configure.in 2010-02-11 23:14:01.436008069 -0500
-@@ -251,14 +251,16 @@ PKG_CHECK_MODULES(X, x11 xau, :, [
++++ gnome-panel-2.29.6/configure.in 2010-02-11 23:35:24.292035257 -0500
+@@ -251,14 +251,18 @@ PKG_CHECK_MODULES(X, x11 xau, :, [
X_LIBS="$X_PRE_LIBS $X_LIBS -lX11 -lXau $X_EXTRA_LIBS"
])
@@ -17,6 +17,8 @@ diff -up gnome-panel-2.29.6/configure.in.libs
gnome-panel-2.29.6/configure.in
+AC_SUBST(X_LIBS)
+
++LIBS="$LIBS -lm"
++
dnl IDL directories
ORBIT_IDL="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`"
commit b686c3db8c3889acfb8ff4fbaaf138d649ae3650
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Feb 12 04:22:54 2010 +0000
make ld happy
diff --git a/gnome-panel-libs.patch b/gnome-panel-libs.patch
new file mode 100644
index 0000000..51bd93f
--- /dev/null
+++ b/gnome-panel-libs.patch
@@ -0,0 +1,22 @@
+diff -up gnome-panel-2.29.6/configure.in.libs gnome-panel-2.29.6/configure.in
+--- gnome-panel-2.29.6/configure.in.libs 2010-02-11 23:09:20.086009297 -0500
++++ gnome-panel-2.29.6/configure.in 2010-02-11 23:14:01.436008069 -0500
+@@ -251,14 +251,16 @@ PKG_CHECK_MODULES(X, x11 xau, :, [
+ X_LIBS="$X_PRE_LIBS $X_LIBS -lX11 -lXau $X_EXTRA_LIBS"
+ ])
+
+-AC_SUBST(X_LIBS)
+-
+ dnl X RANDR extension
+
+ if $PKG_CONFIG --exists "xrandr >= 1.2.0" ; then
+ AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library])
++ PKG_CHECK_MODULES(RANDR, xrandr)
++ X_LIBS="$X_LIBS $RANDR_LIBS"
+ fi
+
++AC_SUBST(X_LIBS)
++
+ dnl IDL directories
+
+ ORBIT_IDL="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`"
diff --git a/gnome-panel.spec b/gnome-panel.spec
index aabaa3d..679f67c 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -129,6 +129,8 @@ Patch46: resolution-change.patch
#
https://bugzilla.redhat.com/show_bug.cgi?id=537798
Patch47: fix-clock-crash.patch
+Patch48: gnome-panel-libs.patch
+
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -180,6 +182,7 @@ Panel Applets using the libpanel-applet library.
%patch45 -p1 -b .icon-padding
%patch46 -p1 -b .resolution-change
%patch47 -p1 -b .fix-clock-crash
+%patch48 -p1 -b .libs
. %{SOURCE6}
commit f0a31eefa86673afcec48b4ff3b00f69580f40d8
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Feb 12 03:53:20 2010 +0000
2.29.6
diff --git a/.cvsignore b/.cvsignore
index 53b3ec7..571531d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.29.5.1.tar.bz2
+gnome-panel-2.29.6.tar.bz2
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 159a488..aabaa3d 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,7 +21,7 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.29.5.1
+Version: 2.29.6
Release: 1%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.29/%{name}-%{version}.tar...
@@ -387,6 +387,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Thu Feb 11 2010 Matthias Clasen <mclasen(a)redhat.com> 2.29.6-1
+- Update to 2.29.6
+
* Sun Jan 17 2010 Matthias Clasen <mclasen(a)redhat.com> 2.29.5.1-1
- Update to 2.29.5.1
diff --git a/sources b/sources
index d3d4234..62009b1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4e86f12049645566778fa2796649ff9e gnome-panel-2.29.5.1.tar.bz2
+c798236a3c8168f417fef010d45359c2 gnome-panel-2.29.6.tar.bz2
commit e88d0e2d3e734584b508c56ad77069e636d94391
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Jan 18 01:44:20 2010 +0000
fix patches
diff --git a/desktop-file-monitoring.patch b/desktop-file-monitoring.patch
index a43da9d..adfa5e2 100644
--- a/desktop-file-monitoring.patch
+++ b/desktop-file-monitoring.patch
@@ -233,7 +233,7 @@ diff -up
gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c.desktop-file-moni
}
@@ -992,6 +1005,13 @@ update_editor_from_desktop_file (PanelDI
*/
- setup_icon_entry (dialog, icon);
+ setup_icon_chooser (dialog, icon);
+ /* We set the orig_desktop_file field to let the
+ * launcher know that the editor contents are coming
diff --git a/launcher-desktop-files.patch b/launcher-desktop-files.patch
index c0287b1..ab2d715 100644
--- a/launcher-desktop-files.patch
+++ b/launcher-desktop-files.patch
@@ -35,7 +35,7 @@ diff -up
gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c.launcher-desktop-
+ /* Note: we need to set the icon last, since the editor
+ * tries to guess the icon when the command is modified
+ */
-+ setup_icon_entry (dialog, icon);
++ setup_icon_chooser (dialog, icon);
+
+ g_free (name);
+ g_free (comment);
commit 04c3f59cc497a72088ad90aacdb69f5683a0bc29
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Jan 18 00:38:15 2010 +0000
Try again
diff --git a/desktop-file-monitoring.patch b/desktop-file-monitoring.patch
index ff3f6c2..a43da9d 100644
--- a/desktop-file-monitoring.patch
+++ b/desktop-file-monitoring.patch
@@ -202,7 +202,7 @@ diff -up
gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c.desktop-file-moni
GtkWidget *cancel_button;
GtkWidget *ok_button;
+
-+ char *orig_Desktop_file;
++ char *orig_desktop_file;
};
/* Time in seconds after which we save the file on the disk */
commit 45303f88422e89650b397809737c5aaea148f176
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sun Jan 17 23:49:39 2010 +0000
Fix BRs
diff --git a/gnome-panel.spec b/gnome-panel.spec
index e21afff..159a488 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -87,6 +87,7 @@ BuildRequires: NetworkManager-devel
BuildRequires: intltool
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
commit 89bad3c54e40962a01b366c5658054f2d541c16d
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sun Jan 17 23:40:43 2010 +0000
2.29.5.1
diff --git a/.cvsignore b/.cvsignore
index 8e1e8a5..53b3ec7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.28.0.tar.bz2
+gnome-panel-2.29.5.1.tar.bz2
diff --git a/bookmarks-submenu.patch b/bookmarks-submenu.patch
index 626dafb..90e619f 100644
--- a/bookmarks-submenu.patch
+++ b/bookmarks-submenu.patch
@@ -1,12 +1,12 @@
-diff -up gnome-panel-2.28.0/gnome-panel/panel-menu-items.c.bookmarks-submenu
gnome-panel-2.28.0/gnome-panel/panel-menu-items.c
---- gnome-panel-2.28.0/gnome-panel/panel-menu-items.c.bookmarks-submenu 2009-10-08
00:52:51.855737118 -0400
-+++ gnome-panel-2.28.0/gnome-panel/panel-menu-items.c 2009-10-08 00:53:09.378716600
-0400
+diff -up gnome-panel-2.29.5.1/gnome-panel/panel-menu-items.c.bookmarks-submenu
gnome-panel-2.29.5.1/gnome-panel/panel-menu-items.c
+--- gnome-panel-2.29.5.1/gnome-panel/panel-menu-items.c.bookmarks-submenu 2010-01-17
18:19:36.000000000 -0500
++++ gnome-panel-2.29.5.1/gnome-panel/panel-menu-items.c 2010-01-17 18:21:00.466529924
-0500
@@ -61,7 +61,7 @@
#define NAMES_DIR "/apps/nautilus/desktop"
#define HOME_NAME_KEY "/apps/nautilus/desktop/home_icon_name"
#define COMPUTER_NAME_KEY "/apps/nautilus/desktop/computer_icon_name"
-#define MAX_ITEMS_OR_SUBMENU 5
+#define MAX_ITEMS_OR_SUBMENU 8
+ #define MAX_BOOKMARK_ITEMS 100
G_DEFINE_TYPE (PanelPlaceMenuItem, panel_place_menu_item, GTK_TYPE_IMAGE_MENU_ITEM)
- G_DEFINE_TYPE (PanelDesktopMenuItem, panel_desktop_menu_item, GTK_TYPE_IMAGE_MENU_ITEM)
diff --git a/desktop-file-monitoring.patch b/desktop-file-monitoring.patch
index 14a5ea3..ff3f6c2 100644
--- a/desktop-file-monitoring.patch
+++ b/desktop-file-monitoring.patch
@@ -1,39 +1,7 @@
-diff -up gnome-panel-2.21.91/gnome-panel/launcher.h.desktop-file-monitoring
gnome-panel-2.21.91/gnome-panel/launcher.h
---- gnome-panel-2.21.91/gnome-panel/launcher.h.desktop-file-monitoring 2008-02-11
16:15:47.000000000 -0500
-+++ gnome-panel-2.21.91/gnome-panel/launcher.h 2008-02-13 17:50:59.000000000 -0500
-@@ -29,6 +29,8 @@ typedef struct {
- GSList *error_dialogs;
-
- gulong destroy_handler;
-+
-+ GFileMonitor *monitor;
- } Launcher;
-
- void panel_launcher_create (PanelToplevel *toplevel,
-@@ -58,7 +60,6 @@ void launcher_load_from_gconf
- gint position,
- const char *id);
-
--void panel_launcher_delete (Launcher *launcher);
-
- void ask_about_launcher (const char *file,
- PanelWidget *panel,
-diff -up gnome-panel-2.21.91/gnome-panel/panel-ditem-editor.h.desktop-file-monitoring
gnome-panel-2.21.91/gnome-panel/panel-ditem-editor.h
----
gnome-panel-2.21.91/gnome-panel/panel-ditem-editor.h.desktop-file-monitoring 2008-02-11
16:15:47.000000000 -0500
-+++ gnome-panel-2.21.91/gnome-panel/panel-ditem-editor.h 2008-02-13 17:34:43.000000000
-0500
-@@ -101,6 +101,8 @@ void panel_ditem_editor_set_uri (PanelDI
- const char *uri);
-
- G_CONST_RETURN char *panel_ditem_editor_get_uri (PanelDItemEditor *dialog);
-+G_CONST_RETURN char *panel_ditem_editor_get_orig_desktop_file (PanelDItemEditor
*dialog);
-+
-
- void panel_ditem_register_save_uri_func (PanelDItemEditor *dialog,
- PanelDitemSaveUri save_uri,
-diff -up gnome-panel-2.21.91/gnome-panel/launcher.c.desktop-file-monitoring
gnome-panel-2.21.91/gnome-panel/launcher.c
---- gnome-panel-2.21.91/gnome-panel/launcher.c.desktop-file-monitoring 2008-02-11
16:15:47.000000000 -0500
-+++ gnome-panel-2.21.91/gnome-panel/launcher.c 2008-02-13 18:04:07.000000000 -0500
-@@ -307,6 +307,8 @@ static void
+diff -up gnome-panel-2.29.5.1/gnome-panel/launcher.c.desktop-file-monitoring
gnome-panel-2.29.5.1/gnome-panel/launcher.c
+--- gnome-panel-2.29.5.1/gnome-panel/launcher.c.desktop-file-monitoring 2010-01-13
22:26:27.000000000 -0500
++++ gnome-panel-2.29.5.1/gnome-panel/launcher.c 2010-01-17 18:06:14.640537280 -0500
+@@ -237,6 +237,8 @@ static void
destroy_launcher (GtkWidget *widget,
Launcher *launcher)
{
@@ -42,7 +10,7 @@ diff -up
gnome-panel-2.21.91/gnome-panel/launcher.c.desktop-file-monitoring gnom
launcher_properties_destroy (launcher);
launcher_widget_destroy_open_dialogs (launcher);
}
-@@ -488,6 +490,37 @@ drag_data_get_cb (GtkWidget *widg
+@@ -410,6 +412,37 @@ drag_data_get_cb (GtkWidget *widg
}
@@ -80,7 +48,7 @@ diff -up
gnome-panel-2.21.91/gnome-panel/launcher.c.desktop-file-monitoring gnom
static Launcher *
create_launcher (const char *location)
{
-@@ -564,6 +597,21 @@ create_launcher (const char *location)
+@@ -482,6 +515,21 @@ create_launcher (const char *location)
launcher->key_file = key_file;
launcher->prop_dialog = NULL;
launcher->destroy_handler = 0;
@@ -102,7 +70,7 @@ diff -up
gnome-panel-2.21.91/gnome-panel/launcher.c.desktop-file-monitoring gnom
/* Icon will be setup later */
launcher->button = button_widget_new (NULL /* icon */,
-@@ -694,6 +742,15 @@ static void
+@@ -612,6 +660,15 @@ static void
launcher_changed (PanelDItemEditor *dialog,
Launcher *launcher)
{
@@ -118,7 +86,7 @@ diff -up
gnome-panel-2.21.91/gnome-panel/launcher.c.desktop-file-monitoring gnom
/* Setup the button look */
setup_button (launcher);
}
-@@ -765,6 +822,42 @@ launcher_save_uri (PanelDItemEditor *dia
+@@ -681,6 +738,42 @@ launcher_save_uri (PanelDItemEditor *dia
return NULL;
}
@@ -161,7 +129,7 @@ diff -up
gnome-panel-2.21.91/gnome-panel/launcher.c.desktop-file-monitoring gnom
static void
launcher_saved (GtkWidget *dialog,
Launcher *launcher)
-@@ -772,11 +865,15 @@ launcher_saved (GtkWidget *dialog,
+@@ -688,11 +781,15 @@ launcher_saved (GtkWidget *dialog,
const char *uri;
GConfClient *client;
const char *key;
@@ -177,7 +145,7 @@ diff -up
gnome-panel-2.21.91/gnome-panel/launcher.c.desktop-file-monitoring gnom
if (uri && launcher->location && strcmp (uri,
launcher->location)) {
client = panel_gconf_get_client ();
-@@ -789,6 +886,9 @@ launcher_saved (GtkWidget *dialog,
+@@ -705,6 +802,9 @@ launcher_saved (GtkWidget *dialog,
if (launcher->location)
g_free (launcher->location);
launcher->location = g_strdup (uri);
@@ -187,7 +155,7 @@ diff -up
gnome-panel-2.21.91/gnome-panel/launcher.c.desktop-file-monitoring gnom
}
}
-@@ -955,6 +1055,7 @@ launcher_new_saved (GtkWidget *dialog,
+@@ -871,6 +971,7 @@ launcher_new_saved (GtkWidget *dialog,
PanelWidget *panel;
int pos;
const char *uri;
@@ -195,7 +163,7 @@ diff -up
gnome-panel-2.21.91/gnome-panel/launcher.c.desktop-file-monitoring gnom
pos = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (dialog), "pos"));
panel = g_object_get_data (G_OBJECT (dialog), "panel");
-@@ -962,6 +1063,10 @@ launcher_new_saved (GtkWidget *dialog,
+@@ -878,6 +979,10 @@ launcher_new_saved (GtkWidget *dialog,
uri = panel_ditem_editor_get_uri (PANEL_DITEM_EDITOR (dialog));
if (panel_launcher_get_filename (uri) != NULL)
uri = panel_launcher_get_filename (uri);
@@ -206,21 +174,41 @@ diff -up
gnome-panel-2.21.91/gnome-panel/launcher.c.desktop-file-monitoring gnom
panel_launcher_create (panel->toplevel, pos, uri);
}
-diff -up gnome-panel-2.21.91/gnome-panel/panel-ditem-editor.c.desktop-file-monitoring
gnome-panel-2.21.91/gnome-panel/panel-ditem-editor.c
----
gnome-panel-2.21.91/gnome-panel/panel-ditem-editor.c.desktop-file-monitoring 2008-02-13
17:34:43.000000000 -0500
-+++ gnome-panel-2.21.91/gnome-panel/panel-ditem-editor.c 2008-02-13 17:34:43.000000000
-0500
-@@ -80,6 +80,8 @@ struct _PanelDItemEditorPrivate
+diff -up gnome-panel-2.29.5.1/gnome-panel/launcher.h.desktop-file-monitoring
gnome-panel-2.29.5.1/gnome-panel/launcher.h
+--- gnome-panel-2.29.5.1/gnome-panel/launcher.h.desktop-file-monitoring 2009-04-19
13:45:09.000000000 -0400
++++ gnome-panel-2.29.5.1/gnome-panel/launcher.h 2010-01-17 18:06:14.638537025 -0500
+@@ -27,6 +27,8 @@ typedef struct {
+ GSList *error_dialogs;
- /* the directory of the theme for the icon, see bug #119208 */
- char *icon_theme_dir;
+ gulong destroy_handler;
+
-+ char *orig_desktop_file;
++ GFileMonitor *monitor;
+ } Launcher;
+
+ void panel_launcher_create (PanelToplevel *toplevel,
+@@ -56,7 +58,6 @@ void launcher_load_from_gconf
+ gint position,
+ const char *id);
+
+-void panel_launcher_delete (Launcher *launcher);
+
+ void ask_about_launcher (const char *file,
+ PanelWidget *panel,
+diff -up gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c.desktop-file-monitoring
gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c
+---
gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c.desktop-file-monitoring 2010-01-17
18:06:14.635278719 -0500
++++ gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c 2010-01-17 18:11:39.921279627
-0500
+@@ -81,6 +81,8 @@ struct _PanelDItemEditorPrivate
+ GtkWidget *close_button;
+ GtkWidget *cancel_button;
+ GtkWidget *ok_button;
++
++ char *orig_Desktop_file;
};
/* Time in seconds after which we save the file on the disk */
-@@ -367,6 +369,10 @@ panel_ditem_editor_destroy (GtkObject *o
- g_free (dialog->priv->icon_theme_dir);
- dialog->priv->icon_theme_dir = NULL;
+@@ -366,6 +368,10 @@ panel_ditem_editor_destroy (GtkObject *o
+ g_free (dialog->priv->uri);
+ dialog->priv->uri = NULL;
+ if (dialog->priv->orig_desktop_file != NULL)
+ g_free (dialog->priv->orig_desktop_file);
@@ -243,21 +231,21 @@ diff -up
gnome-panel-2.21.91/gnome-panel/panel-ditem-editor.c.desktop-file-monit
dialog->priv->dirty = TRUE;
g_signal_emit (G_OBJECT (dialog), ditem_edit_signals[CHANGED], 0);
}
-@@ -1005,6 +1018,13 @@ update_editor_from_desktop_file (PanelDI
- */
- setup_icon_entry (dialog, icon);
+@@ -992,6 +1005,13 @@ update_editor_from_desktop_file (PanelDI
+ */
+ setup_icon_entry (dialog, icon);
-+ /* We set the orig_desktop_file field to let the
-+ * launcher know that the editor contents are coming
-+ * directly from a desktop file.
-+ */
-+ g_free (dialog->priv->orig_desktop_file);
-+ dialog->priv->orig_desktop_file = g_strdup (uri);
++ /* We set the orig_desktop_file field to let the
++ * launcher know that the editor contents are coming
++ * directly from a desktop file.
++ */
++ g_free (dialog->priv->orig_desktop_file);
++ dialog->priv->orig_desktop_file = g_strdup (uri);
+
- g_free (name);
- g_free (comment);
- g_free (icon);
-@@ -1079,6 +1099,7 @@ update_chooser_for_type (PanelDItemEdito
+ g_free (name);
+ g_free (comment);
+ g_free (icon);
+@@ -1066,6 +1086,7 @@ update_chooser_for_type (PanelDItemEdito
g_assert_not_reached ();
}
@@ -265,7 +253,7 @@ diff -up
gnome-panel-2.21.91/gnome-panel/panel-ditem-editor.c.desktop-file-monit
chooser = dialog->priv->command_browse_filechooser;
gtk_window_set_title (GTK_WINDOW (chooser),
-@@ -1835,3 +1856,12 @@ panel_ditem_register_save_uri_func (Pane
+@@ -1849,3 +1870,12 @@ panel_ditem_register_save_uri_func (Pane
dialog->priv->save_uri = save_uri;
dialog->priv->save_uri_data = data;
}
@@ -278,3 +266,15 @@ diff -up
gnome-panel-2.21.91/gnome-panel/panel-ditem-editor.c.desktop-file-monit
+ return dialog->priv->orig_desktop_file;
+}
+
+diff -up gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.h.desktop-file-monitoring
gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.h
+---
gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.h.desktop-file-monitoring 2009-04-19
13:45:09.000000000 -0400
++++ gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.h 2010-01-17 18:06:14.638537025
-0500
+@@ -101,6 +101,8 @@ void panel_ditem_editor_set_uri (PanelDI
+ const char *uri);
+
+ G_CONST_RETURN char *panel_ditem_editor_get_uri (PanelDItemEditor *dialog);
++G_CONST_RETURN char *panel_ditem_editor_get_orig_desktop_file (PanelDItemEditor
*dialog);
++
+
+ void panel_ditem_register_save_uri_func (PanelDItemEditor *dialog,
+ PanelDitemSaveUri save_uri,
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 20a1cf1..e21afff 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,10 +21,10 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.28.0
-Release: 17%{?dist}
+Version: 2.29.5.1
+Release: 1%{?dist}
URL:
http://www.gnome.org
-Source0:
http://download.gnome.org/sources/gnome-panel/2.28/%{name}-%{version}.tar...
+Source0:
http://download.gnome.org/sources/gnome-panel/2.29/%{name}-%{version}.tar...
Source3: redhat-panel-default-setup.entries
Source4: gnome-compiler-flags.m4
@@ -107,17 +107,12 @@ Patch11: applet-error.patch
#
http://bugzilla.gnome.org/show_bug.cgi?id=520111
Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
-Patch35: clock-wakeups.patch
-
#
http://bugzilla.gnome.org/show_bug.cgi?id=579092
Patch38: clock-network.patch
Patch40: clock-home.patch
Patch41: bookmarks-submenu.patch
-# from upstream
-Patch42: panel-randr-crashes.patch
-
#
http://bugzilla.gnome.org/show_bug.cgi?id=343436
Patch43: panel-padding.patch
@@ -133,9 +128,6 @@ Patch46: resolution-change.patch
#
https://bugzilla.redhat.com/show_bug.cgi?id=537798
Patch47: fix-clock-crash.patch
-#
https://bugzilla.gnome.org/show_bug.cgi?id=604678
-Patch48: polkit-error.patch
-
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -179,17 +171,14 @@ Panel Applets using the libpanel-applet library.
%patch10 -p1 -b .preferred-apps
%patch11 -p1 -b .applet-error
%patch24 -p1 -b .allow-spurious-view-done-signals
-%patch35 -p1 -b .clock-wakeups
%patch38 -p1 -b .clock-network
%patch40 -p1 -b .clock-home
%patch41 -p1 -b .bookmarks-submenu
-%patch42 -p1 -b .randr-crashes
%patch43 -p1 -b .panel-padding
%patch44 -p1 -b .icon-order
%patch45 -p1 -b .icon-padding
%patch46 -p1 -b .resolution-change
%patch47 -p1 -b .fix-clock-crash
-%patch48 -p1 -b .polkit-error
. %{SOURCE6}
@@ -397,6 +386,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Sun Jan 17 2010 Matthias Clasen <mclasen(a)redhat.com> 2.29.5.1-1
+- Update to 2.29.5.1
+
* Tue Dec 15 2009 Matthias Clasen <mclasen(a)redhat.com> 2.28.0-17
- Handle errors returned from PolicyKit in the clock applet (#547624)
- Fix clock crash (bug 537798)
diff --git a/launcher-desktop-files.patch b/launcher-desktop-files.patch
index 27b09fb..c0287b1 100644
--- a/launcher-desktop-files.patch
+++ b/launcher-desktop-files.patch
@@ -1,59 +1,59 @@
-diff -up gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.c.launcher-desktop-files
gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.c
----
gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.c.launcher-desktop-files 2007-09-04
13:34:26.000000000 -0400
-+++ gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.c 2007-09-13 12:13:36.000000000
-0400
-@@ -973,6 +973,51 @@ panel_ditem_editor_icon_changed (PanelDI
- g_free (file);
+diff -up gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c.launcher-desktop-files
gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c
+---
gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c.launcher-desktop-files 2010-01-13
22:26:27.000000000 -0500
++++ gnome-panel-2.29.5.1/gnome-panel/panel-ditem-editor.c 2010-01-17 18:05:34.492279538
-0500
+@@ -960,6 +960,51 @@ panel_ditem_editor_icon_changed (PanelDI
+ icon);
}
+static gboolean
+update_editor_from_desktop_file (PanelDItemEditor *dialog,
-+ const gchar *uri)
++ const gchar *uri)
+{
-+ GKeyFile *key_file;
-+ char *name;
-+ char *comment;
-+ char *exec;
-+ char *icon;
-+ gboolean retval = FALSE;
++ GKeyFile *key_file;
++ char *name;
++ char *comment;
++ char *exec;
++ char *icon;
++ gboolean retval = FALSE;
+
-+ key_file = g_key_file_new ();
-+ if (g_key_file_load_from_file (key_file, uri, 0, NULL)) {
-+ if (panel_key_file_get_boolean (key_file, "Terminal", FALSE))
-+ gtk_combo_box_set_active (GTK_COMBO_BOX (dialog->priv->type_combo), 1);
-+ else
-+ gtk_combo_box_set_active (GTK_COMBO_BOX (dialog->priv->type_combo), 0);
++ key_file = g_key_file_new ();
++ if (g_key_file_load_from_file (key_file, uri, 0, NULL)) {
++ if (panel_key_file_get_boolean (key_file, "Terminal", FALSE))
++ gtk_combo_box_set_active (GTK_COMBO_BOX
(dialog->priv->type_combo), 1);
++ else
++ gtk_combo_box_set_active (GTK_COMBO_BOX
(dialog->priv->type_combo), 0);
+
-+ name = panel_key_file_get_locale_string (key_file, "Name");
-+ comment = panel_key_file_get_locale_string (key_file, "Comment");
-+ icon = panel_key_file_get_locale_string (key_file, "Icon");
-+ exec = panel_key_file_get_string (key_file, "Exec");
++ name = panel_key_file_get_locale_string (key_file, "Name");
++ comment = panel_key_file_get_locale_string (key_file,
"Comment");
++ icon = panel_key_file_get_locale_string (key_file, "Icon");
++ exec = panel_key_file_get_string (key_file, "Exec");
+
-+ gtk_entry_set_text (GTK_ENTRY (dialog->priv->name_entry), name ? name :
"");
-+ gtk_entry_set_text (GTK_ENTRY (dialog->priv->comment_entry), comment ? comment :
"");
-+ gtk_entry_set_text (GTK_ENTRY (dialog->priv->command_entry), exec ? exec :
"");
++ gtk_entry_set_text (GTK_ENTRY (dialog->priv->name_entry), name ?
name : "");
++ gtk_entry_set_text (GTK_ENTRY (dialog->priv->comment_entry),
comment ? comment : "");
++ gtk_entry_set_text (GTK_ENTRY (dialog->priv->command_entry), exec ?
exec : "");
+
-+ /* Note: we need to set the icon last, since the editor
-+ * tries to guess the icon when the command is modified
-+ */
-+ setup_icon_entry (dialog, icon);
++ /* Note: we need to set the icon last, since the editor
++ * tries to guess the icon when the command is modified
++ */
++ setup_icon_entry (dialog, icon);
+
-+ g_free (name);
-+ g_free (comment);
-+ g_free (icon);
-+ g_free (exec);
++ g_free (name);
++ g_free (comment);
++ g_free (icon);
++ g_free (exec);
+
-+ retval = TRUE;
-+ }
++ retval = TRUE;
++ }
+
-+ g_key_file_free (key_file);
++ g_key_file_free (key_file);
+
-+ return retval;
++ return retval;
+}
+
static void
command_browse_chooser_response (GtkFileChooser *chooser,
gint response_id,
-@@ -986,7 +1031,11 @@ command_browse_chooser_response (GtkFile
+@@ -973,7 +1018,11 @@ command_browse_chooser_response (GtkFile
case PANEL_DITEM_EDITOR_TYPE_APPLICATION:
case PANEL_DITEM_EDITOR_TYPE_TERMINAL_APPLICATION:
text = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (chooser));
@@ -66,7 +66,7 @@ diff -up
gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.c.launcher-desktop-f
g_free (text);
break;
case PANEL_DITEM_EDITOR_TYPE_LINK:
-@@ -996,8 +1045,9 @@ command_browse_chooser_response (GtkFile
+@@ -983,8 +1032,9 @@ command_browse_chooser_response (GtkFile
g_assert_not_reached ();
}
diff --git a/sources b/sources
index 4d651a5..d3d4234 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9f0ea283d44bbcce67dc2e8a02fe9fad gnome-panel-2.28.0.tar.bz2
+4e86f12049645566778fa2796649ff9e gnome-panel-2.29.5.1.tar.bz2
commit 0a91edfa8bea352d84a847cf9ad7294cf3b24da1
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Dec 16 04:13:51 2009 +0000
copy F12 changes
diff --git a/fix-clock-crash.patch b/fix-clock-crash.patch
new file mode 100644
index 0000000..4a12b60
--- /dev/null
+++ b/fix-clock-crash.patch
@@ -0,0 +1,52 @@
+From 58d7ba0359ab128f30b39ea0518a69ed83a4e329 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode(a)redhat.com>
+Date: Tue, 8 Dec 2009 14:48:58 -0500
+Subject: [PATCH] Only call e_passwords_shutdown once
+
+It doesn't appear to support being called multiple times
+in a row.
+
+It appears there was already an attempt to do this with a
+reference counter called clock_numbers:
+
+/* Used to count the number of clock instances. It's there to know when
+ * we should free resources that are shared. */
+static int clock_numbers = 0;
+
+But the logic was wrong.
+---
+ applets/clock/clock.c | 9 +++++++--
+ 1 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/applets/clock/clock.c b/applets/clock/clock.c
+index ddbbc16..c06530a 100644
+--- a/applets/clock/clock.c
++++ b/applets/clock/clock.c
+@@ -803,8 +803,11 @@ destroy_clock (GtkWidget * widget, ClockData *cd)
+
+ #ifdef HAVE_LIBECAL
+ if (clock_numbers > 0) {
+- e_passwords_shutdown ();
+ clock_numbers--;
++
++ if (clock_numbers == 0) {
++ e_passwords_shutdown ();
++ }
+ }
+ #endif
+ }
+@@ -1385,8 +1388,10 @@ static void
+ create_clock_widget (ClockData *cd)
+ {
+ #ifdef HAVE_LIBECAL
++ if (clock_numbers == 0) {
++ e_passwords_init ();
++ }
+ clock_numbers++;
+- e_passwords_init ();
+ #endif
+
+ /* Main toggle button */
+--
+1.6.5.2
+
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 2594817..20a1cf1 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.28.0
-Release: 12%{?dist}
+Release: 17%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.28/%{name}-%{version}.tar...
@@ -127,6 +127,15 @@ Patch44: icon-order.patch
#
https://bugzilla.gnome.org/show_bug.cgi?id=583273
Patch45: icon-padding.patch
+#
https://bugzilla.gnome.org/show_bug.cgi?id=341441
+Patch46: resolution-change.patch
+
+#
https://bugzilla.redhat.com/show_bug.cgi?id=537798
+Patch47: fix-clock-crash.patch
+
+#
https://bugzilla.gnome.org/show_bug.cgi?id=604678
+Patch48: polkit-error.patch
+
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -178,6 +187,9 @@ Panel Applets using the libpanel-applet library.
%patch43 -p1 -b .panel-padding
%patch44 -p1 -b .icon-order
%patch45 -p1 -b .icon-padding
+%patch46 -p1 -b .resolution-change
+%patch47 -p1 -b .fix-clock-crash
+%patch48 -p1 -b .polkit-error
. %{SOURCE6}
@@ -385,6 +397,12 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Tue Dec 15 2009 Matthias Clasen <mclasen(a)redhat.com> 2.28.0-17
+- Handle errors returned from PolicyKit in the clock applet (#547624)
+- Fix clock crash (bug 537798)
+- Improve the behaviour of the panel when screen resolution
+ changes (gnome #341441)
+
* Thu Oct 29 2009 Matthias Clasen <mclasen(a)redhat.com> 2.28.0-12
- Make padding work correctly in non-expanded panels (#529614)
diff --git a/polkit-error.patch b/polkit-error.patch
new file mode 100644
index 0000000..cfeaa02
--- /dev/null
+++ b/polkit-error.patch
@@ -0,0 +1,51 @@
+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/resolution-change.patch b/resolution-change.patch
new file mode 100644
index 0000000..9447804
--- /dev/null
+++ b/resolution-change.patch
@@ -0,0 +1,21 @@
+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);
commit 44d58766857c1b71d3d3141b3d6d98b7b314800a
Author: Bill Nottingham <notting(a)fedoraproject.org>
Date: Wed Nov 25 23:19:38 2009 +0000
Fix typo that causes a failure to update the common directory. (releng
#2781)
diff --git a/Makefile b/Makefile
index 7fca097..f459914 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
# Makefile for source rpm: gnome-panel
-# $Id: Makefile,v 1.1 2004/09/09 05:29:48 cvsdist Exp $
+# $Id: Makefile,v 1.2 2007/10/15 18:48:49 notting Exp $
NAME := gnome-panel
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f
$$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo
"$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f
$$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo
"$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
commit 25c2b3ca0a199381f3b175ad062a6f955aeeb93e
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Nov 2 04:45:40 2009 +0000
Copy F12 work over
diff --git a/bookmarks-submenu.patch b/bookmarks-submenu.patch
new file mode 100644
index 0000000..626dafb
--- /dev/null
+++ b/bookmarks-submenu.patch
@@ -0,0 +1,12 @@
+diff -up gnome-panel-2.28.0/gnome-panel/panel-menu-items.c.bookmarks-submenu
gnome-panel-2.28.0/gnome-panel/panel-menu-items.c
+--- gnome-panel-2.28.0/gnome-panel/panel-menu-items.c.bookmarks-submenu 2009-10-08
00:52:51.855737118 -0400
++++ gnome-panel-2.28.0/gnome-panel/panel-menu-items.c 2009-10-08 00:53:09.378716600
-0400
+@@ -61,7 +61,7 @@
+ #define NAMES_DIR "/apps/nautilus/desktop"
+ #define HOME_NAME_KEY "/apps/nautilus/desktop/home_icon_name"
+ #define COMPUTER_NAME_KEY "/apps/nautilus/desktop/computer_icon_name"
+-#define MAX_ITEMS_OR_SUBMENU 5
++#define MAX_ITEMS_OR_SUBMENU 8
+
+ G_DEFINE_TYPE (PanelPlaceMenuItem, panel_place_menu_item, GTK_TYPE_IMAGE_MENU_ITEM)
+ G_DEFINE_TYPE (PanelDesktopMenuItem, panel_desktop_menu_item, GTK_TYPE_IMAGE_MENU_ITEM)
diff --git a/clock-home.patch b/clock-home.patch
new file mode 100644
index 0000000..a4a60e3
--- /dev/null
+++ b/clock-home.patch
@@ -0,0 +1,21 @@
+diff -up gnome-panel-2.28.0/applets/clock/clock.schemas.in.clock-home
gnome-panel-2.28.0/applets/clock/clock.schemas.in
+--- gnome-panel-2.28.0/applets/clock/clock.schemas.in.clock-home 2009-07-01
09:06:23.000000000 -0400
++++ gnome-panel-2.28.0/applets/clock/clock.schemas.in 2009-10-07 22:36:12.298466938
-0400
+@@ -211,7 +211,7 @@
+ <key>/schemas/apps/clock_applet/prefs/expand_locations</key>
+ <owner>clock-applet</owner>
+ <type>bool</type>
+- <default>false</default>
++ <default>true</default>
+ <locale name="C">
+ <short>Expand list of locations</short>
+ <long>
+@@ -271,7 +271,7 @@
+ <owner>clock-applet</owner>
+ <type>list</type>
+ <list_type>string</list_type>
+- <default>[]</default>
++ <default>[<location name=""
city="Boston" timezone="America/New_York"
latitude="42.360558" longitude="-71.010559"
code="KBOS" current="true"/>]</default>
+ <locale name="C">
+ <short>List of locations</short>
+ <long>
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 62e5cda..2594817 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.28.0
-Release: 1%{?dist}
+Release: 12%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.28/%{name}-%{version}.tar...
@@ -41,6 +41,7 @@ Requires: gnome-menus >= %{gnome_menus_version}
Requires: evolution-data-server >= %{evolution_data_server_version}
%endif
Requires: gnome-session-xsession
+Requires: %{name}-libs = %{version}-%{release}
Requires(post): GConf2 >= %{gconf_version}
Requires(post): scrollkeeper
@@ -111,6 +112,21 @@ Patch35: clock-wakeups.patch
#
http://bugzilla.gnome.org/show_bug.cgi?id=579092
Patch38: clock-network.patch
+Patch40: clock-home.patch
+Patch41: bookmarks-submenu.patch
+
+# from upstream
+Patch42: panel-randr-crashes.patch
+
+#
http://bugzilla.gnome.org/show_bug.cgi?id=343436
+Patch43: panel-padding.patch
+
+#
https://bugzilla.gnome.org/show_bug.cgi?id=583115
+Patch44: icon-order.patch
+
+#
https://bugzilla.gnome.org/show_bug.cgi?id=583273
+Patch45: icon-padding.patch
+
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -156,6 +172,12 @@ Panel Applets using the libpanel-applet library.
%patch24 -p1 -b .allow-spurious-view-done-signals
%patch35 -p1 -b .clock-wakeups
%patch38 -p1 -b .clock-network
+%patch40 -p1 -b .clock-home
+%patch41 -p1 -b .bookmarks-submenu
+%patch42 -p1 -b .randr-crashes
+%patch43 -p1 -b .panel-padding
+%patch44 -p1 -b .icon-order
+%patch45 -p1 -b .icon-padding
. %{SOURCE6}
@@ -261,6 +283,7 @@ gconftool-2 --makefile-install-rule \
%{_sysconfdir}/gconf/schemas/tasklist.schemas \
%{_sysconfdir}/gconf/schemas/window-list.schemas \
%{_sysconfdir}/gconf/schemas/workspace-switcher.schemas \
+ %{_sysconfdir}/gconf/schemas/notification_area_applet.schemas \
/dev/null || :
#
@@ -287,6 +310,10 @@ if [ "$1" -gt 1 ]; then
%{_sysconfdir}/gconf/schemas/window-list.schemas \
%{_sysconfdir}/gconf/schemas/workspace-switcher.schemas \
/dev/null || :
+ if [ -f
%{_sysconfdir}/gconf/schemas/notification_area_applet.schemas ]; then
+ gconftool-2 --makefile-uninstall-rule \
+ %{_sysconfdir}/gconf/schemas/notification_area_applet.schemas > /dev/null || :
+ fi
fi
%preun
@@ -305,6 +332,10 @@ if [ "$1" -eq 0 ]; then
%{_sysconfdir}/gconf/schemas/window-list.schemas \
%{_sysconfdir}/gconf/schemas/workspace-switcher.schemas \
/dev/null || :
+ if [ -f
%{_sysconfdir}/gconf/schemas/notification_area_applet.schemas ]; then
+ gconftool-2 --makefile-uninstall-rule \
+ %{_sysconfdir}/gconf/schemas/notification_area_applet.schemas > /dev/null || :
+ fi
fi
%postun
@@ -354,6 +385,39 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Thu Oct 29 2009 Matthias Clasen <mclasen(a)redhat.com> 2.28.0-12
+- Make padding work correctly in non-expanded panels (#529614)
+
+* Tue Oct 20 2009 Matthias Clasen <mclasen(a)redhat.com> 2.28.0-11
+- Remove a leftover debugging statement
+
+* Tue Oct 20 2009 Matthias Clasen <mclasen(a)redhat.com> 2.28.0-10
+- Reduce the inter-applet padding
+
+* Mon Oct 19 2009 Ray Strode <rstrode(a)redhat.com> 2.28.0-9
+- Add explicit libs requires (bug 525600)
+
+* Mon Oct 19 2009 Matthias Clasen <mclasen(a)redhat.com> 2.28.0-9
+- Actually set non-zero padding
+
+* Sat Oct 17 2009 Matthias Clasen <mclasen(a)redhat.com> 2.28.0-8
+- Add padding around status icons
+
+* Fri Oct 16 2009 Matthias Clasen <mclasen(a)redhat.com> 2.28.0-6
+- Put status icons in a predictable order
+
+* Wed Oct 14 2009 Matthias Clasen <mclasen(a)redhat.com> 2.28.0-5
+- Tweaks to the default panel configuration
+
+* Thu Oct 8 2009 Matthias Clasen <mclasen(a)redhat.com> 2.28.0-4
+- Fix possible crashes related to randr events
+
+* Thu Oct 8 2009 Matthias Clasen <mclasen(a)redhat.com> 2.28.0-3
+- Accept more bookmarks in the places menu before overflowing
+
+* Wed Oct 7 2009 Matthias Clasen <mclasen(a)redhat.com> 2.28.0-2
+- Add a default location to the clock applet
+
* Wed Sep 23 2009 Matthias Clasen <mclasen(a)redhat.com> 2.28.0-1
- Update to 2.28.0
diff --git a/icon-order.patch b/icon-order.patch
new file mode 100644
index 0000000..91325cf
--- /dev/null
+++ b/icon-order.patch
@@ -0,0 +1,215 @@
+--- gnome-panel-2.28.0/applets/notification_area/na-tray-child.c 2009-08-11
12:56:35.000000000 -0400
++++ hacked/applets/notification_area/na-tray-child.c 2009-10-16 00:18:25.057041777 -0400
+@@ -428,3 +428,84 @@
+ #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);
++}
+--- gnome-panel-2.28.0/applets/notification_area/na-tray-child.h 2009-08-11
12:55:28.000000000 -0400
++++ hacked/applets/notification_area/na-tray-child.h 2009-10-16 00:19:19.841050913 -0400
+@@ -61,7 +61,10 @@
+ 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
+
+--- gnome-panel-2.28.0/applets/notification_area/na-tray.c 2009-08-11 16:27:41.000000000
-0400
++++ hacked/applets/notification_area/na-tray.c 2009-10-16 01:38:03.211041558 -0400
+@@ -117,6 +117,51 @@
+ 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",
++ 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 +169,11 @@
+ {
+ 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 +182,45 @@
+ 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/icon-padding.patch b/icon-padding.patch
new file mode 100644
index 0000000..5ccf4c0
--- /dev/null
+++ b/icon-padding.patch
@@ -0,0 +1,255 @@
+diff -u -r gnome-panel-2.28.0/applets/notification_area/main.c
hacked/applets/notification_area/main.c
+--- gnome-panel-2.28.0/applets/notification_area/main.c 2009-07-01 09:06:23.000000000
-0400
++++ hacked/applets/notification_area/main.c 2009-10-17 23:06:01.001313433 -0400
+@@ -25,6 +25,7 @@
+
+ #include <panel-applet.h>
+ #include <panel-applet-gconf.h>
++#include <gconf/gconf-client.h>
+
+ #include <glib/gi18n.h>
+ #include <gtk/gtk.h>
+@@ -34,6 +35,7 @@
+ #include "fixedtip.h"
+
+ #define NOTIFICATION_AREA_ICON "gnome-panel-notification-area"
++#define SCHEMA_DIR "/schemas/apps/notification_area_applet/prefs"
+
+ typedef struct
+ {
+@@ -231,6 +233,39 @@
+ gtk_widget_set_name (widget, "na-tray");
+ }
+
++static void
++padding_changed (GConfClient *client,
++ guint cnxn_id,
++ GConfEntry *entry,
++ gpointer user_data)
++{
++ AppletData *data = user_data;
++ gint value;
++
++ if (!entry->value || entry->value->type != GCONF_VALUE_INT)
++ return;
++
++ value = gconf_value_get_int (entry->value);
++
++ na_tray_set_padding (data->tray, value);
++}
++
++static void
++setup_gconf (AppletData *data)
++{
++ GConfClient *client;
++ char *key;
++ int value;
++
++ client = gconf_client_get_default ();
++ key = panel_applet_gconf_get_full_key (data->applet, "padding");
++ value = gconf_client_get_int (client, key, NULL);
++ na_tray_set_padding (data->tray, value);
++ gconf_client_notify_add (client, key, padding_changed, data, NULL, NULL);
++ g_free (key);
++ g_object_unref (client);
++}
++
+ static gboolean
+ applet_factory (PanelApplet *applet,
+ const gchar *iid,
+@@ -260,9 +295,10 @@
+ atko = gtk_widget_get_accessible (GTK_WIDGET (applet));
+ atk_object_set_name (atko, _("Panel Notification Area"));
+
++ panel_applet_add_preferences (applet, SCHEMA_DIR, NULL);
+ panel_applet_set_flags (applet,
+ PANEL_APPLET_HAS_HANDLE|PANEL_APPLET_EXPAND_MINOR);
+-
++
+ g_signal_connect (applet, "change_orient",
+ G_CALLBACK (applet_change_orientation), data);
+ g_signal_connect (applet, "change_background",
+@@ -270,6 +306,8 @@
+ g_signal_connect (applet, "destroy",
+ G_CALLBACK (applet_destroy), data);
+
++ setup_gconf (data);
++
+ panel_applet_set_background_widget (applet, GTK_WIDGET (applet));
+
+ gtk_container_add (GTK_CONTAINER (applet), GTK_WIDGET (tray));
+diff -u -r gnome-panel-2.28.0/applets/notification_area/Makefile.am
hacked/applets/notification_area/Makefile.am
+--- gnome-panel-2.28.0/applets/notification_area/Makefile.am 2009-07-21
13:25:43.000000000 -0400
++++ hacked/applets/notification_area/Makefile.am 2009-10-17 23:16:42.401072682 -0400
+@@ -66,6 +66,24 @@
+
+ @INTLTOOL_SERVER_RULE@
+
++schemasdir = $(GCONF_SCHEMA_FILE_DIR)
++schemas_in_files = notification_area_applet.schemas.in
++schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
++
++@INTLTOOL_SCHEMAS_RULE@
++
++if GCONF_SCHEMAS_INSTALL
++# don't do this if we are building in eg. rpm
++install-data-local:
++ if test -z "$(DESTDIR)" ; then \
++ for p in $(schemas_DATA) ; do \
++ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL)
--makefile-install-rule $(top_builddir)/applets/notification_area/$$p ; \
++ done \
++ fi
++else
++install-data-local:
++endif
++
+ uidir = $(datadir)/gnome-2.0/ui
+ ui_DATA = GNOME_NotificationAreaApplet.xml
+
+diff -u -r gnome-panel-2.28.0/applets/notification_area/na-tray.c
hacked/applets/notification_area/na-tray.c
+--- gnome-panel-2.28.0/applets/notification_area/na-tray.c 2009-10-17 23:22:01.095308064
-0400
++++ hacked/applets/notification_area/na-tray.c 2009-10-17 23:00:01.304062848 -0400
+@@ -602,6 +602,8 @@
+ {
+ trays_screens [screen_number].tray_manager = tray_manager;
+
++ na_tray_manager_set_padding (tray_manager, 0);
++
+ g_signal_connect (tray_manager, "tray_icon_added",
+ G_CALLBACK (tray_added),
+ &trays_screens [screen_number]);
+@@ -804,6 +806,16 @@
+ }
+
+ void
++na_tray_set_padding (NaTray *tray,
++ gint padding)
++{
++ NaTrayPrivate *priv = tray->priv;
++
++ if (get_tray (priv->trays_screen) == tray)
++ na_tray_manager_set_padding (priv->trays_screen->tray_manager, padding);
++}
++
++void
+ na_tray_force_redraw (NaTray *tray)
+ {
+ NaTrayPrivate *priv = tray->priv;
+diff -u -r gnome-panel-2.28.0/applets/notification_area/na-tray.h
hacked/applets/notification_area/na-tray.h
+--- gnome-panel-2.28.0/applets/notification_area/na-tray.h 2009-04-19 13:45:09.000000000
-0400
++++ hacked/applets/notification_area/na-tray.h 2009-10-17 23:00:30.491375187 -0400
+@@ -60,6 +60,8 @@
+ void na_tray_set_orientation (NaTray *tray,
+ GtkOrientation orientation);
+ GtkOrientation na_tray_get_orientation (NaTray *tray);
++void na_tray_set_padding (NaTray *tray,
++ gint padding);
+ void na_tray_force_redraw (NaTray *tray);
+
+ G_END_DECLS
+diff -u -r gnome-panel-2.28.0/applets/notification_area/na-tray-manager.c
hacked/applets/notification_area/na-tray-manager.c
+--- gnome-panel-2.28.0/applets/notification_area/na-tray-manager.c 2009-07-27
08:01:39.000000000 -0400
++++ hacked/applets/notification_area/na-tray-manager.c 2009-10-17 21:55:00.582062966
-0400
+@@ -653,6 +653,32 @@
+ #endif
+ }
+
++static void
++na_tray_manager_set_padding_property (NaTrayManager *manager)
++{
++#ifdef GDK_WINDOWING_X11
++ GdkDisplay *display;
++ Atom orientation_atom;
++ gulong data[1];
++
++ if (!manager->invisible || !manager->invisible->window)
++ return;
++
++ display = gtk_widget_get_display (manager->invisible);
++ orientation_atom = gdk_x11_get_xatom_by_name_for_display (display,
++
"_NET_SYSTEM_TRAY_PADDING");
++
++ data[0] = manager->padding;
++
++ XChangeProperty (GDK_DISPLAY_XDISPLAY (display),
++ GDK_WINDOW_XWINDOW (manager->invisible->window),
++ orientation_atom,
++ XA_CARDINAL, 32,
++ PropModeReplace,
++ (guchar *) &data, 1);
++#endif
++}
++
+ #ifdef GDK_WINDOWING_X11
+
+ static gboolean
+@@ -697,6 +723,7 @@
+
+ na_tray_manager_set_orientation_property (manager);
+ na_tray_manager_set_visual_property (manager);
++ na_tray_manager_set_padding_property (manager);
+
+ timestamp = gdk_x11_get_server_time (invisible->window);
+
+@@ -836,6 +863,20 @@
+ }
+ }
+
++void
++na_tray_manager_set_padding (NaTrayManager *manager,
++ gint padding)
++{
++ g_return_if_fail (NA_IS_TRAY_MANAGER (manager));
++
++ if (manager->padding != padding)
++ {
++ manager->padding = padding;
++
++ na_tray_manager_set_padding_property (manager);
++ }
++}
++
+ GtkOrientation
+ na_tray_manager_get_orientation (NaTrayManager *manager)
+ {
+diff -u -r gnome-panel-2.28.0/applets/notification_area/na-tray-manager.h
hacked/applets/notification_area/na-tray-manager.h
+--- gnome-panel-2.28.0/applets/notification_area/na-tray-manager.h 2009-04-19
13:45:09.000000000 -0400
++++ hacked/applets/notification_area/na-tray-manager.h 2009-10-17 21:55:42.646312700
-0400
+@@ -55,6 +55,7 @@
+ GtkWidget *invisible;
+ GdkScreen *screen;
+ GtkOrientation orientation;
++ gint padding;
+
+ GList *messages;
+ GHashTable *socket_table;
+@@ -91,6 +92,8 @@
+ void na_tray_manager_set_orientation (NaTrayManager *manager,
+ GtkOrientation orientation);
+ GtkOrientation na_tray_manager_get_orientation (NaTrayManager *manager);
++void na_tray_manager_set_padding (NaTrayManager *manager,
++ gint padding);
+
+ G_END_DECLS
+
+diff -u -r
gnome-panel-2.28.0/applets/notification_area/notification_area_applet.schemas.in
hacked/applets/notification_area/notification_area_applet.schemas.in
+---
gnome-panel-2.28.0/applets/notification_area/notification_area_applet.schemas.in 2009-10-17
23:23:41.071058057 -0400
++++ hacked/applets/notification_area/notification_area_applet.schemas.in 2009-10-17
23:21:38.588316399 -0400
+@@ -0,0 +1,17 @@
++<?xml version="1.0"?>
++<gconfschemafile>
++ <schemalist>
++ <schema>
++ <key>/schemas/apps/notification_area_applet/prefs/padding</key>
++ <owner>notification-area-applet</owner>
++ <type>int</type>
++ <default>3</default>
++ <locale name="C">
++ <short>Padding</short>
++ <long>
++ This key specifies padding to be put around status icons.
++ </long>
++ </locale>
++ </schema>
++ </schemalist>
++</gconfschemafile>
diff --git a/panel-padding.patch b/panel-padding.patch
new file mode 100644
index 0000000..90dad4b
--- /dev/null
+++ b/panel-padding.patch
@@ -0,0 +1,343 @@
+diff -up gnome-panel-2.28.0/gnome-panel/panel-profile.c.panel-padding
gnome-panel-2.28.0/gnome-panel/panel-profile.c
+--- gnome-panel-2.28.0/gnome-panel/panel-profile.c.panel-padding 2009-09-21
12:29:33.000000000 -0400
++++ gnome-panel-2.28.0/gnome-panel/panel-profile.c 2009-10-29 09:57:25.285484907 -0400
+@@ -638,6 +638,7 @@ TOPLEVEL_IS_WRITABLE_FUNC ("orientation"
+
+ TOPLEVEL_GET_SET_FUNCS ("size", toplevel, int, size,
int)
+ TOPLEVEL_GET_SET_FUNCS ("expand", toplevel, bool, expand,
gboolean)
++TOPLEVEL_GET_SET_FUNCS ("padding", toplevel, int, padding,
int)
+ TOPLEVEL_GET_SET_FUNCS ("auto_hide", toplevel, bool, auto_hide,
gboolean)
+ TOPLEVEL_GET_SET_FUNCS ("enable_buttons", toplevel, bool,
enable_buttons, gboolean)
+ TOPLEVEL_GET_SET_FUNCS ("enable_arrows", toplevel, bool, enable_arrows,
gboolean)
+@@ -1185,6 +1186,7 @@ panel_profile_toplevel_change_notify (GC
+ else UPDATE_INT ("monitor", monitor)
+ else UPDATE_STRING ("name", name)
+ else UPDATE_BOOL ("expand", expand)
++ else UPDATE_INT ("padding", padding)
+ else UPDATE_STRING ("orientation", orientation)
+ else UPDATE_INT ("size", size)
+ else UPDATE_POS ("x", x, x_right)
+@@ -1706,6 +1708,7 @@ panel_profile_load_toplevel (GConfClient
+ GET_STRING ("name", name);
+ GET_INT ("monitor", monitor);
+ GET_BOOL ("expand", expand);
++ GET_INT ("padding", padding);
+ GET_STRING ("orientation", orientation);
+ GET_INT ("size", size);
+ GET_BOOL ("auto_hide", auto_hide);
+diff -up gnome-panel-2.28.0/gnome-panel/panel-profile.h.panel-padding
gnome-panel-2.28.0/gnome-panel/panel-profile.h
+--- gnome-panel-2.28.0/gnome-panel/panel-profile.h.panel-padding 2009-04-19
13:45:09.000000000 -0400
++++ gnome-panel-2.28.0/gnome-panel/panel-profile.h 2009-10-29 09:57:25.285484907 -0400
+@@ -92,7 +92,10 @@ void panel_profile_set_toplevel_e
+ gboolean expand);
+ gboolean panel_profile_get_toplevel_expand (PanelToplevel *toplevel);
+ gboolean panel_profile_is_writable_toplevel_expand (PanelToplevel *toplevel);
+-
++void panel_profile_set_toplevel_padding (PanelToplevel *toplevel,
++ int padding);
++int panel_profile_get_toplevel_padding (PanelToplevel *padding);
++gboolean panel_profile_is_writable_toplevel_padding (PanelToplevel *toplevel);
+ void panel_profile_set_toplevel_auto_hide (PanelToplevel *toplevel,
+ gboolean auto_hide);
+ gboolean panel_profile_get_toplevel_auto_hide (PanelToplevel *toplevel);
+diff -up gnome-panel-2.28.0/gnome-panel/panel-toplevel.c.panel-padding
gnome-panel-2.28.0/gnome-panel/panel-toplevel.c
+--- gnome-panel-2.28.0/gnome-panel/panel-toplevel.c.panel-padding 2009-08-21
06:31:49.000000000 -0400
++++ gnome-panel-2.28.0/gnome-panel/panel-toplevel.c 2009-10-29 09:57:25.287500667 -0400
+@@ -79,6 +79,7 @@ struct _PanelToplevelPrivate {
+ gboolean expand;
+ PanelOrientation orientation;
+ int size;
++ int padding;
+
+ /* relative to the monitor origin */
+ int x;
+@@ -213,6 +214,7 @@ enum {
+ PROP_0,
+ PROP_NAME,
+ PROP_EXPAND,
++ PROP_PADDING,
+ PROP_ORIENTATION,
+ PROP_SIZE,
+ PROP_X,
+@@ -3862,6 +3864,9 @@ panel_toplevel_set_property (GObject
+ case PROP_EXPAND:
+ panel_toplevel_set_expand (toplevel, g_value_get_boolean (value));
+ break;
++ case PROP_PADDING:
++ panel_toplevel_set_padding (toplevel, g_value_get_int (value));
++ break;
+ case PROP_ORIENTATION:
+ panel_toplevel_set_orientation (toplevel, g_value_get_enum (value));
+ break;
+@@ -3956,6 +3961,9 @@ panel_toplevel_get_property (GObject
+ case PROP_EXPAND:
+ g_value_set_boolean (value, toplevel->priv->expand);
+ break;
++ case PROP_PADDING:
++ g_value_set_int (value, toplevel->priv->padding);
++ break;
+ case PROP_ORIENTATION:
+ g_value_set_enum (value, toplevel->priv->orientation);
+ break;
+@@ -4118,6 +4126,18 @@ panel_toplevel_class_init (PanelToplevel
+
+ g_object_class_install_property (
+ gobject_class,
++ PROP_PADDING,
++ g_param_spec_int (
++ "padding",
++ "Padding",
++ "Padding that is inserted between objects",
++ 0,
++ G_MAXINT,
++ 0,
++ G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
++
++ g_object_class_install_property (
++ gobject_class,
+ PROP_ORIENTATION,
+ g_param_spec_enum (
+ "orientation",
+@@ -4698,6 +4718,30 @@ panel_toplevel_get_expand (PanelToplevel
+ return toplevel->priv->expand;
+ }
+
++void
++panel_toplevel_set_padding (PanelToplevel *toplevel,
++ int padding)
++{
++ g_return_if_fail (PANEL_IS_TOPLEVEL (toplevel));
++
++ if (toplevel->priv->padding == padding)
++ return;
++
++ toplevel->priv->padding = padding;
++
++ gtk_widget_queue_resize (GTK_WIDGET (toplevel));
++
++ g_object_notify (G_OBJECT (toplevel), "padding");
++}
++
++int
++panel_toplevel_get_padding (PanelToplevel *toplevel)
++{
++ g_return_val_if_fail (PANEL_IS_TOPLEVEL (toplevel), 0);
++
++ return toplevel->priv->padding;
++}
++
+ gboolean
+ panel_toplevel_get_is_floating (PanelToplevel *toplevel)
+ {
+diff -up gnome-panel-2.28.0/gnome-panel/panel-toplevel.h.panel-padding
gnome-panel-2.28.0/gnome-panel/panel-toplevel.h
+--- gnome-panel-2.28.0/gnome-panel/panel-toplevel.h.panel-padding 2009-08-19
11:28:09.000000000 -0400
++++ gnome-panel-2.28.0/gnome-panel/panel-toplevel.h 2009-10-29 09:57:25.288484940 -0400
+@@ -83,6 +83,9 @@ G_CONST_RETURN char *panel_toplevel_get_
+ void panel_toplevel_set_expand (PanelToplevel
*toplevel,
+ gboolean expand);
+ gboolean panel_toplevel_get_expand (PanelToplevel
*toplevel);
++void panel_toplevel_set_padding (PanelToplevel
*toplevel,
++ int
padding);
++int panel_toplevel_get_padding (PanelToplevel
*toplevel);
+ void panel_toplevel_set_orientation (PanelToplevel
*toplevel,
+ PanelOrientation orientation);
+ PanelOrientation panel_toplevel_get_orientation (PanelToplevel
*toplevel);
+diff -up gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in.panel-padding
gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in
+--- gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in.panel-padding 2009-07-01
09:06:23.000000000 -0400
++++ gnome-panel-2.28.0/gnome-panel/panel-toplevel.schemas.in 2009-10-29
09:57:25.288484940 -0400
+@@ -103,6 +103,19 @@
+ </schema>
+
+ <schema>
++ <key>/schemas/apps/panel/toplevels/padding</key>
++ <owner>panel</owner>
++ <type>int</type>
++ <default>0</default>
++ <locale name="C">
++ <short>Padding</short>
++ <long>
++ Padding that will be inserted between objects on this panel.
++ </long>
++ </locale>
++ </schema>
++
++ <schema>
+ <key>/schemas/apps/panel/toplevels/x</key>
+ <owner>panel</owner>
+ <type>int</type>
+diff -up gnome-panel-2.28.0/gnome-panel/panel-widget.c.panel-padding
gnome-panel-2.28.0/gnome-panel/panel-widget.c
+--- gnome-panel-2.28.0/gnome-panel/panel-widget.c.panel-padding 2009-08-11
07:32:38.000000000 -0400
++++ gnome-panel-2.28.0/gnome-panel/panel-widget.c 2009-10-29 10:10:43.531226534 -0400
+@@ -710,9 +710,12 @@ panel_widget_switch_applet_right (PanelW
+ {
+ AppletData *ad;
+ AppletData *nad = NULL;
+-
++ gint padding;
++
+ g_assert (list != NULL);
+
++ padding = panel_toplevel_get_padding (panel->toplevel);
++
+ ad = list->data;
+ if (ad->constrained + ad->min_cells >= panel->size)
+ return;
+@@ -720,8 +723,8 @@ panel_widget_switch_applet_right (PanelW
+ if (list->next)
+ nad = list->next->data;
+
+- if (!nad || nad->constrained >= ad->constrained + ad->min_cells +
MOVE_INCREMENT) {
+- ad->pos = ad->constrained += MOVE_INCREMENT;
++ if (!nad || nad->constrained >= ad->constrained + ad->min_cells +
MOVE_INCREMENT + padding) {
++ ad->pos = ad->constrained += MOVE_INCREMENT + padding;
+ gtk_widget_queue_resize (GTK_WIDGET (panel));
+ emit_applet_moved (panel, ad);
+ return;
+@@ -786,6 +789,9 @@ panel_widget_switch_applet_left (PanelWi
+ {
+ AppletData *ad;
+ AppletData *pad = NULL;
++ gint padding;
++
++ padding = panel_toplevel_get_padding (panel->toplevel);
+
+ ad = list->data;
+ if (ad->constrained <= 0)
+@@ -794,8 +800,8 @@ panel_widget_switch_applet_left (PanelWi
+ if (list->prev)
+ pad = list->prev->data;
+
+- if (!pad || pad->constrained + pad->min_cells <= ad->constrained -
MOVE_INCREMENT) {
+- ad->pos = ad->constrained -= MOVE_INCREMENT;
++ if (!pad || pad->constrained + pad->min_cells <= ad->constrained -
MOVE_INCREMENT - padding) {
++ ad->pos = ad->constrained -= MOVE_INCREMENT + padding;
+ gtk_widget_queue_resize (GTK_WIDGET (panel));
+ emit_applet_moved (panel, ad);
+ return;
+@@ -874,15 +880,18 @@ panel_widget_get_right_switch_pos (Panel
+ {
+ AppletData *ad;
+ AppletData *nad = NULL;
++ gint padding;
+
+ g_assert (list != NULL);
+
++ padding = panel_toplevel_get_padding (panel->toplevel);
++
+ ad = list->data;
+ if (list->next)
+ nad = list->next->data;
+
+- if (!nad || nad->constrained >= ad->constrained + ad->min_cells +
MOVE_INCREMENT)
+- return ad->constrained + MOVE_INCREMENT;
++ if (!nad || nad->constrained >= ad->constrained + ad->min_cells +
MOVE_INCREMENT + padding)
++ return ad->constrained + MOVE_INCREMENT + padding;
+
+ if (nad->locked)
+ return panel_widget_get_right_jump_pos (panel,
+@@ -948,15 +957,18 @@ panel_widget_get_left_switch_pos (PanelW
+ {
+ AppletData *ad;
+ AppletData *pad = NULL;
++ gint padding;
+
+ g_assert (list != NULL);
+
++ padding = panel_toplevel_get_padding (panel->toplevel);
++
+ ad = list->data;
+ if (list->prev)
+ pad = list->prev->data;
+
+- if (!pad || pad->constrained + pad->min_cells <= ad->constrained -
MOVE_INCREMENT)
+- return ad->constrained - MOVE_INCREMENT;
++ if (!pad || pad->constrained + pad->min_cells <= ad->constrained -
MOVE_INCREMENT - padding)
++ return ad->constrained - MOVE_INCREMENT - padding;
+
+ if (pad->locked)
+ return panel_widget_get_left_jump_pos (panel,
+@@ -1195,12 +1207,15 @@ panel_widget_size_request(GtkWidget *wid
+ GList *list;
+ GList *ad_with_hints;
+ gboolean dont_fill;
++ gint padding;
+
+ g_return_if_fail(PANEL_IS_WIDGET(widget));
+ g_return_if_fail(requisition!=NULL);
+
+ panel = PANEL_WIDGET(widget);
+
++ padding = panel_toplevel_get_padding (panel->toplevel);
++
+ if(panel->orient == GTK_ORIENTATION_HORIZONTAL) {
+ requisition->width = 0;
+ requisition->height = panel->sz;
+@@ -1224,8 +1239,11 @@ panel_widget_size_request(GtkWidget *wid
+ ad_with_hints = g_list_prepend (ad_with_hints,
+ ad);
+
+- else if (panel->packed)
++ else if (panel->packed) {
++ if (list != panel->applet_list)
++ requisition->width += padding;
+ requisition->width += chreq.width;
++ }
+ } else {
+ if (requisition->width < chreq.width && !ad->size_constrained)
+ requisition->width = chreq.width;
+@@ -1234,8 +1252,11 @@ panel_widget_size_request(GtkWidget *wid
+ ad_with_hints = g_list_prepend (ad_with_hints,
+ ad);
+
+- else if (panel->packed)
++ else if (panel->packed) {
++ if (list != panel->applet_list)
++ requisition->height += padding;
+ requisition->height += chreq.height;
++ }
+ }
+ }
+
+@@ -1333,12 +1354,15 @@ panel_widget_size_allocate(GtkWidget *wi
+ int i;
+ int old_size;
+ gboolean ltr;
++ gint padding;
+
+ g_return_if_fail(PANEL_IS_WIDGET(widget));
+ g_return_if_fail(allocation!=NULL);
+
+ panel = PANEL_WIDGET(widget);
+
++ padding = panel_toplevel_get_padding (panel->toplevel);
++
+ old_size = panel->size;
+ ltr = gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR;
+
+@@ -1404,7 +1428,7 @@ panel_widget_size_allocate(GtkWidget *wi
+ }
+ ad->min_cells = ad->cells;
+ gtk_widget_size_allocate(ad->applet,&challoc);
+- i += ad->cells;
++ i += ad->cells + padding;
+ }
+
+ /* EEEEK, there might be not enough room and we don't handle
+@@ -1439,7 +1463,7 @@ panel_widget_size_allocate(GtkWidget *wi
+ if (ad->constrained < i)
+ ad->constrained = i;
+
+- i = ad->constrained + ad->cells;
++ i = ad->constrained + ad->cells + padding;
+ }
+
+ /* Now expand from the right */
+@@ -1464,7 +1488,7 @@ panel_widget_size_allocate(GtkWidget *wi
+ ad->cells = cells;
+ }
+
+- i = ad->constrained;
++ i = ad->constrained - padding;
+ }
+
+ /* EEEEK, there's not enough room, so shift applets even
diff --git a/panel-randr-crashes.patch b/panel-randr-crashes.patch
new file mode 100644
index 0000000..9e870c1
--- /dev/null
+++ b/panel-randr-crashes.patch
@@ -0,0 +1,82 @@
+From 66b8e290bd0b767183cba583917907940b5b425a Mon Sep 17 00:00:00 2001
+From: Vincent Untz <vuntz(a)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/redhat-panel-default-setup.entries b/redhat-panel-default-setup.entries
index df72a38..4864563 100644
--- a/redhat-panel-default-setup.entries
+++ b/redhat-panel-default-setup.entries
@@ -56,9 +56,6 @@
<string>systray</string>
</value>
<value>
- <string>show_desktop_button</string>
- </value>
- <value>
<string>window_list</string>
</value>
<value>
@@ -91,6 +88,13 @@
</value>
</entry>
<entry>
+ <key>toplevels/top_panel/padding</key>
+ <schema_key>/schemas/apps/panel/toplevels/padding</schema_key>
+ <value>
+ <int>8</int>
+ </value>
+ </entry>
+ <entry>
<key>toplevels/top_panel/orientation</key>
<schema_key>/schemas/apps/panel/toplevels/orientation</schema_key>
<value>
@@ -143,6 +147,13 @@
</value>
</entry>
<entry>
+ <key>toplevels/bottom_panel/padding</key>
+ <schema_key>/schemas/apps/panel/toplevels/padding</schema_key>
+ <value>
+ <int>8</int>
+ </value>
+ </entry>
+ <entry>
<key>toplevels/bottom_panel/orientation</key>
<schema_key>/schemas/apps/panel/toplevels/orientation</schema_key>
<value>
@@ -260,7 +271,7 @@
<key>objects/web_launcher/locked</key>
<schema_key>/schemas/apps/panel/objects/locked</schema_key>
<value>
- <bool>false</bool>
+ <bool>true</bool>
</value>
</entry>
<entry>
@@ -314,7 +325,7 @@
<key>objects/email_launcher/locked</key>
<schema_key>/schemas/apps/panel/objects/locked</schema_key>
<value>
- <bool>false</bool>
+ <bool>true</bool>
</value>
</entry>
<entry>
@@ -361,7 +372,7 @@
<key>applets/gnote/panel_right_stick</key>
<schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
<value>
- <bool>true</bool>
+ <bool>false</bool>
</value>
</entry>
<entry>
@@ -408,7 +419,7 @@
<key>applets/fast_user_switch_applet/position</key>
<schema_key>/schemas/apps/panel/objects/position</schema_key>
<value>
- <int>2</int>
+ <int>0</int>
</value>
</entry>
<entry>
@@ -540,6 +551,13 @@
<string>OAFIID:GNOME_SystemTrayApplet</string>
</value>
</entry>
+ <entry>
+ <key>applets/systray/prefs/padding</key>
+
<schema_key>/schemas/apps/notification_area_applet/prefs/padding</schema_key>
+ <value>
+ <int>2</int>
+ </value>
+ </entry>
<entry><key>applets/systray/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key>
</entry>
<entry><key>applets/systray/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
@@ -550,60 +568,6 @@
<entry><key>applets/systray/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
<entry><key>applets/systray/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
- <!-- Show Desktop Applet -->
-
- <entry>
- <key>applets/show_desktop_button/object_type</key>
- <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
- <value>
- <string>bonobo-applet</string>
- </value>
- </entry>
- <entry>
- <key>applets/show_desktop_button/toplevel_id</key>
- <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
- <value>
- <string>bottom_panel</string>
- </value>
- </entry>
- <entry>
- <key>applets/show_desktop_button/position</key>
- <schema_key>/schemas/apps/panel/objects/position</schema_key>
- <value>
- <int>0</int>
- </value>
- </entry>
- <entry>
- <key>applets/show_desktop_button/panel_right_stick</key>
- <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
- <value>
- <bool>false</bool>
- </value>
- </entry>
- <entry>
- <key>applets/show_desktop_button/locked</key>
- <schema_key>/schemas/apps/panel/objects/locked</schema_key>
- <value>
- <bool>true</bool>
- </value>
- </entry>
- <entry>
- <key>applets/show_desktop_button/bonobo_iid</key>
- <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
- <value>
- <string>OAFIID:GNOME_ShowDesktopApplet</string>
- </value>
- </entry>
-
-
<entry><key>applets/show_desktop_button/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key>
</entry>
-
<entry><key>applets/show_desktop_button/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-
<entry><key>applets/show_desktop_button/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-
<entry><key>applets/show_desktop_button/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-
<entry><key>applets/show_desktop_button/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-
<entry><key>applets/show_desktop_button/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-
<entry><key>applets/show_desktop_button/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
-
<entry><key>applets/show_desktop_button/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
-
<!-- Window List Applet -->
<entry>
@@ -704,7 +668,7 @@
</entry>
<entry>
<key>applets/workspace_switcher/prefs/num_rows</key>
- <schema_key>/schemas/apps/panel/objects/prefes/num_rows</schema_key>
+
<schema_key>/schemas/apps/workspace_switcher/prefs/num_rows</schema_key>
<value>
<int>1</int>
</value>
commit 969145b5437a6b1527b3bc9e77af58016cbd459e
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Sep 24 00:34:45 2009 +0000
2.28.0
diff --git a/.cvsignore b/.cvsignore
index 3f2f2a9..8e1e8a5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.27.92.tar.bz2
+gnome-panel-2.28.0.tar.bz2
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 930e53b..62e5cda 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,10 +21,10 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.27.92
+Version: 2.28.0
Release: 1%{?dist}
URL:
http://www.gnome.org
-Source0:
http://download.gnome.org/sources/gnome-panel/2.27/%{name}-%{version}.tar...
+Source0:
http://download.gnome.org/sources/gnome-panel/2.28/%{name}-%{version}.tar...
Source3: redhat-panel-default-setup.entries
Source4: gnome-compiler-flags.m4
@@ -354,6 +354,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Wed Sep 23 2009 Matthias Clasen <mclasen(a)redhat.com> 2.28.0-1
+- Update to 2.28.0
+
* Wed Sep 9 2009 Matthias Clasen <mclasen(a)redhat.com> 2.27.92-1
- Update to 2.27.92
diff --git a/sources b/sources
index e15dd0a..4d651a5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-835fb6cc641e08b15ba4a7d4d0bec58b gnome-panel-2.27.92.tar.bz2
+9f0ea283d44bbcce67dc2e8a02fe9fad gnome-panel-2.28.0.tar.bz2
commit 29a9a8651365b836d3d3f7e402eb77d6a6674f72
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Sep 9 04:52:06 2009 +0000
2.27.92
diff --git a/.cvsignore b/.cvsignore
index 381fc0e..3f2f2a9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.27.91.tar.bz2
+gnome-panel-2.27.92.tar.bz2
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 545c8d7..930e53b 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -9,7 +9,7 @@
%define orbit_version 2.4.0
%define libwnck_version 2.19.5
%define gconf_version 2.14
-%define gnome_menus_version 2.11.1
+%define gnome_menus_version 2.27.92
%define evolution_data_server_version 1.9.1
%define cairo_version 1.0.0
%define dbus_version 0.60
@@ -21,7 +21,7 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.27.91
+Version: 2.27.92
Release: 1%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.27/%{name}-%{version}.tar...
@@ -354,6 +354,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Wed Sep 9 2009 Matthias Clasen <mclasen(a)redhat.com> 2.27.92-1
+- Update to 2.27.92
+
* Tue Aug 25 2009 Matthias Clasen <mclasen(a)redhat.com> 2.27.91-1
- Update to 2.27.91
diff --git a/sources b/sources
index 9b8d554..e15dd0a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9453fed0d5fec7b9904b408e3f2826f7 gnome-panel-2.27.91.tar.bz2
+835fb6cc641e08b15ba4a7d4d0bec58b gnome-panel-2.27.92.tar.bz2
commit d2624325238e13da3f09ef0de3742ca5d698e7a3
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Aug 25 22:57:27 2009 +0000
fix patch
diff --git a/gnome-panel-about.patch b/gnome-panel-about.patch
index a0b1aa5..3b31508 100644
--- a/gnome-panel-about.patch
+++ b/gnome-panel-about.patch
@@ -7,7 +7,7 @@ diff -up gnome-panel-2.27.91/gnome-panel/panel-menu-items.c.about
gnome-panel-2.
panel_menu_items_append_from_desktop (menu, "gnome-yelp.desktop", NULL,
FALSE);
- panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL,
FALSE);
+ if (panel_has_desktop_file ("about-this-computer.desktop"))
-+ panel_menu_items_append_from_desktop (menu, "about-this-computer.desktop",
NULL);
++ 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);
commit c515c41293247c970a2419b927ba88f73ec591de
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Aug 25 21:10:13 2009 +0000
fix BRs
diff --git a/gnome-panel.spec b/gnome-panel.spec
index da30c6f..545c8d7 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -3,7 +3,6 @@
%define gnome_desktop_version 2.11.1
%define glib2_version 2.15.5
%define gtk2_version 2.11.3
-%define libglade2_version 2.5.0
%define libgnome_version 2.13.0
%define libgnomeui_version 2.5.4
%define libbonoboui_version 2.3.0
@@ -16,7 +15,7 @@
%define dbus_version 0.60
%define dbus_glib_version 0.60
%define gnome_doc_utils_version 0.3.2
-%define libgweather_version 2.22.1
+%define libgweather_version 2.27.90
%define use_evolution_data_server 1
@@ -62,7 +61,6 @@ BuildRequires: libX11-devel
BuildRequires: libXt-devel
BuildRequires: gnome-desktop-devel >= %{gnome_desktop_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
-BuildRequires: libglade2-devel >= %{libglade2_version}
BuildRequires: libgnome-devel >= %{libgnome_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
commit 5eead244806ade42d809251645ddd0ca5c7739d7
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Aug 25 18:14:42 2009 +0000
2.27.91
diff --git a/.cvsignore b/.cvsignore
index 07511f8..381fc0e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.27.4.tar.bz2
+gnome-panel-2.27.91.tar.bz2
diff --git a/gnome-panel-about.patch b/gnome-panel-about.patch
index 29d17b4..a0b1aa5 100644
--- a/gnome-panel-about.patch
+++ b/gnome-panel-about.patch
@@ -1,11 +1,11 @@
-diff -up gnome-panel-2.27.4/gnome-panel/panel-menu-items.c.about
gnome-panel-2.27.4/gnome-panel/panel-menu-items.c
---- gnome-panel-2.27.4/gnome-panel/panel-menu-items.c.about 2009-07-31 18:29:02.635601324
-0400
-+++ gnome-panel-2.27.4/gnome-panel/panel-menu-items.c 2009-07-31 18:30:18.129605780
-0400
-@@ -1159,7 +1159,8 @@ panel_desktop_menu_item_append_menu (Gtk
+diff -up gnome-panel-2.27.91/gnome-panel/panel-menu-items.c.about
gnome-panel-2.27.91/gnome-panel/panel-menu-items.c
+--- gnome-panel-2.27.91/gnome-panel/panel-menu-items.c.about 2009-08-25
13:32:12.101272238 -0400
++++ gnome-panel-2.27.91/gnome-panel/panel-menu-items.c 2009-08-25 14:08:21.444015913
-0400
+@@ -1170,7 +1170,8 @@ panel_desktop_menu_item_append_menu (Gtk
add_menu_separator (menu);
- panel_menu_items_append_from_desktop (menu, "gnome-yelp.desktop", NULL);
-- panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL);
+ panel_menu_items_append_from_desktop (menu, "gnome-yelp.desktop", NULL,
FALSE);
+- panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL,
FALSE);
+ if (panel_has_desktop_file ("about-this-computer.desktop"))
+ panel_menu_items_append_from_desktop (menu, "about-this-computer.desktop",
NULL);
diff --git a/gnome-panel-search.patch b/gnome-panel-search.patch
new file mode 100644
index 0000000..277ba9f
--- /dev/null
+++ b/gnome-panel-search.patch
@@ -0,0 +1,104 @@
+diff -up gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.c.search
gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.c
+--- gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.c.search 2009-04-19
13:45:09.000000000 -0400
++++ gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.c 2009-08-25
11:33:36.666288948 -0400
+@@ -29,6 +29,8 @@
+ #include <gdk/gdk.h>
+ #include <gtk/gtk.h>
+
++#include <libgnome/gnome-desktop-item.h>
++
+ #include "panel-error.h"
+ #include "panel-glib.h"
+
+@@ -201,6 +203,23 @@ panel_launch_desktop_file (const char *
+ }
+
+ gboolean
++panel_has_desktop_file (const char *desktop_file)
++{
++ GnomeDesktopItem *ditem;
++
++ if (g_path_is_absolute (desktop_file))
++ ditem = gnome_desktop_item_new_from_file (desktop_file, 0, NULL);
++ else
++ ditem = gnome_desktop_item_new_from_basename (desktop_file, 0, NULL);
++ if (ditem != NULL) {
++ gnome_desktop_item_unref (ditem);
++ return TRUE;
++ }
++
++ return FALSE;
++}
++
++gboolean
+ panel_launch_desktop_file_with_fallback (const char *desktop_file,
+ const char *fallback_exec,
+ GdkScreen *screen,
+diff -up gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.h.search
gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.h
+--- gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.h.search 2009-04-19
13:45:09.000000000 -0400
++++ gnome-panel-2.27.91/gnome-panel/libpanel-util/panel-launch.h 2009-08-25
11:33:36.667276923 -0400
+@@ -47,6 +47,8 @@ gboolean panel_launch_key_file (GKeyFile
+ GdkScreen *screen,
+ GError **error);
+
++gboolean panel_has_desktop_file (const char *desktop_file);
++
+ gboolean panel_launch_desktop_file (const char *desktop_file,
+ GdkScreen *screen,
+ GError **error);
+diff -up gnome-panel-2.27.91/gnome-panel/panel-action-button.c.search
gnome-panel-2.27.91/gnome-panel/panel-action-button.c
+--- gnome-panel-2.27.91/gnome-panel/panel-action-button.c.search 2009-04-19
13:45:09.000000000 -0400
++++ gnome-panel-2.27.91/gnome-panel/panel-action-button.c 2009-08-25 11:33:36.671290074
-0400
+@@ -219,9 +219,19 @@ panel_action_search (GtkWidget *widget)
+ GdkScreen *screen;
+
+ screen = gtk_widget_get_screen (widget);
+- panel_launch_desktop_file_with_fallback ("gnome-search-tool.desktop",
+- "gnome-search-tool",
+- screen, NULL);
++ if (panel_has_desktop_file ("gnome-beagle-search.desktop")) {
++ panel_launch_desktop_file ("gnome-beagle-search.desktop",
++ screen,
++ NULL);
++ } else if (panel_has_desktop_file ("fedora-tracker-search-tool.desktop")) {
++ panel_launch_desktop_file ("fedora-tracker-search-tool.desktop",
++ screen,
++ NULL);
++ } else {
++ panel_launch_desktop_file ("gnome-search-tool.desktop",
++ screen,
++ NULL);
++ }
+ }
+
+ /* Force Quit
+diff -up gnome-panel-2.27.91/gnome-panel/panel-menu-items.c.search
gnome-panel-2.27.91/gnome-panel/panel-menu-items.c
+--- gnome-panel-2.27.91/gnome-panel/panel-menu-items.c.search 2009-08-25
11:33:36.643267021 -0400
++++ gnome-panel-2.27.91/gnome-panel/panel-menu-items.c 2009-08-25 11:42:41.517027329
-0400
+@@ -1062,10 +1062,22 @@ panel_place_menu_item_create_menu (Panel
+
+ add_menu_separator (places_menu);
+
+- panel_menu_items_append_from_desktop (places_menu,
+- "gnome-search-tool.desktop",
+- NULL,
+- FALSE);
++ if (panel_has_desktop_file ("gnome-beagle-search.desktop")) {
++ panel_menu_items_append_from_desktop (places_menu,
++ "gnome-beagle-search.desktop",
++ NULL,
++ FALSE);
++ } else if (panel_has_desktop_file ("fedora-tracker-search-tool.desktop")) {
++ panel_menu_items_append_from_desktop (places_menu,
++ "fedora-tracker-search-tool.desktop",
++ NULL,
++ FALSE);
++ } else {
++ panel_menu_items_append_from_desktop (places_menu,
++ "gnome-search-tool.desktop",
++ NULL,
++ FALSE);
++ }
+
+ panel_recent_append_documents_menu (places_menu,
+ place_item->priv->recent_manager);
diff --git a/gnome-panel-vendor.patch b/gnome-panel-vendor.patch
new file mode 100644
index 0000000..e52a18a
--- /dev/null
+++ b/gnome-panel-vendor.patch
@@ -0,0 +1,30 @@
+diff -up gnome-panel-2.27.91/gnome-panel/panel-menu-items.c.vendor
gnome-panel-2.27.91/gnome-panel/panel-menu-items.c
+--- gnome-panel-2.27.91/gnome-panel/panel-menu-items.c.vendor 2009-08-19
15:59:57.000000000 -0400
++++ gnome-panel-2.27.91/gnome-panel/panel-menu-items.c 2009-08-25 11:32:39.980266025
-0400
+@@ -1038,7 +1038,7 @@ panel_place_menu_item_create_menu (Panel
+ COMPUTER_NAME_KEY,
+ NULL);
+ panel_menu_items_append_from_desktop (places_menu,
+- "nautilus-computer.desktop",
++ "gnome-nautilus-computer.desktop",
+ gconf_name,
+ TRUE);
+ if (gconf_name)
+@@ -1048,7 +1048,7 @@ panel_place_menu_item_create_menu (Panel
+ add_menu_separator (places_menu);
+
+ panel_menu_items_append_from_desktop (places_menu,
+- "network-scheme.desktop",
++ "gnome-network-scheme.desktop",
+ NULL,
+ TRUE);
+ panel_place_menu_item_append_remote_gio (place_item, places_menu);
+@@ -1157,7 +1157,7 @@ panel_desktop_menu_item_append_menu (Gtk
+ if (add_separator)
+ add_menu_separator (menu);
+
+- panel_menu_items_append_from_desktop (menu, "yelp.desktop", NULL, FALSE);
++ panel_menu_items_append_from_desktop (menu, "gnome-yelp.desktop", NULL,
FALSE);
+ panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL,
FALSE);
+
+ if (parent->priv->append_lock_logout)
diff --git a/gnome-panel.spec b/gnome-panel.spec
index c9aabcb..da30c6f 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,8 +22,8 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.27.4
-Release: 9%{?dist}
+Version: 2.27.91
+Release: 1%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.27/%{name}-%{version}.tar...
@@ -89,9 +89,9 @@ BuildRequires: intltool
BuildRequires: gettext-devel
BuildRequires: libtool
-Patch0: gnome-panel-2.23.4-vendor.patch
+Patch0: gnome-panel-vendor.patch
Patch1: gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch
-Patch2: gnome-panel-2.25.3-search.patch
+Patch2: gnome-panel-search.patch
Patch3: gnome-panel-about.patch
# the next three patches belong together
@@ -113,17 +113,6 @@ Patch35: clock-wakeups.patch
#
http://bugzilla.gnome.org/show_bug.cgi?id=579092
Patch38: clock-network.patch
-#
https://bugzilla.redhat.com/show_bug.cgi?id=498366
-Patch42: polkit1.patch
-
-#
http://bugzilla.gnome.org/show_bug.cgi?id=322932
-Patch45: panel-icons.patch
-
-#
http://bugzilla.gnome.org/show_bug.cgi?id=589632
-Patch46:gnome-panel-2.27.4-fix-monitor.patch
-
-Patch47: recent-icon.patch
-
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -160,7 +149,7 @@ Panel Applets using the libpanel-applet library.
%patch0 -p1 -b .vendor
%patch1 -p1 -b .speak-to-us-ye-old-wise-fish
-%patch2 -p0 -b .search
+%patch2 -p1 -b .search
%patch3 -p1 -b .about
%patch8 -p1 -b .launcher-desktop-files
%patch9 -p1 -b .desktop-file-monitoring
@@ -169,10 +158,6 @@ Panel Applets using the libpanel-applet library.
%patch24 -p1 -b .allow-spurious-view-done-signals
%patch35 -p1 -b .clock-wakeups
%patch38 -p1 -b .clock-network
-%patch42 -p1 -b .polkit1
-%patch45 -p1 -b .panel-icons
-%patch46 -p1 -b .fix-monitor
-%patch47 -p1 -b .recent-icon
. %{SOURCE6}
@@ -371,6 +356,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Tue Aug 25 2009 Matthias Clasen <mclasen(a)redhat.com> 2.27.91-1
+- Update to 2.27.91
+
* Sat Aug 22 2009 Matthias Clasen <mclasen(a)redhat.com> 2.27.4-9
- Actually apply the 'clear recent' patch
diff --git a/sources b/sources
index 84a7a2e..9b8d554 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8878c295b927f9a42273ff414a8bfdd8 gnome-panel-2.27.4.tar.bz2
+9453fed0d5fec7b9904b408e3f2826f7 gnome-panel-2.27.91.tar.bz2
commit d44862ed68bdfd3ab350e8e922c1760c37d78459
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sat Aug 22 05:08:13 2009 +0000
apply clear-recent patch
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 79a3338..c9aabcb 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -23,7 +23,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.27.4
-Release: 8%{?dist}
+Release: 9%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.27/%{name}-%{version}.tar...
@@ -172,6 +172,7 @@ Panel Applets using the libpanel-applet library.
%patch42 -p1 -b .polkit1
%patch45 -p1 -b .panel-icons
%patch46 -p1 -b .fix-monitor
+%patch47 -p1 -b .recent-icon
. %{SOURCE6}
@@ -370,6 +371,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Sat Aug 22 2009 Matthias Clasen <mclasen(a)redhat.com> 2.27.4-9
+- Actually apply the 'clear recent' patch
+
* Thu Aug 13 2009 Matthias Clasen <mclasen(a)redhat.com> 2.27.4-8
- Stricter clock-applet PolicyKit policy
commit 3e0d02c28c82b28fcfd8606a294ecda83d7a5685
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Aug 13 18:26:38 2009 +0000
Stricter clock applet policy
diff --git a/gnome-panel.spec b/gnome-panel.spec
index fc505c5..79a3338 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -23,7 +23,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.27.4
-Release: 7%{?dist}
+Release: 8%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.27/%{name}-%{version}.tar...
@@ -370,6 +370,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Thu Aug 13 2009 Matthias Clasen <mclasen(a)redhat.com> 2.27.4-8
+- Stricter clock-applet PolicyKit policy
+
* Wed Aug 5 2009 Matthias Clasen <mclasen(a)redhat.com> 2.27.4-7
- Make 'Clear Recent Documents' follow the menu-images setting
diff --git a/polkit1.patch b/polkit1.patch
index b34aefc..ee90edc 100644
--- a/polkit1.patch
+++ b/polkit1.patch
@@ -1,7 +1,7 @@
-diff -up gnome-panel-2.26.1/applets/clock/clock.c.polkit1
gnome-panel-2.26.1/applets/clock/clock.c
---- gnome-panel-2.26.1/applets/clock/clock.c.polkit1 2009-04-14 16:14:55.000000000 -0400
-+++ gnome-panel-2.26.1/applets/clock/clock.c 2009-05-13 17:53:57.490936276 -0400
-@@ -1707,7 +1707,7 @@ update_set_time_button (ClockData *cd)
+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;
@@ -10,7 +10,7 @@ diff -up gnome-panel-2.26.1/applets/clock/clock.c.polkit1
gnome-panel-2.26.1/app
if (cd->time_settings_button)
gtk_widget_set_sensitive (cd->time_settings_button, can_set);
-@@ -1770,7 +1770,7 @@ set_time (GtkWidget *widget, ClockData *
+@@ -1680,7 +1680,7 @@ set_time (GtkWidget *widget, ClockData *
tim = mktime (&t);
@@ -19,9 +19,9 @@ diff -up gnome-panel-2.26.1/applets/clock/clock.c.polkit1
gnome-panel-2.26.1/app
}
static void
-diff -up gnome-panel-2.26.1/applets/clock/clock-location.c.polkit1
gnome-panel-2.26.1/applets/clock/clock-location.c
---- gnome-panel-2.26.1/applets/clock/clock-location.c.polkit1 2009-05-13
17:53:57.477962768 -0400
-+++ gnome-panel-2.26.1/applets/clock/clock-location.c 2009-05-13 17:53:57.491936414
-0400
+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);
@@ -32,9 +32,9 @@ diff -up gnome-panel-2.26.1/applets/clock/clock-location.c.polkit1
gnome-panel-2
mcdata,
free_make_current_data);
g_free (filename);
-diff -up gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.c.polkit1
gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.c
---- gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.c.polkit1 2009-04-14
16:14:55.000000000 -0400
-+++ gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.c 2009-05-13
18:00:51.818938425 -0400
+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>
@@ -233,9 +233,9 @@ diff -up
gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.c.polkit1
+ return TRUE;
}
-diff -up gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.h.polkit1
gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.h
---- gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.h.polkit1 2009-04-14
16:14:55.000000000 -0400
-+++ gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.h 2009-05-13
17:53:57.493994728 -0400
+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);
@@ -251,9 +251,9 @@ diff -up
gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.h.polkit1
gboolean gnome_clock_applet_mechanism_adjust_time (GnomeClockAppletMechanism
*mechanism,
gint64
seconds_to_add,
-diff -up gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.xml.polkit1
gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.xml
---- gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.xml.polkit1 2009-04-14
16:14:55.000000000 -0400
-+++ gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.xml 2009-05-13
17:53:57.494962879 -0400
+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"/>
@@ -273,10 +273,10 @@ diff -up
gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.xml.polki
<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.26.1/applets/clock/Makefile.am.polkit1
gnome-panel-2.26.1/applets/clock/Makefile.am
---- gnome-panel-2.26.1/applets/clock/Makefile.am.polkit1 2009-04-14 16:14:55.000000000
-0400
-+++ gnome-panel-2.26.1/applets/clock/Makefile.am 2009-05-13 17:53:57.495947232 -0400
-@@ -7,7 +7,7 @@ INCLUDES = \
+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) \
@@ -285,7 +285,7 @@ diff -up gnome-panel-2.26.1/applets/clock/Makefile.am.polkit1
gnome-panel-2.26.1
$(LIBPANEL_APPLET_CFLAGS) \
-DDATADIR=\""$(datadir)"\" \
-DGLADEDIR=\""$(datadir)/gnome-panel/glade"\" \
-@@ -66,7 +66,7 @@ CLOCK_LDADD = \
+@@ -67,7 +67,7 @@ CLOCK_LDADD = \
../../libpanel-applet/libpanel-applet-2.la \
$(CLOCK_LIBS) \
$(LIBPANEL_APPLET_LIBS) \
@@ -294,7 +294,7 @@ diff -up gnome-panel-2.26.1/applets/clock/Makefile.am.polkit1
gnome-panel-2.26.1
-lgweather
BUILT_SOURCES = \
-@@ -128,11 +128,11 @@ endif
+@@ -132,11 +132,11 @@ endif
gnome_clock_applet_mechanism_INCLUDES = \
$(CLOCK_MECHANISM_CFLAGS) \
@@ -308,7 +308,7 @@ diff -up gnome-panel-2.26.1/applets/clock/Makefile.am.polkit1
gnome-panel-2.26.1
if CLOCK_INPROCESS
APPLET_TYPE = shlib
-@@ -201,7 +201,7 @@ endif
+@@ -206,7 +206,7 @@ endif
dbus_servicesdir = $(datadir)/dbus-1/system-services
dbus_confdir = $(sysconfdir)/dbus-1/system.d
@@ -317,15 +317,15 @@ diff -up gnome-panel-2.26.1/applets/clock/Makefile.am.polkit1
gnome-panel-2.26.1
dbus_services_in_files = org.gnome.ClockApplet.Mechanism.service.in
polkit_in_files = org.gnome.clockapplet.mechanism.policy.in
-diff -up
gnome-panel-2.26.1/applets/clock/org.gnome.clockapplet.mechanism.policy.in.polkit1
gnome-panel-2.26.1/applets/clock/org.gnome.clockapplet.mechanism.policy.in
----
gnome-panel-2.26.1/applets/clock/org.gnome.clockapplet.mechanism.policy.in.polkit1 2009-04-14
16:14:55.000000000 -0400
-+++ gnome-panel-2.26.1/applets/clock/org.gnome.clockapplet.mechanism.policy.in 2009-05-13
17:53:57.496936685 -0400
+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_self_keep</allow_active>
++ <allow_active>auth_admin_keep</allow_active>
</defaults>
</action>
@@ -334,7 +334,7 @@ diff -up
gnome-panel-2.26.1/applets/clock/org.gnome.clockapplet.mechanism.policy
<defaults>
<allow_inactive>no</allow_inactive>
- <allow_active>auth_self_keep_always</allow_active>
-+ <allow_active>auth_self_keep</allow_active>
++ <allow_active>auth_admin_keep</allow_active>
</defaults>
</action>
@@ -343,13 +343,13 @@ diff -up
gnome-panel-2.26.1/applets/clock/org.gnome.clockapplet.mechanism.policy
<defaults>
<allow_inactive>no</allow_inactive>
- <allow_active>auth_self_keep_always</allow_active>
-+ <allow_active>auth_self_keep</allow_active>
++ <allow_active>auth_admin_keep</allow_active>
</defaults>
</action>
-diff -up gnome-panel-2.26.1/applets/clock/set-timezone.c.polkit1
gnome-panel-2.26.1/applets/clock/set-timezone.c
---- gnome-panel-2.26.1/applets/clock/set-timezone.c.polkit1 2009-04-14 16:14:55.000000000
-0400
-+++ gnome-panel-2.26.1/applets/clock/set-timezone.c 2009-05-13 17:53:57.497965108 -0400
+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>
@@ -719,9 +719,9 @@ diff -up gnome-panel-2.26.1/applets/clock/set-timezone.c.polkit1
gnome-panel-2.2
data->callback = callback;
data->data = d;
data->notify = notify;
-diff -up gnome-panel-2.26.1/applets/clock/set-timezone.h.polkit1
gnome-panel-2.26.1/applets/clock/set-timezone.h
---- gnome-panel-2.26.1/applets/clock/set-timezone.h.polkit1 2009-04-14 16:14:55.000000000
-0400
-+++ gnome-panel-2.26.1/applets/clock/set-timezone.h 2009-05-13 17:53:57.498936332 -0400
+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);
@@ -736,9 +736,9 @@ diff -up gnome-panel-2.26.1/applets/clock/set-timezone.h.polkit1
gnome-panel-2.2
GFunc callback,
gpointer data,
GDestroyNotify notify);
-diff -up gnome-panel-2.26.1/configure.in.polkit1 gnome-panel-2.26.1/configure.in
---- gnome-panel-2.26.1/configure.in.polkit1 2009-04-14 16:15:50.000000000 -0400
-+++ gnome-panel-2.26.1/configure.in 2009-05-13 17:53:57.498936332 -0400
+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)
commit 66eb1ea24b90ee18e9db9a7cf83f275c4b992fad
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Aug 6 00:24:40 2009 +0000
Make 'Clear Recent Documents' obey the menu-images setting
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 6f1445e..fc505c5 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -23,7 +23,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.27.4
-Release: 6%{?dist}
+Release: 7%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.27/%{name}-%{version}.tar...
@@ -122,6 +122,8 @@ Patch45: panel-icons.patch
#
http://bugzilla.gnome.org/show_bug.cgi?id=589632
Patch46:gnome-panel-2.27.4-fix-monitor.patch
+Patch47: recent-icon.patch
+
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -368,6 +370,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Wed Aug 5 2009 Matthias Clasen <mclasen(a)redhat.com> 2.27.4-7
+- Make 'Clear Recent Documents' follow the menu-images setting
+
* Sun Aug 2 2009 Matthias Clasen <mclasen(a)redhat.com> 2.27.4-6
- Save some space
diff --git a/recent-icon.patch b/recent-icon.patch
new file mode 100644
index 0000000..a30c376
--- /dev/null
+++ b/recent-icon.patch
@@ -0,0 +1,11 @@
+--- 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,
commit 2345cfc3e0b416ea68a345bb307021d019a6e002
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Aug 3 03:30:02 2009 +0000
Save some space
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 822ca75..6f1445e 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -23,7 +23,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.27.4
-Release: 5%{?dist}
+Release: 6%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.27/%{name}-%{version}.tar...
@@ -210,7 +210,14 @@ done
# libtool doesn't make this easy, so we do it the hard way
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test
"$export_dynamic" = yes && test -n
"$export_dynamic_flag_spec"; then/ func_append compile_command "
-Wl,-O1,--as-needed"\n func_append finalize_command "
-Wl,-O1,--as-needed"\n\0/' libtool
-make
+make %{?_smp_mflags}
+
+
+# truncate NEWS
+awk '/^========/ { seen+=1 }
+{ if (seen < 3) print }
+{ if (seen == 3) { print "For older news, see
http://git.gnome.org/cgit/gnome-panel/plain/NEWS"; exit } }' NEWS > tmp; mv
tmp NEWS
+
%install
rm -rf $RPM_BUILD_ROOT
@@ -230,17 +237,6 @@ sed -e
's|/schemas/apps/workspace_switcher_applet/prefs/|/schemas/apps/pager_app
/bin/rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
/bin/rm -f $RPM_BUILD_ROOT%{_libdir}/libpanel-applet-2.*a
-# clean up help mess
-#/bin/mv -f $RPM_BUILD_ROOT/usr/share/omf/gnome-panel/workspace-switcher*.omf \
-# $RPM_BUILD_ROOT/usr/share/omf/workspace-switcher
-#/bin/mv -f $RPM_BUILD_ROOT/usr/share/omf/gnome-panel/window-list*.omf \
-# $RPM_BUILD_ROOT/usr/share/omf/window-list
-#/bin/mv -f $RPM_BUILD_ROOT/usr/share/omf/gnome-panel/fish*.omf \
-# $RPM_BUILD_ROOT/usr/share/omf/fish
-#/bin/rmdir $RPM_BUILD_ROOT/usr/share/omf/gnome-panel
-
-sed -i -e "s/NoDisplay=True/NoDisplay=true/"
$RPM_BUILD_ROOT%{_datadir}/applications/gnome-panel.desktop
-
desktop-file-install --delete-original \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
$RPM_BUILD_ROOT%{_datadir}/applications/gnome-panel.desktop
@@ -372,6 +368,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Sun Aug 2 2009 Matthias Clasen <mclasen(a)redhat.com> 2.27.4-6
+- Save some space
+
* Fri Jul 31 2009 Matthias Clasen <mclasen(a)redhat.com> 2.27.4-5
- Reduce the excessive 'about'-ing in the System menu
commit fb84907423657282dc32102701176a7a42831cdd
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sat Aug 1 00:09:52 2009 +0000
Reduce excessive 'about'-ing in the System menu
diff --git a/gnome-panel-about.patch b/gnome-panel-about.patch
new file mode 100644
index 0000000..29d17b4
--- /dev/null
+++ b/gnome-panel-about.patch
@@ -0,0 +1,13 @@
+diff -up gnome-panel-2.27.4/gnome-panel/panel-menu-items.c.about
gnome-panel-2.27.4/gnome-panel/panel-menu-items.c
+--- gnome-panel-2.27.4/gnome-panel/panel-menu-items.c.about 2009-07-31 18:29:02.635601324
-0400
++++ gnome-panel-2.27.4/gnome-panel/panel-menu-items.c 2009-07-31 18:30:18.129605780
-0400
+@@ -1159,7 +1159,8 @@ panel_desktop_menu_item_append_menu (Gtk
+ add_menu_separator (menu);
+
+ panel_menu_items_append_from_desktop (menu, "gnome-yelp.desktop", NULL);
+- panel_menu_items_append_from_desktop (menu, "gnome-about.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.spec b/gnome-panel.spec
index a0897bf..822ca75 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -23,7 +23,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.27.4
-Release: 4%{?dist}
+Release: 5%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.27/%{name}-%{version}.tar...
@@ -91,12 +91,8 @@ BuildRequires: libtool
Patch0: gnome-panel-2.23.4-vendor.patch
Patch1: gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch
-Patch2: gnome-panel-2.17.91-about-fedora.patch
-Patch4: gnome-panel-2.25.3-search.patch
-# Drop this patch for now, it should have AT LEAST been moved
-# to an upstream bugzilla by now
-#Patch6: gnome-panel-2.16.0-compiz-support.patch
-Patch7: gnome-panel-2.21.92-about-this-computer.patch
+Patch2: gnome-panel-2.25.3-search.patch
+Patch3: gnome-panel-about.patch
# the next three patches belong together
#
http://bugzilla.gnome.org/show_bug.cgi?id=470966
@@ -162,10 +158,8 @@ Panel Applets using the libpanel-applet library.
%patch0 -p1 -b .vendor
%patch1 -p1 -b .speak-to-us-ye-old-wise-fish
-%patch2 -p1 -b .about-fedora
-%patch4 -p0 -b .search
-##%patch6 -p0 -b .compiz-support
-%patch7 -p1 -b .about-this-computer
+%patch2 -p0 -b .search
+%patch3 -p1 -b .about
%patch8 -p1 -b .launcher-desktop-files
%patch9 -p1 -b .desktop-file-monitoring
%patch10 -p1 -b .preferred-apps
@@ -378,6 +372,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Fri Jul 31 2009 Matthias Clasen <mclasen(a)redhat.com> 2.27.4-5
+- Reduce the excessive 'about'-ing in the System menu
+
* Mon Jul 27 2009 Matthias Clasen <mclasen(a)redhat.com> 2.27.4-4
- Drop unneeded direct deps
diff --git a/panel-icons.patch b/panel-icons.patch
index 13426a3..01c9f86 100644
--- a/panel-icons.patch
+++ b/panel-icons.patch
@@ -1,6 +1,6 @@
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-22 16:36:34.928388257 -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;
@@ -11,8 +11,8 @@ diff -up gnome-panel-2.27.4/gnome-panel/menu.c.panel-icons
gnome-panel-2.27.4/gn
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-22
16:36:34.768127904 -0400
-+++ gnome-panel-2.27.4/gnome-panel/panel-menu-items.c 2009-07-22 16:39:57.329131999
-0400
+--- 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 -*-
@@ -95,16 +95,12 @@ diff -up gnome-panel-2.27.4/gnome-panel/panel-menu-items.c.panel-icons
gnome-pan
}
-@@ -1158,11 +1170,11 @@ panel_desktop_menu_item_append_menu (Gtk
+@@ -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-about.desktop", NULL);
-- panel_menu_items_append_from_desktop (menu, "about-fedora.desktop", NULL);
+ panel_menu_items_append_from_desktop (menu, "gnome-yelp.desktop", NULL,
FALSE);
-+ panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL,
FALSE);
-+ panel_menu_items_append_from_desktop (menu, "about-fedora.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);
@@ -113,7 +109,7 @@ diff -up gnome-panel-2.27.4/gnome-panel/panel-menu-items.c.panel-icons
gnome-pan
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-22 16:36:34.933388684 -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;
commit 506b2d51e9456da6dc00df47ec3cd436e05259a7
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Jul 27 14:01:58 2009 +0000
drop unneeded direct deps
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 8e3bf00..a0897bf 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -23,7 +23,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.27.4
-Release: 3%{?dist}
+Release: 4%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.27/%{name}-%{version}.tar...
@@ -87,6 +87,7 @@ BuildRequires: librsvg2-devel
BuildRequires: NetworkManager-devel
BuildRequires: intltool
BuildRequires: gettext-devel
+BuildRequires: libtool
Patch0: gnome-panel-2.23.4-vendor.patch
Patch1: gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch
@@ -182,6 +183,7 @@ cp -f %{SOURCE3} gnome-panel/panel-default-setup.entries
cp -f %{SOURCE4} m4
cp -f %{SOURCE5} gnome-panel/panel-compatibility.schemas
+libtoolize -f
aclocal -I m4
automake
autoconf
@@ -201,6 +203,7 @@ done
%build
%configure \
+ --disable-shave \
--disable-gtk-doc \
--disable-scrollkeeper \
%if %{use_evolution_data_server}
@@ -209,6 +212,10 @@ done
--enable-eds=no
%endif
+# drop unneeded direct library deps with --as-needed
+# libtool doesn't make this easy, so we do it the hard way
+sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test
"$export_dynamic" = yes && test -n
"$export_dynamic_flag_spec"; then/ func_append compile_command "
-Wl,-O1,--as-needed"\n func_append finalize_command "
-Wl,-O1,--as-needed"\n\0/' libtool
+
make
%install
@@ -371,6 +378,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Mon Jul 27 2009 Matthias Clasen <mclasen(a)redhat.com> 2.27.4-4
+- Drop unneeded direct deps
+
* Fri Jul 24 2009 Ray Strode <rstrode(a)redhat.com> 2.27.4-3
- Make my panels show up again on login (gnome bug 589632)
commit b3ca3076378707984cb62d083bc5e8e981adcbdb
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Fri Jul 24 17:55:59 2009 +0000
- Make my panels show up again on login (gnome bug 589632)
diff --git a/gnome-panel-2.27.4-fix-monitor.patch b/gnome-panel-2.27.4-fix-monitor.patch
new file mode 100644
index 0000000..25c176d
--- /dev/null
+++ b/gnome-panel-2.27.4-fix-monitor.patch
@@ -0,0 +1,17 @@
+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.spec b/gnome-panel.spec
index a903c75..8e3bf00 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -23,7 +23,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.27.4
-Release: 2%{?dist}
+Release: 3%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.27/%{name}-%{version}.tar...
@@ -122,6 +122,9 @@ Patch42: polkit1.patch
#
http://bugzilla.gnome.org/show_bug.cgi?id=322932
Patch45: panel-icons.patch
+#
http://bugzilla.gnome.org/show_bug.cgi?id=589632
+Patch46:gnome-panel-2.27.4-fix-monitor.patch
+
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -171,6 +174,7 @@ Panel Applets using the libpanel-applet library.
%patch38 -p1 -b .clock-network
%patch42 -p1 -b .polkit1
%patch45 -p1 -b .panel-icons
+%patch46 -p1 -b .fix-monitor
. %{SOURCE6}
@@ -367,6 +371,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Fri Jul 24 2009 Ray Strode <rstrode(a)redhat.com> 2.27.4-3
+- Make my panels show up again on login (gnome bug 589632)
+
* Wed Jul 22 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.27.4-2
- Make category icons follow the menu-images setting
commit 628417d650279c6ba1cdfce949578186e91f1562
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Jul 22 21:32:55 2009 +0000
Make category icons obey the menu-images setting
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 8c56868..a903c75 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -23,7 +23,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.27.4
-Release: 1%{?dist}
+Release: 2%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.27/%{name}-%{version}.tar...
@@ -119,6 +119,9 @@ Patch38: clock-network.patch
#
https://bugzilla.redhat.com/show_bug.cgi?id=498366
Patch42: polkit1.patch
+#
http://bugzilla.gnome.org/show_bug.cgi?id=322932
+Patch45: panel-icons.patch
+
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -167,6 +170,7 @@ Panel Applets using the libpanel-applet library.
%patch35 -p1 -b .clock-wakeups
%patch38 -p1 -b .clock-network
%patch42 -p1 -b .polkit1
+%patch45 -p1 -b .panel-icons
. %{SOURCE6}
@@ -363,6 +367,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Wed Jul 22 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.27.4-2
+- Make category icons follow the menu-images setting
+
* Wed Jul 15 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.27.4-1
- Update to 2.27.4
diff --git a/panel-icons.patch b/panel-icons.patch
new file mode 100644
index 0000000..13426a3
--- /dev/null
+++ b/panel-icons.patch
@@ -0,0 +1,125 @@
+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-22 16:36:34.928388257 -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-22
16:36:34.768127904 -0400
++++ gnome-panel-2.27.4/gnome-panel/panel-menu-items.c 2009-07-22 16:39:57.329131999
-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,11 +1170,11 @@ 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-about.desktop", NULL);
+- panel_menu_items_append_from_desktop (menu, "about-fedora.desktop", NULL);
++ panel_menu_items_append_from_desktop (menu, "gnome-yelp.desktop", NULL,
FALSE);
++ panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL,
FALSE);
++ panel_menu_items_append_from_desktop (menu, "about-fedora.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-22 16:36:34.933388684 -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,
commit e37a39c60c91bbf2dbf9fce1e22f23684b2060c9
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Jul 15 20:32:07 2009 +0000
fix file lists
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 608ba82..8c56868 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -338,8 +338,6 @@ fi
%{_datadir}/gnome-2.0/ui/*.xml
%dir %{_datadir}/omf/clock
%dir %{_datadir}/omf/fish
-%dir %{_datadir}/omf/window-list
-%dir %{_datadir}/omf/workspace-switcher
%{_datadir}/man/man*/*
%{_datadir}/applications/gnome-panel.desktop
%{_bindir}/gnome-panel
commit d632a0a010f03e650b5a3349b4754189eb81c114
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Jul 15 18:57:08 2009 +0000
2.27.4
diff --git a/.cvsignore b/.cvsignore
index 8b5ec10..07511f8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.26.2.tar.bz2
+gnome-panel-2.27.4.tar.bz2
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 8a85a9a..608ba82 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,10 +22,10 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.26.2
-Release: 3%{?dist}
+Version: 2.27.4
+Release: 1%{?dist}
URL:
http://www.gnome.org
-Source0:
http://download.gnome.org/sources/gnome-panel/2.26/%{name}-%{version}.tar...
+Source0:
http://download.gnome.org/sources/gnome-panel/2.27/%{name}-%{version}.tar...
Source3: redhat-panel-default-setup.entries
Source4: gnome-compiler-flags.m4
@@ -365,6 +365,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Wed Jul 15 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.27.4-1
+- Update to 2.27.4
+
* Tue Jun 9 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.26.2-3
- Port to PolicyKit 1
diff --git a/sources b/sources
index 5d050f8..84a7a2e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-07974105fec9a6bab8be8b20b9b956e9 gnome-panel-2.26.2.tar.bz2
+8878c295b927f9a42273ff414a8bfdd8 gnome-panel-2.27.4.tar.bz2
commit fa93d278ee67c6fc17cbd07958c5cf1499f30cea
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Jun 10 04:20:34 2009 +0000
Port to PolicyKit 1
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 7afb60d..8a85a9a 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -23,7 +23,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.26.2
-Release: 2%{?dist}
+Release: 3%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.26/%{name}-%{version}.tar...
@@ -41,7 +41,6 @@ Requires: gnome-menus >= %{gnome_menus_version}
%if %{use_evolution_data_server}
Requires: evolution-data-server >= %{evolution_data_server_version}
%endif
-Requires: PolicyKit-authentication-agent
Requires: gnome-session-xsession
Requires(post): GConf2 >= %{gconf_version}
@@ -82,8 +81,7 @@ BuildRequires: evolution-data-server-devel >=
%{evolution_data_server_version}
BuildRequires: ORBit2-devel >= %{orbit_version}
BuildRequires: dbus-devel >= %{dbus_version}
%endif
-BuildRequires: PolicyKit-devel
-BuildRequires: PolicyKit-gnome-devel
+BuildRequires: polkit-devel >= 0.92
BuildRequires: libgweather-devel >= %{libgweather_version}
BuildRequires: librsvg2-devel
BuildRequires: NetworkManager-devel
@@ -118,6 +116,9 @@ Patch35: clock-wakeups.patch
#
http://bugzilla.gnome.org/show_bug.cgi?id=579092
Patch38: clock-network.patch
+#
https://bugzilla.redhat.com/show_bug.cgi?id=498366
+Patch42: polkit1.patch
+
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -165,8 +166,7 @@ Panel Applets using the libpanel-applet library.
%patch24 -p1 -b .allow-spurious-view-done-signals
%patch35 -p1 -b .clock-wakeups
%patch38 -p1 -b .clock-network
-
-libtoolize --force --copy
+%patch42 -p1 -b .polkit1
. %{SOURCE6}
@@ -174,6 +174,10 @@ cp -f %{SOURCE3} gnome-panel/panel-default-setup.entries
cp -f %{SOURCE4} m4
cp -f %{SOURCE5} gnome-panel/panel-compatibility.schemas
+aclocal -I m4
+automake
+autoconf
+
# strip unneeded translations from .mo files
# ideally intltool (ha!) would do that for us
#
http://bugzilla.gnome.org/show_bug.cgi?id=474987
@@ -188,11 +192,6 @@ done
%build
-# gpm-integration patches Makefile.am and configure.in
-aclocal -I m4
-automake --add-missing
-autoheader
-autoconf
%configure \
--disable-gtk-doc \
--disable-scrollkeeper \
@@ -352,7 +351,7 @@ fi
%{_sysconfdir}/dbus-1/system.d/org.gnome.ClockApplet.Mechanism.conf
%{_datadir}/dbus-1/system-services/org.gnome.ClockApplet.Mechanism.service
-%{_datadir}/PolicyKit/policy/org.gnome.clockapplet.mechanism.policy
+%{_datadir}/polkit-1/actions/org.gnome.clockapplet.mechanism.policy
%files libs
%{_libdir}/*.so.*
@@ -366,6 +365,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Tue Jun 9 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.26.2-3
+- Port to PolicyKit 1
+
* Tue Jun 2 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.26.2-2
- Replace tomboy by gnote in the default panel configuration
diff --git a/polkit1.patch b/polkit1.patch
new file mode 100644
index 0000000..b34aefc
--- /dev/null
+++ b/polkit1.patch
@@ -0,0 +1,789 @@
+diff -up gnome-panel-2.26.1/applets/clock/clock.c.polkit1
gnome-panel-2.26.1/applets/clock/clock.c
+--- gnome-panel-2.26.1/applets/clock/clock.c.polkit1 2009-04-14 16:14:55.000000000 -0400
++++ gnome-panel-2.26.1/applets/clock/clock.c 2009-05-13 17:53:57.490936276 -0400
+@@ -1707,7 +1707,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);
+@@ -1770,7 +1770,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.26.1/applets/clock/clock-location.c.polkit1
gnome-panel-2.26.1/applets/clock/clock-location.c
+--- gnome-panel-2.26.1/applets/clock/clock-location.c.polkit1 2009-05-13
17:53:57.477962768 -0400
++++ gnome-panel-2.26.1/applets/clock/clock-location.c 2009-05-13 17:53:57.491936414
-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.26.1/applets/clock/gnome-clock-applet-mechanism.c.polkit1
gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.c
+--- gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.c.polkit1 2009-04-14
16:14:55.000000000 -0400
++++ gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.c 2009-05-13
18:00:51.818938425 -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.26.1/applets/clock/gnome-clock-applet-mechanism.h.polkit1
gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.h
+--- gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.h.polkit1 2009-04-14
16:14:55.000000000 -0400
++++ gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.h 2009-05-13
17:53:57.493994728 -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.26.1/applets/clock/gnome-clock-applet-mechanism.xml.polkit1
gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.xml
+--- gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.xml.polkit1 2009-04-14
16:14:55.000000000 -0400
++++ gnome-panel-2.26.1/applets/clock/gnome-clock-applet-mechanism.xml 2009-05-13
17:53:57.494962879 -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.26.1/applets/clock/Makefile.am.polkit1
gnome-panel-2.26.1/applets/clock/Makefile.am
+--- gnome-panel-2.26.1/applets/clock/Makefile.am.polkit1 2009-04-14 16:14:55.000000000
-0400
++++ gnome-panel-2.26.1/applets/clock/Makefile.am 2009-05-13 17:53:57.495947232 -0400
+@@ -7,7 +7,7 @@ INCLUDES = \
+ $(GNOME_INCLUDEDIR) \
+ $(WARN_CFLAGS) \
+ $(CLOCK_CFLAGS) \
+- $(POLKIT_GNOME_CFLAGS) \
++ $(POLKIT_CFLAGS) \
+ $(LIBPANEL_APPLET_CFLAGS) \
+ -DDATADIR=\""$(datadir)"\" \
+ -DGLADEDIR=\""$(datadir)/gnome-panel/glade"\" \
+@@ -66,7 +66,7 @@ CLOCK_LDADD = \
+ ../../libpanel-applet/libpanel-applet-2.la \
+ $(CLOCK_LIBS) \
+ $(LIBPANEL_APPLET_LIBS) \
+- $(POLKIT_GNOME_LIBS) \
++ $(POLKIT_LIBS) \
+ -lgweather
+
+ BUILT_SOURCES = \
+@@ -128,11 +128,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
+@@ -201,7 +201,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.26.1/applets/clock/org.gnome.clockapplet.mechanism.policy.in.polkit1
gnome-panel-2.26.1/applets/clock/org.gnome.clockapplet.mechanism.policy.in
+---
gnome-panel-2.26.1/applets/clock/org.gnome.clockapplet.mechanism.policy.in.polkit1 2009-04-14
16:14:55.000000000 -0400
++++ gnome-panel-2.26.1/applets/clock/org.gnome.clockapplet.mechanism.policy.in 2009-05-13
17:53:57.496936685 -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_self_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_self_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_self_keep</allow_active>
+ </defaults>
+ </action>
+
+diff -up gnome-panel-2.26.1/applets/clock/set-timezone.c.polkit1
gnome-panel-2.26.1/applets/clock/set-timezone.c
+--- gnome-panel-2.26.1/applets/clock/set-timezone.c.polkit1 2009-04-14 16:14:55.000000000
-0400
++++ gnome-panel-2.26.1/applets/clock/set-timezone.c 2009-05-13 17:53:57.497965108 -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.26.1/applets/clock/set-timezone.h.polkit1
gnome-panel-2.26.1/applets/clock/set-timezone.h
+--- gnome-panel-2.26.1/applets/clock/set-timezone.h.polkit1 2009-04-14 16:14:55.000000000
-0400
++++ gnome-panel-2.26.1/applets/clock/set-timezone.h 2009-05-13 17:53:57.498936332 -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.26.1/configure.in.polkit1 gnome-panel-2.26.1/configure.in
+--- gnome-panel-2.26.1/configure.in.polkit1 2009-04-14 16:15:50.000000000 -0400
++++ gnome-panel-2.26.1/configure.in 2009-05-13 17:53:57.498936332 -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
commit 698de8267191d7c4941e746e00de52a3acdcba10
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Jun 2 04:41:12 2009 +0000
Replace tomboy by gnote in the default panel config
diff --git a/gnome-panel.spec b/gnome-panel.spec
index eecd918..7afb60d 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -23,7 +23,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.26.2
-Release: 1%{?dist}
+Release: 2%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.26/%{name}-%{version}.tar...
@@ -366,6 +366,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Tue Jun 2 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.26.2-2
+- Replace tomboy by gnote in the default panel configuration
+
* Wed May 20 2009 Ray Strode <rstrode(a)redhat.com> 2.26.2-1
- Update to 2.26.2
diff --git a/redhat-panel-default-setup.entries b/redhat-panel-default-setup.entries
index 3812d96..df72a38 100644
--- a/redhat-panel-default-setup.entries
+++ b/redhat-panel-default-setup.entries
@@ -47,7 +47,7 @@
<value>
<list type="string">
<value>
- <string>tomboy</string>
+ <string>gnote</string>
</value>
<value>
<string>clock</string>
@@ -334,59 +334,59 @@
<entry><key>objects/email_launcher/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
<entry><key>objects/email_launcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
- <!-- Tomboy -->
+ <!-- GNote -->
<entry>
- <key>applets/tomboy/object_type</key>
+ <key>applets/gnote/object_type</key>
<schema_key>/schemas/apps/panel/objects/object_type</schema_key>
<value>
<string>bonobo-applet</string>
</value>
</entry>
<entry>
- <key>applets/tomboy/toplevel_id</key>
+ <key>applets/gnote/toplevel_id</key>
<schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
<value>
<string>top_panel</string>
</value>
</entry>
<entry>
- <key>applets/tomboy/position</key>
+ <key>applets/gnote/position</key>
<schema_key>/schemas/apps/panel/objects/position</schema_key>
<value>
<int>3</int>
</value>
</entry>
<entry>
- <key>applets/tomboy/panel_right_stick</key>
+ <key>applets/gnote/panel_right_stick</key>
<schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
<value>
<bool>true</bool>
</value>
</entry>
<entry>
- <key>applets/tomboy/locked</key>
+ <key>applets/gnote/locked</key>
<schema_key>/schemas/apps/panel/objects/locked</schema_key>
<value>
<bool>true</bool>
</value>
</entry>
<entry>
- <key>applets/tomboy/bonobo_iid</key>
+ <key>applets/gnote/bonobo_iid</key>
<schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
<value>
- <string>OAFIID:TomboyApplet</string>
+ <string>OAFIID:GnoteApplet</string>
</value>
</entry>
-
<entry><key>applets/tomboy/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key>
</entry>
-
<entry><key>applets/tomboy/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-
<entry><key>applets/tomboy/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-
<entry><key>applets/tomboy/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-
<entry><key>applets/tomboy/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-
<entry><key>applets/tomboy/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-
<entry><key>applets/tomboy/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
-
<entry><key>applets/tomboy/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
+
<entry><key>applets/gnote/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key>
</entry>
+
<entry><key>applets/gnote/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
+
<entry><key>applets/gnote/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
+
<entry><key>applets/gnote/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
+
<entry><key>applets/gnote/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
+
<entry><key>applets/gnote/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
+
<entry><key>applets/gnote/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
+
<entry><key>applets/gnote/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
<!-- Fast User Switch Applet -->
commit d2ca64e47d4e35c0ef809580be0af6fe425fef1b
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Wed May 20 18:37:14 2009 +0000
Comment out some omf weird stuff
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 8289734..eecd918 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -223,13 +223,13 @@ sed -e
's|/schemas/apps/workspace_switcher_applet/prefs/|/schemas/apps/pager_app
/bin/rm -f $RPM_BUILD_ROOT%{_libdir}/libpanel-applet-2.*a
# clean up help mess
-/bin/mv -f $RPM_BUILD_ROOT/usr/share/omf/gnome-panel/workspace-switcher*.omf \
- $RPM_BUILD_ROOT/usr/share/omf/workspace-switcher
-/bin/mv -f $RPM_BUILD_ROOT/usr/share/omf/gnome-panel/window-list*.omf \
- $RPM_BUILD_ROOT/usr/share/omf/window-list
-/bin/mv -f $RPM_BUILD_ROOT/usr/share/omf/gnome-panel/fish*.omf \
- $RPM_BUILD_ROOT/usr/share/omf/fish
-/bin/rmdir $RPM_BUILD_ROOT/usr/share/omf/gnome-panel
+#/bin/mv -f $RPM_BUILD_ROOT/usr/share/omf/gnome-panel/workspace-switcher*.omf \
+# $RPM_BUILD_ROOT/usr/share/omf/workspace-switcher
+#/bin/mv -f $RPM_BUILD_ROOT/usr/share/omf/gnome-panel/window-list*.omf \
+# $RPM_BUILD_ROOT/usr/share/omf/window-list
+#/bin/mv -f $RPM_BUILD_ROOT/usr/share/omf/gnome-panel/fish*.omf \
+# $RPM_BUILD_ROOT/usr/share/omf/fish
+#/bin/rmdir $RPM_BUILD_ROOT/usr/share/omf/gnome-panel
sed -i -e "s/NoDisplay=True/NoDisplay=true/"
$RPM_BUILD_ROOT%{_datadir}/applications/gnome-panel.desktop
commit 835d4f88981b2bbd327664ad8a82b060869ae628
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Wed May 20 17:28:34 2009 +0000
- Update to 2.26.2
diff --git a/.cvsignore b/.cvsignore
index 7161741..8b5ec10 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.26.1.tar.bz2
+gnome-panel-2.26.2.tar.bz2
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 0febc79..8289734 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,8 +22,8 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.26.1
-Release: 3%{?dist}
+Version: 2.26.2
+Release: 1%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.26/%{name}-%{version}.tar...
@@ -366,6 +366,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Wed May 20 2009 Ray Strode <rstrode(a)redhat.com> 2.26.2-1
+- Update to 2.26.2
+
* Mon Apr 27 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.26.1-3
- Don't drop schemas translations from po files
diff --git a/sources b/sources
index ee1c36d..5d050f8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-af5587b38fc8b05aeeab3e834aa6e548 gnome-panel-2.26.1.tar.bz2
+07974105fec9a6bab8be8b20b9b956e9 gnome-panel-2.26.2.tar.bz2
commit 6703eef77079a03556ff8c1aa1293564c50ef6c5
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Apr 27 06:26:28 2009 +0000
don't drop schemas translations
diff --git a/clock-network.patch b/clock-network.patch
new file mode 100644
index 0000000..db88b82
--- /dev/null
+++ b/clock-network.patch
@@ -0,0 +1,22 @@
+diff -up gnome-panel-2.26.1/applets/clock/clock-location.c.network
gnome-panel-2.26.1/applets/clock/clock-location.c
+--- gnome-panel-2.26.1/applets/clock/clock-location.c.network 2009-04-15
17:28:26.760634154 -0400
++++ gnome-panel-2.26.1/applets/clock/clock-location.c 2009-04-15 17:43:41.869383882
-0400
+@@ -12,6 +12,9 @@
+ #include <time.h>
+ #include <unistd.h>
+ #include <math.h>
++#include <netinet/in.h>
++#include <arpa/nameser.h>
++#include <resolv.h>
+
+ #include <glib.h>
+ #include <gio/gio.h>
+@@ -695,6 +698,8 @@ state_notify (DBusPendingCall *pending,
+ DBUS_TYPE_UINT32, &result,
+ DBUS_TYPE_INVALID)) {
+ if (result == NM_STATE_CONNECTED) {
++ /* thank you, glibc */
++ res_init ();
+ update_weather_infos ();
+ }
+ }
diff --git a/gnome-panel.spec b/gnome-panel.spec
index dc2394a..0febc79 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -23,7 +23,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.26.1
-Release: 1%{?dist}
+Release: 3%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.26/%{name}-%{version}.tar...
@@ -115,6 +115,9 @@ Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
Patch35: clock-wakeups.patch
+#
http://bugzilla.gnome.org/show_bug.cgi?id=579092
+Patch38: clock-network.patch
+
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -161,6 +164,7 @@ Panel Applets using the libpanel-applet library.
%patch11 -p1 -b .applet-error
%patch24 -p1 -b .allow-spurious-view-done-signals
%patch35 -p1 -b .clock-wakeups
+%patch38 -p1 -b .clock-network
libtoolize --force --copy
@@ -174,7 +178,7 @@ cp -f %{SOURCE5} gnome-panel/panel-compatibility.schemas
# ideally intltool (ha!) would do that for us
#
http://bugzilla.gnome.org/show_bug.cgi?id=474987
cd po
-grep -v
".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$\|.*[.]schemas[.]in$\|.*[.]policy[.]in$"
POTFILES.in > POTFILES.keep
+grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$\|.*[.]policy[.]in$"
POTFILES.in > POTFILES.keep
mv POTFILES.keep POTFILES.in
intltool-update --pot
for p in *.po; do
@@ -362,6 +366,12 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Mon Apr 27 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.26.1-3
+- Don't drop schemas translations from po files
+
+* Wed Apr 15 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.26.1-2
+- Fix the clock applets network tracking code
+
* Tue Apr 14 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.26.1-1
- Update to 2.26.1
commit 69d00b0a66215ce0d47ea129dfef95065038bc8c
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Apr 14 21:03:40 2009 +0000
2.26.1
diff --git a/.cvsignore b/.cvsignore
index d2bd3ae..7161741 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.26.0.tar.bz2
+gnome-panel-2.26.1.tar.bz2
diff --git a/gnome-panel.spec b/gnome-panel.spec
index d820fdc..dc2394a 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,8 +22,8 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.26.0
-Release: 2%{?dist}
+Version: 2.26.1
+Release: 1%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.26/%{name}-%{version}.tar...
@@ -115,9 +115,6 @@ Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
Patch35: clock-wakeups.patch
-#
http://bugzilla.gnome.org/show_bug.cgi?id=578859
-Patch100: gnome-panel-2.26.0-show-emblemed-icons.patch
-
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -164,7 +161,6 @@ Panel Applets using the libpanel-applet library.
%patch11 -p1 -b .applet-error
%patch24 -p1 -b .allow-spurious-view-done-signals
%patch35 -p1 -b .clock-wakeups
-%patch100 -p1 -b .emblemed-icons
libtoolize --force --copy
@@ -366,6 +362,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Tue Apr 14 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.26.1-1
+- Update to 2.26.1
+
* Mon Apr 13 2009 David Zeuthen <davidz(a)redhat.com> - 2.26.0-2
- Handle emblemed icons (GNOME #578859)
diff --git a/sources b/sources
index 8c01844..ee1c36d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-27965de9b12952b22b7e232af6acb0de gnome-panel-2.26.0.tar.bz2
+af5587b38fc8b05aeeab3e834aa6e548 gnome-panel-2.26.1.tar.bz2
commit 6fbb99a1d0054b7e08b8376a94599ff37587f305
Author: David Zeuthen <davidz(a)fedoraproject.org>
Date: Mon Apr 13 19:30:49 2009 +0000
- Handle emblemed icons (GNOME #578859)
diff --git a/gnome-panel-2.26.0-show-emblemed-icons.patch
b/gnome-panel-2.26.0-show-emblemed-icons.patch
new file mode 100644
index 0000000..203b30f
--- /dev/null
+++ b/gnome-panel-2.26.0-show-emblemed-icons.patch
@@ -0,0 +1,59 @@
+--- 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.spec b/gnome-panel.spec
index 175052b..d820fdc 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -23,7 +23,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.26.0
-Release: 1%{?dist}
+Release: 2%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.26/%{name}-%{version}.tar...
@@ -115,6 +115,9 @@ Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
Patch35: clock-wakeups.patch
+#
http://bugzilla.gnome.org/show_bug.cgi?id=578859
+Patch100: gnome-panel-2.26.0-show-emblemed-icons.patch
+
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -161,6 +164,7 @@ Panel Applets using the libpanel-applet library.
%patch11 -p1 -b .applet-error
%patch24 -p1 -b .allow-spurious-view-done-signals
%patch35 -p1 -b .clock-wakeups
+%patch100 -p1 -b .emblemed-icons
libtoolize --force --copy
@@ -362,6 +366,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Mon Apr 13 2009 David Zeuthen <davidz(a)redhat.com> - 2.26.0-2
+- Handle emblemed icons (GNOME #578859)
+
* Tue Mar 17 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.26.0-1
- Update to 2.26.0
commit 3c4fadbdaa357388ec8f2132ce15df45ab72c05c
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Mar 17 05:03:24 2009 +0000
2.26.0
diff --git a/.cvsignore b/.cvsignore
index da21b85..d2bd3ae 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.25.92.tar.bz2
+gnome-panel-2.26.0.tar.bz2
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 7545761..175052b 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,10 +22,10 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.25.92
+Version: 2.26.0
Release: 1%{?dist}
URL:
http://www.gnome.org
-Source0:
http://download.gnome.org/sources/gnome-panel/2.25/%{name}-%{version}.tar...
+Source0:
http://download.gnome.org/sources/gnome-panel/2.26/%{name}-%{version}.tar...
Source3: redhat-panel-default-setup.entries
Source4: gnome-compiler-flags.m4
@@ -118,7 +118,7 @@ Patch35: clock-wakeups.patch
Conflicts: gnome-power-manager < 2.15.3
%description
-The GNOME panel provides the window list, workspace switcher, menus, and other
+The GNOME panel provides the window list, workspace switcher, menus, and other
features for the GNOME desktop.
%package libs
@@ -128,7 +128,7 @@ Group: Development/Libraries
%description libs
This package contains the libpanel-applet library that
-is needed by Panel Applets.
+is needed by Panel Applets.
%package devel
Summary: Headers and libraries for Panel Applet development
@@ -362,6 +362,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Tue Mar 17 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.26.0-1
+- Update to 2.26.0
+
* Tue Mar 3 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.25.92-1
- Update to 2.25.92
diff --git a/sources b/sources
index eefd47e..8c01844 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0cbff3b35bb71d0d25b8bdbb3d348312 gnome-panel-2.25.92.tar.bz2
+27965de9b12952b22b7e232af6acb0de gnome-panel-2.26.0.tar.bz2
commit db29d8ba7417d8d02107a24f34e111881c54ecc1
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Mar 3 17:31:38 2009 +0000
2.25.92
diff --git a/.cvsignore b/.cvsignore
index 1b82f5d..da21b85 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.25.91.tar.bz2
+gnome-panel-2.25.92.tar.bz2
diff --git a/gnome-panel-2.24.0-hide-shutdown-if-unavailable.patch
b/gnome-panel-2.24.0-hide-shutdown-if-unavailable.patch
deleted file mode 100644
index f84d22b..0000000
--- a/gnome-panel-2.24.0-hide-shutdown-if-unavailable.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff -ru gnome-panel-2.24.0/gnome-panel/libpanel-util/panel-session-manager.c
new/gnome-panel/libpanel-util/panel-session-manager.c
---- gnome-panel-2.24.0/gnome-panel/libpanel-util/panel-session-manager.c 2008-09-22
17:21:03.000000000 -0400
-+++ new/gnome-panel/libpanel-util/panel-session-manager.c 2008-10-09 12:56:14.000000000
-0400
-@@ -141,6 +141,39 @@
- }
- }
-
-+gboolean
-+panel_session_manager_is_shutdown_available (PanelSessionManager *manager)
-+{
-+ GError *error;
-+ DBusGProxy *proxy;
-+ gboolean is_shutdown_available;
-+
-+ g_return_if_fail (PANEL_IS_SESSION_MANAGER (manager));
-+
-+ error = NULL;
-+
-+ if (!panel_dbus_service_ensure_connection (PANEL_DBUS_SERVICE (manager),
-+ &error)) {
-+ g_warning ("Could not connect to session manager: %s",
-+ error->message);
-+ g_error_free (error);
-+ return;
-+ }
-+
-+ proxy = panel_dbus_service_get_proxy (PANEL_DBUS_SERVICE (manager));
-+
-+ if (!dbus_g_proxy_call (proxy, "CanShutdown", &error,
-+ G_TYPE_INVALID, G_TYPE_BOOLEAN,
-+ &is_shutdown_available, G_TYPE_INVALID) &&
-+ error != NULL) {
-+ g_warning ("Could not ask session manager if shut down is available: %s",
-+ error->message);
-+ g_error_free (error);
-+ return FALSE;
-+ }
-+ return is_shutdown_available;
-+}
-+
- PanelSessionManager *
- panel_session_manager_get (void)
- {
-diff -ru gnome-panel-2.24.0/gnome-panel/libpanel-util/panel-session-manager.h
new/gnome-panel/libpanel-util/panel-session-manager.h
---- gnome-panel-2.24.0/gnome-panel/libpanel-util/panel-session-manager.h 2008-09-22
17:21:03.000000000 -0400
-+++ new/gnome-panel/libpanel-util/panel-session-manager.h 2008-10-09 12:57:27.000000000
-0400
-@@ -63,6 +63,7 @@
- void panel_session_manager_request_logout (PanelSessionManager *session,
- PanelSessionManagerLogoutType mode);
- void panel_session_manager_request_shutdown (PanelSessionManager *session);
-+gboolean panel_session_manager_is_shutdown_available (PanelSessionManager *session);
-
- G_END_DECLS
-
-diff -ru gnome-panel-2.24.0/gnome-panel/panel-action-button.c
new/gnome-panel/panel-action-button.c
---- gnome-panel-2.24.0/gnome-panel/panel-action-button.c 2008-10-09 12:59:52.000000000
-0400
-+++ new/gnome-panel/panel-action-button.c 2008-10-09 13:05:28.000000000 -0400
-@@ -190,15 +190,13 @@
- static gboolean
- panel_action_shutdown_reboot_is_disabled (void)
- {
-- return panel_lockdown_get_disable_log_out();
--#if 0
-- /* FIXME: waiting for a gnome-session dbus api to know if
-- * shutdown/reboot is possible:
-- *
http://bugzilla.gnome.org/show_bug.cgi?id=536915 */
-- return (panel_lockdown_get_disable_log_out() ||
-- (!gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN) &&
-- !gdm_supports_logout_action (GDM_LOGOUT_ACTION_REBOOT)));
--#endif
-+ PanelSessionManager *manager;
-+
-+ if (panel_lockdown_get_disable_log_out())
-+ return TRUE;
-+
-+ manager = panel_session_manager_get ();
-+ return !panel_session_manager_is_shutdown_available (manager);
- }
-
- /* Run Application
diff --git a/gnome-panel-2.24.1-smoother-slide-in.patch
b/gnome-panel-2.24.1-smoother-slide-in.patch
deleted file mode 100644
index 389a015..0000000
--- a/gnome-panel-2.24.1-smoother-slide-in.patch
+++ /dev/null
@@ -1,661 +0,0 @@
-commit 2d6b5f237b167989b96302b8447333dc94e082f6
-Author: Ray Strode <rstrode(a)redhat.com>
-Date: Mon Nov 3 17:19:13 2008 -0500
-
- Don't slide panel down until applets load
-
-diff --git a/gnome-panel/applet.c b/gnome-panel/applet.c
-index 165ded5..53be8e4 100644
---- a/gnome-panel/applet.c
-+++ b/gnome-panel/applet.c
-@@ -792,6 +792,7 @@ typedef struct {
- } PanelAppletToLoad;
-
- static GSList *panel_applets_to_load = NULL;
-+static GSList *panel_applets_loading = NULL;
- static gboolean panel_applet_have_load_idle = FALSE;
-
- static void
-@@ -819,6 +820,52 @@ panel_applet_on_load_queue (const char *id)
- }
-
- static gboolean
-+initially_unhide_toplevels (void)
-+{
-+ GSList *toplevels, *l;
-+
-+ toplevels = panel_toplevel_list_toplevels ();
-+
-+ l = toplevels;
-+ while (l != NULL) {
-+ PanelToplevel *toplevel;
-+
-+ toplevel = (PanelToplevel *) l->data;
-+ if (!panel_toplevel_get_is_attached (toplevel))
-+ panel_toplevel_queue_initial_unhide (toplevel);
-+ l = l->next;
-+ }
-+
-+ return FALSE;
-+}
-+
-+void
-+panel_applet_stop_loading (const char *id)
-+{
-+ PanelAppletToLoad *applet;
-+ GSList *l, *applet_link;
-+
-+ applet_link = NULL;
-+ for (l = panel_applets_loading; l; l = l->next) {
-+ applet = l->data;
-+
-+ if (strcmp (applet->id, id) == 0) {
-+ break;
-+ }
-+ }
-+
-+ if (l == NULL)
-+ return;
-+
-+ panel_applets_loading = g_slist_delete_link (panel_applets_loading, l);
-+ free_applet_to_load (applet);
-+
-+ if (panel_applets_loading == NULL) {
-+ initially_unhide_toplevels ();
-+ }
-+}
-+
-+static gboolean
- panel_applet_load_idle_handler (gpointer dummy)
- {
- PanelAppletToLoad *applet = NULL;
-@@ -848,8 +895,8 @@ panel_applet_load_idle_handler (gpointer dummy)
- panel_applet_have_load_idle = FALSE;
- return FALSE;
- }
--
- panel_applets_to_load = g_slist_delete_link (panel_applets_to_load, l);
-+ panel_applets_loading = g_slist_append (panel_applets_loading, applet);
-
- panel_widget = panel_toplevel_get_panel_widget (toplevel);
-
-@@ -873,6 +920,7 @@ panel_applet_load_idle_handler (gpointer dummy)
- applet->locked,
- applet->position,
- applet->id);
-+ panel_applet_stop_loading (applet->id);
- break;
- case PANEL_OBJECT_MENU:
- panel_menu_button_load_from_gconf (panel_widget,
-@@ -880,12 +928,14 @@ panel_applet_load_idle_handler (gpointer dummy)
- applet->position,
- TRUE,
- applet->id);
-+ panel_applet_stop_loading (applet->id);
- break;
- case PANEL_OBJECT_LAUNCHER:
- launcher_load_from_gconf (panel_widget,
- applet->locked,
- applet->position,
- applet->id);
-+ panel_applet_stop_loading (applet->id);
- break;
- case PANEL_OBJECT_LOGOUT:
- case PANEL_OBJECT_LOCK:
-@@ -896,6 +946,7 @@ panel_applet_load_idle_handler (gpointer dummy)
- applet->position,
- TRUE,
- applet->id);
-+ panel_applet_stop_loading (applet->id);
- break;
- case PANEL_OBJECT_ACTION:
- panel_action_button_load_from_gconf (
-@@ -904,6 +955,7 @@ panel_applet_load_idle_handler (gpointer dummy)
- applet->position,
- TRUE,
- applet->id);
-+ panel_applet_stop_loading (applet->id);
- break;
- case PANEL_OBJECT_MENU_BAR:
- panel_menu_bar_load_from_gconf (
-@@ -912,18 +964,18 @@ panel_applet_load_idle_handler (gpointer dummy)
- applet->position,
- TRUE,
- applet->id);
-+ panel_applet_stop_loading (applet->id);
- break;
- case PANEL_OBJECT_SEPARATOR:
- panel_separator_load_from_gconf (panel_widget,
- applet->locked,
- applet->position,
- applet->id);
-+ panel_applet_stop_loading (applet->id);
- default:
- break;
- }
-
-- free_applet_to_load (applet);
--
- return TRUE;
- }
-
-@@ -971,8 +1023,10 @@ panel_applet_compare (const PanelAppletToLoad *a,
- void
- panel_applet_load_queued_applets (void)
- {
-- if (!panel_applets_to_load)
-+ if (!panel_applets_to_load) {
-+ g_idle_add (initially_unhide_toplevels, NULL);
- return;
-+ }
-
- panel_applets_to_load = g_slist_sort (panel_applets_to_load,
- (GCompareFunc) panel_applet_compare);
-diff --git a/gnome-panel/applet.h b/gnome-panel/applet.h
-index 8790229..16cfa46 100644
---- a/gnome-panel/applet.h
-+++ b/gnome-panel/applet.h
-@@ -53,6 +53,7 @@ AppletInfo *panel_applet_register (GtkWidget *applet,
- gboolean exactpos,
- PanelObjectType type,
- const char *id);
-+void panel_applet_stop_loading (const char *id);
-
- const char *panel_applet_get_id (AppletInfo *info);
- const char *panel_applet_get_id_by_widget (GtkWidget *widget);
-diff --git a/gnome-panel/panel-applet-frame.c b/gnome-panel/panel-applet-frame.c
-index 58f4fb2..8aafd83 100644
---- a/gnome-panel/panel-applet-frame.c
-+++ b/gnome-panel/panel-applet-frame.c
-@@ -1311,6 +1312,7 @@ panel_applet_frame_activated (CORBA_Object object,
- panel_applet_frame_loading_failed (frame, frame_act->id);
- CORBA_exception_free (&corba_ev);
- bonobo_object_release_unref (object, NULL);
-+ panel_applet_stop_loading (frame_act->id);
- g_free (frame_act->id);
- g_free (frame_act);
- g_free (error);
-@@ -1327,6 +1329,7 @@ panel_applet_frame_activated (CORBA_Object object,
- g_warning (G_STRLOC ": failed to load applet %s",
- frame->priv->iid);
- panel_applet_frame_loading_failed (frame, frame_act->id);
-+ panel_applet_stop_loading (frame_act->id);
- g_free (frame_act->id);
- g_free (frame_act);
- return;
-@@ -1338,6 +1341,7 @@ panel_applet_frame_activated (CORBA_Object object,
- "(cannot get control frame)", frame->priv->iid);
- panel_applet_frame_loading_failed (frame, frame_act->id);
- gtk_object_sink (GTK_OBJECT (widget));
-+ panel_applet_stop_loading (frame_act->id);
- g_free (frame_act->id);
- g_free (frame_act);
- return;
-@@ -1354,6 +1358,7 @@ panel_applet_frame_activated (CORBA_Object object,
- frame->priv->iid, error);
- panel_applet_frame_loading_failed (frame, frame_act->id);
- gtk_object_sink (GTK_OBJECT (widget));
-+ panel_applet_stop_loading (frame_act->id);
- g_free (frame_act->id);
- g_free (frame_act);
- g_free (error);
-@@ -1377,6 +1382,7 @@ panel_applet_frame_activated (CORBA_Object object,
- frame->priv->iid, error);
- panel_applet_frame_loading_failed (frame, frame_act->id);
- gtk_object_sink (GTK_OBJECT (widget));
-+ panel_applet_stop_loading (frame_act->id);
- g_free (frame_act->id);
- g_free (frame_act);
- g_free (error);
-@@ -1401,6 +1407,7 @@ panel_applet_frame_activated (CORBA_Object object,
- "(cannot get control)", frame->priv->iid);
- panel_applet_frame_loading_failed (frame, frame_act->id);
- gtk_object_sink (GTK_OBJECT (widget));
-+ panel_applet_stop_loading (frame_act->id);
- g_free (frame_act->id);
- g_free (frame_act);
- return;
-@@ -1413,6 +1420,7 @@ panel_applet_frame_activated (CORBA_Object object,
- "(cannot get applet shell)", frame->priv->iid);
- panel_applet_frame_loading_failed (frame, frame_act->id);
- gtk_object_sink (GTK_OBJECT (widget));
-+ panel_applet_stop_loading (frame_act->id);
- g_free (frame_act->id);
- g_free (frame_act);
- return;
-@@ -1444,6 +1452,7 @@ panel_applet_frame_activated (CORBA_Object object,
- panel_lockdown_notify_add (G_CALLBACK (panel_applet_frame_sync_menu_state),
- frame);
-
-+ panel_applet_stop_loading (frame_act->id);
- g_free (frame_act->id);
- g_free (frame_act);
- }
-diff --git a/gnome-panel/panel-toplevel.c b/gnome-panel/panel-toplevel.c
-index 5d8b8d4..37fc5f0 100644
---- a/gnome-panel/panel-toplevel.c
-+++ b/gnome-panel/panel-toplevel.c
-@@ -2900,10 +2900,14 @@ panel_toplevel_initially_hide (PanelToplevel *toplevel)
- if (!toplevel->priv->attached) {
- toplevel->priv->initial_animation_done = FALSE;
-
-+ /* We start the panel off hidden until all the
-+ * applets are loaded, and then finally slide i
-+ * down when it's ready to be used
-+ */
- toplevel->priv->state = PANEL_STATE_AUTO_HIDDEN;
- gtk_widget_queue_resize (GTK_WIDGET (toplevel));
-
-- panel_toplevel_queue_auto_unhide (toplevel);
-+ panel_toplevel_update_struts (toplevel, FALSE);
- } else
- toplevel->priv->initial_animation_done = TRUE;
-
-@@ -3638,6 +3642,17 @@ panel_toplevel_queue_auto_unhide (PanelToplevel *toplevel)
- toplevel);
- }
-
-+void
-+panel_toplevel_queue_initial_unhide (PanelToplevel *toplevel)
-+{
-+ if (toplevel->priv->initial_animation_done)
-+ return;
-+ /* Give the applets a second or so to frob after registering */
-+ toplevel->priv->unhide_timeout =
-+ g_timeout_add_seconds (1, (GSourceFunc) panel_toplevel_auto_unhide_timeout_handler,
-+ toplevel);
-+}
-+
- static gboolean
- panel_toplevel_enter_notify_event (GtkWidget *widget,
- GdkEventCrossing *event)
-diff --git a/gnome-panel/panel-toplevel.h b/gnome-panel/panel-toplevel.h
-index 81e6c76..60400ea 100644
---- a/gnome-panel/panel-toplevel.h
-+++ b/gnome-panel/panel-toplevel.h
-@@ -136,6 +136,7 @@ void panel_toplevel_hide
(PanelToplevel
- void panel_toplevel_unhide (PanelToplevel
*toplevel);
- void panel_toplevel_queue_auto_hide (PanelToplevel
*toplevel);
- void panel_toplevel_queue_auto_unhide (PanelToplevel
*toplevel);
-+void panel_toplevel_queue_initial_unhide (PanelToplevel
*toplevel);
- void panel_toplevel_push_autohide_disabler (PanelToplevel
*toplevel);
- void panel_toplevel_pop_autohide_disabler (PanelToplevel
*toplevel);
-
-
-commit 2c3e3ad9f93a2b17e2a251913e48d154d15ef93e
-Author: Ray Strode <rstrode(a)redhat.com>
-Date: Mon Nov 3 11:50:16 2008 -0500
-
- Split animation end side calculation to new func
-
- We're going to need it in other places than
- start_animation.
-
-diff --git a/gnome-panel/panel-toplevel.c b/gnome-panel/panel-toplevel.c
-index 37fc5f0..0962659 100644
---- a/gnome-panel/panel-toplevel.c
-+++ b/gnome-panel/panel-toplevel.c
-@@ -3338,22 +3338,19 @@ panel_toplevel_get_animation_time (PanelToplevel *toplevel)
- }
-
- static void
--panel_toplevel_start_animation (PanelToplevel *toplevel)
-+panel_toplevel_calculate_animation_end_geometry (PanelToplevel *toplevel)
- {
- GdkScreen *screen;
- int monitor_width, monitor_height;
-- int deltax, deltay, deltaw = 0, deltah = 0;
-- int cur_x = -1, cur_y = -1;
-- long t;
--
-- screen = panel_toplevel_get_monitor_geometry (
-- toplevel, NULL, NULL, &monitor_width, &monitor_height);
-
- toplevel->priv->animation_end_x = toplevel->priv->x;
- toplevel->priv->animation_end_y = toplevel->priv->y;
- toplevel->priv->animation_end_width = -1;
- toplevel->priv->animation_end_height = -1;
-
-+ screen = panel_toplevel_get_monitor_geometry (
-+ toplevel, NULL, NULL, &monitor_width, &monitor_height);
-+
- if (!toplevel->priv->expand) {
-
- if (toplevel->priv->x_centered)
-@@ -3384,6 +3381,18 @@ panel_toplevel_start_animation (PanelToplevel *toplevel)
- &toplevel->priv->animation_end_width,
- &toplevel->priv->animation_end_height);
-
-+}
-+
-+static void
-+panel_toplevel_start_animation (PanelToplevel *toplevel)
-+{
-+ GdkScreen *screen;
-+ int deltax, deltay, deltaw = 0, deltah = 0;
-+ int cur_x = -1, cur_y = -1;
-+ long t;
-+
-+ panel_toplevel_calculate_animation_end_geometry (toplevel);
-+
- toplevel->priv->animating = TRUE;
-
- panel_toplevel_update_struts (toplevel, TRUE);
-@@ -3396,6 +3405,8 @@ panel_toplevel_start_animation (PanelToplevel *toplevel)
-
- gdk_window_get_origin (GTK_WIDGET (toplevel)->window, &cur_x, &cur_y);
-
-+ screen = gtk_widget_get_screen (GTK_WIDGET (toplevel));
-+
- cur_x -= panel_multiscreen_x (screen, toplevel->priv->monitor);
- cur_y -= panel_multiscreen_y (screen, toplevel->priv->monitor);
-
-
-commit 36b97aa7bb302b65f554c370d7e8c58af4386a76
-Author: Ray Strode <rstrode(a)redhat.com>
-Date: Mon Nov 3 17:20:09 2008 -0500
-
- Don't change struts while animating
-
-diff --git a/gnome-panel/panel-toplevel.c b/gnome-panel/panel-toplevel.c
-index 0962659..bef6a02 100644
---- a/gnome-panel/panel-toplevel.c
-+++ b/gnome-panel/panel-toplevel.c
-@@ -188,7 +188,8 @@ struct _PanelToplevelPrivate {
- /* flag to see if we have already done geometry updating,
- if not then we're still loading and can ignore many things */
- guint updated_geometry_initial : 1;
-- /* flag to see if we have done the initial animation */
-+ /* flags to see if we have done the initial animation */
-+ guint initial_animation_started : 1;
- guint initial_animation_done : 1;
- };
-
-@@ -231,6 +232,8 @@ enum {
- static guint toplevel_signals [LAST_SIGNAL] = { 0 };
- static GSList *toplevel_list = NULL;
-
-+static void panel_toplevel_calculate_animation_end_geometry (PanelToplevel *toplevel);
-+
- GSList *
- panel_toplevel_list_toplevels (void)
- {
-@@ -1372,7 +1375,7 @@ panel_toplevel_get_effective_auto_hide_size (PanelToplevel
*toplevel)
- }
-
- static gboolean
--panel_toplevel_update_struts (PanelToplevel *toplevel, gboolean end_of_animation)
-+panel_toplevel_update_struts (PanelToplevel *toplevel)
- {
- PanelOrientation orientation;
- GdkScreen *screen;
-@@ -1382,6 +1385,8 @@ panel_toplevel_update_struts (PanelToplevel *toplevel, gboolean
end_of_animation
- int monitor_x, monitor_y;
- int monitor_width, monitor_height;
-
-+ panel_toplevel_calculate_animation_end_geometry (toplevel);
-+
- if (!toplevel->priv->updated_geometry_initial)
- return FALSE;
-
-@@ -1397,25 +1402,18 @@ panel_toplevel_update_struts (PanelToplevel *toplevel, gboolean
end_of_animation
- &monitor_width,
- &monitor_height);
-
-- if (end_of_animation) {
-- x = toplevel->priv->animation_end_x;
-- y = toplevel->priv->animation_end_y;
-- x += panel_multiscreen_x (screen, toplevel->priv->monitor);
-- x += panel_multiscreen_y (screen, toplevel->priv->monitor);
-- if (toplevel->priv->animation_end_width != -1)
-- width = toplevel->priv->animation_end_width;
-- else
-- width = toplevel->priv->geometry.width;
-- if (toplevel->priv->animation_end_height != -1)
-- height = toplevel->priv->animation_end_height;
-- else
-- height = toplevel->priv->geometry.height;
-- } else {
-- x = toplevel->priv->geometry.x;
-- y = toplevel->priv->geometry.y;
-- width = toplevel->priv->geometry.width;
-+ x = toplevel->priv->animation_end_x;
-+ y = toplevel->priv->animation_end_y;
-+ x += panel_multiscreen_x (screen, toplevel->priv->monitor);
-+ x += panel_multiscreen_y (screen, toplevel->priv->monitor);
-+ if (toplevel->priv->animation_end_width != -1)
-+ width = toplevel->priv->animation_end_width;
-+ else
-+ width = toplevel->priv->geometry.width;
-+ if (toplevel->priv->animation_end_height != -1)
-+ height = toplevel->priv->animation_end_height;
-+ else
- height = toplevel->priv->geometry.height;
-- }
-
- orientation = toplevel->priv->orientation;
-
-@@ -1827,7 +1825,7 @@ panel_toplevel_update_auto_hide_position (PanelToplevel *toplevel,
- height = toplevel->priv->original_height;
- snap_tolerance = toplevel->priv->snap_tolerance;
-
-- if (toplevel->priv->initial_animation_done) {
-+ if (toplevel->priv->initial_animation_started) {
- auto_hide_size = panel_toplevel_get_effective_auto_hide_size (toplevel);
- } else {
- /* when loading, we animate from outside the screen */
-@@ -2029,6 +2027,7 @@ panel_toplevel_update_animating_position (PanelToplevel *toplevel)
- if (toplevel->priv->geometry.x - monitor_offset_x ==
toplevel->priv->animation_end_x &&
- toplevel->priv->geometry.y - monitor_offset_y ==
toplevel->priv->animation_end_y) {
- toplevel->priv->animating = FALSE;
-+ toplevel->priv->initial_animation_done = TRUE;
-
- if (toplevel->priv->attached && panel_toplevel_get_is_hidden
(toplevel))
- gtk_widget_unmap (GTK_WIDGET (toplevel));
-@@ -2499,7 +2498,12 @@ panel_toplevel_update_geometry (PanelToplevel *toplevel,
- panel_toplevel_update_size (toplevel, requisition);
- panel_toplevel_update_position (toplevel);
-
-- panel_toplevel_update_struts (toplevel, FALSE);
-+ panel_toplevel_update_struts (toplevel);
-+
-+ if (toplevel->priv->animating) {
-+ return;
-+ }
-+
- if (toplevel->priv->state == PANEL_STATE_NORMAL ||
- toplevel->priv->state == PANEL_STATE_AUTO_HIDDEN) {
- panel_struts_update_toplevel_geometry (toplevel,
-@@ -2898,6 +2902,7 @@ static void
- panel_toplevel_initially_hide (PanelToplevel *toplevel)
- {
- if (!toplevel->priv->attached) {
-+ toplevel->priv->initial_animation_started = FALSE;
- toplevel->priv->initial_animation_done = FALSE;
-
- /* We start the panel off hidden until all the
-@@ -2907,9 +2912,11 @@ panel_toplevel_initially_hide (PanelToplevel *toplevel)
- toplevel->priv->state = PANEL_STATE_AUTO_HIDDEN;
- gtk_widget_queue_resize (GTK_WIDGET (toplevel));
-
-- panel_toplevel_update_struts (toplevel, FALSE);
-- } else
-+ panel_toplevel_update_struts (toplevel);
-+ } else {
-+ toplevel->priv->initial_animation_started = TRUE;
- toplevel->priv->initial_animation_done = TRUE;
-+ }
-
- }
-
-@@ -3298,6 +3305,7 @@ panel_toplevel_animation_timeout (PanelToplevel *toplevel)
- toplevel->priv->animation_end_time.tv_sec = 0xdead;
- toplevel->priv->animation_end_time.tv_usec = 0xdead;
- toplevel->priv->animation_timeout = 0;
-+ toplevel->priv->initial_animation_started = TRUE;
- toplevel->priv->initial_animation_done = TRUE;
- }
-
-@@ -3343,6 +3351,9 @@ panel_toplevel_calculate_animation_end_geometry (PanelToplevel
*toplevel)
- GdkScreen *screen;
- int monitor_width, monitor_height;
-
-+ if (toplevel->priv->animating)
-+ return;
-+
- toplevel->priv->animation_end_x = toplevel->priv->x;
- toplevel->priv->animation_end_y = toplevel->priv->y;
- toplevel->priv->animation_end_width = -1;
-@@ -3395,13 +3406,12 @@ panel_toplevel_start_animation (PanelToplevel *toplevel)
-
- toplevel->priv->animating = TRUE;
-
-- panel_toplevel_update_struts (toplevel, TRUE);
- panel_struts_update_toplevel_geometry (toplevel,
- &toplevel->priv->animation_end_x,
- &toplevel->priv->animation_end_y,
- &toplevel->priv->animation_end_width,
- &toplevel->priv->animation_end_height);
-- panel_toplevel_update_struts (toplevel, FALSE);
-+ panel_toplevel_update_struts (toplevel);
-
- gdk_window_get_origin (GTK_WIDGET (toplevel)->window, &cur_x, &cur_y);
-
-@@ -3571,16 +3581,18 @@ panel_toplevel_auto_unhide_timeout_handler (PanelToplevel
*toplevel)
- if (toplevel->priv->animating)
- return TRUE;
-
-- if (!toplevel->priv->animate)
-+ if (!toplevel->priv->animate) {
-+ toplevel->priv->initial_animation_started = TRUE;
- toplevel->priv->initial_animation_done = TRUE;
-+ }
-
- /* initial animation for auto-hidden panels: we need to unhide and hide
- * again to get at the right size */
-- if (!toplevel->priv->initial_animation_done &&
-+ if (!toplevel->priv->initial_animation_started &&
- toplevel->priv->auto_hide) {
- toplevel->priv->unhide_timeout = 0;
- panel_toplevel_unhide (toplevel);
-- toplevel->priv->initial_animation_done = TRUE;
-+ toplevel->priv->initial_animation_started = TRUE;
- panel_toplevel_hide (toplevel, TRUE, -1);
- return FALSE;
- }
-@@ -3656,7 +3668,7 @@ panel_toplevel_queue_auto_unhide (PanelToplevel *toplevel)
- void
- panel_toplevel_queue_initial_unhide (PanelToplevel *toplevel)
- {
-- if (toplevel->priv->initial_animation_done)
-+ if (toplevel->priv->initial_animation_started)
- return;
- /* Give the applets a second or so to frob after registering */
- toplevel->priv->unhide_timeout =
-@@ -4505,8 +4517,9 @@ panel_toplevel_init (PanelToplevel *toplevel)
- toplevel->priv->position_centered = FALSE;
- toplevel->priv->attached = FALSE;
- toplevel->priv->attach_hidden = FALSE;
-- toplevel->priv->updated_geometry_initial = FALSE;
-- toplevel->priv->initial_animation_done = FALSE;
-+ toplevel->priv->updated_geometry_initial = FALSE;
-+ toplevel->priv->initial_animation_started = FALSE;
-+ toplevel->priv->initial_animation_done = FALSE;
-
- gtk_widget_add_events (GTK_WIDGET (toplevel),
- GDK_BUTTON_PRESS_MASK |
-@@ -4809,7 +4822,7 @@ panel_toplevel_set_auto_hide_size (PanelToplevel *toplevel,
- toplevel->priv->auto_hide_size = auto_hide_size;
-
- if (toplevel->priv->state == PANEL_STATE_AUTO_HIDDEN) {
-- if (panel_toplevel_update_struts (toplevel, FALSE)) {
-+ if (panel_toplevel_update_struts (toplevel)) {
- if (toplevel->priv->animate) {
- panel_toplevel_unhide (toplevel);
- panel_toplevel_hide (toplevel, TRUE, -1);
-@@ -4985,7 +4998,7 @@ panel_toplevel_set_auto_hide (PanelToplevel *toplevel,
- else
- panel_toplevel_queue_auto_unhide (toplevel);
-
-- if (panel_toplevel_update_struts (toplevel, FALSE))
-+ if (panel_toplevel_update_struts (toplevel))
- gtk_widget_queue_resize (GTK_WIDGET (toplevel));
-
- g_object_notify (G_OBJECT (toplevel), "auto-hide");
-
-commit 2184c0fc4aa8fea0ffebe1192164125e24107178
-Author: Ray Strode <rstrode(a)redhat.com>
-Date: Mon Nov 3 17:12:04 2008 -0500
-
- Set up struts initially when realizing window
-
-diff --git a/gnome-panel/panel-toplevel.c b/gnome-panel/panel-toplevel.c
-index bef6a02..96f564c 100644
---- a/gnome-panel/panel-toplevel.c
-+++ b/gnome-panel/panel-toplevel.c
-@@ -2939,6 +2939,7 @@ panel_toplevel_realize (GtkWidget *widget)
-
- panel_toplevel_initially_hide (toplevel);
-
-+ panel_toplevel_update_struts (toplevel);
- panel_toplevel_move_resize_window (toplevel, TRUE, TRUE);
- }
-
-
-commit 835cea12efb407b2c9181d33e442317cc1a16904
-Author: Ray Strode <rstrode(a)redhat.com>
-Date: Mon Nov 3 17:13:32 2008 -0500
-
- Set up initial animation to correct position
-
- The initial animation for autohidden panels, is
- the auto hide size, not the normal size. So,
- detect that case and only slide to the autohide size.
-
-diff --git a/gnome-panel/panel-toplevel.c b/gnome-panel/panel-toplevel.c
-index 96f564c..0a71ba0 100644
---- a/gnome-panel/panel-toplevel.c
-+++ b/gnome-panel/panel-toplevel.c
-@@ -3412,7 +3412,30 @@ panel_toplevel_start_animation (PanelToplevel *toplevel)
- &toplevel->priv->animation_end_y,
- &toplevel->priv->animation_end_width,
- &toplevel->priv->animation_end_height);
-- panel_toplevel_update_struts (toplevel);
-+
-+ /* If we're in the initial animation and we're autohidden, we only want
-+ * to animate to the autohidden height
-+ */
-+ if (toplevel->priv->initial_animation_started &&
!toplevel->priv->initial_animation_done && toplevel->priv->state ==
PANEL_STATE_AUTO_HIDDEN) {
-+ switch (toplevel->priv->orientation) {
-+ case PANEL_ORIENTATION_TOP:
-+ toplevel->priv->animation_end_y -= toplevel->priv->geometry.height;
-+ toplevel->priv->animation_end_y += panel_toplevel_get_effective_auto_hide_size
(toplevel);
-+ break;
-+ case PANEL_ORIENTATION_BOTTOM:
-+ toplevel->priv->animation_end_y += toplevel->priv->geometry.height;
-+ toplevel->priv->animation_end_y -= panel_toplevel_get_effective_auto_hide_size
(toplevel);
-+ break;
-+ case PANEL_ORIENTATION_LEFT:
-+ toplevel->priv->animation_end_x -= toplevel->priv->geometry.width;
-+ toplevel->priv->animation_end_x += panel_toplevel_get_effective_auto_hide_size
(toplevel);
-+ break;
-+ case PANEL_ORIENTATION_RIGHT:
-+ toplevel->priv->animation_end_x += toplevel->priv->geometry.width;
-+ toplevel->priv->animation_end_x -= panel_toplevel_get_effective_auto_hide_size
(toplevel);
-+ break;
-+ }
-+ }
-
- gdk_window_get_origin (GTK_WIDGET (toplevel)->window, &cur_x, &cur_y);
-
-diff -up gnome-panel-2.24.1/gnome-panel/panel-applet-frame.c.fix-it
gnome-panel-2.24.1/gnome-panel/panel-applet-frame.c
---- gnome-panel-2.24.1/gnome-panel/panel-applet-frame.c.fix-it 2008-11-03
18:02:07.000000000 -0500
-+++ gnome-panel-2.24.1/gnome-panel/panel-applet-frame.c 2008-11-03 18:02:10.000000000
-0500
-@@ -1286,6 +1286,7 @@ panel_applet_frame_activated (CORBA_Obje
- if (!in_default_panel_config (frame_act->id)) {
- panel_applet_frame_loading_failed (frame, frame_act->id);
- }
-+ panel_applet_stop_loading (frame_act->id);
- g_free (frame_act->id);
- g_free (frame_act);
- return;
diff --git a/gnome-panel.spec b/gnome-panel.spec
index a585a14..7545761 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,8 +22,8 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.25.91
-Release: 3%{?dist}
+Version: 2.25.92
+Release: 1%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.25/%{name}-%{version}.tar...
@@ -105,17 +105,14 @@ Patch8: launcher-desktop-files.patch
Patch9: desktop-file-monitoring.patch
Patch10: preferred-apps.patch
-# don't pop up an error dialog if an applet from the
+# don't pop up an error dialog if an applet from the
# default configuration is missing; we don't want to
-# add a hard dependency on e.g. tomboy
+# add a hard dependency on e.g. tomboy
Patch11: applet-error.patch
#
http://bugzilla.gnome.org/show_bug.cgi?id=520111
Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
-#
http://bugzilla.gnome.org/show_bug.cgi?id=572933
-Patch25: panel-resizing.patch
-
Patch35: clock-wakeups.patch
Conflicts: gnome-power-manager < 2.15.3
@@ -163,7 +160,6 @@ Panel Applets using the libpanel-applet library.
%patch10 -p1 -b .preferred-apps
%patch11 -p1 -b .applet-error
%patch24 -p1 -b .allow-spurious-view-done-signals
-%patch25 -p1 -b .panel-resizing
%patch35 -p1 -b .clock-wakeups
libtoolize --force --copy
@@ -366,6 +362,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Tue Mar 3 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.25.92-1
+- Update to 2.25.92
+
* Fri Feb 27 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.25.91-3
- Require PolicyKit-authentication-agent
diff --git a/panel-resizing.patch b/panel-resizing.patch
deleted file mode 100644
index 3fd9d52..0000000
--- a/panel-resizing.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- gnome-panel-2.25.91/gnome-panel/panel-multiscreen.c 2009-02-17 04:25:39.000000000
-0500
-+++ hacked/gnome-panel/panel-multiscreen.c 2009-02-23 19:23:06.571095094 -0500
-@@ -40,6 +40,26 @@
- static int *monitors = NULL;
- static GdkRectangle **geometries = NULL;
- static gboolean initialized = FALSE;
-+static guint reinit_id = 0;
-+
-+static gboolean
-+panel_multiscreen_reinit_idle (gpointer data)
-+{
-+ panel_multiscreen_reinit ();
-+
-+ reinit_id = 0;
-+
-+ return FALSE;
-+}
-+
-+static void
-+panel_multiscreen_queue_reinit (void)
-+{
-+ if (reinit_id)
-+ return;
-+
-+ reinit_id = g_idle_add (panel_multiscreen_reinit_idle, NULL);
-+}
-
- void
- panel_multiscreen_init (void)
-@@ -63,7 +83,9 @@
- screen = gdk_display_get_screen (display, i);
-
- g_signal_connect (screen, "size-changed",
-- G_CALLBACK (panel_multiscreen_reinit), NULL);
-+ G_CALLBACK (panel_multiscreen_queue_reinit), NULL);
-+ g_signal_connect (screen, "monitors-changed",
-+ G_CALLBACK (panel_multiscreen_queue_reinit), NULL);
-
- monitors [i] = gdk_screen_get_n_monitors (screen);
- geometries [i] = g_new0 (GdkRectangle, monitors [i]);
-@@ -105,7 +127,7 @@
-
- screen = gdk_display_get_screen (display, i);
- g_signal_handlers_disconnect_by_func (screen,
-- panel_multiscreen_reinit,
-+ panel_multiscreen_queue_reinit,
- NULL);
- }
-
diff --git a/sources b/sources
index c975bdd..eefd47e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8b6f0c2c1d53be49cfe1bbe433e1e758 gnome-panel-2.25.91.tar.bz2
+0cbff3b35bb71d0d25b8bdbb3d348312 gnome-panel-2.25.92.tar.bz2
diff --git a/tryexec.patch b/tryexec.patch
deleted file mode 100644
index 7226f38..0000000
--- a/tryexec.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -up gnome-panel-2.24.0/gnome-panel/panel-menu-items.c.tryexec
gnome-panel-2.24.0/gnome-panel/panel-menu-items.c
---- gnome-panel-2.24.0/gnome-panel/panel-menu-items.c.tryexec 2008-10-09
13:31:01.000000000 -0400
-+++ gnome-panel-2.24.0/gnome-panel/panel-menu-items.c 2008-10-09 13:36:29.000000000
-0400
-@@ -151,6 +151,8 @@ panel_menu_items_append_from_desktop (Gt
- char *icon;
- char *name;
- char *comment;
-+ char *tryexec;
-+ char *prog;
-
- path_freeme = NULL;
-
-@@ -189,6 +191,16 @@ panel_menu_items_append_from_desktop (Gt
- g_free (path_freeme);
- return;
- }
-+ tryexec = panel_key_file_get_string (key_file, "TryExec");
-+ if (tryexec) {
-+ prog = g_find_program_in_path (tryexec);
-+ g_free (tryexec);
-+ if (!prog) {
-+ g_key_file_free (key_file);
-+ return;
-+ }
-+ g_free (prog);
-+ }
-
- icon = panel_key_file_get_locale_string (key_file, "Icon");
- comment = panel_key_file_get_locale_string (key_file, "Comment");
commit a7aa5e79d8cb303813b20f1975d57afb3cf58f26
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Feb 27 14:39:08 2009 +0000
Require PolicyKit-authentication-agent
diff --git a/gnome-panel.spec b/gnome-panel.spec
index abaa17f..a585a14 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -23,7 +23,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.25.91
-Release: 2%{?dist}
+Release: 3%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.25/%{name}-%{version}.tar...
@@ -41,7 +41,7 @@ Requires: gnome-menus >= %{gnome_menus_version}
%if %{use_evolution_data_server}
Requires: evolution-data-server >= %{evolution_data_server_version}
%endif
-Requires: PolicyKit-gnome
+Requires: PolicyKit-authentication-agent
Requires: gnome-session-xsession
Requires(post): GConf2 >= %{gconf_version}
@@ -366,6 +366,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Fri Feb 27 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.25.91-3
+- Require PolicyKit-authentication-agent
+
* Mon Feb 23 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.25.91-2
- Fix panel behaviour on screen size changes
commit 51e0a944c08d52573ca7391b7b1cd1c73d0d3ca3
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Feb 24 00:37:13 2009 +0000
fix panel resizing
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 6acc19d..abaa17f 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -23,7 +23,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.25.91
-Release: 1%{?dist}
+Release: 2%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.25/%{name}-%{version}.tar...
@@ -113,6 +113,9 @@ Patch11: applet-error.patch
#
http://bugzilla.gnome.org/show_bug.cgi?id=520111
Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
+#
http://bugzilla.gnome.org/show_bug.cgi?id=572933
+Patch25: panel-resizing.patch
+
Patch35: clock-wakeups.patch
Conflicts: gnome-power-manager < 2.15.3
@@ -160,6 +163,7 @@ Panel Applets using the libpanel-applet library.
%patch10 -p1 -b .preferred-apps
%patch11 -p1 -b .applet-error
%patch24 -p1 -b .allow-spurious-view-done-signals
+%patch25 -p1 -b .panel-resizing
%patch35 -p1 -b .clock-wakeups
libtoolize --force --copy
@@ -362,6 +366,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Mon Feb 23 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.25.91-2
+- Fix panel behaviour on screen size changes
+
* Thu Feb 19 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.25.91-1
- Update to 2.25.91
diff --git a/panel-resizing.patch b/panel-resizing.patch
new file mode 100644
index 0000000..3fd9d52
--- /dev/null
+++ b/panel-resizing.patch
@@ -0,0 +1,49 @@
+--- gnome-panel-2.25.91/gnome-panel/panel-multiscreen.c 2009-02-17 04:25:39.000000000
-0500
++++ hacked/gnome-panel/panel-multiscreen.c 2009-02-23 19:23:06.571095094 -0500
+@@ -40,6 +40,26 @@
+ static int *monitors = NULL;
+ static GdkRectangle **geometries = NULL;
+ static gboolean initialized = FALSE;
++static guint reinit_id = 0;
++
++static gboolean
++panel_multiscreen_reinit_idle (gpointer data)
++{
++ panel_multiscreen_reinit ();
++
++ reinit_id = 0;
++
++ return FALSE;
++}
++
++static void
++panel_multiscreen_queue_reinit (void)
++{
++ if (reinit_id)
++ return;
++
++ reinit_id = g_idle_add (panel_multiscreen_reinit_idle, NULL);
++}
+
+ void
+ panel_multiscreen_init (void)
+@@ -63,7 +83,9 @@
+ screen = gdk_display_get_screen (display, i);
+
+ g_signal_connect (screen, "size-changed",
+- G_CALLBACK (panel_multiscreen_reinit), NULL);
++ G_CALLBACK (panel_multiscreen_queue_reinit), NULL);
++ g_signal_connect (screen, "monitors-changed",
++ G_CALLBACK (panel_multiscreen_queue_reinit), NULL);
+
+ monitors [i] = gdk_screen_get_n_monitors (screen);
+ geometries [i] = g_new0 (GdkRectangle, monitors [i]);
+@@ -105,7 +127,7 @@
+
+ screen = gdk_display_get_screen (display, i);
+ g_signal_handlers_disconnect_by_func (screen,
+- panel_multiscreen_reinit,
++ panel_multiscreen_queue_reinit,
+ NULL);
+ }
+
commit af6066f569cccaf8e41adaa58a4afe092235edeb
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Feb 19 05:24:07 2009 +0000
fix sources
diff --git a/.cvsignore b/.cvsignore
index d891935..1b82f5d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.25.90.tar.bz2
+gnome-panel-2.25.91.tar.bz2
diff --git a/sources b/sources
index c4d16c1..c975bdd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-34cc01a641d929603ce81a50de6ef5ed gnome-panel-2.25.90.tar.bz2
+8b6f0c2c1d53be49cfe1bbe433e1e758 gnome-panel-2.25.91.tar.bz2
commit 639cdfc50d23147b756511b310b5b2d0131c897c
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Feb 19 05:03:20 2009 +0000
2.25.91
diff --git a/gnome-panel.spec b/gnome-panel.spec
index f0d32e3..6acc19d 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.25.90
+Version: 2.25.91
Release: 1%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.25/%{name}-%{version}.tar...
@@ -362,6 +362,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Thu Feb 19 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.25.91-1
+- Update to 2.25.91
+
* Tue Feb 3 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.25.90-1
- Update to 2.25.90
commit da676e7399686ae7f86b6718f4f1a278410cd43c
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Feb 3 17:50:58 2009 +0000
22.590
diff --git a/.cvsignore b/.cvsignore
index 79878c0..d891935 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.25.5.1.tar.bz2
+gnome-panel-2.25.90.tar.bz2
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 8960e76..f0d32e3 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.25.5.1
+Version: 2.25.90
Release: 1%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.25/%{name}-%{version}.tar...
@@ -362,6 +362,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Tue Feb 3 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.25.90-1
+- Update to 2.25.90
+
* Fri Jan 23 2009 Ray Strode <rstrode(a)redhat.com> - 2.25.5.1-1
- Update to 2.25.5.1
- Fixes bug 481029
diff --git a/sources b/sources
index 88548e1..c4d16c1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-62bae4712c8e7be95b061d08b22905f2 gnome-panel-2.25.5.1.tar.bz2
+34cc01a641d929603ce81a50de6ef5ed gnome-panel-2.25.90.tar.bz2
commit d0e7d1842188e48f0d46ef2a5f31ef2ddeade8f3
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Fri Jan 23 16:09:09 2009 +0000
- Update to 2.25.5.1
- Fixes bug 481029
diff --git a/.cvsignore b/.cvsignore
index 0e8ad6f..79878c0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.25.5.tar.bz2
+gnome-panel-2.25.5.1.tar.bz2
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 451f4dc..8960e76 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.25.5
+Version: 2.25.5.1
Release: 1%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.25/%{name}-%{version}.tar...
@@ -362,6 +362,10 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Fri Jan 23 2009 Ray Strode <rstrode(a)redhat.com> - 2.25.5.1-1
+- Update to 2.25.5.1
+- Fixes bug 481029
+
* Tue Jan 20 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.25.5-1
- Update to 2.25.5
diff --git a/sources b/sources
index b869e2d..88548e1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ca67bbaa5e109d8e86424e2ace8e8683 gnome-panel-2.25.5.tar.bz2
+62bae4712c8e7be95b061d08b22905f2 gnome-panel-2.25.5.1.tar.bz2
commit 274955884aba242ad2f65d877cffc7a50a824f62
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Jan 20 19:37:52 2009 +0000
drop lost of patches
diff --git a/.cvsignore b/.cvsignore
index e5bf972..0e8ad6f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.25.3.tar.bz2
+gnome-panel-2.25.5.tar.bz2
diff --git a/applet-error.patch b/applet-error.patch
index d4ed3ec..9a3228a 100644
--- a/applet-error.patch
+++ b/applet-error.patch
@@ -1,7 +1,7 @@
-diff -up gnome-panel-2.21.91/gnome-panel/panel-applet-frame.c.applet-error
gnome-panel-2.21.91/gnome-panel/panel-applet-frame.c
---- gnome-panel-2.21.91/gnome-panel/panel-applet-frame.c.applet-error 2008-02-11
16:15:47.000000000 -0500
-+++ gnome-panel-2.21.91/gnome-panel/panel-applet-frame.c 2008-02-13 20:35:59.000000000
-0500
-@@ -1242,6 +1242,21 @@ panel_applet_frame_event_listener (Bonob
+diff -up gnome-panel-2.25.5/gnome-panel/panel-applet-frame.c.applet-error
gnome-panel-2.25.5/gnome-panel/panel-applet-frame.c
+--- gnome-panel-2.25.5/gnome-panel/panel-applet-frame.c.applet-error 2009-01-20
09:04:47.000000000 -0500
++++ gnome-panel-2.25.5/gnome-panel/panel-applet-frame.c 2009-01-20 14:22:33.000000000
-0500
+@@ -1246,6 +1246,21 @@ panel_applet_frame_event_listener (Bonob
panel_applet_frame_set_size_hints_from_any (frame, any);
}
@@ -23,14 +23,14 @@ diff -up
gnome-panel-2.21.91/gnome-panel/panel-applet-frame.c.applet-error gnome
static void
panel_applet_frame_activated (CORBA_Object object,
const char *error_reason,
-@@ -1266,7 +1281,9 @@ panel_applet_frame_activated (CORBA_Obje
- if (error_reason != NULL || object == CORBA_OBJECT_NIL) {
- g_warning (G_STRLOC ": failed to load applet %s:\n%s",
- frame->priv->iid, error_reason);
-- panel_applet_frame_loading_failed (frame, frame_act->id);
-+ if (!in_default_panel_config (frame_act->id)) {
-+ panel_applet_frame_loading_failed (frame, frame_act->id);
-+ }
- g_free (frame_act->id);
- g_free (frame_act);
- return;
+@@ -1425,7 +1440,9 @@ panel_applet_frame_activated (CORBA_Obje
+ return;
+
+ error_out:
+- panel_applet_frame_loading_failed (frame, frame_act->id);
++ if (!in_default_panel_config (frame_act->id)) {
++ panel_applet_frame_loading_failed (frame, frame_act->id);
++ }
+ if (widget)
+ g_object_unref (widget);
+ panel_applet_stop_loading (frame_act->id);
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 2848a98..451f4dc 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,8 +22,8 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.25.3
-Release: 5%{?dist}
+Version: 2.25.5
+Release: 1%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.25/%{name}-%{version}.tar...
@@ -113,15 +113,7 @@ Patch11: applet-error.patch
#
http://bugzilla.gnome.org/show_bug.cgi?id=520111
Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
-#
http://bugzilla.gnome.org/show_bug.cgi?id=554343
-Patch25: gnome-panel-2.24.1-smoother-slide-in.patch
-
-#
http://bugzilla.gnome.org/show_bug.cgi?id=536915
-Patch26: gnome-panel-2.24.0-hide-shutdown-if-unavailable.patch
-
Patch35: clock-wakeups.patch
-#
http://bugzilla.gnome.org/show_bug.cgi?id=555710
-Patch36: tryexec.patch
Conflicts: gnome-power-manager < 2.15.3
@@ -168,10 +160,7 @@ Panel Applets using the libpanel-applet library.
%patch10 -p1 -b .preferred-apps
%patch11 -p1 -b .applet-error
%patch24 -p1 -b .allow-spurious-view-done-signals
-#%patch25 -p1 -b .smoother-slide-in
-%patch26 -p1 -b .hide-shutdown-item-if-unavailable
%patch35 -p1 -b .clock-wakeups
-%patch36 -p1 -b .tryexec
libtoolize --force --copy
@@ -373,6 +362,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Tue Jan 20 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.25.5-1
+- Update to 2.25.5
+
* Fri Jan 16 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.25.3-4
- And don't write %s into desktop files
diff --git a/sources b/sources
index ae3bc2c..b869e2d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-72173f5fe7775cf9c432e2e60ef856df gnome-panel-2.25.3.tar.bz2
+ca67bbaa5e109d8e86424e2ace8e8683 gnome-panel-2.25.5.tar.bz2
commit 2572bf1cb84eb63f6b1b77865c0ed33ba7269f7b
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Jan 16 19:26:05 2009 +0000
no more
www.s.com
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 1e33c65..2848a98 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -23,7 +23,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.25.3
-Release: 4%{?dist}
+Release: 5%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.25/%{name}-%{version}.tar...
@@ -373,6 +373,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Fri Jan 16 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.25.3-4
+- And don't write %s into desktop files
+
* Fri Jan 16 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.25.3-3
- Fix the 'smart launcher' patch
diff --git a/preferred-apps.patch b/preferred-apps.patch
index b52e599..8f755d9 100644
--- a/preferred-apps.patch
+++ b/preferred-apps.patch
@@ -1,6 +1,6 @@
diff -up gnome-panel-2.25.3/gnome-panel/launcher.c.preferred-apps
gnome-panel-2.25.3/gnome-panel/launcher.c
---- gnome-panel-2.25.3/gnome-panel/launcher.c.preferred-apps 2009-01-16
13:27:30.000000000 -0500
-+++ gnome-panel-2.25.3/gnome-panel/launcher.c 2009-01-16 13:31:07.000000000 -0500
+--- gnome-panel-2.25.3/gnome-panel/launcher.c.preferred-apps 2009-01-16
14:15:17.000000000 -0500
++++ gnome-panel-2.25.3/gnome-panel/launcher.c 2009-01-16 14:24:06.000000000 -0500
@@ -21,6 +21,7 @@
#include <glib/gi18n.h>
#include <gio/gio.h>
@@ -17,7 +17,7 @@ diff -up gnome-panel-2.25.3/gnome-panel/launcher.c.preferred-apps
gnome-panel-2.
static GdkScreen *
launcher_get_screen (Launcher *launcher)
-@@ -1215,3 +1217,178 @@ panel_launcher_set_dnd_enabled (Launcher
+@@ -1215,3 +1217,189 @@ panel_launcher_set_dnd_enabled (Launcher
} else
gtk_drag_source_unset (launcher->button);
}
@@ -93,6 +93,17 @@ diff -up gnome-panel-2.25.3/gnome-panel/launcher.c.preferred-apps
gnome-panel-2.
+ g_key_file_set_string (key_file, "Desktop Entry", "GenericName",
"Web Browser");
+ g_key_file_set_string (key_file, "Desktop Entry", "Comment",
"Browse the Web");
+ g_key_file_set_string (key_file, "Desktop Entry", "Icon",
"redhat-web-browser.png");
++ if (strstr (exec, "%s")) {
++ gchar *exec2, *s;
++
++ exec2 = g_strdup (exec);
++ s = strstr (exec2, "%s");
++ s[1] = 'u';
++
++ g_key_file_set_string (key_file, "Desktop Entry", "Exec",
exec2);
++ g_free (exec2);
++
++ }
+ }
+ else if (strstr (key, "mailto")) {
+ g_key_file_set_string (key_file, "Desktop Entry", "Name",
"Preferred Mail Reader");
@@ -172,7 +183,7 @@ diff -up gnome-panel-2.25.3/gnome-panel/launcher.c.preferred-apps
gnome-panel-2.
+ client = panel_gconf_get_client ();
+
+ gconf_client_add_dir (client,
-+ "desktop/gnome/url-handlers",
++ "/desktop/gnome/url-handlers",
+ GCONF_CLIENT_PRELOAD_NONE,
+ NULL);
+
@@ -197,8 +208,8 @@ diff -up gnome-panel-2.25.3/gnome-panel/launcher.c.preferred-apps
gnome-panel-2.
+ }
+}
diff -up gnome-panel-2.25.3/gnome-panel/launcher.h.preferred-apps
gnome-panel-2.25.3/gnome-panel/launcher.h
---- gnome-panel-2.25.3/gnome-panel/launcher.h.preferred-apps 2009-01-16
13:27:30.000000000 -0500
-+++ gnome-panel-2.25.3/gnome-panel/launcher.h 2009-01-16 13:27:30.000000000 -0500
+--- gnome-panel-2.25.3/gnome-panel/launcher.h.preferred-apps 2009-01-16
14:15:17.000000000 -0500
++++ gnome-panel-2.25.3/gnome-panel/launcher.h 2009-01-16 14:15:17.000000000 -0500
@@ -14,6 +14,8 @@
#include "applet.h"
#include "panel-widget.h"
@@ -218,7 +229,7 @@ diff -up gnome-panel-2.25.3/gnome-panel/launcher.h.preferred-apps
gnome-panel-2.
diff -up gnome-panel-2.25.3/gnome-panel/main.c.preferred-apps
gnome-panel-2.25.3/gnome-panel/main.c
--- gnome-panel-2.25.3/gnome-panel/main.c.preferred-apps 2008-12-09 07:32:37.000000000
-0500
-+++ gnome-panel-2.25.3/gnome-panel/main.c 2009-01-16 13:27:30.000000000 -0500
++++ gnome-panel-2.25.3/gnome-panel/main.c 2009-01-16 14:15:17.000000000 -0500
@@ -27,6 +27,7 @@
#include "panel-action-protocol.h"
#include "panel-lockdown.h"
@@ -237,7 +248,7 @@ diff -up gnome-panel-2.25.3/gnome-panel/main.c.preferred-apps
gnome-panel-2.25.3
panel_profile_load ();
diff -up gnome-panel-2.25.3/gnome-panel/panel-run-dialog.c.preferred-apps
gnome-panel-2.25.3/gnome-panel/panel-run-dialog.c
--- gnome-panel-2.25.3/gnome-panel/panel-run-dialog.c.preferred-apps 2008-12-11
12:03:03.000000000 -0500
-+++ gnome-panel-2.25.3/gnome-panel/panel-run-dialog.c 2009-01-16 13:27:30.000000000
-0500
++++ gnome-panel-2.25.3/gnome-panel/panel-run-dialog.c 2009-01-16 14:15:17.000000000
-0500
@@ -789,7 +789,7 @@ get_all_applications_from_dir (GMenuTree
return list;
}
@@ -249,7 +260,7 @@ diff -up
gnome-panel-2.25.3/gnome-panel/panel-run-dialog.c.preferred-apps gnome-
GMenuTree *tree;
diff -up gnome-panel-2.25.3/gnome-panel/panel-run-dialog.h.preferred-apps
gnome-panel-2.25.3/gnome-panel/panel-run-dialog.h
--- gnome-panel-2.25.3/gnome-panel/panel-run-dialog.h.preferred-apps 2008-11-08
19:27:01.000000000 -0500
-+++ gnome-panel-2.25.3/gnome-panel/panel-run-dialog.h 2009-01-16 13:27:30.000000000
-0500
++++ gnome-panel-2.25.3/gnome-panel/panel-run-dialog.h 2009-01-16 14:15:17.000000000
-0500
@@ -32,6 +32,8 @@ G_BEGIN_DECLS
void panel_run_dialog_present (GdkScreen *screen,
guint32 activate_time);
commit c3e04e76725df6551cc561cbe78cac59750a15ec
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Jan 16 18:40:26 2009 +0000
fix spec
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 9d52873..1e33c65 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -165,7 +165,7 @@ Panel Applets using the libpanel-applet library.
%patch7 -p1 -b .about-this-computer
%patch8 -p1 -b .launcher-desktop-files
%patch9 -p1 -b .desktop-file-monitoring
-%patch10 -p0 -b .preferred-apps
+%patch10 -p1 -b .preferred-apps
%patch11 -p1 -b .applet-error
%patch24 -p1 -b .allow-spurious-view-done-signals
#%patch25 -p1 -b .smoother-slide-in
commit 6ce1d09c2d85eaf658875d631c70520e4d606b76
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Jan 16 18:32:26 2009 +0000
fix smart launchers
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 646c7da..9d52873 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -23,7 +23,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.25.3
-Release: 3%{?dist}
+Release: 4%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.25/%{name}-%{version}.tar...
@@ -373,6 +373,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Fri Jan 16 2009 Matthias Clasen <mclasen(a)redhat.com> - 2.25.3-3
+- Fix the 'smart launcher' patch
+
* Thu Dec 18 2008 - Bastien Nocera <bnocera(a)redhat.com> - 2.25.3-3
- Remove the mixer from the default panel config as well
- Update search and preferred apps patches
diff --git a/preferred-apps.patch b/preferred-apps.patch
index e1de0e5..b52e599 100644
--- a/preferred-apps.patch
+++ b/preferred-apps.patch
@@ -1,33 +1,6 @@
-Index: gnome-panel/panel-run-dialog.c
-===================================================================
---- gnome-panel/panel-run-dialog.c (revision 11419)
-+++ gnome-panel/panel-run-dialog.c (working copy)
-@@ -789,7 +789,7 @@
- return list;
- }
-
--static GSList *
-+GSList *
- get_all_applications (void)
- {
- GMenuTree *tree;
-Index: gnome-panel/panel-run-dialog.h
-===================================================================
---- gnome-panel/panel-run-dialog.h (revision 11419)
-+++ gnome-panel/panel-run-dialog.h (working copy)
-@@ -32,6 +32,8 @@
- void panel_run_dialog_present (GdkScreen *screen,
- guint32 activate_time);
-
-+GSList *get_all_applications (void);
-+
- G_END_DECLS
-
- #endif /* __PANEL_RUN_DIALOG_H__ */
-Index: gnome-panel/launcher.c
-===================================================================
---- gnome-panel/launcher.c (revision 11419)
-+++ gnome-panel/launcher.c (working copy)
+diff -up gnome-panel-2.25.3/gnome-panel/launcher.c.preferred-apps
gnome-panel-2.25.3/gnome-panel/launcher.c
+--- gnome-panel-2.25.3/gnome-panel/launcher.c.preferred-apps 2009-01-16
13:27:30.000000000 -0500
++++ gnome-panel-2.25.3/gnome-panel/launcher.c 2009-01-16 13:31:07.000000000 -0500
@@ -21,6 +21,7 @@
#include <glib/gi18n.h>
#include <gio/gio.h>
@@ -44,7 +17,7 @@ Index: gnome-panel/launcher.c
static GdkScreen *
launcher_get_screen (Launcher *launcher)
-@@ -1110,3 +1112,173 @@
+@@ -1215,3 +1217,178 @@ panel_launcher_set_dnd_enabled (Launcher
} else
gtk_drag_source_unset (launcher->button);
}
@@ -198,6 +171,11 @@ Index: gnome-panel/launcher.c
+
+ client = panel_gconf_get_client ();
+
++ gconf_client_add_dir (client,
++ "desktop/gnome/url-handlers",
++ GCONF_CLIENT_PRELOAD_NONE,
++ NULL);
++
+ for (i = 0; keys[i]; i++) {
+ dirname = g_build_filename (g_get_user_data_dir (),
+ "applications", NULL);
@@ -218,10 +196,9 @@ Index: gnome-panel/launcher.c
+ filename, g_free, NULL);
+ }
+}
-Index: gnome-panel/launcher.h
-===================================================================
---- gnome-panel/launcher.h (revision 11419)
-+++ gnome-panel/launcher.h (working copy)
+diff -up gnome-panel-2.25.3/gnome-panel/launcher.h.preferred-apps
gnome-panel-2.25.3/gnome-panel/launcher.h
+--- gnome-panel-2.25.3/gnome-panel/launcher.h.preferred-apps 2009-01-16
13:27:30.000000000 -0500
++++ gnome-panel-2.25.3/gnome-panel/launcher.h 2009-01-16 13:27:30.000000000 -0500
@@ -14,6 +14,8 @@
#include "applet.h"
#include "panel-widget.h"
@@ -231,7 +208,7 @@ Index: gnome-panel/launcher.h
G_BEGIN_DECLS
typedef struct {
-@@ -70,6 +72,7 @@
+@@ -71,6 +73,7 @@ void launcher_properties_dest
void panel_launcher_set_dnd_enabled (Launcher *launcher,
gboolean dnd_enabled);
@@ -239,10 +216,9 @@ Index: gnome-panel/launcher.h
G_END_DECLS
-Index: gnome-panel/main.c
-===================================================================
---- gnome-panel/main.c (revision 11419)
-+++ gnome-panel/main.c (working copy)
+diff -up gnome-panel-2.25.3/gnome-panel/main.c.preferred-apps
gnome-panel-2.25.3/gnome-panel/main.c
+--- gnome-panel-2.25.3/gnome-panel/main.c.preferred-apps 2008-12-09 07:32:37.000000000
-0500
++++ gnome-panel-2.25.3/gnome-panel/main.c 2009-01-16 13:27:30.000000000 -0500
@@ -27,6 +27,7 @@
#include "panel-action-protocol.h"
#include "panel-lockdown.h"
@@ -251,7 +227,7 @@ Index: gnome-panel/main.c
#include "xstuff.h"
#include "nothing.cP"
-@@ -86,6 +87,7 @@
+@@ -86,6 +87,7 @@ main (int argc, char **argv)
GCONF_CLIENT_PRELOAD_NONE,
NULL);
@@ -259,3 +235,27 @@ Index: gnome-panel/main.c
panel_global_config_load ();
panel_lockdown_init ();
panel_profile_load ();
+diff -up gnome-panel-2.25.3/gnome-panel/panel-run-dialog.c.preferred-apps
gnome-panel-2.25.3/gnome-panel/panel-run-dialog.c
+--- gnome-panel-2.25.3/gnome-panel/panel-run-dialog.c.preferred-apps 2008-12-11
12:03:03.000000000 -0500
++++ gnome-panel-2.25.3/gnome-panel/panel-run-dialog.c 2009-01-16 13:27:30.000000000
-0500
+@@ -789,7 +789,7 @@ get_all_applications_from_dir (GMenuTree
+ return list;
+ }
+
+-static GSList *
++GSList *
+ get_all_applications (void)
+ {
+ GMenuTree *tree;
+diff -up gnome-panel-2.25.3/gnome-panel/panel-run-dialog.h.preferred-apps
gnome-panel-2.25.3/gnome-panel/panel-run-dialog.h
+--- gnome-panel-2.25.3/gnome-panel/panel-run-dialog.h.preferred-apps 2008-11-08
19:27:01.000000000 -0500
++++ gnome-panel-2.25.3/gnome-panel/panel-run-dialog.h 2009-01-16 13:27:30.000000000
-0500
+@@ -32,6 +32,8 @@ G_BEGIN_DECLS
+ void panel_run_dialog_present (GdkScreen *screen,
+ guint32 activate_time);
+
++GSList *get_all_applications (void);
++
+ G_END_DECLS
+
+ #endif /* __PANEL_RUN_DIALOG_H__ */
commit 67abc007b46e0b0a1b2af84b0dd66698dc75496b
Author: Bastien Nocera <hadess(a)fedoraproject.org>
Date: Thu Dec 18 19:04:10 2008 +0000
- Fix search patch again
diff --git a/gnome-panel-2.25.3-search.patch b/gnome-panel-2.25.3-search.patch
index d684ae4..630667b 100644
--- a/gnome-panel-2.25.3-search.patch
+++ b/gnome-panel-2.25.3-search.patch
@@ -81,32 +81,23 @@ Index: gnome-panel/panel-action-button.c
===================================================================
--- gnome-panel/panel-action-button.c (revision 11419)
+++ gnome-panel/panel-action-button.c (working copy)
-@@ -218,11 +218,28 @@
- panel_action_search (GtkWidget *widget)
- {
+@@ -220,9 +220,19 @@
GdkScreen *screen;
-+ const gchar *prog;
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")) {
-+ prog = "beagle-search";
+ panel_launch_desktop_file ("gnome-beagle-search.desktop",
-+ "beagle-search",
+ screen,
+ NULL);
+ } else if (panel_has_desktop_file ("fedora-tracker-search-tool.desktop")) {
-+ prog = "tracker-search-tool";
+ panel_launch_desktop_file ("fedora-tracker-search-tool.desktop",
-+ "tracker-search-tool",
+ screen,
+ NULL);
+ } else {
-+ prog = "gnome-search-tool";
+ panel_launch_desktop_file ("gnome-search-tool.desktop",
-+ "gnome-search-tool",
+ screen,
+ NULL);
+ }
commit 5b62518d4907aa48b83b5e79308d6504d41ff523
Author: Bastien Nocera <hadess(a)fedoraproject.org>
Date: Thu Dec 18 18:39:25 2008 +0000
Add missing include to the search patch
diff --git a/gnome-panel-2.25.3-search.patch b/gnome-panel-2.25.3-search.patch
index 76b760d..d684ae4 100644
--- a/gnome-panel-2.25.3-search.patch
+++ b/gnome-panel-2.25.3-search.patch
@@ -2,7 +2,16 @@ 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)
-@@ -201,6 +201,23 @@
+@@ -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
commit c41fe0bdfe2d836583c0656efdb0709453d14739
Author: Bastien Nocera <hadess(a)fedoraproject.org>
Date: Thu Dec 18 17:45:42 2008 +0000
- Update preferred apps patch to apply
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 16b6aa5..646c7da 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -165,7 +165,7 @@ Panel Applets using the libpanel-applet library.
%patch7 -p1 -b .about-this-computer
%patch8 -p1 -b .launcher-desktop-files
%patch9 -p1 -b .desktop-file-monitoring
-%patch10 -p1 -b .preferred-apps
+%patch10 -p0 -b .preferred-apps
%patch11 -p1 -b .applet-error
%patch24 -p1 -b .allow-spurious-view-done-signals
#%patch25 -p1 -b .smoother-slide-in
@@ -375,7 +375,7 @@ fi
%changelog
* Thu Dec 18 2008 - Bastien Nocera <bnocera(a)redhat.com> - 2.25.3-3
- Remove the mixer from the default panel config as well
-- Update search patch
+- Update search and preferred apps patches
* Wed Dec 17 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.25.3-2
- Update to 2.25.3
diff --git a/preferred-apps.patch b/preferred-apps.patch
index 71281e2..e1de0e5 100644
--- a/preferred-apps.patch
+++ b/preferred-apps.patch
@@ -1,9 +1,36 @@
-diff -up gnome-panel-2.23.6/gnome-panel/launcher.c.preferred-apps
gnome-panel-2.23.6/gnome-panel/launcher.c
---- gnome-panel-2.23.6/gnome-panel/launcher.c.preferred-apps 2008-08-05
12:31:49.000000000 -0400
-+++ gnome-panel-2.23.6/gnome-panel/launcher.c 2008-08-05 12:35:46.000000000 -0400
-@@ -22,6 +22,7 @@
+Index: gnome-panel/panel-run-dialog.c
+===================================================================
+--- gnome-panel/panel-run-dialog.c (revision 11419)
++++ gnome-panel/panel-run-dialog.c (working copy)
+@@ -789,7 +789,7 @@
+ return list;
+ }
+
+-static GSList *
++GSList *
+ get_all_applications (void)
+ {
+ GMenuTree *tree;
+Index: gnome-panel/panel-run-dialog.h
+===================================================================
+--- gnome-panel/panel-run-dialog.h (revision 11419)
++++ gnome-panel/panel-run-dialog.h (working copy)
+@@ -32,6 +32,8 @@
+ void panel_run_dialog_present (GdkScreen *screen,
+ guint32 activate_time);
+
++GSList *get_all_applications (void);
++
+ G_END_DECLS
+
+ #endif /* __PANEL_RUN_DIALOG_H__ */
+Index: gnome-panel/launcher.c
+===================================================================
+--- gnome-panel/launcher.c (revision 11419)
++++ gnome-panel/launcher.c (working copy)
+@@ -21,6 +21,7 @@
+ #include <glib/gi18n.h>
#include <gio/gio.h>
- #include <libgnome/gnome-util.h>
#include <gdk/gdkx.h>
+#include <gmenu-tree.h>
@@ -17,7 +44,7 @@ diff -up gnome-panel-2.23.6/gnome-panel/launcher.c.preferred-apps
gnome-panel-2.
static GdkScreen *
launcher_get_screen (Launcher *launcher)
-@@ -1282,3 +1284,173 @@ panel_launcher_set_dnd_enabled (Launcher
+@@ -1110,3 +1112,173 @@
} else
gtk_drag_source_unset (launcher->button);
}
@@ -191,9 +218,10 @@ diff -up gnome-panel-2.23.6/gnome-panel/launcher.c.preferred-apps
gnome-panel-2.
+ filename, g_free, NULL);
+ }
+}
-diff -up gnome-panel-2.23.6/gnome-panel/launcher.h.preferred-apps
gnome-panel-2.23.6/gnome-panel/launcher.h
---- gnome-panel-2.23.6/gnome-panel/launcher.h.preferred-apps 2008-08-05
12:31:49.000000000 -0400
-+++ gnome-panel-2.23.6/gnome-panel/launcher.h 2008-08-05 12:31:49.000000000 -0400
+Index: gnome-panel/launcher.h
+===================================================================
+--- gnome-panel/launcher.h (revision 11419)
++++ gnome-panel/launcher.h (working copy)
@@ -14,6 +14,8 @@
#include "applet.h"
#include "panel-widget.h"
@@ -202,8 +230,8 @@ diff -up gnome-panel-2.23.6/gnome-panel/launcher.h.preferred-apps
gnome-panel-2.
+
G_BEGIN_DECLS
- #define PANEL_LAUNCHERS_PATH "panel2.d/default/launchers"
-@@ -73,6 +75,7 @@ void launcher_properties_dest
+ typedef struct {
+@@ -70,6 +72,7 @@
void panel_launcher_set_dnd_enabled (Launcher *launcher,
gboolean dnd_enabled);
@@ -211,10 +239,11 @@ diff -up gnome-panel-2.23.6/gnome-panel/launcher.h.preferred-apps
gnome-panel-2.
G_END_DECLS
-diff -up gnome-panel-2.23.6/gnome-panel/main.c.preferred-apps
gnome-panel-2.23.6/gnome-panel/main.c
---- gnome-panel-2.23.6/gnome-panel/main.c.preferred-apps 2008-08-04 16:43:10.000000000
-0400
-+++ gnome-panel-2.23.6/gnome-panel/main.c 2008-08-05 12:31:49.000000000 -0400
-@@ -28,6 +28,7 @@
+Index: gnome-panel/main.c
+===================================================================
+--- gnome-panel/main.c (revision 11419)
++++ gnome-panel/main.c (working copy)
+@@ -27,6 +27,7 @@
#include "panel-action-protocol.h"
#include "panel-lockdown.h"
#include "panel-icon-names.h"
@@ -222,7 +251,7 @@ diff -up gnome-panel-2.23.6/gnome-panel/main.c.preferred-apps
gnome-panel-2.23.6
#include "xstuff.h"
#include "nothing.cP"
-@@ -86,6 +87,7 @@ main (int argc, char **argv)
+@@ -86,6 +87,7 @@
GCONF_CLIENT_PRELOAD_NONE,
NULL);
@@ -230,27 +259,3 @@ diff -up gnome-panel-2.23.6/gnome-panel/main.c.preferred-apps
gnome-panel-2.23.6
panel_global_config_load ();
panel_lockdown_init ();
panel_profile_load ();
-diff -up gnome-panel-2.23.6/gnome-panel/panel-run-dialog.c.preferred-apps
gnome-panel-2.23.6/gnome-panel/panel-run-dialog.c
---- gnome-panel-2.23.6/gnome-panel/panel-run-dialog.c.preferred-apps 2008-08-04
16:43:10.000000000 -0400
-+++ gnome-panel-2.23.6/gnome-panel/panel-run-dialog.c 2008-08-05 12:31:49.000000000
-0400
-@@ -797,7 +797,7 @@ get_all_applications_from_dir (GMenuTree
- return list;
- }
-
--static GSList *
-+GSList *
- get_all_applications (void)
- {
- GMenuTree *tree;
-diff -up gnome-panel-2.23.6/gnome-panel/panel-run-dialog.h.preferred-apps
gnome-panel-2.23.6/gnome-panel/panel-run-dialog.h
---- gnome-panel-2.23.6/gnome-panel/panel-run-dialog.h.preferred-apps 2008-08-04
16:43:10.000000000 -0400
-+++ gnome-panel-2.23.6/gnome-panel/panel-run-dialog.h 2008-08-05 12:31:49.000000000
-0400
-@@ -32,6 +32,8 @@ G_BEGIN_DECLS
- void panel_run_dialog_present (GdkScreen *screen,
- guint32 activate_time);
-
-+GSList *get_all_applications (void);
-+
- G_END_DECLS
-
- #endif /* __PANEL_RUN_DIALOG_H__ */
commit f6a2de691b22dd55b635feff9b08069be3822784
Author: Bastien Nocera <hadess(a)fedoraproject.org>
Date: Thu Dec 18 17:15:19 2008 +0000
- Update search patch
diff --git a/gnome-panel-2.16.1-search.patch b/gnome-panel-2.16.1-search.patch
deleted file mode 100644
index e59ebd7..0000000
--- a/gnome-panel-2.16.1-search.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- gnome-panel-2.16.1/gnome-panel/panel-action-button.c.use-beagle 2006-08-07
17:07:46.000000000 -0400
-+++ gnome-panel-2.16.1/gnome-panel/panel-action-button.c 2006-11-21 08:46:10.000000000
-0500
-@@ -189,16 +189,31 @@
- {
- GdkScreen *screen;
- GError *error = NULL;
-+ const gchar *prog;
-
- screen = gtk_widget_get_screen (widget);
-- panel_launch_desktop_file ("gnome-search-tool.desktop",
-- "gnome-search-tool",
-- screen,
-- &error);
-+ if (panel_has_desktop_file ("gnome-beagle-search.desktop")) {
-+ prog = "beagle-search";
-+ panel_launch_desktop_file ("gnome-beagle-search.desktop",
-+ "beagle-search",
-+ screen,
-+ &error);
-+ } else if (panel_has_desktop_file ("fedora-tracker-search-tool.desktop")) {
-+ prog = "tracker-search-tool";
-+ panel_launch_desktop_file ("fedora-tracker-search-tool.desktop",
-+ "tracker-search-tool",
-+ screen,
-+ &error);
-+ } else {
-+ prog = "gnome-search-tool";
-+ panel_launch_desktop_file ("gnome-search-tool.desktop",
-+ "gnome-search-tool",
-+ screen,
-+ &error);
-+ }
- if (error) {
- char *primary;
-- primary = g_strdup_printf (_("Could not execute '%s'"),
-- "gnome-search-tool");
-+ primary = g_strdup_printf (_("Could not execute '%s'"), prog);
- panel_error_dialog (NULL, screen,
- "cannot_exec_gnome-search-tool", TRUE,
- primary, error->message);
---- gnome-panel-2.16.1/gnome-panel/panel-menu-items.c.use-beagle 2006-11-21
08:36:27.000000000 -0500
-+++ gnome-panel-2.16.1/gnome-panel/panel-menu-items.c 2006-11-21 08:43:40.000000000
-0500
-@@ -627,9 +627,20 @@
-
- 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);
---- gnome-panel-2.16.1/gnome-panel/panel-util.h.use-beagle 2006-11-21 08:46:52.000000000
-0500
-+++ gnome-panel-2.16.1/gnome-panel/panel-util.h 2006-11-21 08:47:28.000000000 -0500
-@@ -16,6 +16,7 @@
- GList *file_list,
- GdkScreen *screen,
- GError **error);
-+gboolean panel_has_desktop_file (const char
*desktop_file);
- void panel_launch_desktop_file (const char *desktop_file,
- const char *fallback_exec,
- GdkScreen *screen,
---- gnome-panel-2.16.1/gnome-panel/panel-util.c.use-beagle 2006-11-21 08:46:59.000000000
-0500
-+++ gnome-panel-2.16.1/gnome-panel/panel-util.c 2006-11-21 08:47:54.000000000 -0500
-@@ -96,6 +96,23 @@
- gnome_desktop_item_unref (ditem);
- }
-
-+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;
-+}
-+
- void
- panel_launch_desktop_file (const char *desktop_file,
- const char *fallback_exec,
diff --git a/gnome-panel-2.25.3-search.patch b/gnome-panel-2.25.3-search.patch
new file mode 100644
index 0000000..76b760d
--- /dev/null
+++ b/gnome-panel-2.25.3-search.patch
@@ -0,0 +1,106 @@
+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)
+@@ -201,6 +201,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)
+@@ -218,11 +218,28 @@
+ panel_action_search (GtkWidget *widget)
+ {
+ GdkScreen *screen;
++ const gchar *prog;
+
+ 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")) {
++ prog = "beagle-search";
++ panel_launch_desktop_file ("gnome-beagle-search.desktop",
++ "beagle-search",
++ screen,
++ NULL);
++ } else if (panel_has_desktop_file ("fedora-tracker-search-tool.desktop")) {
++ prog = "tracker-search-tool";
++ panel_launch_desktop_file ("fedora-tracker-search-tool.desktop",
++ "tracker-search-tool",
++ screen,
++ NULL);
++ } else {
++ prog = "gnome-search-tool";
++ panel_launch_desktop_file ("gnome-search-tool.desktop",
++ "gnome-search-tool",
++ screen,
++ NULL);
++ }
+ }
+
+ /* Force Quit
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 12db061..16b6aa5 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -93,7 +93,7 @@ BuildRequires: gettext-devel
Patch0: gnome-panel-2.23.4-vendor.patch
Patch1: gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch
Patch2: gnome-panel-2.17.91-about-fedora.patch
-Patch4: gnome-panel-2.16.1-search.patch
+Patch4: gnome-panel-2.25.3-search.patch
# Drop this patch for now, it should have AT LEAST been moved
# to an upstream bugzilla by now
#Patch6: gnome-panel-2.16.0-compiz-support.patch
@@ -160,7 +160,7 @@ Panel Applets using the libpanel-applet library.
%patch0 -p1 -b .vendor
%patch1 -p1 -b .speak-to-us-ye-old-wise-fish
%patch2 -p1 -b .about-fedora
-%patch4 -p1 -b .search
+%patch4 -p0 -b .search
##%patch6 -p0 -b .compiz-support
%patch7 -p1 -b .about-this-computer
%patch8 -p1 -b .launcher-desktop-files
@@ -375,6 +375,7 @@ fi
%changelog
* Thu Dec 18 2008 - Bastien Nocera <bnocera(a)redhat.com> - 2.25.3-3
- Remove the mixer from the default panel config as well
+- Update search patch
* Wed Dec 17 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.25.3-2
- Update to 2.25.3
commit 2d5fc97ab1beeb6d1be9555974da2dbc6fa09311
Author: Bastien Nocera <hadess(a)fedoraproject.org>
Date: Thu Dec 18 15:52:05 2008 +0000
- Remove the mixer from the default panel config as well
diff --git a/gnome-panel.spec b/gnome-panel.spec
index a325df3..12db061 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -23,7 +23,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.25.3
-Release: 2%{?dist}
+Release: 3%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.25/%{name}-%{version}.tar...
@@ -373,6 +373,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Thu Dec 18 2008 - Bastien Nocera <bnocera(a)redhat.com> - 2.25.3-3
+- Remove the mixer from the default panel config as well
+
* Wed Dec 17 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.25.3-2
- Update to 2.25.3
- Drop mixer from default config
diff --git a/redhat-panel-backwards-compat-config.schemas
b/redhat-panel-backwards-compat-config.schemas
index 2361340..2cdaf44 100644
--- a/redhat-panel-backwards-compat-config.schemas
+++ b/redhat-panel-backwards-compat-config.schemas
@@ -1120,61 +1120,6 @@ see
http://www.gnome.org/projects/gconf/
</locale>
</schema>
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/applets/mixer_applet/object_type</key>
- <owner>panel</owner>
- <type>string</type>
- <default>bonobo-applet</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/applets/mixer_applet/panel_id</key>
- <owner>panel</owner>
- <type>string</type>
- <default>bottom_panel</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/applets/mixer_applet/position</key>
- <owner>panel</owner>
- <type>int</type>
- <default>-20</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/applets/mixer_applet/bonobo_iid</key>
- <owner>panel</owner>
- <type>string</type>
- <default>OAFIID:GNOME_MixerApplet</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
- <schema>
-
<key>/schemas/apps/panel/default_profiles/medium/applets/mixer_applet/panel_right_stick</key>
- <owner>panel</owner>
- <type>bool</type>
- <default>true</default>
- <locale name="C">
- <short></short>
- <long></long>
- </locale>
- </schema>
-
<!-- clock -->
<schema>
commit 054cb0f894caba351de3f38e692a6cf16e044bc8
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Dec 18 05:37:22 2008 +0000
Try again
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 46172b3..a325df3 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -23,7 +23,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.25.3
-Release: 1%{?dist}
+Release: 2%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.25/%{name}-%{version}.tar...
@@ -373,8 +373,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
-* Wed Dec 17 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.25.3-1
+* Wed Dec 17 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.25.3-2
- Update to 2.25.3
+- Drop mixer from default config
* Thu Nov 13 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.24.1-6
- Rebuild
diff --git a/redhat-panel-default-setup.entries b/redhat-panel-default-setup.entries
index 83a6c13..3812d96 100644
--- a/redhat-panel-default-setup.entries
+++ b/redhat-panel-default-setup.entries
@@ -50,9 +50,6 @@
<string>tomboy</string>
</value>
<value>
- <string>mixer</string>
- </value>
- <value>
<string>clock</string>
</value>
<value>
@@ -391,60 +388,6 @@
<entry><key>applets/tomboy/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
<entry><key>applets/tomboy/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
- <!-- Mixer Applet -->
-
- <entry>
- <key>applets/mixer/object_type</key>
- <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
- <value>
- <string>bonobo-applet</string>
- </value>
- </entry>
- <entry>
- <key>applets/mixer/toplevel_id</key>
- <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
- <value>
- <string>top_panel</string>
- </value>
- </entry>
- <entry>
- <key>applets/mixer/position</key>
- <schema_key>/schemas/apps/panel/objects/position</schema_key>
- <value>
- <int>0</int>
- </value>
- </entry>
- <entry>
- <key>applets/mixer/panel_right_stick</key>
- <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
- <value>
- <bool>true</bool>
- </value>
- </entry>
- <entry>
- <key>applets/mixer/locked</key>
- <schema_key>/schemas/apps/panel/objects/locked</schema_key>
- <value>
- <bool>true</bool>
- </value>
- </entry>
- <entry>
- <key>applets/mixer/bonobo_iid</key>
- <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
- <value>
- <string>OAFIID:GNOME_MixerApplet</string>
- </value>
- </entry>
-
-
<entry><key>applets/mixer/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key>
</entry>
-
<entry><key>applets/mixer/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
-
<entry><key>applets/mixer/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
-
<entry><key>applets/mixer/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
-
<entry><key>applets/mixer/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
-
<entry><key>applets/mixer/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
-
<entry><key>applets/mixer/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
-
<entry><key>applets/mixer/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
-
<!-- Fast User Switch Applet -->
<entry>
commit 6f4dbe53081173bbca1953fcbb1f5ba2a88627c3
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Dec 18 00:07:30 2008 +0000
2.25.3
diff --git a/.cvsignore b/.cvsignore
index dbdb9ee..e5bf972 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.24.1.tar.bz2
+gnome-panel-2.25.3.tar.bz2
diff --git a/gnome-panel.spec b/gnome-panel.spec
index ad79dd1..46172b3 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,10 +22,10 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.24.1
-Release: 6%{?dist}
+Version: 2.25.3
+Release: 1%{?dist}
URL:
http://www.gnome.org
-Source0:
http://download.gnome.org/sources/gnome-panel/2.24/%{name}-%{version}.tar...
+Source0:
http://download.gnome.org/sources/gnome-panel/2.25/%{name}-%{version}.tar...
Source3: redhat-panel-default-setup.entries
Source4: gnome-compiler-flags.m4
@@ -373,6 +373,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Wed Dec 17 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.25.3-1
+- Update to 2.25.3
+
* Thu Nov 13 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.24.1-6
- Rebuild
diff --git a/sources b/sources
index ef7ac1e..ae3bc2c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-37742d8fcb909965d5e18f351a7c4578 gnome-panel-2.24.1.tar.bz2
+72173f5fe7775cf9c432e2e60ef856df gnome-panel-2.25.3.tar.bz2
commit 6066a4d31c0d06bfe30663ad396a4c60110534f1
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Nov 14 03:37:04 2008 +0000
libtool me harder
diff --git a/gnome-panel.spec b/gnome-panel.spec
index a97f16c..ad79dd1 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -23,7 +23,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.24.1
-Release: 5%{?dist}
+Release: 6%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.24/%{name}-%{version}.tar...
@@ -173,6 +173,8 @@ Panel Applets using the libpanel-applet library.
%patch35 -p1 -b .clock-wakeups
%patch36 -p1 -b .tryexec
+libtoolize --force --copy
+
. %{SOURCE6}
cp -f %{SOURCE3} gnome-panel/panel-default-setup.entries
@@ -371,7 +373,7 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
-* Thu Nov 13 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.24.1-5
+* Thu Nov 13 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.24.1-6
- Rebuild
* Sun Nov 9 2008 Ray Strode <rstrode(a)redhat.com> - 2.24.1-4
commit 3bebee988c1fa1713b19204cfa46ffb0bc9e9969
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Nov 14 03:17:35 2008 +0000
rebuild
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 274c324..a97f16c 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -23,7 +23,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.24.1
-Release: 4%{?dist}
+Release: 5%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.24/%{name}-%{version}.tar...
@@ -168,7 +168,7 @@ Panel Applets using the libpanel-applet library.
%patch10 -p1 -b .preferred-apps
%patch11 -p1 -b .applet-error
%patch24 -p1 -b .allow-spurious-view-done-signals
-%patch25 -p1 -b .smoother-slide-in
+#%patch25 -p1 -b .smoother-slide-in
%patch26 -p1 -b .hide-shutdown-item-if-unavailable
%patch35 -p1 -b .clock-wakeups
%patch36 -p1 -b .tryexec
@@ -371,6 +371,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Thu Nov 13 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.24.1-5
+- Rebuild
+
* Sun Nov 9 2008 Ray Strode <rstrode(a)redhat.com> - 2.24.1-4
- Don't unhide drawers by default. Patch from
Leszek Matok <lam(a)lac.pl> (bug 470719)
commit c571f754c30fd9eac129c00a9d639a82052fd905
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Mon Nov 10 04:48:15 2008 +0000
- Don't unhide drawers by default. Patch from Leszek Matok <lam(a)lac.pl>
(bug 470719)
diff --git a/gnome-panel-2.24.1-smoother-slide-in.patch
b/gnome-panel-2.24.1-smoother-slide-in.patch
index 08875d1..389a015 100644
--- a/gnome-panel-2.24.1-smoother-slide-in.patch
+++ b/gnome-panel-2.24.1-smoother-slide-in.patch
@@ -31,8 +31,8 @@ index 165ded5..53be8e4 100644
+ PanelToplevel *toplevel;
+
+ toplevel = (PanelToplevel *) l->data;
-+
-+ panel_toplevel_queue_initial_unhide (toplevel);
++ if (!panel_toplevel_get_is_attached (toplevel))
++ panel_toplevel_queue_initial_unhide (toplevel);
+ l = l->next;
+ }
+
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 14f32d4..274c324 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -23,7 +23,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.24.1
-Release: 3%{?dist}
+Release: 4%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.24/%{name}-%{version}.tar...
@@ -371,6 +371,10 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Sun Nov 9 2008 Ray Strode <rstrode(a)redhat.com> - 2.24.1-4
+- Don't unhide drawers by default. Patch from
+ Leszek Matok <lam(a)lac.pl> (bug 470719)
+
* Mon Nov 3 2008 Ray Strode <rstrode(a)redhat.com> - 2.24.1-3
- Fix up panel slide in patch to work better with empty panels
commit 952d4eeabcf225e3f773f96a27e515d2a2232ab1
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Tue Nov 4 02:16:24 2008 +0000
- Fix up panel slide in patch to work better with empty panels
diff --git a/gnome-panel-2.24.1-smoother-slide-in.patch
b/gnome-panel-2.24.1-smoother-slide-in.patch
index 9b2c152..08875d1 100644
--- a/gnome-panel-2.24.1-smoother-slide-in.patch
+++ b/gnome-panel-2.24.1-smoother-slide-in.patch
@@ -1,11 +1,11 @@
-commit 37414a0c6ee5e655b72742b3279f363990c444ae
+commit 2d6b5f237b167989b96302b8447333dc94e082f6
Author: Ray Strode <rstrode(a)redhat.com>
Date: Mon Nov 3 17:19:13 2008 -0500
Don't slide panel down until applets load
diff --git a/gnome-panel/applet.c b/gnome-panel/applet.c
-index 165ded5..6c880a4 100644
+index 165ded5..53be8e4 100644
--- a/gnome-panel/applet.c
+++ b/gnome-panel/applet.c
@@ -792,6 +792,7 @@ typedef struct {
@@ -16,10 +16,29 @@ index 165ded5..6c880a4 100644
static gboolean panel_applet_have_load_idle = FALSE;
static void
-@@ -818,6 +819,44 @@ panel_applet_on_load_queue (const char *id)
- return FALSE;
+@@ -819,6 +820,52 @@ panel_applet_on_load_queue (const char *id)
}
+ static gboolean
++initially_unhide_toplevels (void)
++{
++ GSList *toplevels, *l;
++
++ toplevels = panel_toplevel_list_toplevels ();
++
++ l = toplevels;
++ while (l != NULL) {
++ PanelToplevel *toplevel;
++
++ toplevel = (PanelToplevel *) l->data;
++
++ panel_toplevel_queue_initial_unhide (toplevel);
++ l = l->next;
++ }
++
++ return FALSE;
++}
++
+void
+panel_applet_stop_loading (const char *id)
+{
@@ -42,26 +61,15 @@ index 165ded5..6c880a4 100644
+ free_applet_to_load (applet);
+
+ if (panel_applets_loading == NULL) {
-+ GSList *toplevels, *l;
-+
-+ toplevels = panel_toplevel_list_toplevels ();
-+
-+ l = toplevels;
-+ while (l != NULL) {
-+ PanelToplevel *toplevel;
-+
-+ toplevel = (PanelToplevel *) l->data;
-+
-+ panel_toplevel_queue_initial_unhide (toplevel);
-+ l = l->next;
-+ }
++ initially_unhide_toplevels ();
+ }
+}
+
- static gboolean
++static gboolean
panel_applet_load_idle_handler (gpointer dummy)
{
-@@ -848,8 +887,8 @@ panel_applet_load_idle_handler (gpointer dummy)
+ PanelAppletToLoad *applet = NULL;
+@@ -848,8 +895,8 @@ panel_applet_load_idle_handler (gpointer dummy)
panel_applet_have_load_idle = FALSE;
return FALSE;
}
@@ -71,7 +79,7 @@ index 165ded5..6c880a4 100644
panel_widget = panel_toplevel_get_panel_widget (toplevel);
-@@ -873,6 +912,7 @@ panel_applet_load_idle_handler (gpointer dummy)
+@@ -873,6 +920,7 @@ panel_applet_load_idle_handler (gpointer dummy)
applet->locked,
applet->position,
applet->id);
@@ -79,7 +87,7 @@ index 165ded5..6c880a4 100644
break;
case PANEL_OBJECT_MENU:
panel_menu_button_load_from_gconf (panel_widget,
-@@ -880,12 +920,14 @@ panel_applet_load_idle_handler (gpointer dummy)
+@@ -880,12 +928,14 @@ panel_applet_load_idle_handler (gpointer dummy)
applet->position,
TRUE,
applet->id);
@@ -94,7 +102,7 @@ index 165ded5..6c880a4 100644
break;
case PANEL_OBJECT_LOGOUT:
case PANEL_OBJECT_LOCK:
-@@ -896,6 +938,7 @@ panel_applet_load_idle_handler (gpointer dummy)
+@@ -896,6 +946,7 @@ panel_applet_load_idle_handler (gpointer dummy)
applet->position,
TRUE,
applet->id);
@@ -102,7 +110,7 @@ index 165ded5..6c880a4 100644
break;
case PANEL_OBJECT_ACTION:
panel_action_button_load_from_gconf (
-@@ -904,6 +947,7 @@ panel_applet_load_idle_handler (gpointer dummy)
+@@ -904,6 +955,7 @@ panel_applet_load_idle_handler (gpointer dummy)
applet->position,
TRUE,
applet->id);
@@ -110,7 +118,7 @@ index 165ded5..6c880a4 100644
break;
case PANEL_OBJECT_MENU_BAR:
panel_menu_bar_load_from_gconf (
-@@ -912,18 +956,18 @@ panel_applet_load_idle_handler (gpointer dummy)
+@@ -912,18 +964,18 @@ panel_applet_load_idle_handler (gpointer dummy)
applet->position,
TRUE,
applet->id);
@@ -131,6 +139,18 @@ index 165ded5..6c880a4 100644
return TRUE;
}
+@@ -971,8 +1023,10 @@ panel_applet_compare (const PanelAppletToLoad *a,
+ void
+ panel_applet_load_queued_applets (void)
+ {
+- if (!panel_applets_to_load)
++ if (!panel_applets_to_load) {
++ g_idle_add (initially_unhide_toplevels, NULL);
+ return;
++ }
+
+ panel_applets_to_load = g_slist_sort (panel_applets_to_load,
+ (GCompareFunc) panel_applet_compare);
diff --git a/gnome-panel/applet.h b/gnome-panel/applet.h
index 8790229..16cfa46 100644
--- a/gnome-panel/applet.h
@@ -262,7 +282,7 @@ index 81e6c76..60400ea 100644
void panel_toplevel_pop_autohide_disabler (PanelToplevel
*toplevel);
-commit e0ab832dcf9a2bf7889abef798b56b67bcb2b167
+commit 2c3e3ad9f93a2b17e2a251913e48d154d15ef93e
Author: Ray Strode <rstrode(a)redhat.com>
Date: Mon Nov 3 11:50:16 2008 -0500
@@ -331,7 +351,7 @@ index 37fc5f0..0962659 100644
cur_y -= panel_multiscreen_y (screen, toplevel->priv->monitor);
-commit 7c9b2b501b3b3c83dc030de70f6d13e76c0c328e
+commit 36b97aa7bb302b65f554c370d7e8c58af4386a76
Author: Ray Strode <rstrode(a)redhat.com>
Date: Mon Nov 3 17:20:09 2008 -0500
@@ -563,7 +583,7 @@ index 0962659..bef6a02 100644
g_object_notify (G_OBJECT (toplevel), "auto-hide");
-commit c78ee2be16ffe3a2f158bc880be246f06623d60c
+commit 2184c0fc4aa8fea0ffebe1192164125e24107178
Author: Ray Strode <rstrode(a)redhat.com>
Date: Mon Nov 3 17:12:04 2008 -0500
@@ -582,7 +602,7 @@ index bef6a02..96f564c 100644
}
-commit 9d711261374f2fc55664c1707f5cf283c594be8a
+commit 835cea12efb407b2c9181d33e442317cc1a16904
Author: Ray Strode <rstrode(a)redhat.com>
Date: Mon Nov 3 17:13:32 2008 -0500
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 6e0ebe5..14f32d4 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -23,7 +23,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.24.1
-Release: 2%{?dist}
+Release: 3%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.24/%{name}-%{version}.tar...
@@ -371,6 +371,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Mon Nov 3 2008 Ray Strode <rstrode(a)redhat.com> - 2.24.1-3
+- Fix up panel slide in patch to work better with empty panels
+
* Mon Nov 3 2008 Ray Strode <rstrode(a)redhat.com> - 2.24.1-2
- Fix up panel slide in patch to
1) not have odd effects with vertical panels
commit 537397c929e01e7b0f23bc44db7248c5445b4ee6
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Mon Nov 3 23:06:33 2008 +0000
- Fix up panel slide in patch to
1) not have odd effects with vertical panels
2) set up struts earlier
diff --git a/gnome-panel-2.24.0-smoother-slide-in.patch
b/gnome-panel-2.24.0-smoother-slide-in.patch
deleted file mode 100644
index e423679..0000000
--- a/gnome-panel-2.24.0-smoother-slide-in.patch
+++ /dev/null
@@ -1,448 +0,0 @@
-Author: Ray Strode <rstrode(a)redhat.com>
-Date: Wed Oct 22 08:56:23 2008 -0400
-
- Split animation end side calculation to new func
-
- We're going to need it in other places than
- start_animation.
-
---- gnome-panel-2.24.0/gnome-panel/panel-toplevel.c
-+++ gnome-panel-2.24.0/gnome-panel/panel-toplevel.c
-@@ -3334,22 +3334,19 @@ panel_toplevel_get_animation_time (PanelToplevel *toplevel)
- }
-
- static void
--panel_toplevel_start_animation (PanelToplevel *toplevel)
-+panel_toplevel_calculate_animation_end_geometry (PanelToplevel *toplevel)
- {
- GdkScreen *screen;
- int monitor_width, monitor_height;
-- int deltax, deltay, deltaw = 0, deltah = 0;
-- int cur_x = -1, cur_y = -1;
-- long t;
--
-- screen = panel_toplevel_get_monitor_geometry (
-- toplevel, NULL, NULL, &monitor_width, &monitor_height);
-
- toplevel->priv->animation_end_x = toplevel->priv->x;
- toplevel->priv->animation_end_y = toplevel->priv->y;
- toplevel->priv->animation_end_width = -1;
- toplevel->priv->animation_end_height = -1;
-
-+ screen = panel_toplevel_get_monitor_geometry (
-+ toplevel, NULL, NULL, &monitor_width, &monitor_height);
-+
- if (!toplevel->priv->expand) {
-
- if (toplevel->priv->x_centered)
-@@ -3380,6 +3377,18 @@ panel_toplevel_start_animation (PanelToplevel *toplevel)
- &toplevel->priv->animation_end_width,
- &toplevel->priv->animation_end_height);
-
-+}
-+
-+static void
-+panel_toplevel_start_animation (PanelToplevel *toplevel)
-+{
-+ GdkScreen *screen;
-+ int deltax, deltay, deltaw = 0, deltah = 0;
-+ int cur_x = -1, cur_y = -1;
-+ long t;
-+
-+ panel_toplevel_calculate_animation_end_geometry (toplevel);
-+
- toplevel->priv->animating = TRUE;
-
- panel_toplevel_update_struts (toplevel, TRUE);
-@@ -3392,6 +3401,8 @@ panel_toplevel_start_animation (PanelToplevel *toplevel)
-
- gdk_window_get_origin (GTK_WIDGET (toplevel)->window, &cur_x, &cur_y);
-
-+ screen = gtk_widget_get_screen (GTK_WIDGET (toplevel));
-+
- cur_x -= panel_multiscreen_x (screen, toplevel->priv->monitor);
- cur_y -= panel_multiscreen_y (screen, toplevel->priv->monitor);
-
-
-Author: Ray Strode <rstrode(a)redhat.com>
-Date: Wed Oct 22 10:27:00 2008 -0400
-
- Don't change struts while animating
-
---- gnome-panel-2.24.0/gnome-panel/panel-toplevel.c
-+++ gnome-panel-2.24.0/gnome-panel/panel-toplevel.c
-@@ -231,6 +231,8 @@ enum {
- static guint toplevel_signals [LAST_SIGNAL] = { 0 };
- static GSList *toplevel_list = NULL;
-
-+static void panel_toplevel_calculate_animation_end_geometry (PanelToplevel *toplevel);
-+
- GSList *
- panel_toplevel_list_toplevels (void)
- {
-@@ -1372,7 +1374,7 @@ panel_toplevel_get_effective_auto_hide_size (PanelToplevel
*toplevel)
- }
-
- static gboolean
--panel_toplevel_update_struts (PanelToplevel *toplevel, gboolean end_of_animation)
-+panel_toplevel_update_struts (PanelToplevel *toplevel)
- {
- PanelOrientation orientation;
- GdkScreen *screen;
-@@ -1382,6 +1384,8 @@ panel_toplevel_update_struts (PanelToplevel *toplevel, gboolean
end_of_animation
- int monitor_x, monitor_y;
- int monitor_width, monitor_height;
-
-+ panel_toplevel_calculate_animation_end_geometry (toplevel);
-+
- if (!toplevel->priv->updated_geometry_initial)
- return FALSE;
-
-@@ -1397,25 +1401,18 @@ panel_toplevel_update_struts (PanelToplevel *toplevel, gboolean
end_of_animation
- &monitor_width,
- &monitor_height);
-
-- if (end_of_animation) {
-- x = toplevel->priv->animation_end_x;
-- y = toplevel->priv->animation_end_y;
-- x += panel_multiscreen_x (screen, toplevel->priv->monitor);
-- x += panel_multiscreen_y (screen, toplevel->priv->monitor);
-- if (toplevel->priv->animation_end_width != -1)
-- width = toplevel->priv->animation_end_width;
-- else
-- width = toplevel->priv->geometry.width;
-- if (toplevel->priv->animation_end_height != -1)
-- height = toplevel->priv->animation_end_height;
-- else
-- height = toplevel->priv->geometry.height;
-- } else {
-- x = toplevel->priv->geometry.x;
-- y = toplevel->priv->geometry.y;
-- width = toplevel->priv->geometry.width;
-+ x = toplevel->priv->animation_end_x;
-+ y = toplevel->priv->animation_end_y;
-+ x += panel_multiscreen_x (screen, toplevel->priv->monitor);
-+ x += panel_multiscreen_y (screen, toplevel->priv->monitor);
-+ if (toplevel->priv->animation_end_width != -1)
-+ width = toplevel->priv->animation_end_width;
-+ else
-+ width = toplevel->priv->geometry.width;
-+ if (toplevel->priv->animation_end_height != -1)
-+ height = toplevel->priv->animation_end_height;
-+ else
- height = toplevel->priv->geometry.height;
-- }
-
- orientation = toplevel->priv->orientation;
-
-@@ -2499,7 +2496,7 @@ panel_toplevel_update_geometry (PanelToplevel *toplevel,
- panel_toplevel_update_size (toplevel, requisition);
- panel_toplevel_update_position (toplevel);
-
-- panel_toplevel_update_struts (toplevel, FALSE);
-+ panel_toplevel_update_struts (toplevel);
- if (toplevel->priv->state == PANEL_STATE_NORMAL ||
- toplevel->priv->state == PANEL_STATE_AUTO_HIDDEN) {
- panel_struts_update_toplevel_geometry (toplevel,
-@@ -2903,6 +2900,7 @@ panel_toplevel_initially_hide (PanelToplevel *toplevel)
- toplevel->priv->state = PANEL_STATE_AUTO_HIDDEN;
- gtk_widget_queue_resize (GTK_WIDGET (toplevel));
-
-+ panel_toplevel_update_struts (toplevel);
- panel_toplevel_queue_auto_unhide (toplevel);
- } else
- toplevel->priv->initial_animation_done = TRUE;
-@@ -3391,13 +3389,12 @@ panel_toplevel_start_animation (PanelToplevel *toplevel)
-
- toplevel->priv->animating = TRUE;
-
-- panel_toplevel_update_struts (toplevel, TRUE);
- panel_struts_update_toplevel_geometry (toplevel,
- &toplevel->priv->animation_end_x,
- &toplevel->priv->animation_end_y,
- &toplevel->priv->animation_end_width,
- &toplevel->priv->animation_end_height);
-- panel_toplevel_update_struts (toplevel, FALSE);
-+ panel_toplevel_update_struts (toplevel);
-
- gdk_window_get_origin (GTK_WIDGET (toplevel)->window, &cur_x, &cur_y);
-
-@@ -4794,7 +4791,7 @@ panel_toplevel_set_auto_hide_size (PanelToplevel *toplevel,
- toplevel->priv->auto_hide_size = auto_hide_size;
-
- if (toplevel->priv->state == PANEL_STATE_AUTO_HIDDEN) {
-- if (panel_toplevel_update_struts (toplevel, FALSE)) {
-+ if (panel_toplevel_update_struts (toplevel)) {
- if (toplevel->priv->animate) {
- panel_toplevel_unhide (toplevel);
- panel_toplevel_hide (toplevel, TRUE, -1);
-@@ -4970,7 +4967,7 @@ panel_toplevel_set_auto_hide (PanelToplevel *toplevel,
- else
- panel_toplevel_queue_auto_unhide (toplevel);
-
-- if (panel_toplevel_update_struts (toplevel, FALSE))
-+ if (panel_toplevel_update_struts (toplevel))
- gtk_widget_queue_resize (GTK_WIDGET (toplevel));
-
- g_object_notify (G_OBJECT (toplevel), "auto-hide");
-
-Author: Ray Strode <rstrode(a)redhat.com>
-Date: Wed Oct 22 10:55:48 2008 -0400
-
- Delay slide out until applets register
-
---- gnome-panel-2.24.0/gnome-panel/applet.c
-+++ gnome-panel-2.24.0/gnome-panel/applet.c
-@@ -792,6 +792,7 @@ typedef struct {
- } PanelAppletToLoad;
-
- static GSList *panel_applets_to_load = NULL;
-+static GSList *panel_applets_loading = NULL;
- static gboolean panel_applet_have_load_idle = FALSE;
-
- static void
-@@ -818,6 +819,44 @@ panel_applet_on_load_queue (const char *id)
- return FALSE;
- }
-
-+void
-+panel_applet_stop_loading (const char *id)
-+{
-+ PanelAppletToLoad *applet;
-+ GSList *l, *applet_link;
-+
-+ applet_link = NULL;
-+ for (l = panel_applets_loading; l; l = l->next) {
-+ applet = l->data;
-+
-+ if (strcmp (applet->id, id) == 0) {
-+ break;
-+ }
-+ }
-+
-+ if (l == NULL)
-+ return;
-+
-+ panel_applets_loading = g_slist_delete_link (panel_applets_loading, l);
-+ free_applet_to_load (applet);
-+
-+ if (panel_applets_loading == NULL) {
-+ GSList *toplevels, *l;
-+
-+ toplevels = panel_toplevel_list_toplevels ();
-+
-+ l = toplevels;
-+ while (l != NULL) {
-+ PanelToplevel *toplevel;
-+
-+ toplevel = (PanelToplevel *) l->data;
-+
-+ panel_toplevel_queue_initial_unhide (toplevel);
-+ l = l->next;
-+ }
-+ }
-+}
-+
- static gboolean
- panel_applet_load_idle_handler (gpointer dummy)
- {
-@@ -848,8 +887,8 @@ panel_applet_load_idle_handler (gpointer dummy)
- panel_applet_have_load_idle = FALSE;
- return FALSE;
- }
--
- panel_applets_to_load = g_slist_delete_link (panel_applets_to_load, l);
-+ panel_applets_loading = g_slist_append (panel_applets_loading, applet);
-
- panel_widget = panel_toplevel_get_panel_widget (toplevel);
-
-@@ -873,6 +912,7 @@ panel_applet_load_idle_handler (gpointer dummy)
- applet->locked,
- applet->position,
- applet->id);
-+ panel_applet_stop_loading (applet->id);
- break;
- case PANEL_OBJECT_MENU:
- panel_menu_button_load_from_gconf (panel_widget,
-@@ -880,12 +920,14 @@ panel_applet_load_idle_handler (gpointer dummy)
- applet->position,
- TRUE,
- applet->id);
-+ panel_applet_stop_loading (applet->id);
- break;
- case PANEL_OBJECT_LAUNCHER:
- launcher_load_from_gconf (panel_widget,
- applet->locked,
- applet->position,
- applet->id);
-+ panel_applet_stop_loading (applet->id);
- break;
- case PANEL_OBJECT_LOGOUT:
- case PANEL_OBJECT_LOCK:
-@@ -896,6 +938,7 @@ panel_applet_load_idle_handler (gpointer dummy)
- applet->position,
- TRUE,
- applet->id);
-+ panel_applet_stop_loading (applet->id);
- break;
- case PANEL_OBJECT_ACTION:
- panel_action_button_load_from_gconf (
-@@ -904,6 +947,7 @@ panel_applet_load_idle_handler (gpointer dummy)
- applet->position,
- TRUE,
- applet->id);
-+ panel_applet_stop_loading (applet->id);
- break;
- case PANEL_OBJECT_MENU_BAR:
- panel_menu_bar_load_from_gconf (
-@@ -912,18 +956,18 @@ panel_applet_load_idle_handler (gpointer dummy)
- applet->position,
- TRUE,
- applet->id);
-+ panel_applet_stop_loading (applet->id);
- break;
- case PANEL_OBJECT_SEPARATOR:
- panel_separator_load_from_gconf (panel_widget,
- applet->locked,
- applet->position,
- applet->id);
-+ panel_applet_stop_loading (applet->id);
- default:
- break;
- }
-
-- free_applet_to_load (applet);
--
- return TRUE;
- }
-
---- gnome-panel-2.24.0/gnome-panel/applet.h
-+++ gnome-panel-2.24.0/gnome-panel/applet.h
-@@ -53,6 +53,7 @@ AppletInfo *panel_applet_register (GtkWidget *applet,
- gboolean exactpos,
- PanelObjectType type,
- const char *id);
-+void panel_applet_stop_loading (const char *id);
-
- const char *panel_applet_get_id (AppletInfo *info);
- const char *panel_applet_get_id_by_widget (GtkWidget *widget);
---- gnome-panel-2.24.0/gnome-panel/panel-applet-frame.c
-+++ gnome-panel-2.24.0/gnome-panel/panel-applet-frame.c
-@@ -1286,6 +1286,7 @@ panel_applet_frame_activated (CORBA_Object object,
- if (!in_default_panel_config (frame_act->id)) {
- panel_applet_frame_loading_failed (frame, frame_act->id);
- }
-+ panel_applet_stop_loading (frame_act->id);
- g_free (frame_act->id);
- g_free (frame_act);
- return;
-@@ -1328,6 +1329,7 @@ panel_applet_frame_activated (CORBA_Object object,
- panel_applet_frame_loading_failed (frame, frame_act->id);
- CORBA_exception_free (&corba_ev);
- bonobo_object_release_unref (object, NULL);
-+ panel_applet_stop_loading (frame_act->id);
- g_free (frame_act->id);
- g_free (frame_act);
- g_free (error);
-@@ -1344,6 +1346,7 @@ panel_applet_frame_activated (CORBA_Object object,
- g_warning (G_STRLOC ": failed to load applet %s",
- frame->priv->iid);
- panel_applet_frame_loading_failed (frame, frame_act->id);
-+ panel_applet_stop_loading (frame_act->id);
- g_free (frame_act->id);
- g_free (frame_act);
- return;
-@@ -1355,6 +1358,7 @@ panel_applet_frame_activated (CORBA_Object object,
- "(cannot get control frame)", frame->priv->iid);
- panel_applet_frame_loading_failed (frame, frame_act->id);
- gtk_object_sink (GTK_OBJECT (widget));
-+ panel_applet_stop_loading (frame_act->id);
- g_free (frame_act->id);
- g_free (frame_act);
- return;
-@@ -1371,6 +1375,7 @@ panel_applet_frame_activated (CORBA_Object object,
- frame->priv->iid, error);
- panel_applet_frame_loading_failed (frame, frame_act->id);
- gtk_object_sink (GTK_OBJECT (widget));
-+ panel_applet_stop_loading (frame_act->id);
- g_free (frame_act->id);
- g_free (frame_act);
- g_free (error);
-@@ -1394,6 +1399,7 @@ panel_applet_frame_activated (CORBA_Object object,
- frame->priv->iid, error);
- panel_applet_frame_loading_failed (frame, frame_act->id);
- gtk_object_sink (GTK_OBJECT (widget));
-+ panel_applet_stop_loading (frame_act->id);
- g_free (frame_act->id);
- g_free (frame_act);
- g_free (error);
-@@ -1418,6 +1424,7 @@ panel_applet_frame_activated (CORBA_Object object,
- "(cannot get control)", frame->priv->iid);
- panel_applet_frame_loading_failed (frame, frame_act->id);
- gtk_object_sink (GTK_OBJECT (widget));
-+ panel_applet_stop_loading (frame_act->id);
- g_free (frame_act->id);
- g_free (frame_act);
- return;
-@@ -1430,6 +1437,7 @@ panel_applet_frame_activated (CORBA_Object object,
- "(cannot get applet shell)", frame->priv->iid);
- panel_applet_frame_loading_failed (frame, frame_act->id);
- gtk_object_sink (GTK_OBJECT (widget));
-+ panel_applet_stop_loading (frame_act->id);
- g_free (frame_act->id);
- g_free (frame_act);
- return;
-@@ -1461,6 +1469,7 @@ panel_applet_frame_activated (CORBA_Object object,
- panel_lockdown_notify_add (G_CALLBACK (panel_applet_frame_sync_menu_state),
- frame);
-
-+ panel_applet_stop_loading (frame_act->id);
- g_free (frame_act->id);
- g_free (frame_act);
- }
---- gnome-panel-2.24.0/gnome-panel/panel-toplevel.c
-+++ gnome-panel-2.24.0/gnome-panel/panel-toplevel.c
-@@ -2897,11 +2897,14 @@ panel_toplevel_initially_hide (PanelToplevel *toplevel)
- if (!toplevel->priv->attached) {
- toplevel->priv->initial_animation_done = FALSE;
-
-+ /* We start the panel off hidden until all the
-+ * applets are loaded, and then finally slide i
-+ * down when it's ready to be used
-+ */
- toplevel->priv->state = PANEL_STATE_AUTO_HIDDEN;
- gtk_widget_queue_resize (GTK_WIDGET (toplevel));
-
- panel_toplevel_update_struts (toplevel);
-- panel_toplevel_queue_auto_unhide (toplevel);
- } else
- toplevel->priv->initial_animation_done = TRUE;
-
-@@ -3646,6 +3649,17 @@ panel_toplevel_queue_auto_unhide (PanelToplevel *toplevel)
- toplevel);
- }
-
-+void
-+panel_toplevel_queue_initial_unhide (PanelToplevel *toplevel)
-+{
-+ if (toplevel->priv->initial_animation_done)
-+ return;
-+ /* Give the applets a second or so to frob after registering */
-+ toplevel->priv->unhide_timeout =
-+ g_timeout_add_seconds (1, (GSourceFunc) panel_toplevel_auto_unhide_timeout_handler,
-+ toplevel);
-+}
-+
- static gboolean
- panel_toplevel_enter_notify_event (GtkWidget *widget,
- GdkEventCrossing *event)
---- gnome-panel-2.24.0/gnome-panel/panel-toplevel.h
-+++ gnome-panel-2.24.0/gnome-panel/panel-toplevel.h
-@@ -136,6 +136,7 @@ void panel_toplevel_hide
(PanelToplevel
- void panel_toplevel_unhide (PanelToplevel
*toplevel);
- void panel_toplevel_queue_auto_hide (PanelToplevel
*toplevel);
- void panel_toplevel_queue_auto_unhide (PanelToplevel
*toplevel);
-+void panel_toplevel_queue_initial_unhide (PanelToplevel
*toplevel);
- void panel_toplevel_push_autohide_disabler (PanelToplevel
*toplevel);
- void panel_toplevel_pop_autohide_disabler (PanelToplevel
*toplevel);
-
diff --git a/gnome-panel-2.24.1-smoother-slide-in.patch
b/gnome-panel-2.24.1-smoother-slide-in.patch
new file mode 100644
index 0000000..9b2c152
--- /dev/null
+++ b/gnome-panel-2.24.1-smoother-slide-in.patch
@@ -0,0 +1,641 @@
+commit 37414a0c6ee5e655b72742b3279f363990c444ae
+Author: Ray Strode <rstrode(a)redhat.com>
+Date: Mon Nov 3 17:19:13 2008 -0500
+
+ Don't slide panel down until applets load
+
+diff --git a/gnome-panel/applet.c b/gnome-panel/applet.c
+index 165ded5..6c880a4 100644
+--- a/gnome-panel/applet.c
++++ b/gnome-panel/applet.c
+@@ -792,6 +792,7 @@ typedef struct {
+ } PanelAppletToLoad;
+
+ static GSList *panel_applets_to_load = NULL;
++static GSList *panel_applets_loading = NULL;
+ static gboolean panel_applet_have_load_idle = FALSE;
+
+ static void
+@@ -818,6 +819,44 @@ panel_applet_on_load_queue (const char *id)
+ return FALSE;
+ }
+
++void
++panel_applet_stop_loading (const char *id)
++{
++ PanelAppletToLoad *applet;
++ GSList *l, *applet_link;
++
++ applet_link = NULL;
++ for (l = panel_applets_loading; l; l = l->next) {
++ applet = l->data;
++
++ if (strcmp (applet->id, id) == 0) {
++ break;
++ }
++ }
++
++ if (l == NULL)
++ return;
++
++ panel_applets_loading = g_slist_delete_link (panel_applets_loading, l);
++ free_applet_to_load (applet);
++
++ if (panel_applets_loading == NULL) {
++ GSList *toplevels, *l;
++
++ toplevels = panel_toplevel_list_toplevels ();
++
++ l = toplevels;
++ while (l != NULL) {
++ PanelToplevel *toplevel;
++
++ toplevel = (PanelToplevel *) l->data;
++
++ panel_toplevel_queue_initial_unhide (toplevel);
++ l = l->next;
++ }
++ }
++}
++
+ static gboolean
+ panel_applet_load_idle_handler (gpointer dummy)
+ {
+@@ -848,8 +887,8 @@ panel_applet_load_idle_handler (gpointer dummy)
+ panel_applet_have_load_idle = FALSE;
+ return FALSE;
+ }
+-
+ panel_applets_to_load = g_slist_delete_link (panel_applets_to_load, l);
++ panel_applets_loading = g_slist_append (panel_applets_loading, applet);
+
+ panel_widget = panel_toplevel_get_panel_widget (toplevel);
+
+@@ -873,6 +912,7 @@ panel_applet_load_idle_handler (gpointer dummy)
+ applet->locked,
+ applet->position,
+ applet->id);
++ panel_applet_stop_loading (applet->id);
+ break;
+ case PANEL_OBJECT_MENU:
+ panel_menu_button_load_from_gconf (panel_widget,
+@@ -880,12 +920,14 @@ panel_applet_load_idle_handler (gpointer dummy)
+ applet->position,
+ TRUE,
+ applet->id);
++ panel_applet_stop_loading (applet->id);
+ break;
+ case PANEL_OBJECT_LAUNCHER:
+ launcher_load_from_gconf (panel_widget,
+ applet->locked,
+ applet->position,
+ applet->id);
++ panel_applet_stop_loading (applet->id);
+ break;
+ case PANEL_OBJECT_LOGOUT:
+ case PANEL_OBJECT_LOCK:
+@@ -896,6 +938,7 @@ panel_applet_load_idle_handler (gpointer dummy)
+ applet->position,
+ TRUE,
+ applet->id);
++ panel_applet_stop_loading (applet->id);
+ break;
+ case PANEL_OBJECT_ACTION:
+ panel_action_button_load_from_gconf (
+@@ -904,6 +947,7 @@ panel_applet_load_idle_handler (gpointer dummy)
+ applet->position,
+ TRUE,
+ applet->id);
++ panel_applet_stop_loading (applet->id);
+ break;
+ case PANEL_OBJECT_MENU_BAR:
+ panel_menu_bar_load_from_gconf (
+@@ -912,18 +956,18 @@ panel_applet_load_idle_handler (gpointer dummy)
+ applet->position,
+ TRUE,
+ applet->id);
++ panel_applet_stop_loading (applet->id);
+ break;
+ case PANEL_OBJECT_SEPARATOR:
+ panel_separator_load_from_gconf (panel_widget,
+ applet->locked,
+ applet->position,
+ applet->id);
++ panel_applet_stop_loading (applet->id);
+ default:
+ break;
+ }
+
+- free_applet_to_load (applet);
+-
+ return TRUE;
+ }
+
+diff --git a/gnome-panel/applet.h b/gnome-panel/applet.h
+index 8790229..16cfa46 100644
+--- a/gnome-panel/applet.h
++++ b/gnome-panel/applet.h
+@@ -53,6 +53,7 @@ AppletInfo *panel_applet_register (GtkWidget *applet,
+ gboolean exactpos,
+ PanelObjectType type,
+ const char *id);
++void panel_applet_stop_loading (const char *id);
+
+ const char *panel_applet_get_id (AppletInfo *info);
+ const char *panel_applet_get_id_by_widget (GtkWidget *widget);
+diff --git a/gnome-panel/panel-applet-frame.c b/gnome-panel/panel-applet-frame.c
+index 58f4fb2..8aafd83 100644
+--- a/gnome-panel/panel-applet-frame.c
++++ b/gnome-panel/panel-applet-frame.c
+@@ -1311,6 +1312,7 @@ panel_applet_frame_activated (CORBA_Object object,
+ panel_applet_frame_loading_failed (frame, frame_act->id);
+ CORBA_exception_free (&corba_ev);
+ bonobo_object_release_unref (object, NULL);
++ panel_applet_stop_loading (frame_act->id);
+ g_free (frame_act->id);
+ g_free (frame_act);
+ g_free (error);
+@@ -1327,6 +1329,7 @@ panel_applet_frame_activated (CORBA_Object object,
+ g_warning (G_STRLOC ": failed to load applet %s",
+ frame->priv->iid);
+ panel_applet_frame_loading_failed (frame, frame_act->id);
++ panel_applet_stop_loading (frame_act->id);
+ g_free (frame_act->id);
+ g_free (frame_act);
+ return;
+@@ -1338,6 +1341,7 @@ panel_applet_frame_activated (CORBA_Object object,
+ "(cannot get control frame)", frame->priv->iid);
+ panel_applet_frame_loading_failed (frame, frame_act->id);
+ gtk_object_sink (GTK_OBJECT (widget));
++ panel_applet_stop_loading (frame_act->id);
+ g_free (frame_act->id);
+ g_free (frame_act);
+ return;
+@@ -1354,6 +1358,7 @@ panel_applet_frame_activated (CORBA_Object object,
+ frame->priv->iid, error);
+ panel_applet_frame_loading_failed (frame, frame_act->id);
+ gtk_object_sink (GTK_OBJECT (widget));
++ panel_applet_stop_loading (frame_act->id);
+ g_free (frame_act->id);
+ g_free (frame_act);
+ g_free (error);
+@@ -1377,6 +1382,7 @@ panel_applet_frame_activated (CORBA_Object object,
+ frame->priv->iid, error);
+ panel_applet_frame_loading_failed (frame, frame_act->id);
+ gtk_object_sink (GTK_OBJECT (widget));
++ panel_applet_stop_loading (frame_act->id);
+ g_free (frame_act->id);
+ g_free (frame_act);
+ g_free (error);
+@@ -1401,6 +1407,7 @@ panel_applet_frame_activated (CORBA_Object object,
+ "(cannot get control)", frame->priv->iid);
+ panel_applet_frame_loading_failed (frame, frame_act->id);
+ gtk_object_sink (GTK_OBJECT (widget));
++ panel_applet_stop_loading (frame_act->id);
+ g_free (frame_act->id);
+ g_free (frame_act);
+ return;
+@@ -1413,6 +1420,7 @@ panel_applet_frame_activated (CORBA_Object object,
+ "(cannot get applet shell)", frame->priv->iid);
+ panel_applet_frame_loading_failed (frame, frame_act->id);
+ gtk_object_sink (GTK_OBJECT (widget));
++ panel_applet_stop_loading (frame_act->id);
+ g_free (frame_act->id);
+ g_free (frame_act);
+ return;
+@@ -1444,6 +1452,7 @@ panel_applet_frame_activated (CORBA_Object object,
+ panel_lockdown_notify_add (G_CALLBACK (panel_applet_frame_sync_menu_state),
+ frame);
+
++ panel_applet_stop_loading (frame_act->id);
+ g_free (frame_act->id);
+ g_free (frame_act);
+ }
+diff --git a/gnome-panel/panel-toplevel.c b/gnome-panel/panel-toplevel.c
+index 5d8b8d4..37fc5f0 100644
+--- a/gnome-panel/panel-toplevel.c
++++ b/gnome-panel/panel-toplevel.c
+@@ -2900,10 +2900,14 @@ panel_toplevel_initially_hide (PanelToplevel *toplevel)
+ if (!toplevel->priv->attached) {
+ toplevel->priv->initial_animation_done = FALSE;
+
++ /* We start the panel off hidden until all the
++ * applets are loaded, and then finally slide i
++ * down when it's ready to be used
++ */
+ toplevel->priv->state = PANEL_STATE_AUTO_HIDDEN;
+ gtk_widget_queue_resize (GTK_WIDGET (toplevel));
+
+- panel_toplevel_queue_auto_unhide (toplevel);
++ panel_toplevel_update_struts (toplevel, FALSE);
+ } else
+ toplevel->priv->initial_animation_done = TRUE;
+
+@@ -3638,6 +3642,17 @@ panel_toplevel_queue_auto_unhide (PanelToplevel *toplevel)
+ toplevel);
+ }
+
++void
++panel_toplevel_queue_initial_unhide (PanelToplevel *toplevel)
++{
++ if (toplevel->priv->initial_animation_done)
++ return;
++ /* Give the applets a second or so to frob after registering */
++ toplevel->priv->unhide_timeout =
++ g_timeout_add_seconds (1, (GSourceFunc) panel_toplevel_auto_unhide_timeout_handler,
++ toplevel);
++}
++
+ static gboolean
+ panel_toplevel_enter_notify_event (GtkWidget *widget,
+ GdkEventCrossing *event)
+diff --git a/gnome-panel/panel-toplevel.h b/gnome-panel/panel-toplevel.h
+index 81e6c76..60400ea 100644
+--- a/gnome-panel/panel-toplevel.h
++++ b/gnome-panel/panel-toplevel.h
+@@ -136,6 +136,7 @@ void panel_toplevel_hide
(PanelToplevel
+ void panel_toplevel_unhide (PanelToplevel
*toplevel);
+ void panel_toplevel_queue_auto_hide (PanelToplevel
*toplevel);
+ void panel_toplevel_queue_auto_unhide (PanelToplevel
*toplevel);
++void panel_toplevel_queue_initial_unhide (PanelToplevel
*toplevel);
+ void panel_toplevel_push_autohide_disabler (PanelToplevel
*toplevel);
+ void panel_toplevel_pop_autohide_disabler (PanelToplevel
*toplevel);
+
+
+commit e0ab832dcf9a2bf7889abef798b56b67bcb2b167
+Author: Ray Strode <rstrode(a)redhat.com>
+Date: Mon Nov 3 11:50:16 2008 -0500
+
+ Split animation end side calculation to new func
+
+ We're going to need it in other places than
+ start_animation.
+
+diff --git a/gnome-panel/panel-toplevel.c b/gnome-panel/panel-toplevel.c
+index 37fc5f0..0962659 100644
+--- a/gnome-panel/panel-toplevel.c
++++ b/gnome-panel/panel-toplevel.c
+@@ -3338,22 +3338,19 @@ panel_toplevel_get_animation_time (PanelToplevel *toplevel)
+ }
+
+ static void
+-panel_toplevel_start_animation (PanelToplevel *toplevel)
++panel_toplevel_calculate_animation_end_geometry (PanelToplevel *toplevel)
+ {
+ GdkScreen *screen;
+ int monitor_width, monitor_height;
+- int deltax, deltay, deltaw = 0, deltah = 0;
+- int cur_x = -1, cur_y = -1;
+- long t;
+-
+- screen = panel_toplevel_get_monitor_geometry (
+- toplevel, NULL, NULL, &monitor_width, &monitor_height);
+
+ toplevel->priv->animation_end_x = toplevel->priv->x;
+ toplevel->priv->animation_end_y = toplevel->priv->y;
+ toplevel->priv->animation_end_width = -1;
+ toplevel->priv->animation_end_height = -1;
+
++ screen = panel_toplevel_get_monitor_geometry (
++ toplevel, NULL, NULL, &monitor_width, &monitor_height);
++
+ if (!toplevel->priv->expand) {
+
+ if (toplevel->priv->x_centered)
+@@ -3384,6 +3381,18 @@ panel_toplevel_start_animation (PanelToplevel *toplevel)
+ &toplevel->priv->animation_end_width,
+ &toplevel->priv->animation_end_height);
+
++}
++
++static void
++panel_toplevel_start_animation (PanelToplevel *toplevel)
++{
++ GdkScreen *screen;
++ int deltax, deltay, deltaw = 0, deltah = 0;
++ int cur_x = -1, cur_y = -1;
++ long t;
++
++ panel_toplevel_calculate_animation_end_geometry (toplevel);
++
+ toplevel->priv->animating = TRUE;
+
+ panel_toplevel_update_struts (toplevel, TRUE);
+@@ -3396,6 +3405,8 @@ panel_toplevel_start_animation (PanelToplevel *toplevel)
+
+ gdk_window_get_origin (GTK_WIDGET (toplevel)->window, &cur_x, &cur_y);
+
++ screen = gtk_widget_get_screen (GTK_WIDGET (toplevel));
++
+ cur_x -= panel_multiscreen_x (screen, toplevel->priv->monitor);
+ cur_y -= panel_multiscreen_y (screen, toplevel->priv->monitor);
+
+
+commit 7c9b2b501b3b3c83dc030de70f6d13e76c0c328e
+Author: Ray Strode <rstrode(a)redhat.com>
+Date: Mon Nov 3 17:20:09 2008 -0500
+
+ Don't change struts while animating
+
+diff --git a/gnome-panel/panel-toplevel.c b/gnome-panel/panel-toplevel.c
+index 0962659..bef6a02 100644
+--- a/gnome-panel/panel-toplevel.c
++++ b/gnome-panel/panel-toplevel.c
+@@ -188,7 +188,8 @@ struct _PanelToplevelPrivate {
+ /* flag to see if we have already done geometry updating,
+ if not then we're still loading and can ignore many things */
+ guint updated_geometry_initial : 1;
+- /* flag to see if we have done the initial animation */
++ /* flags to see if we have done the initial animation */
++ guint initial_animation_started : 1;
+ guint initial_animation_done : 1;
+ };
+
+@@ -231,6 +232,8 @@ enum {
+ static guint toplevel_signals [LAST_SIGNAL] = { 0 };
+ static GSList *toplevel_list = NULL;
+
++static void panel_toplevel_calculate_animation_end_geometry (PanelToplevel *toplevel);
++
+ GSList *
+ panel_toplevel_list_toplevels (void)
+ {
+@@ -1372,7 +1375,7 @@ panel_toplevel_get_effective_auto_hide_size (PanelToplevel
*toplevel)
+ }
+
+ static gboolean
+-panel_toplevel_update_struts (PanelToplevel *toplevel, gboolean end_of_animation)
++panel_toplevel_update_struts (PanelToplevel *toplevel)
+ {
+ PanelOrientation orientation;
+ GdkScreen *screen;
+@@ -1382,6 +1385,8 @@ panel_toplevel_update_struts (PanelToplevel *toplevel, gboolean
end_of_animation
+ int monitor_x, monitor_y;
+ int monitor_width, monitor_height;
+
++ panel_toplevel_calculate_animation_end_geometry (toplevel);
++
+ if (!toplevel->priv->updated_geometry_initial)
+ return FALSE;
+
+@@ -1397,25 +1402,18 @@ panel_toplevel_update_struts (PanelToplevel *toplevel, gboolean
end_of_animation
+ &monitor_width,
+ &monitor_height);
+
+- if (end_of_animation) {
+- x = toplevel->priv->animation_end_x;
+- y = toplevel->priv->animation_end_y;
+- x += panel_multiscreen_x (screen, toplevel->priv->monitor);
+- x += panel_multiscreen_y (screen, toplevel->priv->monitor);
+- if (toplevel->priv->animation_end_width != -1)
+- width = toplevel->priv->animation_end_width;
+- else
+- width = toplevel->priv->geometry.width;
+- if (toplevel->priv->animation_end_height != -1)
+- height = toplevel->priv->animation_end_height;
+- else
+- height = toplevel->priv->geometry.height;
+- } else {
+- x = toplevel->priv->geometry.x;
+- y = toplevel->priv->geometry.y;
+- width = toplevel->priv->geometry.width;
++ x = toplevel->priv->animation_end_x;
++ y = toplevel->priv->animation_end_y;
++ x += panel_multiscreen_x (screen, toplevel->priv->monitor);
++ x += panel_multiscreen_y (screen, toplevel->priv->monitor);
++ if (toplevel->priv->animation_end_width != -1)
++ width = toplevel->priv->animation_end_width;
++ else
++ width = toplevel->priv->geometry.width;
++ if (toplevel->priv->animation_end_height != -1)
++ height = toplevel->priv->animation_end_height;
++ else
+ height = toplevel->priv->geometry.height;
+- }
+
+ orientation = toplevel->priv->orientation;
+
+@@ -1827,7 +1825,7 @@ panel_toplevel_update_auto_hide_position (PanelToplevel *toplevel,
+ height = toplevel->priv->original_height;
+ snap_tolerance = toplevel->priv->snap_tolerance;
+
+- if (toplevel->priv->initial_animation_done) {
++ if (toplevel->priv->initial_animation_started) {
+ auto_hide_size = panel_toplevel_get_effective_auto_hide_size (toplevel);
+ } else {
+ /* when loading, we animate from outside the screen */
+@@ -2029,6 +2027,7 @@ panel_toplevel_update_animating_position (PanelToplevel *toplevel)
+ if (toplevel->priv->geometry.x - monitor_offset_x ==
toplevel->priv->animation_end_x &&
+ toplevel->priv->geometry.y - monitor_offset_y ==
toplevel->priv->animation_end_y) {
+ toplevel->priv->animating = FALSE;
++ toplevel->priv->initial_animation_done = TRUE;
+
+ if (toplevel->priv->attached && panel_toplevel_get_is_hidden
(toplevel))
+ gtk_widget_unmap (GTK_WIDGET (toplevel));
+@@ -2499,7 +2498,12 @@ panel_toplevel_update_geometry (PanelToplevel *toplevel,
+ panel_toplevel_update_size (toplevel, requisition);
+ panel_toplevel_update_position (toplevel);
+
+- panel_toplevel_update_struts (toplevel, FALSE);
++ panel_toplevel_update_struts (toplevel);
++
++ if (toplevel->priv->animating) {
++ return;
++ }
++
+ if (toplevel->priv->state == PANEL_STATE_NORMAL ||
+ toplevel->priv->state == PANEL_STATE_AUTO_HIDDEN) {
+ panel_struts_update_toplevel_geometry (toplevel,
+@@ -2898,6 +2902,7 @@ static void
+ panel_toplevel_initially_hide (PanelToplevel *toplevel)
+ {
+ if (!toplevel->priv->attached) {
++ toplevel->priv->initial_animation_started = FALSE;
+ toplevel->priv->initial_animation_done = FALSE;
+
+ /* We start the panel off hidden until all the
+@@ -2907,9 +2912,11 @@ panel_toplevel_initially_hide (PanelToplevel *toplevel)
+ toplevel->priv->state = PANEL_STATE_AUTO_HIDDEN;
+ gtk_widget_queue_resize (GTK_WIDGET (toplevel));
+
+- panel_toplevel_update_struts (toplevel, FALSE);
+- } else
++ panel_toplevel_update_struts (toplevel);
++ } else {
++ toplevel->priv->initial_animation_started = TRUE;
+ toplevel->priv->initial_animation_done = TRUE;
++ }
+
+ }
+
+@@ -3298,6 +3305,7 @@ panel_toplevel_animation_timeout (PanelToplevel *toplevel)
+ toplevel->priv->animation_end_time.tv_sec = 0xdead;
+ toplevel->priv->animation_end_time.tv_usec = 0xdead;
+ toplevel->priv->animation_timeout = 0;
++ toplevel->priv->initial_animation_started = TRUE;
+ toplevel->priv->initial_animation_done = TRUE;
+ }
+
+@@ -3343,6 +3351,9 @@ panel_toplevel_calculate_animation_end_geometry (PanelToplevel
*toplevel)
+ GdkScreen *screen;
+ int monitor_width, monitor_height;
+
++ if (toplevel->priv->animating)
++ return;
++
+ toplevel->priv->animation_end_x = toplevel->priv->x;
+ toplevel->priv->animation_end_y = toplevel->priv->y;
+ toplevel->priv->animation_end_width = -1;
+@@ -3395,13 +3406,12 @@ panel_toplevel_start_animation (PanelToplevel *toplevel)
+
+ toplevel->priv->animating = TRUE;
+
+- panel_toplevel_update_struts (toplevel, TRUE);
+ panel_struts_update_toplevel_geometry (toplevel,
+ &toplevel->priv->animation_end_x,
+ &toplevel->priv->animation_end_y,
+ &toplevel->priv->animation_end_width,
+ &toplevel->priv->animation_end_height);
+- panel_toplevel_update_struts (toplevel, FALSE);
++ panel_toplevel_update_struts (toplevel);
+
+ gdk_window_get_origin (GTK_WIDGET (toplevel)->window, &cur_x, &cur_y);
+
+@@ -3571,16 +3581,18 @@ panel_toplevel_auto_unhide_timeout_handler (PanelToplevel
*toplevel)
+ if (toplevel->priv->animating)
+ return TRUE;
+
+- if (!toplevel->priv->animate)
++ if (!toplevel->priv->animate) {
++ toplevel->priv->initial_animation_started = TRUE;
+ toplevel->priv->initial_animation_done = TRUE;
++ }
+
+ /* initial animation for auto-hidden panels: we need to unhide and hide
+ * again to get at the right size */
+- if (!toplevel->priv->initial_animation_done &&
++ if (!toplevel->priv->initial_animation_started &&
+ toplevel->priv->auto_hide) {
+ toplevel->priv->unhide_timeout = 0;
+ panel_toplevel_unhide (toplevel);
+- toplevel->priv->initial_animation_done = TRUE;
++ toplevel->priv->initial_animation_started = TRUE;
+ panel_toplevel_hide (toplevel, TRUE, -1);
+ return FALSE;
+ }
+@@ -3656,7 +3668,7 @@ panel_toplevel_queue_auto_unhide (PanelToplevel *toplevel)
+ void
+ panel_toplevel_queue_initial_unhide (PanelToplevel *toplevel)
+ {
+- if (toplevel->priv->initial_animation_done)
++ if (toplevel->priv->initial_animation_started)
+ return;
+ /* Give the applets a second or so to frob after registering */
+ toplevel->priv->unhide_timeout =
+@@ -4505,8 +4517,9 @@ panel_toplevel_init (PanelToplevel *toplevel)
+ toplevel->priv->position_centered = FALSE;
+ toplevel->priv->attached = FALSE;
+ toplevel->priv->attach_hidden = FALSE;
+- toplevel->priv->updated_geometry_initial = FALSE;
+- toplevel->priv->initial_animation_done = FALSE;
++ toplevel->priv->updated_geometry_initial = FALSE;
++ toplevel->priv->initial_animation_started = FALSE;
++ toplevel->priv->initial_animation_done = FALSE;
+
+ gtk_widget_add_events (GTK_WIDGET (toplevel),
+ GDK_BUTTON_PRESS_MASK |
+@@ -4809,7 +4822,7 @@ panel_toplevel_set_auto_hide_size (PanelToplevel *toplevel,
+ toplevel->priv->auto_hide_size = auto_hide_size;
+
+ if (toplevel->priv->state == PANEL_STATE_AUTO_HIDDEN) {
+- if (panel_toplevel_update_struts (toplevel, FALSE)) {
++ if (panel_toplevel_update_struts (toplevel)) {
+ if (toplevel->priv->animate) {
+ panel_toplevel_unhide (toplevel);
+ panel_toplevel_hide (toplevel, TRUE, -1);
+@@ -4985,7 +4998,7 @@ panel_toplevel_set_auto_hide (PanelToplevel *toplevel,
+ else
+ panel_toplevel_queue_auto_unhide (toplevel);
+
+- if (panel_toplevel_update_struts (toplevel, FALSE))
++ if (panel_toplevel_update_struts (toplevel))
+ gtk_widget_queue_resize (GTK_WIDGET (toplevel));
+
+ g_object_notify (G_OBJECT (toplevel), "auto-hide");
+
+commit c78ee2be16ffe3a2f158bc880be246f06623d60c
+Author: Ray Strode <rstrode(a)redhat.com>
+Date: Mon Nov 3 17:12:04 2008 -0500
+
+ Set up struts initially when realizing window
+
+diff --git a/gnome-panel/panel-toplevel.c b/gnome-panel/panel-toplevel.c
+index bef6a02..96f564c 100644
+--- a/gnome-panel/panel-toplevel.c
++++ b/gnome-panel/panel-toplevel.c
+@@ -2939,6 +2939,7 @@ panel_toplevel_realize (GtkWidget *widget)
+
+ panel_toplevel_initially_hide (toplevel);
+
++ panel_toplevel_update_struts (toplevel);
+ panel_toplevel_move_resize_window (toplevel, TRUE, TRUE);
+ }
+
+
+commit 9d711261374f2fc55664c1707f5cf283c594be8a
+Author: Ray Strode <rstrode(a)redhat.com>
+Date: Mon Nov 3 17:13:32 2008 -0500
+
+ Set up initial animation to correct position
+
+ The initial animation for autohidden panels, is
+ the auto hide size, not the normal size. So,
+ detect that case and only slide to the autohide size.
+
+diff --git a/gnome-panel/panel-toplevel.c b/gnome-panel/panel-toplevel.c
+index 96f564c..0a71ba0 100644
+--- a/gnome-panel/panel-toplevel.c
++++ b/gnome-panel/panel-toplevel.c
+@@ -3412,7 +3412,30 @@ panel_toplevel_start_animation (PanelToplevel *toplevel)
+ &toplevel->priv->animation_end_y,
+ &toplevel->priv->animation_end_width,
+ &toplevel->priv->animation_end_height);
+- panel_toplevel_update_struts (toplevel);
++
++ /* If we're in the initial animation and we're autohidden, we only want
++ * to animate to the autohidden height
++ */
++ if (toplevel->priv->initial_animation_started &&
!toplevel->priv->initial_animation_done && toplevel->priv->state ==
PANEL_STATE_AUTO_HIDDEN) {
++ switch (toplevel->priv->orientation) {
++ case PANEL_ORIENTATION_TOP:
++ toplevel->priv->animation_end_y -= toplevel->priv->geometry.height;
++ toplevel->priv->animation_end_y += panel_toplevel_get_effective_auto_hide_size
(toplevel);
++ break;
++ case PANEL_ORIENTATION_BOTTOM:
++ toplevel->priv->animation_end_y += toplevel->priv->geometry.height;
++ toplevel->priv->animation_end_y -= panel_toplevel_get_effective_auto_hide_size
(toplevel);
++ break;
++ case PANEL_ORIENTATION_LEFT:
++ toplevel->priv->animation_end_x -= toplevel->priv->geometry.width;
++ toplevel->priv->animation_end_x += panel_toplevel_get_effective_auto_hide_size
(toplevel);
++ break;
++ case PANEL_ORIENTATION_RIGHT:
++ toplevel->priv->animation_end_x += toplevel->priv->geometry.width;
++ toplevel->priv->animation_end_x -= panel_toplevel_get_effective_auto_hide_size
(toplevel);
++ break;
++ }
++ }
+
+ gdk_window_get_origin (GTK_WIDGET (toplevel)->window, &cur_x, &cur_y);
+
+diff -up gnome-panel-2.24.1/gnome-panel/panel-applet-frame.c.fix-it
gnome-panel-2.24.1/gnome-panel/panel-applet-frame.c
+--- gnome-panel-2.24.1/gnome-panel/panel-applet-frame.c.fix-it 2008-11-03
18:02:07.000000000 -0500
++++ gnome-panel-2.24.1/gnome-panel/panel-applet-frame.c 2008-11-03 18:02:10.000000000
-0500
+@@ -1286,6 +1286,7 @@ panel_applet_frame_activated (CORBA_Obje
+ if (!in_default_panel_config (frame_act->id)) {
+ panel_applet_frame_loading_failed (frame, frame_act->id);
+ }
++ panel_applet_stop_loading (frame_act->id);
+ g_free (frame_act->id);
+ g_free (frame_act);
+ return;
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 7d61d69..6e0ebe5 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -23,7 +23,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.24.1
-Release: 1%{?dist}
+Release: 2%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.24/%{name}-%{version}.tar...
@@ -114,7 +114,7 @@ Patch11: applet-error.patch
Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
#
http://bugzilla.gnome.org/show_bug.cgi?id=554343
-Patch25: gnome-panel-2.24.0-smoother-slide-in.patch
+Patch25: gnome-panel-2.24.1-smoother-slide-in.patch
#
http://bugzilla.gnome.org/show_bug.cgi?id=536915
Patch26: gnome-panel-2.24.0-hide-shutdown-if-unavailable.patch
@@ -371,6 +371,11 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Mon Nov 3 2008 Ray Strode <rstrode(a)redhat.com> - 2.24.1-2
+- Fix up panel slide in patch to
+ 1) not have odd effects with vertical panels
+ 2) set up struts earlier
+
* Wed Oct 22 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.24.1-1
- Update to 2.24.1
commit d2a851845716ed6e3272e55a4e6ce9cbd3e06f71
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Oct 22 18:40:45 2008 +0000
2.24.1
diff --git a/.cvsignore b/.cvsignore
index 895e6dc..dbdb9ee 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.24.0.tar.bz2
+gnome-panel-2.24.1.tar.bz2
diff --git a/gnome-panel.spec b/gnome-panel.spec
index d204660..7d61d69 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,8 +22,8 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.24.0
-Release: 8%{?dist}
+Version: 2.24.1
+Release: 1%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.24/%{name}-%{version}.tar...
@@ -371,6 +371,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Wed Oct 22 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.24.1-1
+- Update to 2.24.1
+
* Wed Oct 22 2008 Ray Strode <rstrode(a)redhat.com> - 2.24.0-8
- Don't make nautilus slide down as the panel slides down,
instead push nautilus out of the way immediately, and slide
diff --git a/sources b/sources
index 7476d3f..ef7ac1e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0d246880611a4c58fe2ff99614b96918 gnome-panel-2.24.0.tar.bz2
+37742d8fcb909965d5e18f351a7c4578 gnome-panel-2.24.1.tar.bz2
commit cc452f9b0753596f2b60b929168fb643c5169b92
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Wed Oct 22 17:15:28 2008 +0000
- Don't make nautilus slide down as the panel slides down, instead push
nautilus out of the way immediately, and slide in the available space.
diff --git a/gnome-panel-2.24.0-smoother-slide-in.patch
b/gnome-panel-2.24.0-smoother-slide-in.patch
index 2a4101a..e423679 100644
--- a/gnome-panel-2.24.0-smoother-slide-in.patch
+++ b/gnome-panel-2.24.0-smoother-slide-in.patch
@@ -1,6 +1,198 @@
-diff -up gnome-panel-2.24.0/gnome-panel/applet.c.smoother-slide-in
gnome-panel-2.24.0/gnome-panel/applet.c
---- gnome-panel-2.24.0/gnome-panel/applet.c.smoother-slide-in 2008-09-22
17:21:05.000000000 -0400
-+++ gnome-panel-2.24.0/gnome-panel/applet.c 2008-10-12 11:22:38.000000000 -0400
+Author: Ray Strode <rstrode(a)redhat.com>
+Date: Wed Oct 22 08:56:23 2008 -0400
+
+ Split animation end side calculation to new func
+
+ We're going to need it in other places than
+ start_animation.
+
+--- gnome-panel-2.24.0/gnome-panel/panel-toplevel.c
++++ gnome-panel-2.24.0/gnome-panel/panel-toplevel.c
+@@ -3334,22 +3334,19 @@ panel_toplevel_get_animation_time (PanelToplevel *toplevel)
+ }
+
+ static void
+-panel_toplevel_start_animation (PanelToplevel *toplevel)
++panel_toplevel_calculate_animation_end_geometry (PanelToplevel *toplevel)
+ {
+ GdkScreen *screen;
+ int monitor_width, monitor_height;
+- int deltax, deltay, deltaw = 0, deltah = 0;
+- int cur_x = -1, cur_y = -1;
+- long t;
+-
+- screen = panel_toplevel_get_monitor_geometry (
+- toplevel, NULL, NULL, &monitor_width, &monitor_height);
+
+ toplevel->priv->animation_end_x = toplevel->priv->x;
+ toplevel->priv->animation_end_y = toplevel->priv->y;
+ toplevel->priv->animation_end_width = -1;
+ toplevel->priv->animation_end_height = -1;
+
++ screen = panel_toplevel_get_monitor_geometry (
++ toplevel, NULL, NULL, &monitor_width, &monitor_height);
++
+ if (!toplevel->priv->expand) {
+
+ if (toplevel->priv->x_centered)
+@@ -3380,6 +3377,18 @@ panel_toplevel_start_animation (PanelToplevel *toplevel)
+ &toplevel->priv->animation_end_width,
+ &toplevel->priv->animation_end_height);
+
++}
++
++static void
++panel_toplevel_start_animation (PanelToplevel *toplevel)
++{
++ GdkScreen *screen;
++ int deltax, deltay, deltaw = 0, deltah = 0;
++ int cur_x = -1, cur_y = -1;
++ long t;
++
++ panel_toplevel_calculate_animation_end_geometry (toplevel);
++
+ toplevel->priv->animating = TRUE;
+
+ panel_toplevel_update_struts (toplevel, TRUE);
+@@ -3392,6 +3401,8 @@ panel_toplevel_start_animation (PanelToplevel *toplevel)
+
+ gdk_window_get_origin (GTK_WIDGET (toplevel)->window, &cur_x, &cur_y);
+
++ screen = gtk_widget_get_screen (GTK_WIDGET (toplevel));
++
+ cur_x -= panel_multiscreen_x (screen, toplevel->priv->monitor);
+ cur_y -= panel_multiscreen_y (screen, toplevel->priv->monitor);
+
+
+Author: Ray Strode <rstrode(a)redhat.com>
+Date: Wed Oct 22 10:27:00 2008 -0400
+
+ Don't change struts while animating
+
+--- gnome-panel-2.24.0/gnome-panel/panel-toplevel.c
++++ gnome-panel-2.24.0/gnome-panel/panel-toplevel.c
+@@ -231,6 +231,8 @@ enum {
+ static guint toplevel_signals [LAST_SIGNAL] = { 0 };
+ static GSList *toplevel_list = NULL;
+
++static void panel_toplevel_calculate_animation_end_geometry (PanelToplevel *toplevel);
++
+ GSList *
+ panel_toplevel_list_toplevels (void)
+ {
+@@ -1372,7 +1374,7 @@ panel_toplevel_get_effective_auto_hide_size (PanelToplevel
*toplevel)
+ }
+
+ static gboolean
+-panel_toplevel_update_struts (PanelToplevel *toplevel, gboolean end_of_animation)
++panel_toplevel_update_struts (PanelToplevel *toplevel)
+ {
+ PanelOrientation orientation;
+ GdkScreen *screen;
+@@ -1382,6 +1384,8 @@ panel_toplevel_update_struts (PanelToplevel *toplevel, gboolean
end_of_animation
+ int monitor_x, monitor_y;
+ int monitor_width, monitor_height;
+
++ panel_toplevel_calculate_animation_end_geometry (toplevel);
++
+ if (!toplevel->priv->updated_geometry_initial)
+ return FALSE;
+
+@@ -1397,25 +1401,18 @@ panel_toplevel_update_struts (PanelToplevel *toplevel, gboolean
end_of_animation
+ &monitor_width,
+ &monitor_height);
+
+- if (end_of_animation) {
+- x = toplevel->priv->animation_end_x;
+- y = toplevel->priv->animation_end_y;
+- x += panel_multiscreen_x (screen, toplevel->priv->monitor);
+- x += panel_multiscreen_y (screen, toplevel->priv->monitor);
+- if (toplevel->priv->animation_end_width != -1)
+- width = toplevel->priv->animation_end_width;
+- else
+- width = toplevel->priv->geometry.width;
+- if (toplevel->priv->animation_end_height != -1)
+- height = toplevel->priv->animation_end_height;
+- else
+- height = toplevel->priv->geometry.height;
+- } else {
+- x = toplevel->priv->geometry.x;
+- y = toplevel->priv->geometry.y;
+- width = toplevel->priv->geometry.width;
++ x = toplevel->priv->animation_end_x;
++ y = toplevel->priv->animation_end_y;
++ x += panel_multiscreen_x (screen, toplevel->priv->monitor);
++ x += panel_multiscreen_y (screen, toplevel->priv->monitor);
++ if (toplevel->priv->animation_end_width != -1)
++ width = toplevel->priv->animation_end_width;
++ else
++ width = toplevel->priv->geometry.width;
++ if (toplevel->priv->animation_end_height != -1)
++ height = toplevel->priv->animation_end_height;
++ else
+ height = toplevel->priv->geometry.height;
+- }
+
+ orientation = toplevel->priv->orientation;
+
+@@ -2499,7 +2496,7 @@ panel_toplevel_update_geometry (PanelToplevel *toplevel,
+ panel_toplevel_update_size (toplevel, requisition);
+ panel_toplevel_update_position (toplevel);
+
+- panel_toplevel_update_struts (toplevel, FALSE);
++ panel_toplevel_update_struts (toplevel);
+ if (toplevel->priv->state == PANEL_STATE_NORMAL ||
+ toplevel->priv->state == PANEL_STATE_AUTO_HIDDEN) {
+ panel_struts_update_toplevel_geometry (toplevel,
+@@ -2903,6 +2900,7 @@ panel_toplevel_initially_hide (PanelToplevel *toplevel)
+ toplevel->priv->state = PANEL_STATE_AUTO_HIDDEN;
+ gtk_widget_queue_resize (GTK_WIDGET (toplevel));
+
++ panel_toplevel_update_struts (toplevel);
+ panel_toplevel_queue_auto_unhide (toplevel);
+ } else
+ toplevel->priv->initial_animation_done = TRUE;
+@@ -3391,13 +3389,12 @@ panel_toplevel_start_animation (PanelToplevel *toplevel)
+
+ toplevel->priv->animating = TRUE;
+
+- panel_toplevel_update_struts (toplevel, TRUE);
+ panel_struts_update_toplevel_geometry (toplevel,
+ &toplevel->priv->animation_end_x,
+ &toplevel->priv->animation_end_y,
+ &toplevel->priv->animation_end_width,
+ &toplevel->priv->animation_end_height);
+- panel_toplevel_update_struts (toplevel, FALSE);
++ panel_toplevel_update_struts (toplevel);
+
+ gdk_window_get_origin (GTK_WIDGET (toplevel)->window, &cur_x, &cur_y);
+
+@@ -4794,7 +4791,7 @@ panel_toplevel_set_auto_hide_size (PanelToplevel *toplevel,
+ toplevel->priv->auto_hide_size = auto_hide_size;
+
+ if (toplevel->priv->state == PANEL_STATE_AUTO_HIDDEN) {
+- if (panel_toplevel_update_struts (toplevel, FALSE)) {
++ if (panel_toplevel_update_struts (toplevel)) {
+ if (toplevel->priv->animate) {
+ panel_toplevel_unhide (toplevel);
+ panel_toplevel_hide (toplevel, TRUE, -1);
+@@ -4970,7 +4967,7 @@ panel_toplevel_set_auto_hide (PanelToplevel *toplevel,
+ else
+ panel_toplevel_queue_auto_unhide (toplevel);
+
+- if (panel_toplevel_update_struts (toplevel, FALSE))
++ if (panel_toplevel_update_struts (toplevel))
+ gtk_widget_queue_resize (GTK_WIDGET (toplevel));
+
+ g_object_notify (G_OBJECT (toplevel), "auto-hide");
+
+Author: Ray Strode <rstrode(a)redhat.com>
+Date: Wed Oct 22 10:55:48 2008 -0400
+
+ Delay slide out until applets register
+
+--- gnome-panel-2.24.0/gnome-panel/applet.c
++++ gnome-panel-2.24.0/gnome-panel/applet.c
@@ -792,6 +792,7 @@ typedef struct {
} PanelAppletToLoad;
@@ -9,7 +201,7 @@ diff -up gnome-panel-2.24.0/gnome-panel/applet.c.smoother-slide-in
gnome-panel-2
static gboolean panel_applet_have_load_idle = FALSE;
static void
-@@ -818,6 +819,44 @@ panel_applet_on_load_queue (const char *
+@@ -818,6 +819,44 @@ panel_applet_on_load_queue (const char *id)
return FALSE;
}
@@ -54,7 +246,7 @@ diff -up gnome-panel-2.24.0/gnome-panel/applet.c.smoother-slide-in
gnome-panel-2
static gboolean
panel_applet_load_idle_handler (gpointer dummy)
{
-@@ -848,8 +887,8 @@ panel_applet_load_idle_handler (gpointer
+@@ -848,8 +887,8 @@ panel_applet_load_idle_handler (gpointer dummy)
panel_applet_have_load_idle = FALSE;
return FALSE;
}
@@ -64,7 +256,7 @@ diff -up gnome-panel-2.24.0/gnome-panel/applet.c.smoother-slide-in
gnome-panel-2
panel_widget = panel_toplevel_get_panel_widget (toplevel);
-@@ -873,6 +912,7 @@ panel_applet_load_idle_handler (gpointer
+@@ -873,6 +912,7 @@ panel_applet_load_idle_handler (gpointer dummy)
applet->locked,
applet->position,
applet->id);
@@ -72,7 +264,7 @@ diff -up gnome-panel-2.24.0/gnome-panel/applet.c.smoother-slide-in
gnome-panel-2
break;
case PANEL_OBJECT_MENU:
panel_menu_button_load_from_gconf (panel_widget,
-@@ -880,12 +920,14 @@ panel_applet_load_idle_handler (gpointer
+@@ -880,12 +920,14 @@ panel_applet_load_idle_handler (gpointer dummy)
applet->position,
TRUE,
applet->id);
@@ -87,7 +279,7 @@ diff -up gnome-panel-2.24.0/gnome-panel/applet.c.smoother-slide-in
gnome-panel-2
break;
case PANEL_OBJECT_LOGOUT:
case PANEL_OBJECT_LOCK:
-@@ -896,6 +938,7 @@ panel_applet_load_idle_handler (gpointer
+@@ -896,6 +938,7 @@ panel_applet_load_idle_handler (gpointer dummy)
applet->position,
TRUE,
applet->id);
@@ -95,7 +287,7 @@ diff -up gnome-panel-2.24.0/gnome-panel/applet.c.smoother-slide-in
gnome-panel-2
break;
case PANEL_OBJECT_ACTION:
panel_action_button_load_from_gconf (
-@@ -904,6 +947,7 @@ panel_applet_load_idle_handler (gpointer
+@@ -904,6 +947,7 @@ panel_applet_load_idle_handler (gpointer dummy)
applet->position,
TRUE,
applet->id);
@@ -103,7 +295,7 @@ diff -up gnome-panel-2.24.0/gnome-panel/applet.c.smoother-slide-in
gnome-panel-2
break;
case PANEL_OBJECT_MENU_BAR:
panel_menu_bar_load_from_gconf (
-@@ -912,18 +956,18 @@ panel_applet_load_idle_handler (gpointer
+@@ -912,18 +956,18 @@ panel_applet_load_idle_handler (gpointer dummy)
applet->position,
TRUE,
applet->id);
@@ -124,10 +316,9 @@ diff -up gnome-panel-2.24.0/gnome-panel/applet.c.smoother-slide-in
gnome-panel-2
return TRUE;
}
-diff -up gnome-panel-2.24.0/gnome-panel/applet.h.smoother-slide-in
gnome-panel-2.24.0/gnome-panel/applet.h
---- gnome-panel-2.24.0/gnome-panel/applet.h.smoother-slide-in 2008-09-22
17:21:05.000000000 -0400
-+++ gnome-panel-2.24.0/gnome-panel/applet.h 2008-10-12 11:11:42.000000000 -0400
-@@ -53,6 +53,7 @@ AppletInfo *panel_applet_register (Gt
+--- gnome-panel-2.24.0/gnome-panel/applet.h
++++ gnome-panel-2.24.0/gnome-panel/applet.h
+@@ -53,6 +53,7 @@ AppletInfo *panel_applet_register (GtkWidget *applet,
gboolean exactpos,
PanelObjectType type,
const char *id);
@@ -135,10 +326,9 @@ diff -up gnome-panel-2.24.0/gnome-panel/applet.h.smoother-slide-in
gnome-panel-2
const char *panel_applet_get_id (AppletInfo *info);
const char *panel_applet_get_id_by_widget (GtkWidget *widget);
-diff -up gnome-panel-2.24.0/gnome-panel/panel-applet-frame.c.smoother-slide-in
gnome-panel-2.24.0/gnome-panel/panel-applet-frame.c
---- gnome-panel-2.24.0/gnome-panel/panel-applet-frame.c.smoother-slide-in 2008-10-11
12:42:50.000000000 -0400
-+++ gnome-panel-2.24.0/gnome-panel/panel-applet-frame.c 2008-10-12 11:19:58.000000000
-0400
-@@ -1286,6 +1286,7 @@ panel_applet_frame_activated (CORBA_Obje
+--- gnome-panel-2.24.0/gnome-panel/panel-applet-frame.c
++++ gnome-panel-2.24.0/gnome-panel/panel-applet-frame.c
+@@ -1286,6 +1286,7 @@ panel_applet_frame_activated (CORBA_Object object,
if (!in_default_panel_config (frame_act->id)) {
panel_applet_frame_loading_failed (frame, frame_act->id);
}
@@ -146,7 +336,7 @@ diff -up
gnome-panel-2.24.0/gnome-panel/panel-applet-frame.c.smoother-slide-in g
g_free (frame_act->id);
g_free (frame_act);
return;
-@@ -1328,6 +1329,7 @@ panel_applet_frame_activated (CORBA_Obje
+@@ -1328,6 +1329,7 @@ panel_applet_frame_activated (CORBA_Object object,
panel_applet_frame_loading_failed (frame, frame_act->id);
CORBA_exception_free (&corba_ev);
bonobo_object_release_unref (object, NULL);
@@ -154,7 +344,7 @@ diff -up
gnome-panel-2.24.0/gnome-panel/panel-applet-frame.c.smoother-slide-in g
g_free (frame_act->id);
g_free (frame_act);
g_free (error);
-@@ -1344,6 +1346,7 @@ panel_applet_frame_activated (CORBA_Obje
+@@ -1344,6 +1346,7 @@ panel_applet_frame_activated (CORBA_Object object,
g_warning (G_STRLOC ": failed to load applet %s",
frame->priv->iid);
panel_applet_frame_loading_failed (frame, frame_act->id);
@@ -162,7 +352,7 @@ diff -up
gnome-panel-2.24.0/gnome-panel/panel-applet-frame.c.smoother-slide-in g
g_free (frame_act->id);
g_free (frame_act);
return;
-@@ -1355,6 +1358,7 @@ panel_applet_frame_activated (CORBA_Obje
+@@ -1355,6 +1358,7 @@ panel_applet_frame_activated (CORBA_Object object,
"(cannot get control frame)", frame->priv->iid);
panel_applet_frame_loading_failed (frame, frame_act->id);
gtk_object_sink (GTK_OBJECT (widget));
@@ -170,7 +360,7 @@ diff -up
gnome-panel-2.24.0/gnome-panel/panel-applet-frame.c.smoother-slide-in g
g_free (frame_act->id);
g_free (frame_act);
return;
-@@ -1371,6 +1375,7 @@ panel_applet_frame_activated (CORBA_Obje
+@@ -1371,6 +1375,7 @@ panel_applet_frame_activated (CORBA_Object object,
frame->priv->iid, error);
panel_applet_frame_loading_failed (frame, frame_act->id);
gtk_object_sink (GTK_OBJECT (widget));
@@ -178,7 +368,7 @@ diff -up
gnome-panel-2.24.0/gnome-panel/panel-applet-frame.c.smoother-slide-in g
g_free (frame_act->id);
g_free (frame_act);
g_free (error);
-@@ -1394,6 +1399,7 @@ panel_applet_frame_activated (CORBA_Obje
+@@ -1394,6 +1399,7 @@ panel_applet_frame_activated (CORBA_Object object,
frame->priv->iid, error);
panel_applet_frame_loading_failed (frame, frame_act->id);
gtk_object_sink (GTK_OBJECT (widget));
@@ -186,7 +376,7 @@ diff -up
gnome-panel-2.24.0/gnome-panel/panel-applet-frame.c.smoother-slide-in g
g_free (frame_act->id);
g_free (frame_act);
g_free (error);
-@@ -1418,6 +1424,7 @@ panel_applet_frame_activated (CORBA_Obje
+@@ -1418,6 +1424,7 @@ panel_applet_frame_activated (CORBA_Object object,
"(cannot get control)", frame->priv->iid);
panel_applet_frame_loading_failed (frame, frame_act->id);
gtk_object_sink (GTK_OBJECT (widget));
@@ -194,7 +384,7 @@ diff -up
gnome-panel-2.24.0/gnome-panel/panel-applet-frame.c.smoother-slide-in g
g_free (frame_act->id);
g_free (frame_act);
return;
-@@ -1430,6 +1437,7 @@ panel_applet_frame_activated (CORBA_Obje
+@@ -1430,6 +1437,7 @@ panel_applet_frame_activated (CORBA_Object object,
"(cannot get applet shell)", frame->priv->iid);
panel_applet_frame_loading_failed (frame, frame_act->id);
gtk_object_sink (GTK_OBJECT (widget));
@@ -202,7 +392,7 @@ diff -up
gnome-panel-2.24.0/gnome-panel/panel-applet-frame.c.smoother-slide-in g
g_free (frame_act->id);
g_free (frame_act);
return;
-@@ -1461,6 +1469,7 @@ panel_applet_frame_activated (CORBA_Obje
+@@ -1461,6 +1469,7 @@ panel_applet_frame_activated (CORBA_Object object,
panel_lockdown_notify_add (G_CALLBACK (panel_applet_frame_sync_menu_state),
frame);
@@ -210,30 +400,25 @@ diff -up
gnome-panel-2.24.0/gnome-panel/panel-applet-frame.c.smoother-slide-in g
g_free (frame_act->id);
g_free (frame_act);
}
-diff -up gnome-panel-2.24.0/gnome-panel/panel-applet-frame.h.smoother-slide-in
gnome-panel-2.24.0/gnome-panel/panel-applet-frame.h
-diff -up gnome-panel-2.24.0/gnome-panel/panel-profile.c.smoother-slide-in
gnome-panel-2.24.0/gnome-panel/panel-profile.c
-diff -up gnome-panel-2.24.0/gnome-panel/panel-toplevel.c.smoother-slide-in
gnome-panel-2.24.0/gnome-panel/panel-toplevel.c
---- gnome-panel-2.24.0/gnome-panel/panel-toplevel.c.smoother-slide-in 2008-09-22
17:21:05.000000000 -0400
-+++ gnome-panel-2.24.0/gnome-panel/panel-toplevel.c 2008-10-11 12:42:50.000000000 -0400
-@@ -2898,12 +2898,15 @@ static void
- panel_toplevel_initially_hide (PanelToplevel *toplevel)
- {
+--- gnome-panel-2.24.0/gnome-panel/panel-toplevel.c
++++ gnome-panel-2.24.0/gnome-panel/panel-toplevel.c
+@@ -2897,11 +2897,14 @@ panel_toplevel_initially_hide (PanelToplevel *toplevel)
if (!toplevel->priv->attached) {
-+
+ toplevel->priv->initial_animation_done = FALSE;
+
+ /* We start the panel off hidden until all the
-+ * applets are loaded, and then finally slide it
++ * applets are loaded, and then finally slide i
+ * down when it's ready to be used
+ */
- toplevel->priv->initial_animation_done = FALSE;
-
toplevel->priv->state = PANEL_STATE_AUTO_HIDDEN;
gtk_widget_queue_resize (GTK_WIDGET (toplevel));
--
+
+ panel_toplevel_update_struts (toplevel);
- panel_toplevel_queue_auto_unhide (toplevel);
} else
toplevel->priv->initial_animation_done = TRUE;
-@@ -3638,6 +3641,17 @@ panel_toplevel_queue_auto_unhide (PanelT
+@@ -3646,6 +3649,17 @@ panel_toplevel_queue_auto_unhide (PanelToplevel *toplevel)
toplevel);
}
@@ -251,10 +436,9 @@ diff -up
gnome-panel-2.24.0/gnome-panel/panel-toplevel.c.smoother-slide-in gnome
static gboolean
panel_toplevel_enter_notify_event (GtkWidget *widget,
GdkEventCrossing *event)
-diff -up gnome-panel-2.24.0/gnome-panel/panel-toplevel.h.smoother-slide-in
gnome-panel-2.24.0/gnome-panel/panel-toplevel.h
---- gnome-panel-2.24.0/gnome-panel/panel-toplevel.h.smoother-slide-in 2008-09-22
17:21:05.000000000 -0400
-+++ gnome-panel-2.24.0/gnome-panel/panel-toplevel.h 2008-10-11 12:42:50.000000000 -0400
-@@ -136,6 +136,7 @@ void panel_toplevel_hide
+--- gnome-panel-2.24.0/gnome-panel/panel-toplevel.h
++++ gnome-panel-2.24.0/gnome-panel/panel-toplevel.h
+@@ -136,6 +136,7 @@ void panel_toplevel_hide
(PanelToplevel
void panel_toplevel_unhide (PanelToplevel
*toplevel);
void panel_toplevel_queue_auto_hide (PanelToplevel
*toplevel);
void panel_toplevel_queue_auto_unhide (PanelToplevel
*toplevel);
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 4277003..d204660 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -23,7 +23,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.24.0
-Release: 7%{?dist}
+Release: 8%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.24/%{name}-%{version}.tar...
@@ -371,6 +371,11 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Wed Oct 22 2008 Ray Strode <rstrode(a)redhat.com> - 2.24.0-8
+- Don't make nautilus slide down as the panel slides down,
+ instead push nautilus out of the way immediately, and slide
+ in the available space.
+
* Sun Oct 12 2008 Ray Strode <rstrode(a)redhat.com> - 2.24.0-7
- Update smooth slide patch to be simpler based on feedback
on gnome bug (554343)
commit 8ca97cfd78528281b0b632e2cb01e30aa1a15034
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Sun Oct 12 15:42:13 2008 +0000
- Update smooth slide patch to be simpler based on feedback on gnome bug
(554343)
diff --git a/gnome-panel-2.24.0-smoother-slide-in.patch
b/gnome-panel-2.24.0-smoother-slide-in.patch
index b0fb4d8..2a4101a 100644
--- a/gnome-panel-2.24.0-smoother-slide-in.patch
+++ b/gnome-panel-2.24.0-smoother-slide-in.patch
@@ -1,5 +1,6 @@
---- gnome-panel-2.24.0/gnome-panel/applet.c
-+++ gnome-panel-2.24.0/gnome-panel/applet.c
+diff -up gnome-panel-2.24.0/gnome-panel/applet.c.smoother-slide-in
gnome-panel-2.24.0/gnome-panel/applet.c
+--- gnome-panel-2.24.0/gnome-panel/applet.c.smoother-slide-in 2008-09-22
17:21:05.000000000 -0400
++++ gnome-panel-2.24.0/gnome-panel/applet.c 2008-10-12 11:22:38.000000000 -0400
@@ -792,6 +792,7 @@ typedef struct {
} PanelAppletToLoad;
@@ -8,19 +9,16 @@
static gboolean panel_applet_have_load_idle = FALSE;
static void
-@@ -818,8 +819,40 @@ panel_applet_on_load_queue (const char *id)
+@@ -818,6 +819,44 @@ panel_applet_on_load_queue (const char *
return FALSE;
}
-+static void
-+on_applet_loaded (const char *id,
-+ gpointer user_data)
++void
++panel_applet_stop_loading (const char *id)
+{
+ PanelAppletToLoad *applet;
+ GSList *l, *applet_link;
+
-+ GClosure *closure = (GClosure *) user_data;
-+
+ applet_link = NULL;
+ for (l = panel_applets_loading; l; l = l->next) {
+ applet = l->data;
@@ -36,21 +34,27 @@
+ panel_applets_loading = g_slist_delete_link (panel_applets_loading, l);
+ free_applet_to_load (applet);
+
-+ if (panel_applets_loading == NULL && closure != NULL) {
-+ GValue param = { 0 };
-+ g_value_init (¶m, G_TYPE_POINTER);
-+ g_value_set_instance (¶m, NULL);
-+ g_cclosure_marshal_VOID__VOID (closure, NULL, 1, ¶m, 0, NULL);
++ if (panel_applets_loading == NULL) {
++ GSList *toplevels, *l;
++
++ toplevels = panel_toplevel_list_toplevels ();
++
++ l = toplevels;
++ while (l != NULL) {
++ PanelToplevel *toplevel;
++
++ toplevel = (PanelToplevel *) l->data;
++
++ panel_toplevel_queue_initial_unhide (toplevel);
++ l = l->next;
++ }
+ }
+}
+
static gboolean
--panel_applet_load_idle_handler (gpointer dummy)
-+panel_applet_load_idle_handler (GClosure *closure)
+ panel_applet_load_idle_handler (gpointer dummy)
{
- PanelAppletToLoad *applet = NULL;
- PanelToplevel *toplevel = NULL;
-@@ -848,8 +881,8 @@ panel_applet_load_idle_handler (gpointer dummy)
+@@ -848,8 +887,8 @@ panel_applet_load_idle_handler (gpointer
panel_applet_have_load_idle = FALSE;
return FALSE;
}
@@ -60,67 +64,57 @@
panel_widget = panel_toplevel_get_panel_widget (toplevel);
-@@ -866,13 +900,16 @@ panel_applet_load_idle_handler (gpointer dummy)
- panel_widget,
- applet->locked,
- applet->position,
-- applet->id);
-+ applet->id,
-+ on_applet_loaded,
-+ closure);
- break;
- case PANEL_OBJECT_DRAWER:
- drawer_load_from_gconf (panel_widget,
+@@ -873,6 +912,7 @@ panel_applet_load_idle_handler (gpointer
applet->locked,
applet->position,
applet->id);
-+ on_applet_loaded (applet->id, closure);
++ panel_applet_stop_loading (applet->id);
break;
case PANEL_OBJECT_MENU:
panel_menu_button_load_from_gconf (panel_widget,
-@@ -880,12 +917,14 @@ panel_applet_load_idle_handler (gpointer dummy)
+@@ -880,12 +920,14 @@ panel_applet_load_idle_handler (gpointer
applet->position,
TRUE,
applet->id);
-+ on_applet_loaded (applet->id, closure);
++ panel_applet_stop_loading (applet->id);
break;
case PANEL_OBJECT_LAUNCHER:
launcher_load_from_gconf (panel_widget,
applet->locked,
applet->position,
applet->id);
-+ on_applet_loaded (applet->id, closure);
++ panel_applet_stop_loading (applet->id);
break;
case PANEL_OBJECT_LOGOUT:
case PANEL_OBJECT_LOCK:
-@@ -896,6 +935,7 @@ panel_applet_load_idle_handler (gpointer dummy)
+@@ -896,6 +938,7 @@ panel_applet_load_idle_handler (gpointer
applet->position,
TRUE,
applet->id);
-+ on_applet_loaded (applet->id, closure);
++ panel_applet_stop_loading (applet->id);
break;
case PANEL_OBJECT_ACTION:
panel_action_button_load_from_gconf (
-@@ -904,6 +944,7 @@ panel_applet_load_idle_handler (gpointer dummy)
+@@ -904,6 +947,7 @@ panel_applet_load_idle_handler (gpointer
applet->position,
TRUE,
applet->id);
-+ on_applet_loaded (applet->id, closure);
++ panel_applet_stop_loading (applet->id);
break;
case PANEL_OBJECT_MENU_BAR:
panel_menu_bar_load_from_gconf (
-@@ -912,18 +953,18 @@ panel_applet_load_idle_handler (gpointer dummy)
+@@ -912,18 +956,18 @@ panel_applet_load_idle_handler (gpointer
applet->position,
TRUE,
applet->id);
-+ on_applet_loaded (applet->id, closure);
++ panel_applet_stop_loading (applet->id);
break;
case PANEL_OBJECT_SEPARATOR:
panel_separator_load_from_gconf (panel_widget,
applet->locked,
applet->position,
applet->id);
-+ on_applet_loaded (applet->id, closure);
++ panel_applet_stop_loading (applet->id);
default:
break;
}
@@ -130,280 +124,98 @@
return TRUE;
}
-@@ -969,8 +1010,11 @@ panel_applet_compare (const PanelAppletToLoad *a,
- }
-
- void
--panel_applet_load_queued_applets (void)
-+panel_applet_load_queued_applets (GFunc queue_empty_func,
-+ gpointer user_data)
- {
-+ GClosure *closure;
-+
- if (!panel_applets_to_load)
- return;
-
-@@ -978,7 +1022,11 @@ panel_applet_load_queued_applets (void)
- (GCompareFunc) panel_applet_compare);
-
- if ( ! panel_applet_have_load_idle) {
-- g_idle_add (panel_applet_load_idle_handler, NULL);
-+ if (queue_empty_func != NULL)
-+ closure = g_cclosure_new_swap (G_CALLBACK (queue_empty_func), user_data, NULL);
-+ else
-+ closure = NULL;
-+ g_idle_add ((GSourceFunc) panel_applet_load_idle_handler, closure);
- panel_applet_have_load_idle = TRUE;
- }
- }
---- gnome-panel-2.24.0/gnome-panel/applet.h
-+++ gnome-panel-2.24.0/gnome-panel/applet.h
-@@ -28,6 +28,7 @@ typedef struct {
- char *id;
- } AppletInfo;
-
-+typedef void (* AppletLoadingDoneFunc) (const char *id, gpointer data);
- typedef gboolean (* CallbackEnabledFunc) (void);
-
- typedef struct {
-@@ -69,7 +70,8 @@ void panel_applet_queue_applet_to_load (const char *id,
- int position,
- gboolean right_stick,
- gboolean locked);
--void panel_applet_load_queued_applets (void);
-+void panel_applet_load_queued_applets (GFunc queue_empty_func,
-+ gpointer user_data);
- gboolean panel_applet_on_load_queue (const char *id);
-
-
---- gnome-panel-2.24.0/gnome-panel/panel-applet-frame.c
-+++ gnome-panel-2.24.0/gnome-panel/panel-applet-frame.c
-@@ -80,6 +80,8 @@ typedef struct {
- int position;
- gboolean exactpos;
- char *id;
-+ AppletLoadingDoneFunc done_func;
-+ gpointer user_data;
- } PanelAppletFrameActivating;
-
- /* Keep in sync with panel-applet.h. Uggh.
-@@ -326,7 +328,9 @@ panel_applet_frame_load (const gchar *iid,
- gboolean locked,
- int position,
- gboolean exactpos,
-- const char *id)
-+ const char *id,
-+ AppletLoadingDoneFunc done_func,
-+ gpointer user_data)
- {
- PanelAppletFrame *frame;
- CORBA_Environment ev;
-@@ -337,11 +341,17 @@ panel_applet_frame_load (const gchar *iid,
- g_return_if_fail (id != NULL);
-
- if (g_slist_find_custom (no_reload_applets, id,
-- (GCompareFunc) strcmp))
-+ (GCompareFunc) strcmp)) {
-+ if (done_func)
-+ done_func (id, user_data);
- return;
-+ }
-
-- if (panel_lockdown_is_applet_disabled (iid))
-+ if (panel_lockdown_is_applet_disabled (iid)) {
-+ if (done_func)
-+ done_func (id, user_data);
- return;
-+ }
-
- frame = g_object_new (PANEL_TYPE_APPLET_FRAME, NULL);
- frame->priv->panel = panel;
-@@ -353,6 +363,8 @@ panel_applet_frame_load (const gchar *iid,
- frame_act->position = position;
- frame_act->exactpos = exactpos;
- frame_act->id = g_strdup (id);
-+ frame_act->done_func = done_func;
-+ frame_act->user_data = user_data;
-
- CORBA_exception_init (&ev);
-
-@@ -367,7 +379,9 @@ void
- panel_applet_frame_load_from_gconf (PanelWidget *panel_widget,
- gboolean locked,
- int position,
-- const char *id)
-+ const char *id,
-+ AppletLoadingDoneFunc done_func,
-+ gpointer user_data)
- {
- const char *key;
- char *applet_iid;
-@@ -379,11 +393,14 @@ panel_applet_frame_load_from_gconf (PanelWidget *panel_widget,
- applet_iid = gconf_client_get_string (panel_gconf_get_client (),
- key, NULL);
-
-- if (!applet_iid || !applet_iid[0])
-+ if (!applet_iid || !applet_iid[0]) {
-+ done_func (id, user_data);
- return;
-+ }
-
- panel_applet_frame_load (applet_iid, panel_widget,
-- locked, position, TRUE, id);
-+ locked, position, TRUE, id,
-+ done_func, user_data);
-
- g_free (applet_iid);
- }
-@@ -890,7 +907,7 @@ panel_applet_frame_reload_response (GtkWidget *dialog,
- }
-
- panel_applet_frame_load (iid, panel, locked,
-- position, TRUE, id);
-+ position, TRUE, id, NULL, NULL);
-
- g_free (iid);
- g_free (id);
-@@ -1286,6 +1303,8 @@ panel_applet_frame_activated (CORBA_Object object,
+diff -up gnome-panel-2.24.0/gnome-panel/applet.h.smoother-slide-in
gnome-panel-2.24.0/gnome-panel/applet.h
+--- gnome-panel-2.24.0/gnome-panel/applet.h.smoother-slide-in 2008-09-22
17:21:05.000000000 -0400
++++ gnome-panel-2.24.0/gnome-panel/applet.h 2008-10-12 11:11:42.000000000 -0400
+@@ -53,6 +53,7 @@ AppletInfo *panel_applet_register (Gt
+ gboolean exactpos,
+ PanelObjectType type,
+ const char *id);
++void panel_applet_stop_loading (const char *id);
+
+ const char *panel_applet_get_id (AppletInfo *info);
+ const char *panel_applet_get_id_by_widget (GtkWidget *widget);
+diff -up gnome-panel-2.24.0/gnome-panel/panel-applet-frame.c.smoother-slide-in
gnome-panel-2.24.0/gnome-panel/panel-applet-frame.c
+--- gnome-panel-2.24.0/gnome-panel/panel-applet-frame.c.smoother-slide-in 2008-10-11
12:42:50.000000000 -0400
++++ gnome-panel-2.24.0/gnome-panel/panel-applet-frame.c 2008-10-12 11:19:58.000000000
-0400
+@@ -1286,6 +1286,7 @@ panel_applet_frame_activated (CORBA_Obje
if (!in_default_panel_config (frame_act->id)) {
panel_applet_frame_loading_failed (frame, frame_act->id);
}
-+ if (frame_act->done_func)
-+ frame_act->done_func (frame_act->id, frame_act->user_data);
++ panel_applet_stop_loading (frame_act->id);
g_free (frame_act->id);
g_free (frame_act);
return;
-@@ -1328,6 +1347,8 @@ panel_applet_frame_activated (CORBA_Object object,
+@@ -1328,6 +1329,7 @@ panel_applet_frame_activated (CORBA_Obje
panel_applet_frame_loading_failed (frame, frame_act->id);
CORBA_exception_free (&corba_ev);
bonobo_object_release_unref (object, NULL);
-+ if (frame_act->done_func)
-+ frame_act->done_func (frame_act->id, frame_act->user_data);
++ panel_applet_stop_loading (frame_act->id);
g_free (frame_act->id);
g_free (frame_act);
g_free (error);
-@@ -1344,6 +1365,8 @@ panel_applet_frame_activated (CORBA_Object object,
+@@ -1344,6 +1346,7 @@ panel_applet_frame_activated (CORBA_Obje
g_warning (G_STRLOC ": failed to load applet %s",
frame->priv->iid);
panel_applet_frame_loading_failed (frame, frame_act->id);
-+ if (frame_act->done_func)
-+ frame_act->done_func (frame_act->id, frame_act->user_data);
++ panel_applet_stop_loading (frame_act->id);
g_free (frame_act->id);
g_free (frame_act);
return;
-@@ -1355,6 +1378,8 @@ panel_applet_frame_activated (CORBA_Object object,
+@@ -1355,6 +1358,7 @@ panel_applet_frame_activated (CORBA_Obje
"(cannot get control frame)", frame->priv->iid);
panel_applet_frame_loading_failed (frame, frame_act->id);
gtk_object_sink (GTK_OBJECT (widget));
-+ if (frame_act->done_func)
-+ frame_act->done_func (frame_act->id, frame_act->user_data);
++ panel_applet_stop_loading (frame_act->id);
g_free (frame_act->id);
g_free (frame_act);
return;
-@@ -1371,6 +1396,8 @@ panel_applet_frame_activated (CORBA_Object object,
+@@ -1371,6 +1375,7 @@ panel_applet_frame_activated (CORBA_Obje
frame->priv->iid, error);
panel_applet_frame_loading_failed (frame, frame_act->id);
gtk_object_sink (GTK_OBJECT (widget));
-+ if (frame_act->done_func)
-+ frame_act->done_func (frame_act->id, frame_act->user_data);
++ panel_applet_stop_loading (frame_act->id);
g_free (frame_act->id);
g_free (frame_act);
g_free (error);
-@@ -1394,6 +1421,8 @@ panel_applet_frame_activated (CORBA_Object object,
+@@ -1394,6 +1399,7 @@ panel_applet_frame_activated (CORBA_Obje
frame->priv->iid, error);
panel_applet_frame_loading_failed (frame, frame_act->id);
gtk_object_sink (GTK_OBJECT (widget));
-+ if (frame_act->done_func)
-+ frame_act->done_func (frame_act->id, frame_act->user_data);
++ panel_applet_stop_loading (frame_act->id);
g_free (frame_act->id);
g_free (frame_act);
g_free (error);
-@@ -1418,6 +1447,8 @@ panel_applet_frame_activated (CORBA_Object object,
+@@ -1418,6 +1424,7 @@ panel_applet_frame_activated (CORBA_Obje
"(cannot get control)", frame->priv->iid);
panel_applet_frame_loading_failed (frame, frame_act->id);
gtk_object_sink (GTK_OBJECT (widget));
-+ if (frame_act->done_func)
-+ frame_act->done_func (frame_act->id, frame_act->user_data);
++ panel_applet_stop_loading (frame_act->id);
g_free (frame_act->id);
g_free (frame_act);
return;
-@@ -1430,6 +1461,8 @@ panel_applet_frame_activated (CORBA_Object object,
+@@ -1430,6 +1437,7 @@ panel_applet_frame_activated (CORBA_Obje
"(cannot get applet shell)", frame->priv->iid);
panel_applet_frame_loading_failed (frame, frame_act->id);
gtk_object_sink (GTK_OBJECT (widget));
-+ if (frame_act->done_func)
-+ frame_act->done_func (frame_act->id, frame_act->user_data);
++ panel_applet_stop_loading (frame_act->id);
g_free (frame_act->id);
g_free (frame_act);
return;
-@@ -1461,6 +1494,8 @@ panel_applet_frame_activated (CORBA_Object object,
+@@ -1461,6 +1469,7 @@ panel_applet_frame_activated (CORBA_Obje
panel_lockdown_notify_add (G_CALLBACK (panel_applet_frame_sync_menu_state),
frame);
-+ if (frame_act->done_func)
-+ frame_act->done_func (frame_act->id, frame_act->user_data);
++ panel_applet_stop_loading (frame_act->id);
g_free (frame_act->id);
g_free (frame_act);
}
---- gnome-panel-2.24.0/gnome-panel/panel-applet-frame.h
-+++ gnome-panel-2.24.0/gnome-panel/panel-applet-frame.h
-@@ -73,7 +73,9 @@ void panel_applet_frame_change_background (PanelAppletFrame
*frame,
- void panel_applet_frame_load_from_gconf (PanelWidget *panel_widget,
- gboolean locked,
- int position,
-- const char *id);
-+ const char *id,
-+ AppletLoadingDoneFunc done_func,
-+ gpointer user_data);
-
- void panel_applet_frame_set_panel (PanelAppletFrame *frame,
- PanelWidget *panel);
---- gnome-panel-2.24.0/gnome-panel/panel-profile.c
-+++ gnome-panel-2.24.0/gnome-panel/panel-profile.c
-@@ -2195,7 +2195,7 @@ panel_profile_object_id_list_notify (GConfClient *client,
- g_slist_free (sublist);
- g_slist_free (object_ids);
-
-- panel_applet_load_queued_applets ();
-+ panel_applet_load_queued_applets (NULL, NULL);
- }
-
- static void
-@@ -2446,6 +2446,22 @@ panel_profile_ensure_toplevel_per_screen (GConfClient *client,
- g_slist_free (empty_screens);
- }
-
-+static void
-+panel_profile_on_loaded (void)
-+{
-+ GSList *toplevels;
-+ GSList *l;
-+
-+ toplevels = panel_toplevel_list_toplevels ();
-+
-+ for (l = toplevels; l; l = l->next) {
-+ PanelToplevel *toplevel;
-+
-+ toplevel = PANEL_TOPLEVEL (l->data);
-+ panel_toplevel_queue_initial_unhide (toplevel);
-+ }
-+}
-+
- void
- panel_profile_load (void)
- {
-@@ -2477,7 +2493,7 @@ panel_profile_load (void)
-
- panel_profile_ensure_toplevel_per_screen (client, PANEL_CONFIG_DIR);
-
-- panel_applet_load_queued_applets ();
-+ panel_applet_load_queued_applets ((GFunc) panel_profile_on_loaded, NULL);
- }
-
- static gboolean
---- gnome-panel-2.24.0/gnome-panel/panel-toplevel.c
-+++ gnome-panel-2.24.0/gnome-panel/panel-toplevel.c
-@@ -2898,12 +2899,15 @@ static void
+diff -up gnome-panel-2.24.0/gnome-panel/panel-applet-frame.h.smoother-slide-in
gnome-panel-2.24.0/gnome-panel/panel-applet-frame.h
+diff -up gnome-panel-2.24.0/gnome-panel/panel-profile.c.smoother-slide-in
gnome-panel-2.24.0/gnome-panel/panel-profile.c
+diff -up gnome-panel-2.24.0/gnome-panel/panel-toplevel.c.smoother-slide-in
gnome-panel-2.24.0/gnome-panel/panel-toplevel.c
+--- gnome-panel-2.24.0/gnome-panel/panel-toplevel.c.smoother-slide-in 2008-09-22
17:21:05.000000000 -0400
++++ gnome-panel-2.24.0/gnome-panel/panel-toplevel.c 2008-10-11 12:42:50.000000000 -0400
+@@ -2898,12 +2898,15 @@ static void
panel_toplevel_initially_hide (PanelToplevel *toplevel)
{
if (!toplevel->priv->attached) {
@@ -421,7 +233,7 @@
} else
toplevel->priv->initial_animation_done = TRUE;
-@@ -3638,6 +3642,17 @@ panel_toplevel_queue_auto_unhide (PanelToplevel *toplevel)
+@@ -3638,6 +3641,17 @@ panel_toplevel_queue_auto_unhide (PanelT
toplevel);
}
@@ -439,9 +251,10 @@
static gboolean
panel_toplevel_enter_notify_event (GtkWidget *widget,
GdkEventCrossing *event)
---- gnome-panel-2.24.0/gnome-panel/panel-toplevel.h
-+++ gnome-panel-2.24.0/gnome-panel/panel-toplevel.h
-@@ -136,6 +136,7 @@ void panel_toplevel_hide
(PanelToplevel
+diff -up gnome-panel-2.24.0/gnome-panel/panel-toplevel.h.smoother-slide-in
gnome-panel-2.24.0/gnome-panel/panel-toplevel.h
+--- gnome-panel-2.24.0/gnome-panel/panel-toplevel.h.smoother-slide-in 2008-09-22
17:21:05.000000000 -0400
++++ gnome-panel-2.24.0/gnome-panel/panel-toplevel.h 2008-10-11 12:42:50.000000000 -0400
+@@ -136,6 +136,7 @@ void panel_toplevel_hide
void panel_toplevel_unhide (PanelToplevel
*toplevel);
void panel_toplevel_queue_auto_hide (PanelToplevel
*toplevel);
void panel_toplevel_queue_auto_unhide (PanelToplevel
*toplevel);
diff --git a/gnome-panel.spec b/gnome-panel.spec
index ccbcad3..4277003 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -23,7 +23,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.24.0
-Release: 6%{?dist}
+Release: 7%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.24/%{name}-%{version}.tar...
@@ -371,6 +371,10 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Sun Oct 12 2008 Ray Strode <rstrode(a)redhat.com> - 2.24.0-7
+- Update smooth slide patch to be simpler based on feedback
+ on gnome bug (554343)
+
* Thu Oct 9 2008 Ray Strode <rstrode(a)redhat.com> - 2.24.0-6
- Hide shutdown item if unavailable
commit 1fcc9a6ddfd3af12542877d529df895ca02128eb
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Thu Oct 9 19:59:53 2008 +0000
Add upstream bug reference
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 81d4507..ccbcad3 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -116,7 +116,7 @@ Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
#
http://bugzilla.gnome.org/show_bug.cgi?id=554343
Patch25: gnome-panel-2.24.0-smoother-slide-in.patch
-# TODO file patch upstream
+#
http://bugzilla.gnome.org/show_bug.cgi?id=536915
Patch26: gnome-panel-2.24.0-hide-shutdown-if-unavailable.patch
Patch35: clock-wakeups.patch
commit 5037c7c524546f2599b337c1967e6d26d59a8eb2
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Thu Oct 9 19:39:32 2008 +0000
- Hide shutdown item if unavailable
diff --git a/gnome-panel-2.24.0-hide-shutdown-if-unavailable.patch
b/gnome-panel-2.24.0-hide-shutdown-if-unavailable.patch
new file mode 100644
index 0000000..f84d22b
--- /dev/null
+++ b/gnome-panel-2.24.0-hide-shutdown-if-unavailable.patch
@@ -0,0 +1,80 @@
+diff -ru gnome-panel-2.24.0/gnome-panel/libpanel-util/panel-session-manager.c
new/gnome-panel/libpanel-util/panel-session-manager.c
+--- gnome-panel-2.24.0/gnome-panel/libpanel-util/panel-session-manager.c 2008-09-22
17:21:03.000000000 -0400
++++ new/gnome-panel/libpanel-util/panel-session-manager.c 2008-10-09 12:56:14.000000000
-0400
+@@ -141,6 +141,39 @@
+ }
+ }
+
++gboolean
++panel_session_manager_is_shutdown_available (PanelSessionManager *manager)
++{
++ GError *error;
++ DBusGProxy *proxy;
++ gboolean is_shutdown_available;
++
++ g_return_if_fail (PANEL_IS_SESSION_MANAGER (manager));
++
++ error = NULL;
++
++ if (!panel_dbus_service_ensure_connection (PANEL_DBUS_SERVICE (manager),
++ &error)) {
++ g_warning ("Could not connect to session manager: %s",
++ error->message);
++ g_error_free (error);
++ return;
++ }
++
++ proxy = panel_dbus_service_get_proxy (PANEL_DBUS_SERVICE (manager));
++
++ if (!dbus_g_proxy_call (proxy, "CanShutdown", &error,
++ G_TYPE_INVALID, G_TYPE_BOOLEAN,
++ &is_shutdown_available, G_TYPE_INVALID) &&
++ error != NULL) {
++ g_warning ("Could not ask session manager if shut down is available: %s",
++ error->message);
++ g_error_free (error);
++ return FALSE;
++ }
++ return is_shutdown_available;
++}
++
+ PanelSessionManager *
+ panel_session_manager_get (void)
+ {
+diff -ru gnome-panel-2.24.0/gnome-panel/libpanel-util/panel-session-manager.h
new/gnome-panel/libpanel-util/panel-session-manager.h
+--- gnome-panel-2.24.0/gnome-panel/libpanel-util/panel-session-manager.h 2008-09-22
17:21:03.000000000 -0400
++++ new/gnome-panel/libpanel-util/panel-session-manager.h 2008-10-09 12:57:27.000000000
-0400
+@@ -63,6 +63,7 @@
+ void panel_session_manager_request_logout (PanelSessionManager *session,
+ PanelSessionManagerLogoutType mode);
+ void panel_session_manager_request_shutdown (PanelSessionManager *session);
++gboolean panel_session_manager_is_shutdown_available (PanelSessionManager *session);
+
+ G_END_DECLS
+
+diff -ru gnome-panel-2.24.0/gnome-panel/panel-action-button.c
new/gnome-panel/panel-action-button.c
+--- gnome-panel-2.24.0/gnome-panel/panel-action-button.c 2008-10-09 12:59:52.000000000
-0400
++++ new/gnome-panel/panel-action-button.c 2008-10-09 13:05:28.000000000 -0400
+@@ -190,15 +190,13 @@
+ static gboolean
+ panel_action_shutdown_reboot_is_disabled (void)
+ {
+- return panel_lockdown_get_disable_log_out();
+-#if 0
+- /* FIXME: waiting for a gnome-session dbus api to know if
+- * shutdown/reboot is possible:
+- *
http://bugzilla.gnome.org/show_bug.cgi?id=536915 */
+- return (panel_lockdown_get_disable_log_out() ||
+- (!gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN) &&
+- !gdm_supports_logout_action (GDM_LOGOUT_ACTION_REBOOT)));
+-#endif
++ PanelSessionManager *manager;
++
++ if (panel_lockdown_get_disable_log_out())
++ return TRUE;
++
++ manager = panel_session_manager_get ();
++ return !panel_session_manager_is_shutdown_available (manager);
+ }
+
+ /* Run Application
diff --git a/gnome-panel.spec b/gnome-panel.spec
index e6164e4..81d4507 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -23,7 +23,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.24.0
-Release: 5%{?dist}
+Release: 6%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.24/%{name}-%{version}.tar...
@@ -116,6 +116,9 @@ Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
#
http://bugzilla.gnome.org/show_bug.cgi?id=554343
Patch25: gnome-panel-2.24.0-smoother-slide-in.patch
+# TODO file patch upstream
+Patch26: gnome-panel-2.24.0-hide-shutdown-if-unavailable.patch
+
Patch35: clock-wakeups.patch
#
http://bugzilla.gnome.org/show_bug.cgi?id=555710
Patch36: tryexec.patch
@@ -166,6 +169,7 @@ Panel Applets using the libpanel-applet library.
%patch11 -p1 -b .applet-error
%patch24 -p1 -b .allow-spurious-view-done-signals
%patch25 -p1 -b .smoother-slide-in
+%patch26 -p1 -b .hide-shutdown-item-if-unavailable
%patch35 -p1 -b .clock-wakeups
%patch36 -p1 -b .tryexec
@@ -367,6 +371,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Thu Oct 9 2008 Ray Strode <rstrode(a)redhat.com> - 2.24.0-6
+- Hide shutdown item if unavailable
+
* Thu Oct 9 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.24.0-5
- Don't show menuitems which fail the tryexec test
commit 3b36adea91801b50fb078ec56efb69ad44f78119
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Oct 9 17:56:19 2008 +0000
fix menu item visibility
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 8bae54c..e6164e4 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -23,7 +23,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.24.0
-Release: 4%{?dist}
+Release: 5%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.24/%{name}-%{version}.tar...
@@ -117,6 +117,8 @@ Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
Patch25: gnome-panel-2.24.0-smoother-slide-in.patch
Patch35: clock-wakeups.patch
+#
http://bugzilla.gnome.org/show_bug.cgi?id=555710
+Patch36: tryexec.patch
Conflicts: gnome-power-manager < 2.15.3
@@ -165,6 +167,7 @@ Panel Applets using the libpanel-applet library.
%patch24 -p1 -b .allow-spurious-view-done-signals
%patch25 -p1 -b .smoother-slide-in
%patch35 -p1 -b .clock-wakeups
+%patch36 -p1 -b .tryexec
. %{SOURCE6}
@@ -364,6 +367,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Thu Oct 9 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.24.0-5
+- Don't show menuitems which fail the tryexec test
+
* Fri Sep 26 2008 Ray Strode <rstrode(a)redhat.com> - 2.24.0-4
- Try to make initial panel slide-in animation be smooth
diff --git a/tryexec.patch b/tryexec.patch
new file mode 100644
index 0000000..7226f38
--- /dev/null
+++ b/tryexec.patch
@@ -0,0 +1,29 @@
+diff -up gnome-panel-2.24.0/gnome-panel/panel-menu-items.c.tryexec
gnome-panel-2.24.0/gnome-panel/panel-menu-items.c
+--- gnome-panel-2.24.0/gnome-panel/panel-menu-items.c.tryexec 2008-10-09
13:31:01.000000000 -0400
++++ gnome-panel-2.24.0/gnome-panel/panel-menu-items.c 2008-10-09 13:36:29.000000000
-0400
+@@ -151,6 +151,8 @@ panel_menu_items_append_from_desktop (Gt
+ char *icon;
+ char *name;
+ char *comment;
++ char *tryexec;
++ char *prog;
+
+ path_freeme = NULL;
+
+@@ -189,6 +191,16 @@ panel_menu_items_append_from_desktop (Gt
+ g_free (path_freeme);
+ return;
+ }
++ tryexec = panel_key_file_get_string (key_file, "TryExec");
++ if (tryexec) {
++ prog = g_find_program_in_path (tryexec);
++ g_free (tryexec);
++ if (!prog) {
++ g_key_file_free (key_file);
++ return;
++ }
++ g_free (prog);
++ }
+
+ icon = panel_key_file_get_locale_string (key_file, "Icon");
+ comment = panel_key_file_get_locale_string (key_file, "Comment");
commit 1830c93dc27d221147a20a89b2abf990c9faece3
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Mon Sep 29 18:39:12 2008 +0000
add bug line to patch
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 6a61552..8bae54c 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -113,6 +113,7 @@ Patch11: applet-error.patch
#
http://bugzilla.gnome.org/show_bug.cgi?id=520111
Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
+#
http://bugzilla.gnome.org/show_bug.cgi?id=554343
Patch25: gnome-panel-2.24.0-smoother-slide-in.patch
Patch35: clock-wakeups.patch
commit 1034e315b1fa568314f651022ed8084d24bae656
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Fri Sep 26 19:39:13 2008 +0000
- Try to make initial panel slide-in animation be smooth
diff --git a/gnome-panel-2.24.0-smoother-slide-in.patch
b/gnome-panel-2.24.0-smoother-slide-in.patch
new file mode 100644
index 0000000..b0fb4d8
--- /dev/null
+++ b/gnome-panel-2.24.0-smoother-slide-in.patch
@@ -0,0 +1,451 @@
+--- gnome-panel-2.24.0/gnome-panel/applet.c
++++ gnome-panel-2.24.0/gnome-panel/applet.c
+@@ -792,6 +792,7 @@ typedef struct {
+ } PanelAppletToLoad;
+
+ static GSList *panel_applets_to_load = NULL;
++static GSList *panel_applets_loading = NULL;
+ static gboolean panel_applet_have_load_idle = FALSE;
+
+ static void
+@@ -818,8 +819,40 @@ panel_applet_on_load_queue (const char *id)
+ return FALSE;
+ }
+
++static void
++on_applet_loaded (const char *id,
++ gpointer user_data)
++{
++ PanelAppletToLoad *applet;
++ GSList *l, *applet_link;
++
++ GClosure *closure = (GClosure *) user_data;
++
++ applet_link = NULL;
++ for (l = panel_applets_loading; l; l = l->next) {
++ applet = l->data;
++
++ if (strcmp (applet->id, id) == 0) {
++ break;
++ }
++ }
++
++ if (l == NULL)
++ return;
++
++ panel_applets_loading = g_slist_delete_link (panel_applets_loading, l);
++ free_applet_to_load (applet);
++
++ if (panel_applets_loading == NULL && closure != NULL) {
++ GValue param = { 0 };
++ g_value_init (¶m, G_TYPE_POINTER);
++ g_value_set_instance (¶m, NULL);
++ g_cclosure_marshal_VOID__VOID (closure, NULL, 1, ¶m, 0, NULL);
++ }
++}
++
+ static gboolean
+-panel_applet_load_idle_handler (gpointer dummy)
++panel_applet_load_idle_handler (GClosure *closure)
+ {
+ PanelAppletToLoad *applet = NULL;
+ PanelToplevel *toplevel = NULL;
+@@ -848,8 +881,8 @@ panel_applet_load_idle_handler (gpointer dummy)
+ panel_applet_have_load_idle = FALSE;
+ return FALSE;
+ }
+-
+ panel_applets_to_load = g_slist_delete_link (panel_applets_to_load, l);
++ panel_applets_loading = g_slist_append (panel_applets_loading, applet);
+
+ panel_widget = panel_toplevel_get_panel_widget (toplevel);
+
+@@ -866,13 +900,16 @@ panel_applet_load_idle_handler (gpointer dummy)
+ panel_widget,
+ applet->locked,
+ applet->position,
+- applet->id);
++ applet->id,
++ on_applet_loaded,
++ closure);
+ break;
+ case PANEL_OBJECT_DRAWER:
+ drawer_load_from_gconf (panel_widget,
+ applet->locked,
+ applet->position,
+ applet->id);
++ on_applet_loaded (applet->id, closure);
+ break;
+ case PANEL_OBJECT_MENU:
+ panel_menu_button_load_from_gconf (panel_widget,
+@@ -880,12 +917,14 @@ panel_applet_load_idle_handler (gpointer dummy)
+ applet->position,
+ TRUE,
+ applet->id);
++ on_applet_loaded (applet->id, closure);
+ break;
+ case PANEL_OBJECT_LAUNCHER:
+ launcher_load_from_gconf (panel_widget,
+ applet->locked,
+ applet->position,
+ applet->id);
++ on_applet_loaded (applet->id, closure);
+ break;
+ case PANEL_OBJECT_LOGOUT:
+ case PANEL_OBJECT_LOCK:
+@@ -896,6 +935,7 @@ panel_applet_load_idle_handler (gpointer dummy)
+ applet->position,
+ TRUE,
+ applet->id);
++ on_applet_loaded (applet->id, closure);
+ break;
+ case PANEL_OBJECT_ACTION:
+ panel_action_button_load_from_gconf (
+@@ -904,6 +944,7 @@ panel_applet_load_idle_handler (gpointer dummy)
+ applet->position,
+ TRUE,
+ applet->id);
++ on_applet_loaded (applet->id, closure);
+ break;
+ case PANEL_OBJECT_MENU_BAR:
+ panel_menu_bar_load_from_gconf (
+@@ -912,18 +953,18 @@ panel_applet_load_idle_handler (gpointer dummy)
+ applet->position,
+ TRUE,
+ applet->id);
++ on_applet_loaded (applet->id, closure);
+ break;
+ case PANEL_OBJECT_SEPARATOR:
+ panel_separator_load_from_gconf (panel_widget,
+ applet->locked,
+ applet->position,
+ applet->id);
++ on_applet_loaded (applet->id, closure);
+ default:
+ break;
+ }
+
+- free_applet_to_load (applet);
+-
+ return TRUE;
+ }
+
+@@ -969,8 +1010,11 @@ panel_applet_compare (const PanelAppletToLoad *a,
+ }
+
+ void
+-panel_applet_load_queued_applets (void)
++panel_applet_load_queued_applets (GFunc queue_empty_func,
++ gpointer user_data)
+ {
++ GClosure *closure;
++
+ if (!panel_applets_to_load)
+ return;
+
+@@ -978,7 +1022,11 @@ panel_applet_load_queued_applets (void)
+ (GCompareFunc) panel_applet_compare);
+
+ if ( ! panel_applet_have_load_idle) {
+- g_idle_add (panel_applet_load_idle_handler, NULL);
++ if (queue_empty_func != NULL)
++ closure = g_cclosure_new_swap (G_CALLBACK (queue_empty_func), user_data, NULL);
++ else
++ closure = NULL;
++ g_idle_add ((GSourceFunc) panel_applet_load_idle_handler, closure);
+ panel_applet_have_load_idle = TRUE;
+ }
+ }
+--- gnome-panel-2.24.0/gnome-panel/applet.h
++++ gnome-panel-2.24.0/gnome-panel/applet.h
+@@ -28,6 +28,7 @@ typedef struct {
+ char *id;
+ } AppletInfo;
+
++typedef void (* AppletLoadingDoneFunc) (const char *id, gpointer data);
+ typedef gboolean (* CallbackEnabledFunc) (void);
+
+ typedef struct {
+@@ -69,7 +70,8 @@ void panel_applet_queue_applet_to_load (const char *id,
+ int position,
+ gboolean right_stick,
+ gboolean locked);
+-void panel_applet_load_queued_applets (void);
++void panel_applet_load_queued_applets (GFunc queue_empty_func,
++ gpointer user_data);
+ gboolean panel_applet_on_load_queue (const char *id);
+
+
+--- gnome-panel-2.24.0/gnome-panel/panel-applet-frame.c
++++ gnome-panel-2.24.0/gnome-panel/panel-applet-frame.c
+@@ -80,6 +80,8 @@ typedef struct {
+ int position;
+ gboolean exactpos;
+ char *id;
++ AppletLoadingDoneFunc done_func;
++ gpointer user_data;
+ } PanelAppletFrameActivating;
+
+ /* Keep in sync with panel-applet.h. Uggh.
+@@ -326,7 +328,9 @@ panel_applet_frame_load (const gchar *iid,
+ gboolean locked,
+ int position,
+ gboolean exactpos,
+- const char *id)
++ const char *id,
++ AppletLoadingDoneFunc done_func,
++ gpointer user_data)
+ {
+ PanelAppletFrame *frame;
+ CORBA_Environment ev;
+@@ -337,11 +341,17 @@ panel_applet_frame_load (const gchar *iid,
+ g_return_if_fail (id != NULL);
+
+ if (g_slist_find_custom (no_reload_applets, id,
+- (GCompareFunc) strcmp))
++ (GCompareFunc) strcmp)) {
++ if (done_func)
++ done_func (id, user_data);
+ return;
++ }
+
+- if (panel_lockdown_is_applet_disabled (iid))
++ if (panel_lockdown_is_applet_disabled (iid)) {
++ if (done_func)
++ done_func (id, user_data);
+ return;
++ }
+
+ frame = g_object_new (PANEL_TYPE_APPLET_FRAME, NULL);
+ frame->priv->panel = panel;
+@@ -353,6 +363,8 @@ panel_applet_frame_load (const gchar *iid,
+ frame_act->position = position;
+ frame_act->exactpos = exactpos;
+ frame_act->id = g_strdup (id);
++ frame_act->done_func = done_func;
++ frame_act->user_data = user_data;
+
+ CORBA_exception_init (&ev);
+
+@@ -367,7 +379,9 @@ void
+ panel_applet_frame_load_from_gconf (PanelWidget *panel_widget,
+ gboolean locked,
+ int position,
+- const char *id)
++ const char *id,
++ AppletLoadingDoneFunc done_func,
++ gpointer user_data)
+ {
+ const char *key;
+ char *applet_iid;
+@@ -379,11 +393,14 @@ panel_applet_frame_load_from_gconf (PanelWidget *panel_widget,
+ applet_iid = gconf_client_get_string (panel_gconf_get_client (),
+ key, NULL);
+
+- if (!applet_iid || !applet_iid[0])
++ if (!applet_iid || !applet_iid[0]) {
++ done_func (id, user_data);
+ return;
++ }
+
+ panel_applet_frame_load (applet_iid, panel_widget,
+- locked, position, TRUE, id);
++ locked, position, TRUE, id,
++ done_func, user_data);
+
+ g_free (applet_iid);
+ }
+@@ -890,7 +907,7 @@ panel_applet_frame_reload_response (GtkWidget *dialog,
+ }
+
+ panel_applet_frame_load (iid, panel, locked,
+- position, TRUE, id);
++ position, TRUE, id, NULL, NULL);
+
+ g_free (iid);
+ g_free (id);
+@@ -1286,6 +1303,8 @@ panel_applet_frame_activated (CORBA_Object object,
+ if (!in_default_panel_config (frame_act->id)) {
+ panel_applet_frame_loading_failed (frame, frame_act->id);
+ }
++ if (frame_act->done_func)
++ frame_act->done_func (frame_act->id, frame_act->user_data);
+ g_free (frame_act->id);
+ g_free (frame_act);
+ return;
+@@ -1328,6 +1347,8 @@ panel_applet_frame_activated (CORBA_Object object,
+ panel_applet_frame_loading_failed (frame, frame_act->id);
+ CORBA_exception_free (&corba_ev);
+ bonobo_object_release_unref (object, NULL);
++ if (frame_act->done_func)
++ frame_act->done_func (frame_act->id, frame_act->user_data);
+ g_free (frame_act->id);
+ g_free (frame_act);
+ g_free (error);
+@@ -1344,6 +1365,8 @@ panel_applet_frame_activated (CORBA_Object object,
+ g_warning (G_STRLOC ": failed to load applet %s",
+ frame->priv->iid);
+ panel_applet_frame_loading_failed (frame, frame_act->id);
++ if (frame_act->done_func)
++ frame_act->done_func (frame_act->id, frame_act->user_data);
+ g_free (frame_act->id);
+ g_free (frame_act);
+ return;
+@@ -1355,6 +1378,8 @@ panel_applet_frame_activated (CORBA_Object object,
+ "(cannot get control frame)", frame->priv->iid);
+ panel_applet_frame_loading_failed (frame, frame_act->id);
+ gtk_object_sink (GTK_OBJECT (widget));
++ if (frame_act->done_func)
++ frame_act->done_func (frame_act->id, frame_act->user_data);
+ g_free (frame_act->id);
+ g_free (frame_act);
+ return;
+@@ -1371,6 +1396,8 @@ panel_applet_frame_activated (CORBA_Object object,
+ frame->priv->iid, error);
+ panel_applet_frame_loading_failed (frame, frame_act->id);
+ gtk_object_sink (GTK_OBJECT (widget));
++ if (frame_act->done_func)
++ frame_act->done_func (frame_act->id, frame_act->user_data);
+ g_free (frame_act->id);
+ g_free (frame_act);
+ g_free (error);
+@@ -1394,6 +1421,8 @@ panel_applet_frame_activated (CORBA_Object object,
+ frame->priv->iid, error);
+ panel_applet_frame_loading_failed (frame, frame_act->id);
+ gtk_object_sink (GTK_OBJECT (widget));
++ if (frame_act->done_func)
++ frame_act->done_func (frame_act->id, frame_act->user_data);
+ g_free (frame_act->id);
+ g_free (frame_act);
+ g_free (error);
+@@ -1418,6 +1447,8 @@ panel_applet_frame_activated (CORBA_Object object,
+ "(cannot get control)", frame->priv->iid);
+ panel_applet_frame_loading_failed (frame, frame_act->id);
+ gtk_object_sink (GTK_OBJECT (widget));
++ if (frame_act->done_func)
++ frame_act->done_func (frame_act->id, frame_act->user_data);
+ g_free (frame_act->id);
+ g_free (frame_act);
+ return;
+@@ -1430,6 +1461,8 @@ panel_applet_frame_activated (CORBA_Object object,
+ "(cannot get applet shell)", frame->priv->iid);
+ panel_applet_frame_loading_failed (frame, frame_act->id);
+ gtk_object_sink (GTK_OBJECT (widget));
++ if (frame_act->done_func)
++ frame_act->done_func (frame_act->id, frame_act->user_data);
+ g_free (frame_act->id);
+ g_free (frame_act);
+ return;
+@@ -1461,6 +1494,8 @@ panel_applet_frame_activated (CORBA_Object object,
+ panel_lockdown_notify_add (G_CALLBACK (panel_applet_frame_sync_menu_state),
+ frame);
+
++ if (frame_act->done_func)
++ frame_act->done_func (frame_act->id, frame_act->user_data);
+ g_free (frame_act->id);
+ g_free (frame_act);
+ }
+--- gnome-panel-2.24.0/gnome-panel/panel-applet-frame.h
++++ gnome-panel-2.24.0/gnome-panel/panel-applet-frame.h
+@@ -73,7 +73,9 @@ void panel_applet_frame_change_background (PanelAppletFrame
*frame,
+ void panel_applet_frame_load_from_gconf (PanelWidget *panel_widget,
+ gboolean locked,
+ int position,
+- const char *id);
++ const char *id,
++ AppletLoadingDoneFunc done_func,
++ gpointer user_data);
+
+ void panel_applet_frame_set_panel (PanelAppletFrame *frame,
+ PanelWidget *panel);
+--- gnome-panel-2.24.0/gnome-panel/panel-profile.c
++++ gnome-panel-2.24.0/gnome-panel/panel-profile.c
+@@ -2195,7 +2195,7 @@ panel_profile_object_id_list_notify (GConfClient *client,
+ g_slist_free (sublist);
+ g_slist_free (object_ids);
+
+- panel_applet_load_queued_applets ();
++ panel_applet_load_queued_applets (NULL, NULL);
+ }
+
+ static void
+@@ -2446,6 +2446,22 @@ panel_profile_ensure_toplevel_per_screen (GConfClient *client,
+ g_slist_free (empty_screens);
+ }
+
++static void
++panel_profile_on_loaded (void)
++{
++ GSList *toplevels;
++ GSList *l;
++
++ toplevels = panel_toplevel_list_toplevels ();
++
++ for (l = toplevels; l; l = l->next) {
++ PanelToplevel *toplevel;
++
++ toplevel = PANEL_TOPLEVEL (l->data);
++ panel_toplevel_queue_initial_unhide (toplevel);
++ }
++}
++
+ void
+ panel_profile_load (void)
+ {
+@@ -2477,7 +2493,7 @@ panel_profile_load (void)
+
+ panel_profile_ensure_toplevel_per_screen (client, PANEL_CONFIG_DIR);
+
+- panel_applet_load_queued_applets ();
++ panel_applet_load_queued_applets ((GFunc) panel_profile_on_loaded, NULL);
+ }
+
+ static gboolean
+--- gnome-panel-2.24.0/gnome-panel/panel-toplevel.c
++++ gnome-panel-2.24.0/gnome-panel/panel-toplevel.c
+@@ -2898,12 +2899,15 @@ static void
+ panel_toplevel_initially_hide (PanelToplevel *toplevel)
+ {
+ if (!toplevel->priv->attached) {
++
++ /* We start the panel off hidden until all the
++ * applets are loaded, and then finally slide it
++ * down when it's ready to be used
++ */
+ toplevel->priv->initial_animation_done = FALSE;
+
+ toplevel->priv->state = PANEL_STATE_AUTO_HIDDEN;
+ gtk_widget_queue_resize (GTK_WIDGET (toplevel));
+-
+- panel_toplevel_queue_auto_unhide (toplevel);
+ } else
+ toplevel->priv->initial_animation_done = TRUE;
+
+@@ -3638,6 +3642,17 @@ panel_toplevel_queue_auto_unhide (PanelToplevel *toplevel)
+ toplevel);
+ }
+
++void
++panel_toplevel_queue_initial_unhide (PanelToplevel *toplevel)
++{
++ if (toplevel->priv->initial_animation_done)
++ return;
++ /* Give the applets a second or so to frob after registering */
++ toplevel->priv->unhide_timeout =
++ g_timeout_add_seconds (1, (GSourceFunc) panel_toplevel_auto_unhide_timeout_handler,
++ toplevel);
++}
++
+ static gboolean
+ panel_toplevel_enter_notify_event (GtkWidget *widget,
+ GdkEventCrossing *event)
+--- gnome-panel-2.24.0/gnome-panel/panel-toplevel.h
++++ gnome-panel-2.24.0/gnome-panel/panel-toplevel.h
+@@ -136,6 +136,7 @@ void panel_toplevel_hide
(PanelToplevel
+ void panel_toplevel_unhide (PanelToplevel
*toplevel);
+ void panel_toplevel_queue_auto_hide (PanelToplevel
*toplevel);
+ void panel_toplevel_queue_auto_unhide (PanelToplevel
*toplevel);
++void panel_toplevel_queue_initial_unhide (PanelToplevel
*toplevel);
+ void panel_toplevel_push_autohide_disabler (PanelToplevel
*toplevel);
+ void panel_toplevel_pop_autohide_disabler (PanelToplevel
*toplevel);
+
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 7462d99..6a61552 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -23,7 +23,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.24.0
-Release: 3%{?dist}
+Release: 4%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.24/%{name}-%{version}.tar...
@@ -113,6 +113,8 @@ Patch11: applet-error.patch
#
http://bugzilla.gnome.org/show_bug.cgi?id=520111
Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
+Patch25: gnome-panel-2.24.0-smoother-slide-in.patch
+
Patch35: clock-wakeups.patch
Conflicts: gnome-power-manager < 2.15.3
@@ -160,6 +162,7 @@ Panel Applets using the libpanel-applet library.
%patch10 -p1 -b .preferred-apps
%patch11 -p1 -b .applet-error
%patch24 -p1 -b .allow-spurious-view-done-signals
+%patch25 -p1 -b .smoother-slide-in
%patch35 -p1 -b .clock-wakeups
. %{SOURCE6}
@@ -360,6 +363,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Fri Sep 26 2008 Ray Strode <rstrode(a)redhat.com> - 2.24.0-4
+- Try to make initial panel slide-in animation be smooth
+
* Thu Sep 25 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.24.0-3
- Save some space
commit cf899e88f585704157e70c3ff85e8e147801e508
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Sep 25 19:22:03 2008 +0000
save some space
diff --git a/gnome-panel.spec b/gnome-panel.spec
index abd4453..7462d99 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -23,7 +23,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.24.0
-Release: 2%{?dist}
+Release: 3%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.24/%{name}-%{version}.tar...
@@ -168,6 +168,19 @@ cp -f %{SOURCE3} gnome-panel/panel-default-setup.entries
cp -f %{SOURCE4} m4
cp -f %{SOURCE5} gnome-panel/panel-compatibility.schemas
+# strip unneeded translations from .mo files
+# ideally intltool (ha!) would do that for us
+#
http://bugzilla.gnome.org/show_bug.cgi?id=474987
+cd po
+grep -v
".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$\|.*[.]schemas[.]in$\|.*[.]policy[.]in$"
POTFILES.in > POTFILES.keep
+mv POTFILES.keep POTFILES.in
+intltool-update --pot
+for p in *.po; do
+ msgmerge $p %{gettext_package}.pot > $p.out
+ msgfmt -o `basename $p .po`.gmo $p.out
+done
+
+
%build
# gpm-integration patches Makefile.am and configure.in
aclocal -I m4
@@ -347,6 +360,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Thu Sep 25 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.24.0-3
+- Save some space
+
* Thu Sep 25 2008 Ray Strode <rstrode(a)redhat.com> - 2.24.0-2
- Requires: gnome-session-xsession so it gets pulled in for
typical GNOME installs.
commit 9f26c4b1bd5db455aaf6f1af77c8a8e170bd9385
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Thu Sep 25 18:22:59 2008 +0000
- Requires: gnome-session-xsession so it gets pulled in for typical GNOME
installs.
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 3fcc8af..abd4453 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -23,7 +23,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.24.0
-Release: 1%{?dist}
+Release: 2%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.24/%{name}-%{version}.tar...
@@ -42,6 +42,7 @@ Requires: gnome-menus >= %{gnome_menus_version}
Requires: evolution-data-server >= %{evolution_data_server_version}
%endif
Requires: PolicyKit-gnome
+Requires: gnome-session-xsession
Requires(post): GConf2 >= %{gconf_version}
Requires(post): scrollkeeper
@@ -346,6 +347,10 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Thu Sep 25 2008 Ray Strode <rstrode(a)redhat.com> - 2.24.0-2
+- Requires: gnome-session-xsession so it gets pulled in for
+ typical GNOME installs.
+
* Tue Sep 23 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.24.0-1
- Update to 2.24.0
commit 8a6d984ad3de67325852a109394732bd3d81afb2
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Sep 23 04:12:39 2008 +0000
2.24.0
diff --git a/.cvsignore b/.cvsignore
index cac83ae..895e6dc 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.23.92.tar.bz2
+gnome-panel-2.24.0.tar.bz2
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 53a1a86..3fcc8af 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,10 +22,10 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.23.92
+Version: 2.24.0
Release: 1%{?dist}
URL:
http://www.gnome.org
-Source0:
http://download.gnome.org/sources/gnome-panel/2.23/%{name}-%{version}.tar...
+Source0:
http://download.gnome.org/sources/gnome-panel/2.24/%{name}-%{version}.tar...
Source3: redhat-panel-default-setup.entries
Source4: gnome-compiler-flags.m4
@@ -346,6 +346,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Tue Sep 23 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.24.0-1
+- Update to 2.24.0
+
* Mon Sep 8 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.92-1
- Update to 2.23.92
diff --git a/sources b/sources
index dfe9b0b..7476d3f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8720f9b42692904ce7df371715248255 gnome-panel-2.23.92.tar.bz2
+0d246880611a4c58fe2ff99614b96918 gnome-panel-2.24.0.tar.bz2
commit d0d3d180c2ca0f65683e0a404a7c855f3c5e6213
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Sep 9 01:42:04 2008 +0000
2.23.92
diff --git a/.cvsignore b/.cvsignore
index 92ccdaf..cac83ae 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.23.91.tar.bz2
+gnome-panel-2.23.92.tar.bz2
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 3cefcd5..53a1a86 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.23.91
+Version: 2.23.92
Release: 1%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.23/%{name}-%{version}.tar...
@@ -346,6 +346,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Mon Sep 8 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.92-1
+- Update to 2.23.92
+
* Tue Sep 2 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.91-1
- Update to 2.23.91
diff --git a/sources b/sources
index e294c17..dfe9b0b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-56b17e14666d80a02e48c6ef457dde7e gnome-panel-2.23.91.tar.bz2
+8720f9b42692904ce7df371715248255 gnome-panel-2.23.92.tar.bz2
commit 73d2063f437133752c79715e025b7850f56da872
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Sep 3 03:26:30 2008 +0000
2.23.91
diff --git a/.cvsignore b/.cvsignore
index 2379f42..92ccdaf 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.23.90.1.tar.bz2
+gnome-panel-2.23.91.tar.bz2
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 6119022..3cefcd5 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.23.90.1
+Version: 2.23.91
Release: 1%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.23/%{name}-%{version}.tar...
@@ -346,6 +346,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Tue Sep 2 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.91-1
+- Update to 2.23.91
+
* Sat Aug 23 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.90.1-1
- Update to 2.23.90.1
diff --git a/sources b/sources
index a6b4c40..e294c17 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fb33af68201e66faf84abab3fb75fe2e gnome-panel-2.23.90.1.tar.bz2
+56b17e14666d80a02e48c6ef457dde7e gnome-panel-2.23.91.tar.bz2
commit 69bdf1d6d0751f9316f942a42023bb1756c50119
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sat Aug 23 04:57:22 2008 +0000
2.23.90.1
diff --git a/.cvsignore b/.cvsignore
index d80cc52..2379f42 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.23.6.tar.bz2
+gnome-panel-2.23.90.1.tar.bz2
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 0268eb5..6119022 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.23.6
+Version: 2.23.90.1
Release: 1%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.23/%{name}-%{version}.tar...
@@ -346,6 +346,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Sat Aug 23 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.90.1-1
+- Update to 2.23.90.1
+
* Tue Aug 5 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.6-1
- Update to 2.23.6
diff --git a/sources b/sources
index 50f286f..a6b4c40 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6204b45029b79deeb6b05e46b7c2908d gnome-panel-2.23.6.tar.bz2
+fb33af68201e66faf84abab3fb75fe2e gnome-panel-2.23.90.1.tar.bz2
commit 5768e9701c8e4e3fbb480da6a6c72711110d9a05
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Aug 5 17:48:05 2008 +0000
more spec fixage
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 25f2141..0268eb5 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -87,6 +87,7 @@ BuildRequires: libgweather-devel >= %{libgweather_version}
BuildRequires: librsvg2-devel
BuildRequires: NetworkManager-devel
BuildRequires: intltool
+BuildRequires: gettext-devel
Patch0: gnome-panel-2.23.4-vendor.patch
Patch1: gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch
commit e6f8d2417a2481d3b8eb4b13fe6d54f095b4490e
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Aug 5 17:10:17 2008 +0000
intltool hate
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 3c89ce8..25f2141 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -86,6 +86,7 @@ BuildRequires: PolicyKit-gnome-devel
BuildRequires: libgweather-devel >= %{libgweather_version}
BuildRequires: librsvg2-devel
BuildRequires: NetworkManager-devel
+BuildRequires: intltool
Patch0: gnome-panel-2.23.4-vendor.patch
Patch1: gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch
commit 5f3946cc287e244587900764d08ae66bbd74fb6c
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Aug 5 16:44:17 2008 +0000
2.23.6
diff --git a/.cvsignore b/.cvsignore
index 82b4963..d80cc52 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.23.5.tar.bz2
+gnome-panel-2.23.6.tar.bz2
diff --git a/gnome-panel-2.13.5-switch-user.patch b/gnome-panel-2.13.5-switch-user.patch
deleted file mode 100644
index 9deb8e4..0000000
--- a/gnome-panel-2.13.5-switch-user.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- gnome-panel-2.13.5/gnome-panel/panel-logout.c.switch-user 2006-01-20
09:43:52.000000000 -0500
-+++ gnome-panel-2.13.5/gnome-panel/panel-logout.c 2006-01-20 09:44:26.000000000 -0500
-@@ -205,10 +205,12 @@
- // FIXME set default button
- logout_dialog->priv->default_response = PANEL_LOGOUT_DIALOG_LOGOUT;
-
-+#if 0
- //FIXME is gdm running?
- gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
- _("_Switch User"),
- PANEL_LOGOUT_RESPONSE_SWITCH_USER);
-+#endif
- gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
- GTK_STOCK_CANCEL,
- GTK_RESPONSE_CANCEL);
diff --git a/gnome-panel-2.19.5-vendor.patch b/gnome-panel-2.19.5-vendor.patch
deleted file mode 100644
index 0afbf46..0000000
--- a/gnome-panel-2.19.5-vendor.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- gnome-panel-2.17.91.svn20070207/gnome-panel/panel-menu-items.c.vendor 2007-02-07
00:18:07.000000000 -0500
-+++ gnome-panel-2.17.91.svn20070207/gnome-panel/panel-menu-items.c 2007-02-07
01:07:52.000000000 -0500
-@@ -611,7 +611,7 @@
- COMPUTER_NAME_KEY,
- NULL);
- panel_menu_items_append_from_desktop (places_menu,
-- "nautilus-computer.desktop",
-+ "gnome-nautilus-computer.desktop",
- gconf_name);
- if (gconf_name)
- g_free (gconf_name);
-@@ -624,7 +624,7 @@
- add_menu_separator (places_menu);
-
- panel_menu_items_append_from_desktop (places_menu,
-- "network-scheme.desktop",
-+ "gnome-network-scheme.desktop",
- NULL);
- panel_place_menu_item_append_volumes (places_menu, TRUE);
-
-@@ -715,7 +715,7 @@
- if (add_separator)
- add_menu_separator (menu);
-
-- panel_menu_items_append_from_desktop (menu, "yelp.desktop", NULL);
-+ panel_menu_items_append_from_desktop (menu, "gnome-yelp.desktop", NULL);
- panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL);
-
- if (parent->priv->append_lock_logout)
diff --git a/gnome-panel-2.22.0-ck-shutdown.patch b/gnome-panel-2.22.0-ck-shutdown.patch
deleted file mode 100644
index a041d49..0000000
--- a/gnome-panel-2.22.0-ck-shutdown.patch
+++ /dev/null
@@ -1,1193 +0,0 @@
-diff -up gnome-panel-2.22.0/gnome-panel/Makefile.am.ck-shutdown
gnome-panel-2.22.0/gnome-panel/Makefile.am
---- gnome-panel-2.22.0/gnome-panel/Makefile.am.ck-shutdown 2008-03-10 16:44:57.000000000
-0400
-+++ gnome-panel-2.22.0/gnome-panel/Makefile.am 2008-04-05 20:48:37.000000000 -0400
-@@ -16,6 +16,7 @@ INCLUDES = \
- $(STANDARD_PROPERTIES_CFLAGS) \
- $(PANEL_CFLAGS) \
- $(PANELCONFIG_CFLAGS) \
-+ $(POLKIT_GNOME_CFLAGS) \
- $(WARN_CFLAGS) \
- $(NULL)
-
-@@ -98,6 +99,7 @@ panel_sources = \
- panel-logout.c \
- panel-gdm.c \
- panel-power-manager.c \
-+ panel-consolekit.c \
- panel-ditem-editor.c \
- panel-mount-operation.c \
- $(NULL)
-@@ -148,6 +150,7 @@ panel_headers = \
- panel-logout.h \
- panel-gdm.h \
- panel-power-manager.h \
-+ panel-consolekit.h \
- panel-ditem-editor.h \
- panel-icon-names.h \
- panel-mount-operation.h \
-@@ -161,6 +164,7 @@ gnome_panel_SOURCES = \
-
- gnome_panel_LDADD = \
- $(PANEL_LIBS) \
-+ $(POLKIT_GNOME_LIBS) \
- $(X_LIBS)
-
- gnome_panel_LDFLAGS = -export-dynamic
-diff -up gnome-panel-2.22.0/gnome-panel/panel-action-button.c.ck-shutdown
gnome-panel-2.22.0/gnome-panel/panel-action-button.c
---- gnome-panel-2.22.0/gnome-panel/panel-action-button.c.ck-shutdown 2008-04-05
20:48:37.000000000 -0400
-+++ gnome-panel-2.22.0/gnome-panel/panel-action-button.c 2008-04-05 20:48:37.000000000
-0400
-@@ -46,7 +46,6 @@
- #include "panel-lockdown.h"
- #include "panel-logout.h"
- #include "panel-compatibility.h"
--#include "panel-gdm.h"
- #include "panel-icon-names.h"
-
- G_DEFINE_TYPE (PanelActionButton, panel_action_button, BUTTON_TYPE_WIDGET);
-@@ -183,8 +182,7 @@ static gboolean
- panel_action_shutdown_reboot_is_disabled (void)
- {
- return (panel_lockdown_get_disable_log_out() ||
-- (!gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN) &&
-- !gdm_supports_logout_action (GDM_LOGOUT_ACTION_REBOOT)));
-+ !panel_logout_supports_shutdown_reboot ());
- }
-
- /* Run Application
-diff -up /dev/null gnome-panel-2.22.0/gnome-panel/panel-consolekit.c
---- /dev/null 2008-04-05 22:04:35.194004710 -0400
-+++ gnome-panel-2.22.0/gnome-panel/panel-consolekit.c 2008-04-05 20:48:37.000000000
-0400
-@@ -0,0 +1,682 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
-+ *
-+ * Copyright (C) 2008 Jon McCann <jmccann(a)redhat.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2, or (at your option)
-+ * any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+ * 02111-1307, USA.
-+ */
-+
-+#include "config.h"
-+
-+#include <errno.h>
-+#include <string.h>
-+#include <unistd.h>
-+
-+#include <glib.h>
-+#include <glib-object.h>
-+#include <glib/gi18n.h>
-+
-+#include <dbus/dbus-glib.h>
-+
-+#ifdef HAVE_POLKIT
-+#include <polkit-gnome/polkit-gnome.h>
-+#endif
-+
-+#include "panel-consolekit.h"
-+
-+#define CK_NAME "org.freedesktop.ConsoleKit"
-+#define CK_PATH "/org/freedesktop/ConsoleKit"
-+#define CK_INTERFACE "org.freedesktop.ConsoleKit"
-+
-+#define CK_MANAGER_PATH "/org/freedesktop/ConsoleKit/Manager"
-+#define CK_MANAGER_INTERFACE "org.freedesktop.ConsoleKit.Manager"
-+#define CK_SEAT_INTERFACE "org.freedesktop.ConsoleKit.Seat"
-+#define CK_SESSION_INTERFACE "org.freedesktop.ConsoleKit.Session"
-+
-+#define PANEL_CONSOLEKIT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o),
PANEL_TYPE_CONSOLEKIT, PanelConsolekitPrivate))
-+
-+struct _PanelConsolekitPrivate {
-+ DBusGConnection *dbus_connection;
-+ DBusGProxy *bus_proxy;
-+ DBusGProxy *ck_proxy;
-+ guint32 is_connected : 1;
-+};
-+
-+enum {
-+ PROP_0 = 0,
-+ PROP_IS_CONNECTED
-+};
-+
-+enum {
-+ REQUEST_COMPLETED = 0,
-+ LAST_SIGNAL
-+};
-+
-+static guint signals [LAST_SIGNAL];
-+
-+static void panel_consolekit_class_init (PanelConsolekitClass *klass);
-+static void panel_consolekit_init (PanelConsolekit *ck);
-+static void panel_consolekit_finalize (GObject *object);
-+static void panel_consolekit_on_name_owner_changed (DBusGProxy *bus_proxy,
-+ const char *name,
-+ const char *prev_owner,
-+ const char *new_owner,
-+ PanelConsolekit *manager);
-+
-+G_DEFINE_TYPE (PanelConsolekit, panel_consolekit, G_TYPE_OBJECT);
-+
-+static void
-+panel_consolekit_get_property (GObject *object,
-+ guint prop_id,
-+ GValue *value,
-+ GParamSpec *pspec)
-+{
-+ PanelConsolekit *manager = PANEL_CONSOLEKIT (object);
-+
-+ switch (prop_id) {
-+ case PROP_IS_CONNECTED:
-+ g_value_set_boolean (value,
-+ manager->priv->is_connected);
-+ break;
-+
-+ default:
-+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object,
-+ prop_id,
-+ pspec);
-+ }
-+}
-+
-+static void
-+panel_consolekit_class_init (PanelConsolekitClass *manager_class)
-+{
-+ GObjectClass *object_class;
-+ GParamSpec *param_spec;
-+
-+ object_class = G_OBJECT_CLASS (manager_class);
-+
-+ object_class->finalize = panel_consolekit_finalize;
-+ object_class->get_property = panel_consolekit_get_property;
-+
-+ param_spec = g_param_spec_boolean ("is-connected",
-+ "Is connected",
-+ "Whether the panel is connected to ConsoleKit",
-+ FALSE,
-+ G_PARAM_READABLE);
-+ g_object_class_install_property (object_class, PROP_IS_CONNECTED,
-+ param_spec);
-+
-+ signals [REQUEST_COMPLETED] =
-+ g_signal_new ("request-completed",
-+ G_OBJECT_CLASS_TYPE (object_class),
-+ G_SIGNAL_RUN_LAST,
-+ G_STRUCT_OFFSET (PanelConsolekitClass, request_completed),
-+ NULL,
-+ NULL,
-+ g_cclosure_marshal_VOID__POINTER,
-+ G_TYPE_NONE,
-+ 1, G_TYPE_POINTER);
-+
-+ g_type_class_add_private (manager_class,
-+ sizeof (PanelConsolekitPrivate));
-+}
-+
-+static gboolean
-+panel_consolekit_ensure_ck_connection (PanelConsolekit *manager,
-+ GError **error)
-+{
-+ GError *connection_error;
-+ gboolean is_connected;
-+
-+ connection_error = NULL;
-+ if (manager->priv->dbus_connection == NULL) {
-+ manager->priv->dbus_connection = dbus_g_bus_get (DBUS_BUS_SYSTEM,
-+ &connection_error);
-+
-+ if (manager->priv->dbus_connection == NULL) {
-+ g_propagate_error (error, connection_error);
-+ is_connected = FALSE;
-+ goto out;
-+ }
-+ }
-+
-+ if (manager->priv->bus_proxy == NULL) {
-+ manager->priv->bus_proxy =
-+ dbus_g_proxy_new_for_name_owner (manager->priv->dbus_connection,
-+ DBUS_SERVICE_DBUS,
-+ DBUS_PATH_DBUS,
-+ DBUS_INTERFACE_DBUS,
-+ &connection_error);
-+
-+ if (manager->priv->bus_proxy == NULL) {
-+ g_propagate_error (error, connection_error);
-+ is_connected = FALSE;
-+ goto out;
-+ }
-+
-+ dbus_g_proxy_add_signal (manager->priv->bus_proxy,
-+ "NameOwnerChanged",
-+ G_TYPE_STRING,
-+ G_TYPE_STRING,
-+ G_TYPE_STRING,
-+ G_TYPE_INVALID);
-+ dbus_g_proxy_connect_signal (manager->priv->bus_proxy,
-+ "NameOwnerChanged",
-+ G_CALLBACK (panel_consolekit_on_name_owner_changed),
-+ manager, NULL);
-+ }
-+
-+ if (manager->priv->ck_proxy == NULL) {
-+ manager->priv->ck_proxy =
-+ dbus_g_proxy_new_for_name_owner (manager->priv->dbus_connection,
-+ "org.freedesktop.ConsoleKit",
-+ "/org/freedesktop/ConsoleKit/Manager",
-+ "org.freedesktop.ConsoleKit.Manager",
-+ &connection_error);
-+
-+ if (manager->priv->ck_proxy == NULL) {
-+ g_propagate_error (error, connection_error);
-+ is_connected = FALSE;
-+ goto out;
-+ }
-+ }
-+ is_connected = TRUE;
-+
-+out:
-+ if (manager->priv->is_connected != is_connected) {
-+ manager->priv->is_connected = is_connected;
-+ g_object_notify (G_OBJECT (manager), "is-connected");
-+ }
-+
-+ if (!is_connected) {
-+ if (manager->priv->dbus_connection == NULL) {
-+ if (manager->priv->bus_proxy != NULL) {
-+ g_object_unref (manager->priv->bus_proxy);
-+ manager->priv->bus_proxy = NULL;
-+ }
-+
-+ if (manager->priv->ck_proxy != NULL) {
-+ g_object_unref (manager->priv->ck_proxy);
-+ manager->priv->ck_proxy = NULL;
-+ }
-+ } else if (manager->priv->bus_proxy == NULL) {
-+ if (manager->priv->ck_proxy != NULL) {
-+ g_object_unref (manager->priv->ck_proxy);
-+ manager->priv->ck_proxy = NULL;
-+ }
-+ }
-+ }
-+
-+ return is_connected;
-+}
-+
-+static void
-+panel_consolekit_on_name_owner_changed (DBusGProxy *bus_proxy,
-+ const char *name,
-+ const char *prev_owner,
-+ const char *new_owner,
-+ PanelConsolekit *manager)
-+{
-+ if (name != NULL && strcmp (name, "org.freedesktop.ConsoleKit") !=
0)
-+ return;
-+
-+ if (manager->priv->ck_proxy != NULL) {
-+ g_object_unref (manager->priv->ck_proxy);
-+ manager->priv->ck_proxy = NULL;
-+ }
-+
-+ panel_consolekit_ensure_ck_connection (manager, NULL);
-+}
-+
-+static void
-+panel_consolekit_init (PanelConsolekit *manager)
-+{
-+ GError *error;
-+
-+ manager->priv = PANEL_CONSOLEKIT_GET_PRIVATE (manager);
-+
-+ error = NULL;
-+ if (!panel_consolekit_ensure_ck_connection (manager, &error)) {
-+ g_message ("Could not connect to ConsoleKit: %s",
-+ error->message);
-+ g_error_free (error);
-+ }
-+}
-+
-+static void
-+panel_consolekit_finalize (GObject *object)
-+{
-+ PanelConsolekit *manager;
-+ GObjectClass *parent_class;
-+
-+ manager = PANEL_CONSOLEKIT (object);
-+
-+ parent_class = G_OBJECT_CLASS (panel_consolekit_parent_class);
-+
-+ if (manager->priv->bus_proxy != NULL) {
-+ g_object_unref (manager->priv->bus_proxy);
-+ }
-+
-+ if (manager->priv->ck_proxy != NULL) {
-+ g_object_unref (manager->priv->ck_proxy);
-+ }
-+
-+ if (parent_class->finalize != NULL)
-+ parent_class->finalize (object);
-+}
-+
-+GQuark
-+panel_consolekit_error_quark (void)
-+{
-+ static GQuark error_quark = 0;
-+
-+ if (error_quark == 0)
-+ error_quark = g_quark_from_static_string ("panel-consolekit-error");
-+
-+ return error_quark;
-+}
-+
-+PanelConsolekit *
-+panel_consolekit_new (void)
-+{
-+ PanelConsolekit *manager;
-+
-+ manager = g_object_new (PANEL_TYPE_CONSOLEKIT, NULL);
-+
-+ return manager;
-+}
-+
-+static gboolean
-+try_system_stop (DBusGConnection *connection,
-+ GError **error)
-+{
-+ DBusGProxy *proxy;
-+ gboolean res;
-+
-+ proxy = dbus_g_proxy_new_for_name (connection,
-+ CK_NAME,
-+ CK_MANAGER_PATH,
-+ CK_MANAGER_INTERFACE);
-+ res = dbus_g_proxy_call_with_timeout (proxy,
-+ "Stop",
-+ INT_MAX,
-+ error,
-+ /* parameters: */
-+ G_TYPE_INVALID,
-+ /* return values: */
-+ G_TYPE_INVALID);
-+ return res;
-+}
-+
-+static gboolean
-+try_system_restart (DBusGConnection *connection,
-+ GError **error)
-+{
-+ DBusGProxy *proxy;
-+ gboolean res;
-+
-+ proxy = dbus_g_proxy_new_for_name (connection,
-+ CK_NAME,
-+ CK_MANAGER_PATH,
-+ CK_MANAGER_INTERFACE);
-+ res = dbus_g_proxy_call_with_timeout (proxy,
-+ "Restart",
-+ INT_MAX,
-+ error,
-+ /* parameters: */
-+ G_TYPE_INVALID,
-+ /* return values: */
-+ G_TYPE_INVALID);
-+ return res;
-+}
-+
-+static void
-+emit_restart_complete (PanelConsolekit *manager,
-+ const char *error_message)
-+{
-+ GError *call_error;
-+
-+ call_error = NULL;
-+
-+ if (error_message != NULL) {
-+ call_error = g_error_new_literal (PANEL_CONSOLEKIT_ERROR,
-+ PANEL_CONSOLEKIT_ERROR_RESTARTING,
-+ error_message);
-+ }
-+
-+ g_signal_emit (G_OBJECT (manager),
-+ signals [REQUEST_COMPLETED],
-+ 0, call_error);
-+ if (call_error != NULL) {
-+ g_error_free (call_error);
-+ }
-+}
-+
-+static void
-+emit_stop_complete (PanelConsolekit *manager,
-+ GError *error)
-+{
-+ GError *call_error;
-+
-+ call_error = NULL;
-+
-+ if (error != NULL) {
-+ call_error = g_error_new_literal (PANEL_CONSOLEKIT_ERROR,
-+ PANEL_CONSOLEKIT_ERROR_STOPPING,
-+ error->message);
-+ }
-+
-+ g_signal_emit (G_OBJECT (manager),
-+ signals [REQUEST_COMPLETED],
-+ 0, call_error);
-+ if (call_error != NULL) {
-+ g_error_free (call_error);
-+ }
-+}
-+
-+#ifdef HAVE_POLKIT
-+static void
-+system_restart_auth_cb (PolKitAction *action,
-+ gboolean gained_privilege,
-+ GError *error,
-+ PanelConsolekit *manager)
-+{
-+ GError *local_error;
-+ gboolean res;
-+
-+ if (! gained_privilege) {
-+ if (error != NULL) {
-+ emit_restart_complete (manager, error->message);
-+ }
-+ return;
-+ }
-+
-+ local_error = NULL;
-+ res = try_system_restart (manager->priv->dbus_connection, &local_error);
-+ if (! res) {
-+ g_warning ("Unable to restart system: %s", local_error->message);
-+ emit_restart_complete (manager, local_error->message);
-+ g_error_free (local_error);
-+ return;
-+ }
-+}
-+
-+static void
-+system_stop_auth_cb (PolKitAction *action,
-+ gboolean gained_privilege,
-+ GError *error,
-+ PanelConsolekit *manager)
-+{
-+ GError *local_error;
-+ gboolean res;
-+
-+ if (! gained_privilege) {
-+ if (error != NULL) {
-+ emit_stop_complete (manager, error);
-+ }
-+ return;
-+ }
-+
-+ local_error = NULL;
-+ res = try_system_stop (manager->priv->dbus_connection, &local_error);
-+ if (! res) {
-+ g_warning ("Unable to stop system: %s", local_error->message);
-+ emit_stop_complete (manager, local_error);
-+ g_error_free (local_error);
-+ return;
-+ }
-+}
-+
-+static PolKitAction *
-+get_action_from_error (GError *error)
-+{
-+ PolKitAction *action;
-+ char *paction;
-+ char *p;
-+
-+ action = polkit_action_new ();
-+
-+ paction = NULL;
-+ if (g_str_has_prefix (error->message, "Not privileged for action:
")) {
-+ paction = g_strdup (error->message + strlen ("Not privileged for
action: "));
-+ p = strchr (paction, ' ');
-+ if (p)
-+ *p = '\0';
-+ }
-+ polkit_action_set_action_id (action, paction);
-+
-+ g_free (paction);
-+
-+ return action;
-+}
-+
-+static PolKitResult
-+get_result_from_error (GError *error)
-+{
-+ PolKitResult result = POLKIT_RESULT_UNKNOWN;
-+ const char *p;
-+
-+ p = strrchr (error->message, ' ');
-+ if (p) {
-+ p++;
-+ polkit_result_from_string_representation (p, &result);
-+ }
-+
-+ return result;
-+}
-+
-+#endif /* HAVE_POLKIT */
-+
-+static void
-+request_restart_priv (PanelConsolekit *manager,
-+ GError *error)
-+{
-+#ifdef HAVE_POLKIT
-+ gboolean res = FALSE;
-+ char *error_message = NULL;
-+ PolKitAction *action;
-+ PolKitAction *action2;
-+ PolKitResult result;
-+ guint xid;
-+ pid_t pid;
-+ GError *local_error;
-+
-+ action = get_action_from_error (error);
-+ result = get_result_from_error (error);
-+
-+ if (result == POLKIT_RESULT_NO) {
-+ action2 = polkit_action_new ();
-+ polkit_action_set_action_id (action2,
"org.freedesktop.consolekit.system.restart-multiple-users");
-+ if (polkit_action_equal (action, action2)) {
-+ emit_restart_complete (manager, _("You are not allowed to restart the computer
"
-+ "because multiple users are logged in"));
-+ }
-+ else {
-+ emit_restart_complete (manager, _("You are not allowed to restart the
computer"));
-+ }
-+ polkit_action_unref (action);
-+ polkit_action_unref (action2);
-+
-+ return;
-+ }
-+
-+
-+ xid = 0;
-+ pid = getpid ();
-+
-+ local_error = NULL;
-+ res = polkit_gnome_auth_obtain (action,
-+ xid,
-+ pid,
-+ (PolKitGnomeAuthCB) system_restart_auth_cb,
-+ manager,
-+ &local_error);
-+ polkit_action_unref (action);
-+ if (local_error != NULL) {
-+ error_message = g_strdup (local_error->message);
-+ g_error_free (local_error);
-+ }
-+
-+ if (! res) {
-+ emit_restart_complete (manager, error_message);
-+ g_free (error_message);
-+ }
-+#else
-+ g_assert_not_reached ();
-+#endif /* HAVE POLKIT */
-+}
-+
-+static void
-+request_stop_priv (PanelConsolekit *manager,
-+ GError *error)
-+{
-+#ifdef HAVE_POLKIT
-+ gboolean res = FALSE;
-+ char *error_message = NULL;
-+ PolKitAction *action;
-+ PolKitAction *action2;
-+ PolKitResult result;
-+ guint xid;
-+ pid_t pid;
-+ GError *local_error;
-+
-+ result = get_result_from_error (error);
-+ action = get_action_from_error (error);
-+
-+ if (result == POLKIT_RESULT_NO) {
-+ action2 = polkit_action_new ();
-+ polkit_action_set_action_id (action2,
"org.freedesktop.consolekit.system.stop-multiple-users");
-+ if (polkit_action_equal (action, action2)) {
-+ emit_restart_complete (manager, _("You are not allowed to stop the computer
"
-+ "because multiple users are logged in"));
-+ }
-+ else {
-+ emit_restart_complete (manager, _("You are not allowed to stop the
computer"));
-+ }
-+ polkit_action_unref (action);
-+ polkit_action_unref (action2);
-+
-+ return;
-+ }
-+
-+ xid = 0;
-+ pid = getpid ();
-+
-+ xid = 0;
-+ pid = getpid ();
-+
-+ local_error = NULL;
-+ res = polkit_gnome_auth_obtain (action,
-+ xid,
-+ pid,
-+ (PolKitGnomeAuthCB) system_stop_auth_cb,
-+ manager,
-+ &local_error);
-+ polkit_action_unref (action);
-+ if (local_error != NULL) {
-+ error_message = g_strdup (local_error->message);
-+ g_error_free (local_error);
-+ }
-+ if (! res) {
-+ emit_stop_complete (manager, error_message);
-+ g_free (error_message);
-+ }
-+#else
-+ g_assert_not_reached ();
-+#endif /* HAVE POLKIT */
-+}
-+
-+void
-+panel_consolekit_attempt_restart (PanelConsolekit *manager)
-+{
-+ gboolean res;
-+ GError *error;
-+
-+ error = NULL;
-+
-+ if (!panel_consolekit_ensure_ck_connection (manager, &error)) {
-+ g_warning ("Could not connect to ConsoleKit: %s",
-+ error->message);
-+ g_error_free (error);
-+ return;
-+ }
-+
-+ res = try_system_restart (manager->priv->dbus_connection, &error);
-+ if (! res) {
-+ if (dbus_g_error_has_name (error,
"org.freedesktop.ConsoleKit.Manager.NotPrivileged")) {
-+ request_restart_priv (manager, error);
-+ } else {
-+ emit_restart_complete (manager, error);
-+ }
-+ g_error_free (error);
-+ }
-+}
-+
-+void
-+panel_consolekit_attempt_stop (PanelConsolekit *manager)
-+{
-+ gboolean res;
-+ GError *error;
-+
-+ error = NULL;
-+
-+ if (!panel_consolekit_ensure_ck_connection (manager, &error)) {
-+ g_warning ("Could not connect to ConsoleKit: %s",
-+ error->message);
-+ g_error_free (error);
-+ return;
-+ }
-+
-+ res = try_system_stop (manager->priv->dbus_connection, &error);
-+ if (! res) {
-+ if (dbus_g_error_has_name (error,
"org.freedesktop.ConsoleKit.Manager.NotPrivileged")) {
-+ request_stop_priv (manager, error);
-+ } else {
-+ emit_stop_complete (manager, error);
-+ }
-+ g_error_free (error);
-+ }
-+}
-+
-+gboolean
-+panel_consolekit_can_restart (PanelConsolekit *manager)
-+{
-+#ifdef HAVE_POLKIT
-+ return panel_consolekit_ensure_ck_connection (manager, NULL);
-+#else
-+ return FALSE;
-+#endif
-+}
-+
-+gboolean
-+panel_consolekit_can_stop (PanelConsolekit *manager)
-+{
-+#ifdef HAVE_POLKIT
-+ return panel_consolekit_ensure_ck_connection (manager, NULL);
-+#else
-+ return FALSE;
-+#endif
-+}
-+
-+PanelConsolekit *
-+panel_get_consolekit (void)
-+{
-+ static PanelConsolekit *manager = NULL;
-+
-+ if (manager == NULL) {
-+ manager = panel_consolekit_new ();
-+ }
-+
-+ return g_object_ref (manager);
-+}
-diff -up /dev/null gnome-panel-2.22.0/gnome-panel/panel-consolekit.h
---- /dev/null 2008-04-05 22:04:35.194004710 -0400
-+++ gnome-panel-2.22.0/gnome-panel/panel-consolekit.h 2008-04-05 20:48:37.000000000
-0400
-@@ -0,0 +1,77 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
-+ *
-+ * Copyright (C) 2008 Jon McCann <jmccann(a)redhat.com>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of the
-+ * License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+ * 02111-1307, USA.
-+ *
-+ * Authors:
-+ * Jon McCann <jmccann(a)redhat.com>
-+ */
-+
-+#ifndef PANEL_CONSOLEKIT_H
-+#define PANEL_CONSOLEKIT_H
-+
-+#include <glib.h>
-+#include <glib-object.h>
-+
-+G_BEGIN_DECLS
-+
-+#define PANEL_TYPE_CONSOLEKIT (panel_consolekit_get_type ())
-+#define PANEL_CONSOLEKIT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
PANEL_TYPE_CONSOLEKIT, PanelConsolekit))
-+#define PANEL_CONSOLEKIT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass),
PANEL_TYPE_CONSOLEKIT, PanelConsolekitClass))
-+#define PANEL_IS_CONSOLEKIT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj),
PANEL_TYPE_CONSOLEKIT))
-+#define PANEL_IS_CONSOLEKIT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),
PANEL_TYPE_CONSOLEKIT))
-+#define PANEL_CONSOLEKIT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj),
PANEL_TYPE_CONSOLEKIT, PanelConsolekitClass))
-+#define PANEL_CONSOLEKIT_ERROR (panel_consolekit_error_quark ())
-+
-+typedef struct _PanelConsolekit PanelConsolekit;
-+typedef struct _PanelConsolekitClass PanelConsolekitClass;
-+typedef struct _PanelConsolekitPrivate PanelConsolekitPrivate;
-+typedef enum _PanelConsolekitError PanelConsolekitError;
-+
-+struct _PanelConsolekit {
-+ GObject parent;
-+ PanelConsolekitPrivate *priv;
-+};
-+
-+struct _PanelConsolekitClass {
-+ GObjectClass parent_class;
-+
-+ void (* request_completed) (PanelConsolekit *manager,
-+ GError *error);
-+};
-+
-+enum _PanelConsolekitError {
-+ PANEL_CONSOLEKIT_ERROR_RESTARTING = 0,
-+ PANEL_CONSOLEKIT_ERROR_STOPPING
-+};
-+
-+GType panel_consolekit_get_type (void);
-+GQuark panel_consolekit_error_quark (void);
-+
-+PanelConsolekit *panel_consolekit_new (void) G_GNUC_MALLOC;
-+
-+gboolean panel_consolekit_can_stop (PanelConsolekit *manager);
-+gboolean panel_consolekit_can_restart (PanelConsolekit *manager);
-+
-+void panel_consolekit_attempt_stop (PanelConsolekit *manager);
-+void panel_consolekit_attempt_restart (PanelConsolekit *manager);
-+
-+PanelConsolekit *panel_get_consolekit (void);
-+
-+G_END_DECLS
-+
-+#endif /* PANEL_CONSOLEKIT_H */
-diff -up gnome-panel-2.22.0/gnome-panel/panel-logout.c.ck-shutdown
gnome-panel-2.22.0/gnome-panel/panel-logout.c
---- gnome-panel-2.22.0/gnome-panel/panel-logout.c.ck-shutdown 2008-04-05
20:48:37.000000000 -0400
-+++ gnome-panel-2.22.0/gnome-panel/panel-logout.c 2008-04-05 22:18:24.000000000 -0400
-@@ -1,4 +1,5 @@
--/*
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
-+ *
- * panel-logout.c:
- *
- * Copyright (C) 2006 Vincent Untz
-@@ -35,8 +36,10 @@
- #include "panel-logout.h"
- #include "panel-gdm.h"
- #include "panel-power-manager.h"
-+#include "panel-consolekit.h"
- #include "panel-session.h"
- #include "panel-icon-names.h"
-+#include "panel-gconf.h"
-
- #define PANEL_LOGOUT_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o),
PANEL_TYPE_LOGOUT_DIALOG, PanelLogoutDialogPrivate))
-
-@@ -55,6 +58,7 @@ struct _PanelLogoutDialogPrivate {
- PanelLogoutDialogType type;
-
- PanelPowerManager *power_manager;
-+ PanelConsolekit *consolekit;
-
- int timeout;
- unsigned int timeout_id;
-@@ -76,7 +80,7 @@ enum {
- };
- G_DEFINE_TYPE (PanelLogoutDialog, panel_logout, GTK_TYPE_MESSAGE_DIALOG);
-
--static void
-+static void
- panel_logout_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
-@@ -91,7 +95,7 @@ panel_logout_set_property (GObject
- }
- }
-
--static void
-+static void
- panel_logout_get_property (GObject *object,
- guint prop_id,
- GValue *value,
-@@ -130,6 +134,57 @@ panel_logout_class_init (PanelLogoutDial
- }
-
- static void
-+ck_restart_error_window (GError *error)
-+{
-+ GtkWidget *dialog;
-+ const char *primary;
-+
-+ g_assert (error != NULL);
-+
-+ switch (error->code) {
-+ case PANEL_CONSOLEKIT_ERROR_RESTARTING:
-+ primary = _("Unable to restart system");
-+ break;
-+ case PANEL_CONSOLEKIT_ERROR_STOPPING:
-+ primary = _("Unable to stop system");
-+ break;
-+ default:
-+ g_assert_not_reached ();
-+ }
-+
-+ dialog = gtk_message_dialog_new (NULL, 0,
-+ GTK_MESSAGE_ERROR,
-+ GTK_BUTTONS_NONE,
-+ primary);
-+
-+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-+ "%s", error->message);
-+
-+ gtk_dialog_add_buttons (GTK_DIALOG (dialog),
-+ GTK_STOCK_CLOSE,
-+ NULL);
-+
-+ gtk_dialog_set_default_response (GTK_DIALOG (dialog),
-+ GTK_RESPONSE_CLOSE);
-+ gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), FALSE);
-+ gtk_window_set_title (GTK_WINDOW (dialog), "");
-+
-+ g_signal_connect (dialog, "response",
-+ G_CALLBACK (gtk_widget_destroy), NULL);
-+
-+ gtk_widget_show (dialog);
-+}
-+
-+static void
-+on_ck_request_completed (PanelConsolekit *panel_consolekit,
-+ GError *error)
-+{
-+ if (error) {
-+ ck_restart_error_window (error);
-+ }
-+}
-+
-+static void
- panel_logout_init (PanelLogoutDialog *logout_dialog)
- {
- logout_dialog->priv = PANEL_LOGOUT_DIALOG_GET_PRIVATE (logout_dialog);
-@@ -146,6 +201,10 @@ panel_logout_init (PanelLogoutDialog *lo
- GTK_WIN_POS_CENTER_ALWAYS);
-
- logout_dialog->priv->power_manager = panel_get_power_manager ();
-+ logout_dialog->priv->consolekit = panel_get_consolekit ();
-+ g_signal_connect (logout_dialog->priv->consolekit,
-+ "request-completed",
-+ G_CALLBACK (on_ck_request_completed), NULL);
-
- g_signal_connect (logout_dialog, "destroy",
- G_CALLBACK (panel_logout_destroy), NULL);
-@@ -163,37 +222,129 @@ panel_logout_destroy (PanelLogoutDialog
-
- g_object_unref (logout_dialog->priv->power_manager);
- logout_dialog->priv->power_manager = NULL;
-+ g_object_unref (logout_dialog->priv->consolekit);
-+ logout_dialog->priv->consolekit = NULL;
-
- current_dialog = NULL;
- }
-
-+static gboolean
-+panel_logout_supports_reboot (PanelLogoutDialog *logout_dialog)
-+{
-+ gboolean ret;
-+
-+ ret = panel_consolekit_can_restart (logout_dialog->priv->consolekit);
-+ if (!ret) {
-+ ret = gdm_supports_logout_action (GDM_LOGOUT_ACTION_REBOOT);
-+ }
-+ return ret;
-+}
-+
-+static gboolean
-+panel_logout_supports_shutdown (PanelLogoutDialog *logout_dialog)
-+{
-+ gboolean ret;
-+
-+ ret = panel_consolekit_can_stop (logout_dialog->priv->consolekit);
-+ if (!ret) {
-+ ret = gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN);
-+ }
-+ return ret;
-+}
-+
-+gboolean
-+panel_logout_supports_shutdown_reboot (void)
-+{
-+ PanelConsolekit *consolekit;
-+ gboolean ret;
-+
-+ ret = FALSE;
-+
-+ /* if we can do any then return true */
-+
-+ consolekit = panel_get_consolekit ();
-+ if (consolekit != NULL) {
-+ ret = panel_consolekit_can_restart (consolekit)
-+ || panel_consolekit_can_stop (consolekit);
-+ g_object_unref (consolekit);
-+ }
-+
-+ if (!ret) {
-+ ret = gdm_supports_logout_action (GDM_LOGOUT_ACTION_REBOOT)
-+ || gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN);
-+ }
-+
-+ return ret;
-+}
-+
-+static void
-+do_request_logout (PanelConsolekit *consolekit)
-+{
-+ gdm_set_logout_action (GDM_LOGOUT_ACTION_NONE);
-+ panel_session_request_logout ();
-+}
-+
-+static void
-+maybe_request_session_save (void)
-+{
-+ if (gconf_client_get_bool (panel_gconf_get_client (),
-+ "/apps/gnome-session/options/auto_save_session",
-+ NULL))
-+ panel_session_request_save ();
-+}
-+
-+static void
-+do_request_reboot (PanelConsolekit *consolekit)
-+{
-+ if (panel_consolekit_can_restart (consolekit)) {
-+ gdm_set_logout_action (GDM_LOGOUT_ACTION_NONE);
-+ maybe_request_session_save ();
-+ panel_consolekit_attempt_restart (consolekit);
-+ } else {
-+ gdm_set_logout_action (GDM_LOGOUT_ACTION_REBOOT);
-+ panel_session_request_logout ();
-+ }
-+}
-+
-+static void
-+do_request_shutdown (PanelConsolekit *consolekit)
-+{
-+ if (panel_consolekit_can_stop (consolekit)) {
-+ gdm_set_logout_action (GDM_LOGOUT_ACTION_NONE);
-+ maybe_request_session_save ();
-+ panel_consolekit_attempt_stop (consolekit);
-+ } else {
-+ gdm_set_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN);
-+ panel_session_request_logout ();
-+ }
-+}
-+
- static void
- panel_logout_response (PanelLogoutDialog *logout_dialog,
- guint response_id,
- gpointer data)
- {
- PanelPowerManager *power_manager;
-+ PanelConsolekit *consolekit;
-
- power_manager = g_object_ref (logout_dialog->priv->power_manager);
-+ consolekit = g_object_ref (logout_dialog->priv->consolekit);
- gtk_widget_destroy (GTK_WIDGET (logout_dialog));
-
- switch (response_id) {
- case GTK_RESPONSE_CANCEL:
- break;
- case PANEL_LOGOUT_RESPONSE_LOGOUT:
-- gdm_set_logout_action (GDM_LOGOUT_ACTION_NONE);
-- panel_session_request_logout ();
-+ do_request_logout (consolekit);
- break;
- case PANEL_LOGOUT_RESPONSE_SWITCH_USER:
- gdm_new_login ();
- break;
- case PANEL_LOGOUT_RESPONSE_SHUTDOWN:
-- gdm_set_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN);
-- panel_session_request_logout ();
-+ do_request_shutdown (consolekit);
- break;
- case PANEL_LOGOUT_RESPONSE_REBOOT:
-- gdm_set_logout_action (GDM_LOGOUT_ACTION_REBOOT);
-- panel_session_request_logout ();
-+ do_request_reboot (consolekit);
- break;
- case PANEL_LOGOUT_RESPONSE_STD:
- if (panel_power_manager_can_hibernate (power_manager))
-@@ -210,6 +361,7 @@ panel_logout_response (PanelLogoutDialog
- g_assert_not_reached ();
- }
- g_object_unref (power_manager);
-+ g_object_unref (consolekit);
- }
-
- static gboolean
-@@ -363,7 +515,7 @@ panel_logout_new (PanelLogoutDialogType
- _("_Hibernate"),
- PANEL_LOGOUT_RESPONSE_STD);
-
-- if (gdm_supports_logout_action (GDM_LOGOUT_ACTION_REBOOT))
-+ if (panel_logout_supports_reboot (logout_dialog))
- gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
- _("_Restart"),
- PANEL_LOGOUT_RESPONSE_REBOOT);
-@@ -372,7 +524,7 @@ panel_logout_new (PanelLogoutDialogType
- GTK_STOCK_CANCEL,
- GTK_RESPONSE_CANCEL);
-
-- if (gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN))
-+ if (panel_logout_supports_shutdown (logout_dialog))
- gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
- _("_Shut Down"),
- PANEL_LOGOUT_RESPONSE_SHUTDOWN);
-diff -up gnome-panel-2.22.0/gnome-panel/panel-logout.h.ck-shutdown
gnome-panel-2.22.0/gnome-panel/panel-logout.h
---- gnome-panel-2.22.0/gnome-panel/panel-logout.h.ck-shutdown 2008-03-10
16:44:57.000000000 -0400
-+++ gnome-panel-2.22.0/gnome-panel/panel-logout.h 2008-04-05 20:48:37.000000000 -0400
-@@ -57,6 +57,8 @@ struct _PanelLogoutDialogClass {
-
- GType panel_logout_get_type (void) G_GNUC_CONST;
-
-+gboolean panel_logout_supports_shutdown_reboot (void);
-+
- void panel_logout_new (PanelLogoutDialogType type,
- GdkScreen *screen,
- guint32 activate_time);
-diff -up gnome-panel-2.22.0/gnome-panel/panel-session.c.ck-shutdown
gnome-panel-2.22.0/gnome-panel/panel-session.c
---- gnome-panel-2.22.0/gnome-panel/panel-session.c.ck-shutdown 2008-03-10
16:44:57.000000000 -0400
-+++ gnome-panel-2.22.0/gnome-panel/panel-session.c 2008-04-05 20:48:37.000000000 -0400
-@@ -60,6 +60,34 @@ panel_session_request_logout (void)
- recursion_guard--;
- }
-
-+void
-+panel_session_request_save (void)
-+{
-+ GnomeClient *client;
-+ static int recursion_guard = 0;
-+
-+ if (recursion_guard)
-+ return;
-+
-+ recursion_guard++;
-+
-+ if (!(client = gnome_master_client ()))
-+ return;
-+
-+ /* Only request a Global save. We only want a Local
-+ * save if the user selects 'Save current setup'
-+ * from the dialog.
-+ */
-+ gnome_client_request_save (client,
-+ GNOME_SAVE_GLOBAL,
-+ FALSE,
-+ GNOME_INTERACT_NONE,
-+ TRUE, /* do not use the gnome-session gui */
-+ TRUE);
-+
-+ recursion_guard--;
-+}
-+
- static void
- panel_session_handle_die_request (GnomeClient *client)
- {
-diff -up gnome-panel-2.22.0/gnome-panel/panel-session.h.ck-shutdown
gnome-panel-2.22.0/gnome-panel/panel-session.h
---- gnome-panel-2.22.0/gnome-panel/panel-session.h.ck-shutdown 2008-03-10
16:44:57.000000000 -0400
-+++ gnome-panel-2.22.0/gnome-panel/panel-session.h 2008-04-05 20:48:37.000000000 -0400
-@@ -30,6 +30,7 @@ G_BEGIN_DECLS
- void panel_session_init (void);
- void panel_session_do_not_restart (void);
- void panel_session_request_logout (void);
-+void panel_session_request_save (void);
-
- G_END_DECLS
-
-diff -up gnome-panel-2.22.0/gnome-panel/panel-toplevel.c.ck-shutdown
gnome-panel-2.22.0/gnome-panel/panel-toplevel.c
---- gnome-panel-2.22.0/gnome-panel/panel-toplevel.c.ck-shutdown 2008-03-10
16:44:57.000000000 -0400
-+++ gnome-panel-2.22.0/gnome-panel/panel-toplevel.c 2008-04-05 20:48:37.000000000 -0400
-@@ -3329,7 +3329,8 @@ panel_toplevel_get_animation_time (Panel
- }
-
- static void
--panel_toplevel_start_animation (PanelToplevel *toplevel)
-+panel_toplevel_start_animation (PanelToplevel *toplevel,
-+ gboolean auto_hide)
- {
- GdkScreen *screen;
- int monitor_width, monitor_height;
-@@ -3480,7 +3481,7 @@ panel_toplevel_hide (PanelToplevel *t
- }
-
- if (toplevel->priv->animate && GTK_WIDGET_REALIZED (toplevel))
-- panel_toplevel_start_animation (toplevel);
-+ panel_toplevel_start_animation (toplevel, auto_hide);
- else if (toplevel->priv->attached)
- gtk_widget_hide (GTK_WIDGET (toplevel));
-
-@@ -3528,7 +3529,7 @@ panel_toplevel_unhide (PanelToplevel *to
- panel_toplevel_push_autohide_disabler (toplevel->priv->attach_toplevel);
-
- if (toplevel->priv->animate && GTK_WIDGET_REALIZED (toplevel))
-- panel_toplevel_start_animation (toplevel);
-+ panel_toplevel_start_animation (toplevel, FALSE);
- else if (toplevel->priv->attached)
- gtk_widget_show (GTK_WIDGET (toplevel));
-
diff --git a/gnome-panel-larger-find-window.patch b/gnome-panel-larger-find-window.patch
deleted file mode 100644
index 087c37f..0000000
--- a/gnome-panel-larger-find-window.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up gnome-panel-2.22.0/applets/clock/clock.glade.larger-find-window
gnome-panel-2.22.0/applets/clock/clock.glade
---- gnome-panel-2.22.0/applets/clock/clock.glade.larger-find-window 2008-03-27
21:37:32.000000000 -0400
-+++ gnome-panel-2.22.0/applets/clock/clock.glade 2008-03-27 21:36:59.000000000 -0400
-@@ -822,6 +822,8 @@ South</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
-+ <property name="default_width">400</property>
-+ <property name="default_height">500</property>
-
- <child>
- <widget class="GtkVBox" id="vbox25">
diff --git a/gnome-panel-launch-with-gio.patch b/gnome-panel-launch-with-gio.patch
deleted file mode 100644
index d5531f8..0000000
--- a/gnome-panel-launch-with-gio.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-diff -up gnome-panel-2.23.5/gnome-panel/panel-menu-items.c.launch-with-gio
gnome-panel-2.23.5/gnome-panel/panel-menu-items.c
---- gnome-panel-2.23.5/gnome-panel/panel-menu-items.c.launch-with-gio 2008-07-22
22:37:50.000000000 -0400
-+++ gnome-panel-2.23.5/gnome-panel/panel-menu-items.c 2008-07-22 22:39:01.000000000
-0400
-@@ -41,6 +41,7 @@
-
- #include <libgnome/gnome-url.h>
- #include <libgnomeui/gnome-url.h>
-+#include <libgnomeui/gnome-password-dialog.h>
-
- #include <libpanel-util/panel-glib.h>
- #include <libpanel-util/panel-keyfile.h>
-@@ -99,6 +100,51 @@ struct _PanelDesktopMenuItemPrivate {
- guint append_lock_logout : 1;
- };
-
-+typedef struct {
-+ GMountOperation *mount_op;
-+ GdkScreen *screen;
-+} MountOperationHandle;
-+
-+static void
-+mount_async_callback (GObject *source_object,
-+ GAsyncResult *result,
-+ gpointer user_data)
-+{
-+ GError *error = NULL;
-+ GFile *file;
-+ MountOperationHandle *handle = user_data;
-+
-+ file = G_FILE (source_object);
-+ if (g_file_mount_enclosing_volume_finish (file, result, &error)) {
-+ char *uri = g_file_get_uri (file);
-+ // FIXME use an app launch context
-+ g_app_info_launch_default_for_uri (uri, NULL, &error);
-+ g_free (uri);
-+ }
-+ else {
-+ if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED) &&
-+ !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_FAILED_HANDLED)) {
-+ char *primary, *escaped, *url;
-+ url = g_file_get_uri (file);
-+ escaped = g_markup_escape_text (url, -1);
-+ g_free (url);
-+ primary = g_strdup_printf (_("Could not open location '%s'"),
-+ escaped);
-+ g_free (escaped);
-+ panel_error_dialog (NULL, handle->screen,
-+ "cannot_show_url", TRUE,
-+ primary, error->message);
-+ g_free (primary);
-+ }
-+ g_error_free (error);
-+ }
-+
-+ if (handle->mount_op)
-+ g_object_unref (handle->mount_op);
-+
-+ g_free (handle);
-+}
-+
- static void
- activate_uri_on_screen (const char *path,
- GdkScreen *screen)
-@@ -125,12 +171,28 @@ activate_uri_on_screen (const char *path
-
- command = g_strdup_printf ("nautilus --no-desktop %s", url);
- gdk_spawn_command_line_on_screen (screen, command, &error);
-- } else
-+ } else {
-+ // FIXME use an app launch context
- g_app_info_launch_default_for_uri (url, NULL, &error);
-- //gnome_url_show_on_screen (url, screen, &error);
-+ }
-
- if (error != NULL) {
-- if (error->code != GNOME_URL_ERROR_CANCELLED) {
-+ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_NOT_MOUNTED)) {
-+ MountOperationHandle *handle;
-+
-+ handle = g_new (MountOperationHandle, 1);
-+ file = g_file_new_for_uri (url);
-+
-+ /* If it's not mounted, try to mount it ourselves */
-+ handle->mount_op = panel_mount_operation_new (NULL);
-+ handle->screen = screen;
-+
-+ g_file_mount_enclosing_volume (file, G_MOUNT_MOUNT_NONE, handle->mount_op,
-+ NULL, mount_async_callback, handle);
-+ g_object_unref (file);
-+
-+ }
-+ else {
- char *primary;
- escaped = g_markup_escape_text (url, -1);
- primary = g_strdup_printf (_("Could not open location '%s'"),
-diff -up gnome-panel-2.23.5/gnome-panel/panel-mount-operation.c.launch-with-gio
gnome-panel-2.23.5/gnome-panel/panel-mount-operation.c
---- gnome-panel-2.23.5/gnome-panel/panel-mount-operation.c.launch-with-gio 2008-07-22
17:50:58.000000000 -0400
-+++ gnome-panel-2.23.5/gnome-panel/panel-mount-operation.c 2008-07-22 22:37:50.000000000
-0400
-@@ -102,6 +102,18 @@ password_dialog_button_clicked (GtkDialo
- anon = gnome_password_dialog_anon_selected (gpd);
- g_mount_operation_set_anonymous (op, anon);
-
-+ switch (gnome_password_dialog_get_remember (gpd)) {
-+ case GNOME_PASSWORD_DIALOG_REMEMBER_NOTHING:
-+ g_mount_operation_set_password_save (op, G_PASSWORD_SAVE_NEVER);
-+ break;
-+ case GNOME_PASSWORD_DIALOG_REMEMBER_SESSION:
-+ g_mount_operation_set_password_save (op, G_PASSWORD_SAVE_FOR_SESSION);
-+ break;
-+ case GNOME_PASSWORD_DIALOG_REMEMBER_FOREVER:
-+ g_mount_operation_set_password_save (op, G_PASSWORD_SAVE_PERMANENTLY);
-+ break;
-+ }
-+
- g_mount_operation_reply (op, G_MOUNT_OPERATION_HANDLED);
- } else {
- g_mount_operation_reply (op, G_MOUNT_OPERATION_ABORTED);
-@@ -136,6 +148,9 @@ ask_password (GMountOperation *op,
- flags & G_ASK_PASSWORD_NEED_DOMAIN);
- gnome_password_dialog_set_show_userpass_buttons (GNOME_PASSWORD_DIALOG (dialog),
- flags & G_ASK_PASSWORD_ANONYMOUS_SUPPORTED);
-+ gnome_password_dialog_set_show_remember (GNOME_PASSWORD_DIALOG (dialog),
-+ flags & G_ASK_PASSWORD_SAVING_SUPPORTED);
-+
- if (default_domain) {
- gnome_password_dialog_set_domain (GNOME_PASSWORD_DIALOG (dialog),
- default_domain);
diff --git a/gnome-panel-use-gio.patch b/gnome-panel-use-gio.patch
deleted file mode 100644
index dcf1036..0000000
--- a/gnome-panel-use-gio.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up gnome-panel-2.22.1.2/gnome-panel/panel-menu-items.c.use-gio
gnome-panel-2.22.1.2/gnome-panel/panel-menu-items.c
---- gnome-panel-2.22.1.2/gnome-panel/panel-menu-items.c.use-gio 2008-04-18
22:48:16.000000000 -0400
-+++ gnome-panel-2.22.1.2/gnome-panel/panel-menu-items.c 2008-04-18 22:53:10.000000000
-0400
-@@ -125,8 +125,9 @@ activate_uri (GtkWidget *menuitem,
-
- command = g_strdup_printf ("nautilus --no-desktop %s", url);
- gdk_spawn_command_line_on_screen (screen, command, &error);
-- } else
-- gnome_url_show_on_screen (url, screen, &error);
-+ } else
-+ g_app_info_launch_default_for_uri (url, NULL, &error);
-+ //gnome_url_show_on_screen (url, screen, &error);
-
- if (error != NULL) {
- if (error->code != GNOME_URL_ERROR_CANCELLED) {
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 261a198..3c89ce8 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,8 +22,8 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.23.5
-Release: 2%{?dist}
+Version: 2.23.6
+Release: 1%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.23/%{name}-%{version}.tar...
@@ -110,13 +110,6 @@ Patch11: applet-error.patch
#
http://bugzilla.gnome.org/show_bug.cgi?id=520111
Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
-# fixed upstream
-Patch28: gnome-panel-larger-find-window.patch
-
-Patch33: gnome-panel-use-gio.patch
-#
http://bugzilla.gnome.org/show_bug.cgi?id=529243
-Patch34: gnome-panel-launch-with-gio.patch
-
Patch35: clock-wakeups.patch
Conflicts: gnome-power-manager < 2.15.3
@@ -164,9 +157,6 @@ Panel Applets using the libpanel-applet library.
%patch10 -p1 -b .preferred-apps
%patch11 -p1 -b .applet-error
%patch24 -p1 -b .allow-spurious-view-done-signals
-%patch28 -p1 -b .larger-find-window
-%patch33 -p1 -b .use-gio
-%patch34 -p1 -b .launch-with-gio
%patch35 -p1 -b .clock-wakeups
. %{SOURCE6}
@@ -354,6 +344,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Tue Aug 5 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.6-1
+- Update to 2.23.6
+
* Wed Jul 23 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.23.5-2
- fix license tag
diff --git a/icon-names.patch b/icon-names.patch
deleted file mode 100644
index 8c9d850..0000000
--- a/icon-names.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up gnome-panel-2.23.4/applets/wncklet/GNOME_Wncklet_Factory.server.in.in.icon-names
gnome-panel-2.23.4/applets/wncklet/GNOME_Wncklet_Factory.server.in.in
----
gnome-panel-2.23.4/applets/wncklet/GNOME_Wncklet_Factory.server.in.in.icon-names 2008-07-18
21:54:05.000000000 -0400
-+++ gnome-panel-2.23.4/applets/wncklet/GNOME_Wncklet_Factory.server.in.in 2008-07-18
21:54:20.000000000 -0400
-@@ -122,7 +122,7 @@
- </oaf_attribute>
- <oaf_attribute name="name" type="string" _value="Show
Desktop"/>
- <oaf_attribute name="description" type="string"
_value="Hide application windows and show the desktop"/>
-- <oaf_attribute name="panel:icon" type="string"
value="gnome-fs-desktop.png"/>
-+ <oaf_attribute name="panel:icon" type="string"
value="user-desktop.png"/>
- <oaf_attribute name="bugzilla:bugzilla" type="string"
value="GNOME"/>
- <oaf_attribute name="bugzilla:product" type="string"
value="gnome-panel"/>
- <oaf_attribute name="bugzilla:component" type="string"
value="Show Desktop Button"/>
-diff -up gnome-panel-2.23.4/gnome-panel/panel-icon-names.h.icon-names
gnome-panel-2.23.4/gnome-panel/panel-icon-names.h
---- gnome-panel-2.23.4/gnome-panel/panel-icon-names.h.icon-names 2008-06-17
06:02:08.000000000 -0400
-+++ gnome-panel-2.23.4/gnome-panel/panel-icon-names.h 2008-07-18 21:53:39.000000000
-0400
-@@ -25,7 +25,7 @@
- #define PANEL_ICON_SEPARATOR "gnome-panel-separator"
- #define PANEL_ICON_SAVED_SEARCH "folder-saved-search"
- #define PANEL_ICON_SEARCHTOOL "system-search"
--#define PANEL_ICON_SHUTDOWN "gnome-shutdown"
-+#define PANEL_ICON_SHUTDOWN "system-shutdown"
- #define PANEL_ICON_THEME "preferences-desktop-theme"
- #define PANEL_ICON_TRASH "user-trash"
- #define PANEL_ICON_UNKNOWN "image-missing"
diff --git a/preferred-apps.patch b/preferred-apps.patch
index 831b983..71281e2 100644
--- a/preferred-apps.patch
+++ b/preferred-apps.patch
@@ -1,15 +1,15 @@
-diff -up gnome-panel-2.23.5/gnome-panel/launcher.c.preferred-apps
gnome-panel-2.23.5/gnome-panel/launcher.c
---- gnome-panel-2.23.5/gnome-panel/launcher.c.preferred-apps 2008-07-22
22:20:48.000000000 -0400
-+++ gnome-panel-2.23.5/gnome-panel/launcher.c 2008-07-22 22:36:59.000000000 -0400
-@@ -23,6 +23,7 @@
+diff -up gnome-panel-2.23.6/gnome-panel/launcher.c.preferred-apps
gnome-panel-2.23.6/gnome-panel/launcher.c
+--- gnome-panel-2.23.6/gnome-panel/launcher.c.preferred-apps 2008-08-05
12:31:49.000000000 -0400
++++ gnome-panel-2.23.6/gnome-panel/launcher.c 2008-08-05 12:35:46.000000000 -0400
+@@ -22,6 +22,7 @@
+ #include <gio/gio.h>
#include <libgnome/gnome-util.h>
- #include <libgnomeui/gnome-url.h>
#include <gdk/gdkx.h>
+#include <gmenu-tree.h>
+ #include <libpanel-util/panel-error.h>
#include <libpanel-util/panel-glib.h>
- #include <libpanel-util/panel-keyfile.h>
-@@ -43,6 +44,7 @@
+@@ -44,6 +45,7 @@
#include "panel-compatibility.h"
#include "panel-ditem-editor.h"
#include "panel-icon-names.h"
@@ -17,7 +17,7 @@ diff -up gnome-panel-2.23.5/gnome-panel/launcher.c.preferred-apps
gnome-panel-2.
static GdkScreen *
launcher_get_screen (Launcher *launcher)
-@@ -1300,3 +1302,173 @@ panel_launcher_set_dnd_enabled (Launcher
+@@ -1282,3 +1284,173 @@ panel_launcher_set_dnd_enabled (Launcher
} else
gtk_drag_source_unset (launcher->button);
}
@@ -191,9 +191,9 @@ diff -up gnome-panel-2.23.5/gnome-panel/launcher.c.preferred-apps
gnome-panel-2.
+ filename, g_free, NULL);
+ }
+}
-diff -up gnome-panel-2.23.5/gnome-panel/launcher.h.preferred-apps
gnome-panel-2.23.5/gnome-panel/launcher.h
---- gnome-panel-2.23.5/gnome-panel/launcher.h.preferred-apps 2008-07-22
22:20:48.000000000 -0400
-+++ gnome-panel-2.23.5/gnome-panel/launcher.h 2008-07-22 22:20:49.000000000 -0400
+diff -up gnome-panel-2.23.6/gnome-panel/launcher.h.preferred-apps
gnome-panel-2.23.6/gnome-panel/launcher.h
+--- gnome-panel-2.23.6/gnome-panel/launcher.h.preferred-apps 2008-08-05
12:31:49.000000000 -0400
++++ gnome-panel-2.23.6/gnome-panel/launcher.h 2008-08-05 12:31:49.000000000 -0400
@@ -14,6 +14,8 @@
#include "applet.h"
#include "panel-widget.h"
@@ -211,9 +211,9 @@ diff -up gnome-panel-2.23.5/gnome-panel/launcher.h.preferred-apps
gnome-panel-2.
G_END_DECLS
-diff -up gnome-panel-2.23.5/gnome-panel/main.c.preferred-apps
gnome-panel-2.23.5/gnome-panel/main.c
---- gnome-panel-2.23.5/gnome-panel/main.c.preferred-apps 2008-07-22 17:50:58.000000000
-0400
-+++ gnome-panel-2.23.5/gnome-panel/main.c 2008-07-22 22:20:49.000000000 -0400
+diff -up gnome-panel-2.23.6/gnome-panel/main.c.preferred-apps
gnome-panel-2.23.6/gnome-panel/main.c
+--- gnome-panel-2.23.6/gnome-panel/main.c.preferred-apps 2008-08-04 16:43:10.000000000
-0400
++++ gnome-panel-2.23.6/gnome-panel/main.c 2008-08-05 12:31:49.000000000 -0400
@@ -28,6 +28,7 @@
#include "panel-action-protocol.h"
#include "panel-lockdown.h"
@@ -230,10 +230,10 @@ diff -up gnome-panel-2.23.5/gnome-panel/main.c.preferred-apps
gnome-panel-2.23.5
panel_global_config_load ();
panel_lockdown_init ();
panel_profile_load ();
-diff -up gnome-panel-2.23.5/gnome-panel/panel-run-dialog.c.preferred-apps
gnome-panel-2.23.5/gnome-panel/panel-run-dialog.c
---- gnome-panel-2.23.5/gnome-panel/panel-run-dialog.c.preferred-apps 2008-07-22
17:50:58.000000000 -0400
-+++ gnome-panel-2.23.5/gnome-panel/panel-run-dialog.c 2008-07-22 22:20:49.000000000
-0400
-@@ -818,7 +818,7 @@ get_all_applications_from_dir (GMenuTree
+diff -up gnome-panel-2.23.6/gnome-panel/panel-run-dialog.c.preferred-apps
gnome-panel-2.23.6/gnome-panel/panel-run-dialog.c
+--- gnome-panel-2.23.6/gnome-panel/panel-run-dialog.c.preferred-apps 2008-08-04
16:43:10.000000000 -0400
++++ gnome-panel-2.23.6/gnome-panel/panel-run-dialog.c 2008-08-05 12:31:49.000000000
-0400
+@@ -797,7 +797,7 @@ get_all_applications_from_dir (GMenuTree
return list;
}
@@ -242,9 +242,9 @@ diff -up
gnome-panel-2.23.5/gnome-panel/panel-run-dialog.c.preferred-apps gnome-
get_all_applications (void)
{
GMenuTree *tree;
-diff -up gnome-panel-2.23.5/gnome-panel/panel-run-dialog.h.preferred-apps
gnome-panel-2.23.5/gnome-panel/panel-run-dialog.h
---- gnome-panel-2.23.5/gnome-panel/panel-run-dialog.h.preferred-apps 2008-07-22
17:50:58.000000000 -0400
-+++ gnome-panel-2.23.5/gnome-panel/panel-run-dialog.h 2008-07-22 22:20:49.000000000
-0400
+diff -up gnome-panel-2.23.6/gnome-panel/panel-run-dialog.h.preferred-apps
gnome-panel-2.23.6/gnome-panel/panel-run-dialog.h
+--- gnome-panel-2.23.6/gnome-panel/panel-run-dialog.h.preferred-apps 2008-08-04
16:43:10.000000000 -0400
++++ gnome-panel-2.23.6/gnome-panel/panel-run-dialog.h 2008-08-05 12:31:49.000000000
-0400
@@ -32,6 +32,8 @@ G_BEGIN_DECLS
void panel_run_dialog_present (GdkScreen *screen,
guint32 activate_time);
diff --git a/sources b/sources
index 567fadc..50f286f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-075172fb7a72e8a35df50e99a5a826af gnome-panel-2.23.5.tar.bz2
+6204b45029b79deeb6b05e46b7c2908d gnome-panel-2.23.6.tar.bz2
diff --git a/timezone-debug.patch b/timezone-debug.patch
deleted file mode 100644
index 39d4735..0000000
--- a/timezone-debug.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up gnome-panel-2.22.1.2/applets/clock/system-timezone.c.timezone-debug
gnome-panel-2.22.1.2/applets/clock/system-timezone.c
---- gnome-panel-2.22.1.2/applets/clock/system-timezone.c.timezone-debug 2008-04-22
20:17:15.000000000 -0400
-+++ gnome-panel-2.22.1.2/applets/clock/system-timezone.c 2008-04-23 10:05:34.000000000
-0400
-@@ -863,7 +863,7 @@ system_timezone_is_zone_file_valid (cons
- return FALSE;
- }
-
-- if (read != 4 || strcmp (buffer, TZ_MAGIC) != 0) {
-+ if (read != strlen (TZ_MAGIC) || strncmp (buffer, TZ_MAGIC, strlen (TZ_MAGIC))
!= 0) {
- g_set_error (error, SYSTEM_TIMEZONE_ERROR,
- SYSTEM_TIMEZONE_ERROR_INVALID_TIMEZONE_FILE,
- "%s is not a timezone file",
commit e05b8ced42a68e16e0690e2b790c9dcf87713ee4
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Wed Jul 23 16:39:29 2008 +0000
fix license tag
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 354ed60..261a198 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -23,7 +23,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.23.5
-Release: 1%{?dist}
+Release: 2%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.23/%{name}-%{version}.tar...
@@ -31,7 +31,7 @@ Source3: redhat-panel-default-setup.entries
Source4: gnome-compiler-flags.m4
Source5: redhat-panel-backwards-compat-config.schemas
Source6: add-translations.sh
-License: GPLv2+ and LGPLv2+ and GFDL+
+License: GPLv2+ and LGPLv2+ and GFDL
Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -354,6 +354,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Wed Jul 23 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> - 2.23.5-2
+- fix license tag
+
* Tue Jul 22 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.5-1
- Update to 2.23.5
commit 30e99d41dafcff4db506881bbb3777b09f0c33d5
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Jul 23 02:44:59 2008 +0000
fix patches
diff --git a/.cvsignore b/.cvsignore
index 40425d4..82b4963 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.23.4.tar.bz2
+gnome-panel-2.23.5.tar.bz2
diff --git a/gnome-panel-launch-with-gio.patch b/gnome-panel-launch-with-gio.patch
index 096a868..d5531f8 100644
--- a/gnome-panel-launch-with-gio.patch
+++ b/gnome-panel-launch-with-gio.patch
@@ -1,15 +1,15 @@
-diff -up gnome-panel-2.23.4/gnome-panel/panel-menu-items.c.launch-with-gio
gnome-panel-2.23.4/gnome-panel/panel-menu-items.c
---- gnome-panel-2.23.4/gnome-panel/panel-menu-items.c.launch-with-gio 2008-07-18
21:45:57.000000000 -0400
-+++ gnome-panel-2.23.4/gnome-panel/panel-menu-items.c 2008-07-18 21:52:41.000000000
-0400
+diff -up gnome-panel-2.23.5/gnome-panel/panel-menu-items.c.launch-with-gio
gnome-panel-2.23.5/gnome-panel/panel-menu-items.c
+--- gnome-panel-2.23.5/gnome-panel/panel-menu-items.c.launch-with-gio 2008-07-22
22:37:50.000000000 -0400
++++ gnome-panel-2.23.5/gnome-panel/panel-menu-items.c 2008-07-22 22:39:01.000000000
-0400
@@ -41,6 +41,7 @@
#include <libgnome/gnome-url.h>
#include <libgnomeui/gnome-url.h>
+#include <libgnomeui/gnome-password-dialog.h>
+ #include <libpanel-util/panel-glib.h>
#include <libpanel-util/panel-keyfile.h>
-
-@@ -98,6 +99,51 @@ struct _PanelDesktopMenuItemPrivate {
+@@ -99,6 +100,51 @@ struct _PanelDesktopMenuItemPrivate {
guint append_lock_logout : 1;
};
@@ -61,7 +61,7 @@ diff -up
gnome-panel-2.23.4/gnome-panel/panel-menu-items.c.launch-with-gio gnome
static void
activate_uri_on_screen (const char *path,
GdkScreen *screen)
-@@ -124,12 +170,28 @@ activate_uri_on_screen (const char *path
+@@ -125,12 +171,28 @@ activate_uri_on_screen (const char *path
command = g_strdup_printf ("nautilus --no-desktop %s", url);
gdk_spawn_command_line_on_screen (screen, command, &error);
@@ -93,9 +93,9 @@ diff -up
gnome-panel-2.23.4/gnome-panel/panel-menu-items.c.launch-with-gio gnome
char *primary;
escaped = g_markup_escape_text (url, -1);
primary = g_strdup_printf (_("Could not open location '%s'"),
-diff -up gnome-panel-2.23.4/gnome-panel/panel-mount-operation.c.launch-with-gio
gnome-panel-2.23.4/gnome-panel/panel-mount-operation.c
---- gnome-panel-2.23.4/gnome-panel/panel-mount-operation.c.launch-with-gio 2008-06-17
06:02:08.000000000 -0400
-+++ gnome-panel-2.23.4/gnome-panel/panel-mount-operation.c 2008-07-18 21:45:57.000000000
-0400
+diff -up gnome-panel-2.23.5/gnome-panel/panel-mount-operation.c.launch-with-gio
gnome-panel-2.23.5/gnome-panel/panel-mount-operation.c
+--- gnome-panel-2.23.5/gnome-panel/panel-mount-operation.c.launch-with-gio 2008-07-22
17:50:58.000000000 -0400
++++ gnome-panel-2.23.5/gnome-panel/panel-mount-operation.c 2008-07-22 22:37:50.000000000
-0400
@@ -102,6 +102,18 @@ password_dialog_button_clicked (GtkDialo
anon = gnome_password_dialog_anon_selected (gpd);
g_mount_operation_set_anonymous (op, anon);
diff --git a/gnome-panel.spec b/gnome-panel.spec
index ab6b9e2..354ed60 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,8 +22,8 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.23.4
-Release: 5%{?dist}
+Version: 2.23.5
+Release: 1%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.23/%{name}-%{version}.tar...
@@ -119,9 +119,6 @@ Patch34: gnome-panel-launch-with-gio.patch
Patch35: clock-wakeups.patch
-#
http://bugzilla.gnome.org/show_bug.cgi?id=542257
-Patch47: icon-names.patch
-
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -171,7 +168,6 @@ Panel Applets using the libpanel-applet library.
%patch33 -p1 -b .use-gio
%patch34 -p1 -b .launch-with-gio
%patch35 -p1 -b .clock-wakeups
-%patch47 -p1 -b .icon-names
. %{SOURCE6}
@@ -358,6 +354,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Tue Jul 22 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.5-1
+- Update to 2.23.5
+
* Fri Jul 18 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.4-5
- Fix one more icon
diff --git a/preferred-apps.patch b/preferred-apps.patch
index 4f61b82..831b983 100644
--- a/preferred-apps.patch
+++ b/preferred-apps.patch
@@ -1,15 +1,15 @@
-diff -up gnome-panel-2.23.4/gnome-panel/launcher.c.preferred-apps
gnome-panel-2.23.4/gnome-panel/launcher.c
---- gnome-panel-2.23.4/gnome-panel/launcher.c.preferred-apps 2008-07-18
21:44:07.000000000 -0400
-+++ gnome-panel-2.23.4/gnome-panel/launcher.c 2008-07-18 21:44:51.000000000 -0400
+diff -up gnome-panel-2.23.5/gnome-panel/launcher.c.preferred-apps
gnome-panel-2.23.5/gnome-panel/launcher.c
+--- gnome-panel-2.23.5/gnome-panel/launcher.c.preferred-apps 2008-07-22
22:20:48.000000000 -0400
++++ gnome-panel-2.23.5/gnome-panel/launcher.c 2008-07-22 22:36:59.000000000 -0400
@@ -23,6 +23,7 @@
#include <libgnome/gnome-util.h>
#include <libgnomeui/gnome-url.h>
#include <gdk/gdkx.h>
+#include <gmenu-tree.h>
+ #include <libpanel-util/panel-glib.h>
#include <libpanel-util/panel-keyfile.h>
-
-@@ -42,6 +43,7 @@
+@@ -43,6 +44,7 @@
#include "panel-compatibility.h"
#include "panel-ditem-editor.h"
#include "panel-icon-names.h"
@@ -17,7 +17,7 @@ diff -up gnome-panel-2.23.4/gnome-panel/launcher.c.preferred-apps
gnome-panel-2.
static GdkScreen *
launcher_get_screen (Launcher *launcher)
-@@ -1297,3 +1299,173 @@ panel_launcher_set_dnd_enabled (Launcher
+@@ -1300,3 +1302,173 @@ panel_launcher_set_dnd_enabled (Launcher
} else
gtk_drag_source_unset (launcher->button);
}
@@ -191,9 +191,9 @@ diff -up gnome-panel-2.23.4/gnome-panel/launcher.c.preferred-apps
gnome-panel-2.
+ filename, g_free, NULL);
+ }
+}
-diff -up gnome-panel-2.23.4/gnome-panel/launcher.h.preferred-apps
gnome-panel-2.23.4/gnome-panel/launcher.h
---- gnome-panel-2.23.4/gnome-panel/launcher.h.preferred-apps 2008-07-18
21:44:07.000000000 -0400
-+++ gnome-panel-2.23.4/gnome-panel/launcher.h 2008-07-18 21:44:07.000000000 -0400
+diff -up gnome-panel-2.23.5/gnome-panel/launcher.h.preferred-apps
gnome-panel-2.23.5/gnome-panel/launcher.h
+--- gnome-panel-2.23.5/gnome-panel/launcher.h.preferred-apps 2008-07-22
22:20:48.000000000 -0400
++++ gnome-panel-2.23.5/gnome-panel/launcher.h 2008-07-22 22:20:49.000000000 -0400
@@ -14,6 +14,8 @@
#include "applet.h"
#include "panel-widget.h"
@@ -211,9 +211,9 @@ diff -up gnome-panel-2.23.4/gnome-panel/launcher.h.preferred-apps
gnome-panel-2.
G_END_DECLS
-diff -up gnome-panel-2.23.4/gnome-panel/main.c.preferred-apps
gnome-panel-2.23.4/gnome-panel/main.c
---- gnome-panel-2.23.4/gnome-panel/main.c.preferred-apps 2008-06-17 06:02:08.000000000
-0400
-+++ gnome-panel-2.23.4/gnome-panel/main.c 2008-07-18 21:44:07.000000000 -0400
+diff -up gnome-panel-2.23.5/gnome-panel/main.c.preferred-apps
gnome-panel-2.23.5/gnome-panel/main.c
+--- gnome-panel-2.23.5/gnome-panel/main.c.preferred-apps 2008-07-22 17:50:58.000000000
-0400
++++ gnome-panel-2.23.5/gnome-panel/main.c 2008-07-22 22:20:49.000000000 -0400
@@ -28,6 +28,7 @@
#include "panel-action-protocol.h"
#include "panel-lockdown.h"
@@ -230,9 +230,9 @@ diff -up gnome-panel-2.23.4/gnome-panel/main.c.preferred-apps
gnome-panel-2.23.4
panel_global_config_load ();
panel_lockdown_init ();
panel_profile_load ();
-diff -up gnome-panel-2.23.4/gnome-panel/panel-run-dialog.c.preferred-apps
gnome-panel-2.23.4/gnome-panel/panel-run-dialog.c
---- gnome-panel-2.23.4/gnome-panel/panel-run-dialog.c.preferred-apps 2008-06-17
06:02:08.000000000 -0400
-+++ gnome-panel-2.23.4/gnome-panel/panel-run-dialog.c 2008-07-18 21:44:07.000000000
-0400
+diff -up gnome-panel-2.23.5/gnome-panel/panel-run-dialog.c.preferred-apps
gnome-panel-2.23.5/gnome-panel/panel-run-dialog.c
+--- gnome-panel-2.23.5/gnome-panel/panel-run-dialog.c.preferred-apps 2008-07-22
17:50:58.000000000 -0400
++++ gnome-panel-2.23.5/gnome-panel/panel-run-dialog.c 2008-07-22 22:20:49.000000000
-0400
@@ -818,7 +818,7 @@ get_all_applications_from_dir (GMenuTree
return list;
}
@@ -242,9 +242,9 @@ diff -up
gnome-panel-2.23.4/gnome-panel/panel-run-dialog.c.preferred-apps gnome-
get_all_applications (void)
{
GMenuTree *tree;
-diff -up gnome-panel-2.23.4/gnome-panel/panel-run-dialog.h.preferred-apps
gnome-panel-2.23.4/gnome-panel/panel-run-dialog.h
---- gnome-panel-2.23.4/gnome-panel/panel-run-dialog.h.preferred-apps 2008-06-17
06:02:08.000000000 -0400
-+++ gnome-panel-2.23.4/gnome-panel/panel-run-dialog.h 2008-07-18 21:44:07.000000000
-0400
+diff -up gnome-panel-2.23.5/gnome-panel/panel-run-dialog.h.preferred-apps
gnome-panel-2.23.5/gnome-panel/panel-run-dialog.h
+--- gnome-panel-2.23.5/gnome-panel/panel-run-dialog.h.preferred-apps 2008-07-22
17:50:58.000000000 -0400
++++ gnome-panel-2.23.5/gnome-panel/panel-run-dialog.h 2008-07-22 22:20:49.000000000
-0400
@@ -32,6 +32,8 @@ G_BEGIN_DECLS
void panel_run_dialog_present (GdkScreen *screen,
guint32 activate_time);
diff --git a/sources b/sources
index aa60fc3..567fadc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5fe8148c05a8dab63a08b7db3c5d9ab6 gnome-panel-2.23.4.tar.bz2
+075172fb7a72e8a35df50e99a5a826af gnome-panel-2.23.5.tar.bz2
commit 38a3190e0daf92baa9524da4876957c990e0896a
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sat Jul 19 01:57:55 2008 +0000
fix one more icon
diff --git a/gnome-panel-2.23.4-vendor.patch b/gnome-panel-2.23.4-vendor.patch
new file mode 100644
index 0000000..91877e5
--- /dev/null
+++ b/gnome-panel-2.23.4-vendor.patch
@@ -0,0 +1,30 @@
+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-launch-with-gio.patch b/gnome-panel-launch-with-gio.patch
index fbe354b..096a868 100644
--- a/gnome-panel-launch-with-gio.patch
+++ b/gnome-panel-launch-with-gio.patch
@@ -1,15 +1,15 @@
-diff -up gnome-panel-2.22.1.2/gnome-panel/panel-menu-items.c.launch-with-gio
gnome-panel-2.22.1.2/gnome-panel/panel-menu-items.c
---- gnome-panel-2.22.1.2/gnome-panel/panel-menu-items.c.launch-with-gio 2008-04-20
23:54:37.000000000 -0400
-+++ gnome-panel-2.22.1.2/gnome-panel/panel-menu-items.c 2008-04-20 23:54:37.000000000
-0400
+diff -up gnome-panel-2.23.4/gnome-panel/panel-menu-items.c.launch-with-gio
gnome-panel-2.23.4/gnome-panel/panel-menu-items.c
+--- gnome-panel-2.23.4/gnome-panel/panel-menu-items.c.launch-with-gio 2008-07-18
21:45:57.000000000 -0400
++++ gnome-panel-2.23.4/gnome-panel/panel-menu-items.c 2008-07-18 21:52:41.000000000
-0400
@@ -41,6 +41,7 @@
#include <libgnome/gnome-url.h>
#include <libgnomeui/gnome-url.h>
+#include <libgnomeui/gnome-password-dialog.h>
- #include "menu.h"
- #include "panel-action-button.h"
-@@ -96,6 +97,51 @@ struct _PanelDesktopMenuItemPrivate {
+ #include <libpanel-util/panel-keyfile.h>
+
+@@ -98,6 +99,51 @@ struct _PanelDesktopMenuItemPrivate {
guint append_lock_logout : 1;
};
@@ -46,7 +46,7 @@ diff -up
gnome-panel-2.22.1.2/gnome-panel/panel-menu-items.c.launch-with-gio gno
+ g_free (escaped);
+ panel_error_dialog (NULL, handle->screen,
+ "cannot_show_url", TRUE,
-+ primary, error->message);
++ primary, error->message);
+ g_free (primary);
+ }
+ g_error_free (error);
@@ -59,9 +59,9 @@ diff -up
gnome-panel-2.22.1.2/gnome-panel/panel-menu-items.c.launch-with-gio gno
+}
+
static void
- activate_uri (GtkWidget *menuitem,
- const char *path)
-@@ -125,12 +171,28 @@ activate_uri (GtkWidget *menuitem,
+ activate_uri_on_screen (const char *path,
+ GdkScreen *screen)
+@@ -124,12 +170,28 @@ activate_uri_on_screen (const char *path
command = g_strdup_printf ("nautilus --no-desktop %s", url);
gdk_spawn_command_line_on_screen (screen, command, &error);
@@ -93,9 +93,9 @@ diff -up
gnome-panel-2.22.1.2/gnome-panel/panel-menu-items.c.launch-with-gio gno
char *primary;
escaped = g_markup_escape_text (url, -1);
primary = g_strdup_printf (_("Could not open location '%s'"),
-diff -up gnome-panel-2.22.1.2/gnome-panel/panel-mount-operation.c.launch-with-gio
gnome-panel-2.22.1.2/gnome-panel/panel-mount-operation.c
---- gnome-panel-2.22.1.2/gnome-panel/panel-mount-operation.c.launch-with-gio 2008-04-21
00:10:20.000000000 -0400
-+++ gnome-panel-2.22.1.2/gnome-panel/panel-mount-operation.c 2008-04-21
00:13:35.000000000 -0400
+diff -up gnome-panel-2.23.4/gnome-panel/panel-mount-operation.c.launch-with-gio
gnome-panel-2.23.4/gnome-panel/panel-mount-operation.c
+--- gnome-panel-2.23.4/gnome-panel/panel-mount-operation.c.launch-with-gio 2008-06-17
06:02:08.000000000 -0400
++++ gnome-panel-2.23.4/gnome-panel/panel-mount-operation.c 2008-07-18 21:45:57.000000000
-0400
@@ -102,6 +102,18 @@ password_dialog_button_clicked (GtkDialo
anon = gnome_password_dialog_anon_selected (gpd);
g_mount_operation_set_anonymous (op, anon);
diff --git a/gnome-panel.spec b/gnome-panel.spec
index afaece7..ab6b9e2 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -23,7 +23,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.23.4
-Release: 4%{?dist}
+Release: 5%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.23/%{name}-%{version}.tar...
@@ -87,7 +87,7 @@ BuildRequires: libgweather-devel >= %{libgweather_version}
BuildRequires: librsvg2-devel
BuildRequires: NetworkManager-devel
-Patch0: gnome-panel-2.19.5-vendor.patch
+Patch0: gnome-panel-2.23.4-vendor.patch
Patch1: gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch
Patch2: gnome-panel-2.17.91-about-fedora.patch
Patch4: gnome-panel-2.16.1-search.patch
@@ -160,7 +160,7 @@ Panel Applets using the libpanel-applet library.
%patch1 -p1 -b .speak-to-us-ye-old-wise-fish
%patch2 -p1 -b .about-fedora
%patch4 -p1 -b .search
-#%patch6 -p0 -b .compiz-support
+##%patch6 -p0 -b .compiz-support
%patch7 -p1 -b .about-this-computer
%patch8 -p1 -b .launcher-desktop-files
%patch9 -p1 -b .desktop-file-monitoring
@@ -358,6 +358,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Fri Jul 18 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.4-5
+- Fix one more icon
+
* Wed Jul 9 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.4-4
- Move panel-test-applets to the -devel package
diff --git a/icon-names.patch b/icon-names.patch
index 855af1b..8c9d850 100644
--- a/icon-names.patch
+++ b/icon-names.patch
@@ -1,6 +1,18 @@
+diff -up gnome-panel-2.23.4/applets/wncklet/GNOME_Wncklet_Factory.server.in.in.icon-names
gnome-panel-2.23.4/applets/wncklet/GNOME_Wncklet_Factory.server.in.in
+---
gnome-panel-2.23.4/applets/wncklet/GNOME_Wncklet_Factory.server.in.in.icon-names 2008-07-18
21:54:05.000000000 -0400
++++ gnome-panel-2.23.4/applets/wncklet/GNOME_Wncklet_Factory.server.in.in 2008-07-18
21:54:20.000000000 -0400
+@@ -122,7 +122,7 @@
+ </oaf_attribute>
+ <oaf_attribute name="name" type="string" _value="Show
Desktop"/>
+ <oaf_attribute name="description" type="string"
_value="Hide application windows and show the desktop"/>
+- <oaf_attribute name="panel:icon" type="string"
value="gnome-fs-desktop.png"/>
++ <oaf_attribute name="panel:icon" type="string"
value="user-desktop.png"/>
+ <oaf_attribute name="bugzilla:bugzilla" type="string"
value="GNOME"/>
+ <oaf_attribute name="bugzilla:product" type="string"
value="gnome-panel"/>
+ <oaf_attribute name="bugzilla:component" type="string"
value="Show Desktop Button"/>
diff -up gnome-panel-2.23.4/gnome-panel/panel-icon-names.h.icon-names
gnome-panel-2.23.4/gnome-panel/panel-icon-names.h
---- gnome-panel-2.23.4/gnome-panel/panel-icon-names.h.icon-names 2008-07-09
15:22:29.000000000 -0400
-+++ gnome-panel-2.23.4/gnome-panel/panel-icon-names.h 2008-07-09 15:22:43.000000000
-0400
+--- gnome-panel-2.23.4/gnome-panel/panel-icon-names.h.icon-names 2008-06-17
06:02:08.000000000 -0400
++++ gnome-panel-2.23.4/gnome-panel/panel-icon-names.h 2008-07-18 21:53:39.000000000
-0400
@@ -25,7 +25,7 @@
#define PANEL_ICON_SEPARATOR "gnome-panel-separator"
#define PANEL_ICON_SAVED_SEARCH "folder-saved-search"
diff --git a/preferred-apps.patch b/preferred-apps.patch
index 74f51ae..4f61b82 100644
--- a/preferred-apps.patch
+++ b/preferred-apps.patch
@@ -1,34 +1,15 @@
-diff -up gnome-panel-2.21.91/gnome-panel/main.c.preferred-apps
gnome-panel-2.21.91/gnome-panel/main.c
---- gnome-panel-2.21.91/gnome-panel/main.c.preferred-apps 2008-02-11 16:15:47.000000000
-0500
-+++ gnome-panel-2.21.91/gnome-panel/main.c 2008-02-13 20:44:49.000000000 -0500
-@@ -26,6 +26,7 @@
- #include "panel-action-protocol.h"
- #include "panel-lockdown.h"
- #include "panel-icon-names.h"
-+#include "launcher.h"
- #include "xstuff.h"
-
- #include "nothing.cP"
-@@ -81,6 +82,7 @@ main (int argc, char **argv)
- GCONF_CLIENT_PRELOAD_NONE,
- NULL);
-
-+ panel_preferred_apps_init ();
- panel_global_config_load ();
- panel_lockdown_init ();
- panel_profile_load ();
-diff -up gnome-panel-2.21.91/gnome-panel/launcher.c.preferred-apps
gnome-panel-2.21.91/gnome-panel/launcher.c
---- gnome-panel-2.21.91/gnome-panel/launcher.c.preferred-apps 2008-02-13
20:44:49.000000000 -0500
-+++ gnome-panel-2.21.91/gnome-panel/launcher.c 2008-02-13 20:44:49.000000000 -0500
+diff -up gnome-panel-2.23.4/gnome-panel/launcher.c.preferred-apps
gnome-panel-2.23.4/gnome-panel/launcher.c
+--- gnome-panel-2.23.4/gnome-panel/launcher.c.preferred-apps 2008-07-18
21:44:07.000000000 -0400
++++ gnome-panel-2.23.4/gnome-panel/launcher.c 2008-07-18 21:44:51.000000000 -0400
@@ -23,6 +23,7 @@
#include <libgnome/gnome-util.h>
#include <libgnomeui/gnome-url.h>
#include <gdk/gdkx.h>
+#include <gmenu-tree.h>
- #include "launcher.h"
+ #include <libpanel-util/panel-keyfile.h>
-@@ -40,6 +41,7 @@
+@@ -42,6 +43,7 @@
#include "panel-compatibility.h"
#include "panel-ditem-editor.h"
#include "panel-icon-names.h"
@@ -36,7 +17,7 @@ diff -up gnome-panel-2.21.91/gnome-panel/launcher.c.preferred-apps
gnome-panel-2
static GdkScreen *
launcher_get_screen (Launcher *launcher)
-@@ -1299,3 +1301,173 @@ panel_launcher_set_dnd_enabled (Launcher
+@@ -1297,3 +1299,173 @@ panel_launcher_set_dnd_enabled (Launcher
} else
gtk_drag_source_unset (launcher->button);
}
@@ -210,9 +191,9 @@ diff -up gnome-panel-2.21.91/gnome-panel/launcher.c.preferred-apps
gnome-panel-2
+ filename, g_free, NULL);
+ }
+}
-diff -up gnome-panel-2.21.91/gnome-panel/launcher.h.preferred-apps
gnome-panel-2.21.91/gnome-panel/launcher.h
---- gnome-panel-2.21.91/gnome-panel/launcher.h.preferred-apps 2008-02-13
20:44:49.000000000 -0500
-+++ gnome-panel-2.21.91/gnome-panel/launcher.h 2008-02-13 20:45:58.000000000 -0500
+diff -up gnome-panel-2.23.4/gnome-panel/launcher.h.preferred-apps
gnome-panel-2.23.4/gnome-panel/launcher.h
+--- gnome-panel-2.23.4/gnome-panel/launcher.h.preferred-apps 2008-07-18
21:44:07.000000000 -0400
++++ gnome-panel-2.23.4/gnome-panel/launcher.h 2008-07-18 21:44:07.000000000 -0400
@@ -14,6 +14,8 @@
#include "applet.h"
#include "panel-widget.h"
@@ -230,22 +211,29 @@ diff -up gnome-panel-2.21.91/gnome-panel/launcher.h.preferred-apps
gnome-panel-2
G_END_DECLS
-diff -up gnome-panel-2.21.91/gnome-panel/panel-run-dialog.h.preferred-apps
gnome-panel-2.21.91/gnome-panel/panel-run-dialog.h
---- gnome-panel-2.21.91/gnome-panel/panel-run-dialog.h.preferred-apps 2008-02-11
16:15:47.000000000 -0500
-+++ gnome-panel-2.21.91/gnome-panel/panel-run-dialog.h 2008-02-13 20:44:49.000000000
-0500
-@@ -32,6 +32,8 @@ G_BEGIN_DECLS
- void panel_run_dialog_present (GdkScreen *screen,
- guint32 activate_time);
+diff -up gnome-panel-2.23.4/gnome-panel/main.c.preferred-apps
gnome-panel-2.23.4/gnome-panel/main.c
+--- gnome-panel-2.23.4/gnome-panel/main.c.preferred-apps 2008-06-17 06:02:08.000000000
-0400
++++ gnome-panel-2.23.4/gnome-panel/main.c 2008-07-18 21:44:07.000000000 -0400
+@@ -28,6 +28,7 @@
+ #include "panel-action-protocol.h"
+ #include "panel-lockdown.h"
+ #include "panel-icon-names.h"
++#include "launcher.h"
+ #include "xstuff.h"
-+GSList *get_all_applications (void);
-+
- G_END_DECLS
+ #include "nothing.cP"
+@@ -86,6 +87,7 @@ main (int argc, char **argv)
+ GCONF_CLIENT_PRELOAD_NONE,
+ NULL);
- #endif /* __PANEL_RUN_DIALOG_H__ */
-diff -up gnome-panel-2.21.91/gnome-panel/panel-run-dialog.c.preferred-apps
gnome-panel-2.21.91/gnome-panel/panel-run-dialog.c
---- gnome-panel-2.21.91/gnome-panel/panel-run-dialog.c.preferred-apps 2008-02-11
16:15:47.000000000 -0500
-+++ gnome-panel-2.21.91/gnome-panel/panel-run-dialog.c 2008-02-13 20:44:49.000000000
-0500
-@@ -816,7 +816,7 @@ get_all_applications_from_dir (GMenuTree
++ panel_preferred_apps_init ();
+ panel_global_config_load ();
+ panel_lockdown_init ();
+ panel_profile_load ();
+diff -up gnome-panel-2.23.4/gnome-panel/panel-run-dialog.c.preferred-apps
gnome-panel-2.23.4/gnome-panel/panel-run-dialog.c
+--- gnome-panel-2.23.4/gnome-panel/panel-run-dialog.c.preferred-apps 2008-06-17
06:02:08.000000000 -0400
++++ gnome-panel-2.23.4/gnome-panel/panel-run-dialog.c 2008-07-18 21:44:07.000000000
-0400
+@@ -818,7 +818,7 @@ get_all_applications_from_dir (GMenuTree
return list;
}
@@ -254,3 +242,15 @@ diff -up
gnome-panel-2.21.91/gnome-panel/panel-run-dialog.c.preferred-apps gnome
get_all_applications (void)
{
GMenuTree *tree;
+diff -up gnome-panel-2.23.4/gnome-panel/panel-run-dialog.h.preferred-apps
gnome-panel-2.23.4/gnome-panel/panel-run-dialog.h
+--- gnome-panel-2.23.4/gnome-panel/panel-run-dialog.h.preferred-apps 2008-06-17
06:02:08.000000000 -0400
++++ gnome-panel-2.23.4/gnome-panel/panel-run-dialog.h 2008-07-18 21:44:07.000000000
-0400
+@@ -32,6 +32,8 @@ G_BEGIN_DECLS
+ void panel_run_dialog_present (GdkScreen *screen,
+ guint32 activate_time);
+
++GSList *get_all_applications (void);
++
+ G_END_DECLS
+
+ #endif /* __PANEL_RUN_DIALOG_H__ */
commit f1b22d20b9e12bf576af45eef86f6aef62874bc5
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Jul 10 03:23:01 2008 +0000
small cleanup
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 097ece4..afaece7 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -23,7 +23,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.23.4
-Release: 3%{?dist}
+Release: 4%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.23/%{name}-%{version}.tar...
@@ -335,7 +335,8 @@ fi
%dir %{_datadir}/omf/workspace-switcher
%{_datadir}/man/man*/*
%{_datadir}/applications/gnome-panel.desktop
-%{_bindir}/*
+%{_bindir}/gnome-panel
+%{_bindir}/gnome-desktop-item-edit
%{_libexecdir}/*
%{_libdir}/bonobo/servers/*.server
%{_sysconfdir}/gconf/schemas/*.schemas
@@ -350,12 +351,16 @@ fi
%files devel
%defattr(-, root, root)
+%{_bindir}/panel-test-applets
%{_libdir}/pkgconfig/*
%{_includedir}/panel-2.0
%{_libdir}/*.so
%{_datadir}/gtk-doc/html/*
%changelog
+* Wed Jul 9 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.4-4
+- Move panel-test-applets to the -devel package
+
* Wed Jul 9 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.4-3
- Use more standard icon names
commit a0a23d3fce8021a8fa3f6e5a28753a1c7481dd8a
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Jul 9 20:59:14 2008 +0000
use standard icon names
diff --git a/gnome-panel.spec b/gnome-panel.spec
index f97124c..097ece4 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -23,7 +23,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.23.4
-Release: 2%{?dist}
+Release: 3%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.23/%{name}-%{version}.tar...
@@ -119,6 +119,9 @@ Patch34: gnome-panel-launch-with-gio.patch
Patch35: clock-wakeups.patch
+#
http://bugzilla.gnome.org/show_bug.cgi?id=542257
+Patch47: icon-names.patch
+
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -168,6 +171,7 @@ Panel Applets using the libpanel-applet library.
%patch33 -p1 -b .use-gio
%patch34 -p1 -b .launch-with-gio
%patch35 -p1 -b .clock-wakeups
+%patch47 -p1 -b .icon-names
. %{SOURCE6}
@@ -352,6 +356,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Wed Jul 9 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.4-3
+- Use more standard icon names
+
* Tue Jul 8 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.4-2
- Fix debuginfo generation
diff --git a/icon-names.patch b/icon-names.patch
new file mode 100644
index 0000000..855af1b
--- /dev/null
+++ b/icon-names.patch
@@ -0,0 +1,12 @@
+diff -up gnome-panel-2.23.4/gnome-panel/panel-icon-names.h.icon-names
gnome-panel-2.23.4/gnome-panel/panel-icon-names.h
+--- gnome-panel-2.23.4/gnome-panel/panel-icon-names.h.icon-names 2008-07-09
15:22:29.000000000 -0400
++++ gnome-panel-2.23.4/gnome-panel/panel-icon-names.h 2008-07-09 15:22:43.000000000
-0400
+@@ -25,7 +25,7 @@
+ #define PANEL_ICON_SEPARATOR "gnome-panel-separator"
+ #define PANEL_ICON_SAVED_SEARCH "folder-saved-search"
+ #define PANEL_ICON_SEARCHTOOL "system-search"
+-#define PANEL_ICON_SHUTDOWN "gnome-shutdown"
++#define PANEL_ICON_SHUTDOWN "system-shutdown"
+ #define PANEL_ICON_THEME "preferences-desktop-theme"
+ #define PANEL_ICON_TRASH "user-trash"
+ #define PANEL_ICON_UNKNOWN "image-missing"
commit 57bd955f8a19b887d6a5c7e818050be65c72075c
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Jul 8 17:17:54 2008 +0000
Fix debuginfo generation
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 3d7a923..f97124c 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -23,7 +23,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.23.4
-Release: 1%{?dist}
+Release: 2%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.23/%{name}-%{version}.tar...
@@ -190,7 +190,7 @@ autoconf
--enable-eds=no
%endif
-make CFLAGS="$RPM_CFLAGS -DGWEATHER_I_KNOW_THIS_IS_UNSTABLE"
+make
%install
rm -rf $RPM_BUILD_ROOT
@@ -352,6 +352,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Tue Jul 8 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.4-2
+- Fix debuginfo generation
+
* Wed Jun 18 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.4-1
- Update to 2.23.4
commit 5107e1895658688b0457672339737c5e6291387d
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Jun 18 21:31:13 2008 +0000
update patches
diff --git a/desktop-file-monitoring.patch b/desktop-file-monitoring.patch
index 7048299..14a5ea3 100644
--- a/desktop-file-monitoring.patch
+++ b/desktop-file-monitoring.patch
@@ -135,7 +135,7 @@ diff -up
gnome-panel-2.21.91/gnome-panel/launcher.c.desktop-file-monitoring gnom
+ if (entry) {
+ key_file = g_key_file_new ();
+ if (!g_key_file_load_from_file (key_file, entry, 0, NULL) ||
-+ !panel_util_key_file_get_boolean (key_file, "X-Panel-Monitor", FALSE))
++ !panel_key_file_get_boolean (key_file, "X-Panel-Monitor", FALSE))
+ entry = NULL;
+ g_key_file_free (key_file);
+ }
diff --git a/launcher-desktop-files.patch b/launcher-desktop-files.patch
index f42379d..27b09fb 100644
--- a/launcher-desktop-files.patch
+++ b/launcher-desktop-files.patch
@@ -18,15 +18,15 @@ diff -up
gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.c.launcher-desktop-f
+
+ key_file = g_key_file_new ();
+ if (g_key_file_load_from_file (key_file, uri, 0, NULL)) {
-+ if (panel_util_key_file_get_boolean (key_file, "Terminal", FALSE))
++ if (panel_key_file_get_boolean (key_file, "Terminal", FALSE))
+ gtk_combo_box_set_active (GTK_COMBO_BOX (dialog->priv->type_combo), 1);
+ else
+ gtk_combo_box_set_active (GTK_COMBO_BOX (dialog->priv->type_combo), 0);
+
-+ name = panel_util_key_file_get_locale_string (key_file, "Name");
-+ comment = panel_util_key_file_get_locale_string (key_file, "Comment");
-+ icon = panel_util_key_file_get_locale_string (key_file, "Icon");
-+ exec = panel_util_key_file_get_string (key_file, "Exec");
++ name = panel_key_file_get_locale_string (key_file, "Name");
++ comment = panel_key_file_get_locale_string (key_file, "Comment");
++ icon = panel_key_file_get_locale_string (key_file, "Icon");
++ exec = panel_key_file_get_string (key_file, "Exec");
+
+ gtk_entry_set_text (GTK_ENTRY (dialog->priv->name_entry), name ? name :
"");
+ gtk_entry_set_text (GTK_ENTRY (dialog->priv->comment_entry), comment ? comment :
"");
diff --git a/preferred-apps.patch b/preferred-apps.patch
index 89357af..74f51ae 100644
--- a/preferred-apps.patch
+++ b/preferred-apps.patch
@@ -99,9 +99,9 @@ diff -up gnome-panel-2.21.91/gnome-panel/launcher.c.preferred-apps
gnome-panel-2
+
+ location = find_desktop_file_from_exec (exec);
+ key_file = g_key_file_new ();
-+ if (!panel_util_key_file_load_from_uri (key_file, location,
-+ G_KEY_FILE_KEEP_COMMENTS|G_KEY_FILE_KEEP_TRANSLATIONS,
-+ NULL)) {
++ if (!panel_key_file_load_from_uri (key_file, location,
++ G_KEY_FILE_KEEP_COMMENTS|G_KEY_FILE_KEEP_TRANSLATIONS,
++ NULL)) {
+ /* FIXME would be much better if preferred apps were backed by desktop files */
+ g_key_file_set_string (key_file, "Desktop Entry", "Version",
"1.0");
+ g_key_file_set_string (key_file, "Desktop Entry", "Encoding",
"UTF-8");
commit ece03669e6e7c1713a90f5ad09242db0a24068ae
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Jun 18 19:47:18 2008 +0000
drop obsolete patches
diff --git a/gnome-panel.spec b/gnome-panel.spec
index b787ea7..3d7a923 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -90,7 +90,6 @@ BuildRequires: NetworkManager-devel
Patch0: gnome-panel-2.19.5-vendor.patch
Patch1: gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch
Patch2: gnome-panel-2.17.91-about-fedora.patch
-Patch3: gnome-panel-2.13.5-switch-user.patch
Patch4: gnome-panel-2.16.1-search.patch
# Drop this patch for now, it should have AT LEAST been moved
# to an upstream bugzilla by now
@@ -108,9 +107,6 @@ Patch10: preferred-apps.patch
# add a hard dependency on e.g. tomboy
Patch11: applet-error.patch
-#
http://bugzilla.gnome.org/show_bug.cgi?id=511881
-Patch14: gnome-panel-2.22.0-ck-shutdown.patch
-
#
http://bugzilla.gnome.org/show_bug.cgi?id=520111
Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
@@ -160,7 +156,6 @@ Panel Applets using the libpanel-applet library.
%patch0 -p1 -b .vendor
%patch1 -p1 -b .speak-to-us-ye-old-wise-fish
%patch2 -p1 -b .about-fedora
-%patch3 -p1 -b .switch-user
%patch4 -p1 -b .search
#%patch6 -p0 -b .compiz-support
%patch7 -p1 -b .about-this-computer
@@ -168,7 +163,6 @@ Panel Applets using the libpanel-applet library.
%patch9 -p1 -b .desktop-file-monitoring
%patch10 -p1 -b .preferred-apps
%patch11 -p1 -b .applet-error
-%patch14 -p1 -b .ck-shutdown
%patch24 -p1 -b .allow-spurious-view-done-signals
%patch28 -p1 -b .larger-find-window
%patch33 -p1 -b .use-gio
commit 4260fa5135dd47ee470596d4fd55520a985480b9
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Jun 18 18:01:32 2008 +0000
2.23.4
diff --git a/.cvsignore b/.cvsignore
index bdeefd7..40425d4 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.23.3.tar.bz2
+gnome-panel-2.23.4.tar.bz2
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 3202524..b787ea7 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,8 +22,8 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.23.3
-Release: 2%{?dist}
+Version: 2.23.4
+Release: 1%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.23/%{name}-%{version}.tar...
@@ -358,6 +358,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Wed Jun 18 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.4-1
+- Update to 2.23.4
+
* Tue Jun 10 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.3-2
- Avoid unnecessary wakeups in the clock for monitoring
Gentoo config file locations
diff --git a/sources b/sources
index 6bc182e..aa60fc3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d330382064ac0d9d667d36432d71af8e gnome-panel-2.23.3.tar.bz2
+5fe8148c05a8dab63a08b7db3c5d9ab6 gnome-panel-2.23.4.tar.bz2
commit 11a47156a02034cf00a912d9355fc00a3a5a0e9f
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Jun 10 23:36:50 2008 +0000
avoid unnecessary wakeups
diff --git a/clock-wakeups.patch b/clock-wakeups.patch
new file mode 100644
index 0000000..6f842aa
--- /dev/null
+++ b/clock-wakeups.patch
@@ -0,0 +1,23 @@
+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.spec b/gnome-panel.spec
index e5a029d..3202524 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -23,7 +23,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.23.3
-Release: 1%{?dist}
+Release: 2%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.23/%{name}-%{version}.tar...
@@ -121,6 +121,8 @@ Patch33: gnome-panel-use-gio.patch
#
http://bugzilla.gnome.org/show_bug.cgi?id=529243
Patch34: gnome-panel-launch-with-gio.patch
+Patch35: clock-wakeups.patch
+
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -171,6 +173,7 @@ Panel Applets using the libpanel-applet library.
%patch28 -p1 -b .larger-find-window
%patch33 -p1 -b .use-gio
%patch34 -p1 -b .launch-with-gio
+%patch35 -p1 -b .clock-wakeups
. %{SOURCE6}
@@ -355,6 +358,10 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Tue Jun 10 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.3-2
+- Avoid unnecessary wakeups in the clock for monitoring
+ Gentoo config file locations
+
* Wed Jun 4 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.3-1
- 2.23.3
commit 800f21af65e57b56ce3b539f91437a1c26fcfb6a
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Jun 4 20:19:11 2008 +0000
2.23.3
diff --git a/.cvsignore b/.cvsignore
index e5c51be..bdeefd7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.23.2.1.tar.bz2
+gnome-panel-2.23.3.tar.bz2
diff --git a/gnome-panel.spec b/gnome-panel.spec
index fa34c87..e5a029d 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.23.2.1
+Version: 2.23.3
Release: 1%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.23/%{name}-%{version}.tar...
@@ -355,6 +355,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Wed Jun 4 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.3-1
+- 2.23.3
+
* Wed May 14 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.2.1-1
- Update to 2.23.2.1
diff --git a/sources b/sources
index 9bc258b..6bc182e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ccd959c3d4484ebd1e225f0ff8d788b6 gnome-panel-2.23.2.1.tar.bz2
+d330382064ac0d9d667d36432d71af8e gnome-panel-2.23.3.tar.bz2
commit b30f765c0465ba0b3f4c5a71013d7108c89b88b5
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu May 15 03:12:09 2008 +0000
drop upstreamed patch
diff --git a/gnome-panel.spec b/gnome-panel.spec
index ddf90e2..fa34c87 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -120,7 +120,6 @@ Patch28: gnome-panel-larger-find-window.patch
Patch33: gnome-panel-use-gio.patch
#
http://bugzilla.gnome.org/show_bug.cgi?id=529243
Patch34: gnome-panel-launch-with-gio.patch
-Patch36: timezone-debug.patch
Conflicts: gnome-power-manager < 2.15.3
@@ -172,7 +171,6 @@ Panel Applets using the libpanel-applet library.
%patch28 -p1 -b .larger-find-window
%patch33 -p1 -b .use-gio
%patch34 -p1 -b .launch-with-gio
-%patch36 -p1 -b .timezone-debug
. %{SOURCE6}
commit fbe98df5db744e65f7408b56a203f9e80c84948e
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu May 15 02:54:50 2008 +0000
2.23.2.1
diff --git a/.cvsignore b/.cvsignore
index f1ca2f2..e5c51be 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.23.1.tar.bz2
+gnome-panel-2.23.2.1.tar.bz2
diff --git a/gnome-panel.spec b/gnome-panel.spec
index c9a20d7..ddf90e2 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,8 +22,8 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.23.1
-Release: 2%{?dist}
+Version: 2.23.2.1
+Release: 1%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.23/%{name}-%{version}.tar...
@@ -357,6 +357,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Wed May 14 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.2.1-1
+- Update to 2.23.2.1
+
* Wed May 14 2008 Adam Tkac <atkac redhat com> - 2.23.1-2
- rebuild
diff --git a/sources b/sources
index e57c770..9bc258b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-315e85cbd56c838d538fefe7f4aa9868 gnome-panel-2.23.1.tar.bz2
+ccd959c3d4484ebd1e225f0ff8d788b6 gnome-panel-2.23.2.1.tar.bz2
commit d73ecc0ab0aa6e8e3c7e3a9417747786a39ea565
Author: Adam Tkac <atkac(a)fedoraproject.org>
Date: Wed May 14 12:51:36 2008 +0000
- rebuild
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 8a07381..c9a20d7 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -23,7 +23,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.23.1
-Release: 1%{?dist}
+Release: 2%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.23/%{name}-%{version}.tar...
@@ -357,6 +357,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Wed May 14 2008 Adam Tkac <atkac redhat com> - 2.23.1-2
+- rebuild
+
* Fri Apr 25 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.1-1
- Update to 2.23.1
commit 2482d227e1de9b09ccf44faa02411039adac0025
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Apr 25 04:54:58 2008 +0000
fix file lists
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 167d46b..8a07381 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -344,7 +344,7 @@ fi
%{_sysconfdir}/dbus-1/system.d/org.gnome.ClockApplet.Mechanism.conf
%{_datadir}/dbus-1/system-services/org.gnome.ClockApplet.Mechanism.service
-%{_datadir}/PolicyKit/policy/gnome-clock-applet-mechanism.policy
+%{_datadir}/PolicyKit/policy/org.gnome.clockapplet.mechanism.policy
%files libs
%{_libdir}/*.so.*
commit 0e0cb171a1c99abd1898dbe4d332c93ac3d222a9
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Apr 25 04:43:34 2008 +0000
2.23.1
diff --git a/.cvsignore b/.cvsignore
index a724782..f1ca2f2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.22.1.2.tar.bz2
+gnome-panel-2.23.1.tar.bz2
diff --git a/can-do-crash.patch b/can-do-crash.patch
deleted file mode 100644
index aefc86b..0000000
--- a/can-do-crash.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -up gnome-panel-2.22.0/applets/clock/set-timezone.c.can-do-crash
gnome-panel-2.22.0/applets/clock/set-timezone.c
---- gnome-panel-2.22.0/applets/clock/set-timezone.c.can-do-crash 2008-04-02
17:13:46.000000000 -0400
-+++ gnome-panel-2.22.0/applets/clock/set-timezone.c 2008-04-02 17:13:56.000000000 -0400
-@@ -139,6 +139,9 @@ can_do (const gchar *pk_action_id)
- 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;
-@@ -147,9 +150,6 @@ can_do (const gchar *pk_action_id)
- if (pk_context == NULL)
- goto out;
-
-- pk_caller = NULL;
-- pk_action = NULL;
--
- pk_action = polkit_action_new ();
- polkit_action_set_action_id (pk_action, pk_action_id);
-
diff --git a/clock-help.patch b/clock-help.patch
deleted file mode 100644
index 6d81ebb..0000000
--- a/clock-help.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -up gnome-panel-2.22.1.2/applets/clock/clock.c.clock-help
gnome-panel-2.22.1.2/applets/clock/clock.c
---- gnome-panel-2.22.1.2/applets/clock/clock.c.clock-help 2008-04-16 21:23:29.000000000
-0400
-+++ gnome-panel-2.22.1.2/applets/clock/clock.c 2008-04-16 21:23:33.000000000 -0400
-@@ -2954,21 +2954,6 @@ set_custom_format_cb (GtkEntry *entry,
- }
-
- static void
--properties_response_cb (GtkWidget *widget,
-- int id,
-- ClockData *cd)
--{
-- /* FMQ: was used from old preferences dialog; fix this up */
--
-- if (id == GTK_RESPONSE_HELP)
-- clock_utils_display_help (cd->applet,
-- "clock", "clock", "clock-settings");
--
-- else
-- gtk_widget_destroy (widget);
--}
--
--static void
- prefs_locations_changed (GtkTreeSelection *selection, ClockData *cd)
- {
- gint n;
-@@ -3693,6 +3678,13 @@ prefs_hide_event (GtkWidget *widget, Gdk
- return TRUE;
- }
-
-+static void
-+prefs_help (GtkWidget *widget, ClockData *cd)
-+{
-+ clock_utils_display_help (cd->applet,
-+ "clock", "clock", "clock-settings");
-+}
-+
- typedef struct {
- const gchar *name;
- const gchar *country_code;
-@@ -4147,6 +4139,7 @@ ensure_prefs_window_is_created (ClockDat
- {
- GtkWidget *edit_window;
- GtkWidget *prefs_close_button;
-+ GtkWidget *prefs_help_button;
- GtkWidget *edit_cancel_button;
- GtkWidget *edit_ok_button;
- GtkWidget *zone_combo;
-@@ -4163,6 +4156,7 @@ ensure_prefs_window_is_created (ClockDat
- gtk_window_set_icon_name (GTK_WINDOW (cd->prefs_window), CLOCK_ICON);
-
- prefs_close_button = glade_xml_get_widget (cd->glade_xml,
"prefs-close-button");
-+ prefs_help_button = glade_xml_get_widget (cd->glade_xml,
"prefs-help-button");
- cd->prefs_locations = GTK_TREE_VIEW (glade_xml_get_widget (cd->glade_xml,
"cities_list"));
-
- selection = gtk_tree_view_get_selection (cd->prefs_locations);
-@@ -4175,6 +4169,9 @@ ensure_prefs_window_is_created (ClockDat
- g_signal_connect (G_OBJECT (prefs_close_button), "clicked",
- G_CALLBACK (prefs_hide), cd);
-
-+ g_signal_connect (G_OBJECT (prefs_help_button), "clicked",
-+ G_CALLBACK (prefs_help), cd);
-+
- cd->prefs_location_remove_button = glade_xml_get_widget (cd->glade_xml,
"prefs-locations-remove-button");
-
- g_signal_connect (G_OBJECT (cd->prefs_location_remove_button),
"clicked",
diff --git a/clock1.patch b/clock1.patch
deleted file mode 100644
index df895f0..0000000
--- a/clock1.patch
+++ /dev/null
@@ -1,108 +0,0 @@
---- trunk/applets/clock/clock.c 2008/04/10 13:05:02 11046
-+++ trunk/applets/clock/clock.c 2008/04/10 16:25:30 11047
-@@ -2208,7 +2208,11 @@
- return;
- }
-
-- loc = clock_location_new (name, timezone, latitude, longitude, code,
&prefs);
-+ loc = clock_location_find_and_ref (cd->locations, name, timezone,
-+ latitude, longitude, code);
-+ if (!loc)
-+ loc = clock_location_new (name, timezone,
-+ latitude, longitude, code, &prefs);
-
- if (current && clock_location_is_current_timezone (loc))
- clock_location_make_current (loc, NULL, NULL, NULL);
-@@ -3087,9 +3091,10 @@
- clock_location_is_current (loc);
-
- cd->locations = g_list_append (cd->locations, loc);
-- locations_changed (cd);
- }
-
-+ /* This will update everything related to locations to take into
-+ * account the new location (via the gconf notification) */
- save_cities_store (cd);
-
- edit_hide (edit_window, cd);
-@@ -3828,12 +3833,11 @@
- ClockLocation *loc = NULL;
-
- gtk_tree_model_get (model, iter, COL_CITY_LOC, &loc, -1);
--
-- gtk_list_store_remove (cd->cities_store, iter);
- cd->locations = g_list_remove (cd->locations, loc);
-- locations_changed (cd);
- g_object_unref (loc);
-
-+ /* This will update everything related to locations to take into
-+ * account the removed location (via the gconf notification) */
- save_cities_store (cd);
- }
-
---- trunk/applets/clock/clock-location.h 2008/04/10 13:05:02 11046
-+++ trunk/applets/clock/clock-location.h 2008/04/10 16:25:30 11047
-@@ -38,6 +38,13 @@
- const gchar *code,
- WeatherPrefs *prefs);
-
-+ClockLocation *clock_location_find_and_ref (GList *locations,
-+ const gchar *name,
-+ const gchar *timezone,
-+ gfloat latitude,
-+ gfloat longitude,
-+ const gchar *code);
-+
- gchar *clock_location_get_tzname (ClockLocation *loc);
-
- const gchar *clock_location_get_name (ClockLocation *loc);
---- trunk/applets/clock/clock-location.c 2008/04/10 13:05:02 11046
-+++ trunk/applets/clock/clock-location.c 2008/04/10 16:25:30 11047
-@@ -67,6 +67,34 @@
- #define PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CLOCK_LOCATION_TYPE,
ClockLocationPrivate))
-
- ClockLocation *
-+clock_location_find_and_ref (GList *locations,
-+ const gchar *name,
-+ const gchar *timezone,
-+ gfloat latitude,
-+ gfloat longitude,
-+ const gchar *code)
-+{
-+ GList *l;
-+ ClockLocationPrivate *priv;
-+
-+ for (l = locations; l != NULL; l = l->next) {
-+ priv = PRIVATE (l->data);
-+
-+ if (priv->latitude == latitude &&
-+ priv->longitude == longitude &&
-+ g_strcmp0 (priv->weather_code, code) == 0 &&
-+ g_strcmp0 (priv->timezone, timezone) == 0 &&
-+ g_strcmp0 (priv->name, name) == 0)
-+ break;
-+ }
-+
-+ if (l != NULL)
-+ return g_object_ref (CLOCK_LOCATION (l->data));
-+ else
-+ return NULL;
-+}
-+
-+ClockLocation *
- clock_location_new (const gchar *name, const gchar *timezone,
- gfloat latitude, gfloat longitude,
- const gchar *code, WeatherPrefs *prefs)
-@@ -467,6 +495,12 @@
- gchar *filename;
- MakeCurrentData *mcdata;
-
-+ if (loc == current_location) {
-+ if (destroy)
-+ destroy (data);
-+ return;
-+ }
-+
- if (clock_location_is_current_timezone (loc)) {
- if (current_location)
- g_object_remove_weak_pointer (G_OBJECT (current_location),
diff --git a/clock2.patch b/clock2.patch
deleted file mode 100644
index 20bc39f..0000000
--- a/clock2.patch
+++ /dev/null
@@ -1,125 +0,0 @@
---- trunk/applets/clock/clock.c 2008/04/10 16:25:30 11047
-+++ trunk/applets/clock/clock.c 2008/04/10 20:01:41 11048
-@@ -3410,8 +3410,12 @@
- G_CALLBACK (location_row_activated), cd);
-
- model = gweather_xml_load_locations ();
-- gtk_tree_view_set_model (tree, model);
-- g_object_unref (model);
-+
-+ /* Can be NULL if libgweather is not correctly installed */
-+ if (model) {
-+ gtk_tree_view_set_model (tree, model);
-+ g_object_unref (model);
-+ }
- }
-
- static void
-@@ -3421,23 +3425,41 @@
- GtkWidget *name_entry = glade_xml_get_widget (cd->glade_xml,
"edit-location-name-entry");
- GtkWidget *window;
- const char *find;
-+ const char *location;
-
- fill_location_tree (cd);
- window = glade_xml_get_widget (cd->glade_xml,
"find-location-window");
-
- /* prefill the find entry if it's empty */
- find = gtk_entry_get_text (GTK_ENTRY (cd->find_location_entry));
-- if (!find || !find[0]) {
-- const char *location;
-+ location = gtk_entry_get_text (GTK_ENTRY (name_entry));
-
-- location = gtk_entry_get_text (GTK_ENTRY (name_entry));
-- gtk_entry_set_text (GTK_ENTRY (cd->find_location_entry),
-- location);
-+ if (g_strcmp0 (find, location) != 0 || !find || !find[0]) {
-+ GtkWidget *scroll = glade_xml_get_widget (cd->glade_xml,
"find-location-scroll");
-+ GtkAdjustment *adjustment;
-+
-+ /* If we autofill the entry, reset the state of the treeview
-+ * first so that it looks like a brand new search */
-+ gtk_tree_view_collapse_all (GTK_TREE_VIEW (cd->location_tree));
-+
-+ adjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scroll));
-+ gtk_adjustment_set_value (adjustment, 0);
-+ gtk_scrolled_window_set_vadjustment (GTK_SCROLLED_WINDOW (scroll),
-+ adjustment);
-+
-+ if (g_strcmp0 (find, location) != 0)
-+ gtk_entry_set_text (GTK_ENTRY (cd->find_location_entry),
-+ location);
- }
-+
- gtk_widget_grab_focus (cd->find_location_entry);
-+ gtk_editable_set_position (GTK_EDITABLE (cd->find_location_entry),
-+ -1);
-
-- gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (edit_window));
-- gtk_window_present_with_time (GTK_WINDOW (window), gtk_get_current_event_time
());
-+ gtk_window_set_transient_for (GTK_WINDOW (window),
-+ GTK_WINDOW (edit_window));
-+ gtk_window_present_with_time (GTK_WINDOW (window),
-+ gtk_get_current_event_time ());
- }
-
- static gboolean
-@@ -3512,6 +3534,10 @@
-
- tree = GTK_TREE_VIEW (cd->location_tree);
- model = gtk_tree_view_get_model (tree);
-+ /* Can happen if libgweather is not correctly installed */
-+ if (!model)
-+ return;
-+
- entry = GTK_ENTRY (cd->find_location_entry);
- selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree));
-
-@@ -3556,6 +3582,9 @@
-
- tree = GTK_TREE_VIEW (cd->location_tree);
- model = gtk_tree_view_get_model (tree);
-+ /* Can happen if libgweather is not correctly installed */
-+ if (!model)
-+ return;
-
- selection = gtk_tree_view_get_selection (tree);
- gtk_tree_model_get_iter_first (model, &iter);
-@@ -3601,8 +3630,6 @@
- GtkWidget *lon_entry = glade_xml_get_widget (cd->glade_xml,
"edit-location-longitude-entry");
- GtkWidget *lat_combo = glade_xml_get_widget (cd->glade_xml,
"edit-location-latitude-combo");
- GtkWidget *lon_combo = glade_xml_get_widget (cd->glade_xml,
"edit-location-longitude-combo");
-- GtkWidget *scroll = glade_xml_get_widget (cd->glade_xml,
"find-location-scroll");
-- GtkAdjustment *adjustment;
-
- /* clear out the old data */
- gtk_combo_box_set_active (GTK_COMBO_BOX (zone_combo), -1);
-@@ -3614,16 +3641,6 @@
-
- gtk_combo_box_set_active (GTK_COMBO_BOX (lat_combo), -1);
- gtk_combo_box_set_active (GTK_COMBO_BOX (lon_combo), -1);
--
-- /* reset the state of the find window */
-- gtk_entry_set_text (GTK_ENTRY (cd->find_location_entry), "");
--
-- gtk_tree_view_collapse_all (GTK_TREE_VIEW (cd->location_tree));
--
-- adjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scroll));
-- gtk_adjustment_set_value (adjustment, 0);
-- gtk_scrolled_window_set_vadjustment (GTK_SCROLLED_WINDOW (scroll),
-- adjustment);
- }
-
- static void
-@@ -3730,7 +3747,10 @@
- data.distance = 1e6;
- data.location = NULL;
-
-- gtk_tree_model_foreach (GTK_TREE_MODEL (model), compare_location, &data);
-+ /* Can be NULL if libgweather is not correctly installed */
-+ if (model)
-+ gtk_tree_model_foreach (GTK_TREE_MODEL (model),
-+ compare_location, &data);
-
- if (data.location)
- code = g_strdup (data.location->code);
diff --git a/current.patch b/current.patch
deleted file mode 100644
index 290e5ca..0000000
--- a/current.patch
+++ /dev/null
@@ -1,351 +0,0 @@
-diff -up gnome-panel-2.21.92/applets/clock/clock-location.h.current
gnome-panel-2.21.92/applets/clock/clock-location.h
---- gnome-panel-2.21.92/applets/clock/clock-location.h.current 2008-02-26
08:17:49.000000000 -0500
-+++ gnome-panel-2.21.92/applets/clock/clock-location.h 2008-03-03 17:53:43.000000000
-0500
-@@ -27,6 +27,8 @@ typedef struct
- GObjectClass g_object_class;
-
- void (* weather_updated) (ClockLocation *location, WeatherInfo *info);
-+
-+ void (* set_current) (ClockLocation *location);
- } ClockLocationClass;
-
- GType clock_location_get_type (void);
-@@ -40,7 +42,7 @@ ClockLocation *clock_location_new_from_e
-
- gchar *clock_location_get_tzname (ClockLocation *loc);
-
--gchar *clock_location_get_name (ClockLocation *loc);
-+const gchar *clock_location_get_name (ClockLocation *loc);
- void clock_location_set_name (ClockLocation *loc, const gchar *name);
-
- gchar *clock_location_get_timezone (ClockLocation *loc);
-@@ -56,6 +58,7 @@ void clock_location_make_current (ClockL
- GFunc callback,
- gpointer data,
- GDestroyNotify destroy);
-+gboolean clock_location_is_current_timezone (ClockLocation *loc);
-
- const gchar *clock_location_get_weather_code (ClockLocation *loc);
- void clock_location_set_weather_code (ClockLocation *loc, const gchar *code);
-diff -up gnome-panel-2.21.92/applets/clock/clock-location-tile.c.current
gnome-panel-2.21.92/applets/clock/clock-location-tile.c
---- gnome-panel-2.21.92/applets/clock/clock-location-tile.c.current 2008-03-03
13:52:38.000000000 -0500
-+++ gnome-panel-2.21.92/applets/clock/clock-location-tile.c 2008-03-03 18:59:59.000000000
-0500
-@@ -19,7 +19,6 @@ G_DEFINE_TYPE (ClockLocationTile, clock_
-
- enum {
- TILE_PRESSED,
-- TIMEZONE_SET,
- NEED_CLOCK_FORMAT,
- LAST_SIGNAL
- };
-@@ -106,14 +105,6 @@ clock_location_tile_class_init (ClockLoc
- NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
-- signals[TIMEZONE_SET] = g_signal_new ("timezone-set",
-- G_TYPE_FROM_CLASS (g_obj_class),
-- G_SIGNAL_RUN_FIRST,
-- G_STRUCT_OFFSET (ClockLocationTileClass, timezone_set),
-- NULL,
-- NULL,
-- g_cclosure_marshal_VOID__VOID,
-- G_TYPE_NONE, 0);
- signals[NEED_CLOCK_FORMAT] = g_signal_new ("need-clock-format",
- G_TYPE_FROM_CLASS (g_obj_class),
- G_SIGNAL_RUN_LAST,
-@@ -180,13 +171,9 @@ press_on_tile (GtkWidget
- static void
- make_current_cb (gpointer data, GError *error)
- {
-- ClockLocationTile *tile = data;
- GtkWidget *dialog;
-
-- if (error == NULL) {
-- g_signal_emit (tile, signals[TIMEZONE_SET], 0);
-- }
-- else {
-+ if (error) {
- dialog = gtk_message_dialog_new (NULL,
- 0,
- GTK_MESSAGE_ERROR,
-@@ -232,7 +219,10 @@ enter_or_leave_tile (GtkWidget
- if (event->type == GDK_ENTER_NOTIFY) {
- gint can_set;
-
-- can_set = can_set_system_timezone ();
-+ if (clock_location_is_current_timezone (priv->location))
-+ can_set = 2;
-+ else
-+ can_set = can_set_system_timezone ();
- if (can_set != 0) {
- gtk_label_set_markup (GTK_LABEL (priv->current_label),
- can_set == 1 ?
-@@ -317,6 +307,7 @@ clock_location_tile_fill (ClockLocationT
- gtk_widget_show (priv->current_label);
- gtk_widget_set_no_show_all (priv->current_button, TRUE);
- gtk_container_add (GTK_CONTAINER (priv->current_button),
priv->current_label);
-+ /* FIXME: this needs to talk about locations, not timezones */
- gtk_widget_set_tooltip_text (priv->current_button, _("Set as current
timezone for this computer"));
-
- priv->current_marker = gtk_image_new_from_icon_name ("go-home",
GTK_ICON_SIZE_BUTTON);
-diff -up gnome-panel-2.21.92/applets/clock/clock.c.current
gnome-panel-2.21.92/applets/clock/clock.c
---- gnome-panel-2.21.92/applets/clock/clock.c.current 2008-03-03 15:51:48.000000000
-0500
-+++ gnome-panel-2.21.92/applets/clock/clock.c 2008-03-03 19:01:31.000000000 -0500
-@@ -237,6 +237,7 @@ static void applet_change_orient (PanelA
- ClockData *cd);
-
- static void edit_hide (GtkWidget *unused, ClockData *cd);
-+static void save_cities_store (ClockData *cd);
-
- static void
- unfix_size (ClockData *cd)
-@@ -962,8 +963,8 @@ sort_locations_by_name (gconstpointer a,
- ClockLocation *loc_a = (ClockLocation *) a;
- ClockLocation *loc_b = (ClockLocation *) b;
-
-- char *name_a = clock_location_get_name (loc_a);
-- char *name_b = clock_location_get_name (loc_b);
-+ const char *name_a = clock_location_get_name (loc_a);
-+ const char *name_b = clock_location_get_name (loc_b);
-
- return strcmp (name_a, name_b);
- }
-@@ -1069,15 +1070,6 @@ location_tile_pressed_cb (ClockLocationT
- }
-
- static void
--location_tile_timezone_set_cb (ClockLocationTile *tile, gpointer data)
--{
-- ClockData *cd = data;
--
-- clock_map_refresh (CLOCK_MAP (cd->map_widget));
-- update_location_tiles (cd);
--}
--
--static void
- location_tile_weather_updated_cb (ClockLocationTile *tile, GdkPixbuf *weather_icon,
const char *temperature, gpointer data)
- {
- ClockData *cd = data;
-@@ -1131,8 +1123,6 @@ create_cities_section (ClockData *cd)
- city = clock_location_tile_new (loc, CLOCK_FACE_SMALL);
- g_signal_connect (city, "tile-pressed",
- G_CALLBACK (location_tile_pressed_cb), cd);
-- g_signal_connect (city, "timezone-set",
-- G_CALLBACK (location_tile_timezone_set_cb), cd);
- g_signal_connect (city, "need-clock-format",
- G_CALLBACK (location_tile_need_clock_format_cb), cd);
-
-@@ -2064,6 +2054,21 @@ location_weather_updated_cb (ClockLocati
- }
-
- static void
-+location_set_current_cb (ClockLocation *loc,
-+ gpointer data)
-+{
-+ ClockData *cd = data;
-+ WeatherInfo *info;
-+
-+ info = clock_location_get_weather_info (loc);
-+ location_weather_updated_cb (loc, info, cd);
-+
-+ clock_map_refresh (CLOCK_MAP (cd->map_widget));
-+ update_location_tiles (cd);
-+ save_cities_store (cd);
-+}
-+
-+static void
- locations_changed (ClockData *cd)
- {
- GList *l;
-@@ -2078,6 +2083,8 @@ locations_changed (ClockData *cd)
- id = g_signal_connect (loc, "weather-updated",
- G_CALLBACK (location_weather_updated_cb), cd);
- g_object_set_data (G_OBJECT (loc), "weather-updated", GINT_TO_POINTER
(id));
-+ g_signal_connect (loc, "set-current",
-+ G_CALLBACK (location_set_current_cb), cd);
- }
- }
-
-@@ -2122,6 +2129,7 @@ location_start_element (GMarkupParseCont
- gfloat latitude = 0.0;
- gfloat longitude = 0.0;
- gchar *code = NULL;
-+ gboolean current = FALSE;
-
- int index = 0;
-
-@@ -2147,6 +2155,11 @@ location_start_element (GMarkupParseCont
- } else if (strcmp (att_name, "code") == 0) {
- code = (gchar *)attribute_values[index];
- }
-+ else if (strcmp (att_name, "current") == 0) {
-+ if (strcmp (attribute_values[index], "true") == 0) {
-+ current = TRUE;
-+ }
-+ }
- }
-
- setlocale (LC_NUMERIC, "");
-@@ -2157,6 +2170,9 @@ location_start_element (GMarkupParseCont
-
- loc = clock_location_new (name, timezone, latitude, longitude, code,
&prefs);
-
-+ if (current)
-+ clock_location_make_current (loc, NULL, NULL, NULL);
-+
- data->cities = g_list_append (data->cities, loc);
- }
-
-@@ -2912,13 +2928,14 @@ loc_to_string (ClockLocation *loc)
- clock_location_get_coords (loc, &latitude, &longitude);
-
- prev_locale = setlocale (LC_NUMERIC, "POSIX");
--
-+
- ret = g_markup_printf_escaped
-- ("<location name=\"%s\" timezone=\"%s\"
latitude=\"%f\" longitude=\"%f\" code=\"%s\"/>",
-+ ("<location name=\"%s\" timezone=\"%s\"
latitude=\"%f\" longitude=\"%f\" code=\"%s\"
current=\"%s\"/>",
- clock_location_get_name (loc),
- clock_location_get_timezone (loc),
- latitude, longitude,
-- clock_location_get_weather_code (loc));
-+ clock_location_get_weather_code (loc),
-+ clock_location_is_current (loc) ? "true" : "false");
-
- setlocale (LC_NUMERIC, "");
-
-diff -up gnome-panel-2.21.92/applets/clock/clock-location-tile.h.current
gnome-panel-2.21.92/applets/clock/clock-location-tile.h
---- gnome-panel-2.21.92/applets/clock/clock-location-tile.h.current 2008-03-03
18:58:50.000000000 -0500
-+++ gnome-panel-2.21.92/applets/clock/clock-location-tile.h 2008-03-03 18:58:58.000000000
-0500
-@@ -26,7 +26,6 @@ typedef struct
- GtkAlignmentClass parent_class;
-
- void (* tile_pressed) (ClockLocationTile *tile);
-- void (* timezone_set) (ClockLocationTile *tile);
- int (* need_clock_format) (ClockLocationTile *tile);
- } ClockLocationTileClass;
-
-diff -up gnome-panel-2.21.92/applets/clock/clock-location.c.current
gnome-panel-2.21.92/applets/clock/clock-location.c
---- gnome-panel-2.21.92/applets/clock/clock-location.c.current 2008-02-26
08:17:49.000000000 -0500
-+++ gnome-panel-2.21.92/applets/clock/clock-location.c 2008-03-03 19:01:45.000000000
-0500
-@@ -51,6 +51,7 @@ typedef struct {
-
- enum {
- WEATHER_UPDATED,
-+ SET_CURRENT,
- LAST_SIGNAL
- };
-
-@@ -232,6 +233,7 @@ guess_zone_from_tree (const gchar *local
- }
-
- static gchar *current_zone = NULL;
-+static ClockLocation *current_location = NULL;
- static GFileMonitor *monitor = NULL;
-
- static void
-@@ -409,6 +411,15 @@ clock_location_class_init (ClockLocation
- _clock_marshal_VOID__POINTER,
- G_TYPE_NONE, 1, G_TYPE_POINTER);
-
-+ location_signals[SET_CURRENT] =
-+ g_signal_new ("set-current",
-+ G_OBJECT_CLASS_TYPE (g_obj_class),
-+ G_SIGNAL_RUN_FIRST,
-+ G_STRUCT_OFFSET (ClockLocationClass, set_current),
-+ NULL, NULL,
-+ _clock_marshal_VOID__VOID,
-+ G_TYPE_NONE, 0);
-+
- g_type_class_add_private (this_class, sizeof (ClockLocationPrivate));
- }
-
-@@ -482,7 +493,7 @@ clock_location_finalize (GObject *g_obj)
- G_OBJECT_CLASS (clock_location_parent_class)->finalize (g_obj);
- }
-
--gchar *
-+const gchar *
- clock_location_get_name (ClockLocation *loc)
- {
- ClockLocationPrivate *priv = PRIVATE (loc);
-@@ -629,15 +640,37 @@ clock_location_localtime (ClockLocation
- }
-
- gboolean
--clock_location_is_current (ClockLocation *loc)
-+clock_location_is_current_timezone (ClockLocation *loc)
- {
- ClockLocationPrivate *priv = PRIVATE (loc);
- const char *zone;
-
-- if ((zone = zone_from_etc_sysconfig_clock ()))
-+ if ((zone = zone_from_etc_sysconfig_clock ())) {
- return strcmp (zone, priv->timezone) == 0;
-+ }
-+ else {
-+ return clock_location_get_offset (loc) == 0;
-+ }
-+}
-
-- return clock_location_get_offset (loc) == 0;
-+gboolean
-+clock_location_is_current (ClockLocation *loc)
-+{
-+
-+ if (current_location == loc)
-+ return TRUE;
-+ else if (current_location != NULL)
-+ return FALSE;
-+
-+ if (clock_location_is_current_timezone (loc)) {
-+ current_location = loc;
-+ g_object_add_weak_pointer (G_OBJECT (current_location),
-+ (gpointer *)¤t_location);
-+
-+ return TRUE;
-+ }
-+
-+ return FALSE;
- }
-
-
-@@ -700,6 +733,15 @@ make_current_cb (gpointer data, GError *
- */
- g_free (current_zone);
- current_zone = g_strdup (priv->timezone);
-+
-+ if (current_location)
-+ g_object_remove_weak_pointer (G_OBJECT (current_location),
-+ (gpointer *)¤t_location);
-+ current_location = mcdata->location;
-+ g_object_add_weak_pointer (G_OBJECT (current_location),
-+ (gpointer *)¤t_location);
-+ g_signal_emit (current_location, location_signals[SET_CURRENT],
-+ 0, NULL);
- }
-
- if (mcdata->callback)
-@@ -730,6 +772,22 @@ clock_location_make_current (ClockLocati
- gchar *filename;
- MakeCurrentData *mcdata;
-
-+ if (clock_location_is_current_timezone (loc)) {
-+ if (current_location)
-+ g_object_remove_weak_pointer (G_OBJECT (current_location),
-+ (gpointer *)¤t_location);
-+ current_location = loc;
-+ g_object_add_weak_pointer (G_OBJECT (current_location),
-+ (gpointer *)¤t_location);
-+ g_signal_emit (current_location, location_signals[SET_CURRENT],
-+ 0, NULL);
-+ if (callback)
-+ callback (data, NULL);
-+ if (destroy)
-+ destroy (data);
-+ return;
-+ }
-+
- mcdata = g_new (MakeCurrentData, 1);
-
- mcdata->location = g_object_ref (loc);
diff --git a/dbus-timeout.patch b/dbus-timeout.patch
deleted file mode 100644
index 2d29852..0000000
--- a/dbus-timeout.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up gnome-panel-2.22.0/applets/clock/set-timezone.c.dbus-timeout
gnome-panel-2.22.0/applets/clock/set-timezone.c
---- gnome-panel-2.22.0/applets/clock/set-timezone.c.dbus-timeout 2008-04-04
20:44:52.000000000 -0400
-+++ gnome-panel-2.22.0/applets/clock/set-timezone.c 2008-04-04 20:44:58.000000000 -0400
-@@ -291,7 +291,17 @@ set_time_notify (DBusGProxy *proxy,
- data->callback (data->data, NULL);
- }
- else {
-- if (dbus_g_error_has_name (error,
"org.gnome.ClockApplet.Mechanism.NotPrivileged")) {
-+ if (error->domain == DBUS_GERROR &&
-+ error->code == DBUS_GERROR_NO_REPLY) {
-+ /* these errors happen because dbus doesn't
-+ * use monotonic clocks
-+ */
-+ g_warning ("ignoring no-reply error when setting time");
-+ g_error_free (error);
-+ 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);
diff --git a/expose.patch b/expose.patch
deleted file mode 100644
index dd8aa3d..0000000
--- a/expose.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up gnome-panel-2.21.92/applets/clock/clock-map.c.expose
gnome-panel-2.21.92/applets/clock/clock-map.c
---- gnome-panel-2.21.92/applets/clock/clock-map.c.expose 2008-03-03 20:26:50.000000000
-0500
-+++ gnome-panel-2.21.92/applets/clock/clock-map.c 2008-03-03 20:26:55.000000000 -0500
-@@ -247,8 +247,9 @@ clock_map_expose (GtkWidget *this, GdkEv
- /* draw a simple outline */
- cairo_rectangle (
- cr,
-- region.x + 0.5, region.y + 0.5,
-- region.width - 1, region.height - 1);
-+ allocation.x + 0.5, allocation.y + 0.5,
-+ gdk_pixbuf_get_width (priv->rotated_map_pixbuf) - 1,
-+ gdk_pixbuf_get_height (priv->rotated_map_pixbuf) - 1);
-
- cairo_set_source_rgb (
- cr,
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 857677f..167d46b 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -16,15 +16,16 @@
%define dbus_version 0.60
%define dbus_glib_version 0.60
%define gnome_doc_utils_version 0.3.2
+%define libgweather_version 2.22.1
%define use_evolution_data_server 1
Summary: GNOME panel
Name: gnome-panel
-Version: 2.22.1.2
-Release: 6%{?dist}
+Version: 2.23.1
+Release: 1%{?dist}
URL:
http://www.gnome.org
-Source0:
http://download.gnome.org/sources/gnome-panel/2.22/%{name}-%{version}.tar...
+Source0:
http://download.gnome.org/sources/gnome-panel/2.23/%{name}-%{version}.tar...
Source3: redhat-panel-default-setup.entries
Source4: gnome-compiler-flags.m4
@@ -82,7 +83,7 @@ BuildRequires: dbus-devel >= %{dbus_version}
%endif
BuildRequires: PolicyKit-devel
BuildRequires: PolicyKit-gnome-devel
-BuildRequires: libgweather-devel
+BuildRequires: libgweather-devel >= %{libgweather_version}
BuildRequires: librsvg2-devel
BuildRequires: NetworkManager-devel
@@ -116,17 +117,9 @@ Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
# fixed upstream
Patch28: gnome-panel-larger-find-window.patch
-# some upstream fixes
-Patch30: clock1.patch
-Patch31: clock2.patch
-
-Patch32: clock-help.patch
-
Patch33: gnome-panel-use-gio.patch
#
http://bugzilla.gnome.org/show_bug.cgi?id=529243
Patch34: gnome-panel-launch-with-gio.patch
-# fixed in upstream svn
-Patch35: timezone-64.patch
Patch36: timezone-debug.patch
Conflicts: gnome-power-manager < 2.15.3
@@ -177,12 +170,8 @@ Panel Applets using the libpanel-applet library.
%patch14 -p1 -b .ck-shutdown
%patch24 -p1 -b .allow-spurious-view-done-signals
%patch28 -p1 -b .larger-find-window
-%patch30 -p1 -b .clock1
-%patch31 -p1 -b .clock2
-%patch32 -p1 -b .clock-help
%patch33 -p1 -b .use-gio
%patch34 -p1 -b .launch-with-gio
-%patch35 -p1 -b .timezone-64
%patch36 -p1 -b .timezone-debug
. %{SOURCE6}
@@ -368,6 +357,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Fri Apr 25 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.23.1-1
+- Update to 2.23.1
+
* Wed Apr 23 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.1.2-6
- Remove an erroneous addition in the last patch
diff --git a/location-edit.patch b/location-edit.patch
deleted file mode 100644
index 012423f..0000000
--- a/location-edit.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -up gnome-panel-2.22.0/applets/clock/clock.c.location-edit
gnome-panel-2.22.0/applets/clock/clock.c
---- gnome-panel-2.22.0/applets/clock/clock.c.location-edit 2008-03-28 11:25:10.000000000
-0400
-+++ gnome-panel-2.22.0/applets/clock/clock.c 2008-03-28 11:25:16.000000000 -0400
-@@ -1003,6 +1003,13 @@ create_cities_store (ClockData *cd)
-
- list = list->next;
- }
-+
-+
-+ if (cd->prefs_window) {
-+ GtkWidget *widget = glade_xml_get_widget (cd->glade_xml, "cities_list");
-+ gtk_tree_view_set_model (GTK_TREE_VIEW (widget),
-+ GTK_TREE_MODEL (cd->cities_store));
-+ }
- }
-
- static gint
diff --git a/populate.patch b/populate.patch
deleted file mode 100644
index 5e17c5d..0000000
--- a/populate.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -up gnome-panel-2.22.0/applets/clock/clock.c.populate
gnome-panel-2.22.0/applets/clock/clock.c
---- gnome-panel-2.22.0/applets/clock/clock.c.populate 2008-03-14 17:15:02.000000000
-0400
-+++ gnome-panel-2.22.0/applets/clock/clock.c 2008-03-14 17:15:06.000000000 -0400
-@@ -1002,12 +1002,6 @@ create_cities_store (ClockData *cd)
-
- list = list->next;
- }
--
-- if (cd->prefs_window) {
-- GtkWidget *widget = glade_xml_get_widget (cd->glade_xml,
"cities_list");
-- gtk_tree_view_set_model (GTK_TREE_VIEW (widget),
-- GTK_TREE_MODEL (cd->cities_store));
-- }
- }
-
- static gint
-@@ -3832,6 +3826,9 @@ fill_prefs_window (ClockData *cd)
- renderer = gtk_cell_renderer_text_new ();
- col = gtk_tree_view_column_new_with_attributes (_("City Time Zone"),
renderer, "text", COL_CITY_TZ, NULL);
- gtk_tree_view_insert_column (GTK_TREE_VIEW (widget), col, -1);
-+
-+ if (cd->cities_store == NULL)
-+ create_cities_store (cd);
-
- gtk_tree_view_set_model (GTK_TREE_VIEW (widget),
- GTK_TREE_MODEL (cd->cities_store));
diff --git a/set-time-window.patch b/set-time-window.patch
deleted file mode 100644
index 39c3985..0000000
--- a/set-time-window.patch
+++ /dev/null
@@ -1,1864 +0,0 @@
-diff -up gnome-panel-2.22.0/applets/clock/clock.c.set-time-window
gnome-panel-2.22.0/applets/clock/clock.c
---- gnome-panel-2.22.0/applets/clock/clock.c.set-time-window 2008-03-28
00:21:34.000000000 -0400
-+++ gnome-panel-2.22.0/applets/clock/clock.c 2008-03-28 00:22:00.000000000 -0400
-@@ -237,6 +237,7 @@ static void applet_change_orient (PanelA
- ClockData *cd);
-
- static void edit_hide (GtkWidget *unused, ClockData *cd);
-+static gboolean edit_delete (GtkWidget *unused, GdkEvent *event, ClockData *cd);
- static void save_cities_store (ClockData *cd);
-
- static void
-@@ -1735,6 +1736,14 @@ cancel_time_settings (GtkWidget *button,
- refresh_clock_timeout (cd);
- }
-
-+static gboolean
-+delete_time_settings (GtkWidget *widget, GdkEvent *event, gpointer data)
-+{
-+ cancel_time_settings (widget, data);
-+
-+ return TRUE;
-+}
-+
- static void
- fill_time_settings_window (ClockData *cd)
- {
-@@ -1803,6 +1812,8 @@ ensure_time_settings_window_is_created (
- return;
-
- cd->set_time_window = glade_xml_get_widget (cd->glade_xml,
"set-time-window");
-+ g_signal_connect (cd->set_time_window, "delete_event",
-+ G_CALLBACK (delete_time_settings), cd);
-
- cd->calendar = glade_xml_get_widget (cd->glade_xml,
"calendar");
- cd->hours_spin = glade_xml_get_widget (cd->glade_xml,
"hours_spin");
-@@ -3492,6 +3503,14 @@ edit_hide (GtkWidget *unused, ClockData
- }
-
- static gboolean
-+edit_delete (GtkWidget *unused, GdkEvent *event, ClockData *cd)
-+{
-+ edit_hide (unused, cd);
-+
-+ return TRUE;
-+}
-+
-+static gboolean
- edit_hide_event (GtkWidget *widget, GdkEvent *event, ClockData *cd)
- {
- edit_hide (widget, cd);
-@@ -3617,6 +3636,13 @@ run_prefs_locations_add (GtkButton *butt
-
- g_object_set_data (G_OBJECT (edit_window), "clock-location", NULL);
- gtk_window_set_transient_for (GTK_WINDOW (edit_window), GTK_WINDOW
(cd->prefs_window));
-+
-+ if (g_object_get_data (G_OBJECT (edit_window), "delete-handler")
-+ == NULL) {
-+ g_object_set_data (G_OBJECT (edit_window), "delete-handler",
-+ GINT_TO_POINTER (g_signal_connect (edit_window, "delete_event",
G_CALLBACK (edit_delete), cd)));
-+ }
-+
- gtk_window_present_with_time (GTK_WINDOW (edit_window),
gtk_get_current_event_time ());
- }
-
-diff -up gnome-panel-2.22.0/applets/clock/clock.glade.set-time-window
gnome-panel-2.22.0/applets/clock/clock.glade
---- gnome-panel-2.22.0/applets/clock/clock.glade.set-time-window 2008-03-28
00:21:34.000000000 -0400
-+++ gnome-panel-2.22.0/applets/clock/clock.glade 2008-03-28 00:22:02.000000000 -0400
-@@ -4,7 +4,7 @@
- <glade-interface>
- <requires lib="gnome"/>
-
--<widget class="GtkWindow" id="edit-location-window">
-+<widget class="GtkWindow" id="edit-location-windowx">
- <property name="title"></property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
-@@ -152,7 +152,7 @@
- </child>
-
- <child>
-- <widget class="GtkEntry"
id="edit-location-longitude-entry">
-+ <widget class="GtkEntry"
id="edit-location-longitude-entryx">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
-@@ -173,7 +173,7 @@
- </child>
-
- <child>
-- <widget class="GtkComboBox"
id="edit-location-longitude-combo">
-+ <widget class="GtkComboBox"
id="edit-location-longitude-combox">
- <property name="visible">True</property>
- <property name="items" translatable="yes">East
- West</property>
-@@ -247,7 +247,7 @@ West</property>
- </child>
-
- <child>
-- <widget class="GtkComboBox"
id="edit-location-latitude-combo">
-+ <widget class="GtkComboBox"
id="edit-location-latitude-combox">
- <property name="visible">True</property>
- <property name="items" translatable="yes">North
- South</property>
-@@ -265,7 +265,7 @@ South</property>
- </child>
-
- <child>
-- <widget class="GtkEntry"
id="edit-location-latitude-entry">
-+ <widget class="GtkEntry"
id="edit-location-latitude-entryx">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
-@@ -348,7 +348,7 @@ South</property>
- <property name="spacing">6</property>
-
- <child>
-- <widget class="GtkEntry" id="edit-location-name-entry">
-+ <widget class="GtkEntry" id="edit-location-name-entryx">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
-@@ -367,7 +367,7 @@ South</property>
- </child>
-
- <child>
-- <widget class="GtkButton" id="find-location-button">
-+ <widget class="GtkButton" id="find-location-buttonx">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label"
translatable="yes">Find...</property>
-@@ -393,7 +393,7 @@ South</property>
- </child>
-
- <child>
-- <widget class="GtkComboBoxEntry"
id="edit-location-timezone-combo">
-+ <widget class="GtkComboBoxEntry"
id="edit-location-timezone-combox">
- <property name="visible">True</property>
- <property name="items">Dummy Item</property>
- <property name="add_tearoffs">False</property>
-@@ -440,7 +440,7 @@ South</property>
- <property name="spacing">6</property>
-
- <child>
-- <widget class="GtkButton"
id="edit-location-cancel-button">
-+ <widget class="GtkButton"
id="edit-location-cancel-buttonx">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
-@@ -452,7 +452,7 @@ South</property>
- </child>
-
- <child>
-- <widget class="GtkButton" id="edit-location-ok-button">
-+ <widget class="GtkButton" id="edit-location-ok-buttonx">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
-@@ -473,12 +473,13 @@ South</property>
- </child>
- </widget>
-
--<widget class="GtkWindow" id="set-time-window">
-- <property name="border_width">12</property>
-- <property name="title" translatable="yes">Time
Settings</property>
-+<widget class="GtkWindow" id="find-location-windowx">
-+ <property name="title" translatable="yes"></property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
-+ <property name="default_width">400</property>
-+ <property name="default_height">500</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
-@@ -490,141 +491,91 @@ South</property>
- <property name="urgency_hint">False</property>
-
- <child>
-- <widget class="GtkVBox" id="vbox20">
-+ <widget class="GtkVBox" id="vbox25">
-+ <property name="border_width">12</property>
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
-- <property name="spacing">6</property>
--
-- <child>
-- <widget class="GtkLabel" id="label212">
-- <property name="visible">True</property>
-- <property name="label"
translatable="yes"><b>Time
Settings</b></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>
-+ <property name="spacing">24</property>
-
- <child>
-- <widget class="GtkHBox" id="time_settings_box">
-+ <widget class="GtkVBox" id="vbox26">
- <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="label217">
-+ <widget class="GtkScrolledWindow" id="scrolledwindow11">
- <property name="visible">True</property>
-- <property name="label"> </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>
-+ <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="find-location-treex">
-+ <property name="visible">True</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">False</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>
-- <property name="expand">False</property>
-- <property name="fill">False</property>
-+ <property name="expand">True</property>
-+ <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
-- <widget class="GtkHBox" id="hbox52">
-+ <widget class="GtkHBox" id="hbox56">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
-- <property name="spacing">12</property>
-+ <property name="spacing">6</property>
-
- <child>
-- <widget class="GtkCalendar" id="calendar">
-+ <widget class="GtkLabel" id="label221">
- <property name="visible">True</property>
-- <property name="can_focus">True</property>
-- <property
name="display_options">GTK_CALENDAR_SHOW_HEADING</property>
-+ <property name="label"
translatable="yes">_Find:</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.5</property>
-+ <property name="yalign">0.5</property>
-+ <property name="xpad">0</property>
-+ <property name="ypad">0</property>
-+ <property
name="mnemonic_widget">find-location-entryx</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">True</property>
-- <property name="fill">True</property>
-+ <property name="expand">False</property>
-+ <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
-- <widget class="GtkVBox" id="vbox22">
-+ <widget class="GtkEntry" id="find-location-entryx">
- <property name="visible">True</property>
-- <property name="homogeneous">False</property>
-- <property name="spacing">6</property>
--
-- <child>
-- <widget class="GtkLabel" id="label218">
-- <property name="visible">True</property>
-- <property name="label" translatable="yes">Current
Time:</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="padding">0</property>
-- <property name="expand">False</property>
-- <property name="fill">False</property>
-- </packing>
-- </child>
--
-- <child>
-- <widget class="GtkLabel" id="label219">
-- <property name="visible">True</property>
-- <property name="label"
translatable="yes">Time:</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="padding">0</property>
-- <property name="expand">False</property>
-- <property name="fill">False</property>
-- </packing>
-- </child>
-+ <property name="can_focus">True</property>
-+ <property name="editable">True</property>
-+ <property name="visibility">True</property>
-+ <property name="max_length">0</property>
-+ <property name="text"
translatable="yes"></property>
-+ <property name="has_frame">True</property>
-+ <property name="invisible_char"></property>
-+ <property name="activates_default">False</property>
- </widget>
- <packing>
- <property name="padding">0</property>
-@@ -634,357 +585,71 @@ South</property>
- </child>
-
- <child>
-- <widget class="GtkVBox" id="vbox23">
-+ <widget class="GtkButton" id="find-next-location-buttonx">
- <property name="visible">True</property>
-- <property name="homogeneous">False</property>
-- <property name="spacing">6</property>
-+ <property name="can_focus">True</property>
-+ <property name="relief">GTK_RELIEF_NORMAL</property>
-+ <property name="focus_on_click">True</property>
-
- <child>
-- <widget class="GtkLabel" id="current_time_label">
-+ <widget class="GtkAlignment" id="alignment31">
- <property name="visible">True</property>
-- <property name="label">23:59:59</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="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="GtkHBox" id="hbox53">
-- <property name="visible">True</property>
-- <property name="homogeneous">False</property>
-- <property name="spacing">0</property>
-+ <property name="xscale">0</property>
-+ <property name="yscale">0</property>
-+ <property name="top_padding">0</property>
-+ <property name="bottom_padding">0</property>
-+ <property name="left_padding">0</property>
-+ <property name="right_padding">0</property>
-
- <child>
-- <widget class="GtkSpinButton" id="hours_spin">
-+ <widget class="GtkHBox" id="hbox57">
- <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">True</property>
-- <property name="adjustment">23 0 23 1 12 12</property>
-- </widget>
-- <packing>
-- <property name="padding">0</property>
-- <property name="expand">True</property>
-- <property name="fill">True</property>
-- </packing>
-- </child>
-+ <property name="homogeneous">False</property>
-+ <property name="spacing">2</property>
-
-- <child>
-- <widget class="GtkSpinButton" id="minutes_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">True</property>
-- <property name="adjustment">59 0 59 1 30 30</property>
-- </widget>
-- <packing>
-- <property name="padding">0</property>
-- <property name="expand">True</property>
-- <property name="fill">True</property>
-- </packing>
-- </child>
-+ <child>
-+ <widget class="GtkImage" id="image29">
-+ <property name="visible">True</property>
-+ <property name="stock">gtk-find</property>
-+ <property name="icon_size">4</property>
-+ <property name="xalign">0.5</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>
-
-- <child>
-- <widget class="GtkSpinButton" id="seconds_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">True</property>
-- <property name="adjustment">59 0 59 1 30 30</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">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">False</property>
-- </packing>
-- </child>
--
-- <child>
-- <widget class="GtkHBox" id="hbox58">
-- <property name="visible">True</property>
-- <property name="homogeneous">False</property>
-- <property name="spacing">0</property>
--
-- <child>
-- <widget class="GtkHButtonBox" id="hbuttonbox21">
-- <property name="visible">True</property>
-- <property name="layout_style">GTK_BUTTONBOX_END</property>
-- <property name="spacing">6</property>
--
-- <child>
-- <widget class="GtkButton" id="cancel-set-time-button">
-- <property name="visible">True</property>
-- <property name="can_default">True</property>
-- <property name="can_focus">True</property>
-- <property name="label">gtk-cancel</property>
-- <property name="use_stock">True</property>
-- <property name="relief">GTK_RELIEF_NORMAL</property>
-- <property name="focus_on_click">True</property>
-- </widget>
-- </child>
--
-- <child>
-- <widget class="GtkButton" id="set-time-button">
-- <property name="visible">True</property>
-- <property name="can_focus">True</property>
-- <property name="label" translatable="yes">Set System
Time</property>
-- <property name="use_underline">True</property>
-- <property name="relief">GTK_RELIEF_NORMAL</property>
-- <property name="focus_on_click">True</property>
-- </widget>
-- </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">False</property>
-- <property name="pack_type">GTK_PACK_END</property>
-- </packing>
-- </child>
-- </widget>
-- </child>
--</widget>
--
--<widget class="GtkWindow" id="find-location-window">
-- <property name="title" translatable="yes"></property>
-- <property name="type">GTK_WINDOW_TOPLEVEL</property>
-- <property name="window_position">GTK_WIN_POS_NONE</property>
-- <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="default_width">400</property>
-- <property name="default_height">500</property>
--
-- <child>
-- <widget class="GtkVBox" id="vbox25">
-- <property name="border_width">12</property>
-- <property name="visible">True</property>
-- <property name="homogeneous">False</property>
-- <property name="spacing">24</property>
--
-- <child>
-- <widget class="GtkVBox" id="vbox26">
-- <property name="visible">True</property>
-- <property name="homogeneous">False</property>
-- <property name="spacing">6</property>
--
-- <child>
-- <widget class="GtkScrolledWindow" id="scrolledwindow11">
-- <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="find-location-tree">
-- <property name="visible">True</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">False</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>
-- <property name="expand">True</property>
-- <property name="fill">True</property>
-- </packing>
-- </child>
--
-- <child>
-- <widget class="GtkHBox" id="hbox56">
-- <property name="visible">True</property>
-- <property name="homogeneous">False</property>
-- <property name="spacing">6</property>
--
-- <child>
-- <widget class="GtkLabel" id="label221">
-- <property name="visible">True</property>
-- <property name="label"
translatable="yes">_Find:</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.5</property>
-- <property name="yalign">0.5</property>
-- <property name="xpad">0</property>
-- <property name="ypad">0</property>
-- <property
name="mnemonic_widget">find-location-entry</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="GtkEntry" id="find-location-entry">
-- <property name="visible">True</property>
-- <property name="can_focus">True</property>
-- <property name="editable">True</property>
-- <property name="visibility">True</property>
-- <property name="max_length">0</property>
-- <property name="text"
translatable="yes"></property>
-- <property name="has_frame">True</property>
-- <property name="invisible_char"></property>
-- <property name="activates_default">False</property>
-- </widget>
-- <packing>
-- <property name="padding">0</property>
-- <property name="expand">True</property>
-- <property name="fill">True</property>
-- </packing>
-- </child>
--
-- <child>
-- <widget class="GtkButton" id="find-next-location-button">
-- <property name="visible">True</property>
-- <property name="can_focus">True</property>
-- <property name="relief">GTK_RELIEF_NORMAL</property>
-- <property name="focus_on_click">True</property>
--
-- <child>
-- <widget class="GtkAlignment" id="alignment31">
-- <property name="visible">True</property>
-- <property name="xalign">0.5</property>
-- <property name="yalign">0.5</property>
-- <property name="xscale">0</property>
-- <property name="yscale">0</property>
-- <property name="top_padding">0</property>
-- <property name="bottom_padding">0</property>
-- <property name="left_padding">0</property>
-- <property name="right_padding">0</property>
--
-- <child>
-- <widget class="GtkHBox" id="hbox57">
-- <property name="visible">True</property>
-- <property name="homogeneous">False</property>
-- <property name="spacing">2</property>
--
-- <child>
-- <widget class="GtkImage" id="image29">
-- <property name="visible">True</property>
-- <property name="stock">gtk-find</property>
-- <property name="icon_size">4</property>
-- <property name="xalign">0.5</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>
--
-- <child>
-- <widget class="GtkLabel" id="label222">
-- <property name="visible">True</property>
-- <property name="label" translatable="yes">Find
_Next</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.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="GtkLabel" id="label222">
-+ <property name="visible">True</property>
-+ <property name="label" translatable="yes">Find
_Next</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.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>
- </widget>
- </child>
- </widget>
-@@ -1018,7 +683,7 @@ South</property>
- <property name="spacing">0</property>
-
- <child>
-- <widget class="GtkButton"
id="find-location-cancel-button">
-+ <widget class="GtkButton"
id="find-location-cancel-buttonx">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
-@@ -1030,7 +695,7 @@ South</property>
- </child>
-
- <child>
-- <widget class="GtkButton" id="find-location-ok-button">
-+ <widget class="GtkButton" id="find-location-ok-buttonx">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
-@@ -1840,4 +1505,1060 @@ South</property>
- </child>
- </widget>
-
-+<widget class="GtkDialog" id="set-time-window">
-+ <property name="border_width">5</property>
-+ <property name="title" translatable="yes">Time
Settings</property>
-+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
-+ <property name="window_position">GTK_WIN_POS_NONE</property>
-+ <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">
-+ <widget class="GtkVBox" id="dialog-vbox2">
-+ <property name="visible">True</property>
-+ <property name="homogeneous">False</property>
-+ <property name="spacing">0</property>
-+
-+ <child internal-child="action_area">
-+ <widget class="GtkHButtonBox" id="dialog-action_area2">
-+ <property name="visible">True</property>
-+ <property name="layout_style">GTK_BUTTONBOX_END</property>
-+
-+ <child>
-+ <widget class="GtkButton" id="cancel-set-time-button">
-+ <property name="visible">True</property>
-+ <property name="can_default">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="label">gtk-cancel</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>
-+
-+ <child>
-+ <widget class="GtkButton" id="set-time-button">
-+ <property name="visible">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="label" translatable="yes">Set System
Time</property>
-+ <property name="use_underline">True</property>
-+ <property name="relief">GTK_RELIEF_NORMAL</property>
-+ <property name="focus_on_click">True</property>
-+ <property name="response_id">0</property>
-+ </widget>
-+ </child>
-+ </widget>
-+ <packing>
-+ <property name="padding">0</property>
-+ <property name="expand">False</property>
-+ <property name="fill">True</property>
-+ <property name="pack_type">GTK_PACK_END</property>
-+ </packing>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkVBox" id="vbox31">
-+ <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="label233">
-+ <property name="visible">True</property>
-+ <property name="label"
translatable="yes"><b>Time
Settings</b></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="time_settings_box">
-+ <property name="visible">True</property>
-+ <property name="homogeneous">False</property>
-+ <property name="spacing">0</property>
-+
-+ <child>
-+ <widget class="GtkLabel" id="label234">
-+ <property name="visible">True</property>
-+ <property name="label"> </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="GtkHBox" id="hbox60">
-+ <property name="visible">True</property>
-+ <property name="homogeneous">False</property>
-+ <property name="spacing">12</property>
-+
-+ <child>
-+ <widget class="GtkCalendar" id="calendar">
-+ <property name="visible">True</property>
-+ <property name="can_focus">True</property>
-+ <property
name="display_options">GTK_CALENDAR_SHOW_HEADING</property>
-+ </widget>
-+ <packing>
-+ <property name="padding">0</property>
-+ <property name="expand">True</property>
-+ <property name="fill">True</property>
-+ </packing>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkVBox" id="vbox32">
-+ <property name="visible">True</property>
-+ <property name="homogeneous">False</property>
-+ <property name="spacing">6</property>
-+
-+ <child>
-+ <widget class="GtkLabel" id="label235">
-+ <property name="visible">True</property>
-+ <property name="label" translatable="yes">Current
Time:</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="padding">0</property>
-+ <property name="expand">False</property>
-+ <property name="fill">False</property>
-+ </packing>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkLabel" id="label236">
-+ <property name="visible">True</property>
-+ <property name="label"
translatable="yes">Time:</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="padding">0</property>
-+ <property name="expand">False</property>
-+ <property name="fill">False</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="GtkVBox" id="vbox33">
-+ <property name="visible">True</property>
-+ <property name="homogeneous">False</property>
-+ <property name="spacing">6</property>
-+
-+ <child>
-+ <widget class="GtkLabel" id="current_time_label">
-+ <property name="visible">True</property>
-+ <property name="label">23:59:59</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="padding">0</property>
-+ <property name="expand">False</property>
-+ <property name="fill">False</property>
-+ </packing>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkHBox" id="hbox61">
-+ <property name="visible">True</property>
-+ <property name="homogeneous">False</property>
-+ <property name="spacing">0</property>
-+
-+ <child>
-+ <widget class="GtkSpinButton" id="hours_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">True</property>
-+ <property name="adjustment">23 0 23 1 12 12</property>
-+ </widget>
-+ <packing>
-+ <property name="padding">0</property>
-+ <property name="expand">True</property>
-+ <property name="fill">True</property>
-+ </packing>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkSpinButton" id="minutes_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">True</property>
-+ <property name="adjustment">59 0 59 1 30 30</property>
-+ </widget>
-+ <packing>
-+ <property name="padding">0</property>
-+ <property name="expand">True</property>
-+ <property name="fill">True</property>
-+ </packing>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkSpinButton" id="seconds_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">True</property>
-+ <property name="adjustment">59 0 59 1 30 30</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">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">False</property>
-+ </packing>
-+ </child>
-+ </widget>
-+ <packing>
-+ <property name="padding">0</property>
-+ <property name="expand">True</property>
-+ <property name="fill">True</property>
-+ </packing>
-+ </child>
-+ </widget>
-+ </child>
-+</widget>
-+
-+<widget class="GtkDialog" id="edit-location-window">
-+ <property name="border_width">5</property>
-+ <property name="title"></property>
-+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
-+ <property name="window_position">GTK_WIN_POS_NONE</property>
-+ <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">
-+ <widget class="GtkVBox" id="dialog-vbox3">
-+ <property name="visible">True</property>
-+ <property name="homogeneous">False</property>
-+ <property name="spacing">0</property>
-+
-+ <child internal-child="action_area">
-+ <widget class="GtkHButtonBox" id="dialog-action_area3">
-+ <property name="visible">True</property>
-+ <property name="layout_style">GTK_BUTTONBOX_END</property>
-+
-+ <child>
-+ <widget class="GtkButton"
id="edit-location-cancel-button">
-+ <property name="visible">True</property>
-+ <property name="can_default">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="label">gtk-cancel</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">-6</property>
-+ </widget>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkButton" id="edit-location-ok-button">
-+ <property name="visible">True</property>
-+ <property name="can_default">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="label">gtk-ok</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">-5</property>
-+ </widget>
-+ </child>
-+ </widget>
-+ <packing>
-+ <property name="padding">0</property>
-+ <property name="expand">False</property>
-+ <property name="fill">True</property>
-+ <property name="pack_type">GTK_PACK_END</property>
-+ </packing>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkTable" id="table26">
-+ <property name="visible">True</property>
-+ <property name="n_rows">1</property>
-+ <property name="n_columns">3</property>
-+ <property name="homogeneous">False</property>
-+ <property name="row_spacing">6</property>
-+ <property name="column_spacing">6</property>
-+
-+ <child>
-+ <widget class="GtkVBox" id="vbox34">
-+ <property name="visible">True</property>
-+ <property name="homogeneous">False</property>
-+ <property name="spacing">6</property>
-+
-+ <child>
-+ <widget class="GtkScrolledWindow" id="scrolledwindow12">
-+ <property name="visible">True</property>
-+ <property name="can_focus">True</property>
-+ <property
name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-+ <property
name="vscrollbar_policy">GTK_POLICY_NEVER</property>
-+ <property name="shadow_type">GTK_SHADOW_NONE</property>
-+ <property
name="window_placement">GTK_CORNER_TOP_LEFT</property>
-+
-+ <child>
-+ <widget class="GtkViewport" id="viewport3">
-+ <property name="visible">True</property>
-+ <property name="shadow_type">GTK_SHADOW_NONE</property>
-+
-+ <child>
-+ <widget class="GtkImage" id="image30">
-+ <property name="visible">True</property>
-+ <property name="xalign">0.5</property>
-+ <property name="yalign">0.5</property>
-+ <property name="xpad">0</property>
-+ <property name="ypad">0</property>
-+ </widget>
-+ </child>
-+ </widget>
-+ </child>
-+ </widget>
-+ <packing>
-+ <property name="padding">0</property>
-+ <property name="expand">True</property>
-+ <property name="fill">True</property>
-+ </packing>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkTable" id="table27">
-+ <property name="border_width">5</property>
-+ <property name="visible">True</property>
-+ <property name="n_rows">4</property>
-+ <property name="n_columns">4</property>
-+ <property name="homogeneous">False</property>
-+ <property name="row_spacing">6</property>
-+ <property name="column_spacing">6</property>
-+
-+ <child>
-+ <widget class="GtkVBox" id="vbox35">
-+ <property name="visible">True</property>
-+ <property name="homogeneous">True</property>
-+ <property name="spacing">6</property>
-+
-+ <child>
-+ <widget class="GtkLabel" id="label237">
-+ <property name="visible">True</property>
-+ <property name="label"
translatable="yes">Latitude:</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="padding">0</property>
-+ <property name="expand">False</property>
-+ <property name="fill">False</property>
-+ </packing>
-+ </child>
-+ </widget>
-+ <packing>
-+ <property name="left_attach">0</property>
-+ <property name="right_attach">1</property>
-+ <property name="top_attach">2</property>
-+ <property name="bottom_attach">3</property>
-+ <property name="x_options">fill</property>
-+ </packing>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkLabel" id="label238">
-+ <property name="visible">True</property>
-+ <property name="label"
translatable="yes">Longitude:</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">3</property>
-+ <property name="bottom_attach">4</property>
-+ <property name="x_options">fill</property>
-+ <property name="y_options"></property>
-+ </packing>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkEntry"
id="edit-location-longitude-entry">
-+ <property name="visible">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="editable">True</property>
-+ <property name="visibility">True</property>
-+ <property name="max_length">0</property>
-+ <property name="text"
translatable="yes"></property>
-+ <property name="has_frame">True</property>
-+ <property name="invisible_char"></property>
-+ <property name="activates_default">False</property>
-+ </widget>
-+ <packing>
-+ <property name="left_attach">1</property>
-+ <property name="right_attach">2</property>
-+ <property name="top_attach">3</property>
-+ <property name="bottom_attach">4</property>
-+ <property name="y_options"></property>
-+ </packing>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkComboBox"
id="edit-location-longitude-combo">
-+ <property name="visible">True</property>
-+ <property name="items" translatable="yes">East
-+West</property>
-+ <property name="add_tearoffs">False</property>
-+ <property name="focus_on_click">True</property>
-+ </widget>
-+ <packing>
-+ <property name="left_attach">2</property>
-+ <property name="right_attach">3</property>
-+ <property name="top_attach">3</property>
-+ <property name="bottom_attach">4</property>
-+ <property name="x_options">fill</property>
-+ <property name="y_options">fill</property>
-+ </packing>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkLabel" id="label239">
-+ <property name="visible">True</property>
-+ <property name="label"
translatable="yes"><i>(optional)</i></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="left_attach">3</property>
-+ <property name="right_attach">4</property>
-+ <property name="top_attach">3</property>
-+ <property name="bottom_attach">4</property>
-+ <property name="x_options">fill</property>
-+ <property name="y_options"></property>
-+ </packing>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkLabel" id="label240">
-+ <property name="visible">True</property>
-+ <property name="label"
translatable="yes"><i>(optional)</i></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="left_attach">3</property>
-+ <property name="right_attach">4</property>
-+ <property name="top_attach">2</property>
-+ <property name="bottom_attach">3</property>
-+ <property name="x_options">fill</property>
-+ <property name="y_options"></property>
-+ </packing>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkComboBox"
id="edit-location-latitude-combo">
-+ <property name="visible">True</property>
-+ <property name="items" translatable="yes">North
-+South</property>
-+ <property name="add_tearoffs">False</property>
-+ <property name="focus_on_click">True</property>
-+ </widget>
-+ <packing>
-+ <property name="left_attach">2</property>
-+ <property name="right_attach">3</property>
-+ <property name="top_attach">2</property>
-+ <property name="bottom_attach">3</property>
-+ <property name="x_options">fill</property>
-+ <property name="y_options">fill</property>
-+ </packing>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkEntry"
id="edit-location-latitude-entry">
-+ <property name="visible">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="editable">True</property>
-+ <property name="visibility">True</property>
-+ <property name="max_length">0</property>
-+ <property name="text"
translatable="yes"></property>
-+ <property name="has_frame">True</property>
-+ <property name="invisible_char"></property>
-+ <property name="activates_default">False</property>
-+ </widget>
-+ <packing>
-+ <property name="left_attach">1</property>
-+ <property name="right_attach">2</property>
-+ <property name="top_attach">2</property>
-+ <property name="bottom_attach">3</property>
-+ <property name="y_options"></property>
-+ </packing>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkLabel" id="label241">
-+ <property name="visible">True</property>
-+ <property name="label" translatable="yes">Location
Name:</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">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="label242">
-+ <property name="visible">True</property>
-+ <property name="label"
translatable="yes">Timezone:</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="GtkHBox" id="hbox62">
-+ <property name="visible">True</property>
-+ <property name="homogeneous">False</property>
-+ <property name="spacing">6</property>
-+
-+ <child>
-+ <widget class="GtkEntry" id="edit-location-name-entry">
-+ <property name="visible">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="editable">True</property>
-+ <property name="visibility">True</property>
-+ <property name="max_length">0</property>
-+ <property name="text"
translatable="yes"></property>
-+ <property name="has_frame">True</property>
-+ <property name="invisible_char"></property>
-+ <property name="activates_default">False</property>
-+ </widget>
-+ <packing>
-+ <property name="padding">0</property>
-+ <property name="expand">True</property>
-+ <property name="fill">True</property>
-+ </packing>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkButton" id="find-location-button">
-+ <property name="visible">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="label"
translatable="yes">Find...</property>
-+ <property name="use_underline">True</property>
-+ <property name="relief">GTK_RELIEF_NORMAL</property>
-+ <property name="focus_on_click">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="left_attach">1</property>
-+ <property name="right_attach">4</property>
-+ <property name="top_attach">0</property>
-+ <property name="bottom_attach">1</property>
-+ <property name="x_options">fill</property>
-+ <property name="y_options">fill</property>
-+ </packing>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkComboBoxEntry"
id="edit-location-timezone-combo">
-+ <property name="visible">True</property>
-+ <property name="items">Dummy Item</property>
-+ <property name="add_tearoffs">False</property>
-+ <property name="has_frame">True</property>
-+ <property name="focus_on_click">True</property>
-+ </widget>
-+ <packing>
-+ <property name="left_attach">1</property>
-+ <property name="right_attach">4</property>
-+ <property name="top_attach">1</property>
-+ <property name="bottom_attach">2</property>
-+ <property name="x_options">fill</property>
-+ <property name="y_options">fill</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="left_attach">0</property>
-+ <property name="right_attach">3</property>
-+ <property name="top_attach">0</property>
-+ <property name="bottom_attach">1</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>
-+ </widget>
-+ </child>
-+</widget>
-+
-+<widget class="GtkDialog" id="find-location-window">
-+ <property name="border_width">5</property>
-+ <property name="title" translatable="yes"></property>
-+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
-+ <property name="window_position">GTK_WIN_POS_NONE</property>
-+ <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">
-+ <widget class="GtkVBox" id="dialog-vbox4">
-+ <property name="visible">True</property>
-+ <property name="homogeneous">False</property>
-+ <property name="spacing">0</property>
-+
-+ <child internal-child="action_area">
-+ <widget class="GtkHButtonBox" id="dialog-action_area4">
-+ <property name="visible">True</property>
-+ <property name="layout_style">GTK_BUTTONBOX_END</property>
-+
-+ <child>
-+ <widget class="GtkButton"
id="find-location-cancel-button">
-+ <property name="visible">True</property>
-+ <property name="can_default">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="label">gtk-cancel</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">-6</property>
-+ </widget>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkButton" id="find-location-ok-button">
-+ <property name="visible">True</property>
-+ <property name="can_default">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="label">gtk-ok</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">-5</property>
-+ </widget>
-+ </child>
-+ </widget>
-+ <packing>
-+ <property name="padding">0</property>
-+ <property name="expand">False</property>
-+ <property name="fill">True</property>
-+ <property name="pack_type">GTK_PACK_END</property>
-+ </packing>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkVBox" id="vbox36">
-+ <property name="border_width">5</property>
-+ <property name="visible">True</property>
-+ <property name="homogeneous">False</property>
-+ <property name="spacing">6</property>
-+
-+ <child>
-+ <widget class="GtkScrolledWindow" id="scrolledwindow13">
-+ <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="find-location-tree">
-+ <property name="visible">True</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">False</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>
-+ <property name="expand">True</property>
-+ <property name="fill">True</property>
-+ </packing>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkHBox" id="hbox63">
-+ <property name="visible">True</property>
-+ <property name="homogeneous">False</property>
-+ <property name="spacing">6</property>
-+
-+ <child>
-+ <widget class="GtkLabel" id="label243">
-+ <property name="visible">True</property>
-+ <property name="label"
translatable="yes">_Find:</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.5</property>
-+ <property name="yalign">0.5</property>
-+ <property name="xpad">0</property>
-+ <property name="ypad">0</property>
-+ <property
name="mnemonic_widget">find-location-entry</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="GtkEntry" id="find-location-entry">
-+ <property name="visible">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="editable">True</property>
-+ <property name="visibility">True</property>
-+ <property name="max_length">0</property>
-+ <property name="text"
translatable="yes"></property>
-+ <property name="has_frame">True</property>
-+ <property name="invisible_char"></property>
-+ <property name="activates_default">False</property>
-+ </widget>
-+ <packing>
-+ <property name="padding">0</property>
-+ <property name="expand">True</property>
-+ <property name="fill">True</property>
-+ </packing>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkButton" id="find-next-location-button">
-+ <property name="visible">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="relief">GTK_RELIEF_NORMAL</property>
-+ <property name="focus_on_click">True</property>
-+
-+ <child>
-+ <widget class="GtkAlignment" id="alignment35">
-+ <property name="visible">True</property>
-+ <property name="xalign">0.5</property>
-+ <property name="yalign">0.5</property>
-+ <property name="xscale">0</property>
-+ <property name="yscale">0</property>
-+ <property name="top_padding">0</property>
-+ <property name="bottom_padding">0</property>
-+ <property name="left_padding">0</property>
-+ <property name="right_padding">0</property>
-+
-+ <child>
-+ <widget class="GtkHBox" id="hbox64">
-+ <property name="visible">True</property>
-+ <property name="homogeneous">False</property>
-+ <property name="spacing">2</property>
-+
-+ <child>
-+ <widget class="GtkImage" id="image31">
-+ <property name="visible">True</property>
-+ <property name="stock">gtk-find</property>
-+ <property name="icon_size">4</property>
-+ <property name="xalign">0.5</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>
-+
-+ <child>
-+ <widget class="GtkLabel" id="label244">
-+ <property name="visible">True</property>
-+ <property name="label" translatable="yes">Find
_Next</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.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>
-+ </widget>
-+ </child>
-+ </widget>
-+ </child>
-+ </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>
-+ <property name="expand">False</property>
-+ <property name="fill">False</property>
-+ </packing>
-+ </child>
-+ </widget>
-+ <packing>
-+ <property name="padding">0</property>
-+ <property name="expand">True</property>
-+ <property name="fill">True</property>
-+ </packing>
-+ </child>
-+ </widget>
-+ </child>
-+</widget>
-+
- </glade-interface>
diff --git a/sources b/sources
index a3f1a66..e57c770 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bf89eb75655557c6a1ab9dbd37f028a6 gnome-panel-2.22.1.2.tar.bz2
+315e85cbd56c838d538fefe7f4aa9868 gnome-panel-2.23.1.tar.bz2
diff --git a/timezone-64.patch b/timezone-64.patch
deleted file mode 100644
index 5b4d304..0000000
--- a/timezone-64.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-diff -up gnome-panel-2.22.1.2/applets/clock/system-timezone.c.timezone-64
gnome-panel-2.22.1.2/applets/clock/system-timezone.c
---- gnome-panel-2.22.1.2/applets/clock/system-timezone.c.timezone-64 2008-04-10
08:38:24.000000000 -0400
-+++ gnome-panel-2.22.1.2/applets/clock/system-timezone.c 2008-04-22 12:38:10.000000000
-0400
-@@ -443,14 +443,14 @@ system_timezone_write_key_file (const ch
- const char *value,
- GError **error)
- {
-- GError *our_error;
-- char *content;
-- unsigned int len;
-- char *key_eq;
-- char **lines;
-- gboolean replaced;
-- gboolean retval;
-- int n;
-+ GError *our_error;
-+ char *content;
-+ gsize len;
-+ char *key_eq;
-+ char **lines;
-+ gboolean replaced;
-+ gboolean retval;
-+ int n;
-
- if (!g_file_test (filename, G_FILE_TEST_IS_REGULAR))
- return TRUE;
-@@ -613,16 +613,16 @@ system_timezone_read_etc_localtime_softl
- return tz;
- }
-
--typedef gboolean (*CompareFiles) (struct stat *a_stat,
-- struct stat *b_stat,
-- const char *a_content,
-- unsigned int a_content_len,
-- const char *b_filename);
-+typedef gboolean (*CompareFiles) (struct stat *a_stat,
-+ struct stat *b_stat,
-+ const char *a_content,
-+ gsize a_content_len,
-+ const char *b_filename);
-
- static char *
- recursive_compare (struct stat *localtime_stat,
- const char *localtime_content,
-- unsigned int localtime_content_len,
-+ gsize localtime_content_len,
- char *file,
- CompareFiles compare_func)
- {
-@@ -675,11 +675,11 @@ recursive_compare (struct stat *localti
-
-
- static gboolean
--files_are_identical_inode (struct stat *a_stat,
-- struct stat *b_stat,
-- const char *a_content,
-- unsigned int a_content_len,
-- const char *b_filename)
-+files_are_identical_inode (struct stat *a_stat,
-+ struct stat *b_stat,
-+ const char *a_content,
-+ gsize a_content_len,
-+ const char *b_filename)
- {
- return (a_stat->st_ino == b_stat->st_ino);
- }
-@@ -706,15 +706,15 @@ system_timezone_read_etc_localtime_hardl
- }
-
- static gboolean
--files_are_identical_content (struct stat *a_stat,
-- struct stat *b_stat,
-- const char *a_content,
-- unsigned int a_content_len,
-- const char *b_filename)
--{
-- char *b_content = NULL;
-- unsigned int b_content_len = -1;
-- int cmp;
-+files_are_identical_content (struct stat *a_stat,
-+ struct stat *b_stat,
-+ const char *a_content,
-+ gsize a_content_len,
-+ const char *b_filename)
-+{
-+ char *b_content = NULL;
-+ gsize b_content_len = -1;
-+ int cmp;
-
- if (a_stat->st_size != b_stat->st_size)
- return FALSE;
-@@ -740,7 +740,7 @@ system_timezone_read_etc_localtime_conte
- {
- struct stat stat_localtime;
- char *localtime_content = NULL;
-- unsigned int localtime_content_len = -1;
-+ gsize localtime_content_len = -1;
-
- if (g_stat (ETC_LOCALTIME, &stat_localtime) != 0)
- return NULL;
-@@ -819,11 +819,11 @@ static gboolean
- system_timezone_is_zone_file_valid (const char *zone_file,
- GError **error)
- {
-- GError *our_error;
-- GIOChannel *channel;
-- GIOStatus status;
-- char buffer[strlen (TZ_MAGIC)];
-- unsigned int read;
-+ GError *our_error;
-+ GIOChannel *channel;
-+ GIOStatus status;
-+ char buffer[strlen (TZ_MAGIC)];
-+ gsize read;
-
- /* First, check the zone_file is properly rooted */
- if (!g_str_has_prefix (zone_file, SYSTEM_ZONEINFODIR"/")) {
-@@ -878,9 +878,9 @@ static gboolean
- system_timezone_set_etc_timezone (const char *zone_file,
- GError **error)
- {
-- GError *our_error;
-- char *content;
-- unsigned int len;
-+ GError *our_error;
-+ char *content;
-+ gsize len;
-
- if (!system_timezone_is_zone_file_valid (zone_file, error))
- return FALSE;
commit 6b73ecb777163636fdacd7634be05a2c98dcd939
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Apr 23 14:20:50 2008 +0000
clean up patch
diff --git a/gnome-panel.spec b/gnome-panel.spec
index dbcf97f..857677f 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.22.1.2
-Release: 5%{?dist}
+Release: 6%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.22/%{name}-%{version}.tar...
@@ -368,6 +368,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Wed Apr 23 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.1.2-6
+- Remove an erroneous addition in the last patch
+
* Tue Apr 22 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.1.2-5
- Add another patch that may fix timezone setting problems (#443415)
diff --git a/timezone-debug.patch b/timezone-debug.patch
index d7fbf43..39d4735 100644
--- a/timezone-debug.patch
+++ b/timezone-debug.patch
@@ -1,13 +1,12 @@
-diff -up gnome-panel-2.22.1.2/applets/clock/system-timezone.c.debug
gnome-panel-2.22.1.2/applets/clock/system-timezone.c
---- gnome-panel-2.22.1.2/applets/clock/system-timezone.c.debug 2008-04-22
19:22:48.000000000 -0400
-+++ gnome-panel-2.22.1.2/applets/clock/system-timezone.c 2008-04-22 20:16:44.000000000
-0400
-@@ -863,7 +863,8 @@ system_timezone_is_zone_file_valid (cons
+diff -up gnome-panel-2.22.1.2/applets/clock/system-timezone.c.timezone-debug
gnome-panel-2.22.1.2/applets/clock/system-timezone.c
+--- gnome-panel-2.22.1.2/applets/clock/system-timezone.c.timezone-debug 2008-04-22
20:17:15.000000000 -0400
++++ gnome-panel-2.22.1.2/applets/clock/system-timezone.c 2008-04-23 10:05:34.000000000
-0400
+@@ -863,7 +863,7 @@ system_timezone_is_zone_file_valid (cons
return FALSE;
}
- if (read != 4 || strcmp (buffer, TZ_MAGIC) != 0) {
+ if (read != strlen (TZ_MAGIC) || strncmp (buffer, TZ_MAGIC, strlen (TZ_MAGIC))
!= 0) {
-+ buffer[read] = 0;
g_set_error (error, SYSTEM_TIMEZONE_ERROR,
SYSTEM_TIMEZONE_ERROR_INVALID_TIMEZONE_FILE,
"%s is not a timezone file",
commit 02c4cb5f41f489729f7853596dda3cf09a1d32e0
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Apr 23 01:59:16 2008 +0000
try to fix a timezone setting problem
diff --git a/gnome-panel.spec b/gnome-panel.spec
index f41d676..dbcf97f 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.22.1.2
-Release: 4%{?dist}
+Release: 5%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.22/%{name}-%{version}.tar...
@@ -127,6 +127,7 @@ Patch33: gnome-panel-use-gio.patch
Patch34: gnome-panel-launch-with-gio.patch
# fixed in upstream svn
Patch35: timezone-64.patch
+Patch36: timezone-debug.patch
Conflicts: gnome-power-manager < 2.15.3
@@ -182,6 +183,7 @@ Panel Applets using the libpanel-applet library.
%patch33 -p1 -b .use-gio
%patch34 -p1 -b .launch-with-gio
%patch35 -p1 -b .timezone-64
+%patch36 -p1 -b .timezone-debug
. %{SOURCE6}
@@ -366,6 +368,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Tue Apr 22 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.1.2-5
+- Add another patch that may fix timezone setting problems (#443415)
+
* Fri Apr 18 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.1.2-4
- Use gio to open places
- Fix a 64bit issue with timezone handling in the clock
diff --git a/timezone-debug.patch b/timezone-debug.patch
new file mode 100644
index 0000000..d7fbf43
--- /dev/null
+++ b/timezone-debug.patch
@@ -0,0 +1,13 @@
+diff -up gnome-panel-2.22.1.2/applets/clock/system-timezone.c.debug
gnome-panel-2.22.1.2/applets/clock/system-timezone.c
+--- gnome-panel-2.22.1.2/applets/clock/system-timezone.c.debug 2008-04-22
19:22:48.000000000 -0400
++++ gnome-panel-2.22.1.2/applets/clock/system-timezone.c 2008-04-22 20:16:44.000000000
-0400
+@@ -863,7 +863,8 @@ system_timezone_is_zone_file_valid (cons
+ return FALSE;
+ }
+
+- if (read != 4 || strcmp (buffer, TZ_MAGIC) != 0) {
++ if (read != strlen (TZ_MAGIC) || strncmp (buffer, TZ_MAGIC, strlen (TZ_MAGIC))
!= 0) {
++ buffer[read] = 0;
+ g_set_error (error, SYSTEM_TIMEZONE_ERROR,
+ SYSTEM_TIMEZONE_ERROR_INVALID_TIMEZONE_FILE,
+ "%s is not a timezone file",
commit 79c3e1be83d648edcfc01031c4ac40ba5c113872
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Apr 22 16:45:44 2008 +0000
another forgotten patch
diff --git a/gnome-panel-use-gio.patch b/gnome-panel-use-gio.patch
new file mode 100644
index 0000000..dcf1036
--- /dev/null
+++ b/gnome-panel-use-gio.patch
@@ -0,0 +1,15 @@
+diff -up gnome-panel-2.22.1.2/gnome-panel/panel-menu-items.c.use-gio
gnome-panel-2.22.1.2/gnome-panel/panel-menu-items.c
+--- gnome-panel-2.22.1.2/gnome-panel/panel-menu-items.c.use-gio 2008-04-18
22:48:16.000000000 -0400
++++ gnome-panel-2.22.1.2/gnome-panel/panel-menu-items.c 2008-04-18 22:53:10.000000000
-0400
+@@ -125,8 +125,9 @@ activate_uri (GtkWidget *menuitem,
+
+ command = g_strdup_printf ("nautilus --no-desktop %s", url);
+ gdk_spawn_command_line_on_screen (screen, command, &error);
+- } else
+- gnome_url_show_on_screen (url, screen, &error);
++ } else
++ g_app_info_launch_default_for_uri (url, NULL, &error);
++ //gnome_url_show_on_screen (url, screen, &error);
+
+ if (error != NULL) {
+ if (error->code != GNOME_URL_ERROR_CANCELLED) {
commit 81528cf3027732d302da54a7e78735e0dfb1f41c
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Apr 22 16:40:58 2008 +0000
fix patch
diff --git a/timezone-64.patch b/timezone-64.patch
index 42f710b..5b4d304 100644
--- a/timezone-64.patch
+++ b/timezone-64.patch
@@ -1,6 +1,7 @@
---- trunk/applets/clock/system-timezone.c 2008/04/11 12:11:19 11053
-+++ trunk/applets/clock/system-timezone.c 2008/04/11 13:11:59 11054
-@@ -447,14 +447,14 @@
+diff -up gnome-panel-2.22.1.2/applets/clock/system-timezone.c.timezone-64
gnome-panel-2.22.1.2/applets/clock/system-timezone.c
+--- gnome-panel-2.22.1.2/applets/clock/system-timezone.c.timezone-64 2008-04-10
08:38:24.000000000 -0400
++++ gnome-panel-2.22.1.2/applets/clock/system-timezone.c 2008-04-22 12:38:10.000000000
-0400
+@@ -443,14 +443,14 @@ system_timezone_write_key_file (const ch
const char *value,
GError **error)
{
@@ -23,7 +24,7 @@
if (!g_file_test (filename, G_FILE_TEST_IS_REGULAR))
return TRUE;
-@@ -647,16 +647,16 @@
+@@ -613,16 +613,16 @@ system_timezone_read_etc_localtime_softl
return tz;
}
@@ -46,7 +47,7 @@
char *file,
CompareFiles compare_func)
{
-@@ -709,11 +709,11 @@
+@@ -675,11 +675,11 @@ recursive_compare (struct stat *localti
static gboolean
@@ -63,7 +64,7 @@
{
return (a_stat->st_ino == b_stat->st_ino);
}
-@@ -740,15 +740,15 @@
+@@ -706,15 +706,15 @@ system_timezone_read_etc_localtime_hardl
}
static gboolean
@@ -88,22 +89,16 @@
if (a_stat->st_size != b_stat->st_size)
return FALSE;
-@@ -772,10 +772,10 @@
- static char *
- system_timezone_read_etc_localtime_content (void)
+@@ -740,7 +740,7 @@ system_timezone_read_etc_localtime_conte
{
-- struct stat stat_localtime;
-- char *localtime_content = NULL;
+ struct stat stat_localtime;
+ char *localtime_content = NULL;
- unsigned int localtime_content_len = -1;
-- char *retval;
-+ struct stat stat_localtime;
-+ char *localtime_content = NULL;
-+ gsize localtime_content_len = -1;
-+ char *retval;
++ gsize localtime_content_len = -1;
if (g_stat (ETC_LOCALTIME, &stat_localtime) != 0)
return NULL;
-@@ -866,11 +866,11 @@
+@@ -819,11 +819,11 @@ static gboolean
system_timezone_is_zone_file_valid (const char *zone_file,
GError **error)
{
@@ -120,7 +115,7 @@
/* First, check the zone_file is properly rooted */
if (!g_str_has_prefix (zone_file, SYSTEM_ZONEINFODIR"/")) {
-@@ -925,9 +925,9 @@
+@@ -878,9 +878,9 @@ static gboolean
system_timezone_set_etc_timezone (const char *zone_file,
GError **error)
{
commit 2eabe4caedcd66c9fff44a21d3f120068f5a3dfb
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Apr 22 16:11:33 2008 +0000
grr, finally
diff --git a/gnome-panel-launch-with-gio.patch b/gnome-panel-launch-with-gio.patch
new file mode 100644
index 0000000..fbe354b
--- /dev/null
+++ b/gnome-panel-launch-with-gio.patch
@@ -0,0 +1,127 @@
+diff -up gnome-panel-2.22.1.2/gnome-panel/panel-menu-items.c.launch-with-gio
gnome-panel-2.22.1.2/gnome-panel/panel-menu-items.c
+--- gnome-panel-2.22.1.2/gnome-panel/panel-menu-items.c.launch-with-gio 2008-04-20
23:54:37.000000000 -0400
++++ gnome-panel-2.22.1.2/gnome-panel/panel-menu-items.c 2008-04-20 23:54:37.000000000
-0400
+@@ -41,6 +41,7 @@
+
+ #include <libgnome/gnome-url.h>
+ #include <libgnomeui/gnome-url.h>
++#include <libgnomeui/gnome-password-dialog.h>
+
+ #include "menu.h"
+ #include "panel-action-button.h"
+@@ -96,6 +97,51 @@ struct _PanelDesktopMenuItemPrivate {
+ guint append_lock_logout : 1;
+ };
+
++typedef struct {
++ GMountOperation *mount_op;
++ GdkScreen *screen;
++} MountOperationHandle;
++
++static void
++mount_async_callback (GObject *source_object,
++ GAsyncResult *result,
++ gpointer user_data)
++{
++ GError *error = NULL;
++ GFile *file;
++ MountOperationHandle *handle = user_data;
++
++ file = G_FILE (source_object);
++ if (g_file_mount_enclosing_volume_finish (file, result, &error)) {
++ char *uri = g_file_get_uri (file);
++ // FIXME use an app launch context
++ g_app_info_launch_default_for_uri (uri, NULL, &error);
++ g_free (uri);
++ }
++ else {
++ if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED) &&
++ !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_FAILED_HANDLED)) {
++ char *primary, *escaped, *url;
++ url = g_file_get_uri (file);
++ escaped = g_markup_escape_text (url, -1);
++ g_free (url);
++ primary = g_strdup_printf (_("Could not open location '%s'"),
++ escaped);
++ g_free (escaped);
++ panel_error_dialog (NULL, handle->screen,
++ "cannot_show_url", TRUE,
++ primary, error->message);
++ g_free (primary);
++ }
++ g_error_free (error);
++ }
++
++ if (handle->mount_op)
++ g_object_unref (handle->mount_op);
++
++ g_free (handle);
++}
++
+ static void
+ activate_uri (GtkWidget *menuitem,
+ const char *path)
+@@ -125,12 +171,28 @@ activate_uri (GtkWidget *menuitem,
+
+ command = g_strdup_printf ("nautilus --no-desktop %s", url);
+ gdk_spawn_command_line_on_screen (screen, command, &error);
+- } else
++ } else {
++ // FIXME use an app launch context
+ g_app_info_launch_default_for_uri (url, NULL, &error);
+- //gnome_url_show_on_screen (url, screen, &error);
++ }
+
+ if (error != NULL) {
+- if (error->code != GNOME_URL_ERROR_CANCELLED) {
++ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_NOT_MOUNTED)) {
++ MountOperationHandle *handle;
++
++ handle = g_new (MountOperationHandle, 1);
++ file = g_file_new_for_uri (url);
++
++ /* If it's not mounted, try to mount it ourselves */
++ handle->mount_op = panel_mount_operation_new (NULL);
++ handle->screen = screen;
++
++ g_file_mount_enclosing_volume (file, G_MOUNT_MOUNT_NONE, handle->mount_op,
++ NULL, mount_async_callback, handle);
++ g_object_unref (file);
++
++ }
++ else {
+ char *primary;
+ escaped = g_markup_escape_text (url, -1);
+ primary = g_strdup_printf (_("Could not open location '%s'"),
+diff -up gnome-panel-2.22.1.2/gnome-panel/panel-mount-operation.c.launch-with-gio
gnome-panel-2.22.1.2/gnome-panel/panel-mount-operation.c
+--- gnome-panel-2.22.1.2/gnome-panel/panel-mount-operation.c.launch-with-gio 2008-04-21
00:10:20.000000000 -0400
++++ gnome-panel-2.22.1.2/gnome-panel/panel-mount-operation.c 2008-04-21
00:13:35.000000000 -0400
+@@ -102,6 +102,18 @@ password_dialog_button_clicked (GtkDialo
+ anon = gnome_password_dialog_anon_selected (gpd);
+ g_mount_operation_set_anonymous (op, anon);
+
++ switch (gnome_password_dialog_get_remember (gpd)) {
++ case GNOME_PASSWORD_DIALOG_REMEMBER_NOTHING:
++ g_mount_operation_set_password_save (op, G_PASSWORD_SAVE_NEVER);
++ break;
++ case GNOME_PASSWORD_DIALOG_REMEMBER_SESSION:
++ g_mount_operation_set_password_save (op, G_PASSWORD_SAVE_FOR_SESSION);
++ break;
++ case GNOME_PASSWORD_DIALOG_REMEMBER_FOREVER:
++ g_mount_operation_set_password_save (op, G_PASSWORD_SAVE_PERMANENTLY);
++ break;
++ }
++
+ g_mount_operation_reply (op, G_MOUNT_OPERATION_HANDLED);
+ } else {
+ g_mount_operation_reply (op, G_MOUNT_OPERATION_ABORTED);
+@@ -136,6 +148,9 @@ ask_password (GMountOperation *op,
+ flags & G_ASK_PASSWORD_NEED_DOMAIN);
+ gnome_password_dialog_set_show_userpass_buttons (GNOME_PASSWORD_DIALOG (dialog),
+ flags & G_ASK_PASSWORD_ANONYMOUS_SUPPORTED);
++ gnome_password_dialog_set_show_remember (GNOME_PASSWORD_DIALOG (dialog),
++ flags & G_ASK_PASSWORD_SAVING_SUPPORTED);
++
+ if (default_domain) {
+ gnome_password_dialog_set_domain (GNOME_PASSWORD_DIALOG (dialog),
+ default_domain);
diff --git a/gnome-panel.spec b/gnome-panel.spec
index e79f409..f41d676 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.22.1.2
-Release: 3%{?dist}
+Release: 4%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.22/%{name}-%{version}.tar...
@@ -122,6 +122,12 @@ Patch31: clock2.patch
Patch32: clock-help.patch
+Patch33: gnome-panel-use-gio.patch
+#
http://bugzilla.gnome.org/show_bug.cgi?id=529243
+Patch34: gnome-panel-launch-with-gio.patch
+# fixed in upstream svn
+Patch35: timezone-64.patch
+
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -173,6 +179,9 @@ Panel Applets using the libpanel-applet library.
%patch30 -p1 -b .clock1
%patch31 -p1 -b .clock2
%patch32 -p1 -b .clock-help
+%patch33 -p1 -b .use-gio
+%patch34 -p1 -b .launch-with-gio
+%patch35 -p1 -b .timezone-64
. %{SOURCE6}
@@ -357,6 +366,10 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Fri Apr 18 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.1.2-4
+- Use gio to open places
+- Fix a 64bit issue with timezone handling in the clock
+
* Fri Apr 18 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.1.2-3
- Move the trash applet back where it belongs, to the corner (#439416)
diff --git a/timezone-64.patch b/timezone-64.patch
new file mode 100644
index 0000000..42f710b
--- /dev/null
+++ b/timezone-64.patch
@@ -0,0 +1,135 @@
+--- trunk/applets/clock/system-timezone.c 2008/04/11 12:11:19 11053
++++ trunk/applets/clock/system-timezone.c 2008/04/11 13:11:59 11054
+@@ -447,14 +447,14 @@
+ const char *value,
+ GError **error)
+ {
+- GError *our_error;
+- char *content;
+- unsigned int len;
+- char *key_eq;
+- char **lines;
+- gboolean replaced;
+- gboolean retval;
+- int n;
++ GError *our_error;
++ char *content;
++ gsize len;
++ char *key_eq;
++ char **lines;
++ gboolean replaced;
++ gboolean retval;
++ int n;
+
+ if (!g_file_test (filename, G_FILE_TEST_IS_REGULAR))
+ return TRUE;
+@@ -647,16 +647,16 @@
+ return tz;
+ }
+
+-typedef gboolean (*CompareFiles) (struct stat *a_stat,
+- struct stat *b_stat,
+- const char *a_content,
+- unsigned int a_content_len,
+- const char *b_filename);
++typedef gboolean (*CompareFiles) (struct stat *a_stat,
++ struct stat *b_stat,
++ const char *a_content,
++ gsize a_content_len,
++ const char *b_filename);
+
+ static char *
+ recursive_compare (struct stat *localtime_stat,
+ const char *localtime_content,
+- unsigned int localtime_content_len,
++ gsize localtime_content_len,
+ char *file,
+ CompareFiles compare_func)
+ {
+@@ -709,11 +709,11 @@
+
+
+ static gboolean
+-files_are_identical_inode (struct stat *a_stat,
+- struct stat *b_stat,
+- const char *a_content,
+- unsigned int a_content_len,
+- const char *b_filename)
++files_are_identical_inode (struct stat *a_stat,
++ struct stat *b_stat,
++ const char *a_content,
++ gsize a_content_len,
++ const char *b_filename)
+ {
+ return (a_stat->st_ino == b_stat->st_ino);
+ }
+@@ -740,15 +740,15 @@
+ }
+
+ static gboolean
+-files_are_identical_content (struct stat *a_stat,
+- struct stat *b_stat,
+- const char *a_content,
+- unsigned int a_content_len,
+- const char *b_filename)
+-{
+- char *b_content = NULL;
+- unsigned int b_content_len = -1;
+- int cmp;
++files_are_identical_content (struct stat *a_stat,
++ struct stat *b_stat,
++ const char *a_content,
++ gsize a_content_len,
++ const char *b_filename)
++{
++ char *b_content = NULL;
++ gsize b_content_len = -1;
++ int cmp;
+
+ if (a_stat->st_size != b_stat->st_size)
+ return FALSE;
+@@ -772,10 +772,10 @@
+ static char *
+ system_timezone_read_etc_localtime_content (void)
+ {
+- struct stat stat_localtime;
+- char *localtime_content = NULL;
+- unsigned int localtime_content_len = -1;
+- char *retval;
++ struct stat stat_localtime;
++ char *localtime_content = NULL;
++ gsize localtime_content_len = -1;
++ char *retval;
+
+ if (g_stat (ETC_LOCALTIME, &stat_localtime) != 0)
+ return NULL;
+@@ -866,11 +866,11 @@
+ system_timezone_is_zone_file_valid (const char *zone_file,
+ GError **error)
+ {
+- GError *our_error;
+- GIOChannel *channel;
+- GIOStatus status;
+- char buffer[strlen (TZ_MAGIC)];
+- unsigned int read;
++ GError *our_error;
++ GIOChannel *channel;
++ GIOStatus status;
++ char buffer[strlen (TZ_MAGIC)];
++ gsize read;
+
+ /* First, check the zone_file is properly rooted */
+ if (!g_str_has_prefix (zone_file, SYSTEM_ZONEINFODIR"/")) {
+@@ -925,9 +925,9 @@
+ system_timezone_set_etc_timezone (const char *zone_file,
+ GError **error)
+ {
+- GError *our_error;
+- char *content;
+- unsigned int len;
++ GError *our_error;
++ char *content;
++ gsize len;
+
+ if (!system_timezone_is_zone_file_valid (zone_file, error))
+ return FALSE;
commit 4cd096a0eb67c2493ba809e8422818513e02bb7a
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Apr 18 14:30:37 2008 +0000
fix positioning of trash applet
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 2230059..e79f409 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.22.1.2
-Release: 2%{?dist}
+Release: 3%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.22/%{name}-%{version}.tar...
@@ -357,6 +357,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Fri Apr 18 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.1.2-3
+- Move the trash applet back where it belongs, to the corner (#439416)
+
* Wed Apr 16 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.1.2-2
- Make help buttons work in clock preferences
diff --git a/redhat-panel-default-setup.entries b/redhat-panel-default-setup.entries
index b065d83..83a6c13 100644
--- a/redhat-panel-default-setup.entries
+++ b/redhat-panel-default-setup.entries
@@ -735,7 +735,7 @@
<key>applets/workspace_switcher/position</key>
<schema_key>/schemas/apps/panel/objects/position</schema_key>
<value>
- <int>0</int>
+ <int>1</int>
</value>
</entry>
<entry>
commit ab6573ed2f34bd375391da5864ab826fbd08d703
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Apr 17 01:33:07 2008 +0000
forgotten patch
diff --git a/clock-help.patch b/clock-help.patch
new file mode 100644
index 0000000..6d81ebb
--- /dev/null
+++ b/clock-help.patch
@@ -0,0 +1,65 @@
+diff -up gnome-panel-2.22.1.2/applets/clock/clock.c.clock-help
gnome-panel-2.22.1.2/applets/clock/clock.c
+--- gnome-panel-2.22.1.2/applets/clock/clock.c.clock-help 2008-04-16 21:23:29.000000000
-0400
++++ gnome-panel-2.22.1.2/applets/clock/clock.c 2008-04-16 21:23:33.000000000 -0400
+@@ -2954,21 +2954,6 @@ set_custom_format_cb (GtkEntry *entry,
+ }
+
+ static void
+-properties_response_cb (GtkWidget *widget,
+- int id,
+- ClockData *cd)
+-{
+- /* FMQ: was used from old preferences dialog; fix this up */
+-
+- if (id == GTK_RESPONSE_HELP)
+- clock_utils_display_help (cd->applet,
+- "clock", "clock", "clock-settings");
+-
+- else
+- gtk_widget_destroy (widget);
+-}
+-
+-static void
+ prefs_locations_changed (GtkTreeSelection *selection, ClockData *cd)
+ {
+ gint n;
+@@ -3693,6 +3678,13 @@ prefs_hide_event (GtkWidget *widget, Gdk
+ return TRUE;
+ }
+
++static void
++prefs_help (GtkWidget *widget, ClockData *cd)
++{
++ clock_utils_display_help (cd->applet,
++ "clock", "clock", "clock-settings");
++}
++
+ typedef struct {
+ const gchar *name;
+ const gchar *country_code;
+@@ -4147,6 +4139,7 @@ ensure_prefs_window_is_created (ClockDat
+ {
+ GtkWidget *edit_window;
+ GtkWidget *prefs_close_button;
++ GtkWidget *prefs_help_button;
+ GtkWidget *edit_cancel_button;
+ GtkWidget *edit_ok_button;
+ GtkWidget *zone_combo;
+@@ -4163,6 +4156,7 @@ ensure_prefs_window_is_created (ClockDat
+ gtk_window_set_icon_name (GTK_WINDOW (cd->prefs_window), CLOCK_ICON);
+
+ prefs_close_button = glade_xml_get_widget (cd->glade_xml,
"prefs-close-button");
++ prefs_help_button = glade_xml_get_widget (cd->glade_xml,
"prefs-help-button");
+ cd->prefs_locations = GTK_TREE_VIEW (glade_xml_get_widget (cd->glade_xml,
"cities_list"));
+
+ selection = gtk_tree_view_get_selection (cd->prefs_locations);
+@@ -4175,6 +4169,9 @@ ensure_prefs_window_is_created (ClockDat
+ g_signal_connect (G_OBJECT (prefs_close_button), "clicked",
+ G_CALLBACK (prefs_hide), cd);
+
++ g_signal_connect (G_OBJECT (prefs_help_button), "clicked",
++ G_CALLBACK (prefs_help), cd);
++
+ cd->prefs_location_remove_button = glade_xml_get_widget (cd->glade_xml,
"prefs-locations-remove-button");
+
+ g_signal_connect (G_OBJECT (cd->prefs_location_remove_button),
"clicked",
commit 4d40a771e2409b0ded51b6e4fb581347ed41e696
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Apr 17 01:27:43 2008 +0000
Make the help button in the clock preferences work
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 500d1ed..2230059 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.22.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.22/%{name}-%{version}.tar...
@@ -120,6 +120,8 @@ Patch28: gnome-panel-larger-find-window.patch
Patch30: clock1.patch
Patch31: clock2.patch
+Patch32: clock-help.patch
+
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -170,6 +172,7 @@ Panel Applets using the libpanel-applet library.
%patch28 -p1 -b .larger-find-window
%patch30 -p1 -b .clock1
%patch31 -p1 -b .clock2
+%patch32 -p1 -b .clock-help
. %{SOURCE6}
@@ -354,6 +357,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Wed Apr 16 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.1.2-2
+- Make help buttons work in clock preferences
+
* Thu Apr 10 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.1.2-1
- Update to 2.22.1.2 (significant performance and usability
improvements for the clock applet)
commit 82c1d107872b66da851c30bc6d6bcfc3ac3874d8
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Apr 11 03:43:51 2008 +0000
new sources
diff --git a/.cvsignore b/.cvsignore
index e8cd7f1..a724782 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.22.1.1.tar.bz2
+gnome-panel-2.22.1.2.tar.bz2
diff --git a/sources b/sources
index 6a8fb0c..a3f1a66 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c80f265af2dd009917aece662fd6ab37 gnome-panel-2.22.1.1.tar.bz2
+bf89eb75655557c6a1ab9dbd37f028a6 gnome-panel-2.22.1.2.tar.bz2
commit b2fc09da7999ce2e48bbcf2a58d0bb58f95acb56
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Apr 11 03:40:07 2008 +0000
2.22.1.2
diff --git a/clock1.patch b/clock1.patch
new file mode 100644
index 0000000..df895f0
--- /dev/null
+++ b/clock1.patch
@@ -0,0 +1,108 @@
+--- trunk/applets/clock/clock.c 2008/04/10 13:05:02 11046
++++ trunk/applets/clock/clock.c 2008/04/10 16:25:30 11047
+@@ -2208,7 +2208,11 @@
+ return;
+ }
+
+- loc = clock_location_new (name, timezone, latitude, longitude, code,
&prefs);
++ loc = clock_location_find_and_ref (cd->locations, name, timezone,
++ latitude, longitude, code);
++ if (!loc)
++ loc = clock_location_new (name, timezone,
++ latitude, longitude, code, &prefs);
+
+ if (current && clock_location_is_current_timezone (loc))
+ clock_location_make_current (loc, NULL, NULL, NULL);
+@@ -3087,9 +3091,10 @@
+ clock_location_is_current (loc);
+
+ cd->locations = g_list_append (cd->locations, loc);
+- locations_changed (cd);
+ }
+
++ /* This will update everything related to locations to take into
++ * account the new location (via the gconf notification) */
+ save_cities_store (cd);
+
+ edit_hide (edit_window, cd);
+@@ -3828,12 +3833,11 @@
+ ClockLocation *loc = NULL;
+
+ gtk_tree_model_get (model, iter, COL_CITY_LOC, &loc, -1);
+-
+- gtk_list_store_remove (cd->cities_store, iter);
+ cd->locations = g_list_remove (cd->locations, loc);
+- locations_changed (cd);
+ g_object_unref (loc);
+
++ /* This will update everything related to locations to take into
++ * account the removed location (via the gconf notification) */
+ save_cities_store (cd);
+ }
+
+--- trunk/applets/clock/clock-location.h 2008/04/10 13:05:02 11046
++++ trunk/applets/clock/clock-location.h 2008/04/10 16:25:30 11047
+@@ -38,6 +38,13 @@
+ const gchar *code,
+ WeatherPrefs *prefs);
+
++ClockLocation *clock_location_find_and_ref (GList *locations,
++ const gchar *name,
++ const gchar *timezone,
++ gfloat latitude,
++ gfloat longitude,
++ const gchar *code);
++
+ gchar *clock_location_get_tzname (ClockLocation *loc);
+
+ const gchar *clock_location_get_name (ClockLocation *loc);
+--- trunk/applets/clock/clock-location.c 2008/04/10 13:05:02 11046
++++ trunk/applets/clock/clock-location.c 2008/04/10 16:25:30 11047
+@@ -67,6 +67,34 @@
+ #define PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CLOCK_LOCATION_TYPE,
ClockLocationPrivate))
+
+ ClockLocation *
++clock_location_find_and_ref (GList *locations,
++ const gchar *name,
++ const gchar *timezone,
++ gfloat latitude,
++ gfloat longitude,
++ const gchar *code)
++{
++ GList *l;
++ ClockLocationPrivate *priv;
++
++ for (l = locations; l != NULL; l = l->next) {
++ priv = PRIVATE (l->data);
++
++ if (priv->latitude == latitude &&
++ priv->longitude == longitude &&
++ g_strcmp0 (priv->weather_code, code) == 0 &&
++ g_strcmp0 (priv->timezone, timezone) == 0 &&
++ g_strcmp0 (priv->name, name) == 0)
++ break;
++ }
++
++ if (l != NULL)
++ return g_object_ref (CLOCK_LOCATION (l->data));
++ else
++ return NULL;
++}
++
++ClockLocation *
+ clock_location_new (const gchar *name, const gchar *timezone,
+ gfloat latitude, gfloat longitude,
+ const gchar *code, WeatherPrefs *prefs)
+@@ -467,6 +495,12 @@
+ gchar *filename;
+ MakeCurrentData *mcdata;
+
++ if (loc == current_location) {
++ if (destroy)
++ destroy (data);
++ return;
++ }
++
+ if (clock_location_is_current_timezone (loc)) {
+ if (current_location)
+ g_object_remove_weak_pointer (G_OBJECT (current_location),
diff --git a/clock2.patch b/clock2.patch
new file mode 100644
index 0000000..20bc39f
--- /dev/null
+++ b/clock2.patch
@@ -0,0 +1,125 @@
+--- trunk/applets/clock/clock.c 2008/04/10 16:25:30 11047
++++ trunk/applets/clock/clock.c 2008/04/10 20:01:41 11048
+@@ -3410,8 +3410,12 @@
+ G_CALLBACK (location_row_activated), cd);
+
+ model = gweather_xml_load_locations ();
+- gtk_tree_view_set_model (tree, model);
+- g_object_unref (model);
++
++ /* Can be NULL if libgweather is not correctly installed */
++ if (model) {
++ gtk_tree_view_set_model (tree, model);
++ g_object_unref (model);
++ }
+ }
+
+ static void
+@@ -3421,23 +3425,41 @@
+ GtkWidget *name_entry = glade_xml_get_widget (cd->glade_xml,
"edit-location-name-entry");
+ GtkWidget *window;
+ const char *find;
++ const char *location;
+
+ fill_location_tree (cd);
+ window = glade_xml_get_widget (cd->glade_xml,
"find-location-window");
+
+ /* prefill the find entry if it's empty */
+ find = gtk_entry_get_text (GTK_ENTRY (cd->find_location_entry));
+- if (!find || !find[0]) {
+- const char *location;
++ location = gtk_entry_get_text (GTK_ENTRY (name_entry));
+
+- location = gtk_entry_get_text (GTK_ENTRY (name_entry));
+- gtk_entry_set_text (GTK_ENTRY (cd->find_location_entry),
+- location);
++ if (g_strcmp0 (find, location) != 0 || !find || !find[0]) {
++ GtkWidget *scroll = glade_xml_get_widget (cd->glade_xml,
"find-location-scroll");
++ GtkAdjustment *adjustment;
++
++ /* If we autofill the entry, reset the state of the treeview
++ * first so that it looks like a brand new search */
++ gtk_tree_view_collapse_all (GTK_TREE_VIEW (cd->location_tree));
++
++ adjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scroll));
++ gtk_adjustment_set_value (adjustment, 0);
++ gtk_scrolled_window_set_vadjustment (GTK_SCROLLED_WINDOW (scroll),
++ adjustment);
++
++ if (g_strcmp0 (find, location) != 0)
++ gtk_entry_set_text (GTK_ENTRY (cd->find_location_entry),
++ location);
+ }
++
+ gtk_widget_grab_focus (cd->find_location_entry);
++ gtk_editable_set_position (GTK_EDITABLE (cd->find_location_entry),
++ -1);
+
+- gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (edit_window));
+- gtk_window_present_with_time (GTK_WINDOW (window), gtk_get_current_event_time
());
++ gtk_window_set_transient_for (GTK_WINDOW (window),
++ GTK_WINDOW (edit_window));
++ gtk_window_present_with_time (GTK_WINDOW (window),
++ gtk_get_current_event_time ());
+ }
+
+ static gboolean
+@@ -3512,6 +3534,10 @@
+
+ tree = GTK_TREE_VIEW (cd->location_tree);
+ model = gtk_tree_view_get_model (tree);
++ /* Can happen if libgweather is not correctly installed */
++ if (!model)
++ return;
++
+ entry = GTK_ENTRY (cd->find_location_entry);
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree));
+
+@@ -3556,6 +3582,9 @@
+
+ tree = GTK_TREE_VIEW (cd->location_tree);
+ model = gtk_tree_view_get_model (tree);
++ /* Can happen if libgweather is not correctly installed */
++ if (!model)
++ return;
+
+ selection = gtk_tree_view_get_selection (tree);
+ gtk_tree_model_get_iter_first (model, &iter);
+@@ -3601,8 +3630,6 @@
+ GtkWidget *lon_entry = glade_xml_get_widget (cd->glade_xml,
"edit-location-longitude-entry");
+ GtkWidget *lat_combo = glade_xml_get_widget (cd->glade_xml,
"edit-location-latitude-combo");
+ GtkWidget *lon_combo = glade_xml_get_widget (cd->glade_xml,
"edit-location-longitude-combo");
+- GtkWidget *scroll = glade_xml_get_widget (cd->glade_xml,
"find-location-scroll");
+- GtkAdjustment *adjustment;
+
+ /* clear out the old data */
+ gtk_combo_box_set_active (GTK_COMBO_BOX (zone_combo), -1);
+@@ -3614,16 +3641,6 @@
+
+ gtk_combo_box_set_active (GTK_COMBO_BOX (lat_combo), -1);
+ gtk_combo_box_set_active (GTK_COMBO_BOX (lon_combo), -1);
+-
+- /* reset the state of the find window */
+- gtk_entry_set_text (GTK_ENTRY (cd->find_location_entry), "");
+-
+- gtk_tree_view_collapse_all (GTK_TREE_VIEW (cd->location_tree));
+-
+- adjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scroll));
+- gtk_adjustment_set_value (adjustment, 0);
+- gtk_scrolled_window_set_vadjustment (GTK_SCROLLED_WINDOW (scroll),
+- adjustment);
+ }
+
+ static void
+@@ -3730,7 +3747,10 @@
+ data.distance = 1e6;
+ data.location = NULL;
+
+- gtk_tree_model_foreach (GTK_TREE_MODEL (model), compare_location, &data);
++ /* Can be NULL if libgweather is not correctly installed */
++ if (model)
++ gtk_tree_model_foreach (GTK_TREE_MODEL (model),
++ compare_location, &data);
+
+ if (data.location)
+ code = g_strdup (data.location->code);
diff --git a/gnome-panel.spec b/gnome-panel.spec
index bba2f09..500d1ed 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,7 +21,7 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.22.1.1
+Version: 2.22.1.2
Release: 1%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.22/%{name}-%{version}.tar...
@@ -116,6 +116,10 @@ Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
# fixed upstream
Patch28: gnome-panel-larger-find-window.patch
+# some upstream fixes
+Patch30: clock1.patch
+Patch31: clock2.patch
+
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -164,6 +168,8 @@ Panel Applets using the libpanel-applet library.
%patch14 -p1 -b .ck-shutdown
%patch24 -p1 -b .allow-spurious-view-done-signals
%patch28 -p1 -b .larger-find-window
+%patch30 -p1 -b .clock1
+%patch31 -p1 -b .clock2
. %{SOURCE6}
@@ -348,6 +354,10 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Thu Apr 10 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.1.2-1
+- Update to 2.22.1.2 (significant performance and usability
+ improvements for the clock applet)
+
* Tue Apr 08 2008 - Bastien Nocera <bnocera(a)redhat.com> - 2.22.1.1-1
- Update to 2.22.1.1
commit 63223fbc3d6eb75d84cf3e79667e8c126d18cea3
Author: Bastien Nocera <hadess(a)fedoraproject.org>
Date: Tue Apr 8 13:23:24 2008 +0000
- Update to 2.22.1.1
diff --git a/.cvsignore b/.cvsignore
index fc45c64..e8cd7f1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.22.1.tar.bz2
+gnome-panel-2.22.1.1.tar.bz2
diff --git a/gnome-panel.spec b/gnome-panel.spec
index a800616..bba2f09 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,7 +21,7 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.22.1
+Version: 2.22.1.1
Release: 1%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.22/%{name}-%{version}.tar...
@@ -348,6 +348,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Tue Apr 08 2008 - Bastien Nocera <bnocera(a)redhat.com> - 2.22.1.1-1
+- Update to 2.22.1.1
+
* Mon Apr 7 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.1-1
- Update to 2.22.1
diff --git a/sources b/sources
index a79210e..6a8fb0c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fb497e544c3873fffe9c12059838231b gnome-panel-2.22.1.tar.bz2
+c80f265af2dd009917aece662fd6ab37 gnome-panel-2.22.1.1.tar.bz2
commit a4de0dfb312ea37bea0d542279d70f985e28224d
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Apr 8 00:26:55 2008 +0000
2.22.1
diff --git a/.cvsignore b/.cvsignore
index 7d80edf..fc45c64 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.22.0.tar.bz2
+gnome-panel-2.22.1.tar.bz2
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 287bd5c..a800616 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,8 +21,8 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.22.0
-Release: 12%{?dist}
+Version: 2.22.1
+Release: 1%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.22/%{name}-%{version}.tar...
@@ -113,18 +113,8 @@ Patch14: gnome-panel-2.22.0-ck-shutdown.patch
#
http://bugzilla.gnome.org/show_bug.cgi?id=520111
Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
-Patch25: current.patch
-Patch26: expose.patch
-
# fixed upstream
-Patch27: populate.patch
Patch28: gnome-panel-larger-find-window.patch
-Patch29: set-time-window.patch
-Patch30: location-edit.patch
-Patch31: can-do-crash.patch
-
-#
http://bugzilla.gnome.org/show_bug.cgi?id=526266
-Patch32: dbus-timeout.patch
Conflicts: gnome-power-manager < 2.15.3
@@ -173,14 +163,7 @@ Panel Applets using the libpanel-applet library.
%patch11 -p1 -b .applet-error
%patch14 -p1 -b .ck-shutdown
%patch24 -p1 -b .allow-spurious-view-done-signals
-%patch25 -p1 -b .current
-%patch26 -p1 -b .expose
-%patch27 -p1 -b .populate
%patch28 -p1 -b .larger-find-window
-%patch29 -p1 -b .set-time-window
-%patch30 -p1 -b .location-edit
-%patch31 -p1 -b .can-do-crash
-%patch32 -p1 -b .dbus-timeout
. %{SOURCE6}
@@ -365,6 +348,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Mon Apr 7 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.1-1
+- Update to 2.22.1
+
* Sun Apr 6 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.0-12
- Fix a typo in the CK shutdown patch, spotted by Kevin Kofler
diff --git a/sources b/sources
index 1b866fc..a79210e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fe10c920c1f182a2bd5dba98863c786c gnome-panel-2.22.0.tar.bz2
+fb497e544c3873fffe9c12059838231b gnome-panel-2.22.1.tar.bz2
commit 7fc4a5838820555faa36c63efda2514a43552959
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sun Apr 6 13:19:38 2008 +0000
fix a typo
diff --git a/gnome-panel-2.22.0-ck-shutdown.patch b/gnome-panel-2.22.0-ck-shutdown.patch
index 75463eb..a041d49 100644
--- a/gnome-panel-2.22.0-ck-shutdown.patch
+++ b/gnome-panel-2.22.0-ck-shutdown.patch
@@ -50,7 +50,7 @@ diff -up
gnome-panel-2.22.0/gnome-panel/panel-action-button.c.ck-shutdown gnome-
return (panel_lockdown_get_disable_log_out() ||
- (!gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN) &&
- !gdm_supports_logout_action (GDM_LOGOUT_ACTION_REBOOT)));
-+ !panel_logout_supports_shutdown_reboot);
++ !panel_logout_supports_shutdown_reboot ());
}
/* Run Application
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 4468591..287bd5c 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.22.0
-Release: 11%{?dist}
+Release: 12%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.22/%{name}-%{version}.tar...
@@ -365,6 +365,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Sun Apr 6 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.0-12
+- Fix a typo in the CK shutdown patch, spotted by Kevin Kofler
+
* Sat Apr 5 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.0-11
- Handle PolicyKit errors returned from ConsoleKit
commit 55aa5390c919c82b960afddccaebfa66572dbe6b
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sun Apr 6 03:23:00 2008 +0000
Improve handling of CK errors
diff --git a/gnome-panel-2.22.0-ck-shutdown.patch b/gnome-panel-2.22.0-ck-shutdown.patch
index 2458fb3..75463eb 100644
--- a/gnome-panel-2.22.0-ck-shutdown.patch
+++ b/gnome-panel-2.22.0-ck-shutdown.patch
@@ -1,18 +1,63 @@
-diff -up gnome-panel-2.22.0/gnome-panel/panel-session.h.ck-shutdown
gnome-panel-2.22.0/gnome-panel/panel-session.h
---- gnome-panel-2.22.0/gnome-panel/panel-session.h.ck-shutdown 2008-03-10
16:44:57.000000000 -0400
-+++ gnome-panel-2.22.0/gnome-panel/panel-session.h 2008-03-14 17:14:22.000000000 -0400
-@@ -30,6 +30,7 @@ G_BEGIN_DECLS
- void panel_session_init (void);
- void panel_session_do_not_restart (void);
- void panel_session_request_logout (void);
-+void panel_session_request_save (void);
+diff -up gnome-panel-2.22.0/gnome-panel/Makefile.am.ck-shutdown
gnome-panel-2.22.0/gnome-panel/Makefile.am
+--- gnome-panel-2.22.0/gnome-panel/Makefile.am.ck-shutdown 2008-03-10 16:44:57.000000000
-0400
++++ gnome-panel-2.22.0/gnome-panel/Makefile.am 2008-04-05 20:48:37.000000000 -0400
+@@ -16,6 +16,7 @@ INCLUDES = \
+ $(STANDARD_PROPERTIES_CFLAGS) \
+ $(PANEL_CFLAGS) \
+ $(PANELCONFIG_CFLAGS) \
++ $(POLKIT_GNOME_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(NULL)
- G_END_DECLS
+@@ -98,6 +99,7 @@ panel_sources = \
+ panel-logout.c \
+ panel-gdm.c \
+ panel-power-manager.c \
++ panel-consolekit.c \
+ panel-ditem-editor.c \
+ panel-mount-operation.c \
+ $(NULL)
+@@ -148,6 +150,7 @@ panel_headers = \
+ panel-logout.h \
+ panel-gdm.h \
+ panel-power-manager.h \
++ panel-consolekit.h \
+ panel-ditem-editor.h \
+ panel-icon-names.h \
+ panel-mount-operation.h \
+@@ -161,6 +164,7 @@ gnome_panel_SOURCES = \
+ gnome_panel_LDADD = \
+ $(PANEL_LIBS) \
++ $(POLKIT_GNOME_LIBS) \
+ $(X_LIBS)
+
+ gnome_panel_LDFLAGS = -export-dynamic
+diff -up gnome-panel-2.22.0/gnome-panel/panel-action-button.c.ck-shutdown
gnome-panel-2.22.0/gnome-panel/panel-action-button.c
+--- gnome-panel-2.22.0/gnome-panel/panel-action-button.c.ck-shutdown 2008-04-05
20:48:37.000000000 -0400
++++ gnome-panel-2.22.0/gnome-panel/panel-action-button.c 2008-04-05 20:48:37.000000000
-0400
+@@ -46,7 +46,6 @@
+ #include "panel-lockdown.h"
+ #include "panel-logout.h"
+ #include "panel-compatibility.h"
+-#include "panel-gdm.h"
+ #include "panel-icon-names.h"
+
+ G_DEFINE_TYPE (PanelActionButton, panel_action_button, BUTTON_TYPE_WIDGET);
+@@ -183,8 +182,7 @@ static gboolean
+ panel_action_shutdown_reboot_is_disabled (void)
+ {
+ return (panel_lockdown_get_disable_log_out() ||
+- (!gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN) &&
+- !gdm_supports_logout_action (GDM_LOGOUT_ACTION_REBOOT)));
++ !panel_logout_supports_shutdown_reboot);
+ }
+
+ /* Run Application
diff -up /dev/null gnome-panel-2.22.0/gnome-panel/panel-consolekit.c
---- /dev/null 2008-03-15 22:02:38.932007625 -0400
-+++ gnome-panel-2.22.0/gnome-panel/panel-consolekit.c 2008-03-14 17:14:22.000000000
-0400
-@@ -0,0 +1,618 @@
+--- /dev/null 2008-04-05 22:04:35.194004710 -0400
++++ gnome-panel-2.22.0/gnome-panel/panel-consolekit.c 2008-04-05 20:48:37.000000000
-0400
+@@ -0,0 +1,682 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2008 Jon McCann <jmccann(a)redhat.com>
@@ -457,18 +502,40 @@ diff -up /dev/null
gnome-panel-2.22.0/gnome-panel/panel-consolekit.c
+get_action_from_error (GError *error)
+{
+ PolKitAction *action;
-+ const char *paction;
++ char *paction;
++ char *p;
+
+ action = polkit_action_new ();
+
+ paction = NULL;
+ if (g_str_has_prefix (error->message, "Not privileged for action:
")) {
-+ paction = error->message + strlen ("Not privileged for action:
");
++ paction = g_strdup (error->message + strlen ("Not privileged for
action: "));
++ p = strchr (paction, ' ');
++ if (p)
++ *p = '\0';
+ }
+ polkit_action_set_action_id (action, paction);
+
++ g_free (paction);
++
+ return action;
+}
++
++static PolKitResult
++get_result_from_error (GError *error)
++{
++ PolKitResult result = POLKIT_RESULT_UNKNOWN;
++ const char *p;
++
++ p = strrchr (error->message, ' ');
++ if (p) {
++ p++;
++ polkit_result_from_string_representation (p, &result);
++ }
++
++ return result;
++}
++
+#endif /* HAVE_POLKIT */
+
+static void
@@ -479,11 +546,31 @@ diff -up /dev/null
gnome-panel-2.22.0/gnome-panel/panel-consolekit.c
+ gboolean res = FALSE;
+ char *error_message = NULL;
+ PolKitAction *action;
++ PolKitAction *action2;
++ PolKitResult result;
+ guint xid;
+ pid_t pid;
+ GError *local_error;
+
+ action = get_action_from_error (error);
++ result = get_result_from_error (error);
++
++ if (result == POLKIT_RESULT_NO) {
++ action2 = polkit_action_new ();
++ polkit_action_set_action_id (action2,
"org.freedesktop.consolekit.system.restart-multiple-users");
++ if (polkit_action_equal (action, action2)) {
++ emit_restart_complete (manager, _("You are not allowed to restart the computer
"
++ "because multiple users are logged in"));
++ }
++ else {
++ emit_restart_complete (manager, _("You are not allowed to restart the
computer"));
++ }
++ polkit_action_unref (action);
++ polkit_action_unref (action2);
++
++ return;
++ }
++
+
+ xid = 0;
+ pid = getpid ();
@@ -518,12 +605,34 @@ diff -up /dev/null
gnome-panel-2.22.0/gnome-panel/panel-consolekit.c
+ gboolean res = FALSE;
+ char *error_message = NULL;
+ PolKitAction *action;
++ PolKitAction *action2;
++ PolKitResult result;
+ guint xid;
+ pid_t pid;
+ GError *local_error;
+
++ result = get_result_from_error (error);
+ action = get_action_from_error (error);
+
++ if (result == POLKIT_RESULT_NO) {
++ action2 = polkit_action_new ();
++ polkit_action_set_action_id (action2,
"org.freedesktop.consolekit.system.stop-multiple-users");
++ if (polkit_action_equal (action, action2)) {
++ emit_restart_complete (manager, _("You are not allowed to stop the computer
"
++ "because multiple users are logged in"));
++ }
++ else {
++ emit_restart_complete (manager, _("You are not allowed to stop the
computer"));
++ }
++ polkit_action_unref (action);
++ polkit_action_unref (action2);
++
++ return;
++ }
++
++ xid = 0;
++ pid = getpid ();
++
+ xid = 0;
+ pid = getpid ();
+
@@ -631,40 +740,90 @@ diff -up /dev/null
gnome-panel-2.22.0/gnome-panel/panel-consolekit.c
+
+ return g_object_ref (manager);
+}
-diff -up gnome-panel-2.22.0/gnome-panel/panel-toplevel.c.ck-shutdown
gnome-panel-2.22.0/gnome-panel/panel-toplevel.c
---- gnome-panel-2.22.0/gnome-panel/panel-toplevel.c.ck-shutdown 2008-03-10
16:44:57.000000000 -0400
-+++ gnome-panel-2.22.0/gnome-panel/panel-toplevel.c 2008-03-14 17:14:22.000000000 -0400
-@@ -3329,7 +3329,8 @@ panel_toplevel_get_animation_time (Panel
- }
-
- static void
--panel_toplevel_start_animation (PanelToplevel *toplevel)
-+panel_toplevel_start_animation (PanelToplevel *toplevel,
-+ gboolean auto_hide)
- {
- GdkScreen *screen;
- int monitor_width, monitor_height;
-@@ -3480,7 +3481,7 @@ panel_toplevel_hide (PanelToplevel *t
- }
-
- if (toplevel->priv->animate && GTK_WIDGET_REALIZED (toplevel))
-- panel_toplevel_start_animation (toplevel);
-+ panel_toplevel_start_animation (toplevel, auto_hide);
- else if (toplevel->priv->attached)
- gtk_widget_hide (GTK_WIDGET (toplevel));
-
-@@ -3528,7 +3529,7 @@ panel_toplevel_unhide (PanelToplevel *to
- panel_toplevel_push_autohide_disabler (toplevel->priv->attach_toplevel);
-
- if (toplevel->priv->animate && GTK_WIDGET_REALIZED (toplevel))
-- panel_toplevel_start_animation (toplevel);
-+ panel_toplevel_start_animation (toplevel, FALSE);
- else if (toplevel->priv->attached)
- gtk_widget_show (GTK_WIDGET (toplevel));
-
+diff -up /dev/null gnome-panel-2.22.0/gnome-panel/panel-consolekit.h
+--- /dev/null 2008-04-05 22:04:35.194004710 -0400
++++ gnome-panel-2.22.0/gnome-panel/panel-consolekit.h 2008-04-05 20:48:37.000000000
-0400
+@@ -0,0 +1,77 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
++ *
++ * Copyright (C) 2008 Jon McCann <jmccann(a)redhat.com>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of the
++ * License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++ * 02111-1307, USA.
++ *
++ * Authors:
++ * Jon McCann <jmccann(a)redhat.com>
++ */
++
++#ifndef PANEL_CONSOLEKIT_H
++#define PANEL_CONSOLEKIT_H
++
++#include <glib.h>
++#include <glib-object.h>
++
++G_BEGIN_DECLS
++
++#define PANEL_TYPE_CONSOLEKIT (panel_consolekit_get_type ())
++#define PANEL_CONSOLEKIT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
PANEL_TYPE_CONSOLEKIT, PanelConsolekit))
++#define PANEL_CONSOLEKIT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass),
PANEL_TYPE_CONSOLEKIT, PanelConsolekitClass))
++#define PANEL_IS_CONSOLEKIT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj),
PANEL_TYPE_CONSOLEKIT))
++#define PANEL_IS_CONSOLEKIT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),
PANEL_TYPE_CONSOLEKIT))
++#define PANEL_CONSOLEKIT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj),
PANEL_TYPE_CONSOLEKIT, PanelConsolekitClass))
++#define PANEL_CONSOLEKIT_ERROR (panel_consolekit_error_quark ())
++
++typedef struct _PanelConsolekit PanelConsolekit;
++typedef struct _PanelConsolekitClass PanelConsolekitClass;
++typedef struct _PanelConsolekitPrivate PanelConsolekitPrivate;
++typedef enum _PanelConsolekitError PanelConsolekitError;
++
++struct _PanelConsolekit {
++ GObject parent;
++ PanelConsolekitPrivate *priv;
++};
++
++struct _PanelConsolekitClass {
++ GObjectClass parent_class;
++
++ void (* request_completed) (PanelConsolekit *manager,
++ GError *error);
++};
++
++enum _PanelConsolekitError {
++ PANEL_CONSOLEKIT_ERROR_RESTARTING = 0,
++ PANEL_CONSOLEKIT_ERROR_STOPPING
++};
++
++GType panel_consolekit_get_type (void);
++GQuark panel_consolekit_error_quark (void);
++
++PanelConsolekit *panel_consolekit_new (void) G_GNUC_MALLOC;
++
++gboolean panel_consolekit_can_stop (PanelConsolekit *manager);
++gboolean panel_consolekit_can_restart (PanelConsolekit *manager);
++
++void panel_consolekit_attempt_stop (PanelConsolekit *manager);
++void panel_consolekit_attempt_restart (PanelConsolekit *manager);
++
++PanelConsolekit *panel_get_consolekit (void);
++
++G_END_DECLS
++
++#endif /* PANEL_CONSOLEKIT_H */
diff -up gnome-panel-2.22.0/gnome-panel/panel-logout.c.ck-shutdown
gnome-panel-2.22.0/gnome-panel/panel-logout.c
---- gnome-panel-2.22.0/gnome-panel/panel-logout.c.ck-shutdown 2008-03-14
17:14:22.000000000 -0400
-+++ gnome-panel-2.22.0/gnome-panel/panel-logout.c 2008-03-15 23:36:28.000000000 -0400
+--- gnome-panel-2.22.0/gnome-panel/panel-logout.c.ck-shutdown 2008-04-05
20:48:37.000000000 -0400
++++ gnome-panel-2.22.0/gnome-panel/panel-logout.c 2008-04-05 22:18:24.000000000 -0400
@@ -1,4 +1,5 @@
-/*
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
@@ -709,7 +868,7 @@ diff -up gnome-panel-2.22.0/gnome-panel/panel-logout.c.ck-shutdown
gnome-panel-2
panel_logout_get_property (GObject *object,
guint prop_id,
GValue *value,
-@@ -130,6 +134,59 @@ panel_logout_class_init (PanelLogoutDial
+@@ -130,6 +134,57 @@ panel_logout_class_init (PanelLogoutDial
}
static void
@@ -758,18 +917,16 @@ diff -up gnome-panel-2.22.0/gnome-panel/panel-logout.c.ck-shutdown
gnome-panel-2
+on_ck_request_completed (PanelConsolekit *panel_consolekit,
+ GError *error)
+{
-+ if (error == NULL) {
-+ /* request was successful */
-+ return;
++ if (error) {
++ ck_restart_error_window (error);
+ }
-+
+}
+
+static void
panel_logout_init (PanelLogoutDialog *logout_dialog)
{
logout_dialog->priv = PANEL_LOGOUT_DIALOG_GET_PRIVATE (logout_dialog);
-@@ -146,6 +203,10 @@ panel_logout_init (PanelLogoutDialog *lo
+@@ -146,6 +201,10 @@ panel_logout_init (PanelLogoutDialog *lo
GTK_WIN_POS_CENTER_ALWAYS);
logout_dialog->priv->power_manager = panel_get_power_manager ();
@@ -780,7 +937,7 @@ diff -up gnome-panel-2.22.0/gnome-panel/panel-logout.c.ck-shutdown
gnome-panel-2
g_signal_connect (logout_dialog, "destroy",
G_CALLBACK (panel_logout_destroy), NULL);
-@@ -163,37 +224,129 @@ panel_logout_destroy (PanelLogoutDialog
+@@ -163,37 +222,129 @@ panel_logout_destroy (PanelLogoutDialog
g_object_unref (logout_dialog->priv->power_manager);
logout_dialog->priv->power_manager = NULL;
@@ -916,7 +1073,7 @@ diff -up gnome-panel-2.22.0/gnome-panel/panel-logout.c.ck-shutdown
gnome-panel-2
break;
case PANEL_LOGOUT_RESPONSE_STD:
if (panel_power_manager_can_hibernate (power_manager))
-@@ -210,6 +363,7 @@ panel_logout_response (PanelLogoutDialog
+@@ -210,6 +361,7 @@ panel_logout_response (PanelLogoutDialog
g_assert_not_reached ();
}
g_object_unref (power_manager);
@@ -924,7 +1081,7 @@ diff -up gnome-panel-2.22.0/gnome-panel/panel-logout.c.ck-shutdown
gnome-panel-2
}
static gboolean
-@@ -363,7 +517,7 @@ panel_logout_new (PanelLogoutDialogType
+@@ -363,7 +515,7 @@ panel_logout_new (PanelLogoutDialogType
_("_Hibernate"),
PANEL_LOGOUT_RESPONSE_STD);
@@ -933,7 +1090,7 @@ diff -up gnome-panel-2.22.0/gnome-panel/panel-logout.c.ck-shutdown
gnome-panel-2
gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
_("_Restart"),
PANEL_LOGOUT_RESPONSE_REBOOT);
-@@ -372,7 +526,7 @@ panel_logout_new (PanelLogoutDialogType
+@@ -372,7 +524,7 @@ panel_logout_new (PanelLogoutDialogType
GTK_STOCK_CANCEL,
GTK_RESPONSE_CANCEL);
@@ -942,111 +1099,9 @@ diff -up gnome-panel-2.22.0/gnome-panel/panel-logout.c.ck-shutdown
gnome-panel-2
gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
_("_Shut Down"),
PANEL_LOGOUT_RESPONSE_SHUTDOWN);
-diff -up /dev/null gnome-panel-2.22.0/gnome-panel/panel-consolekit.h
---- /dev/null 2008-03-15 22:02:38.932007625 -0400
-+++ gnome-panel-2.22.0/gnome-panel/panel-consolekit.h 2008-03-14 17:14:22.000000000
-0400
-@@ -0,0 +1,77 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
-+ *
-+ * Copyright (C) 2008 Jon McCann <jmccann(a)redhat.com>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of the
-+ * License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+ * 02111-1307, USA.
-+ *
-+ * Authors:
-+ * Jon McCann <jmccann(a)redhat.com>
-+ */
-+
-+#ifndef PANEL_CONSOLEKIT_H
-+#define PANEL_CONSOLEKIT_H
-+
-+#include <glib.h>
-+#include <glib-object.h>
-+
-+G_BEGIN_DECLS
-+
-+#define PANEL_TYPE_CONSOLEKIT (panel_consolekit_get_type ())
-+#define PANEL_CONSOLEKIT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
PANEL_TYPE_CONSOLEKIT, PanelConsolekit))
-+#define PANEL_CONSOLEKIT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass),
PANEL_TYPE_CONSOLEKIT, PanelConsolekitClass))
-+#define PANEL_IS_CONSOLEKIT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj),
PANEL_TYPE_CONSOLEKIT))
-+#define PANEL_IS_CONSOLEKIT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),
PANEL_TYPE_CONSOLEKIT))
-+#define PANEL_CONSOLEKIT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj),
PANEL_TYPE_CONSOLEKIT, PanelConsolekitClass))
-+#define PANEL_CONSOLEKIT_ERROR (panel_consolekit_error_quark ())
-+
-+typedef struct _PanelConsolekit PanelConsolekit;
-+typedef struct _PanelConsolekitClass PanelConsolekitClass;
-+typedef struct _PanelConsolekitPrivate PanelConsolekitPrivate;
-+typedef enum _PanelConsolekitError PanelConsolekitError;
-+
-+struct _PanelConsolekit {
-+ GObject parent;
-+ PanelConsolekitPrivate *priv;
-+};
-+
-+struct _PanelConsolekitClass {
-+ GObjectClass parent_class;
-+
-+ void (* request_completed) (PanelConsolekit *manager,
-+ GError *error);
-+};
-+
-+enum _PanelConsolekitError {
-+ PANEL_CONSOLEKIT_ERROR_RESTARTING = 0,
-+ PANEL_CONSOLEKIT_ERROR_STOPPING
-+};
-+
-+GType panel_consolekit_get_type (void);
-+GQuark panel_consolekit_error_quark (void);
-+
-+PanelConsolekit *panel_consolekit_new (void) G_GNUC_MALLOC;
-+
-+gboolean panel_consolekit_can_stop (PanelConsolekit *manager);
-+gboolean panel_consolekit_can_restart (PanelConsolekit *manager);
-+
-+void panel_consolekit_attempt_stop (PanelConsolekit *manager);
-+void panel_consolekit_attempt_restart (PanelConsolekit *manager);
-+
-+PanelConsolekit *panel_get_consolekit (void);
-+
-+G_END_DECLS
-+
-+#endif /* PANEL_CONSOLEKIT_H */
-diff -up gnome-panel-2.22.0/gnome-panel/panel-action-button.c.ck-shutdown
gnome-panel-2.22.0/gnome-panel/panel-action-button.c
---- gnome-panel-2.22.0/gnome-panel/panel-action-button.c.ck-shutdown 2008-03-14
17:14:22.000000000 -0400
-+++ gnome-panel-2.22.0/gnome-panel/panel-action-button.c 2008-03-14 17:14:22.000000000
-0400
-@@ -46,7 +46,6 @@
- #include "panel-lockdown.h"
- #include "panel-logout.h"
- #include "panel-compatibility.h"
--#include "panel-gdm.h"
- #include "panel-icon-names.h"
-
- G_DEFINE_TYPE (PanelActionButton, panel_action_button, BUTTON_TYPE_WIDGET);
-@@ -183,8 +182,7 @@ static gboolean
- panel_action_shutdown_reboot_is_disabled (void)
- {
- return (panel_lockdown_get_disable_log_out() ||
-- (!gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN) &&
-- !gdm_supports_logout_action (GDM_LOGOUT_ACTION_REBOOT)));
-+ !panel_logout_supports_shutdown_reboot);
- }
-
- /* Run Application
diff -up gnome-panel-2.22.0/gnome-panel/panel-logout.h.ck-shutdown
gnome-panel-2.22.0/gnome-panel/panel-logout.h
--- gnome-panel-2.22.0/gnome-panel/panel-logout.h.ck-shutdown 2008-03-10
16:44:57.000000000 -0400
-+++ gnome-panel-2.22.0/gnome-panel/panel-logout.h 2008-03-14 17:14:22.000000000 -0400
++++ gnome-panel-2.22.0/gnome-panel/panel-logout.h 2008-04-05 20:48:37.000000000 -0400
@@ -57,6 +57,8 @@ struct _PanelLogoutDialogClass {
GType panel_logout_get_type (void) G_GNUC_CONST;
@@ -1056,44 +1111,9 @@ diff -up gnome-panel-2.22.0/gnome-panel/panel-logout.h.ck-shutdown
gnome-panel-2
void panel_logout_new (PanelLogoutDialogType type,
GdkScreen *screen,
guint32 activate_time);
-diff -up gnome-panel-2.22.0/gnome-panel/Makefile.am.ck-shutdown
gnome-panel-2.22.0/gnome-panel/Makefile.am
---- gnome-panel-2.22.0/gnome-panel/Makefile.am.ck-shutdown 2008-03-10 16:44:57.000000000
-0400
-+++ gnome-panel-2.22.0/gnome-panel/Makefile.am 2008-03-14 17:14:22.000000000 -0400
-@@ -16,6 +16,7 @@ INCLUDES = \
- $(STANDARD_PROPERTIES_CFLAGS) \
- $(PANEL_CFLAGS) \
- $(PANELCONFIG_CFLAGS) \
-+ $(POLKIT_GNOME_CFLAGS) \
- $(WARN_CFLAGS) \
- $(NULL)
-
-@@ -98,6 +99,7 @@ panel_sources = \
- panel-logout.c \
- panel-gdm.c \
- panel-power-manager.c \
-+ panel-consolekit.c \
- panel-ditem-editor.c \
- panel-mount-operation.c \
- $(NULL)
-@@ -148,6 +150,7 @@ panel_headers = \
- panel-logout.h \
- panel-gdm.h \
- panel-power-manager.h \
-+ panel-consolekit.h \
- panel-ditem-editor.h \
- panel-icon-names.h \
- panel-mount-operation.h \
-@@ -161,6 +164,7 @@ gnome_panel_SOURCES = \
-
- gnome_panel_LDADD = \
- $(PANEL_LIBS) \
-+ $(POLKIT_GNOME_LIBS) \
- $(X_LIBS)
-
- gnome_panel_LDFLAGS = -export-dynamic
diff -up gnome-panel-2.22.0/gnome-panel/panel-session.c.ck-shutdown
gnome-panel-2.22.0/gnome-panel/panel-session.c
--- gnome-panel-2.22.0/gnome-panel/panel-session.c.ck-shutdown 2008-03-10
16:44:57.000000000 -0400
-+++ gnome-panel-2.22.0/gnome-panel/panel-session.c 2008-03-14 17:14:22.000000000 -0400
++++ gnome-panel-2.22.0/gnome-panel/panel-session.c 2008-04-05 20:48:37.000000000 -0400
@@ -60,6 +60,34 @@ panel_session_request_logout (void)
recursion_guard--;
}
@@ -1129,3 +1149,45 @@ diff -up gnome-panel-2.22.0/gnome-panel/panel-session.c.ck-shutdown
gnome-panel-
static void
panel_session_handle_die_request (GnomeClient *client)
{
+diff -up gnome-panel-2.22.0/gnome-panel/panel-session.h.ck-shutdown
gnome-panel-2.22.0/gnome-panel/panel-session.h
+--- gnome-panel-2.22.0/gnome-panel/panel-session.h.ck-shutdown 2008-03-10
16:44:57.000000000 -0400
++++ gnome-panel-2.22.0/gnome-panel/panel-session.h 2008-04-05 20:48:37.000000000 -0400
+@@ -30,6 +30,7 @@ G_BEGIN_DECLS
+ void panel_session_init (void);
+ void panel_session_do_not_restart (void);
+ void panel_session_request_logout (void);
++void panel_session_request_save (void);
+
+ G_END_DECLS
+
+diff -up gnome-panel-2.22.0/gnome-panel/panel-toplevel.c.ck-shutdown
gnome-panel-2.22.0/gnome-panel/panel-toplevel.c
+--- gnome-panel-2.22.0/gnome-panel/panel-toplevel.c.ck-shutdown 2008-03-10
16:44:57.000000000 -0400
++++ gnome-panel-2.22.0/gnome-panel/panel-toplevel.c 2008-04-05 20:48:37.000000000 -0400
+@@ -3329,7 +3329,8 @@ panel_toplevel_get_animation_time (Panel
+ }
+
+ static void
+-panel_toplevel_start_animation (PanelToplevel *toplevel)
++panel_toplevel_start_animation (PanelToplevel *toplevel,
++ gboolean auto_hide)
+ {
+ GdkScreen *screen;
+ int monitor_width, monitor_height;
+@@ -3480,7 +3481,7 @@ panel_toplevel_hide (PanelToplevel *t
+ }
+
+ if (toplevel->priv->animate && GTK_WIDGET_REALIZED (toplevel))
+- panel_toplevel_start_animation (toplevel);
++ panel_toplevel_start_animation (toplevel, auto_hide);
+ else if (toplevel->priv->attached)
+ gtk_widget_hide (GTK_WIDGET (toplevel));
+
+@@ -3528,7 +3529,7 @@ panel_toplevel_unhide (PanelToplevel *to
+ panel_toplevel_push_autohide_disabler (toplevel->priv->attach_toplevel);
+
+ if (toplevel->priv->animate && GTK_WIDGET_REALIZED (toplevel))
+- panel_toplevel_start_animation (toplevel);
++ panel_toplevel_start_animation (toplevel, FALSE);
+ else if (toplevel->priv->attached)
+ gtk_widget_show (GTK_WIDGET (toplevel));
+
diff --git a/gnome-panel.spec b/gnome-panel.spec
index e6982e8..4468591 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.22.0
-Release: 10%{?dist}
+Release: 11%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.22/%{name}-%{version}.tar...
@@ -365,6 +365,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Sat Apr 5 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.0-11
+- Handle PolicyKit errors returned from ConsoleKit
+
* Fri Apr 4 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.0-10
- Ignore dbus errors when setting the time
commit 0b55cdb64d243912d21ae685e907437f85751812
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sat Apr 5 01:56:13 2008 +0000
forgotten patch
diff --git a/dbus-timeout.patch b/dbus-timeout.patch
new file mode 100644
index 0000000..2d29852
--- /dev/null
+++ b/dbus-timeout.patch
@@ -0,0 +1,22 @@
+diff -up gnome-panel-2.22.0/applets/clock/set-timezone.c.dbus-timeout
gnome-panel-2.22.0/applets/clock/set-timezone.c
+--- gnome-panel-2.22.0/applets/clock/set-timezone.c.dbus-timeout 2008-04-04
20:44:52.000000000 -0400
++++ gnome-panel-2.22.0/applets/clock/set-timezone.c 2008-04-04 20:44:58.000000000 -0400
+@@ -291,7 +291,17 @@ set_time_notify (DBusGProxy *proxy,
+ data->callback (data->data, NULL);
+ }
+ else {
+- if (dbus_g_error_has_name (error,
"org.gnome.ClockApplet.Mechanism.NotPrivileged")) {
++ if (error->domain == DBUS_GERROR &&
++ error->code == DBUS_GERROR_NO_REPLY) {
++ /* these errors happen because dbus doesn't
++ * use monotonic clocks
++ */
++ g_warning ("ignoring no-reply error when setting time");
++ g_error_free (error);
++ 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);
commit bb65c14cc7590d674dd93eb90484dd9854f3b1e6
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sat Apr 5 01:37:41 2008 +0000
add bug ref
diff --git a/gnome-panel.spec b/gnome-panel.spec
index e8f4deb..e6982e8 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.22.0
-Release: 9%{?dist}
+Release: 10%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.22/%{name}-%{version}.tar...
@@ -123,6 +123,9 @@ Patch29: set-time-window.patch
Patch30: location-edit.patch
Patch31: can-do-crash.patch
+#
http://bugzilla.gnome.org/show_bug.cgi?id=526266
+Patch32: dbus-timeout.patch
+
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -177,6 +180,7 @@ Panel Applets using the libpanel-applet library.
%patch29 -p1 -b .set-time-window
%patch30 -p1 -b .location-edit
%patch31 -p1 -b .can-do-crash
+%patch32 -p1 -b .dbus-timeout
. %{SOURCE6}
@@ -361,6 +365,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Fri Apr 4 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.0-10
+- Ignore dbus errors when setting the time
+
* Wed Apr 2 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.0-9
- Fix a possible crash in the clock applet
commit 626cf920adb38a7d0556255cb42c9d01f7c6eddc
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Apr 2 22:12:33 2008 +0000
bump rev
diff --git a/gnome-panel.spec b/gnome-panel.spec
index d099b49..e8f4deb 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.22.0
-Release: 8%{?dist}
+Release: 9%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.22/%{name}-%{version}.tar...
commit b463724ac5b873727f678076dd194aa00e4bdbb5
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Apr 2 22:08:11 2008 +0000
fix a possible crash
diff --git a/can-do-crash.patch b/can-do-crash.patch
new file mode 100644
index 0000000..aefc86b
--- /dev/null
+++ b/can-do-crash.patch
@@ -0,0 +1,23 @@
+diff -up gnome-panel-2.22.0/applets/clock/set-timezone.c.can-do-crash
gnome-panel-2.22.0/applets/clock/set-timezone.c
+--- gnome-panel-2.22.0/applets/clock/set-timezone.c.can-do-crash 2008-04-02
17:13:46.000000000 -0400
++++ gnome-panel-2.22.0/applets/clock/set-timezone.c 2008-04-02 17:13:56.000000000 -0400
+@@ -139,6 +139,9 @@ can_do (const gchar *pk_action_id)
+ 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;
+@@ -147,9 +150,6 @@ can_do (const gchar *pk_action_id)
+ if (pk_context == NULL)
+ goto out;
+
+- pk_caller = NULL;
+- pk_action = NULL;
+-
+ pk_action = polkit_action_new ();
+ polkit_action_set_action_id (pk_action, pk_action_id);
+
diff --git a/gnome-panel.spec b/gnome-panel.spec
index e3e0b47..d099b49 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -121,6 +121,7 @@ Patch27: populate.patch
Patch28: gnome-panel-larger-find-window.patch
Patch29: set-time-window.patch
Patch30: location-edit.patch
+Patch31: can-do-crash.patch
Conflicts: gnome-power-manager < 2.15.3
@@ -175,6 +176,7 @@ Panel Applets using the libpanel-applet library.
%patch28 -p1 -b .larger-find-window
%patch29 -p1 -b .set-time-window
%patch30 -p1 -b .location-edit
+%patch31 -p1 -b .can-do-crash
. %{SOURCE6}
@@ -359,6 +361,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Wed Apr 2 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.0-9
+- Fix a possible crash in the clock applet
+
* Fri Mar 28 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.0-8
- Fix editing of locations in the clock applet
commit 864031348b3cb70ff6237107c9f7a262f6691821
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Mar 28 15:27:52 2008 +0000
fix location editing
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 678a043..e3e0b47 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.22.0
-Release: 7%{?dist}
+Release: 8%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.22/%{name}-%{version}.tar...
@@ -120,6 +120,7 @@ Patch26: expose.patch
Patch27: populate.patch
Patch28: gnome-panel-larger-find-window.patch
Patch29: set-time-window.patch
+Patch30: location-edit.patch
Conflicts: gnome-power-manager < 2.15.3
@@ -173,6 +174,7 @@ Panel Applets using the libpanel-applet library.
%patch27 -p1 -b .populate
%patch28 -p1 -b .larger-find-window
%patch29 -p1 -b .set-time-window
+%patch30 -p1 -b .location-edit
. %{SOURCE6}
@@ -357,6 +359,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Fri Mar 28 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.0-8
+- Fix editing of locations in the clock applet
+
* Fri Mar 28 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.0-7
- Convert the edit and find location windows to dialogs
diff --git a/location-edit.patch b/location-edit.patch
new file mode 100644
index 0000000..012423f
--- /dev/null
+++ b/location-edit.patch
@@ -0,0 +1,17 @@
+diff -up gnome-panel-2.22.0/applets/clock/clock.c.location-edit
gnome-panel-2.22.0/applets/clock/clock.c
+--- gnome-panel-2.22.0/applets/clock/clock.c.location-edit 2008-03-28 11:25:10.000000000
-0400
++++ gnome-panel-2.22.0/applets/clock/clock.c 2008-03-28 11:25:16.000000000 -0400
+@@ -1003,6 +1003,13 @@ create_cities_store (ClockData *cd)
+
+ list = list->next;
+ }
++
++
++ if (cd->prefs_window) {
++ GtkWidget *widget = glade_xml_get_widget (cd->glade_xml, "cities_list");
++ gtk_tree_view_set_model (GTK_TREE_VIEW (widget),
++ GTK_TREE_MODEL (cd->cities_store));
++ }
+ }
+
+ static gint
commit ba5e084eed8c8192244e50247852d0940ec51552
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Mar 28 04:25:59 2008 +0000
some more clock improvements
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 864eabb..678a043 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.22.0
-Release: 6%{?dist}
+Release: 7%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.22/%{name}-%{version}.tar...
@@ -357,6 +357,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Fri Mar 28 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.0-7
+- Convert the edit and find location windows to dialogs
+
* Thu Mar 27 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.0-6
- Improve the time settings window
diff --git a/set-time-window.patch b/set-time-window.patch
index 8dcbaf1..39c3985 100644
--- a/set-time-window.patch
+++ b/set-time-window.patch
@@ -1,7 +1,15 @@
diff -up gnome-panel-2.22.0/applets/clock/clock.c.set-time-window
gnome-panel-2.22.0/applets/clock/clock.c
---- gnome-panel-2.22.0/applets/clock/clock.c.set-time-window 2008-03-27
23:07:01.000000000 -0400
-+++ gnome-panel-2.22.0/applets/clock/clock.c 2008-03-27 23:07:01.000000000 -0400
-@@ -1735,6 +1735,14 @@ cancel_time_settings (GtkWidget *button,
+--- gnome-panel-2.22.0/applets/clock/clock.c.set-time-window 2008-03-28
00:21:34.000000000 -0400
++++ gnome-panel-2.22.0/applets/clock/clock.c 2008-03-28 00:22:00.000000000 -0400
+@@ -237,6 +237,7 @@ static void applet_change_orient (PanelA
+ ClockData *cd);
+
+ static void edit_hide (GtkWidget *unused, ClockData *cd);
++static gboolean edit_delete (GtkWidget *unused, GdkEvent *event, ClockData *cd);
+ static void save_cities_store (ClockData *cd);
+
+ static void
+@@ -1735,6 +1736,14 @@ cancel_time_settings (GtkWidget *button,
refresh_clock_timeout (cd);
}
@@ -16,7 +24,7 @@ diff -up gnome-panel-2.22.0/applets/clock/clock.c.set-time-window
gnome-panel-2.
static void
fill_time_settings_window (ClockData *cd)
{
-@@ -1803,6 +1811,8 @@ ensure_time_settings_window_is_created (
+@@ -1803,6 +1812,8 @@ ensure_time_settings_window_is_created (
return;
cd->set_time_window = glade_xml_get_widget (cd->glade_xml,
"set-time-window");
@@ -25,33 +33,154 @@ diff -up gnome-panel-2.22.0/applets/clock/clock.c.set-time-window
gnome-panel-2.
cd->calendar = glade_xml_get_widget (cd->glade_xml,
"calendar");
cd->hours_spin = glade_xml_get_widget (cd->glade_xml,
"hours_spin");
+@@ -3492,6 +3503,14 @@ edit_hide (GtkWidget *unused, ClockData
+ }
+
+ static gboolean
++edit_delete (GtkWidget *unused, GdkEvent *event, ClockData *cd)
++{
++ edit_hide (unused, cd);
++
++ return TRUE;
++}
++
++static gboolean
+ edit_hide_event (GtkWidget *widget, GdkEvent *event, ClockData *cd)
+ {
+ edit_hide (widget, cd);
+@@ -3617,6 +3636,13 @@ run_prefs_locations_add (GtkButton *butt
+
+ g_object_set_data (G_OBJECT (edit_window), "clock-location", NULL);
+ gtk_window_set_transient_for (GTK_WINDOW (edit_window), GTK_WINDOW
(cd->prefs_window));
++
++ if (g_object_get_data (G_OBJECT (edit_window), "delete-handler")
++ == NULL) {
++ g_object_set_data (G_OBJECT (edit_window), "delete-handler",
++ GINT_TO_POINTER (g_signal_connect (edit_window, "delete_event",
G_CALLBACK (edit_delete), cd)));
++ }
++
+ gtk_window_present_with_time (GTK_WINDOW (edit_window),
gtk_get_current_event_time ());
+ }
+
diff -up gnome-panel-2.22.0/applets/clock/clock.glade.set-time-window
gnome-panel-2.22.0/applets/clock/clock.glade
---- gnome-panel-2.22.0/applets/clock/clock.glade.set-time-window 2008-03-27
23:07:17.000000000 -0400
-+++ gnome-panel-2.22.0/applets/clock/clock.glade 2008-03-27 23:07:22.000000000 -0400
-@@ -473,346 +473,13 @@ South</property>
+--- gnome-panel-2.22.0/applets/clock/clock.glade.set-time-window 2008-03-28
00:21:34.000000000 -0400
++++ gnome-panel-2.22.0/applets/clock/clock.glade 2008-03-28 00:22:02.000000000 -0400
+@@ -4,7 +4,7 @@
+ <glade-interface>
+ <requires lib="gnome"/>
+
+-<widget class="GtkWindow" id="edit-location-window">
++<widget class="GtkWindow" id="edit-location-windowx">
+ <property name="title"></property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+@@ -152,7 +152,7 @@
+ </child>
+
+ <child>
+- <widget class="GtkEntry"
id="edit-location-longitude-entry">
++ <widget class="GtkEntry"
id="edit-location-longitude-entryx">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+@@ -173,7 +173,7 @@
+ </child>
+
+ <child>
+- <widget class="GtkComboBox"
id="edit-location-longitude-combo">
++ <widget class="GtkComboBox"
id="edit-location-longitude-combox">
+ <property name="visible">True</property>
+ <property name="items" translatable="yes">East
+ West</property>
+@@ -247,7 +247,7 @@ West</property>
+ </child>
+
+ <child>
+- <widget class="GtkComboBox"
id="edit-location-latitude-combo">
++ <widget class="GtkComboBox"
id="edit-location-latitude-combox">
+ <property name="visible">True</property>
+ <property name="items" translatable="yes">North
+ South</property>
+@@ -265,7 +265,7 @@ South</property>
+ </child>
+
+ <child>
+- <widget class="GtkEntry"
id="edit-location-latitude-entry">
++ <widget class="GtkEntry"
id="edit-location-latitude-entryx">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+@@ -348,7 +348,7 @@ South</property>
+ <property name="spacing">6</property>
+
+ <child>
+- <widget class="GtkEntry" id="edit-location-name-entry">
++ <widget class="GtkEntry" id="edit-location-name-entryx">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+@@ -367,7 +367,7 @@ South</property>
+ </child>
+
+ <child>
+- <widget class="GtkButton" id="find-location-button">
++ <widget class="GtkButton" id="find-location-buttonx">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label"
translatable="yes">Find...</property>
+@@ -393,7 +393,7 @@ South</property>
+ </child>
+
+ <child>
+- <widget class="GtkComboBoxEntry"
id="edit-location-timezone-combo">
++ <widget class="GtkComboBoxEntry"
id="edit-location-timezone-combox">
+ <property name="visible">True</property>
+ <property name="items">Dummy Item</property>
+ <property name="add_tearoffs">False</property>
+@@ -440,7 +440,7 @@ South</property>
+ <property name="spacing">6</property>
+
+ <child>
+- <widget class="GtkButton"
id="edit-location-cancel-button">
++ <widget class="GtkButton"
id="edit-location-cancel-buttonx">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+@@ -452,7 +452,7 @@ South</property>
+ </child>
+
+ <child>
+- <widget class="GtkButton" id="edit-location-ok-button">
++ <widget class="GtkButton" id="edit-location-ok-buttonx">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+@@ -473,12 +473,13 @@ South</property>
</child>
</widget>
-<widget class="GtkWindow" id="set-time-window">
- <property name="border_width">12</property>
- <property name="title" translatable="yes">Time
Settings</property>
-- <property name="type">GTK_WINDOW_TOPLEVEL</property>
-- <property name="window_position">GTK_WIN_POS_NONE</property>
-- <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>
--
-- <child>
++<widget class="GtkWindow" id="find-location-windowx">
++ <property name="title" translatable="yes"></property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">False</property>
++ <property name="default_width">400</property>
++ <property name="default_height">500</property>
+ <property name="resizable">True</property>
+ <property name="destroy_with_parent">False</property>
+ <property name="decorated">True</property>
+@@ -490,141 +491,91 @@ South</property>
+ <property name="urgency_hint">False</property>
+
+ <child>
- <widget class="GtkVBox" id="vbox20">
-- <property name="visible">True</property>
-- <property name="homogeneous">False</property>
++ <widget class="GtkVBox" id="vbox25">
++ <property name="border_width">12</property>
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
@@ -78,16 +207,20 @@ diff -up gnome-panel-2.22.0/applets/clock/clock.glade.set-time-window
gnome-pane
- <property name="fill">False</property>
- </packing>
- </child>
--
-- <child>
++ <property name="spacing">24</property>
+
+ <child>
- <widget class="GtkHBox" id="time_settings_box">
-- <property name="visible">True</property>
-- <property name="homogeneous">False</property>
++ <widget class="GtkVBox" id="vbox26">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
- <property name="spacing">0</property>
--
-- <child>
++ <property name="spacing">6</property>
+
+ <child>
- <widget class="GtkLabel" id="label217">
-- <property name="visible">True</property>
++ <widget class="GtkScrolledWindow" id="scrolledwindow11">
+ <property name="visible">True</property>
- <property name="label"> </property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
@@ -102,36 +235,78 @@ diff -up
gnome-panel-2.22.0/applets/clock/clock.glade.set-time-window gnome-pane
- <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="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="find-location-treex">
++ <property name="visible">True</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">False</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>
- <property name="expand">False</property>
- <property name="fill">False</property>
-- </packing>
-- </child>
--
-- <child>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
- <widget class="GtkHBox" id="hbox52">
-- <property name="visible">True</property>
-- <property name="homogeneous">False</property>
++ <widget class="GtkHBox" id="hbox56">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
- <property name="spacing">12</property>
--
-- <child>
++ <property name="spacing">6</property>
+
+ <child>
- <widget class="GtkCalendar" id="calendar">
-- <property name="visible">True</property>
++ <widget class="GtkLabel" id="label221">
+ <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="display_options">GTK_CALENDAR_SHOW_HEADING</property>
-- </widget>
-- <packing>
-- <property name="padding">0</property>
++ <property name="label"
translatable="yes">_Find:</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.5</property>
++ <property name="yalign">0.5</property>
++ <property name="xpad">0</property>
++ <property name="ypad">0</property>
++ <property
name="mnemonic_widget">find-location-entryx</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">True</property>
- <property name="fill">True</property>
-- </packing>
-- </child>
--
-- <child>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
- <widget class="GtkVBox" id="vbox22">
-- <property name="visible">True</property>
++ <widget class="GtkEntry" id="find-location-entryx">
+ <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
@@ -184,23 +359,34 @@ diff -up
gnome-panel-2.22.0/applets/clock/clock.glade.set-time-window gnome-pane
- <property name="fill">False</property>
- </packing>
- </child>
-- </widget>
-- <packing>
-- <property name="padding">0</property>
-- <property name="expand">True</property>
-- <property name="fill">True</property>
-- </packing>
-- </child>
--
-- <child>
++ <property name="can_focus">True</property>
++ <property name="editable">True</property>
++ <property name="visibility">True</property>
++ <property name="max_length">0</property>
++ <property name="text"
translatable="yes"></property>
++ <property name="has_frame">True</property>
++ <property name="invisible_char"></property>
++ <property name="activates_default">False</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+@@ -634,357 +585,71 @@ South</property>
+ </child>
+
+ <child>
- <widget class="GtkVBox" id="vbox23">
-- <property name="visible">True</property>
++ <widget class="GtkButton" id="find-next-location-buttonx">
+ <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
--
-- <child>
++ <property name="can_focus">True</property>
++ <property name="relief">GTK_RELIEF_NORMAL</property>
++ <property name="focus_on_click">True</property>
+
+ <child>
- <widget class="GtkLabel" id="current_time_label">
-- <property name="visible">True</property>
++ <widget class="GtkAlignment" id="alignment31">
+ <property name="visible">True</property>
- <property name="label">23:59:59</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
@@ -208,7 +394,8 @@ diff -up gnome-panel-2.22.0/applets/clock/clock.glade.set-time-window
gnome-pane
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
-- <property name="yalign">0.5</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>
@@ -228,10 +415,17 @@ diff -up
gnome-panel-2.22.0/applets/clock/clock.glade.set-time-window gnome-pane
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
--
-- <child>
++ <property name="xscale">0</property>
++ <property name="yscale">0</property>
++ <property name="top_padding">0</property>
++ <property name="bottom_padding">0</property>
++ <property name="left_padding">0</property>
++ <property name="right_padding">0</property>
+
+ <child>
- <widget class="GtkSpinButton" id="hours_spin">
-- <property name="visible">True</property>
++ <widget class="GtkHBox" id="hbox57">
+ <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="climb_rate">1</property>
- <property name="digits">0</property>
@@ -247,7 +441,9 @@ diff -up gnome-panel-2.22.0/applets/clock/clock.glade.set-time-window
gnome-pane
- <property name="fill">True</property>
- </packing>
- </child>
--
++ <property name="homogeneous">False</property>
++ <property name="spacing">2</property>
+
- <child>
- <widget class="GtkSpinButton" id="minutes_spin">
- <property name="visible">True</property>
@@ -266,7 +462,23 @@ diff -up gnome-panel-2.22.0/applets/clock/clock.glade.set-time-window
gnome-pane
- <property name="fill">True</property>
- </packing>
- </child>
--
++ <child>
++ <widget class="GtkImage" id="image29">
++ <property name="visible">True</property>
++ <property name="stock">gtk-find</property>
++ <property name="icon_size">4</property>
++ <property name="xalign">0.5</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>
+
- <child>
- <widget class="GtkSpinButton" id="seconds_spin">
- <property name="visible">True</property>
@@ -367,26 +579,229 @@ diff -up
gnome-panel-2.22.0/applets/clock/clock.glade.set-time-window gnome-pane
- </child>
-</widget>
-
- <widget class="GtkWindow" id="find-location-window">
- <property name="title" translatable="yes"></property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
-+ <property name="default_width">400</property>
-+ <property name="default_height">500</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
-@@ -822,8 +489,6 @@ South</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
+-<widget class="GtkWindow" id="find-location-window">
+- <property name="title" translatable="yes"></property>
+- <property name="type">GTK_WINDOW_TOPLEVEL</property>
+- <property name="window_position">GTK_WIN_POS_NONE</property>
+- <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="default_width">400</property>
- <property name="default_height">500</property>
+-
+- <child>
+- <widget class="GtkVBox" id="vbox25">
+- <property name="border_width">12</property>
+- <property name="visible">True</property>
+- <property name="homogeneous">False</property>
+- <property name="spacing">24</property>
+-
+- <child>
+- <widget class="GtkVBox" id="vbox26">
+- <property name="visible">True</property>
+- <property name="homogeneous">False</property>
+- <property name="spacing">6</property>
+-
+- <child>
+- <widget class="GtkScrolledWindow" id="scrolledwindow11">
+- <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="find-location-tree">
+- <property name="visible">True</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">False</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>
+- <property name="expand">True</property>
+- <property name="fill">True</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkHBox" id="hbox56">
+- <property name="visible">True</property>
+- <property name="homogeneous">False</property>
+- <property name="spacing">6</property>
+-
+- <child>
+- <widget class="GtkLabel" id="label221">
+- <property name="visible">True</property>
+- <property name="label"
translatable="yes">_Find:</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.5</property>
+- <property name="yalign">0.5</property>
+- <property name="xpad">0</property>
+- <property name="ypad">0</property>
+- <property
name="mnemonic_widget">find-location-entry</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="GtkEntry" id="find-location-entry">
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="editable">True</property>
+- <property name="visibility">True</property>
+- <property name="max_length">0</property>
+- <property name="text"
translatable="yes"></property>
+- <property name="has_frame">True</property>
+- <property name="invisible_char"></property>
+- <property name="activates_default">False</property>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">True</property>
+- <property name="fill">True</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkButton" id="find-next-location-button">
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="relief">GTK_RELIEF_NORMAL</property>
+- <property name="focus_on_click">True</property>
+-
+- <child>
+- <widget class="GtkAlignment" id="alignment31">
+- <property name="visible">True</property>
+- <property name="xalign">0.5</property>
+- <property name="yalign">0.5</property>
+- <property name="xscale">0</property>
+- <property name="yscale">0</property>
+- <property name="top_padding">0</property>
+- <property name="bottom_padding">0</property>
+- <property name="left_padding">0</property>
+- <property name="right_padding">0</property>
+-
+- <child>
+- <widget class="GtkHBox" id="hbox57">
+- <property name="visible">True</property>
+- <property name="homogeneous">False</property>
+- <property name="spacing">2</property>
+-
+- <child>
+- <widget class="GtkImage" id="image29">
+- <property name="visible">True</property>
+- <property name="stock">gtk-find</property>
+- <property name="icon_size">4</property>
+- <property name="xalign">0.5</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>
+-
+- <child>
+- <widget class="GtkLabel" id="label222">
+- <property name="visible">True</property>
+- <property name="label" translatable="yes">Find
_Next</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.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="GtkLabel" id="label222">
++ <property name="visible">True</property>
++ <property name="label" translatable="yes">Find
_Next</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.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>
+ </widget>
+ </child>
+ </widget>
+@@ -1018,7 +683,7 @@ South</property>
+ <property name="spacing">0</property>
- <child>
- <widget class="GtkVBox" id="vbox25">
-@@ -1840,4 +1505,342 @@ South</property>
+ <child>
+- <widget class="GtkButton"
id="find-location-cancel-button">
++ <widget class="GtkButton"
id="find-location-cancel-buttonx">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+@@ -1030,7 +695,7 @@ South</property>
+ </child>
+
+ <child>
+- <widget class="GtkButton" id="find-location-ok-button">
++ <widget class="GtkButton" id="find-location-ok-buttonx">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+@@ -1840,4 +1505,1060 @@ South</property>
</child>
</widget>
@@ -728,4 +1143,722 @@ diff -up
gnome-panel-2.22.0/applets/clock/clock.glade.set-time-window gnome-pane
+ </child>
+</widget>
+
++<widget class="GtkDialog" id="edit-location-window">
++ <property name="border_width">5</property>
++ <property name="title"></property>
++ <property name="type">GTK_WINDOW_TOPLEVEL</property>
++ <property name="window_position">GTK_WIN_POS_NONE</property>
++ <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">
++ <widget class="GtkVBox" id="dialog-vbox3">
++ <property name="visible">True</property>
++ <property name="homogeneous">False</property>
++ <property name="spacing">0</property>
++
++ <child internal-child="action_area">
++ <widget class="GtkHButtonBox" id="dialog-action_area3">
++ <property name="visible">True</property>
++ <property name="layout_style">GTK_BUTTONBOX_END</property>
++
++ <child>
++ <widget class="GtkButton"
id="edit-location-cancel-button">
++ <property name="visible">True</property>
++ <property name="can_default">True</property>
++ <property name="can_focus">True</property>
++ <property name="label">gtk-cancel</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">-6</property>
++ </widget>
++ </child>
++
++ <child>
++ <widget class="GtkButton" id="edit-location-ok-button">
++ <property name="visible">True</property>
++ <property name="can_default">True</property>
++ <property name="can_focus">True</property>
++ <property name="label">gtk-ok</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">-5</property>
++ </widget>
++ </child>
++ </widget>
++ <packing>
++ <property name="padding">0</property>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
++ <property name="pack_type">GTK_PACK_END</property>
++ </packing>
++ </child>
++
++ <child>
++ <widget class="GtkTable" id="table26">
++ <property name="visible">True</property>
++ <property name="n_rows">1</property>
++ <property name="n_columns">3</property>
++ <property name="homogeneous">False</property>
++ <property name="row_spacing">6</property>
++ <property name="column_spacing">6</property>
++
++ <child>
++ <widget class="GtkVBox" id="vbox34">
++ <property name="visible">True</property>
++ <property name="homogeneous">False</property>
++ <property name="spacing">6</property>
++
++ <child>
++ <widget class="GtkScrolledWindow" id="scrolledwindow12">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property
name="hscrollbar_policy">GTK_POLICY_NEVER</property>
++ <property
name="vscrollbar_policy">GTK_POLICY_NEVER</property>
++ <property name="shadow_type">GTK_SHADOW_NONE</property>
++ <property
name="window_placement">GTK_CORNER_TOP_LEFT</property>
++
++ <child>
++ <widget class="GtkViewport" id="viewport3">
++ <property name="visible">True</property>
++ <property name="shadow_type">GTK_SHADOW_NONE</property>
++
++ <child>
++ <widget class="GtkImage" id="image30">
++ <property name="visible">True</property>
++ <property name="xalign">0.5</property>
++ <property name="yalign">0.5</property>
++ <property name="xpad">0</property>
++ <property name="ypad">0</property>
++ </widget>
++ </child>
++ </widget>
++ </child>
++ </widget>
++ <packing>
++ <property name="padding">0</property>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
++ </packing>
++ </child>
++
++ <child>
++ <widget class="GtkTable" id="table27">
++ <property name="border_width">5</property>
++ <property name="visible">True</property>
++ <property name="n_rows">4</property>
++ <property name="n_columns">4</property>
++ <property name="homogeneous">False</property>
++ <property name="row_spacing">6</property>
++ <property name="column_spacing">6</property>
++
++ <child>
++ <widget class="GtkVBox" id="vbox35">
++ <property name="visible">True</property>
++ <property name="homogeneous">True</property>
++ <property name="spacing">6</property>
++
++ <child>
++ <widget class="GtkLabel" id="label237">
++ <property name="visible">True</property>
++ <property name="label"
translatable="yes">Latitude:</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="padding">0</property>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ </packing>
++ </child>
++ </widget>
++ <packing>
++ <property name="left_attach">0</property>
++ <property name="right_attach">1</property>
++ <property name="top_attach">2</property>
++ <property name="bottom_attach">3</property>
++ <property name="x_options">fill</property>
++ </packing>
++ </child>
++
++ <child>
++ <widget class="GtkLabel" id="label238">
++ <property name="visible">True</property>
++ <property name="label"
translatable="yes">Longitude:</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">3</property>
++ <property name="bottom_attach">4</property>
++ <property name="x_options">fill</property>
++ <property name="y_options"></property>
++ </packing>
++ </child>
++
++ <child>
++ <widget class="GtkEntry"
id="edit-location-longitude-entry">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="editable">True</property>
++ <property name="visibility">True</property>
++ <property name="max_length">0</property>
++ <property name="text"
translatable="yes"></property>
++ <property name="has_frame">True</property>
++ <property name="invisible_char"></property>
++ <property name="activates_default">False</property>
++ </widget>
++ <packing>
++ <property name="left_attach">1</property>
++ <property name="right_attach">2</property>
++ <property name="top_attach">3</property>
++ <property name="bottom_attach">4</property>
++ <property name="y_options"></property>
++ </packing>
++ </child>
++
++ <child>
++ <widget class="GtkComboBox"
id="edit-location-longitude-combo">
++ <property name="visible">True</property>
++ <property name="items" translatable="yes">East
++West</property>
++ <property name="add_tearoffs">False</property>
++ <property name="focus_on_click">True</property>
++ </widget>
++ <packing>
++ <property name="left_attach">2</property>
++ <property name="right_attach">3</property>
++ <property name="top_attach">3</property>
++ <property name="bottom_attach">4</property>
++ <property name="x_options">fill</property>
++ <property name="y_options">fill</property>
++ </packing>
++ </child>
++
++ <child>
++ <widget class="GtkLabel" id="label239">
++ <property name="visible">True</property>
++ <property name="label"
translatable="yes"><i>(optional)</i></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="left_attach">3</property>
++ <property name="right_attach">4</property>
++ <property name="top_attach">3</property>
++ <property name="bottom_attach">4</property>
++ <property name="x_options">fill</property>
++ <property name="y_options"></property>
++ </packing>
++ </child>
++
++ <child>
++ <widget class="GtkLabel" id="label240">
++ <property name="visible">True</property>
++ <property name="label"
translatable="yes"><i>(optional)</i></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="left_attach">3</property>
++ <property name="right_attach">4</property>
++ <property name="top_attach">2</property>
++ <property name="bottom_attach">3</property>
++ <property name="x_options">fill</property>
++ <property name="y_options"></property>
++ </packing>
++ </child>
++
++ <child>
++ <widget class="GtkComboBox"
id="edit-location-latitude-combo">
++ <property name="visible">True</property>
++ <property name="items" translatable="yes">North
++South</property>
++ <property name="add_tearoffs">False</property>
++ <property name="focus_on_click">True</property>
++ </widget>
++ <packing>
++ <property name="left_attach">2</property>
++ <property name="right_attach">3</property>
++ <property name="top_attach">2</property>
++ <property name="bottom_attach">3</property>
++ <property name="x_options">fill</property>
++ <property name="y_options">fill</property>
++ </packing>
++ </child>
++
++ <child>
++ <widget class="GtkEntry"
id="edit-location-latitude-entry">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="editable">True</property>
++ <property name="visibility">True</property>
++ <property name="max_length">0</property>
++ <property name="text"
translatable="yes"></property>
++ <property name="has_frame">True</property>
++ <property name="invisible_char"></property>
++ <property name="activates_default">False</property>
++ </widget>
++ <packing>
++ <property name="left_attach">1</property>
++ <property name="right_attach">2</property>
++ <property name="top_attach">2</property>
++ <property name="bottom_attach">3</property>
++ <property name="y_options"></property>
++ </packing>
++ </child>
++
++ <child>
++ <widget class="GtkLabel" id="label241">
++ <property name="visible">True</property>
++ <property name="label" translatable="yes">Location
Name:</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">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="label242">
++ <property name="visible">True</property>
++ <property name="label"
translatable="yes">Timezone:</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="GtkHBox" id="hbox62">
++ <property name="visible">True</property>
++ <property name="homogeneous">False</property>
++ <property name="spacing">6</property>
++
++ <child>
++ <widget class="GtkEntry" id="edit-location-name-entry">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="editable">True</property>
++ <property name="visibility">True</property>
++ <property name="max_length">0</property>
++ <property name="text"
translatable="yes"></property>
++ <property name="has_frame">True</property>
++ <property name="invisible_char"></property>
++ <property name="activates_default">False</property>
++ </widget>
++ <packing>
++ <property name="padding">0</property>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
++ </packing>
++ </child>
++
++ <child>
++ <widget class="GtkButton" id="find-location-button">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="label"
translatable="yes">Find...</property>
++ <property name="use_underline">True</property>
++ <property name="relief">GTK_RELIEF_NORMAL</property>
++ <property name="focus_on_click">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="left_attach">1</property>
++ <property name="right_attach">4</property>
++ <property name="top_attach">0</property>
++ <property name="bottom_attach">1</property>
++ <property name="x_options">fill</property>
++ <property name="y_options">fill</property>
++ </packing>
++ </child>
++
++ <child>
++ <widget class="GtkComboBoxEntry"
id="edit-location-timezone-combo">
++ <property name="visible">True</property>
++ <property name="items">Dummy Item</property>
++ <property name="add_tearoffs">False</property>
++ <property name="has_frame">True</property>
++ <property name="focus_on_click">True</property>
++ </widget>
++ <packing>
++ <property name="left_attach">1</property>
++ <property name="right_attach">4</property>
++ <property name="top_attach">1</property>
++ <property name="bottom_attach">2</property>
++ <property name="x_options">fill</property>
++ <property name="y_options">fill</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="left_attach">0</property>
++ <property name="right_attach">3</property>
++ <property name="top_attach">0</property>
++ <property name="bottom_attach">1</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>
++ </widget>
++ </child>
++</widget>
++
++<widget class="GtkDialog" id="find-location-window">
++ <property name="border_width">5</property>
++ <property name="title" translatable="yes"></property>
++ <property name="type">GTK_WINDOW_TOPLEVEL</property>
++ <property name="window_position">GTK_WIN_POS_NONE</property>
++ <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">
++ <widget class="GtkVBox" id="dialog-vbox4">
++ <property name="visible">True</property>
++ <property name="homogeneous">False</property>
++ <property name="spacing">0</property>
++
++ <child internal-child="action_area">
++ <widget class="GtkHButtonBox" id="dialog-action_area4">
++ <property name="visible">True</property>
++ <property name="layout_style">GTK_BUTTONBOX_END</property>
++
++ <child>
++ <widget class="GtkButton"
id="find-location-cancel-button">
++ <property name="visible">True</property>
++ <property name="can_default">True</property>
++ <property name="can_focus">True</property>
++ <property name="label">gtk-cancel</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">-6</property>
++ </widget>
++ </child>
++
++ <child>
++ <widget class="GtkButton" id="find-location-ok-button">
++ <property name="visible">True</property>
++ <property name="can_default">True</property>
++ <property name="can_focus">True</property>
++ <property name="label">gtk-ok</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">-5</property>
++ </widget>
++ </child>
++ </widget>
++ <packing>
++ <property name="padding">0</property>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
++ <property name="pack_type">GTK_PACK_END</property>
++ </packing>
++ </child>
++
++ <child>
++ <widget class="GtkVBox" id="vbox36">
++ <property name="border_width">5</property>
++ <property name="visible">True</property>
++ <property name="homogeneous">False</property>
++ <property name="spacing">6</property>
++
++ <child>
++ <widget class="GtkScrolledWindow" id="scrolledwindow13">
++ <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="find-location-tree">
++ <property name="visible">True</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">False</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>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
++ </packing>
++ </child>
++
++ <child>
++ <widget class="GtkHBox" id="hbox63">
++ <property name="visible">True</property>
++ <property name="homogeneous">False</property>
++ <property name="spacing">6</property>
++
++ <child>
++ <widget class="GtkLabel" id="label243">
++ <property name="visible">True</property>
++ <property name="label"
translatable="yes">_Find:</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.5</property>
++ <property name="yalign">0.5</property>
++ <property name="xpad">0</property>
++ <property name="ypad">0</property>
++ <property
name="mnemonic_widget">find-location-entry</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="GtkEntry" id="find-location-entry">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="editable">True</property>
++ <property name="visibility">True</property>
++ <property name="max_length">0</property>
++ <property name="text"
translatable="yes"></property>
++ <property name="has_frame">True</property>
++ <property name="invisible_char"></property>
++ <property name="activates_default">False</property>
++ </widget>
++ <packing>
++ <property name="padding">0</property>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
++ </packing>
++ </child>
++
++ <child>
++ <widget class="GtkButton" id="find-next-location-button">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="relief">GTK_RELIEF_NORMAL</property>
++ <property name="focus_on_click">True</property>
++
++ <child>
++ <widget class="GtkAlignment" id="alignment35">
++ <property name="visible">True</property>
++ <property name="xalign">0.5</property>
++ <property name="yalign">0.5</property>
++ <property name="xscale">0</property>
++ <property name="yscale">0</property>
++ <property name="top_padding">0</property>
++ <property name="bottom_padding">0</property>
++ <property name="left_padding">0</property>
++ <property name="right_padding">0</property>
++
++ <child>
++ <widget class="GtkHBox" id="hbox64">
++ <property name="visible">True</property>
++ <property name="homogeneous">False</property>
++ <property name="spacing">2</property>
++
++ <child>
++ <widget class="GtkImage" id="image31">
++ <property name="visible">True</property>
++ <property name="stock">gtk-find</property>
++ <property name="icon_size">4</property>
++ <property name="xalign">0.5</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>
++
++ <child>
++ <widget class="GtkLabel" id="label244">
++ <property name="visible">True</property>
++ <property name="label" translatable="yes">Find
_Next</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.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>
++ </widget>
++ </child>
++ </widget>
++ </child>
++ </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>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ </packing>
++ </child>
++ </widget>
++ <packing>
++ <property name="padding">0</property>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
++ </packing>
++ </child>
++ </widget>
++ </child>
++</widget>
++
</glade-interface>
commit d6f4fc12674f547a799d67318800add79a6f045f
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Mar 28 03:11:15 2008 +0000
Improve the time settings window
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 91bc4f6..864eabb 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.22.0
-Release: 5%{?dist}
+Release: 6%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.22/%{name}-%{version}.tar...
@@ -118,9 +118,8 @@ Patch26: expose.patch
# fixed upstream
Patch27: populate.patch
-
-# fixed upstream
Patch28: gnome-panel-larger-find-window.patch
+Patch29: set-time-window.patch
Conflicts: gnome-power-manager < 2.15.3
@@ -173,6 +172,7 @@ Panel Applets using the libpanel-applet library.
%patch26 -p1 -b .expose
%patch27 -p1 -b .populate
%patch28 -p1 -b .larger-find-window
+%patch29 -p1 -b .set-time-window
. %{SOURCE6}
@@ -357,6 +357,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Thu Mar 27 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.0-6
+- Improve the time settings window
+
* Thu Mar 27 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.0-5
- Make the find-location window of the clock larger
diff --git a/set-time-window.patch b/set-time-window.patch
new file mode 100644
index 0000000..8dcbaf1
--- /dev/null
+++ b/set-time-window.patch
@@ -0,0 +1,731 @@
+diff -up gnome-panel-2.22.0/applets/clock/clock.c.set-time-window
gnome-panel-2.22.0/applets/clock/clock.c
+--- gnome-panel-2.22.0/applets/clock/clock.c.set-time-window 2008-03-27
23:07:01.000000000 -0400
++++ gnome-panel-2.22.0/applets/clock/clock.c 2008-03-27 23:07:01.000000000 -0400
+@@ -1735,6 +1735,14 @@ cancel_time_settings (GtkWidget *button,
+ refresh_clock_timeout (cd);
+ }
+
++static gboolean
++delete_time_settings (GtkWidget *widget, GdkEvent *event, gpointer data)
++{
++ cancel_time_settings (widget, data);
++
++ return TRUE;
++}
++
+ static void
+ fill_time_settings_window (ClockData *cd)
+ {
+@@ -1803,6 +1811,8 @@ ensure_time_settings_window_is_created (
+ return;
+
+ cd->set_time_window = glade_xml_get_widget (cd->glade_xml,
"set-time-window");
++ g_signal_connect (cd->set_time_window, "delete_event",
++ G_CALLBACK (delete_time_settings), cd);
+
+ cd->calendar = glade_xml_get_widget (cd->glade_xml,
"calendar");
+ cd->hours_spin = glade_xml_get_widget (cd->glade_xml,
"hours_spin");
+diff -up gnome-panel-2.22.0/applets/clock/clock.glade.set-time-window
gnome-panel-2.22.0/applets/clock/clock.glade
+--- gnome-panel-2.22.0/applets/clock/clock.glade.set-time-window 2008-03-27
23:07:17.000000000 -0400
++++ gnome-panel-2.22.0/applets/clock/clock.glade 2008-03-27 23:07:22.000000000 -0400
+@@ -473,346 +473,13 @@ South</property>
+ </child>
+ </widget>
+
+-<widget class="GtkWindow" id="set-time-window">
+- <property name="border_width">12</property>
+- <property name="title" translatable="yes">Time
Settings</property>
+- <property name="type">GTK_WINDOW_TOPLEVEL</property>
+- <property name="window_position">GTK_WIN_POS_NONE</property>
+- <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>
+-
+- <child>
+- <widget class="GtkVBox" id="vbox20">
+- <property name="visible">True</property>
+- <property name="homogeneous">False</property>
+- <property name="spacing">6</property>
+-
+- <child>
+- <widget class="GtkLabel" id="label212">
+- <property name="visible">True</property>
+- <property name="label"
translatable="yes"><b>Time
Settings</b></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="time_settings_box">
+- <property name="visible">True</property>
+- <property name="homogeneous">False</property>
+- <property name="spacing">0</property>
+-
+- <child>
+- <widget class="GtkLabel" id="label217">
+- <property name="visible">True</property>
+- <property name="label"> </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="GtkHBox" id="hbox52">
+- <property name="visible">True</property>
+- <property name="homogeneous">False</property>
+- <property name="spacing">12</property>
+-
+- <child>
+- <widget class="GtkCalendar" id="calendar">
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property
name="display_options">GTK_CALENDAR_SHOW_HEADING</property>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">True</property>
+- <property name="fill">True</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkVBox" id="vbox22">
+- <property name="visible">True</property>
+- <property name="homogeneous">False</property>
+- <property name="spacing">6</property>
+-
+- <child>
+- <widget class="GtkLabel" id="label218">
+- <property name="visible">True</property>
+- <property name="label" translatable="yes">Current
Time:</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="padding">0</property>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkLabel" id="label219">
+- <property name="visible">True</property>
+- <property name="label"
translatable="yes">Time:</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="padding">0</property>
+- <property name="expand">False</property>
+- <property name="fill">False</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="GtkVBox" id="vbox23">
+- <property name="visible">True</property>
+- <property name="homogeneous">False</property>
+- <property name="spacing">6</property>
+-
+- <child>
+- <widget class="GtkLabel" id="current_time_label">
+- <property name="visible">True</property>
+- <property name="label">23:59:59</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="padding">0</property>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkHBox" id="hbox53">
+- <property name="visible">True</property>
+- <property name="homogeneous">False</property>
+- <property name="spacing">0</property>
+-
+- <child>
+- <widget class="GtkSpinButton" id="hours_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">True</property>
+- <property name="adjustment">23 0 23 1 12 12</property>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">True</property>
+- <property name="fill">True</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkSpinButton" id="minutes_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">True</property>
+- <property name="adjustment">59 0 59 1 30 30</property>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">True</property>
+- <property name="fill">True</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkSpinButton" id="seconds_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">True</property>
+- <property name="adjustment">59 0 59 1 30 30</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">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">False</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkHBox" id="hbox58">
+- <property name="visible">True</property>
+- <property name="homogeneous">False</property>
+- <property name="spacing">0</property>
+-
+- <child>
+- <widget class="GtkHButtonBox" id="hbuttonbox21">
+- <property name="visible">True</property>
+- <property name="layout_style">GTK_BUTTONBOX_END</property>
+- <property name="spacing">6</property>
+-
+- <child>
+- <widget class="GtkButton" id="cancel-set-time-button">
+- <property name="visible">True</property>
+- <property name="can_default">True</property>
+- <property name="can_focus">True</property>
+- <property name="label">gtk-cancel</property>
+- <property name="use_stock">True</property>
+- <property name="relief">GTK_RELIEF_NORMAL</property>
+- <property name="focus_on_click">True</property>
+- </widget>
+- </child>
+-
+- <child>
+- <widget class="GtkButton" id="set-time-button">
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="label" translatable="yes">Set System
Time</property>
+- <property name="use_underline">True</property>
+- <property name="relief">GTK_RELIEF_NORMAL</property>
+- <property name="focus_on_click">True</property>
+- </widget>
+- </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">False</property>
+- <property name="pack_type">GTK_PACK_END</property>
+- </packing>
+- </child>
+- </widget>
+- </child>
+-</widget>
+-
+ <widget class="GtkWindow" id="find-location-window">
+ <property name="title" translatable="yes"></property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">False</property>
++ <property name="default_width">400</property>
++ <property name="default_height">500</property>
+ <property name="resizable">True</property>
+ <property name="destroy_with_parent">False</property>
+ <property name="decorated">True</property>
+@@ -822,8 +489,6 @@ South</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
+- <property name="default_width">400</property>
+- <property name="default_height">500</property>
+
+ <child>
+ <widget class="GtkVBox" id="vbox25">
+@@ -1840,4 +1505,342 @@ South</property>
+ </child>
+ </widget>
+
++<widget class="GtkDialog" id="set-time-window">
++ <property name="border_width">5</property>
++ <property name="title" translatable="yes">Time
Settings</property>
++ <property name="type">GTK_WINDOW_TOPLEVEL</property>
++ <property name="window_position">GTK_WIN_POS_NONE</property>
++ <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">
++ <widget class="GtkVBox" id="dialog-vbox2">
++ <property name="visible">True</property>
++ <property name="homogeneous">False</property>
++ <property name="spacing">0</property>
++
++ <child internal-child="action_area">
++ <widget class="GtkHButtonBox" id="dialog-action_area2">
++ <property name="visible">True</property>
++ <property name="layout_style">GTK_BUTTONBOX_END</property>
++
++ <child>
++ <widget class="GtkButton" id="cancel-set-time-button">
++ <property name="visible">True</property>
++ <property name="can_default">True</property>
++ <property name="can_focus">True</property>
++ <property name="label">gtk-cancel</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>
++
++ <child>
++ <widget class="GtkButton" id="set-time-button">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="label" translatable="yes">Set System
Time</property>
++ <property name="use_underline">True</property>
++ <property name="relief">GTK_RELIEF_NORMAL</property>
++ <property name="focus_on_click">True</property>
++ <property name="response_id">0</property>
++ </widget>
++ </child>
++ </widget>
++ <packing>
++ <property name="padding">0</property>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
++ <property name="pack_type">GTK_PACK_END</property>
++ </packing>
++ </child>
++
++ <child>
++ <widget class="GtkVBox" id="vbox31">
++ <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="label233">
++ <property name="visible">True</property>
++ <property name="label"
translatable="yes"><b>Time
Settings</b></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="time_settings_box">
++ <property name="visible">True</property>
++ <property name="homogeneous">False</property>
++ <property name="spacing">0</property>
++
++ <child>
++ <widget class="GtkLabel" id="label234">
++ <property name="visible">True</property>
++ <property name="label"> </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="GtkHBox" id="hbox60">
++ <property name="visible">True</property>
++ <property name="homogeneous">False</property>
++ <property name="spacing">12</property>
++
++ <child>
++ <widget class="GtkCalendar" id="calendar">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property
name="display_options">GTK_CALENDAR_SHOW_HEADING</property>
++ </widget>
++ <packing>
++ <property name="padding">0</property>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
++ </packing>
++ </child>
++
++ <child>
++ <widget class="GtkVBox" id="vbox32">
++ <property name="visible">True</property>
++ <property name="homogeneous">False</property>
++ <property name="spacing">6</property>
++
++ <child>
++ <widget class="GtkLabel" id="label235">
++ <property name="visible">True</property>
++ <property name="label" translatable="yes">Current
Time:</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="padding">0</property>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ </packing>
++ </child>
++
++ <child>
++ <widget class="GtkLabel" id="label236">
++ <property name="visible">True</property>
++ <property name="label"
translatable="yes">Time:</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="padding">0</property>
++ <property name="expand">False</property>
++ <property name="fill">False</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="GtkVBox" id="vbox33">
++ <property name="visible">True</property>
++ <property name="homogeneous">False</property>
++ <property name="spacing">6</property>
++
++ <child>
++ <widget class="GtkLabel" id="current_time_label">
++ <property name="visible">True</property>
++ <property name="label">23:59:59</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="padding">0</property>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ </packing>
++ </child>
++
++ <child>
++ <widget class="GtkHBox" id="hbox61">
++ <property name="visible">True</property>
++ <property name="homogeneous">False</property>
++ <property name="spacing">0</property>
++
++ <child>
++ <widget class="GtkSpinButton" id="hours_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">True</property>
++ <property name="adjustment">23 0 23 1 12 12</property>
++ </widget>
++ <packing>
++ <property name="padding">0</property>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
++ </packing>
++ </child>
++
++ <child>
++ <widget class="GtkSpinButton" id="minutes_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">True</property>
++ <property name="adjustment">59 0 59 1 30 30</property>
++ </widget>
++ <packing>
++ <property name="padding">0</property>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
++ </packing>
++ </child>
++
++ <child>
++ <widget class="GtkSpinButton" id="seconds_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">True</property>
++ <property name="adjustment">59 0 59 1 30 30</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">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">False</property>
++ </packing>
++ </child>
++ </widget>
++ <packing>
++ <property name="padding">0</property>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
++ </packing>
++ </child>
++ </widget>
++ </child>
++</widget>
++
+ </glade-interface>
commit a68fb987b9d45acd3c06764979dc32b4ca45c8a4
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Mar 28 01:42:42 2008 +0000
Make the find-location window larger
diff --git a/gnome-panel-larger-find-window.patch b/gnome-panel-larger-find-window.patch
new file mode 100644
index 0000000..087c37f
--- /dev/null
+++ b/gnome-panel-larger-find-window.patch
@@ -0,0 +1,12 @@
+diff -up gnome-panel-2.22.0/applets/clock/clock.glade.larger-find-window
gnome-panel-2.22.0/applets/clock/clock.glade
+--- gnome-panel-2.22.0/applets/clock/clock.glade.larger-find-window 2008-03-27
21:37:32.000000000 -0400
++++ gnome-panel-2.22.0/applets/clock/clock.glade 2008-03-27 21:36:59.000000000 -0400
+@@ -822,6 +822,8 @@ South</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
++ <property name="default_width">400</property>
++ <property name="default_height">500</property>
+
+ <child>
+ <widget class="GtkVBox" id="vbox25">
diff --git a/gnome-panel.spec b/gnome-panel.spec
index d0e5991..91bc4f6 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.22.0
-Release: 4%{?dist}
+Release: 5%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.22/%{name}-%{version}.tar...
@@ -119,6 +119,9 @@ Patch26: expose.patch
# fixed upstream
Patch27: populate.patch
+# fixed upstream
+Patch28: gnome-panel-larger-find-window.patch
+
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -169,6 +172,7 @@ Panel Applets using the libpanel-applet library.
%patch25 -p1 -b .current
%patch26 -p1 -b .expose
%patch27 -p1 -b .populate
+%patch28 -p1 -b .larger-find-window
. %{SOURCE6}
@@ -353,6 +357,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Thu Mar 27 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.0-5
+- Make the find-location window of the clock larger
+
* Sat Mar 15 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.0-4
- Only save the session when the users wants it
commit 66f73496423abc508f45f5d923398dce03b48077
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sun Mar 16 03:52:57 2008 +0000
Don't save sessions unconditionally
diff --git a/gnome-panel-2.21.5-ck-shutdown.patch b/gnome-panel-2.21.5-ck-shutdown.patch
deleted file mode 100644
index ecc9603..0000000
--- a/gnome-panel-2.21.5-ck-shutdown.patch
+++ /dev/null
@@ -1,1128 +0,0 @@
-Index: gnome-panel/gnome-panel/panel-consolekit.c
-===================================================================
---- gnome-panel/gnome-panel/panel-consolekit.c (revision 0)
-+++ gnome-panel/gnome-panel/panel-consolekit.c (revision 0)
-@@ -0,0 +1,618 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
-+ *
-+ * Copyright (C) 2008 Jon McCann <jmccann(a)redhat.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2, or (at your option)
-+ * any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+ * 02111-1307, USA.
-+ */
-+
-+#include "config.h"
-+
-+#include <errno.h>
-+#include <string.h>
-+#include <unistd.h>
-+
-+#include <glib.h>
-+#include <glib-object.h>
-+#include <glib/gi18n.h>
-+
-+#include <dbus/dbus-glib.h>
-+
-+#ifdef HAVE_POLKIT
-+#include <polkit-gnome/polkit-gnome.h>
-+#endif
-+
-+#include "panel-consolekit.h"
-+
-+#define CK_NAME "org.freedesktop.ConsoleKit"
-+#define CK_PATH "/org/freedesktop/ConsoleKit"
-+#define CK_INTERFACE "org.freedesktop.ConsoleKit"
-+
-+#define CK_MANAGER_PATH "/org/freedesktop/ConsoleKit/Manager"
-+#define CK_MANAGER_INTERFACE "org.freedesktop.ConsoleKit.Manager"
-+#define CK_SEAT_INTERFACE "org.freedesktop.ConsoleKit.Seat"
-+#define CK_SESSION_INTERFACE "org.freedesktop.ConsoleKit.Session"
-+
-+#define PANEL_CONSOLEKIT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o),
PANEL_TYPE_CONSOLEKIT, PanelConsolekitPrivate))
-+
-+struct _PanelConsolekitPrivate {
-+ DBusGConnection *dbus_connection;
-+ DBusGProxy *bus_proxy;
-+ DBusGProxy *ck_proxy;
-+ guint32 is_connected : 1;
-+};
-+
-+enum {
-+ PROP_0 = 0,
-+ PROP_IS_CONNECTED
-+};
-+
-+enum {
-+ REQUEST_COMPLETED = 0,
-+ LAST_SIGNAL
-+};
-+
-+static guint signals [LAST_SIGNAL];
-+
-+static void panel_consolekit_class_init (PanelConsolekitClass *klass);
-+static void panel_consolekit_init (PanelConsolekit *ck);
-+static void panel_consolekit_finalize (GObject *object);
-+static void panel_consolekit_on_name_owner_changed (DBusGProxy *bus_proxy,
-+ const char *name,
-+ const char *prev_owner,
-+ const char *new_owner,
-+ PanelConsolekit *manager);
-+
-+G_DEFINE_TYPE (PanelConsolekit, panel_consolekit, G_TYPE_OBJECT);
-+
-+static void
-+panel_consolekit_get_property (GObject *object,
-+ guint prop_id,
-+ GValue *value,
-+ GParamSpec *pspec)
-+{
-+ PanelConsolekit *manager = PANEL_CONSOLEKIT (object);
-+
-+ switch (prop_id) {
-+ case PROP_IS_CONNECTED:
-+ g_value_set_boolean (value,
-+ manager->priv->is_connected);
-+ break;
-+
-+ default:
-+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object,
-+ prop_id,
-+ pspec);
-+ }
-+}
-+
-+static void
-+panel_consolekit_class_init (PanelConsolekitClass *manager_class)
-+{
-+ GObjectClass *object_class;
-+ GParamSpec *param_spec;
-+
-+ object_class = G_OBJECT_CLASS (manager_class);
-+
-+ object_class->finalize = panel_consolekit_finalize;
-+ object_class->get_property = panel_consolekit_get_property;
-+
-+ param_spec = g_param_spec_boolean ("is-connected",
-+ "Is connected",
-+ "Whether the panel is connected to ConsoleKit",
-+ FALSE,
-+ G_PARAM_READABLE);
-+ g_object_class_install_property (object_class, PROP_IS_CONNECTED,
-+ param_spec);
-+
-+ signals [REQUEST_COMPLETED] =
-+ g_signal_new ("request-completed",
-+ G_OBJECT_CLASS_TYPE (object_class),
-+ G_SIGNAL_RUN_LAST,
-+ G_STRUCT_OFFSET (PanelConsolekitClass, request_completed),
-+ NULL,
-+ NULL,
-+ g_cclosure_marshal_VOID__POINTER,
-+ G_TYPE_NONE,
-+ 1, G_TYPE_POINTER);
-+
-+ g_type_class_add_private (manager_class,
-+ sizeof (PanelConsolekitPrivate));
-+}
-+
-+static gboolean
-+panel_consolekit_ensure_ck_connection (PanelConsolekit *manager,
-+ GError **error)
-+{
-+ GError *connection_error;
-+ gboolean is_connected;
-+
-+ connection_error = NULL;
-+ if (manager->priv->dbus_connection == NULL) {
-+ manager->priv->dbus_connection = dbus_g_bus_get (DBUS_BUS_SYSTEM,
-+ &connection_error);
-+
-+ if (manager->priv->dbus_connection == NULL) {
-+ g_propagate_error (error, connection_error);
-+ is_connected = FALSE;
-+ goto out;
-+ }
-+ }
-+
-+ if (manager->priv->bus_proxy == NULL) {
-+ manager->priv->bus_proxy =
-+ dbus_g_proxy_new_for_name_owner (manager->priv->dbus_connection,
-+ DBUS_SERVICE_DBUS,
-+ DBUS_PATH_DBUS,
-+ DBUS_INTERFACE_DBUS,
-+ &connection_error);
-+
-+ if (manager->priv->bus_proxy == NULL) {
-+ g_propagate_error (error, connection_error);
-+ is_connected = FALSE;
-+ goto out;
-+ }
-+
-+ dbus_g_proxy_add_signal (manager->priv->bus_proxy,
-+ "NameOwnerChanged",
-+ G_TYPE_STRING,
-+ G_TYPE_STRING,
-+ G_TYPE_STRING,
-+ G_TYPE_INVALID);
-+ dbus_g_proxy_connect_signal (manager->priv->bus_proxy,
-+ "NameOwnerChanged",
-+ G_CALLBACK (panel_consolekit_on_name_owner_changed),
-+ manager, NULL);
-+ }
-+
-+ if (manager->priv->ck_proxy == NULL) {
-+ manager->priv->ck_proxy =
-+ dbus_g_proxy_new_for_name_owner (manager->priv->dbus_connection,
-+ "org.freedesktop.ConsoleKit",
-+ "/org/freedesktop/ConsoleKit/Manager",
-+ "org.freedesktop.ConsoleKit.Manager",
-+ &connection_error);
-+
-+ if (manager->priv->ck_proxy == NULL) {
-+ g_propagate_error (error, connection_error);
-+ is_connected = FALSE;
-+ goto out;
-+ }
-+ }
-+ is_connected = TRUE;
-+
-+out:
-+ if (manager->priv->is_connected != is_connected) {
-+ manager->priv->is_connected = is_connected;
-+ g_object_notify (G_OBJECT (manager), "is-connected");
-+ }
-+
-+ if (!is_connected) {
-+ if (manager->priv->dbus_connection == NULL) {
-+ if (manager->priv->bus_proxy != NULL) {
-+ g_object_unref (manager->priv->bus_proxy);
-+ manager->priv->bus_proxy = NULL;
-+ }
-+
-+ if (manager->priv->ck_proxy != NULL) {
-+ g_object_unref (manager->priv->ck_proxy);
-+ manager->priv->ck_proxy = NULL;
-+ }
-+ } else if (manager->priv->bus_proxy == NULL) {
-+ if (manager->priv->ck_proxy != NULL) {
-+ g_object_unref (manager->priv->ck_proxy);
-+ manager->priv->ck_proxy = NULL;
-+ }
-+ }
-+ }
-+
-+ return is_connected;
-+}
-+
-+static void
-+panel_consolekit_on_name_owner_changed (DBusGProxy *bus_proxy,
-+ const char *name,
-+ const char *prev_owner,
-+ const char *new_owner,
-+ PanelConsolekit *manager)
-+{
-+ if (name != NULL && strcmp (name, "org.freedesktop.ConsoleKit") !=
0)
-+ return;
-+
-+ if (manager->priv->ck_proxy != NULL) {
-+ g_object_unref (manager->priv->ck_proxy);
-+ manager->priv->ck_proxy = NULL;
-+ }
-+
-+ panel_consolekit_ensure_ck_connection (manager, NULL);
-+}
-+
-+static void
-+panel_consolekit_init (PanelConsolekit *manager)
-+{
-+ GError *error;
-+
-+ manager->priv = PANEL_CONSOLEKIT_GET_PRIVATE (manager);
-+
-+ error = NULL;
-+ if (!panel_consolekit_ensure_ck_connection (manager, &error)) {
-+ g_message ("Could not connect to ConsoleKit: %s",
-+ error->message);
-+ g_error_free (error);
-+ }
-+}
-+
-+static void
-+panel_consolekit_finalize (GObject *object)
-+{
-+ PanelConsolekit *manager;
-+ GObjectClass *parent_class;
-+
-+ manager = PANEL_CONSOLEKIT (object);
-+
-+ parent_class = G_OBJECT_CLASS (panel_consolekit_parent_class);
-+
-+ if (manager->priv->bus_proxy != NULL) {
-+ g_object_unref (manager->priv->bus_proxy);
-+ }
-+
-+ if (manager->priv->ck_proxy != NULL) {
-+ g_object_unref (manager->priv->ck_proxy);
-+ }
-+
-+ if (parent_class->finalize != NULL)
-+ parent_class->finalize (object);
-+}
-+
-+GQuark
-+panel_consolekit_error_quark (void)
-+{
-+ static GQuark error_quark = 0;
-+
-+ if (error_quark == 0)
-+ error_quark = g_quark_from_static_string ("panel-consolekit-error");
-+
-+ return error_quark;
-+}
-+
-+PanelConsolekit *
-+panel_consolekit_new (void)
-+{
-+ PanelConsolekit *manager;
-+
-+ manager = g_object_new (PANEL_TYPE_CONSOLEKIT, NULL);
-+
-+ return manager;
-+}
-+
-+static gboolean
-+try_system_stop (DBusGConnection *connection,
-+ GError **error)
-+{
-+ DBusGProxy *proxy;
-+ gboolean res;
-+
-+ proxy = dbus_g_proxy_new_for_name (connection,
-+ CK_NAME,
-+ CK_MANAGER_PATH,
-+ CK_MANAGER_INTERFACE);
-+ res = dbus_g_proxy_call_with_timeout (proxy,
-+ "Stop",
-+ INT_MAX,
-+ error,
-+ /* parameters: */
-+ G_TYPE_INVALID,
-+ /* return values: */
-+ G_TYPE_INVALID);
-+ return res;
-+}
-+
-+static gboolean
-+try_system_restart (DBusGConnection *connection,
-+ GError **error)
-+{
-+ DBusGProxy *proxy;
-+ gboolean res;
-+
-+ proxy = dbus_g_proxy_new_for_name (connection,
-+ CK_NAME,
-+ CK_MANAGER_PATH,
-+ CK_MANAGER_INTERFACE);
-+ res = dbus_g_proxy_call_with_timeout (proxy,
-+ "Restart",
-+ INT_MAX,
-+ error,
-+ /* parameters: */
-+ G_TYPE_INVALID,
-+ /* return values: */
-+ G_TYPE_INVALID);
-+ return res;
-+}
-+
-+static void
-+emit_restart_complete (PanelConsolekit *manager,
-+ const char *error_message)
-+{
-+ GError *call_error;
-+
-+ call_error = NULL;
-+
-+ if (error_message != NULL) {
-+ call_error = g_error_new_literal (PANEL_CONSOLEKIT_ERROR,
-+ PANEL_CONSOLEKIT_ERROR_RESTARTING,
-+ error_message);
-+ }
-+
-+ g_signal_emit (G_OBJECT (manager),
-+ signals [REQUEST_COMPLETED],
-+ 0, call_error);
-+ if (call_error != NULL) {
-+ g_error_free (call_error);
-+ }
-+}
-+
-+static void
-+emit_stop_complete (PanelConsolekit *manager,
-+ GError *error)
-+{
-+ GError *call_error;
-+
-+ call_error = NULL;
-+
-+ if (error != NULL) {
-+ call_error = g_error_new_literal (PANEL_CONSOLEKIT_ERROR,
-+ PANEL_CONSOLEKIT_ERROR_STOPPING,
-+ error->message);
-+ }
-+
-+ g_signal_emit (G_OBJECT (manager),
-+ signals [REQUEST_COMPLETED],
-+ 0, call_error);
-+ if (call_error != NULL) {
-+ g_error_free (call_error);
-+ }
-+}
-+
-+#ifdef HAVE_POLKIT
-+static void
-+system_restart_auth_cb (PolKitAction *action,
-+ gboolean gained_privilege,
-+ GError *error,
-+ PanelConsolekit *manager)
-+{
-+ GError *local_error;
-+ gboolean res;
-+
-+ if (! gained_privilege) {
-+ if (error != NULL) {
-+ emit_restart_complete (manager, error->message);
-+ }
-+ return;
-+ }
-+
-+ local_error = NULL;
-+ res = try_system_restart (manager->priv->dbus_connection, &local_error);
-+ if (! res) {
-+ g_warning ("Unable to restart system: %s", local_error->message);
-+ emit_restart_complete (manager, local_error->message);
-+ g_error_free (local_error);
-+ return;
-+ }
-+}
-+
-+static void
-+system_stop_auth_cb (PolKitAction *action,
-+ gboolean gained_privilege,
-+ GError *error,
-+ PanelConsolekit *manager)
-+{
-+ GError *local_error;
-+ gboolean res;
-+
-+ if (! gained_privilege) {
-+ if (error != NULL) {
-+ emit_stop_complete (manager, error);
-+ }
-+ return;
-+ }
-+
-+ local_error = NULL;
-+ res = try_system_stop (manager->priv->dbus_connection, &local_error);
-+ if (! res) {
-+ g_warning ("Unable to stop system: %s", local_error->message);
-+ emit_stop_complete (manager, local_error);
-+ g_error_free (local_error);
-+ return;
-+ }
-+}
-+
-+static PolKitAction *
-+get_action_from_error (GError *error)
-+{
-+ PolKitAction *action;
-+ const char *paction;
-+
-+ action = polkit_action_new ();
-+
-+ paction = NULL;
-+ if (g_str_has_prefix (error->message, "Not privileged for action:
")) {
-+ paction = error->message + strlen ("Not privileged for action:
");
-+ }
-+ polkit_action_set_action_id (action, paction);
-+
-+ return action;
-+}
-+#endif /* HAVE_POLKIT */
-+
-+static void
-+request_restart_priv (PanelConsolekit *manager,
-+ GError *error)
-+{
-+#ifdef HAVE_POLKIT
-+ gboolean res = FALSE;
-+ char *error_message = NULL;
-+ PolKitAction *action;
-+ guint xid;
-+ pid_t pid;
-+ GError *local_error;
-+
-+ action = get_action_from_error (error);
-+
-+ xid = 0;
-+ pid = getpid ();
-+
-+ local_error = NULL;
-+ res = polkit_gnome_auth_obtain (action,
-+ xid,
-+ pid,
-+ (PolKitGnomeAuthCB) system_restart_auth_cb,
-+ manager,
-+ &local_error);
-+ polkit_action_unref (action);
-+ if (local_error != NULL) {
-+ error_message = g_strdup (local_error->message);
-+ g_error_free (local_error);
-+ }
-+
-+ if (! res) {
-+ emit_restart_complete (manager, error_message);
-+ g_free (error_message);
-+ }
-+#else
-+ g_assert_not_reached ();
-+#endif /* HAVE POLKIT */
-+}
-+
-+static void
-+request_stop_priv (PanelConsolekit *manager,
-+ GError *error)
-+{
-+#ifdef HAVE_POLKIT
-+ gboolean res = FALSE;
-+ char *error_message = NULL;
-+ PolKitAction *action;
-+ guint xid;
-+ pid_t pid;
-+ GError *local_error;
-+
-+ action = get_action_from_error (error);
-+
-+ xid = 0;
-+ pid = getpid ();
-+
-+ local_error = NULL;
-+ res = polkit_gnome_auth_obtain (action,
-+ xid,
-+ pid,
-+ (PolKitGnomeAuthCB) system_stop_auth_cb,
-+ manager,
-+ &local_error);
-+ polkit_action_unref (action);
-+ if (local_error != NULL) {
-+ error_message = g_strdup (local_error->message);
-+ g_error_free (local_error);
-+ }
-+ if (! res) {
-+ emit_stop_complete (manager, error_message);
-+ g_free (error_message);
-+ }
-+#else
-+ g_assert_not_reached ();
-+#endif /* HAVE POLKIT */
-+}
-+
-+void
-+panel_consolekit_attempt_restart (PanelConsolekit *manager)
-+{
-+ gboolean res;
-+ GError *error;
-+
-+ error = NULL;
-+
-+ if (!panel_consolekit_ensure_ck_connection (manager, &error)) {
-+ g_warning ("Could not connect to ConsoleKit: %s",
-+ error->message);
-+ g_error_free (error);
-+ return;
-+ }
-+
-+ res = try_system_restart (manager->priv->dbus_connection, &error);
-+ if (! res) {
-+ if (dbus_g_error_has_name (error,
"org.freedesktop.ConsoleKit.Manager.NotPrivileged")) {
-+ request_restart_priv (manager, error);
-+ } else {
-+ emit_restart_complete (manager, error);
-+ }
-+ g_error_free (error);
-+ }
-+}
-+
-+void
-+panel_consolekit_attempt_stop (PanelConsolekit *manager)
-+{
-+ gboolean res;
-+ GError *error;
-+
-+ error = NULL;
-+
-+ if (!panel_consolekit_ensure_ck_connection (manager, &error)) {
-+ g_warning ("Could not connect to ConsoleKit: %s",
-+ error->message);
-+ g_error_free (error);
-+ return;
-+ }
-+
-+ res = try_system_stop (manager->priv->dbus_connection, &error);
-+ if (! res) {
-+ if (dbus_g_error_has_name (error,
"org.freedesktop.ConsoleKit.Manager.NotPrivileged")) {
-+ request_stop_priv (manager, error);
-+ } else {
-+ emit_stop_complete (manager, error);
-+ }
-+ g_error_free (error);
-+ }
-+}
-+
-+gboolean
-+panel_consolekit_can_restart (PanelConsolekit *manager)
-+{
-+#ifdef HAVE_POLKIT
-+ return panel_consolekit_ensure_ck_connection (manager, NULL);
-+#else
-+ return FALSE;
-+#endif
-+}
-+
-+gboolean
-+panel_consolekit_can_stop (PanelConsolekit *manager)
-+{
-+#ifdef HAVE_POLKIT
-+ return panel_consolekit_ensure_ck_connection (manager, NULL);
-+#else
-+ return FALSE;
-+#endif
-+}
-+
-+PanelConsolekit *
-+panel_get_consolekit (void)
-+{
-+ static PanelConsolekit *manager = NULL;
-+
-+ if (manager == NULL) {
-+ manager = panel_consolekit_new ();
-+ }
-+
-+ return g_object_ref (manager);
-+}
-Index: gnome-panel/gnome-panel/panel-consolekit.h
-===================================================================
---- gnome-panel/gnome-panel/panel-consolekit.h (revision 0)
-+++ gnome-panel/gnome-panel/panel-consolekit.h (revision 0)
-@@ -0,0 +1,77 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
-+ *
-+ * Copyright (C) 2008 Jon McCann <jmccann(a)redhat.com>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of the
-+ * License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+ * 02111-1307, USA.
-+ *
-+ * Authors:
-+ * Jon McCann <jmccann(a)redhat.com>
-+ */
-+
-+#ifndef PANEL_CONSOLEKIT_H
-+#define PANEL_CONSOLEKIT_H
-+
-+#include <glib.h>
-+#include <glib-object.h>
-+
-+G_BEGIN_DECLS
-+
-+#define PANEL_TYPE_CONSOLEKIT (panel_consolekit_get_type ())
-+#define PANEL_CONSOLEKIT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
PANEL_TYPE_CONSOLEKIT, PanelConsolekit))
-+#define PANEL_CONSOLEKIT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass),
PANEL_TYPE_CONSOLEKIT, PanelConsolekitClass))
-+#define PANEL_IS_CONSOLEKIT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj),
PANEL_TYPE_CONSOLEKIT))
-+#define PANEL_IS_CONSOLEKIT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),
PANEL_TYPE_CONSOLEKIT))
-+#define PANEL_CONSOLEKIT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj),
PANEL_TYPE_CONSOLEKIT, PanelConsolekitClass))
-+#define PANEL_CONSOLEKIT_ERROR (panel_consolekit_error_quark ())
-+
-+typedef struct _PanelConsolekit PanelConsolekit;
-+typedef struct _PanelConsolekitClass PanelConsolekitClass;
-+typedef struct _PanelConsolekitPrivate PanelConsolekitPrivate;
-+typedef enum _PanelConsolekitError PanelConsolekitError;
-+
-+struct _PanelConsolekit {
-+ GObject parent;
-+ PanelConsolekitPrivate *priv;
-+};
-+
-+struct _PanelConsolekitClass {
-+ GObjectClass parent_class;
-+
-+ void (* request_completed) (PanelConsolekit *manager,
-+ GError *error);
-+};
-+
-+enum _PanelConsolekitError {
-+ PANEL_CONSOLEKIT_ERROR_RESTARTING = 0,
-+ PANEL_CONSOLEKIT_ERROR_STOPPING
-+};
-+
-+GType panel_consolekit_get_type (void);
-+GQuark panel_consolekit_error_quark (void);
-+
-+PanelConsolekit *panel_consolekit_new (void) G_GNUC_MALLOC;
-+
-+gboolean panel_consolekit_can_stop (PanelConsolekit *manager);
-+gboolean panel_consolekit_can_restart (PanelConsolekit *manager);
-+
-+void panel_consolekit_attempt_stop (PanelConsolekit *manager);
-+void panel_consolekit_attempt_restart (PanelConsolekit *manager);
-+
-+PanelConsolekit *panel_get_consolekit (void);
-+
-+G_END_DECLS
-+
-+#endif /* PANEL_CONSOLEKIT_H */
-Index: gnome-panel/gnome-panel/panel-logout.c
-===================================================================
---- gnome-panel/gnome-panel/panel-logout.c (revision 10951)
-+++ gnome-panel/gnome-panel/panel-logout.c (working copy)
-@@ -1,4 +1,5 @@
--/*
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
-+ *
- * panel-logout.c:
- *
- * Copyright (C) 2006 Vincent Untz
-@@ -35,6 +36,7 @@
- #include "panel-logout.h"
- #include "panel-gdm.h"
- #include "panel-power-manager.h"
-+#include "panel-consolekit.h"
- #include "panel-session.h"
- #include "panel-icon-names.h"
-
-@@ -55,6 +57,7 @@ struct _PanelLogoutDialogPrivate {
- PanelLogoutDialogType type;
-
- PanelPowerManager *power_manager;
-+ PanelConsolekit *consolekit;
-
- int timeout;
- unsigned int timeout_id;
-@@ -76,7 +79,7 @@ enum {
- };
- G_DEFINE_TYPE (PanelLogoutDialog, panel_logout, GTK_TYPE_MESSAGE_DIALOG);
-
--static void
-+static void
- panel_logout_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
-@@ -91,7 +94,7 @@ panel_logout_set_property (GObject
- }
- }
-
--static void
-+static void
- panel_logout_get_property (GObject *object,
- guint prop_id,
- GValue *value,
-@@ -130,6 +133,59 @@ panel_logout_class_init (PanelLogoutDial
- }
-
- static void
-+ck_restart_error_window (GError *error)
-+{
-+ GtkWidget *dialog;
-+ const char *primary;
-+
-+ g_assert (error != NULL);
-+
-+ switch (error->code) {
-+ case PANEL_CONSOLEKIT_ERROR_RESTARTING:
-+ primary = _("Unable to restart system");
-+ break;
-+ case PANEL_CONSOLEKIT_ERROR_STOPPING:
-+ primary = _("Unable to stop system");
-+ break;
-+ default:
-+ g_assert_not_reached ();
-+ }
-+
-+ dialog = gtk_message_dialog_new (NULL, 0,
-+ GTK_MESSAGE_ERROR,
-+ GTK_BUTTONS_NONE,
-+ primary);
-+
-+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-+ "%s", error->message);
-+
-+ gtk_dialog_add_buttons (GTK_DIALOG (dialog),
-+ GTK_STOCK_CLOSE,
-+ NULL);
-+
-+ gtk_dialog_set_default_response (GTK_DIALOG (dialog),
-+ GTK_RESPONSE_CLOSE);
-+ gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), FALSE);
-+ gtk_window_set_title (GTK_WINDOW (dialog), "");
-+
-+ g_signal_connect (dialog, "response",
-+ G_CALLBACK (gtk_widget_destroy), NULL);
-+
-+ gtk_widget_show (dialog);
-+}
-+
-+static void
-+on_ck_request_completed (PanelConsolekit *panel_consolekit,
-+ GError *error)
-+{
-+ if (error == NULL) {
-+ /* request was successful */
-+ return;
-+ }
-+
-+}
-+
-+static void
- panel_logout_init (PanelLogoutDialog *logout_dialog)
- {
- logout_dialog->priv = PANEL_LOGOUT_DIALOG_GET_PRIVATE (logout_dialog);
-@@ -146,6 +202,10 @@ panel_logout_init (PanelLogoutDialog *lo
- GTK_WIN_POS_CENTER_ALWAYS);
-
- logout_dialog->priv->power_manager = panel_get_power_manager ();
-+ logout_dialog->priv->consolekit = panel_get_consolekit ();
-+ g_signal_connect (logout_dialog->priv->consolekit,
-+ "request-completed",
-+ G_CALLBACK (on_ck_request_completed), NULL);
-
- g_signal_connect (logout_dialog, "destroy",
- G_CALLBACK (panel_logout_destroy), NULL);
-@@ -163,37 +223,120 @@ panel_logout_destroy (PanelLogoutDialog
-
- g_object_unref (logout_dialog->priv->power_manager);
- logout_dialog->priv->power_manager = NULL;
-+ g_object_unref (logout_dialog->priv->consolekit);
-+ logout_dialog->priv->consolekit = NULL;
-
- current_dialog = NULL;
- }
-
-+static gboolean
-+panel_logout_supports_reboot (PanelLogoutDialog *logout_dialog)
-+{
-+ gboolean ret;
-+
-+ ret = panel_consolekit_can_restart (logout_dialog->priv->consolekit);
-+ if (!ret) {
-+ ret = gdm_supports_logout_action (GDM_LOGOUT_ACTION_REBOOT);
-+ }
-+ return ret;
-+}
-+
-+static gboolean
-+panel_logout_supports_shutdown (PanelLogoutDialog *logout_dialog)
-+{
-+ gboolean ret;
-+
-+ ret = panel_consolekit_can_stop (logout_dialog->priv->consolekit);
-+ if (!ret) {
-+ ret = gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN);
-+ }
-+ return ret;
-+}
-+
-+gboolean
-+panel_logout_supports_shutdown_reboot (void)
-+{
-+ PanelConsolekit *consolekit;
-+ gboolean ret;
-+
-+ ret = FALSE;
-+
-+ /* if we can do any then return true */
-+
-+ consolekit = panel_get_consolekit ();
-+ if (consolekit != NULL) {
-+ ret = panel_consolekit_can_restart (consolekit)
-+ || panel_consolekit_can_stop (consolekit);
-+ g_object_unref (consolekit);
-+ }
-+
-+ if (!ret) {
-+ ret = gdm_supports_logout_action (GDM_LOGOUT_ACTION_REBOOT)
-+ || gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN);
-+ }
-+
-+ return ret;
-+}
-+
-+static void
-+do_request_logout (PanelConsolekit *consolekit)
-+{
-+ gdm_set_logout_action (GDM_LOGOUT_ACTION_NONE);
-+ panel_session_request_logout ();
-+}
-+
-+static void
-+do_request_reboot (PanelConsolekit *consolekit)
-+{
-+ if (panel_consolekit_can_restart (consolekit)) {
-+ gdm_set_logout_action (GDM_LOGOUT_ACTION_NONE);
-+ panel_session_request_save ();
-+ panel_consolekit_attempt_restart (consolekit);
-+ } else {
-+ gdm_set_logout_action (GDM_LOGOUT_ACTION_REBOOT);
-+ panel_session_request_logout ();
-+ }
-+}
-+
-+static void
-+do_request_shutdown (PanelConsolekit *consolekit)
-+{
-+ if (panel_consolekit_can_stop (consolekit)) {
-+ gdm_set_logout_action (GDM_LOGOUT_ACTION_NONE);
-+ panel_session_request_save ();
-+ panel_consolekit_attempt_stop (consolekit);
-+ } else {
-+ gdm_set_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN);
-+ panel_session_request_logout ();
-+ }
-+}
-+
- static void
- panel_logout_response (PanelLogoutDialog *logout_dialog,
- guint response_id,
- gpointer data)
- {
- PanelPowerManager *power_manager;
-+ PanelConsolekit *consolekit;
-
- power_manager = g_object_ref (logout_dialog->priv->power_manager);
-+ consolekit = g_object_ref (logout_dialog->priv->consolekit);
- gtk_widget_destroy (GTK_WIDGET (logout_dialog));
-
- switch (response_id) {
- case GTK_RESPONSE_CANCEL:
- break;
- case PANEL_LOGOUT_RESPONSE_LOGOUT:
-- gdm_set_logout_action (GDM_LOGOUT_ACTION_NONE);
-- panel_session_request_logout ();
-+ do_request_logout (consolekit);
- break;
- case PANEL_LOGOUT_RESPONSE_SWITCH_USER:
- gdm_new_login ();
- break;
- case PANEL_LOGOUT_RESPONSE_SHUTDOWN:
-- gdm_set_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN);
-- panel_session_request_logout ();
-+ do_request_shutdown (consolekit);
- break;
- case PANEL_LOGOUT_RESPONSE_REBOOT:
-- gdm_set_logout_action (GDM_LOGOUT_ACTION_REBOOT);
-- panel_session_request_logout ();
-+ do_request_reboot (consolekit);
- break;
- case PANEL_LOGOUT_RESPONSE_STD:
- if (panel_power_manager_can_hibernate (power_manager))
-@@ -210,6 +353,7 @@ panel_logout_response (PanelLogoutDialog
- g_assert_not_reached ();
- }
- g_object_unref (power_manager);
-+ g_object_unref (consolekit);
- }
-
- static gboolean
-@@ -361,7 +505,7 @@ panel_logout_new (PanelLogoutDialogType
- _("_Hibernate"),
- PANEL_LOGOUT_RESPONSE_STD);
-
-- if (gdm_supports_logout_action (GDM_LOGOUT_ACTION_REBOOT))
-+ if (panel_logout_supports_reboot (logout_dialog))
- gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
- _("_Restart"),
- PANEL_LOGOUT_RESPONSE_REBOOT);
-@@ -370,7 +514,7 @@ panel_logout_new (PanelLogoutDialogType
- GTK_STOCK_CANCEL,
- GTK_RESPONSE_CANCEL);
-
-- if (gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN))
-+ if (panel_logout_supports_shutdown (logout_dialog))
- gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
- _("_Shut Down"),
- PANEL_LOGOUT_RESPONSE_SHUTDOWN);
-Index: gnome-panel/gnome-panel/panel-logout.h
-===================================================================
---- gnome-panel/gnome-panel/panel-logout.h (revision 10951)
-+++ gnome-panel/gnome-panel/panel-logout.h (working copy)
-@@ -57,6 +57,8 @@ struct _PanelLogoutDialogClass {
-
- GType panel_logout_get_type (void) G_GNUC_CONST;
-
-+gboolean panel_logout_supports_shutdown_reboot (void);
-+
- void panel_logout_new (PanelLogoutDialogType type,
- GdkScreen *screen,
- guint32 activate_time);
-Index: gnome-panel/gnome-panel/panel-toplevel.c
-===================================================================
---- gnome-panel/gnome-panel/panel-toplevel.c (revision 10951)
-+++ gnome-panel/gnome-panel/panel-toplevel.c (working copy)
-@@ -3329,7 +3329,8 @@ panel_toplevel_get_animation_time (Panel
- }
-
- static void
--panel_toplevel_start_animation (PanelToplevel *toplevel)
-+panel_toplevel_start_animation (PanelToplevel *toplevel,
-+ gboolean auto_hide)
- {
- GdkScreen *screen;
- int monitor_width, monitor_height;
-@@ -3480,7 +3481,7 @@ panel_toplevel_hide (PanelToplevel *t
- }
-
- if (toplevel->priv->animate && GTK_WIDGET_REALIZED (toplevel))
-- panel_toplevel_start_animation (toplevel);
-+ panel_toplevel_start_animation (toplevel, auto_hide);
- else if (toplevel->priv->attached)
- gtk_widget_hide (GTK_WIDGET (toplevel));
-
-@@ -3528,7 +3529,7 @@ panel_toplevel_unhide (PanelToplevel *to
- panel_toplevel_push_autohide_disabler (toplevel->priv->attach_toplevel);
-
- if (toplevel->priv->animate && GTK_WIDGET_REALIZED (toplevel))
-- panel_toplevel_start_animation (toplevel);
-+ panel_toplevel_start_animation (toplevel, FALSE);
- else if (toplevel->priv->attached)
- gtk_widget_show (GTK_WIDGET (toplevel));
-
-Index: gnome-panel/gnome-panel/panel-session.c
-===================================================================
---- gnome-panel/gnome-panel/panel-session.c (revision 10951)
-+++ gnome-panel/gnome-panel/panel-session.c (working copy)
-@@ -60,6 +60,34 @@ panel_session_request_logout (void)
- recursion_guard--;
- }
-
-+void
-+panel_session_request_save (void)
-+{
-+ GnomeClient *client;
-+ static int recursion_guard = 0;
-+
-+ if (recursion_guard)
-+ return;
-+
-+ recursion_guard++;
-+
-+ if (!(client = gnome_master_client ()))
-+ return;
-+
-+ /* Only request a Global save. We only want a Local
-+ * save if the user selects 'Save current setup'
-+ * from the dialog.
-+ */
-+ gnome_client_request_save (client,
-+ GNOME_SAVE_GLOBAL,
-+ FALSE,
-+ GNOME_INTERACT_NONE,
-+ TRUE, /* do not use the gnome-session gui */
-+ TRUE);
-+
-+ recursion_guard--;
-+}
-+
- static void
- panel_session_handle_die_request (GnomeClient *client)
- {
-Index: gnome-panel/gnome-panel/panel-action-button.c
-===================================================================
---- gnome-panel/gnome-panel/panel-action-button.c (revision 10951)
-+++ gnome-panel/gnome-panel/panel-action-button.c (working copy)
-@@ -46,7 +46,6 @@
- #include "panel-lockdown.h"
- #include "panel-logout.h"
- #include "panel-compatibility.h"
--#include "panel-gdm.h"
- #include "panel-icon-names.h"
-
- G_DEFINE_TYPE (PanelActionButton, panel_action_button, BUTTON_TYPE_WIDGET);
-@@ -183,8 +182,7 @@ static gboolean
- panel_action_shutdown_reboot_is_disabled (void)
- {
- return (panel_lockdown_get_disable_log_out() ||
-- (!gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN) &&
-- !gdm_supports_logout_action (GDM_LOGOUT_ACTION_REBOOT)));
-+ !panel_logout_supports_shutdown_reboot);
- }
-
- /* Run Application
-Index: gnome-panel/gnome-panel/panel-session.h
-===================================================================
---- gnome-panel/gnome-panel/panel-session.h (revision 10951)
-+++ gnome-panel/gnome-panel/panel-session.h (working copy)
-@@ -30,6 +30,7 @@ G_BEGIN_DECLS
- void panel_session_init (void);
- void panel_session_do_not_restart (void);
- void panel_session_request_logout (void);
-+void panel_session_request_save (void);
-
- G_END_DECLS
-
-Index: gnome-panel/gnome-panel/Makefile.am
-===================================================================
---- gnome-panel/gnome-panel/Makefile.am (revision 10951)
-+++ gnome-panel/gnome-panel/Makefile.am (working copy)
-@@ -16,6 +16,7 @@ INCLUDES = \
- $(STANDARD_PROPERTIES_CFLAGS) \
- $(PANEL_CFLAGS) \
- $(PANELCONFIG_CFLAGS) \
-+ $(POLKIT_GNOME_CFLAGS) \
- $(WARN_CFLAGS) \
- $(NULL)
-
-@@ -98,6 +99,7 @@ panel_sources = \
- panel-logout.c \
- panel-gdm.c \
- panel-power-manager.c \
-+ panel-consolekit.c \
- panel-ditem-editor.c \
- panel-mount-operation.c \
- $(NULL)
-@@ -148,6 +150,7 @@ panel_headers = \
- panel-logout.h \
- panel-gdm.h \
- panel-power-manager.h \
-+ panel-consolekit.h \
- panel-ditem-editor.h \
- panel-icon-names.h \
- panel-mount-operation.h \
-@@ -161,6 +164,7 @@ gnome_panel_SOURCES = \
-
- gnome_panel_LDADD = \
- $(PANEL_LIBS) \
-+ $(POLKIT_GNOME_LIBS) \
- $(X_LIBS)
-
- gnome_panel_LDFLAGS = -export-dynamic
diff --git a/gnome-panel-2.22.0-ck-shutdown.patch b/gnome-panel-2.22.0-ck-shutdown.patch
new file mode 100644
index 0000000..2458fb3
--- /dev/null
+++ b/gnome-panel-2.22.0-ck-shutdown.patch
@@ -0,0 +1,1131 @@
+diff -up gnome-panel-2.22.0/gnome-panel/panel-session.h.ck-shutdown
gnome-panel-2.22.0/gnome-panel/panel-session.h
+--- gnome-panel-2.22.0/gnome-panel/panel-session.h.ck-shutdown 2008-03-10
16:44:57.000000000 -0400
++++ gnome-panel-2.22.0/gnome-panel/panel-session.h 2008-03-14 17:14:22.000000000 -0400
+@@ -30,6 +30,7 @@ G_BEGIN_DECLS
+ void panel_session_init (void);
+ void panel_session_do_not_restart (void);
+ void panel_session_request_logout (void);
++void panel_session_request_save (void);
+
+ G_END_DECLS
+
+diff -up /dev/null gnome-panel-2.22.0/gnome-panel/panel-consolekit.c
+--- /dev/null 2008-03-15 22:02:38.932007625 -0400
++++ gnome-panel-2.22.0/gnome-panel/panel-consolekit.c 2008-03-14 17:14:22.000000000
-0400
+@@ -0,0 +1,618 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
++ *
++ * Copyright (C) 2008 Jon McCann <jmccann(a)redhat.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2, or (at your option)
++ * any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++ * 02111-1307, USA.
++ */
++
++#include "config.h"
++
++#include <errno.h>
++#include <string.h>
++#include <unistd.h>
++
++#include <glib.h>
++#include <glib-object.h>
++#include <glib/gi18n.h>
++
++#include <dbus/dbus-glib.h>
++
++#ifdef HAVE_POLKIT
++#include <polkit-gnome/polkit-gnome.h>
++#endif
++
++#include "panel-consolekit.h"
++
++#define CK_NAME "org.freedesktop.ConsoleKit"
++#define CK_PATH "/org/freedesktop/ConsoleKit"
++#define CK_INTERFACE "org.freedesktop.ConsoleKit"
++
++#define CK_MANAGER_PATH "/org/freedesktop/ConsoleKit/Manager"
++#define CK_MANAGER_INTERFACE "org.freedesktop.ConsoleKit.Manager"
++#define CK_SEAT_INTERFACE "org.freedesktop.ConsoleKit.Seat"
++#define CK_SESSION_INTERFACE "org.freedesktop.ConsoleKit.Session"
++
++#define PANEL_CONSOLEKIT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o),
PANEL_TYPE_CONSOLEKIT, PanelConsolekitPrivate))
++
++struct _PanelConsolekitPrivate {
++ DBusGConnection *dbus_connection;
++ DBusGProxy *bus_proxy;
++ DBusGProxy *ck_proxy;
++ guint32 is_connected : 1;
++};
++
++enum {
++ PROP_0 = 0,
++ PROP_IS_CONNECTED
++};
++
++enum {
++ REQUEST_COMPLETED = 0,
++ LAST_SIGNAL
++};
++
++static guint signals [LAST_SIGNAL];
++
++static void panel_consolekit_class_init (PanelConsolekitClass *klass);
++static void panel_consolekit_init (PanelConsolekit *ck);
++static void panel_consolekit_finalize (GObject *object);
++static void panel_consolekit_on_name_owner_changed (DBusGProxy *bus_proxy,
++ const char *name,
++ const char *prev_owner,
++ const char *new_owner,
++ PanelConsolekit *manager);
++
++G_DEFINE_TYPE (PanelConsolekit, panel_consolekit, G_TYPE_OBJECT);
++
++static void
++panel_consolekit_get_property (GObject *object,
++ guint prop_id,
++ GValue *value,
++ GParamSpec *pspec)
++{
++ PanelConsolekit *manager = PANEL_CONSOLEKIT (object);
++
++ switch (prop_id) {
++ case PROP_IS_CONNECTED:
++ g_value_set_boolean (value,
++ manager->priv->is_connected);
++ break;
++
++ default:
++ G_OBJECT_WARN_INVALID_PROPERTY_ID (object,
++ prop_id,
++ pspec);
++ }
++}
++
++static void
++panel_consolekit_class_init (PanelConsolekitClass *manager_class)
++{
++ GObjectClass *object_class;
++ GParamSpec *param_spec;
++
++ object_class = G_OBJECT_CLASS (manager_class);
++
++ object_class->finalize = panel_consolekit_finalize;
++ object_class->get_property = panel_consolekit_get_property;
++
++ param_spec = g_param_spec_boolean ("is-connected",
++ "Is connected",
++ "Whether the panel is connected to ConsoleKit",
++ FALSE,
++ G_PARAM_READABLE);
++ g_object_class_install_property (object_class, PROP_IS_CONNECTED,
++ param_spec);
++
++ signals [REQUEST_COMPLETED] =
++ g_signal_new ("request-completed",
++ G_OBJECT_CLASS_TYPE (object_class),
++ G_SIGNAL_RUN_LAST,
++ G_STRUCT_OFFSET (PanelConsolekitClass, request_completed),
++ NULL,
++ NULL,
++ g_cclosure_marshal_VOID__POINTER,
++ G_TYPE_NONE,
++ 1, G_TYPE_POINTER);
++
++ g_type_class_add_private (manager_class,
++ sizeof (PanelConsolekitPrivate));
++}
++
++static gboolean
++panel_consolekit_ensure_ck_connection (PanelConsolekit *manager,
++ GError **error)
++{
++ GError *connection_error;
++ gboolean is_connected;
++
++ connection_error = NULL;
++ if (manager->priv->dbus_connection == NULL) {
++ manager->priv->dbus_connection = dbus_g_bus_get (DBUS_BUS_SYSTEM,
++ &connection_error);
++
++ if (manager->priv->dbus_connection == NULL) {
++ g_propagate_error (error, connection_error);
++ is_connected = FALSE;
++ goto out;
++ }
++ }
++
++ if (manager->priv->bus_proxy == NULL) {
++ manager->priv->bus_proxy =
++ dbus_g_proxy_new_for_name_owner (manager->priv->dbus_connection,
++ DBUS_SERVICE_DBUS,
++ DBUS_PATH_DBUS,
++ DBUS_INTERFACE_DBUS,
++ &connection_error);
++
++ if (manager->priv->bus_proxy == NULL) {
++ g_propagate_error (error, connection_error);
++ is_connected = FALSE;
++ goto out;
++ }
++
++ dbus_g_proxy_add_signal (manager->priv->bus_proxy,
++ "NameOwnerChanged",
++ G_TYPE_STRING,
++ G_TYPE_STRING,
++ G_TYPE_STRING,
++ G_TYPE_INVALID);
++ dbus_g_proxy_connect_signal (manager->priv->bus_proxy,
++ "NameOwnerChanged",
++ G_CALLBACK (panel_consolekit_on_name_owner_changed),
++ manager, NULL);
++ }
++
++ if (manager->priv->ck_proxy == NULL) {
++ manager->priv->ck_proxy =
++ dbus_g_proxy_new_for_name_owner (manager->priv->dbus_connection,
++ "org.freedesktop.ConsoleKit",
++ "/org/freedesktop/ConsoleKit/Manager",
++ "org.freedesktop.ConsoleKit.Manager",
++ &connection_error);
++
++ if (manager->priv->ck_proxy == NULL) {
++ g_propagate_error (error, connection_error);
++ is_connected = FALSE;
++ goto out;
++ }
++ }
++ is_connected = TRUE;
++
++out:
++ if (manager->priv->is_connected != is_connected) {
++ manager->priv->is_connected = is_connected;
++ g_object_notify (G_OBJECT (manager), "is-connected");
++ }
++
++ if (!is_connected) {
++ if (manager->priv->dbus_connection == NULL) {
++ if (manager->priv->bus_proxy != NULL) {
++ g_object_unref (manager->priv->bus_proxy);
++ manager->priv->bus_proxy = NULL;
++ }
++
++ if (manager->priv->ck_proxy != NULL) {
++ g_object_unref (manager->priv->ck_proxy);
++ manager->priv->ck_proxy = NULL;
++ }
++ } else if (manager->priv->bus_proxy == NULL) {
++ if (manager->priv->ck_proxy != NULL) {
++ g_object_unref (manager->priv->ck_proxy);
++ manager->priv->ck_proxy = NULL;
++ }
++ }
++ }
++
++ return is_connected;
++}
++
++static void
++panel_consolekit_on_name_owner_changed (DBusGProxy *bus_proxy,
++ const char *name,
++ const char *prev_owner,
++ const char *new_owner,
++ PanelConsolekit *manager)
++{
++ if (name != NULL && strcmp (name, "org.freedesktop.ConsoleKit") !=
0)
++ return;
++
++ if (manager->priv->ck_proxy != NULL) {
++ g_object_unref (manager->priv->ck_proxy);
++ manager->priv->ck_proxy = NULL;
++ }
++
++ panel_consolekit_ensure_ck_connection (manager, NULL);
++}
++
++static void
++panel_consolekit_init (PanelConsolekit *manager)
++{
++ GError *error;
++
++ manager->priv = PANEL_CONSOLEKIT_GET_PRIVATE (manager);
++
++ error = NULL;
++ if (!panel_consolekit_ensure_ck_connection (manager, &error)) {
++ g_message ("Could not connect to ConsoleKit: %s",
++ error->message);
++ g_error_free (error);
++ }
++}
++
++static void
++panel_consolekit_finalize (GObject *object)
++{
++ PanelConsolekit *manager;
++ GObjectClass *parent_class;
++
++ manager = PANEL_CONSOLEKIT (object);
++
++ parent_class = G_OBJECT_CLASS (panel_consolekit_parent_class);
++
++ if (manager->priv->bus_proxy != NULL) {
++ g_object_unref (manager->priv->bus_proxy);
++ }
++
++ if (manager->priv->ck_proxy != NULL) {
++ g_object_unref (manager->priv->ck_proxy);
++ }
++
++ if (parent_class->finalize != NULL)
++ parent_class->finalize (object);
++}
++
++GQuark
++panel_consolekit_error_quark (void)
++{
++ static GQuark error_quark = 0;
++
++ if (error_quark == 0)
++ error_quark = g_quark_from_static_string ("panel-consolekit-error");
++
++ return error_quark;
++}
++
++PanelConsolekit *
++panel_consolekit_new (void)
++{
++ PanelConsolekit *manager;
++
++ manager = g_object_new (PANEL_TYPE_CONSOLEKIT, NULL);
++
++ return manager;
++}
++
++static gboolean
++try_system_stop (DBusGConnection *connection,
++ GError **error)
++{
++ DBusGProxy *proxy;
++ gboolean res;
++
++ proxy = dbus_g_proxy_new_for_name (connection,
++ CK_NAME,
++ CK_MANAGER_PATH,
++ CK_MANAGER_INTERFACE);
++ res = dbus_g_proxy_call_with_timeout (proxy,
++ "Stop",
++ INT_MAX,
++ error,
++ /* parameters: */
++ G_TYPE_INVALID,
++ /* return values: */
++ G_TYPE_INVALID);
++ return res;
++}
++
++static gboolean
++try_system_restart (DBusGConnection *connection,
++ GError **error)
++{
++ DBusGProxy *proxy;
++ gboolean res;
++
++ proxy = dbus_g_proxy_new_for_name (connection,
++ CK_NAME,
++ CK_MANAGER_PATH,
++ CK_MANAGER_INTERFACE);
++ res = dbus_g_proxy_call_with_timeout (proxy,
++ "Restart",
++ INT_MAX,
++ error,
++ /* parameters: */
++ G_TYPE_INVALID,
++ /* return values: */
++ G_TYPE_INVALID);
++ return res;
++}
++
++static void
++emit_restart_complete (PanelConsolekit *manager,
++ const char *error_message)
++{
++ GError *call_error;
++
++ call_error = NULL;
++
++ if (error_message != NULL) {
++ call_error = g_error_new_literal (PANEL_CONSOLEKIT_ERROR,
++ PANEL_CONSOLEKIT_ERROR_RESTARTING,
++ error_message);
++ }
++
++ g_signal_emit (G_OBJECT (manager),
++ signals [REQUEST_COMPLETED],
++ 0, call_error);
++ if (call_error != NULL) {
++ g_error_free (call_error);
++ }
++}
++
++static void
++emit_stop_complete (PanelConsolekit *manager,
++ GError *error)
++{
++ GError *call_error;
++
++ call_error = NULL;
++
++ if (error != NULL) {
++ call_error = g_error_new_literal (PANEL_CONSOLEKIT_ERROR,
++ PANEL_CONSOLEKIT_ERROR_STOPPING,
++ error->message);
++ }
++
++ g_signal_emit (G_OBJECT (manager),
++ signals [REQUEST_COMPLETED],
++ 0, call_error);
++ if (call_error != NULL) {
++ g_error_free (call_error);
++ }
++}
++
++#ifdef HAVE_POLKIT
++static void
++system_restart_auth_cb (PolKitAction *action,
++ gboolean gained_privilege,
++ GError *error,
++ PanelConsolekit *manager)
++{
++ GError *local_error;
++ gboolean res;
++
++ if (! gained_privilege) {
++ if (error != NULL) {
++ emit_restart_complete (manager, error->message);
++ }
++ return;
++ }
++
++ local_error = NULL;
++ res = try_system_restart (manager->priv->dbus_connection, &local_error);
++ if (! res) {
++ g_warning ("Unable to restart system: %s", local_error->message);
++ emit_restart_complete (manager, local_error->message);
++ g_error_free (local_error);
++ return;
++ }
++}
++
++static void
++system_stop_auth_cb (PolKitAction *action,
++ gboolean gained_privilege,
++ GError *error,
++ PanelConsolekit *manager)
++{
++ GError *local_error;
++ gboolean res;
++
++ if (! gained_privilege) {
++ if (error != NULL) {
++ emit_stop_complete (manager, error);
++ }
++ return;
++ }
++
++ local_error = NULL;
++ res = try_system_stop (manager->priv->dbus_connection, &local_error);
++ if (! res) {
++ g_warning ("Unable to stop system: %s", local_error->message);
++ emit_stop_complete (manager, local_error);
++ g_error_free (local_error);
++ return;
++ }
++}
++
++static PolKitAction *
++get_action_from_error (GError *error)
++{
++ PolKitAction *action;
++ const char *paction;
++
++ action = polkit_action_new ();
++
++ paction = NULL;
++ if (g_str_has_prefix (error->message, "Not privileged for action:
")) {
++ paction = error->message + strlen ("Not privileged for action:
");
++ }
++ polkit_action_set_action_id (action, paction);
++
++ return action;
++}
++#endif /* HAVE_POLKIT */
++
++static void
++request_restart_priv (PanelConsolekit *manager,
++ GError *error)
++{
++#ifdef HAVE_POLKIT
++ gboolean res = FALSE;
++ char *error_message = NULL;
++ PolKitAction *action;
++ guint xid;
++ pid_t pid;
++ GError *local_error;
++
++ action = get_action_from_error (error);
++
++ xid = 0;
++ pid = getpid ();
++
++ local_error = NULL;
++ res = polkit_gnome_auth_obtain (action,
++ xid,
++ pid,
++ (PolKitGnomeAuthCB) system_restart_auth_cb,
++ manager,
++ &local_error);
++ polkit_action_unref (action);
++ if (local_error != NULL) {
++ error_message = g_strdup (local_error->message);
++ g_error_free (local_error);
++ }
++
++ if (! res) {
++ emit_restart_complete (manager, error_message);
++ g_free (error_message);
++ }
++#else
++ g_assert_not_reached ();
++#endif /* HAVE POLKIT */
++}
++
++static void
++request_stop_priv (PanelConsolekit *manager,
++ GError *error)
++{
++#ifdef HAVE_POLKIT
++ gboolean res = FALSE;
++ char *error_message = NULL;
++ PolKitAction *action;
++ guint xid;
++ pid_t pid;
++ GError *local_error;
++
++ action = get_action_from_error (error);
++
++ xid = 0;
++ pid = getpid ();
++
++ local_error = NULL;
++ res = polkit_gnome_auth_obtain (action,
++ xid,
++ pid,
++ (PolKitGnomeAuthCB) system_stop_auth_cb,
++ manager,
++ &local_error);
++ polkit_action_unref (action);
++ if (local_error != NULL) {
++ error_message = g_strdup (local_error->message);
++ g_error_free (local_error);
++ }
++ if (! res) {
++ emit_stop_complete (manager, error_message);
++ g_free (error_message);
++ }
++#else
++ g_assert_not_reached ();
++#endif /* HAVE POLKIT */
++}
++
++void
++panel_consolekit_attempt_restart (PanelConsolekit *manager)
++{
++ gboolean res;
++ GError *error;
++
++ error = NULL;
++
++ if (!panel_consolekit_ensure_ck_connection (manager, &error)) {
++ g_warning ("Could not connect to ConsoleKit: %s",
++ error->message);
++ g_error_free (error);
++ return;
++ }
++
++ res = try_system_restart (manager->priv->dbus_connection, &error);
++ if (! res) {
++ if (dbus_g_error_has_name (error,
"org.freedesktop.ConsoleKit.Manager.NotPrivileged")) {
++ request_restart_priv (manager, error);
++ } else {
++ emit_restart_complete (manager, error);
++ }
++ g_error_free (error);
++ }
++}
++
++void
++panel_consolekit_attempt_stop (PanelConsolekit *manager)
++{
++ gboolean res;
++ GError *error;
++
++ error = NULL;
++
++ if (!panel_consolekit_ensure_ck_connection (manager, &error)) {
++ g_warning ("Could not connect to ConsoleKit: %s",
++ error->message);
++ g_error_free (error);
++ return;
++ }
++
++ res = try_system_stop (manager->priv->dbus_connection, &error);
++ if (! res) {
++ if (dbus_g_error_has_name (error,
"org.freedesktop.ConsoleKit.Manager.NotPrivileged")) {
++ request_stop_priv (manager, error);
++ } else {
++ emit_stop_complete (manager, error);
++ }
++ g_error_free (error);
++ }
++}
++
++gboolean
++panel_consolekit_can_restart (PanelConsolekit *manager)
++{
++#ifdef HAVE_POLKIT
++ return panel_consolekit_ensure_ck_connection (manager, NULL);
++#else
++ return FALSE;
++#endif
++}
++
++gboolean
++panel_consolekit_can_stop (PanelConsolekit *manager)
++{
++#ifdef HAVE_POLKIT
++ return panel_consolekit_ensure_ck_connection (manager, NULL);
++#else
++ return FALSE;
++#endif
++}
++
++PanelConsolekit *
++panel_get_consolekit (void)
++{
++ static PanelConsolekit *manager = NULL;
++
++ if (manager == NULL) {
++ manager = panel_consolekit_new ();
++ }
++
++ return g_object_ref (manager);
++}
+diff -up gnome-panel-2.22.0/gnome-panel/panel-toplevel.c.ck-shutdown
gnome-panel-2.22.0/gnome-panel/panel-toplevel.c
+--- gnome-panel-2.22.0/gnome-panel/panel-toplevel.c.ck-shutdown 2008-03-10
16:44:57.000000000 -0400
++++ gnome-panel-2.22.0/gnome-panel/panel-toplevel.c 2008-03-14 17:14:22.000000000 -0400
+@@ -3329,7 +3329,8 @@ panel_toplevel_get_animation_time (Panel
+ }
+
+ static void
+-panel_toplevel_start_animation (PanelToplevel *toplevel)
++panel_toplevel_start_animation (PanelToplevel *toplevel,
++ gboolean auto_hide)
+ {
+ GdkScreen *screen;
+ int monitor_width, monitor_height;
+@@ -3480,7 +3481,7 @@ panel_toplevel_hide (PanelToplevel *t
+ }
+
+ if (toplevel->priv->animate && GTK_WIDGET_REALIZED (toplevel))
+- panel_toplevel_start_animation (toplevel);
++ panel_toplevel_start_animation (toplevel, auto_hide);
+ else if (toplevel->priv->attached)
+ gtk_widget_hide (GTK_WIDGET (toplevel));
+
+@@ -3528,7 +3529,7 @@ panel_toplevel_unhide (PanelToplevel *to
+ panel_toplevel_push_autohide_disabler (toplevel->priv->attach_toplevel);
+
+ if (toplevel->priv->animate && GTK_WIDGET_REALIZED (toplevel))
+- panel_toplevel_start_animation (toplevel);
++ panel_toplevel_start_animation (toplevel, FALSE);
+ else if (toplevel->priv->attached)
+ gtk_widget_show (GTK_WIDGET (toplevel));
+
+diff -up gnome-panel-2.22.0/gnome-panel/panel-logout.c.ck-shutdown
gnome-panel-2.22.0/gnome-panel/panel-logout.c
+--- gnome-panel-2.22.0/gnome-panel/panel-logout.c.ck-shutdown 2008-03-14
17:14:22.000000000 -0400
++++ gnome-panel-2.22.0/gnome-panel/panel-logout.c 2008-03-15 23:36:28.000000000 -0400
+@@ -1,4 +1,5 @@
+-/*
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
++ *
+ * panel-logout.c:
+ *
+ * Copyright (C) 2006 Vincent Untz
+@@ -35,8 +36,10 @@
+ #include "panel-logout.h"
+ #include "panel-gdm.h"
+ #include "panel-power-manager.h"
++#include "panel-consolekit.h"
+ #include "panel-session.h"
+ #include "panel-icon-names.h"
++#include "panel-gconf.h"
+
+ #define PANEL_LOGOUT_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o),
PANEL_TYPE_LOGOUT_DIALOG, PanelLogoutDialogPrivate))
+
+@@ -55,6 +58,7 @@ struct _PanelLogoutDialogPrivate {
+ PanelLogoutDialogType type;
+
+ PanelPowerManager *power_manager;
++ PanelConsolekit *consolekit;
+
+ int timeout;
+ unsigned int timeout_id;
+@@ -76,7 +80,7 @@ enum {
+ };
+ G_DEFINE_TYPE (PanelLogoutDialog, panel_logout, GTK_TYPE_MESSAGE_DIALOG);
+
+-static void
++static void
+ panel_logout_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+@@ -91,7 +95,7 @@ panel_logout_set_property (GObject
+ }
+ }
+
+-static void
++static void
+ panel_logout_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+@@ -130,6 +134,59 @@ panel_logout_class_init (PanelLogoutDial
+ }
+
+ static void
++ck_restart_error_window (GError *error)
++{
++ GtkWidget *dialog;
++ const char *primary;
++
++ g_assert (error != NULL);
++
++ switch (error->code) {
++ case PANEL_CONSOLEKIT_ERROR_RESTARTING:
++ primary = _("Unable to restart system");
++ break;
++ case PANEL_CONSOLEKIT_ERROR_STOPPING:
++ primary = _("Unable to stop system");
++ break;
++ default:
++ g_assert_not_reached ();
++ }
++
++ dialog = gtk_message_dialog_new (NULL, 0,
++ GTK_MESSAGE_ERROR,
++ GTK_BUTTONS_NONE,
++ primary);
++
++ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
++ "%s", error->message);
++
++ gtk_dialog_add_buttons (GTK_DIALOG (dialog),
++ GTK_STOCK_CLOSE,
++ NULL);
++
++ gtk_dialog_set_default_response (GTK_DIALOG (dialog),
++ GTK_RESPONSE_CLOSE);
++ gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), FALSE);
++ gtk_window_set_title (GTK_WINDOW (dialog), "");
++
++ g_signal_connect (dialog, "response",
++ G_CALLBACK (gtk_widget_destroy), NULL);
++
++ gtk_widget_show (dialog);
++}
++
++static void
++on_ck_request_completed (PanelConsolekit *panel_consolekit,
++ GError *error)
++{
++ if (error == NULL) {
++ /* request was successful */
++ return;
++ }
++
++}
++
++static void
+ panel_logout_init (PanelLogoutDialog *logout_dialog)
+ {
+ logout_dialog->priv = PANEL_LOGOUT_DIALOG_GET_PRIVATE (logout_dialog);
+@@ -146,6 +203,10 @@ panel_logout_init (PanelLogoutDialog *lo
+ GTK_WIN_POS_CENTER_ALWAYS);
+
+ logout_dialog->priv->power_manager = panel_get_power_manager ();
++ logout_dialog->priv->consolekit = panel_get_consolekit ();
++ g_signal_connect (logout_dialog->priv->consolekit,
++ "request-completed",
++ G_CALLBACK (on_ck_request_completed), NULL);
+
+ g_signal_connect (logout_dialog, "destroy",
+ G_CALLBACK (panel_logout_destroy), NULL);
+@@ -163,37 +224,129 @@ panel_logout_destroy (PanelLogoutDialog
+
+ g_object_unref (logout_dialog->priv->power_manager);
+ logout_dialog->priv->power_manager = NULL;
++ g_object_unref (logout_dialog->priv->consolekit);
++ logout_dialog->priv->consolekit = NULL;
+
+ current_dialog = NULL;
+ }
+
++static gboolean
++panel_logout_supports_reboot (PanelLogoutDialog *logout_dialog)
++{
++ gboolean ret;
++
++ ret = panel_consolekit_can_restart (logout_dialog->priv->consolekit);
++ if (!ret) {
++ ret = gdm_supports_logout_action (GDM_LOGOUT_ACTION_REBOOT);
++ }
++ return ret;
++}
++
++static gboolean
++panel_logout_supports_shutdown (PanelLogoutDialog *logout_dialog)
++{
++ gboolean ret;
++
++ ret = panel_consolekit_can_stop (logout_dialog->priv->consolekit);
++ if (!ret) {
++ ret = gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN);
++ }
++ return ret;
++}
++
++gboolean
++panel_logout_supports_shutdown_reboot (void)
++{
++ PanelConsolekit *consolekit;
++ gboolean ret;
++
++ ret = FALSE;
++
++ /* if we can do any then return true */
++
++ consolekit = panel_get_consolekit ();
++ if (consolekit != NULL) {
++ ret = panel_consolekit_can_restart (consolekit)
++ || panel_consolekit_can_stop (consolekit);
++ g_object_unref (consolekit);
++ }
++
++ if (!ret) {
++ ret = gdm_supports_logout_action (GDM_LOGOUT_ACTION_REBOOT)
++ || gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN);
++ }
++
++ return ret;
++}
++
++static void
++do_request_logout (PanelConsolekit *consolekit)
++{
++ gdm_set_logout_action (GDM_LOGOUT_ACTION_NONE);
++ panel_session_request_logout ();
++}
++
++static void
++maybe_request_session_save (void)
++{
++ if (gconf_client_get_bool (panel_gconf_get_client (),
++ "/apps/gnome-session/options/auto_save_session",
++ NULL))
++ panel_session_request_save ();
++}
++
++static void
++do_request_reboot (PanelConsolekit *consolekit)
++{
++ if (panel_consolekit_can_restart (consolekit)) {
++ gdm_set_logout_action (GDM_LOGOUT_ACTION_NONE);
++ maybe_request_session_save ();
++ panel_consolekit_attempt_restart (consolekit);
++ } else {
++ gdm_set_logout_action (GDM_LOGOUT_ACTION_REBOOT);
++ panel_session_request_logout ();
++ }
++}
++
++static void
++do_request_shutdown (PanelConsolekit *consolekit)
++{
++ if (panel_consolekit_can_stop (consolekit)) {
++ gdm_set_logout_action (GDM_LOGOUT_ACTION_NONE);
++ maybe_request_session_save ();
++ panel_consolekit_attempt_stop (consolekit);
++ } else {
++ gdm_set_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN);
++ panel_session_request_logout ();
++ }
++}
++
+ static void
+ panel_logout_response (PanelLogoutDialog *logout_dialog,
+ guint response_id,
+ gpointer data)
+ {
+ PanelPowerManager *power_manager;
++ PanelConsolekit *consolekit;
+
+ power_manager = g_object_ref (logout_dialog->priv->power_manager);
++ consolekit = g_object_ref (logout_dialog->priv->consolekit);
+ gtk_widget_destroy (GTK_WIDGET (logout_dialog));
+
+ switch (response_id) {
+ case GTK_RESPONSE_CANCEL:
+ break;
+ case PANEL_LOGOUT_RESPONSE_LOGOUT:
+- gdm_set_logout_action (GDM_LOGOUT_ACTION_NONE);
+- panel_session_request_logout ();
++ do_request_logout (consolekit);
+ break;
+ case PANEL_LOGOUT_RESPONSE_SWITCH_USER:
+ gdm_new_login ();
+ break;
+ case PANEL_LOGOUT_RESPONSE_SHUTDOWN:
+- gdm_set_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN);
+- panel_session_request_logout ();
++ do_request_shutdown (consolekit);
+ break;
+ case PANEL_LOGOUT_RESPONSE_REBOOT:
+- gdm_set_logout_action (GDM_LOGOUT_ACTION_REBOOT);
+- panel_session_request_logout ();
++ do_request_reboot (consolekit);
+ break;
+ case PANEL_LOGOUT_RESPONSE_STD:
+ if (panel_power_manager_can_hibernate (power_manager))
+@@ -210,6 +363,7 @@ panel_logout_response (PanelLogoutDialog
+ g_assert_not_reached ();
+ }
+ g_object_unref (power_manager);
++ g_object_unref (consolekit);
+ }
+
+ static gboolean
+@@ -363,7 +517,7 @@ panel_logout_new (PanelLogoutDialogType
+ _("_Hibernate"),
+ PANEL_LOGOUT_RESPONSE_STD);
+
+- if (gdm_supports_logout_action (GDM_LOGOUT_ACTION_REBOOT))
++ if (panel_logout_supports_reboot (logout_dialog))
+ gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
+ _("_Restart"),
+ PANEL_LOGOUT_RESPONSE_REBOOT);
+@@ -372,7 +526,7 @@ panel_logout_new (PanelLogoutDialogType
+ GTK_STOCK_CANCEL,
+ GTK_RESPONSE_CANCEL);
+
+- if (gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN))
++ if (panel_logout_supports_shutdown (logout_dialog))
+ gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
+ _("_Shut Down"),
+ PANEL_LOGOUT_RESPONSE_SHUTDOWN);
+diff -up /dev/null gnome-panel-2.22.0/gnome-panel/panel-consolekit.h
+--- /dev/null 2008-03-15 22:02:38.932007625 -0400
++++ gnome-panel-2.22.0/gnome-panel/panel-consolekit.h 2008-03-14 17:14:22.000000000
-0400
+@@ -0,0 +1,77 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
++ *
++ * Copyright (C) 2008 Jon McCann <jmccann(a)redhat.com>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of the
++ * License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++ * 02111-1307, USA.
++ *
++ * Authors:
++ * Jon McCann <jmccann(a)redhat.com>
++ */
++
++#ifndef PANEL_CONSOLEKIT_H
++#define PANEL_CONSOLEKIT_H
++
++#include <glib.h>
++#include <glib-object.h>
++
++G_BEGIN_DECLS
++
++#define PANEL_TYPE_CONSOLEKIT (panel_consolekit_get_type ())
++#define PANEL_CONSOLEKIT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
PANEL_TYPE_CONSOLEKIT, PanelConsolekit))
++#define PANEL_CONSOLEKIT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass),
PANEL_TYPE_CONSOLEKIT, PanelConsolekitClass))
++#define PANEL_IS_CONSOLEKIT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj),
PANEL_TYPE_CONSOLEKIT))
++#define PANEL_IS_CONSOLEKIT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),
PANEL_TYPE_CONSOLEKIT))
++#define PANEL_CONSOLEKIT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj),
PANEL_TYPE_CONSOLEKIT, PanelConsolekitClass))
++#define PANEL_CONSOLEKIT_ERROR (panel_consolekit_error_quark ())
++
++typedef struct _PanelConsolekit PanelConsolekit;
++typedef struct _PanelConsolekitClass PanelConsolekitClass;
++typedef struct _PanelConsolekitPrivate PanelConsolekitPrivate;
++typedef enum _PanelConsolekitError PanelConsolekitError;
++
++struct _PanelConsolekit {
++ GObject parent;
++ PanelConsolekitPrivate *priv;
++};
++
++struct _PanelConsolekitClass {
++ GObjectClass parent_class;
++
++ void (* request_completed) (PanelConsolekit *manager,
++ GError *error);
++};
++
++enum _PanelConsolekitError {
++ PANEL_CONSOLEKIT_ERROR_RESTARTING = 0,
++ PANEL_CONSOLEKIT_ERROR_STOPPING
++};
++
++GType panel_consolekit_get_type (void);
++GQuark panel_consolekit_error_quark (void);
++
++PanelConsolekit *panel_consolekit_new (void) G_GNUC_MALLOC;
++
++gboolean panel_consolekit_can_stop (PanelConsolekit *manager);
++gboolean panel_consolekit_can_restart (PanelConsolekit *manager);
++
++void panel_consolekit_attempt_stop (PanelConsolekit *manager);
++void panel_consolekit_attempt_restart (PanelConsolekit *manager);
++
++PanelConsolekit *panel_get_consolekit (void);
++
++G_END_DECLS
++
++#endif /* PANEL_CONSOLEKIT_H */
+diff -up gnome-panel-2.22.0/gnome-panel/panel-action-button.c.ck-shutdown
gnome-panel-2.22.0/gnome-panel/panel-action-button.c
+--- gnome-panel-2.22.0/gnome-panel/panel-action-button.c.ck-shutdown 2008-03-14
17:14:22.000000000 -0400
++++ gnome-panel-2.22.0/gnome-panel/panel-action-button.c 2008-03-14 17:14:22.000000000
-0400
+@@ -46,7 +46,6 @@
+ #include "panel-lockdown.h"
+ #include "panel-logout.h"
+ #include "panel-compatibility.h"
+-#include "panel-gdm.h"
+ #include "panel-icon-names.h"
+
+ G_DEFINE_TYPE (PanelActionButton, panel_action_button, BUTTON_TYPE_WIDGET);
+@@ -183,8 +182,7 @@ static gboolean
+ panel_action_shutdown_reboot_is_disabled (void)
+ {
+ return (panel_lockdown_get_disable_log_out() ||
+- (!gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN) &&
+- !gdm_supports_logout_action (GDM_LOGOUT_ACTION_REBOOT)));
++ !panel_logout_supports_shutdown_reboot);
+ }
+
+ /* Run Application
+diff -up gnome-panel-2.22.0/gnome-panel/panel-logout.h.ck-shutdown
gnome-panel-2.22.0/gnome-panel/panel-logout.h
+--- gnome-panel-2.22.0/gnome-panel/panel-logout.h.ck-shutdown 2008-03-10
16:44:57.000000000 -0400
++++ gnome-panel-2.22.0/gnome-panel/panel-logout.h 2008-03-14 17:14:22.000000000 -0400
+@@ -57,6 +57,8 @@ struct _PanelLogoutDialogClass {
+
+ GType panel_logout_get_type (void) G_GNUC_CONST;
+
++gboolean panel_logout_supports_shutdown_reboot (void);
++
+ void panel_logout_new (PanelLogoutDialogType type,
+ GdkScreen *screen,
+ guint32 activate_time);
+diff -up gnome-panel-2.22.0/gnome-panel/Makefile.am.ck-shutdown
gnome-panel-2.22.0/gnome-panel/Makefile.am
+--- gnome-panel-2.22.0/gnome-panel/Makefile.am.ck-shutdown 2008-03-10 16:44:57.000000000
-0400
++++ gnome-panel-2.22.0/gnome-panel/Makefile.am 2008-03-14 17:14:22.000000000 -0400
+@@ -16,6 +16,7 @@ INCLUDES = \
+ $(STANDARD_PROPERTIES_CFLAGS) \
+ $(PANEL_CFLAGS) \
+ $(PANELCONFIG_CFLAGS) \
++ $(POLKIT_GNOME_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(NULL)
+
+@@ -98,6 +99,7 @@ panel_sources = \
+ panel-logout.c \
+ panel-gdm.c \
+ panel-power-manager.c \
++ panel-consolekit.c \
+ panel-ditem-editor.c \
+ panel-mount-operation.c \
+ $(NULL)
+@@ -148,6 +150,7 @@ panel_headers = \
+ panel-logout.h \
+ panel-gdm.h \
+ panel-power-manager.h \
++ panel-consolekit.h \
+ panel-ditem-editor.h \
+ panel-icon-names.h \
+ panel-mount-operation.h \
+@@ -161,6 +164,7 @@ gnome_panel_SOURCES = \
+
+ gnome_panel_LDADD = \
+ $(PANEL_LIBS) \
++ $(POLKIT_GNOME_LIBS) \
+ $(X_LIBS)
+
+ gnome_panel_LDFLAGS = -export-dynamic
+diff -up gnome-panel-2.22.0/gnome-panel/panel-session.c.ck-shutdown
gnome-panel-2.22.0/gnome-panel/panel-session.c
+--- gnome-panel-2.22.0/gnome-panel/panel-session.c.ck-shutdown 2008-03-10
16:44:57.000000000 -0400
++++ gnome-panel-2.22.0/gnome-panel/panel-session.c 2008-03-14 17:14:22.000000000 -0400
+@@ -60,6 +60,34 @@ panel_session_request_logout (void)
+ recursion_guard--;
+ }
+
++void
++panel_session_request_save (void)
++{
++ GnomeClient *client;
++ static int recursion_guard = 0;
++
++ if (recursion_guard)
++ return;
++
++ recursion_guard++;
++
++ if (!(client = gnome_master_client ()))
++ return;
++
++ /* Only request a Global save. We only want a Local
++ * save if the user selects 'Save current setup'
++ * from the dialog.
++ */
++ gnome_client_request_save (client,
++ GNOME_SAVE_GLOBAL,
++ FALSE,
++ GNOME_INTERACT_NONE,
++ TRUE, /* do not use the gnome-session gui */
++ TRUE);
++
++ recursion_guard--;
++}
++
+ static void
+ panel_session_handle_die_request (GnomeClient *client)
+ {
diff --git a/gnome-panel.spec b/gnome-panel.spec
index a651434..d0e5991 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.22.0
-Release: 3%{?dist}
+Release: 4%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.22/%{name}-%{version}.tar...
@@ -108,7 +108,7 @@ Patch10: preferred-apps.patch
Patch11: applet-error.patch
#
http://bugzilla.gnome.org/show_bug.cgi?id=511881
-Patch14: gnome-panel-2.21.5-ck-shutdown.patch
+Patch14: gnome-panel-2.22.0-ck-shutdown.patch
#
http://bugzilla.gnome.org/show_bug.cgi?id=520111
Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
@@ -353,6 +353,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Sat Mar 15 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.0-4
+- Only save the session when the users wants it
+
* Fri Mar 14 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.0-3
- Populate the location list before showing the preference window
diff --git a/polkit-fix.patch b/polkit-fix.patch
deleted file mode 100644
index 2d07445..0000000
--- a/polkit-fix.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-diff -up gnome-panel-2.21.92/applets/clock/set-timezone.c.polkit-fix
gnome-panel-2.21.92/applets/clock/set-timezone.c
---- gnome-panel-2.21.92/applets/clock/set-timezone.c.polkit-fix 2008-03-03
12:10:34.000000000 -0500
-+++ gnome-panel-2.21.92/applets/clock/set-timezone.c 2008-03-03 12:10:50.000000000 -0500
-@@ -75,6 +75,40 @@ 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;
-+}
-+
-+static void
-+pk_io_remove_watch_fn (PolKitContext *pk_context, int watch_id)
-+{
-+ g_source_remove (watch_id);
-+}
-+
- static PolKitContext *
- get_pk_context (void)
- {
-@@ -82,6 +116,9 @@ get_pk_context (void)
-
- 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;
-@@ -126,22 +163,19 @@ can_do (const gchar *pk_action_id)
- pk_result = polkit_context_can_caller_do_action (pk_context, pk_action,
pk_caller);
-
- switch (pk_result) {
-- default:
- case POLKIT_RESULT_UNKNOWN:
- case POLKIT_RESULT_NO:
- res = 0;
- break;
-- case POLKIT_RESULT_ONLY_VIA_ADMIN_AUTH:
-- case POLKIT_RESULT_ONLY_VIA_ADMIN_AUTH_KEEP_SESSION:
-- case POLKIT_RESULT_ONLY_VIA_ADMIN_AUTH_KEEP_ALWAYS:
-- case POLKIT_RESULT_ONLY_VIA_SELF_AUTH:
-- case POLKIT_RESULT_ONLY_VIA_SELF_AUTH_KEEP_SESSION:
-- case POLKIT_RESULT_ONLY_VIA_SELF_AUTH_KEEP_ALWAYS:
-- res = 1;
-- 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:
-diff -up gnome-panel-2.21.92/applets/clock/clock.c.polkit-fix
gnome-panel-2.21.92/applets/clock/clock.c
---- gnome-panel-2.21.92/applets/clock/clock.c.polkit-fix 2008-03-03 12:10:23.000000000
-0500
-+++ gnome-panel-2.21.92/applets/clock/clock.c 2008-03-03 12:10:45.000000000 -0500
-@@ -2266,11 +2266,15 @@ clock_migrate_to_26 (ClockData *clock)
- else if (hourformat == 24)
- clock->format = CLOCK_FORMAT_24;
-
-- panel_applet_gconf_set_string (PANEL_APPLET (clock->applet),
-- KEY_FORMAT,
-- gconf_enum_to_string (format_type_enum_map,
-- clock->format),
-- NULL);
-+ /* It's still possible that we have none of the old keys, in which case
-+ * we're not migrating from 2.6, but the config is simply wrong. So
-+ * don't set the format key in this case. */
-+ if (clock->format != CLOCK_FORMAT_INVALID)
-+ panel_applet_gconf_set_string (PANEL_APPLET (clock->applet),
-+ KEY_FORMAT,
-+ gconf_enum_to_string (format_type_enum_map,
-+ clock->format),
-+ NULL);
- }
-
- static void
diff --git a/sunrise.patch b/sunrise.patch
deleted file mode 100644
index 4a27c96..0000000
--- a/sunrise.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -up gnome-panel-2.21.91/applets/clock/clock-location-tile.c.sunrise
gnome-panel-2.21.91/applets/clock/clock-location-tile.c
---- gnome-panel-2.21.91/applets/clock/clock-location-tile.c.sunrise 2008-02-22
12:56:42.000000000 -0500
-+++ gnome-panel-2.21.91/applets/clock/clock-location-tile.c 2008-02-22 13:08:01.000000000
-0500
-@@ -534,13 +534,14 @@ clock_location_tile_refresh (ClockLocati
- }
-
- void
--weather_info_setup_tooltip (WeatherInfo *info, GtkTooltip *tooltip)
-+weather_info_setup_tooltip (WeatherInfo *info, ClockLocation *location, GtkTooltip
*tooltip)
- {
- GdkPixbuf *pixbuf = NULL;
- GtkIconTheme *theme = NULL;
- const gchar *conditions, *temp, *apparent, *wind;
- gchar *line1, *line2, *line3, *line4, *tip;
- const gchar *icon_name;
-+ const gchar *sys_timezone;
-
- icon_name = weather_info_get_icon_name (info);
- theme = gtk_icon_theme_get_default ();
-@@ -571,9 +572,20 @@ weather_info_setup_tooltip (WeatherInfo
- else
- line3 = g_strdup ("");
-
-+ /* FIXME: we need libgweather to give us the time,
-+ * not just a formatted string
-+ */
-+ sys_timezone = getenv ("TZ");
-+ setenv ("TZ", clock_location_get_timezone (location), 1);
-+ tzset ();
- line4 = g_strdup_printf (_("Sunrise: %s / Sunset: %s"),
- weather_info_get_sunrise (info),
- weather_info_get_sunset (info));
-+ if (sys_timezone)
-+ setenv ("TZ", sys_timezone, 1);
-+ else
-+ unsetenv ("TZ");
-+ tzset ();
-
- tip = g_strdup_printf ("<b>%s</b>\n%s\n%s%s", line1, line2,
line3, line4);
- gtk_tooltip_set_markup (tooltip, tip);
-@@ -601,7 +613,7 @@ weather_tooltip (GtkWidget *widget,
- if (!info || !weather_info_is_valid (info))
- return FALSE;
-
-- weather_info_setup_tooltip (info, tooltip);
-+ weather_info_setup_tooltip (info, priv->location, tooltip);
-
- return TRUE;
- }
-diff -up gnome-panel-2.21.91/applets/clock/clock.c.sunrise
gnome-panel-2.21.91/applets/clock/clock.c
---- gnome-panel-2.21.91/applets/clock/clock.c.sunrise 2008-02-22 12:56:42.000000000
-0500
-+++ gnome-panel-2.21.91/applets/clock/clock.c 2008-02-22 12:56:42.000000000 -0500
-@@ -1341,12 +1341,13 @@ weather_tooltip (GtkWidget *widget,
- locations = cd->locations;
-
- for (l = locations; l; l = l->next) {
-- if (clock_location_is_current (l->data)) {
-- info = clock_location_get_weather_info (l->data);
-+ ClockLocation *location = l->data;
-+ if (clock_location_is_current (location)) {
-+ info = clock_location_get_weather_info (location);
- if (!info || !weather_info_is_valid (info))
- continue;
-
-- weather_info_setup_tooltip (info, tooltip);
-+ weather_info_setup_tooltip (info, location, tooltip);
-
- return TRUE;
- }
-diff -up gnome-panel-2.21.91/applets/clock/clock-location-tile.h.sunrise
gnome-panel-2.21.91/applets/clock/clock-location-tile.h
---- gnome-panel-2.21.91/applets/clock/clock-location-tile.h.sunrise 2008-02-22
12:56:42.000000000 -0500
-+++ gnome-panel-2.21.91/applets/clock/clock-location-tile.h 2008-02-22 12:56:42.000000000
-0500
-@@ -37,7 +37,7 @@ ClockLocationTile *clock_location_tile_n
-
- ClockLocation *clock_location_tile_get_location (ClockLocationTile *this);
-
--void weather_info_setup_tooltip (WeatherInfo *info, GtkTooltip *tip);
-+void weather_info_setup_tooltip (WeatherInfo *info, ClockLocation *location, GtkTooltip
*tip);
-
- void clock_location_tile_refresh (ClockLocationTile *this,
- gboolean force_refresh);
commit 1e2242685f1ee7b5a9940485b2aaa72f3f765c08
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Mar 14 21:22:23 2008 +0000
Fill the location list before showing the preference window
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 384d183..a651434 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.22.0
-Release: 2%{?dist}
+Release: 3%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.22/%{name}-%{version}.tar...
@@ -116,6 +116,9 @@ Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
Patch25: current.patch
Patch26: expose.patch
+# fixed upstream
+Patch27: populate.patch
+
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -165,6 +168,7 @@ Panel Applets using the libpanel-applet library.
%patch24 -p1 -b .allow-spurious-view-done-signals
%patch25 -p1 -b .current
%patch26 -p1 -b .expose
+%patch27 -p1 -b .populate
. %{SOURCE6}
@@ -349,6 +353,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Fri Mar 14 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.0-3
+- Populate the location list before showing the preference window
+
* Mon Mar 10 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.0-2
- Bump revision
diff --git a/populate.patch b/populate.patch
new file mode 100644
index 0000000..5e17c5d
--- /dev/null
+++ b/populate.patch
@@ -0,0 +1,26 @@
+diff -up gnome-panel-2.22.0/applets/clock/clock.c.populate
gnome-panel-2.22.0/applets/clock/clock.c
+--- gnome-panel-2.22.0/applets/clock/clock.c.populate 2008-03-14 17:15:02.000000000
-0400
++++ gnome-panel-2.22.0/applets/clock/clock.c 2008-03-14 17:15:06.000000000 -0400
+@@ -1002,12 +1002,6 @@ create_cities_store (ClockData *cd)
+
+ list = list->next;
+ }
+-
+- if (cd->prefs_window) {
+- GtkWidget *widget = glade_xml_get_widget (cd->glade_xml,
"cities_list");
+- gtk_tree_view_set_model (GTK_TREE_VIEW (widget),
+- GTK_TREE_MODEL (cd->cities_store));
+- }
+ }
+
+ static gint
+@@ -3832,6 +3826,9 @@ fill_prefs_window (ClockData *cd)
+ renderer = gtk_cell_renderer_text_new ();
+ col = gtk_tree_view_column_new_with_attributes (_("City Time Zone"),
renderer, "text", COL_CITY_TZ, NULL);
+ gtk_tree_view_insert_column (GTK_TREE_VIEW (widget), col, -1);
++
++ if (cd->cities_store == NULL)
++ create_cities_store (cd);
+
+ gtk_tree_view_set_model (GTK_TREE_VIEW (widget),
+ GTK_TREE_MODEL (cd->cities_store));
commit 71bec65e78d6d36458703135972d3f5a22d23e15
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Mar 11 03:50:34 2008 +0000
bump rev
diff --git a/async-timezone.patch b/async-timezone.patch
deleted file mode 100644
index 7a3ce7c..0000000
--- a/async-timezone.patch
+++ /dev/null
@@ -1,368 +0,0 @@
---- gnome-panel-2.21.91/applets/clock/set-timezone.c 2008-02-11 16:15:51.000000000 -0500
-+++ hacked/applets/clock/set-timezone.c 2008-02-18 00:49:27.000000000 -0500
-@@ -91,108 +91,6 @@
- return pk_context;
- }
-
--gboolean
--set_system_timezone (const char *filename, GError **err)
--{
-- DBusGConnection *session_bus;
-- DBusGConnection *system_bus;
-- DBusGProxy *mechanism_proxy;
-- DBusGProxy *polkit_gnome_proxy;
-- gboolean ret = FALSE;
--
-- session_bus = get_session_bus ();
-- if (session_bus == NULL)
-- goto out;
--
-- system_bus = get_system_bus ();
-- if (system_bus == NULL)
-- goto out;
--
-- mechanism_proxy = dbus_g_proxy_new_for_name (system_bus,
--
"org.gnome.ClockApplet.Mechanism",
-- "/",
--
"org.gnome.ClockApplet.Mechanism");
--
-- polkit_gnome_proxy = dbus_g_proxy_new_for_name (session_bus,
--
"org.gnome.PolicyKit",
--
"/org/gnome/PolicyKit/Manager",
--
"org.gnome.PolicyKit.Manager");
--
-- if (filename != NULL) {
-- GError *error;
--
-- g_debug ("Trying to set timezone '%s'", filename);
-- try_again:
-- error = NULL;
-- /* first, try to call into the mechanism */
-- if (!dbus_g_proxy_call_with_timeout (mechanism_proxy,
-- "SetTimezone",
-- INT_MAX,
-- &error,
-- /* parameters: */
-- G_TYPE_STRING, filename,
-- G_TYPE_INVALID,
-- /* return values: */
-- G_TYPE_INVALID)) {
-- if (dbus_g_error_has_name (error,
"org.gnome.ClockApplet.Mechanism.NotPrivileged")) {
-- char **tokens;
-- char *polkit_result_textual;
-- char *polkit_action;
-- gboolean gained_privilege;
--
-- tokens = g_strsplit (error->message, " ",
2);
-- g_error_free (error);
-- if (g_strv_length (tokens) != 2) {
-- g_warning ("helper return string
malformed");
-- g_strfreev (tokens);
-- goto out;
-- }
-- polkit_action = tokens[0];
-- polkit_result_textual = tokens[1];
--
-- g_debug ("helper refused; returned
polkit_result='%s' and polkit_action='%s'",
-- polkit_result_textual, polkit_action);
--
-- /* Now ask the user for auth... */
-- if (!dbus_g_proxy_call_with_timeout
(polkit_gnome_proxy,
--
"ShowDialog",
-- INT_MAX,
-- &error,
-- /* parameters: */
-- G_TYPE_STRING,
polkit_action,
-- G_TYPE_UINT, 0, /*
X11 window ID; none */
-- G_TYPE_INVALID,
-- /* return values:
*/
-- G_TYPE_BOOLEAN,
&gained_privilege,
-- G_TYPE_INVALID)) {
-- g_propagate_error (err, error);
-- g_strfreev (tokens);
-- goto out;
-- }
-- g_strfreev (tokens);
--
-- if (gained_privilege) {
-- g_debug ("Gained privilege; trying to set
timezone again");
-- goto try_again;
-- }
--
-- } else {
-- g_propagate_error (err, error);
-- }
-- goto out;
-- }
--
-- g_debug ("Successfully set time zone to '%s'",
filename);
-- }
--
-- ret = TRUE;
--out:
-- g_object_unref (mechanism_proxy);
-- g_object_unref (polkit_gnome_proxy);
--
-- return ret;
--}
--
- static gint
- can_do (const gchar *pk_action_id)
- {
-@@ -269,7 +167,9 @@
-
- typedef struct {
- gint ref_count;
-+ gchar *call;
- gint64 time;
-+ gchar *filename;
- GFunc callback;
- gpointer data;
- GDestroyNotify notify;
-@@ -284,6 +184,7 @@
- if (data->ref_count == 0) {
- if (data->notify)
- data->notify (data->data);
-+ g_free (data->filename);
- g_free (data);
- }
- }
-@@ -392,16 +293,28 @@
- "org.gnome.ClockApplet.Mechanism");
-
- data->ref_count++;
-- dbus_g_proxy_begin_call_with_timeout (proxy,
-- "SetTime",
-- set_time_notify,
-- data, free_data,
-- INT_MAX,
-- /* parameters: */
-- G_TYPE_INT64, data->time,
-- G_TYPE_INVALID,
-- /* return values: */
-- G_TYPE_INVALID);
-+ if (strcmp (data->call, "SetTime") == 0)
-+ dbus_g_proxy_begin_call_with_timeout (proxy,
-+ "SetTime",
-+ set_time_notify,
-+ data, free_data,
-+ INT_MAX,
-+ /* parameters: */
-+ G_TYPE_INT64, data->time,
-+ G_TYPE_INVALID,
-+ /* return values: */
-+ G_TYPE_INVALID);
-+ else
-+ dbus_g_proxy_begin_call_with_timeout (proxy,
-+ "SetTimezone",
-+ set_time_notify,
-+ data, free_data,
-+ INT_MAX,
-+ /* parameters: */
-+ G_TYPE_STRING, data->filename,
-+ G_TYPE_INVALID,
-+ /* return values: */
-+ G_TYPE_INVALID);
- }
-
- void
-@@ -417,7 +330,33 @@
-
- data = g_new (SetTimeCallbackData, 1);
- data->ref_count = 1;
-+ data->call = "SetTime";
- data->time = time;
-+ data->filename = NULL;
-+ data->callback = callback;
-+ data->data = d;
-+ data->notify = notify;
-+
-+ set_time_async (data);
-+ free_data (data);
-+}
-+
-+void
-+set_system_timezone_async (const gchar *filename,
-+ GFunc callback,
-+ gpointer d,
-+ GDestroyNotify notify)
-+{
-+ SetTimeCallbackData *data;
-+
-+ if (filename == NULL)
-+ return;
-+
-+ data = g_new (SetTimeCallbackData, 1);
-+ data->ref_count = 1;
-+ data->call = "SetTimezone";
-+ data->time = -1;
-+ data->filename = g_strdup (filename);
- data->callback = callback;
- data->data = d;
- data->notify = notify;
---- gnome-panel-2.21.91/applets/clock/set-timezone.h 2008-02-11 16:15:51.000000000 -0500
-+++ hacked/applets/clock/set-timezone.h 2008-02-18 00:48:40.000000000 -0500
-@@ -23,8 +23,6 @@
- #include <glib.h>
- #include <time.h>
-
--gboolean set_system_timezone (const char *filename,
-- GError **err);
- gint can_set_system_timezone (void);
-
- gint can_set_system_time (void);
-@@ -34,4 +32,9 @@
- gpointer data,
- GDestroyNotify notify);
-
-+void set_system_timezone_async (const gchar *filename,
-+ GFunc callback,
-+ gpointer data,
-+ GDestroyNotify notify);
-+
- #endif
---- gnome-panel-2.21.91/applets/clock/clock-location.h 2008-02-11 16:15:51.000000000
-0500
-+++ hacked/applets/clock/clock-location.h 2008-02-18 00:11:57.000000000 -0500
-@@ -52,7 +52,10 @@
- void clock_location_localtime (ClockLocation *loc, struct tm *tm);
-
- gboolean clock_location_is_current (ClockLocation *loc);
--gboolean clock_location_make_current (ClockLocation *loc, GError **error);
-+void clock_location_make_current (ClockLocation *loc,
-+ GFunc callback,
-+ gpointer data,
-+ GDestroyNotify destroy);
-
- const gchar *clock_location_get_weather_code (ClockLocation *loc);
- void clock_location_set_weather_code (ClockLocation *loc, const gchar *code);
---- gnome-panel-2.21.91/applets/clock/clock-location.c 2008-02-11 16:15:51.000000000
-0500
-+++ hacked/applets/clock/clock-location.c 2008-02-18 00:50:53.000000000 -0500
-@@ -667,18 +667,20 @@
- return offset;
- }
-
--gboolean
--clock_location_make_current (ClockLocation *loc, GError **error)
--{
-- ClockLocationPrivate *priv = PRIVATE (loc);
-- gchar *filename;
-- gboolean ret;
-+typedef struct {
-+ ClockLocation *location;
-+ GFunc callback;
-+ gpointer data;
-+ GDestroyNotify destroy;
-+} MakeCurrentData;
-
-- filename = g_build_filename (SYSTEM_ZONEINFODIR, priv->timezone, NULL);
-- ret = set_system_timezone (filename, error);
-- g_free (filename);
-+static void
-+make_current_cb (gpointer data, GError *error)
-+{
-+ MakeCurrentData *mcdata = data;
-+ ClockLocationPrivate *priv = PRIVATE (mcdata->location);
-
-- if (ret) {
-+ if (error == NULL) {
- /* FIXME this ugly shortcut is necessary until we move the
- * current timezone tracking to clock.c and emit the
- * signal from there
-@@ -687,7 +689,47 @@
- current_zone = g_strdup (priv->timezone);
- }
-
-- return ret;
-+ if (mcdata->callback)
-+ mcdata->callback (mcdata->data, error);
-+ else
-+ g_error_free (error);
-+}
-+
-+static void
-+free_make_current_data (gpointer data)
-+{
-+ MakeCurrentData *mcdata = data;
-+
-+ if (mcdata->destroy)
-+ mcdata->destroy (mcdata->data);
-+
-+ g_object_unref (mcdata->location);
-+ g_free (mcdata);
-+}
-+
-+void
-+clock_location_make_current (ClockLocation *loc,
-+ GFunc callback,
-+ gpointer data,
-+ GDestroyNotify destroy)
-+{
-+ ClockLocationPrivate *priv = PRIVATE (loc);
-+ gchar *filename;
-+ MakeCurrentData *mcdata;
-+
-+ mcdata = g_new (MakeCurrentData, 1);
-+
-+ mcdata->location = g_object_ref (loc);
-+ mcdata->callback = callback;
-+ mcdata->data = data;
-+ mcdata->destroy = destroy;
-+
-+ filename = g_build_filename (SYSTEM_ZONEINFODIR, priv->timezone, NULL);
-+ set_system_timezone_async (filename,
-+ (GFunc)make_current_cb,
-+ mcdata,
-+ free_make_current_data);
-+ g_free (filename);
- }
-
- const gchar *
---- gnome-panel-2.21.91/applets/clock/clock-location-tile.c 2008-02-18 01:08:29.000000000
-0500
-+++ hacked/applets/clock/clock-location-tile.c 2008-02-18 01:10:17.000000000 -0500
-@@ -104,7 +104,7 @@
- NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
-- signals[TILE_PRESSED] = g_signal_new ("timezone-set",
-+ signals[TIMEZONE_SET] = g_signal_new ("timezone-set",
- G_TYPE_FROM_CLASS (g_obj_class),
- G_SIGNAL_RUN_FIRST,
- G_STRUCT_OFFSET (ClockLocationTileClass, timezone_set),
-@@ -171,16 +171,15 @@
- }
-
- static void
--make_current (GtkWidget *widget, ClockLocationTile *tile)
-+make_current_cb (gpointer data, GError *error)
- {
-- ClockLocationTilePrivate *priv = PRIVATE (tile);
-- GError *error = NULL;
-- GtkWidget *dialog;
-+ ClockLocationTile *tile = data;
-+ GtkWidget *dialog;
-
-- if (clock_location_make_current (priv->location, &error)) {
-+ if (error == NULL) {
- g_signal_emit (tile, signals[TIMEZONE_SET], 0);
- }
-- else if (error) {
-+ else {
- dialog = gtk_message_dialog_new (NULL,
- 0,
- GTK_MESSAGE_ERROR,
-@@ -195,6 +194,15 @@
- }
- }
-
-+static void
-+make_current (GtkWidget *widget, ClockLocationTile *tile)
-+{
-+ ClockLocationTilePrivate *priv = PRIVATE (tile);
-+
-+ clock_location_make_current (priv->location,
-+ (GFunc)make_current_cb, tile, NULL);
-+}
-+
- static gboolean
- enter_or_leave_tile (GtkWidget *widget,
- GdkEventCrossing *event,
diff --git a/clock-timezones.patch b/clock-timezones.patch
deleted file mode 100644
index fd5a4a7..0000000
--- a/clock-timezones.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-panel-2.19.5/applets/clock/tz.c 2007-07-08 16:25:50.000000000 -0400
-+++ hacked/applets/clock/tz.c 2007-07-12 15:43:48.000000000 -0400
-@@ -469,7 +469,7 @@
- locs = tz_get_locations ();
-
- /* try to locate by inode */
-- for (i = 0; i < locs->len; i++)
-+ for (i = 0; g_ptr_array_index (locs, i); i++)
- {
- tz_loc = g_ptr_array_index (locs, i);
-
diff --git a/dst-offset.patch b/dst-offset.patch
deleted file mode 100644
index c1f1cda..0000000
--- a/dst-offset.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -up gnome-panel-2.21.91/applets/clock/clock-location.c.dst-offset
gnome-panel-2.21.91/applets/clock/clock-location.c
---- gnome-panel-2.21.91/applets/clock/clock-location.c.dst-offset 2008-02-19
22:18:55.000000000 -0500
-+++ gnome-panel-2.21.91/applets/clock/clock-location.c 2008-02-19 22:19:03.000000000
-0500
-@@ -645,17 +645,30 @@ glong
- clock_location_get_offset (ClockLocation *loc)
- {
- ClockLocationPrivate *priv = PRIVATE (loc);
-- glong sys_timezone;
-+ glong sys_timezone, local_timezone;
- glong offset;
-+ time_t t;
-+ struct tm *tm;
-
-+ t = time (NULL);
-+
- unsetenv ("TZ");
-- tzset ();
-+ tm = localtime (&t);
- sys_timezone = timezone;
-
-+ if (tm->tm_isdst > 0) {
-+ sys_timezone -= 3600;
-+ }
-+
- setenv ("TZ", priv->timezone, 1);
-- tzset();
-+ tm = localtime (&t);
-+ local_timezone = timezone;
-+
-+ if (tm->tm_isdst > 0) {
-+ local_timezone -= 3600;
-+ }
-
-- offset = timezone - sys_timezone;
-+ offset = local_timezone - sys_timezone;
-
- if (priv->sys_timezone) {
- setenv ("TZ", priv->sys_timezone, 1);
diff --git a/glue.patch b/glue.patch
deleted file mode 100644
index dd5aac7..0000000
--- a/glue.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-diff -up gnome-panel-2.21.5/applets/clock/gnome-clock-applet-mechanism.policy.glue
gnome-panel-2.21.5/applets/clock/gnome-clock-applet-mechanism.policy
---- gnome-panel-2.21.5/applets/clock/gnome-clock-applet-mechanism.policy.glue 2008-01-16
10:57:15.000000000 -0500
-+++ gnome-panel-2.21.5/applets/clock/gnome-clock-applet-mechanism.policy 2008-01-16
10:56:56.000000000 -0500
-@@ -0,0 +1,37 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE policyconfig PUBLIC
-+ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
-+ "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
-+
-+<!-- needs i18n work -->
-+
-+<policyconfig>
-+
-+ <action id="org.gnome.clockapplet.mechanism.settimezone">
-+ <description>Change system time zone</description>
-+ <message>Changing the system time zone requires privileges.</message>
-+ <defaults>
-+ <allow_inactive>no</allow_inactive>
-+ <allow_active>auth_self_keep_always</allow_active>
-+ </defaults>
-+ </action>
-+
-+ <action id="org.gnome.clockapplet.mechanism.settime">
-+ <description>Change system time</description>
-+ <message>Changing the system time requires privileges.</message>
-+ <defaults>
-+ <allow_inactive>no</allow_inactive>
-+ <allow_active>auth_self_keep_always</allow_active>
-+ </defaults>
-+ </action>
-+
-+ <action id="org.gnome.clockapplet.mechanism.configurehwclock">
-+ <description>Configure hardware clock</description>
-+ <message>Configuring the hardware clock requires privileges.</message>
-+ <defaults>
-+ <allow_inactive>no</allow_inactive>
-+ <allow_active>auth_self_keep_always</allow_active>
-+ </defaults>
-+ </action>
-+
-+</policyconfig>
-diff -up gnome-panel-2.21.5/applets/clock/Makefile.am.glue
gnome-panel-2.21.5/applets/clock/Makefile.am
---- gnome-panel-2.21.5/applets/clock/Makefile.am.glue 2008-01-14 18:05:22.000000000
-0500
-+++ gnome-panel-2.21.5/applets/clock/Makefile.am 2008-01-16 10:54:37.000000000 -0500
-@@ -138,7 +138,7 @@ gnome_clock_applet_mechanism_SOURCES =
- gnome-clock-applet-mechanism-main.c
-
- if HAVE_POLKIT
--BUILT_SOURCES += gnome-clock-applet-mechanism.h
-+BUILT_SOURCES += gnome-clock-applet-mechanism-glue.h
- endif
-
- gnome_clock_applet_mechanism_INCLUDES = \
-diff -up gnome-panel-2.21.5/applets/clock/Makefile.in.glue
gnome-panel-2.21.5/applets/clock/Makefile.in
---- gnome-panel-2.21.5/applets/clock/Makefile.in.glue 2008-01-14 18:18:16.000000000
-0500
-+++ gnome-panel-2.21.5/applets/clock/Makefile.in 2008-01-16 10:54:43.000000000 -0500
-@@ -34,7 +34,7 @@ PRE_UNINSTALL = :
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--@HAVE_POLKIT_TRUE@am__append_1 = gnome-clock-applet-mechanism.h
-+@HAVE_POLKIT_TRUE@am__append_1 = gnome-clock-applet-mechanism-glue.h
- @CLOCK_INPROCESS_FALSE@libexec_PROGRAMS = clock-applet$(EXEEXT) \
- @CLOCK_INPROCESS_FALSE@ $(am__EXEEXT_1)
- @CLOCK_INPROCESS_TRUE@libexec_PROGRAMS = $(am__EXEEXT_1)
-@@ -43,6 +43,7 @@ subdir = applets/clock
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \
-+ $(top_srcdir)/m4/gnome-compiler-flags.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
- $(top_srcdir)/configure.in
-@@ -80,7 +81,7 @@ am__libclock_applet_la_SOURCES_DIST = ca
- clock-zonetable.c clock-zonetable.h gweather-xml.c \
- gweather-xml.h clock-marshallers.c clock-marshallers.h \
- clock-typebuiltins.c clock-typebuiltins.h \
-- gnome-clock-applet-mechanism.h calendar-client.c \
-+ gnome-clock-applet-mechanism-glue.h calendar-client.c \
- calendar-client.h calendar-sources.c calendar-sources.h \
- calendar-debug.h set-timezone-dummy.c set-timezone.h \
- set-timezone.c
-@@ -132,7 +133,7 @@ am__clock_applet_SOURCES_DIST = calendar
- clock-zoneinfo.h clock-zonetable.c clock-zonetable.h \
- gweather-xml.c gweather-xml.h clock-marshallers.c \
- clock-marshallers.h clock-typebuiltins.c clock-typebuiltins.h \
-- gnome-clock-applet-mechanism.h calendar-client.c \
-+ gnome-clock-applet-mechanism-glue.h calendar-client.c \
- calendar-client.h calendar-sources.c calendar-sources.h \
- calendar-debug.h set-timezone-dummy.c set-timezone.h \
- set-timezone.c
-@@ -346,6 +347,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
- RANLIB = @RANLIB@
- REBUILD = @REBUILD@
- SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
-diff -up /dev/null
gnome-panel-2.21.5/applets/clock/org.gnome.ClockApplet.Mechanism.service.in
---- /dev/null 2008-01-16 08:23:02.430982355 -0500
-+++
gnome-panel-2.21.5/applets/clock/org.gnome.ClockApplet.Mechanism.service.in 2008-01-16
10:54:37.000000000 -0500
-@@ -0,0 +1,4 @@
-+[D-BUS Service]
-+Name=org.gnome.ClockApplet.Mechanism
-+Exec=@LIBEXECDIR@/gnome-clock-applet-mechanism
-+User=root
-diff -up /dev/null gnome-panel-2.21.5/applets/clock/org.gnome.ClockApplet.Mechanism.conf
---- /dev/null 2008-01-16 08:23:02.430982355 -0500
-+++ gnome-panel-2.21.5/applets/clock/org.gnome.ClockApplet.Mechanism.conf 2008-01-16
10:54:37.000000000 -0500
-@@ -0,0 +1,19 @@
-+<?xml version="1.0" encoding="UTF-8"?> <!-- -*- XML -*-
-->
-+
-+<!DOCTYPE busconfig PUBLIC
-+ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
-+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-+<busconfig>
-+
-+ <!-- Only root can own the service -->
-+ <policy user="root">
-+ <allow own="org.gnome.ClockApplet.Mechanism"/>
-+ <allow
send_interface="org.gnome.ClockApplet.Mechanism.SetTimezoneInterface"/>
-+ </policy>
-+
-+ <!-- Allow anyone to invoke methods on the interfaces -->
-+ <policy context="default">
-+ <allow
send_interface="org.gnome.ClockApplet.Mechanism.SetTimezoneInterface"/>
-+ </policy>
-+
-+</busconfig>
diff --git a/gnome-panel-2.16.1-allow-spurious-view-done-signals.patch
b/gnome-panel-2.16.1-allow-spurious-view-done-signals.patch
deleted file mode 100644
index fcc0854..0000000
--- a/gnome-panel-2.16.1-allow-spurious-view-done-signals.patch
+++ /dev/null
@@ -1,16 +0,0 @@
----
gnome-panel-2.16.1/applets/clock/calendar-client.c.allow-spurious-view-done-signals 2008-01-07
11:50:59.000000000 -0500
-+++ gnome-panel-2.16.1/applets/clock/calendar-client.c 2008-01-07 11:54:08.000000000
-0500
-@@ -1199,6 +1199,13 @@
- {
- CalendarClientQuery *query;
-
-+ if (!source->query_in_progress)
-+ {
-+ g_warning ("Got spurious 'view-done' signal from calendar backend for
query %p\n",
-+ &source->completed_query);
-+ return;
-+ }
-+
- query = goddamn_this_is_crack (source, view, NULL);
-
- dprintf ("Query %p completed: %s\n", query, e_cal_get_error_message
(status));
diff --git a/gnome-panel.spec b/gnome-panel.spec
index b177f23..384d183 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.22.0
-Release: 1%{?dist}
+Release: 2%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.22/%{name}-%{version}.tar...
@@ -349,6 +349,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Mon Mar 10 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.22.0-2
+- Bump revision
+
* Mon Mar 10 2008 Jon McCann <jmccann(a)redhat.com> - 2.22.0-1
- Update to 2.22.0
diff --git a/less-resizing.patch b/less-resizing.patch
deleted file mode 100644
index 1364fb5..0000000
--- a/less-resizing.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-diff -up gnome-panel-2.21.91/applets/clock/clock.c.less-resizing
gnome-panel-2.21.91/applets/clock/clock.c
---- gnome-panel-2.21.91/applets/clock/clock.c.less-resizing 2008-02-20 11:46:30.000000000
-0500
-+++ gnome-panel-2.21.91/applets/clock/clock.c 2008-02-20 11:46:30.000000000 -0500
-@@ -1074,6 +1074,7 @@ location_tile_timezone_set_cb (ClockLoca
- ClockData *cd = data;
-
- clock_map_refresh (CLOCK_MAP (cd->map_widget));
-+ update_location_tiles (cd);
- }
-
- static void
-diff -up gnome-panel-2.21.91/applets/clock/clock-location-tile.c.less-resizing
gnome-panel-2.21.91/applets/clock/clock-location-tile.c
---- gnome-panel-2.21.91/applets/clock/clock-location-tile.c.less-resizing 2008-02-20
11:46:30.000000000 -0500
-+++ gnome-panel-2.21.91/applets/clock/clock-location-tile.c 2008-02-20 12:03:00.000000000
-0500
-@@ -42,6 +42,8 @@ typedef struct {
- GtkWidget *current_button;
- GtkWidget *current_label;
- GtkWidget *current_marker;
-+ GtkWidget *current_spacer;
-+ GtkSizeGroup *current_group;
- GtkSizeGroup *button_group;
-
- GtkWidget *weather_icon;
-@@ -157,6 +159,11 @@ clock_location_tile_finalize (GObject *g
- priv->button_group = NULL;
- }
-
-+ if (priv->current_group) {
-+ g_object_unref (priv->current_group);
-+ priv->current_group = NULL;
-+ }
-+
- G_OBJECT_CLASS (clock_location_tile_parent_class)->finalize (g_obj);
- }
-
-@@ -213,25 +220,43 @@ enter_or_leave_tile (GtkWidget
- if (event->mode != GDK_CROSSING_NORMAL) {
- return TRUE;
- }
-+
-+ if (clock_location_is_current (priv->location)) {
-+ gtk_widget_hide (priv->current_button);
-+ gtk_widget_hide (priv->current_spacer);
-+ gtk_widget_show (priv->current_marker);
-+
-+ return TRUE;
-+ }
-+
- if (event->type == GDK_ENTER_NOTIFY) {
-- gint can_set;
-+ gint can_set;
-
- can_set = can_set_system_timezone ();
-- if (!clock_location_is_current (priv->location) &&
-- can_set != 0) {
-+ if (can_set != 0) {
- gtk_label_set_markup (GTK_LABEL (priv->current_label),
- can_set == 1 ?
- _("<small>Set...</small>") :
-- _("<small>Set</small>"));
-+ _("<small>Set</small>"));
-+ gtk_widget_hide (priv->current_spacer);
-+ gtk_widget_hide (priv->current_marker);
- gtk_widget_show (priv->current_button);
- }
-- }
-- else {
-- if (event->detail != GDK_NOTIFY_INFERIOR)
-- gtk_widget_hide (priv->current_button);
-- }
-+ else {
-+ gtk_widget_hide (priv->current_marker);
-+ gtk_widget_hide (priv->current_button);
-+ gtk_widget_show (priv->current_spacer);
-+ }
-+ }
-+ else {
-+ if (event->detail != GDK_NOTIFY_INFERIOR) {
-+ gtk_widget_hide (priv->current_button);
-+ gtk_widget_hide (priv->current_marker);
-+ gtk_widget_show (priv->current_spacer);
-+ }
-+ }
-
-- return TRUE;
-+ return TRUE;
- }
-
- static void
-@@ -241,6 +266,7 @@ clock_location_tile_fill (ClockLocationT
- GtkWidget *align;
- GtkWidget *strut;
- GtkWidget *box;
-+ gint can_set;
-
- priv->box = gtk_event_box_new ();
-
-@@ -278,8 +304,16 @@ clock_location_tile_fill (ClockLocationT
- gtk_box_pack_start (GTK_BOX (box), align, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (box), priv->time_label, FALSE, FALSE, 0);
-
-+ can_set = can_set_system_timezone ();
-+
- priv->current_button = gtk_button_new ();
- priv->current_label = gtk_label_new ("");
-+ if (can_set != 0) {
-+ gtk_label_set_markup (GTK_LABEL (priv->current_label),
-+ can_set == 1 ?
-+ _("<small>Set...</small>") :
-+ _("<small>Set</small>"));
-+ }
- gtk_widget_show (priv->current_label);
- gtk_widget_set_no_show_all (priv->current_button, TRUE);
- gtk_container_add (GTK_CONTAINER (priv->current_button),
priv->current_label);
-@@ -289,15 +323,29 @@ clock_location_tile_fill (ClockLocationT
- gtk_misc_set_alignment (GTK_MISC (priv->current_marker), 1.0, 0.5);
- gtk_widget_set_no_show_all (priv->current_marker, TRUE);
-
-+ priv->current_spacer = gtk_event_box_new ();
-+ gtk_widget_set_no_show_all (priv->current_spacer, TRUE);
-+
- strut = gtk_event_box_new ();
- gtk_box_pack_start (GTK_BOX (box), strut, TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (box), priv->current_button, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (box), priv->current_marker, FALSE, FALSE, 0);
-+ gtk_box_pack_start (GTK_BOX (box), priv->current_spacer, FALSE, FALSE, 0);
- priv->button_group = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL);
- gtk_size_group_set_ignore_hidden (priv->button_group, FALSE);
- gtk_size_group_add_widget (priv->button_group, strut);
- gtk_size_group_add_widget (priv->button_group, priv->current_button);
-
-+ priv->current_group = gtk_size_group_new (GTK_SIZE_GROUP_BOTH);
-+ gtk_size_group_set_ignore_hidden (priv->current_group, FALSE);
-+ gtk_size_group_add_widget (priv->current_group, priv->current_button);
-+ gtk_size_group_add_widget (priv->current_group, priv->current_marker);
-+ gtk_size_group_add_widget (priv->current_group, priv->current_spacer);
-+
-+ gtk_widget_show (priv->current_button);
-+ gtk_widget_show (priv->current_marker);
-+ gtk_widget_show (priv->current_spacer);
-+
- g_signal_connect (priv->current_button, "clicked",
- G_CALLBACK (make_current), this);
-
-@@ -443,11 +491,16 @@ clock_location_tile_refresh (ClockLocati
- g_return_if_fail (IS_CLOCK_LOCATION_TILE (this));
-
- if (clock_location_is_current (priv->location)) {
-- gtk_widget_hide (priv->current_button);
-- gtk_widget_show (priv->current_marker);
-- }
-- else {
-- gtk_widget_hide (priv->current_marker);
-+ gtk_widget_hide (priv->current_spacer);
-+ gtk_widget_hide (priv->current_button);
-+ gtk_widget_show (priv->current_marker);
-+ }
-+ else {
-+ if (GTK_WIDGET_VISIBLE (priv->current_marker)) {
-+ gtk_widget_hide (priv->current_marker);
-+ gtk_widget_hide (priv->current_button);
-+ gtk_widget_show (priv->current_spacer);
-+ }
- }
-
- if (clock_needs_face_refresh (this)) {
diff --git a/localtime.patch b/localtime.patch
deleted file mode 100644
index 72ca62a..0000000
--- a/localtime.patch
+++ /dev/null
@@ -1,239 +0,0 @@
-diff -up gnome-panel-2.21.91/applets/clock/clock-location-tile.h.localtime
gnome-panel-2.21.91/applets/clock/clock-location-tile.h
---- gnome-panel-2.21.91/applets/clock/clock-location-tile.h.localtime 2008-02-11
16:15:51.000000000 -0500
-+++ gnome-panel-2.21.91/applets/clock/clock-location-tile.h 2008-02-17 19:26:15.000000000
-0500
-@@ -28,7 +28,7 @@ typedef struct
- void (* tile_pressed) (ClockLocationTile *tile);
- void (* timezone_set) (ClockLocationTile *tile);
- void (* weather_updated) (ClockLocationTile *tile, GdkPixbuf *weather_icon, const char
*temperature);
-- char *(* need_formatted_time) (ClockLocationTile *tile);
-+ int (* need_clock_format) (ClockLocationTile *tile);
- } ClockLocationTileClass;
-
- GType clock_location_tile_get_type (void);
-@@ -40,7 +40,8 @@ ClockLocation *clock_location_tile_get_l
-
- void weather_info_setup_tooltip (WeatherInfo *info, GtkTooltip *tip);
-
--void clock_location_tile_refresh (ClockLocationTile *this);
-+void clock_location_tile_refresh (ClockLocationTile *this,
-+ gboolean force_refresh);
-
- G_END_DECLS
- #endif /* __CLOCK_H__ */
-diff -up gnome-panel-2.21.91/applets/clock/clock.c.localtime
gnome-panel-2.21.91/applets/clock/clock.c
---- gnome-panel-2.21.91/applets/clock/clock.c.localtime 2008-02-11 16:15:51.000000000
-0500
-+++ gnome-panel-2.21.91/applets/clock/clock.c 2008-02-17 19:25:23.000000000 -0500
-@@ -508,7 +508,7 @@ update_location_tiles (ClockData *cd)
- ClockLocationTile *tile;
-
- tile = CLOCK_LOCATION_TILE (l->data);
-- clock_location_tile_refresh (tile);
-+ clock_location_tile_refresh (tile, FALSE);
- }
- }
-
-@@ -1084,12 +1084,12 @@ location_tile_weather_updated_cb (ClockL
- gtk_label_set_text (GTK_LABEL (cd->panel_temperature_label), temperature);
- }
-
--static char *
--location_tile_need_formatted_time_cb (ClockLocationTile *tile, gpointer data)
-+static ClockFormat
-+location_tile_need_clock_format_cb(ClockLocationTile *tile, gpointer data)
- {
- ClockData *cd = data;
-
-- return format_time (cd);
-+ return cd->format;
- }
-
- static void
-@@ -1133,8 +1133,10 @@ create_cities_section (ClockData *cd)
- G_CALLBACK (location_tile_timezone_set_cb), cd);
- g_signal_connect (city, "weather-updated",
- G_CALLBACK (location_tile_weather_updated_cb), cd);
-- g_signal_connect (city, "need-formatted-time",
-- G_CALLBACK (location_tile_need_formatted_time_cb),
cd);
-+ g_signal_connect (city, "need-clock-format",
-+ G_CALLBACK (location_tile_need_clock_format_cb), cd);
-+
-+ clock_location_tile_refresh (city, TRUE);
-
- gtk_box_pack_start (GTK_BOX (cd->cities_section),
- GTK_WIDGET (city),
-diff -up gnome-panel-2.21.91/applets/clock/clock-location-tile.c.localtime
gnome-panel-2.21.91/applets/clock/clock-location-tile.c
---- gnome-panel-2.21.91/applets/clock/clock-location-tile.c.localtime 2008-02-11
16:15:51.000000000 -0500
-+++ gnome-panel-2.21.91/applets/clock/clock-location-tile.c 2008-02-17 19:26:03.000000000
-0500
-@@ -11,6 +11,7 @@
- #include "clock-face.h"
- #include "clock-location-tile.h"
- #include "clock-location.h"
-+#include "clock-utils.h"
- #include "clock-marshallers.h"
- #include "set-timezone.h"
-
-@@ -20,7 +21,7 @@ enum {
- TILE_PRESSED,
- TIMEZONE_SET,
- WEATHER_UPDATED,
-- NEED_FORMATTED_TIME,
-+ NEED_CLOCK_FORMAT,
- LAST_SIGNAL
- };
-
-@@ -122,14 +123,15 @@ clock_location_tile_class_init (ClockLoc
- G_TYPE_NONE, 2,
- G_TYPE_OBJECT,
- G_TYPE_STRING);
-- signals[NEED_FORMATTED_TIME] = g_signal_new ("need-formatted-time",
-- G_TYPE_FROM_CLASS (g_obj_class),
-- G_SIGNAL_RUN_LAST,
-- G_STRUCT_OFFSET (ClockLocationTileClass, need_formatted_time),
-- NULL,
-- NULL,
-- _clock_marshal_STRING__VOID,
-- G_TYPE_STRING, 0);
-+
-+ signals[NEED_CLOCK_FORMAT] = g_signal_new ("need-clock-format",
-+ G_TYPE_FROM_CLASS (g_obj_class),
-+ G_SIGNAL_RUN_LAST,
-+ G_STRUCT_OFFSET (ClockLocationTileClass, need_clock_format),
-+ NULL,
-+ NULL,
-+ _clock_marshal_INT__VOID,
-+ G_TYPE_INT, 0);
- }
-
- static void
-@@ -310,7 +312,7 @@ clock_location_tile_fill (ClockLocationT
- gtk_container_add (GTK_CONTAINER (priv->box), alignment);
- gtk_container_add (GTK_CONTAINER (this), priv->box);
-
-- clock_location_tile_refresh (this);
-+ clock_location_tile_refresh (this, TRUE);
- }
-
- static gboolean
-@@ -378,13 +380,72 @@ emit_weather_updated (ClockLocationTile
- g_signal_emit (this, signals[WEATHER_UPDATED], 0, weather_icon, temperature);
- }
-
-+static char *
-+format_time (struct tm *now,
-+ char *tzname,
-+ ClockFormat clock_format,
-+ long offset)
-+{
-+ char buf[256];
-+ char *format;
-+ time_t local_t;
-+ struct tm local_now;
-+ char *utf8;
-+ char *tmp;
-+ long hours, minutes;
-+
-+ time (&local_t);
-+ localtime_r (&local_t, &local_now);
-+
-+ if (local_now.tm_wday != now->tm_wday) {
-+ if (clock_format == CLOCK_FORMAT_12) {
-+ format = _("%l:%M <small>%p (%A)</small>");
-+ }
-+ else {
-+ format = _("%H:%M <small>(%A)</small>");
-+ }
-+ }
-+ else {
-+ if (clock_format == CLOCK_FORMAT_12) {
-+ format = _("%l:%M <small>%p</small>");
-+ }
-+ else {
-+ format = _("%H:%M");
-+ }
-+ }
-+
-+ if (strftime (buf, sizeof (buf), format, now) <= 0) {
-+ strcpy (buf, "???");
-+ }
-+
-+ hours = offset / 3600;
-+ minutes = labs (offset % 3600) / 60;
-+
-+ if (hours != 0 && minutes != 0) {
-+ tmp = g_strdup_printf ("%s <small>%s %+ld:%ld</small>", buf,
tzname, hours, minutes);
-+ }
-+ else if (hours != 0) {
-+ tmp = g_strdup_printf ("%s <small>%s %+ld</small>", buf, tzname,
hours);
-+ }
-+ else {
-+ tmp = g_strdup_printf ("%s <small>%s</small>", buf, tzname);
-+ }
-+
-+ utf8 = g_locale_to_utf8 (tmp, -1, NULL, NULL, NULL);
-+
-+ g_free (tmp);
-+
-+ return utf8;
-+}
-+
- void
--clock_location_tile_refresh (ClockLocationTile *this)
-+clock_location_tile_refresh (ClockLocationTile *this, gboolean force_refresh)
- {
- ClockLocationTilePrivate *priv = PRIVATE (this);
-- gchar *tmp, *tmp2, *tzname;
-+ gchar *tmp, *tzname;
- struct tm now;
- long offset, hours, minutes;
-+ int format;
-
- g_return_if_fail (IS_CLOCK_LOCATION_TILE (this));
-
-@@ -411,7 +472,7 @@ clock_location_tile_refresh (ClockLocati
- clock_face_refresh (CLOCK_FACE (priv->clock_face));
- }
-
-- if (!clock_needs_label_refresh (this)) {
-+ if (!force_refresh && !clock_needs_label_refresh (this)) {
- return;
- }
-
-@@ -426,26 +487,15 @@ clock_location_tile_refresh (ClockLocati
- gtk_label_set_markup (GTK_LABEL (priv->city_label), tmp);
- g_free (tmp);
-
-- tmp = NULL;
-- g_signal_emit (this, signals[NEED_FORMATTED_TIME], 0, &tmp);
-+ g_signal_emit (this, signals[NEED_CLOCK_FORMAT], 0, &format);
-
- offset = - priv->last_offset;
-
-- hours = offset / 3600;
-- minutes = labs (offset % 3600) / 60;
-+ tmp = format_time (&now, tzname, format, offset);
-
-- if (hours != 0 && minutes != 0)
-- tmp2 = g_strdup_printf ("%s <small>%+ld:%ld</small>", tmp ? tmp
: "", hours, minutes);
-- else if (hours != 0)
-- tmp2 = g_strdup_printf ("%s <small>%+ld</small>", tmp ? tmp :
"", hours);
-- else {
-- tmp2 = tmp;
-- tmp = NULL;
-- }
-+ gtk_label_set_markup (GTK_LABEL (priv->time_label), tmp);
-
-- gtk_label_set_markup (GTK_LABEL (priv->time_label), tmp2);
- g_free (tmp);
-- g_free (tmp2);
- }
-
- void
-diff -up gnome-panel-2.21.91/applets/clock/clock-marshallers.list.localtime
gnome-panel-2.21.91/applets/clock/clock-marshallers.list
---- gnome-panel-2.21.91/applets/clock/clock-marshallers.list.localtime 2008-02-11
16:15:51.000000000 -0500
-+++ gnome-panel-2.21.91/applets/clock/clock-marshallers.list 2008-02-17
19:25:23.000000000 -0500
-@@ -3,4 +3,4 @@ VOID:OBJECT
- VOID:POINTER
- POINTER:VOID
- VOID:OBJECT,STRING
--STRING:VOID
-+INT:VOID
diff --git a/logout-focus.patch b/logout-focus.patch
deleted file mode 100644
index feb8eb6..0000000
--- a/logout-focus.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -up gnome-panel-2.21.90/gnome-panel/panel-logout.c.logout-focus
gnome-panel-2.21.90/gnome-panel/panel-logout.c
---- gnome-panel-2.21.90/gnome-panel/panel-logout.c.logout-focus 2008-02-03
01:48:13.000000000 -0500
-+++ gnome-panel-2.21.90/gnome-panel/panel-logout.c 2008-02-03 01:48:19.000000000 -0500
-@@ -449,4 +449,5 @@ panel_logout_new (PanelLogoutDialogType
-
- gtk_window_set_screen (GTK_WINDOW (logout_dialog), screen);
- gtk_widget_show (GTK_WIDGET (logout_dialog));
-+ gdk_window_focus (GTK_WIDGET (current_dialog)->window, activate_time);
- }
diff --git a/more-sharp-icons.patch b/more-sharp-icons.patch
deleted file mode 100644
index 9d325c4..0000000
--- a/more-sharp-icons.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -up gnome-panel-2.20.0.1/gnome-panel/panel-stock-icons.h.22-24-madness
gnome-panel-2.20.0.1/gnome-panel/panel-stock-icons.h
---- gnome-panel-2.20.0.1/gnome-panel/panel-stock-icons.h.22-24-madness 2007-10-13
00:10:23.000000000 -0400
-+++ gnome-panel-2.20.0.1/gnome-panel/panel-stock-icons.h 2007-10-13 00:10:39.000000000
-0400
-@@ -31,7 +31,7 @@
- G_BEGIN_DECLS
-
- /* themeable size - "panel-menu" */
--#define PANEL_DEFAULT_MENU_ICON_SIZE 22
-+#define PANEL_DEFAULT_MENU_ICON_SIZE 24
-
- /* stock icons */
- #define PANEL_STOCK_FORCE_QUIT "gnome-panel-force-quit"
-diff -up gnome-panel-2.20.0.1/gnome-panel/menu.c.22-24-madness
gnome-panel-2.20.0.1/gnome-panel/menu.c
---- gnome-panel-2.20.0.1/gnome-panel/menu.c.22-24-madness 2007-09-18 09:56:51.000000000
-0400
-+++ gnome-panel-2.20.0.1/gnome-panel/menu.c 2007-10-13 00:01:11.000000000 -0400
-@@ -385,8 +385,24 @@ panel_make_menu_icon (GtkIconTheme *icon
- }
-
- if (pb == NULL) {
-- pb = gdk_pixbuf_new_from_file_at_size (file, size, size, NULL);
--
-+ pb = gdk_pixbuf_new_from_file (file, NULL);
-+ if (pb) {
-+ gint width, height;
-+
-+ width = gdk_pixbuf_get_width (pb);
-+ height = gdk_pixbuf_get_height (pb);
-+
-+ if (!(size - 2 <= width && width <= size &&
-+ size - 2 <= height && height <= size)) {
-+ GdkPixbuf *tmp;
-+
-+ tmp = gdk_pixbuf_scale_simple (pb, size, size, GDK_INTERP_BILINEAR);
-+
-+ g_object_unref (pb);
-+ pb = tmp;
-+ }
-+ }
-+
- /* add icon to the hash table so we don't load it again */
- loaded = TRUE;
- }
-diff -up gnome-panel-2.20.0.1/gnome-panel/panel-stock-icons.c.22-24-madness
gnome-panel-2.20.0.1/gnome-panel/panel-stock-icons.c
---- gnome-panel-2.20.0.1/gnome-panel/panel-stock-icons.c.22-24-madness 2007-10-13
00:12:17.000000000 -0400
-+++ gnome-panel-2.20.0.1/gnome-panel/panel-stock-icons.c 2007-10-13 00:12:26.000000000
-0400
-@@ -128,7 +128,7 @@ panel_init_stock_icons_and_items (void)
- PANEL_DEFAULT_MENU_ICON_SIZE,
- PANEL_DEFAULT_MENU_ICON_SIZE);
-
-- panel_menu_bar_icon_size = gtk_icon_size_register ("panel-foobar", 20, 20);
-+ panel_menu_bar_icon_size = gtk_icon_size_register ("panel-foobar", 24, 24);
-
- factory = gtk_icon_factory_new ();
- gtk_icon_factory_add_default (factory);
diff --git a/open-drawer.patch b/open-drawer.patch
deleted file mode 100644
index 9aaa896..0000000
--- a/open-drawer.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -up gnome-panel-2.21.91/gnome-panel/drawer.c.open-drawer
gnome-panel-2.21.91/gnome-panel/drawer.c
---- gnome-panel-2.21.91/gnome-panel/drawer.c.open-drawer 2008-02-11 16:15:47.000000000
-0500
-+++ gnome-panel-2.21.91/gnome-panel/drawer.c 2008-02-21 10:03:03.000000000 -0500
-@@ -34,7 +34,7 @@
- static void
- drawer_click (GtkWidget *w, Drawer *drawer)
- {
-- if (!panel_toplevel_get_is_hidden (drawer->toplevel))
-+ if (panel_toplevel_get_state (drawer->toplevel) == PANEL_STATE_NORMAL)
- panel_toplevel_hide (drawer->toplevel, FALSE, -1);
- else
- panel_toplevel_unhide (drawer->toplevel);
-@@ -398,7 +398,6 @@ create_drawer_toplevel (const char *draw
-
- toplevel = panel_profile_load_toplevel (client, PANEL_CONFIG_DIR,
- PANEL_GCONF_TOPLEVELS, toplevel_id);
--
- if (!toplevel) {
- g_free (toplevel_id);
- return NULL;
diff --git a/panel-weather.patch b/panel-weather.patch
deleted file mode 100644
index 97cc508..0000000
--- a/panel-weather.patch
+++ /dev/null
@@ -1,271 +0,0 @@
-diff -up gnome-panel-2.21.91/applets/clock/clock.c.panel-weather
gnome-panel-2.21.91/applets/clock/clock.c
---- gnome-panel-2.21.91/applets/clock/clock.c.panel-weather 2008-02-17 21:54:50.000000000
-0500
-+++ gnome-panel-2.21.91/applets/clock/clock.c 2008-02-17 22:06:23.000000000 -0500
-@@ -211,6 +211,7 @@ struct _ClockData {
-
- static void update_clock (ClockData * cd);
- static void update_tooltip (ClockData * cd);
-+static void update_panel_weather (ClockData *cd);
- static int clock_timeout_callback (gpointer data);
- static float get_itime (time_t current_time);
-
-@@ -1131,8 +1132,6 @@ create_cities_section (ClockData *cd)
- G_CALLBACK (location_tile_pressed_cb), cd);
- g_signal_connect (city, "timezone-set",
- G_CALLBACK (location_tile_timezone_set_cb), cd);
-- g_signal_connect (city, "weather-updated",
-- G_CALLBACK (location_tile_weather_updated_cb), cd);
- g_signal_connect (city, "need-clock-format",
- G_CALLBACK (location_tile_need_clock_format_cb), cd);
-
-@@ -1299,7 +1298,6 @@ create_main_clock_button (void)
- GtkWidget *button;
-
- button = gtk_toggle_button_new ();
-- gtk_container_set_resize_mode (GTK_CONTAINER (button), GTK_RESIZE_IMMEDIATE);
- gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
-
- force_no_focus_padding (button);
-@@ -1408,6 +1406,8 @@ create_clock_widget (ClockData *cd)
- cd->orient = -1;
- cd->size = panel_applet_get_size (PANEL_APPLET (cd->applet));
-
-+ update_panel_weather (cd);
-+
- /* Refresh the clock so that it paints its first state */
- refresh_clock_timeout (cd);
- applet_change_orient (PANEL_APPLET (cd->applet),
-@@ -1974,9 +1974,6 @@ show_date_changed (GConfClient *client,
- static void
- update_panel_weather (ClockData *cd)
- {
-- GtkWidget *weatherbox;
--
-- weatherbox = gtk_widget_get_parent (cd->panel_weather_icon);
- if (cd->show_weather)
- gtk_widget_show (cd->panel_weather_icon);
- else
-@@ -1988,9 +1985,11 @@ update_panel_weather (ClockData *cd)
- gtk_widget_hide (cd->panel_temperature_label);
-
- if (cd->show_weather || cd->show_temperature)
-- gtk_widget_show (weatherbox);
-+ gtk_widget_show (cd->weather_obox);
- else
-- gtk_widget_hide (weatherbox);
-+ gtk_widget_hide (cd->weather_obox);
-+
-+ gtk_widget_queue_resize (cd->applet);
- }
-
- static void
-@@ -2036,17 +2035,64 @@ show_temperature_changed (GConfClient *
- }
-
- static void
--set_locations (ClockData *cd, GList *locations)
-+location_weather_updated_cb (ClockLocation *location,
-+ WeatherInfo *info,
-+ gpointer data)
- {
-- free_locations (cd);
-+ ClockData *cd = data;
-+ const gchar *icon_name;
-+ const gchar *temp;
-+ GtkIconTheme *theme;
-+ GdkPixbuf *pixbuf;
-
-- cd->locations = locations;
-+ if (!info || !weather_info_is_valid (info))
-+ return;
-
-- if (cd->map_widget)
-- clock_map_refresh (CLOCK_MAP (cd->map_widget));
-+ if (!clock_location_is_current (location))
-+ return;
-+
-+ icon_name = weather_info_get_icon_name (info);
-+ theme = gtk_icon_theme_get_default ();
-+ pixbuf = gtk_icon_theme_load_icon (theme, icon_name, 16, 0, NULL);
-+
-+ temp = weather_info_get_temp_summary (info);
-+
-+ gtk_image_set_from_pixbuf (GTK_IMAGE (cd->panel_weather_icon), pixbuf);
-+ gtk_label_set_text (GTK_LABEL (cd->panel_temperature_label), temp);
-+}
-+
-+static void
-+locations_changed (ClockData *cd)
-+{
-+ GList *l;
-+ ClockLocation *loc;
-+ glong id;
-+
-+ for (l = cd->locations; l; l = l->next) {
-+ loc = l->data;
-+
-+ id = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (loc),
"weather-updated"));
-+ if (id == 0) {
-+ id = g_signal_connect (loc, "weather-updated",
-+ G_CALLBACK (location_weather_updated_cb), cd);
-+ g_object_set_data (G_OBJECT (loc), "weather-updated", GINT_TO_POINTER
(id));
-+ }
-+ }
-+
-+ if (cd->map_widget)
-+ clock_map_refresh (CLOCK_MAP (cd->map_widget));
-
- if (cd->clock_vbox)
-- create_cities_section (cd);
-+ create_cities_section (cd);
-+}
-+
-+
-+static void
-+set_locations (ClockData *cd, GList *locations)
-+{
-+ free_locations (cd);
-+ cd->locations = locations;
-+ locations_changed (cd);
- }
-
- typedef struct {
-@@ -2948,7 +2994,6 @@ run_prefs_edit_save (GtkButton *button,
- clock_location_set_coords (loc, lat, lon);
- clock_location_set_weather_code (loc, weather_code);
- } else {
-- GList *locs;
- WeatherPrefs prefs;
-
- prefs.temperature_unit = cd->temperature_unit;
-@@ -2956,9 +3001,8 @@ run_prefs_edit_save (GtkButton *button,
-
- loc = clock_location_new (name, clock_zoneinfo_get_name (info), lat,
lon, weather_code, &prefs);
-
-- locs = g_list_copy (cd->locations);
-- locs = g_list_append (locs, loc);
-- set_locations (cd, locs);
-+ cd->locations = g_list_append (cd->locations, loc);
-+ locations_changed (cd);
- }
-
- save_cities_store (cd);
-@@ -3522,14 +3566,13 @@ remove_tree_row (GtkTreeModel *model, Gt
- {
- ClockData *cd = data;
- ClockLocation *loc = NULL;
-- GList *list = g_list_copy (cd->locations);
-
- gtk_tree_model_get (model, iter, COL_CITY_LOC, &loc, -1);
-
-- list = g_list_remove (list, loc);
--
- gtk_list_store_remove (cd->cities_store, iter);
-- set_locations (cd, list);
-+ cd->locations = g_list_remove (cd->locations, loc);
-+ locations_changed (cd);
-+ g_object_unref (loc);
-
- save_cities_store (cd);
- }
-diff -up gnome-panel-2.21.91/applets/clock/clock-location-tile.c.panel-weather
gnome-panel-2.21.91/applets/clock/clock-location-tile.c
---- gnome-panel-2.21.91/applets/clock/clock-location-tile.c.panel-weather 2008-02-17
21:54:42.000000000 -0500
-+++ gnome-panel-2.21.91/applets/clock/clock-location-tile.c 2008-02-17 22:06:39.000000000
-0500
-@@ -20,7 +20,6 @@ G_DEFINE_TYPE (ClockLocationTile, clock_
- enum {
- TILE_PRESSED,
- TIMEZONE_SET,
-- WEATHER_UPDATED,
- NEED_CLOCK_FORMAT,
- LAST_SIGNAL
- };
-@@ -113,17 +112,6 @@ clock_location_tile_class_init (ClockLoc
- NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
-- signals[WEATHER_UPDATED] = g_signal_new ("weather-updated",
-- G_TYPE_FROM_CLASS (g_obj_class),
-- G_SIGNAL_RUN_FIRST,
-- G_STRUCT_OFFSET (ClockLocationTileClass, weather_updated),
-- NULL,
-- NULL,
-- _clock_marshal_VOID__OBJECT_STRING,
-- G_TYPE_NONE, 2,
-- G_TYPE_OBJECT,
-- G_TYPE_STRING);
--
- signals[NEED_CLOCK_FORMAT] = g_signal_new ("need-clock-format",
- G_TYPE_FROM_CLASS (g_obj_class),
- G_SIGNAL_RUN_LAST,
-@@ -377,12 +365,6 @@ copy_tm (struct tm *from, struct tm *to)
- to->tm_yday = from->tm_yday;
- }
-
--static void
--emit_weather_updated (ClockLocationTile *this, GdkPixbuf *weather_icon, const char
*temperature)
--{
-- g_signal_emit (this, signals[WEATHER_UPDATED], 0, weather_icon, temperature);
--}
--
- static char *
- format_time (struct tm *now,
- char *tzname,
-@@ -447,23 +429,12 @@ clock_location_tile_refresh (ClockLocati
- ClockLocationTilePrivate *priv = PRIVATE (this);
- gchar *tmp, *tzname;
- struct tm now;
-- long offset, hours, minutes;
-+ long offset;
- int format;
-
- g_return_if_fail (IS_CLOCK_LOCATION_TILE (this));
-
- if (clock_location_is_current (priv->location)) {
-- if (!GTK_WIDGET_VISIBLE (priv->current_marker)) {
-- GdkPixbuf *pixbuf;
-- const gchar *temp = NULL;
--
-- pixbuf = gtk_image_get_pixbuf (GTK_IMAGE (priv->weather_icon));
-- if (clock_location_get_weather_info (priv->location))
-- temp = weather_info_get_temp_summary
(clock_location_get_weather_info (priv->location));
--
-- emit_weather_updated (this, pixbuf, temp);
-- }
--
- gtk_widget_hide (priv->current_button);
- gtk_widget_show (priv->current_marker);
- }
-@@ -582,7 +553,6 @@ update_weather_icon (ClockLocation *loc,
- GdkPixbuf *pixbuf = NULL;
- GtkIconTheme *theme = NULL;
- const gchar *icon_name;
-- const gchar *temp = NULL;
-
- if (!info || !weather_info_is_valid (info))
- return;
-@@ -591,14 +561,9 @@ update_weather_icon (ClockLocation *loc,
- theme = gtk_icon_theme_get_default ();
- pixbuf = gtk_icon_theme_load_icon (theme, icon_name, 16, 0, NULL);
-
-- temp = weather_info_get_temp_summary (info);
--
- if (pixbuf) {
- gtk_image_set_from_pixbuf (GTK_IMAGE (priv->weather_icon), pixbuf);
- gtk_alignment_set_padding (GTK_ALIGNMENT (gtk_widget_get_parent
(priv->weather_icon)), 0, 0, 0, 6);
-- if (clock_location_is_current (loc)) {
-- emit_weather_updated (tile, pixbuf, temp);
-- }
- }
- }
-
-diff -up gnome-panel-2.21.91/applets/clock/clock-location-tile.h.panel-weather
gnome-panel-2.21.91/applets/clock/clock-location-tile.h
---- gnome-panel-2.21.91/applets/clock/clock-location-tile.h.panel-weather 2008-02-17
21:54:33.000000000 -0500
-+++ gnome-panel-2.21.91/applets/clock/clock-location-tile.h 2008-02-17 21:54:59.000000000
-0500
-@@ -27,7 +27,6 @@ typedef struct
-
- void (* tile_pressed) (ClockLocationTile *tile);
- void (* timezone_set) (ClockLocationTile *tile);
-- void (* weather_updated) (ClockLocationTile *tile, GdkPixbuf *weather_icon, const char
*temperature);
- int (* need_clock_format) (ClockLocationTile *tile);
- } ClockLocationTileClass;
-
diff --git a/pref-dialogs.patch b/pref-dialogs.patch
deleted file mode 100644
index d7ea7da..0000000
--- a/pref-dialogs.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- gnome-panel-2.21.91/applets/clock/clock.glade 2008-02-11 16:15:51.000000000 -0500
-+++ hacked/applets/clock/clock.glade 2008-02-16 01:43:05.000000000 -0500
-@@ -14,7 +14,7 @@
- <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_NORMAL</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>
-@@ -484,7 +484,7 @@
- <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_NORMAL</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>
-@@ -818,7 +818,7 @@
- <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_NORMAL</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>
diff --git a/set-button.patch b/set-button.patch
deleted file mode 100644
index a5c9635..0000000
--- a/set-button.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up gnome-panel-2.21.91/applets/clock/clock-location-tile.c.set-button
gnome-panel-2.21.91/applets/clock/clock-location-tile.c
---- gnome-panel-2.21.91/applets/clock/clock-location-tile.c.set-button 2008-02-17
15:52:17.000000000 -0500
-+++ gnome-panel-2.21.91/applets/clock/clock-location-tile.c 2008-02-17 15:52:54.000000000
-0500
-@@ -223,6 +223,9 @@ enter_or_leave_tile (GtkWidget
- {
- ClockLocationTilePrivate *priv = PRIVATE (tile);
-
-+ if (event->mode != GDK_CROSSING_NORMAL) {
-+ return TRUE;
-+ }
- if (event->type == GDK_ENTER_NOTIFY) {
- gint can_set;
-
commit 18c5b110a1985b28278325a32cea6660c9aa918a
Author: William Jon McCann <mccann(a)fedoraproject.org>
Date: Tue Mar 11 01:55:39 2008 +0000
Fix release num
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 08c247c..b177f23 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.22.0
-Release: 6%{?dist}
+Release: 1%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.22/%{name}-%{version}.tar...
commit 09f7de4c924b50a155d5a75d3b135ae202afc47f
Author: William Jon McCann <mccann(a)fedoraproject.org>
Date: Tue Mar 11 01:53:38 2008 +0000
- Update to 2.22.0
diff --git a/.cvsignore b/.cvsignore
index 3001829..7d80edf 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.21.92.tar.bz2
+gnome-panel-2.22.0.tar.bz2
diff --git a/gnome-panel-2.21.5-ck-shutdown.patch b/gnome-panel-2.21.5-ck-shutdown.patch
index 314861f..ecc9603 100644
--- a/gnome-panel-2.21.5-ck-shutdown.patch
+++ b/gnome-panel-2.21.5-ck-shutdown.patch
@@ -2,7 +2,7 @@ Index: gnome-panel/gnome-panel/panel-consolekit.c
===================================================================
--- gnome-panel/gnome-panel/panel-consolekit.c (revision 0)
+++ gnome-panel/gnome-panel/panel-consolekit.c (revision 0)
-@@ -0,0 +1,597 @@
+@@ -0,0 +1,618 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2008 Jon McCann <jmccann(a)redhat.com>
@@ -84,9 +84,9 @@ Index: gnome-panel/gnome-panel/panel-consolekit.c
+
+static void
+panel_consolekit_get_property (GObject *object,
-+ guint prop_id,
-+ GValue *value,
-+ GParamSpec *pspec)
++ guint prop_id,
++ GValue *value,
++ GParamSpec *pspec)
+{
+ PanelConsolekit *manager = PANEL_CONSOLEKIT (object);
+
@@ -233,7 +233,7 @@ Index: gnome-panel/gnome-panel/panel-consolekit.c
+ const char *new_owner,
+ PanelConsolekit *manager)
+{
-+ if (strcmp (name, "org.freedesktop.ConsoleKit") != 0)
++ if (name != NULL && strcmp (name, "org.freedesktop.ConsoleKit") !=
0)
+ return;
+
+ if (manager->priv->ck_proxy != NULL) {
@@ -269,6 +269,14 @@ Index: gnome-panel/gnome-panel/panel-consolekit.c
+
+ parent_class = G_OBJECT_CLASS (panel_consolekit_parent_class);
+
++ if (manager->priv->bus_proxy != NULL) {
++ g_object_unref (manager->priv->bus_proxy);
++ }
++
++ if (manager->priv->ck_proxy != NULL) {
++ g_object_unref (manager->priv->ck_proxy);
++ }
++
+ if (parent_class->finalize != NULL)
+ parent_class->finalize (object);
+}
@@ -340,16 +348,16 @@ Index: gnome-panel/gnome-panel/panel-consolekit.c
+
+static void
+emit_restart_complete (PanelConsolekit *manager,
-+ GError *error)
++ const char *error_message)
+{
+ GError *call_error;
+
+ call_error = NULL;
+
-+ if (error != NULL) {
++ if (error_message != NULL) {
+ call_error = g_error_new_literal (PANEL_CONSOLEKIT_ERROR,
+ PANEL_CONSOLEKIT_ERROR_RESTARTING,
-+ error->message);
++ error_message);
+ }
+
+ g_signal_emit (G_OBJECT (manager),
@@ -394,8 +402,7 @@ Index: gnome-panel/gnome-panel/panel-consolekit.c
+
+ if (! gained_privilege) {
+ if (error != NULL) {
-+ g_warning ("system restart error: %s", error->message);
-+ emit_restart_complete (manager, error);
++ emit_restart_complete (manager, error->message);
+ }
+ return;
+ }
@@ -404,7 +411,7 @@ Index: gnome-panel/gnome-panel/panel-consolekit.c
+ res = try_system_restart (manager->priv->dbus_connection, &local_error);
+ if (! res) {
+ g_warning ("Unable to restart system: %s", local_error->message);
-+ emit_restart_complete (manager, local_error);
++ emit_restart_complete (manager, local_error->message);
+ g_error_free (local_error);
+ return;
+ }
@@ -421,17 +428,16 @@ Index: gnome-panel/gnome-panel/panel-consolekit.c
+
+ if (! gained_privilege) {
+ if (error != NULL) {
-+ g_warning ("system restart error: %s", error->message);
-+ emit_restart_complete (manager, error);
++ emit_stop_complete (manager, error);
+ }
+ return;
+ }
+
+ local_error = NULL;
-+ res = try_system_restart (manager->priv->dbus_connection, &local_error);
++ res = try_system_stop (manager->priv->dbus_connection, &local_error);
+ if (! res) {
-+ g_warning ("Unable to restart system: %s", local_error->message);
-+ emit_restart_complete (manager, local_error);
++ g_warning ("Unable to stop system: %s", local_error->message);
++ emit_stop_complete (manager, local_error);
+ g_error_free (local_error);
+ return;
+ }
@@ -459,62 +465,77 @@ Index: gnome-panel/gnome-panel/panel-consolekit.c
+request_restart_priv (PanelConsolekit *manager,
+ GError *error)
+{
-+ gboolean res = FALSE;
+#ifdef HAVE_POLKIT
++ gboolean res = FALSE;
++ char *error_message = NULL;
+ PolKitAction *action;
+ guint xid;
+ pid_t pid;
++ GError *local_error;
+
+ action = get_action_from_error (error);
+
+ xid = 0;
+ pid = getpid ();
+
-+ g_error_free (error);
-+ error = NULL;
++ local_error = NULL;
+ res = polkit_gnome_auth_obtain (action,
+ xid,
+ pid,
+ (PolKitGnomeAuthCB) system_restart_auth_cb,
+ manager,
-+ &error);
++ &local_error);
+ polkit_action_unref (action);
-+#endif /* HAVE POLKIT */
++ if (local_error != NULL) {
++ error_message = g_strdup (local_error->message);
++ g_error_free (local_error);
++ }
++
+ if (! res) {
-+ emit_restart_complete (manager, error);
-+ g_error_free (error);
++ emit_restart_complete (manager, error_message);
++ g_free (error_message);
+ }
++#else
++ g_assert_not_reached ();
++#endif /* HAVE POLKIT */
+}
+
+static void
+request_stop_priv (PanelConsolekit *manager,
+ GError *error)
+{
-+ gboolean res = FALSE;
+#ifdef HAVE_POLKIT
++ gboolean res = FALSE;
++ char *error_message = NULL;
+ PolKitAction *action;
+ guint xid;
+ pid_t pid;
++ GError *local_error;
+
+ action = get_action_from_error (error);
+
+ xid = 0;
+ pid = getpid ();
+
-+ g_error_free (error);
-+ error = NULL;
++ local_error = NULL;
+ res = polkit_gnome_auth_obtain (action,
+ xid,
+ pid,
+ (PolKitGnomeAuthCB) system_stop_auth_cb,
+ manager,
-+ &error);
++ &local_error);
+ polkit_action_unref (action);
-+#endif /* HAVE POLKIT */
++ if (local_error != NULL) {
++ error_message = g_strdup (local_error->message);
++ g_error_free (local_error);
++ }
+ if (! res) {
-+ emit_stop_complete (manager, error);
-+ g_error_free (error);
++ emit_stop_complete (manager, error_message);
++ g_free (error_message);
+ }
++#else
++ g_assert_not_reached ();
++#endif /* HAVE POLKIT */
+}
+
+void
@@ -538,10 +559,9 @@ Index: gnome-panel/gnome-panel/panel-consolekit.c
+ request_restart_priv (manager, error);
+ } else {
+ emit_restart_complete (manager, error);
-+ g_error_free (error);
+ }
++ g_error_free (error);
+ }
-+
+}
+
+void
@@ -565,8 +585,8 @@ Index: gnome-panel/gnome-panel/panel-consolekit.c
+ request_stop_priv (manager, error);
+ } else {
+ emit_stop_complete (manager, error);
-+ g_error_free (error);
+ }
++ g_error_free (error);
+ }
+}
+
@@ -574,7 +594,7 @@ Index: gnome-panel/gnome-panel/panel-consolekit.c
+panel_consolekit_can_restart (PanelConsolekit *manager)
+{
+#ifdef HAVE_POLKIT
-+ return TRUE;
++ return panel_consolekit_ensure_ck_connection (manager, NULL);
+#else
+ return FALSE;
+#endif
@@ -584,7 +604,7 @@ Index: gnome-panel/gnome-panel/panel-consolekit.c
+panel_consolekit_can_stop (PanelConsolekit *manager)
+{
+#ifdef HAVE_POLKIT
-+ return TRUE;
++ return panel_consolekit_ensure_ck_connection (manager, NULL);
+#else
+ return FALSE;
+#endif
@@ -595,8 +615,9 @@ Index: gnome-panel/gnome-panel/panel-consolekit.c
+{
+ static PanelConsolekit *manager = NULL;
+
-+ if (manager == NULL)
++ if (manager == NULL) {
+ manager = panel_consolekit_new ();
++ }
+
+ return g_object_ref (manager);
+}
@@ -684,7 +705,7 @@ Index: gnome-panel/gnome-panel/panel-consolekit.h
+#endif /* PANEL_CONSOLEKIT_H */
Index: gnome-panel/gnome-panel/panel-logout.c
===================================================================
---- gnome-panel/gnome-panel/panel-logout.c (revision 10754)
+--- gnome-panel/gnome-panel/panel-logout.c (revision 10951)
+++ gnome-panel/gnome-panel/panel-logout.c (working copy)
@@ -1,4 +1,5 @@
-/*
@@ -693,7 +714,7 @@ Index: gnome-panel/gnome-panel/panel-logout.c
* panel-logout.c:
*
* Copyright (C) 2006 Vincent Untz
-@@ -33,6 +34,7 @@
+@@ -35,6 +36,7 @@
#include "panel-logout.h"
#include "panel-gdm.h"
#include "panel-power-manager.h"
@@ -701,7 +722,7 @@ Index: gnome-panel/gnome-panel/panel-logout.c
#include "panel-session.h"
#include "panel-icon-names.h"
-@@ -53,6 +55,7 @@ struct _PanelLogoutDialogPrivate {
+@@ -55,6 +57,7 @@ struct _PanelLogoutDialogPrivate {
PanelLogoutDialogType type;
PanelPowerManager *power_manager;
@@ -709,7 +730,7 @@ Index: gnome-panel/gnome-panel/panel-logout.c
int timeout;
unsigned int timeout_id;
-@@ -74,7 +77,7 @@ enum {
+@@ -76,7 +79,7 @@ enum {
};
G_DEFINE_TYPE (PanelLogoutDialog, panel_logout, GTK_TYPE_MESSAGE_DIALOG);
@@ -718,7 +739,7 @@ Index: gnome-panel/gnome-panel/panel-logout.c
panel_logout_set_property (GObject *object,
guint prop_id,
const GValue *value,
-@@ -89,7 +92,7 @@ panel_logout_set_property (GObject
+@@ -91,7 +94,7 @@ panel_logout_set_property (GObject
}
}
@@ -727,15 +748,78 @@ Index: gnome-panel/gnome-panel/panel-logout.c
panel_logout_get_property (GObject *object,
guint prop_id,
GValue *value,
-@@ -142,6 +145,7 @@ panel_logout_init (PanelLogoutDialog *lo
- gtk_window_stick (GTK_WINDOW (logout_dialog));
+@@ -130,6 +133,59 @@ panel_logout_class_init (PanelLogoutDial
+ }
+
+ static void
++ck_restart_error_window (GError *error)
++{
++ GtkWidget *dialog;
++ const char *primary;
++
++ g_assert (error != NULL);
++
++ switch (error->code) {
++ case PANEL_CONSOLEKIT_ERROR_RESTARTING:
++ primary = _("Unable to restart system");
++ break;
++ case PANEL_CONSOLEKIT_ERROR_STOPPING:
++ primary = _("Unable to stop system");
++ break;
++ default:
++ g_assert_not_reached ();
++ }
++
++ dialog = gtk_message_dialog_new (NULL, 0,
++ GTK_MESSAGE_ERROR,
++ GTK_BUTTONS_NONE,
++ primary);
++
++ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
++ "%s", error->message);
++
++ gtk_dialog_add_buttons (GTK_DIALOG (dialog),
++ GTK_STOCK_CLOSE,
++ NULL);
++
++ gtk_dialog_set_default_response (GTK_DIALOG (dialog),
++ GTK_RESPONSE_CLOSE);
++ gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), FALSE);
++ gtk_window_set_title (GTK_WINDOW (dialog), "");
++
++ g_signal_connect (dialog, "response",
++ G_CALLBACK (gtk_widget_destroy), NULL);
++
++ gtk_widget_show (dialog);
++}
++
++static void
++on_ck_request_completed (PanelConsolekit *panel_consolekit,
++ GError *error)
++{
++ if (error == NULL) {
++ /* request was successful */
++ return;
++ }
++
++}
++
++static void
+ panel_logout_init (PanelLogoutDialog *logout_dialog)
+ {
+ logout_dialog->priv = PANEL_LOGOUT_DIALOG_GET_PRIVATE (logout_dialog);
+@@ -146,6 +202,10 @@ panel_logout_init (PanelLogoutDialog *lo
+ GTK_WIN_POS_CENTER_ALWAYS);
logout_dialog->priv->power_manager = panel_get_power_manager ();
+ logout_dialog->priv->consolekit = panel_get_consolekit ();
++ g_signal_connect (logout_dialog->priv->consolekit,
++ "request-completed",
++ G_CALLBACK (on_ck_request_completed), NULL);
g_signal_connect (logout_dialog, "destroy",
G_CALLBACK (panel_logout_destroy), NULL);
-@@ -159,37 +163,91 @@ panel_logout_destroy (PanelLogoutDialog
+@@ -163,37 +223,120 @@ panel_logout_destroy (PanelLogoutDialog
g_object_unref (logout_dialog->priv->power_manager);
logout_dialog->priv->power_manager = NULL;
@@ -751,7 +835,7 @@ Index: gnome-panel/gnome-panel/panel-logout.c
+ gboolean ret;
+
+ ret = panel_consolekit_can_restart (logout_dialog->priv->consolekit);
-+ if (! ret) {
++ if (!ret) {
+ ret = gdm_supports_logout_action (GDM_LOGOUT_ACTION_REBOOT);
+ }
+ return ret;
@@ -763,12 +847,37 @@ Index: gnome-panel/gnome-panel/panel-logout.c
+ gboolean ret;
+
+ ret = panel_consolekit_can_stop (logout_dialog->priv->consolekit);
-+ if (! ret) {
++ if (!ret) {
+ ret = gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN);
+ }
+ return ret;
+}
+
++gboolean
++panel_logout_supports_shutdown_reboot (void)
++{
++ PanelConsolekit *consolekit;
++ gboolean ret;
++
++ ret = FALSE;
++
++ /* if we can do any then return true */
++
++ consolekit = panel_get_consolekit ();
++ if (consolekit != NULL) {
++ ret = panel_consolekit_can_restart (consolekit)
++ || panel_consolekit_can_stop (consolekit);
++ g_object_unref (consolekit);
++ }
++
++ if (!ret) {
++ ret = gdm_supports_logout_action (GDM_LOGOUT_ACTION_REBOOT)
++ || gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN);
++ }
++
++ return ret;
++}
++
+static void
+do_request_logout (PanelConsolekit *consolekit)
+{
@@ -780,6 +889,8 @@ Index: gnome-panel/gnome-panel/panel-logout.c
+do_request_reboot (PanelConsolekit *consolekit)
+{
+ if (panel_consolekit_can_restart (consolekit)) {
++ gdm_set_logout_action (GDM_LOGOUT_ACTION_NONE);
++ panel_session_request_save ();
+ panel_consolekit_attempt_restart (consolekit);
+ } else {
+ gdm_set_logout_action (GDM_LOGOUT_ACTION_REBOOT);
@@ -791,6 +902,8 @@ Index: gnome-panel/gnome-panel/panel-logout.c
+do_request_shutdown (PanelConsolekit *consolekit)
+{
+ if (panel_consolekit_can_stop (consolekit)) {
++ gdm_set_logout_action (GDM_LOGOUT_ACTION_NONE);
++ panel_session_request_save ();
+ panel_consolekit_attempt_stop (consolekit);
+ } else {
+ gdm_set_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN);
@@ -833,7 +946,7 @@ Index: gnome-panel/gnome-panel/panel-logout.c
break;
case PANEL_LOGOUT_RESPONSE_STD:
if (panel_power_manager_can_hibernate (power_manager))
-@@ -206,6 +264,7 @@ panel_logout_response (PanelLogoutDialog
+@@ -210,6 +353,7 @@ panel_logout_response (PanelLogoutDialog
g_assert_not_reached ();
}
g_object_unref (power_manager);
@@ -841,7 +954,7 @@ Index: gnome-panel/gnome-panel/panel-logout.c
}
static gboolean
-@@ -357,7 +416,7 @@ panel_logout_new (PanelLogoutDialogType
+@@ -361,7 +505,7 @@ panel_logout_new (PanelLogoutDialogType
_("_Hibernate"),
PANEL_LOGOUT_RESPONSE_STD);
@@ -850,7 +963,7 @@ Index: gnome-panel/gnome-panel/panel-logout.c
gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
_("_Restart"),
PANEL_LOGOUT_RESPONSE_REBOOT);
-@@ -366,7 +425,7 @@ panel_logout_new (PanelLogoutDialogType
+@@ -370,7 +514,7 @@ panel_logout_new (PanelLogoutDialogType
GTK_STOCK_CANCEL,
GTK_RESPONSE_CANCEL);
@@ -859,9 +972,93 @@ Index: gnome-panel/gnome-panel/panel-logout.c
gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
_("_Shut Down"),
PANEL_LOGOUT_RESPONSE_SHUTDOWN);
+Index: gnome-panel/gnome-panel/panel-logout.h
+===================================================================
+--- gnome-panel/gnome-panel/panel-logout.h (revision 10951)
++++ gnome-panel/gnome-panel/panel-logout.h (working copy)
+@@ -57,6 +57,8 @@ struct _PanelLogoutDialogClass {
+
+ GType panel_logout_get_type (void) G_GNUC_CONST;
+
++gboolean panel_logout_supports_shutdown_reboot (void);
++
+ void panel_logout_new (PanelLogoutDialogType type,
+ GdkScreen *screen,
+ guint32 activate_time);
+Index: gnome-panel/gnome-panel/panel-toplevel.c
+===================================================================
+--- gnome-panel/gnome-panel/panel-toplevel.c (revision 10951)
++++ gnome-panel/gnome-panel/panel-toplevel.c (working copy)
+@@ -3329,7 +3329,8 @@ panel_toplevel_get_animation_time (Panel
+ }
+
+ static void
+-panel_toplevel_start_animation (PanelToplevel *toplevel)
++panel_toplevel_start_animation (PanelToplevel *toplevel,
++ gboolean auto_hide)
+ {
+ GdkScreen *screen;
+ int monitor_width, monitor_height;
+@@ -3480,7 +3481,7 @@ panel_toplevel_hide (PanelToplevel *t
+ }
+
+ if (toplevel->priv->animate && GTK_WIDGET_REALIZED (toplevel))
+- panel_toplevel_start_animation (toplevel);
++ panel_toplevel_start_animation (toplevel, auto_hide);
+ else if (toplevel->priv->attached)
+ gtk_widget_hide (GTK_WIDGET (toplevel));
+
+@@ -3528,7 +3529,7 @@ panel_toplevel_unhide (PanelToplevel *to
+ panel_toplevel_push_autohide_disabler (toplevel->priv->attach_toplevel);
+
+ if (toplevel->priv->animate && GTK_WIDGET_REALIZED (toplevel))
+- panel_toplevel_start_animation (toplevel);
++ panel_toplevel_start_animation (toplevel, FALSE);
+ else if (toplevel->priv->attached)
+ gtk_widget_show (GTK_WIDGET (toplevel));
+
+Index: gnome-panel/gnome-panel/panel-session.c
+===================================================================
+--- gnome-panel/gnome-panel/panel-session.c (revision 10951)
++++ gnome-panel/gnome-panel/panel-session.c (working copy)
+@@ -60,6 +60,34 @@ panel_session_request_logout (void)
+ recursion_guard--;
+ }
+
++void
++panel_session_request_save (void)
++{
++ GnomeClient *client;
++ static int recursion_guard = 0;
++
++ if (recursion_guard)
++ return;
++
++ recursion_guard++;
++
++ if (!(client = gnome_master_client ()))
++ return;
++
++ /* Only request a Global save. We only want a Local
++ * save if the user selects 'Save current setup'
++ * from the dialog.
++ */
++ gnome_client_request_save (client,
++ GNOME_SAVE_GLOBAL,
++ FALSE,
++ GNOME_INTERACT_NONE,
++ TRUE, /* do not use the gnome-session gui */
++ TRUE);
++
++ recursion_guard--;
++}
++
+ static void
+ panel_session_handle_die_request (GnomeClient *client)
+ {
Index: gnome-panel/gnome-panel/panel-action-button.c
===================================================================
---- gnome-panel/gnome-panel/panel-action-button.c (revision 10754)
+--- gnome-panel/gnome-panel/panel-action-button.c (revision 10951)
+++ gnome-panel/gnome-panel/panel-action-button.c (working copy)
@@ -46,7 +46,6 @@
#include "panel-lockdown.h"
@@ -871,20 +1068,31 @@ Index: gnome-panel/gnome-panel/panel-action-button.c
#include "panel-icon-names.h"
G_DEFINE_TYPE (PanelActionButton, panel_action_button, BUTTON_TYPE_WIDGET);
-@@ -182,9 +181,7 @@ panel_action_shutdown (GtkWidget *widget
- static gboolean
+@@ -183,8 +182,7 @@ static gboolean
panel_action_shutdown_reboot_is_disabled (void)
{
-- return (panel_lockdown_get_disable_log_out() ||
+ return (panel_lockdown_get_disable_log_out() ||
- (!gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN) &&
- !gdm_supports_logout_action (GDM_LOGOUT_ACTION_REBOOT)));
-+ return (panel_lockdown_get_disable_log_out());
++ !panel_logout_supports_shutdown_reboot);
}
/* Run Application
+Index: gnome-panel/gnome-panel/panel-session.h
+===================================================================
+--- gnome-panel/gnome-panel/panel-session.h (revision 10951)
++++ gnome-panel/gnome-panel/panel-session.h (working copy)
+@@ -30,6 +30,7 @@ G_BEGIN_DECLS
+ void panel_session_init (void);
+ void panel_session_do_not_restart (void);
+ void panel_session_request_logout (void);
++void panel_session_request_save (void);
+
+ G_END_DECLS
+
Index: gnome-panel/gnome-panel/Makefile.am
===================================================================
---- gnome-panel/gnome-panel/Makefile.am (revision 10754)
+--- gnome-panel/gnome-panel/Makefile.am (revision 10951)
+++ gnome-panel/gnome-panel/Makefile.am (working copy)
@@ -16,6 +16,7 @@ INCLUDES = \
$(STANDARD_PROPERTIES_CFLAGS) \
@@ -900,17 +1108,17 @@ Index: gnome-panel/gnome-panel/Makefile.am
panel-power-manager.c \
+ panel-consolekit.c \
panel-ditem-editor.c \
+ panel-mount-operation.c \
$(NULL)
-
-@@ -147,6 +149,7 @@ panel_headers = \
+@@ -148,6 +150,7 @@ panel_headers = \
panel-logout.h \
panel-gdm.h \
panel-power-manager.h \
+ panel-consolekit.h \
panel-ditem-editor.h \
panel-icon-names.h \
- $(NULL)
-@@ -159,6 +162,7 @@ gnome_panel_SOURCES = \
+ panel-mount-operation.h \
+@@ -161,6 +164,7 @@ gnome_panel_SOURCES = \
gnome_panel_LDADD = \
$(PANEL_LIBS) \
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 3560a3c..08c247c 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,10 +21,10 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.21.92
+Version: 2.22.0
Release: 6%{?dist}
URL:
http://www.gnome.org
-Source0:
http://download.gnome.org/sources/gnome-panel/2.21/%{name}-%{version}.tar...
+Source0:
http://download.gnome.org/sources/gnome-panel/2.22/%{name}-%{version}.tar...
Source3: redhat-panel-default-setup.entries
Source4: gnome-compiler-flags.m4
@@ -107,11 +107,9 @@ Patch10: preferred-apps.patch
# add a hard dependency on e.g. tomboy
Patch11: applet-error.patch
+#
http://bugzilla.gnome.org/show_bug.cgi?id=511881
Patch14: gnome-panel-2.21.5-ck-shutdown.patch
-Patch22: polkit-fix.patch
-Patch23: sunrise.patch
-
#
http://bugzilla.gnome.org/show_bug.cgi?id=520111
Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
@@ -164,8 +162,6 @@ Panel Applets using the libpanel-applet library.
%patch10 -p1 -b .preferred-apps
%patch11 -p1 -b .applet-error
%patch14 -p1 -b .ck-shutdown
-%patch22 -p1 -b .polkit-fix
-%patch23 -p1 -b .sunrise
%patch24 -p1 -b .allow-spurious-view-done-signals
%patch25 -p1 -b .current
%patch26 -p1 -b .expose
@@ -353,6 +349,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Mon Mar 10 2008 Jon McCann <jmccann(a)redhat.com> - 2.22.0-1
+- Update to 2.22.0
+
* Sat Mar 8 2008 Will Woods <wwoods(a)redhat.com> - 2.21.92-6
- Add "About This Computer" item to System menu if it exists
diff --git a/sources b/sources
index 2a7e973..1b866fc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-46544232bc0148ff61790f9141a6904b gnome-panel-2.21.92.tar.bz2
+fe10c920c1f182a2bd5dba98863c786c gnome-panel-2.22.0.tar.bz2
commit 11ae0fddc3d8b8c9a620eb85299ad49bc3e0da1d
Author: Will Woods <wwoods(a)fedoraproject.org>
Date: Sun Mar 9 21:25:43 2008 +0000
add about-this-computer patch
diff --git a/gnome-panel-2.21.92-about-this-computer.patch
b/gnome-panel-2.21.92-about-this-computer.patch
new file mode 100644
index 0000000..4b07b3b
--- /dev/null
+++ b/gnome-panel-2.21.92-about-this-computer.patch
@@ -0,0 +1,12 @@
+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.spec b/gnome-panel.spec
index 3e6140a..3560a3c 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.21.92
-Release: 5%{?dist}
+Release: 6%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.21/%{name}-%{version}.tar...
@@ -94,6 +94,7 @@ Patch4: gnome-panel-2.16.1-search.patch
# Drop this patch for now, it should have AT LEAST been moved
# to an upstream bugzilla by now
#Patch6: gnome-panel-2.16.0-compiz-support.patch
+Patch7: gnome-panel-2.21.92-about-this-computer.patch
# the next three patches belong together
#
http://bugzilla.gnome.org/show_bug.cgi?id=470966
@@ -157,6 +158,7 @@ Panel Applets using the libpanel-applet library.
%patch3 -p1 -b .switch-user
%patch4 -p1 -b .search
#%patch6 -p0 -b .compiz-support
+%patch7 -p1 -b .about-this-computer
%patch8 -p1 -b .launcher-desktop-files
%patch9 -p1 -b .desktop-file-monitoring
%patch10 -p1 -b .preferred-apps
@@ -351,6 +353,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Sat Mar 8 2008 Will Woods <wwoods(a)redhat.com> - 2.21.92-6
+- Add "About This Computer" item to System menu if it exists
+
* Mon Mar 3 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.92-5
- Fix a redraw problem with the clock map
commit 9080cee1e38a1c8d92c58e77fee974207287f6f6
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Mar 4 01:29:05 2008 +0000
fix a redraw problem
diff --git a/expose.patch b/expose.patch
new file mode 100644
index 0000000..dd8aa3d
--- /dev/null
+++ b/expose.patch
@@ -0,0 +1,15 @@
+diff -up gnome-panel-2.21.92/applets/clock/clock-map.c.expose
gnome-panel-2.21.92/applets/clock/clock-map.c
+--- gnome-panel-2.21.92/applets/clock/clock-map.c.expose 2008-03-03 20:26:50.000000000
-0500
++++ gnome-panel-2.21.92/applets/clock/clock-map.c 2008-03-03 20:26:55.000000000 -0500
+@@ -247,8 +247,9 @@ clock_map_expose (GtkWidget *this, GdkEv
+ /* draw a simple outline */
+ cairo_rectangle (
+ cr,
+- region.x + 0.5, region.y + 0.5,
+- region.width - 1, region.height - 1);
++ allocation.x + 0.5, allocation.y + 0.5,
++ gdk_pixbuf_get_width (priv->rotated_map_pixbuf) - 1,
++ gdk_pixbuf_get_height (priv->rotated_map_pixbuf) - 1);
+
+ cairo_set_source_rgb (
+ cr,
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 2f49405..3e6140a 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.21.92
-Release: 4%{?dist}
+Release: 5%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.21/%{name}-%{version}.tar...
@@ -115,6 +115,7 @@ Patch23: sunrise.patch
Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
Patch25: current.patch
+Patch26: expose.patch
Conflicts: gnome-power-manager < 2.15.3
@@ -165,6 +166,7 @@ Panel Applets using the libpanel-applet library.
%patch23 -p1 -b .sunrise
%patch24 -p1 -b .allow-spurious-view-done-signals
%patch25 -p1 -b .current
+%patch26 -p1 -b .expose
. %{SOURCE6}
@@ -349,6 +351,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Mon Mar 3 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.92-5
+- Fix a redraw problem with the clock map
+
* Mon Mar 3 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.92-4
- Make the clock applet handle multiple locations in the
same timezone meaningfully
commit 473518cf40c787143c1f949a551810fc31bd99b0
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Mar 4 00:05:50 2008 +0000
Make the clock applet handle multiple locations in the same timezone
meaningfully
diff --git a/current.patch b/current.patch
new file mode 100644
index 0000000..290e5ca
--- /dev/null
+++ b/current.patch
@@ -0,0 +1,351 @@
+diff -up gnome-panel-2.21.92/applets/clock/clock-location.h.current
gnome-panel-2.21.92/applets/clock/clock-location.h
+--- gnome-panel-2.21.92/applets/clock/clock-location.h.current 2008-02-26
08:17:49.000000000 -0500
++++ gnome-panel-2.21.92/applets/clock/clock-location.h 2008-03-03 17:53:43.000000000
-0500
+@@ -27,6 +27,8 @@ typedef struct
+ GObjectClass g_object_class;
+
+ void (* weather_updated) (ClockLocation *location, WeatherInfo *info);
++
++ void (* set_current) (ClockLocation *location);
+ } ClockLocationClass;
+
+ GType clock_location_get_type (void);
+@@ -40,7 +42,7 @@ ClockLocation *clock_location_new_from_e
+
+ gchar *clock_location_get_tzname (ClockLocation *loc);
+
+-gchar *clock_location_get_name (ClockLocation *loc);
++const gchar *clock_location_get_name (ClockLocation *loc);
+ void clock_location_set_name (ClockLocation *loc, const gchar *name);
+
+ gchar *clock_location_get_timezone (ClockLocation *loc);
+@@ -56,6 +58,7 @@ void clock_location_make_current (ClockL
+ GFunc callback,
+ gpointer data,
+ GDestroyNotify destroy);
++gboolean clock_location_is_current_timezone (ClockLocation *loc);
+
+ const gchar *clock_location_get_weather_code (ClockLocation *loc);
+ void clock_location_set_weather_code (ClockLocation *loc, const gchar *code);
+diff -up gnome-panel-2.21.92/applets/clock/clock-location-tile.c.current
gnome-panel-2.21.92/applets/clock/clock-location-tile.c
+--- gnome-panel-2.21.92/applets/clock/clock-location-tile.c.current 2008-03-03
13:52:38.000000000 -0500
++++ gnome-panel-2.21.92/applets/clock/clock-location-tile.c 2008-03-03 18:59:59.000000000
-0500
+@@ -19,7 +19,6 @@ G_DEFINE_TYPE (ClockLocationTile, clock_
+
+ enum {
+ TILE_PRESSED,
+- TIMEZONE_SET,
+ NEED_CLOCK_FORMAT,
+ LAST_SIGNAL
+ };
+@@ -106,14 +105,6 @@ clock_location_tile_class_init (ClockLoc
+ NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
+- signals[TIMEZONE_SET] = g_signal_new ("timezone-set",
+- G_TYPE_FROM_CLASS (g_obj_class),
+- G_SIGNAL_RUN_FIRST,
+- G_STRUCT_OFFSET (ClockLocationTileClass, timezone_set),
+- NULL,
+- NULL,
+- g_cclosure_marshal_VOID__VOID,
+- G_TYPE_NONE, 0);
+ signals[NEED_CLOCK_FORMAT] = g_signal_new ("need-clock-format",
+ G_TYPE_FROM_CLASS (g_obj_class),
+ G_SIGNAL_RUN_LAST,
+@@ -180,13 +171,9 @@ press_on_tile (GtkWidget
+ static void
+ make_current_cb (gpointer data, GError *error)
+ {
+- ClockLocationTile *tile = data;
+ GtkWidget *dialog;
+
+- if (error == NULL) {
+- g_signal_emit (tile, signals[TIMEZONE_SET], 0);
+- }
+- else {
++ if (error) {
+ dialog = gtk_message_dialog_new (NULL,
+ 0,
+ GTK_MESSAGE_ERROR,
+@@ -232,7 +219,10 @@ enter_or_leave_tile (GtkWidget
+ if (event->type == GDK_ENTER_NOTIFY) {
+ gint can_set;
+
+- can_set = can_set_system_timezone ();
++ if (clock_location_is_current_timezone (priv->location))
++ can_set = 2;
++ else
++ can_set = can_set_system_timezone ();
+ if (can_set != 0) {
+ gtk_label_set_markup (GTK_LABEL (priv->current_label),
+ can_set == 1 ?
+@@ -317,6 +307,7 @@ clock_location_tile_fill (ClockLocationT
+ gtk_widget_show (priv->current_label);
+ gtk_widget_set_no_show_all (priv->current_button, TRUE);
+ gtk_container_add (GTK_CONTAINER (priv->current_button),
priv->current_label);
++ /* FIXME: this needs to talk about locations, not timezones */
+ gtk_widget_set_tooltip_text (priv->current_button, _("Set as current
timezone for this computer"));
+
+ priv->current_marker = gtk_image_new_from_icon_name ("go-home",
GTK_ICON_SIZE_BUTTON);
+diff -up gnome-panel-2.21.92/applets/clock/clock.c.current
gnome-panel-2.21.92/applets/clock/clock.c
+--- gnome-panel-2.21.92/applets/clock/clock.c.current 2008-03-03 15:51:48.000000000
-0500
++++ gnome-panel-2.21.92/applets/clock/clock.c 2008-03-03 19:01:31.000000000 -0500
+@@ -237,6 +237,7 @@ static void applet_change_orient (PanelA
+ ClockData *cd);
+
+ static void edit_hide (GtkWidget *unused, ClockData *cd);
++static void save_cities_store (ClockData *cd);
+
+ static void
+ unfix_size (ClockData *cd)
+@@ -962,8 +963,8 @@ sort_locations_by_name (gconstpointer a,
+ ClockLocation *loc_a = (ClockLocation *) a;
+ ClockLocation *loc_b = (ClockLocation *) b;
+
+- char *name_a = clock_location_get_name (loc_a);
+- char *name_b = clock_location_get_name (loc_b);
++ const char *name_a = clock_location_get_name (loc_a);
++ const char *name_b = clock_location_get_name (loc_b);
+
+ return strcmp (name_a, name_b);
+ }
+@@ -1069,15 +1070,6 @@ location_tile_pressed_cb (ClockLocationT
+ }
+
+ static void
+-location_tile_timezone_set_cb (ClockLocationTile *tile, gpointer data)
+-{
+- ClockData *cd = data;
+-
+- clock_map_refresh (CLOCK_MAP (cd->map_widget));
+- update_location_tiles (cd);
+-}
+-
+-static void
+ location_tile_weather_updated_cb (ClockLocationTile *tile, GdkPixbuf *weather_icon,
const char *temperature, gpointer data)
+ {
+ ClockData *cd = data;
+@@ -1131,8 +1123,6 @@ create_cities_section (ClockData *cd)
+ city = clock_location_tile_new (loc, CLOCK_FACE_SMALL);
+ g_signal_connect (city, "tile-pressed",
+ G_CALLBACK (location_tile_pressed_cb), cd);
+- g_signal_connect (city, "timezone-set",
+- G_CALLBACK (location_tile_timezone_set_cb), cd);
+ g_signal_connect (city, "need-clock-format",
+ G_CALLBACK (location_tile_need_clock_format_cb), cd);
+
+@@ -2064,6 +2054,21 @@ location_weather_updated_cb (ClockLocati
+ }
+
+ static void
++location_set_current_cb (ClockLocation *loc,
++ gpointer data)
++{
++ ClockData *cd = data;
++ WeatherInfo *info;
++
++ info = clock_location_get_weather_info (loc);
++ location_weather_updated_cb (loc, info, cd);
++
++ clock_map_refresh (CLOCK_MAP (cd->map_widget));
++ update_location_tiles (cd);
++ save_cities_store (cd);
++}
++
++static void
+ locations_changed (ClockData *cd)
+ {
+ GList *l;
+@@ -2078,6 +2083,8 @@ locations_changed (ClockData *cd)
+ id = g_signal_connect (loc, "weather-updated",
+ G_CALLBACK (location_weather_updated_cb), cd);
+ g_object_set_data (G_OBJECT (loc), "weather-updated", GINT_TO_POINTER
(id));
++ g_signal_connect (loc, "set-current",
++ G_CALLBACK (location_set_current_cb), cd);
+ }
+ }
+
+@@ -2122,6 +2129,7 @@ location_start_element (GMarkupParseCont
+ gfloat latitude = 0.0;
+ gfloat longitude = 0.0;
+ gchar *code = NULL;
++ gboolean current = FALSE;
+
+ int index = 0;
+
+@@ -2147,6 +2155,11 @@ location_start_element (GMarkupParseCont
+ } else if (strcmp (att_name, "code") == 0) {
+ code = (gchar *)attribute_values[index];
+ }
++ else if (strcmp (att_name, "current") == 0) {
++ if (strcmp (attribute_values[index], "true") == 0) {
++ current = TRUE;
++ }
++ }
+ }
+
+ setlocale (LC_NUMERIC, "");
+@@ -2157,6 +2170,9 @@ location_start_element (GMarkupParseCont
+
+ loc = clock_location_new (name, timezone, latitude, longitude, code,
&prefs);
+
++ if (current)
++ clock_location_make_current (loc, NULL, NULL, NULL);
++
+ data->cities = g_list_append (data->cities, loc);
+ }
+
+@@ -2912,13 +2928,14 @@ loc_to_string (ClockLocation *loc)
+ clock_location_get_coords (loc, &latitude, &longitude);
+
+ prev_locale = setlocale (LC_NUMERIC, "POSIX");
+-
++
+ ret = g_markup_printf_escaped
+- ("<location name=\"%s\" timezone=\"%s\"
latitude=\"%f\" longitude=\"%f\" code=\"%s\"/>",
++ ("<location name=\"%s\" timezone=\"%s\"
latitude=\"%f\" longitude=\"%f\" code=\"%s\"
current=\"%s\"/>",
+ clock_location_get_name (loc),
+ clock_location_get_timezone (loc),
+ latitude, longitude,
+- clock_location_get_weather_code (loc));
++ clock_location_get_weather_code (loc),
++ clock_location_is_current (loc) ? "true" : "false");
+
+ setlocale (LC_NUMERIC, "");
+
+diff -up gnome-panel-2.21.92/applets/clock/clock-location-tile.h.current
gnome-panel-2.21.92/applets/clock/clock-location-tile.h
+--- gnome-panel-2.21.92/applets/clock/clock-location-tile.h.current 2008-03-03
18:58:50.000000000 -0500
++++ gnome-panel-2.21.92/applets/clock/clock-location-tile.h 2008-03-03 18:58:58.000000000
-0500
+@@ -26,7 +26,6 @@ typedef struct
+ GtkAlignmentClass parent_class;
+
+ void (* tile_pressed) (ClockLocationTile *tile);
+- void (* timezone_set) (ClockLocationTile *tile);
+ int (* need_clock_format) (ClockLocationTile *tile);
+ } ClockLocationTileClass;
+
+diff -up gnome-panel-2.21.92/applets/clock/clock-location.c.current
gnome-panel-2.21.92/applets/clock/clock-location.c
+--- gnome-panel-2.21.92/applets/clock/clock-location.c.current 2008-02-26
08:17:49.000000000 -0500
++++ gnome-panel-2.21.92/applets/clock/clock-location.c 2008-03-03 19:01:45.000000000
-0500
+@@ -51,6 +51,7 @@ typedef struct {
+
+ enum {
+ WEATHER_UPDATED,
++ SET_CURRENT,
+ LAST_SIGNAL
+ };
+
+@@ -232,6 +233,7 @@ guess_zone_from_tree (const gchar *local
+ }
+
+ static gchar *current_zone = NULL;
++static ClockLocation *current_location = NULL;
+ static GFileMonitor *monitor = NULL;
+
+ static void
+@@ -409,6 +411,15 @@ clock_location_class_init (ClockLocation
+ _clock_marshal_VOID__POINTER,
+ G_TYPE_NONE, 1, G_TYPE_POINTER);
+
++ location_signals[SET_CURRENT] =
++ g_signal_new ("set-current",
++ G_OBJECT_CLASS_TYPE (g_obj_class),
++ G_SIGNAL_RUN_FIRST,
++ G_STRUCT_OFFSET (ClockLocationClass, set_current),
++ NULL, NULL,
++ _clock_marshal_VOID__VOID,
++ G_TYPE_NONE, 0);
++
+ g_type_class_add_private (this_class, sizeof (ClockLocationPrivate));
+ }
+
+@@ -482,7 +493,7 @@ clock_location_finalize (GObject *g_obj)
+ G_OBJECT_CLASS (clock_location_parent_class)->finalize (g_obj);
+ }
+
+-gchar *
++const gchar *
+ clock_location_get_name (ClockLocation *loc)
+ {
+ ClockLocationPrivate *priv = PRIVATE (loc);
+@@ -629,15 +640,37 @@ clock_location_localtime (ClockLocation
+ }
+
+ gboolean
+-clock_location_is_current (ClockLocation *loc)
++clock_location_is_current_timezone (ClockLocation *loc)
+ {
+ ClockLocationPrivate *priv = PRIVATE (loc);
+ const char *zone;
+
+- if ((zone = zone_from_etc_sysconfig_clock ()))
++ if ((zone = zone_from_etc_sysconfig_clock ())) {
+ return strcmp (zone, priv->timezone) == 0;
++ }
++ else {
++ return clock_location_get_offset (loc) == 0;
++ }
++}
+
+- return clock_location_get_offset (loc) == 0;
++gboolean
++clock_location_is_current (ClockLocation *loc)
++{
++
++ if (current_location == loc)
++ return TRUE;
++ else if (current_location != NULL)
++ return FALSE;
++
++ if (clock_location_is_current_timezone (loc)) {
++ current_location = loc;
++ g_object_add_weak_pointer (G_OBJECT (current_location),
++ (gpointer *)¤t_location);
++
++ return TRUE;
++ }
++
++ return FALSE;
+ }
+
+
+@@ -700,6 +733,15 @@ make_current_cb (gpointer data, GError *
+ */
+ g_free (current_zone);
+ current_zone = g_strdup (priv->timezone);
++
++ if (current_location)
++ g_object_remove_weak_pointer (G_OBJECT (current_location),
++ (gpointer *)¤t_location);
++ current_location = mcdata->location;
++ g_object_add_weak_pointer (G_OBJECT (current_location),
++ (gpointer *)¤t_location);
++ g_signal_emit (current_location, location_signals[SET_CURRENT],
++ 0, NULL);
+ }
+
+ if (mcdata->callback)
+@@ -730,6 +772,22 @@ clock_location_make_current (ClockLocati
+ gchar *filename;
+ MakeCurrentData *mcdata;
+
++ if (clock_location_is_current_timezone (loc)) {
++ if (current_location)
++ g_object_remove_weak_pointer (G_OBJECT (current_location),
++ (gpointer *)¤t_location);
++ current_location = loc;
++ g_object_add_weak_pointer (G_OBJECT (current_location),
++ (gpointer *)¤t_location);
++ g_signal_emit (current_location, location_signals[SET_CURRENT],
++ 0, NULL);
++ if (callback)
++ callback (data, NULL);
++ if (destroy)
++ destroy (data);
++ return;
++ }
++
+ mcdata = g_new (MakeCurrentData, 1);
+
+ mcdata->location = g_object_ref (loc);
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 64a92fd..2f49405 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.21.92
-Release: 3%{?dist}
+Release: 4%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.21/%{name}-%{version}.tar...
@@ -114,6 +114,8 @@ Patch23: sunrise.patch
#
http://bugzilla.gnome.org/show_bug.cgi?id=520111
Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
+Patch25: current.patch
+
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -162,6 +164,7 @@ Panel Applets using the libpanel-applet library.
%patch22 -p1 -b .polkit-fix
%patch23 -p1 -b .sunrise
%patch24 -p1 -b .allow-spurious-view-done-signals
+%patch25 -p1 -b .current
. %{SOURCE6}
@@ -346,6 +349,10 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Mon Mar 3 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.92-4
+- Make the clock applet handle multiple locations in the
+ same timezone meaningfully
+
* Mon Mar 3 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.92-3
- Some upstream clock applet fixes
commit 05dc87edc813bc95ea03d42a85be4c704daba2e5
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Mar 3 18:02:59 2008 +0000
Some upstream clock applet fixes
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 71609c7..64a92fd 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.21.92
-Release: 2%{?dist}
+Release: 3%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.21/%{name}-%{version}.tar...
@@ -108,6 +108,7 @@ Patch11: applet-error.patch
Patch14: gnome-panel-2.21.5-ck-shutdown.patch
+Patch22: polkit-fix.patch
Patch23: sunrise.patch
#
http://bugzilla.gnome.org/show_bug.cgi?id=520111
@@ -158,6 +159,7 @@ Panel Applets using the libpanel-applet library.
%patch10 -p1 -b .preferred-apps
%patch11 -p1 -b .applet-error
%patch14 -p1 -b .ck-shutdown
+%patch22 -p1 -b .polkit-fix
%patch23 -p1 -b .sunrise
%patch24 -p1 -b .allow-spurious-view-done-signals
@@ -344,6 +346,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Mon Mar 3 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.92-3
+- Some upstream clock applet fixes
+
* Mon Mar 3 2008 Ray Strode <rstrode(a)redhat.com> - 2.21.92-2
- Don't crash with Zimbra connector (bug 435355)
diff --git a/polkit-fix.patch b/polkit-fix.patch
new file mode 100644
index 0000000..2d07445
--- /dev/null
+++ b/polkit-fix.patch
@@ -0,0 +1,107 @@
+diff -up gnome-panel-2.21.92/applets/clock/set-timezone.c.polkit-fix
gnome-panel-2.21.92/applets/clock/set-timezone.c
+--- gnome-panel-2.21.92/applets/clock/set-timezone.c.polkit-fix 2008-03-03
12:10:34.000000000 -0500
++++ gnome-panel-2.21.92/applets/clock/set-timezone.c 2008-03-03 12:10:50.000000000 -0500
+@@ -75,6 +75,40 @@ 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;
++}
++
++static void
++pk_io_remove_watch_fn (PolKitContext *pk_context, int watch_id)
++{
++ g_source_remove (watch_id);
++}
++
+ static PolKitContext *
+ get_pk_context (void)
+ {
+@@ -82,6 +116,9 @@ get_pk_context (void)
+
+ 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;
+@@ -126,22 +163,19 @@ can_do (const gchar *pk_action_id)
+ pk_result = polkit_context_can_caller_do_action (pk_context, pk_action,
pk_caller);
+
+ switch (pk_result) {
+- default:
+ case POLKIT_RESULT_UNKNOWN:
+ case POLKIT_RESULT_NO:
+ res = 0;
+ break;
+- case POLKIT_RESULT_ONLY_VIA_ADMIN_AUTH:
+- case POLKIT_RESULT_ONLY_VIA_ADMIN_AUTH_KEEP_SESSION:
+- case POLKIT_RESULT_ONLY_VIA_ADMIN_AUTH_KEEP_ALWAYS:
+- case POLKIT_RESULT_ONLY_VIA_SELF_AUTH:
+- case POLKIT_RESULT_ONLY_VIA_SELF_AUTH_KEEP_SESSION:
+- case POLKIT_RESULT_ONLY_VIA_SELF_AUTH_KEEP_ALWAYS:
+- res = 1;
+- 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:
+diff -up gnome-panel-2.21.92/applets/clock/clock.c.polkit-fix
gnome-panel-2.21.92/applets/clock/clock.c
+--- gnome-panel-2.21.92/applets/clock/clock.c.polkit-fix 2008-03-03 12:10:23.000000000
-0500
++++ gnome-panel-2.21.92/applets/clock/clock.c 2008-03-03 12:10:45.000000000 -0500
+@@ -2266,11 +2266,15 @@ clock_migrate_to_26 (ClockData *clock)
+ else if (hourformat == 24)
+ clock->format = CLOCK_FORMAT_24;
+
+- panel_applet_gconf_set_string (PANEL_APPLET (clock->applet),
+- KEY_FORMAT,
+- gconf_enum_to_string (format_type_enum_map,
+- clock->format),
+- NULL);
++ /* It's still possible that we have none of the old keys, in which case
++ * we're not migrating from 2.6, but the config is simply wrong. So
++ * don't set the format key in this case. */
++ if (clock->format != CLOCK_FORMAT_INVALID)
++ panel_applet_gconf_set_string (PANEL_APPLET (clock->applet),
++ KEY_FORMAT,
++ gconf_enum_to_string (format_type_enum_map,
++ clock->format),
++ NULL);
+ }
+
+ static void
commit 881c85a605b25b68160b44b3ea39537b87495c95
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Mon Mar 3 16:30:09 2008 +0000
actually add patch
diff --git a/gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
b/gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
new file mode 100644
index 0000000..8032a80
--- /dev/null
+++ b/gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
@@ -0,0 +1,17 @@
+diff -up
gnome-panel-2.21.92/applets/clock/calendar-client.c.allow-spurious-view-done-signals
gnome-panel-2.21.92/applets/clock/calendar-client.c
+---
gnome-panel-2.21.92/applets/clock/calendar-client.c.allow-spurious-view-done-signals 2008-02-26
08:17:49.000000000 -0500
++++ gnome-panel-2.21.92/applets/clock/calendar-client.c 2008-03-03 10:22:57.000000000
-0500
+@@ -1217,6 +1217,13 @@ calendar_client_handle_query_completed (
+ {
+ CalendarClientQuery *query;
+
++ if (!source->query_in_progress)
++ {
++ g_warning ("Got spurious 'view-done' signal from calendar backend for
query %p\n",
++ &source->completed_query);
++ return;
++ }
++
+ query = goddamn_this_is_crack (source, view, NULL);
+
+ dprintf ("Query %p completed: %s\n", query, e_cal_get_error_message
(status));
commit e032a85a9ff3d69bfb3493d60815d87c61e36878
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Mon Mar 3 15:57:27 2008 +0000
Update changelog with bug number
diff --git a/gnome-panel.spec b/gnome-panel.spec
index a7e286e..71609c7 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -345,7 +345,7 @@ fi
%changelog
* Mon Mar 3 2008 Ray Strode <rstrode(a)redhat.com> - 2.21.92-2
-- Don't crash with Zimbra connector
+- Don't crash with Zimbra connector (bug 435355)
* Tue Feb 26 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.92-1
- Update to 2.21.92
commit c492a07409b777ea4582680217885f6ba86b2bd0
Author: Ray Strode <rstrode(a)fedoraproject.org>
Date: Mon Mar 3 15:56:32 2008 +0000
- Don't crash with Zimbra connector
diff --git a/gnome-panel-2.16.1-allow-spurious-view-done-signals.patch
b/gnome-panel-2.16.1-allow-spurious-view-done-signals.patch
new file mode 100644
index 0000000..fcc0854
--- /dev/null
+++ b/gnome-panel-2.16.1-allow-spurious-view-done-signals.patch
@@ -0,0 +1,16 @@
+---
gnome-panel-2.16.1/applets/clock/calendar-client.c.allow-spurious-view-done-signals 2008-01-07
11:50:59.000000000 -0500
++++ gnome-panel-2.16.1/applets/clock/calendar-client.c 2008-01-07 11:54:08.000000000
-0500
+@@ -1199,6 +1199,13 @@
+ {
+ CalendarClientQuery *query;
+
++ if (!source->query_in_progress)
++ {
++ g_warning ("Got spurious 'view-done' signal from calendar backend for
query %p\n",
++ &source->completed_query);
++ return;
++ }
++
+ query = goddamn_this_is_crack (source, view, NULL);
+
+ dprintf ("Query %p completed: %s\n", query, e_cal_get_error_message
(status));
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 308b851..a7e286e 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.21.92
-Release: 1%{?dist}
+Release: 2%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.21/%{name}-%{version}.tar...
@@ -110,6 +110,9 @@ Patch14: gnome-panel-2.21.5-ck-shutdown.patch
Patch23: sunrise.patch
+#
http://bugzilla.gnome.org/show_bug.cgi?id=520111
+Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
+
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -156,6 +159,7 @@ Panel Applets using the libpanel-applet library.
%patch11 -p1 -b .applet-error
%patch14 -p1 -b .ck-shutdown
%patch23 -p1 -b .sunrise
+%patch24 -p1 -b .allow-spurious-view-done-signals
. %{SOURCE6}
@@ -340,6 +344,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Mon Mar 3 2008 Ray Strode <rstrode(a)redhat.com> - 2.21.92-2
+- Don't crash with Zimbra connector
+
* Tue Feb 26 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.92-1
- Update to 2.21.92
commit ae8b76dc7dd6b1b242432f24cfab3a2a5b41df55
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Feb 26 17:36:45 2008 +0000
2.21.92
diff --git a/.cvsignore b/.cvsignore
index e6929c5..3001829 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.21.91.tar.bz2
+gnome-panel-2.21.92.tar.bz2
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 6b23584..308b851 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,8 +21,8 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.21.91
-Release: 9%{?dist}
+Version: 2.21.92
+Release: 1%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.21/%{name}-%{version}.tar...
@@ -108,30 +108,6 @@ Patch11: applet-error.patch
Patch14: gnome-panel-2.21.5-ck-shutdown.patch
-# fix display of times in location tiles in the clock; fixed upstream
-Patch15: localtime.patch
-
-# fix some focus issues with preference dialogs; fixed upstream
-Patch16: pref-dialogs.patch
-
-# make set buttons on location tiles work; fixed upstream
-Patch17: set-button.patch
-
-# fix display of weather in the panel button; fixed upstream
-Patch18: panel-weather.patch
-
-# make timezone setting asynchronous; fixed upstream
-Patch19: async-timezone.patch
-
-# take daylight savings time into account for offsets
-Patch20: dst-offset.patch
-
-# reduce resizing of the popup due to set buttons
-Patch21: less-resizing.patch
-
-#
http://bugzilla.gnome.org/show_bug.cgi?id=517191
-Patch22: open-drawer.patch
-
Patch23: sunrise.patch
Conflicts: gnome-power-manager < 2.15.3
@@ -179,14 +155,6 @@ Panel Applets using the libpanel-applet library.
%patch10 -p1 -b .preferred-apps
%patch11 -p1 -b .applet-error
%patch14 -p1 -b .ck-shutdown
-%patch15 -p1 -b .localtime
-%patch16 -p1 -b .pref-dialogs
-%patch17 -p1 -b .set-button
-%patch18 -p1 -b .panel-weather
-%patch19 -p1 -b .async-timezone
-%patch20 -p1 -b .dst-offset
-%patch21 -p1 -b .less-resizing
-%patch22 -p1 -b .open-drawer
%patch23 -p1 -b .sunrise
. %{SOURCE6}
@@ -372,6 +340,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Tue Feb 26 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.92-1
+- Update to 2.21.92
+
* Fri Feb 22 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.91-9
- Report sunrise/sunset times in local time
diff --git a/sources b/sources
index afc5e50..2a7e973 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4b2a79d02110fdb38e1573c13e85ab7a gnome-panel-2.21.91.tar.bz2
+46544232bc0148ff61790f9141a6904b gnome-panel-2.21.92.tar.bz2
commit a6519abcc8818b113f6b217050a4e27f575fb8ab
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Feb 22 18:10:39 2008 +0000
Fix reporting of sunrise/sunset times
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 6eda963..6b23584 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.21.91
-Release: 8%{?dist}
+Release: 9%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.21/%{name}-%{version}.tar...
@@ -132,6 +132,8 @@ Patch21: less-resizing.patch
#
http://bugzilla.gnome.org/show_bug.cgi?id=517191
Patch22: open-drawer.patch
+Patch23: sunrise.patch
+
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -185,6 +187,7 @@ Panel Applets using the libpanel-applet library.
%patch20 -p1 -b .dst-offset
%patch21 -p1 -b .less-resizing
%patch22 -p1 -b .open-drawer
+%patch23 -p1 -b .sunrise
. %{SOURCE6}
@@ -369,6 +372,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Fri Feb 22 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.91-9
+- Report sunrise/sunset times in local time
+
* Thu Feb 21 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.91-8
- Make drawers open again
diff --git a/sunrise.patch b/sunrise.patch
new file mode 100644
index 0000000..4a27c96
--- /dev/null
+++ b/sunrise.patch
@@ -0,0 +1,81 @@
+diff -up gnome-panel-2.21.91/applets/clock/clock-location-tile.c.sunrise
gnome-panel-2.21.91/applets/clock/clock-location-tile.c
+--- gnome-panel-2.21.91/applets/clock/clock-location-tile.c.sunrise 2008-02-22
12:56:42.000000000 -0500
++++ gnome-panel-2.21.91/applets/clock/clock-location-tile.c 2008-02-22 13:08:01.000000000
-0500
+@@ -534,13 +534,14 @@ clock_location_tile_refresh (ClockLocati
+ }
+
+ void
+-weather_info_setup_tooltip (WeatherInfo *info, GtkTooltip *tooltip)
++weather_info_setup_tooltip (WeatherInfo *info, ClockLocation *location, GtkTooltip
*tooltip)
+ {
+ GdkPixbuf *pixbuf = NULL;
+ GtkIconTheme *theme = NULL;
+ const gchar *conditions, *temp, *apparent, *wind;
+ gchar *line1, *line2, *line3, *line4, *tip;
+ const gchar *icon_name;
++ const gchar *sys_timezone;
+
+ icon_name = weather_info_get_icon_name (info);
+ theme = gtk_icon_theme_get_default ();
+@@ -571,9 +572,20 @@ weather_info_setup_tooltip (WeatherInfo
+ else
+ line3 = g_strdup ("");
+
++ /* FIXME: we need libgweather to give us the time,
++ * not just a formatted string
++ */
++ sys_timezone = getenv ("TZ");
++ setenv ("TZ", clock_location_get_timezone (location), 1);
++ tzset ();
+ line4 = g_strdup_printf (_("Sunrise: %s / Sunset: %s"),
+ weather_info_get_sunrise (info),
+ weather_info_get_sunset (info));
++ if (sys_timezone)
++ setenv ("TZ", sys_timezone, 1);
++ else
++ unsetenv ("TZ");
++ tzset ();
+
+ tip = g_strdup_printf ("<b>%s</b>\n%s\n%s%s", line1, line2,
line3, line4);
+ gtk_tooltip_set_markup (tooltip, tip);
+@@ -601,7 +613,7 @@ weather_tooltip (GtkWidget *widget,
+ if (!info || !weather_info_is_valid (info))
+ return FALSE;
+
+- weather_info_setup_tooltip (info, tooltip);
++ weather_info_setup_tooltip (info, priv->location, tooltip);
+
+ return TRUE;
+ }
+diff -up gnome-panel-2.21.91/applets/clock/clock.c.sunrise
gnome-panel-2.21.91/applets/clock/clock.c
+--- gnome-panel-2.21.91/applets/clock/clock.c.sunrise 2008-02-22 12:56:42.000000000
-0500
++++ gnome-panel-2.21.91/applets/clock/clock.c 2008-02-22 12:56:42.000000000 -0500
+@@ -1341,12 +1341,13 @@ weather_tooltip (GtkWidget *widget,
+ locations = cd->locations;
+
+ for (l = locations; l; l = l->next) {
+- if (clock_location_is_current (l->data)) {
+- info = clock_location_get_weather_info (l->data);
++ ClockLocation *location = l->data;
++ if (clock_location_is_current (location)) {
++ info = clock_location_get_weather_info (location);
+ if (!info || !weather_info_is_valid (info))
+ continue;
+
+- weather_info_setup_tooltip (info, tooltip);
++ weather_info_setup_tooltip (info, location, tooltip);
+
+ return TRUE;
+ }
+diff -up gnome-panel-2.21.91/applets/clock/clock-location-tile.h.sunrise
gnome-panel-2.21.91/applets/clock/clock-location-tile.h
+--- gnome-panel-2.21.91/applets/clock/clock-location-tile.h.sunrise 2008-02-22
12:56:42.000000000 -0500
++++ gnome-panel-2.21.91/applets/clock/clock-location-tile.h 2008-02-22 12:56:42.000000000
-0500
+@@ -37,7 +37,7 @@ ClockLocationTile *clock_location_tile_n
+
+ ClockLocation *clock_location_tile_get_location (ClockLocationTile *this);
+
+-void weather_info_setup_tooltip (WeatherInfo *info, GtkTooltip *tip);
++void weather_info_setup_tooltip (WeatherInfo *info, ClockLocation *location, GtkTooltip
*tip);
+
+ void clock_location_tile_refresh (ClockLocationTile *this,
+ gboolean force_refresh);
commit 05f791d6e8e0d3608efe757f41fcdb5db528aec5
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Feb 21 15:12:59 2008 +0000
bump rev
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 1c5cb3c..6eda963 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.21.91
-Release: 7%{?dist}
+Release: 8%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.21/%{name}-%{version}.tar...
commit 90ca258a60bbae99a3a1afd80a93c859491c367b
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Feb 21 15:08:12 2008 +0000
Fix drawers
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 45a7e1c..1c5cb3c 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -129,6 +129,9 @@ Patch20: dst-offset.patch
# reduce resizing of the popup due to set buttons
Patch21: less-resizing.patch
+#
http://bugzilla.gnome.org/show_bug.cgi?id=517191
+Patch22: open-drawer.patch
+
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -181,6 +184,7 @@ Panel Applets using the libpanel-applet library.
%patch19 -p1 -b .async-timezone
%patch20 -p1 -b .dst-offset
%patch21 -p1 -b .less-resizing
+%patch22 -p1 -b .open-drawer
. %{SOURCE6}
@@ -365,6 +369,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Thu Feb 21 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.91-8
+- Make drawers open again
+
* Wed Feb 20 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.91-7
- Make the last patch work
diff --git a/open-drawer.patch b/open-drawer.patch
new file mode 100644
index 0000000..9aaa896
--- /dev/null
+++ b/open-drawer.patch
@@ -0,0 +1,20 @@
+diff -up gnome-panel-2.21.91/gnome-panel/drawer.c.open-drawer
gnome-panel-2.21.91/gnome-panel/drawer.c
+--- gnome-panel-2.21.91/gnome-panel/drawer.c.open-drawer 2008-02-11 16:15:47.000000000
-0500
++++ gnome-panel-2.21.91/gnome-panel/drawer.c 2008-02-21 10:03:03.000000000 -0500
+@@ -34,7 +34,7 @@
+ static void
+ drawer_click (GtkWidget *w, Drawer *drawer)
+ {
+- if (!panel_toplevel_get_is_hidden (drawer->toplevel))
++ if (panel_toplevel_get_state (drawer->toplevel) == PANEL_STATE_NORMAL)
+ panel_toplevel_hide (drawer->toplevel, FALSE, -1);
+ else
+ panel_toplevel_unhide (drawer->toplevel);
+@@ -398,7 +398,6 @@ create_drawer_toplevel (const char *draw
+
+ toplevel = panel_profile_load_toplevel (client, PANEL_CONFIG_DIR,
+ PANEL_GCONF_TOPLEVELS, toplevel_id);
+-
+ if (!toplevel) {
+ g_free (toplevel_id);
+ return NULL;
commit d0a8f84c5aefc0d7ce731aee5c7bed584ee512bb
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Feb 20 17:22:14 2008 +0000
fix the last patch
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 66159e9..45a7e1c 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.21.91
-Release: 6%{?dist}
+Release: 7%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.21/%{name}-%{version}.tar...
@@ -365,6 +365,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Wed Feb 20 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.91-7
+- Make the last patch work
+
* Wed Feb 20 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.91-6
- Try harder to avoid resizing the popup
diff --git a/less-resizing.patch b/less-resizing.patch
index f3f0ceb..1364fb5 100644
--- a/less-resizing.patch
+++ b/less-resizing.patch
@@ -1,6 +1,7 @@
---- gnome-panel-2.21.91/applets/clock/clock.c 2008-02-20 00:06:57.000000000 -0500
-+++ hacked/applets/clock/clock.c 2008-02-19 23:05:48.000000000 -0500
-@@ -1074,6 +1074,7 @@
+diff -up gnome-panel-2.21.91/applets/clock/clock.c.less-resizing
gnome-panel-2.21.91/applets/clock/clock.c
+--- gnome-panel-2.21.91/applets/clock/clock.c.less-resizing 2008-02-20 11:46:30.000000000
-0500
++++ gnome-panel-2.21.91/applets/clock/clock.c 2008-02-20 11:46:30.000000000 -0500
+@@ -1074,6 +1074,7 @@ location_tile_timezone_set_cb (ClockLoca
ClockData *cd = data;
clock_map_refresh (CLOCK_MAP (cd->map_widget));
@@ -8,9 +9,10 @@
}
static void
---- gnome-panel-2.21.91/applets/clock/clock-location-tile.c 2008-02-20 00:06:57.000000000
-0500
-+++ hacked/applets/clock/clock-location-tile.c 2008-02-20 00:03:52.000000000 -0500
-@@ -42,6 +42,8 @@
+diff -up gnome-panel-2.21.91/applets/clock/clock-location-tile.c.less-resizing
gnome-panel-2.21.91/applets/clock/clock-location-tile.c
+--- gnome-panel-2.21.91/applets/clock/clock-location-tile.c.less-resizing 2008-02-20
11:46:30.000000000 -0500
++++ gnome-panel-2.21.91/applets/clock/clock-location-tile.c 2008-02-20 12:03:00.000000000
-0500
+@@ -42,6 +42,8 @@ typedef struct {
GtkWidget *current_button;
GtkWidget *current_label;
GtkWidget *current_marker;
@@ -19,7 +21,7 @@
GtkSizeGroup *button_group;
GtkWidget *weather_icon;
-@@ -157,6 +159,11 @@
+@@ -157,6 +159,11 @@ clock_location_tile_finalize (GObject *g
priv->button_group = NULL;
}
@@ -31,7 +33,7 @@
G_OBJECT_CLASS (clock_location_tile_parent_class)->finalize (g_obj);
}
-@@ -213,25 +220,43 @@
+@@ -213,25 +220,43 @@ enter_or_leave_tile (GtkWidget
if (event->mode != GDK_CROSSING_NORMAL) {
return TRUE;
}
@@ -85,7 +87,7 @@
}
static void
-@@ -241,6 +266,7 @@
+@@ -241,6 +266,7 @@ clock_location_tile_fill (ClockLocationT
GtkWidget *align;
GtkWidget *strut;
GtkWidget *box;
@@ -93,7 +95,7 @@
priv->box = gtk_event_box_new ();
-@@ -278,8 +304,16 @@
+@@ -278,8 +304,16 @@ clock_location_tile_fill (ClockLocationT
gtk_box_pack_start (GTK_BOX (box), align, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (box), priv->time_label, FALSE, FALSE, 0);
@@ -110,7 +112,7 @@
gtk_widget_show (priv->current_label);
gtk_widget_set_no_show_all (priv->current_button, TRUE);
gtk_container_add (GTK_CONTAINER (priv->current_button),
priv->current_label);
-@@ -289,15 +323,25 @@
+@@ -289,15 +323,29 @@ clock_location_tile_fill (ClockLocationT
gtk_misc_set_alignment (GTK_MISC (priv->current_marker), 1.0, 0.5);
gtk_widget_set_no_show_all (priv->current_marker, TRUE);
@@ -133,10 +135,14 @@
+ gtk_size_group_add_widget (priv->current_group, priv->current_marker);
+ gtk_size_group_add_widget (priv->current_group, priv->current_spacer);
+
++ gtk_widget_show (priv->current_button);
++ gtk_widget_show (priv->current_marker);
++ gtk_widget_show (priv->current_spacer);
++
g_signal_connect (priv->current_button, "clicked",
G_CALLBACK (make_current), this);
-@@ -443,11 +487,18 @@
+@@ -443,11 +491,16 @@ clock_location_tile_refresh (ClockLocati
g_return_if_fail (IS_CLOCK_LOCATION_TILE (this));
if (clock_location_is_current (priv->location)) {
@@ -145,11 +151,9 @@
- }
- else {
- gtk_widget_hide (priv->current_marker);
-+ if (!GTK_WIDGET_VISIBLE (priv->current_marker)) {
-+ gtk_widget_hide (priv->current_spacer);
-+ gtk_widget_hide (priv->current_button);
-+ gtk_widget_show (priv->current_marker);
-+ }
++ gtk_widget_hide (priv->current_spacer);
++ gtk_widget_hide (priv->current_button);
++ gtk_widget_show (priv->current_marker);
+ }
+ else {
+ if (GTK_WIDGET_VISIBLE (priv->current_marker)) {
commit 8c4a90120763fd2f41c713d1710ec6a03baba436
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Feb 20 05:12:54 2008 +0000
another clock fix
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 01d419d..66159e9 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.21.91
-Release: 5%{?dist}
+Release: 6%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.21/%{name}-%{version}.tar...
@@ -126,6 +126,9 @@ Patch19: async-timezone.patch
# take daylight savings time into account for offsets
Patch20: dst-offset.patch
+# reduce resizing of the popup due to set buttons
+Patch21: less-resizing.patch
+
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -177,6 +180,7 @@ Panel Applets using the libpanel-applet library.
%patch18 -p1 -b .panel-weather
%patch19 -p1 -b .async-timezone
%patch20 -p1 -b .dst-offset
+%patch21 -p1 -b .less-resizing
. %{SOURCE6}
@@ -361,6 +365,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Wed Feb 20 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.91-6
+- Try harder to avoid resizing the popup
+
* Tue Feb 19 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.91-5
- Take daylight savings time into account when calculating offsets
diff --git a/less-resizing.patch b/less-resizing.patch
new file mode 100644
index 0000000..f3f0ceb
--- /dev/null
+++ b/less-resizing.patch
@@ -0,0 +1,162 @@
+--- gnome-panel-2.21.91/applets/clock/clock.c 2008-02-20 00:06:57.000000000 -0500
++++ hacked/applets/clock/clock.c 2008-02-19 23:05:48.000000000 -0500
+@@ -1074,6 +1074,7 @@
+ ClockData *cd = data;
+
+ clock_map_refresh (CLOCK_MAP (cd->map_widget));
++ update_location_tiles (cd);
+ }
+
+ static void
+--- gnome-panel-2.21.91/applets/clock/clock-location-tile.c 2008-02-20 00:06:57.000000000
-0500
++++ hacked/applets/clock/clock-location-tile.c 2008-02-20 00:03:52.000000000 -0500
+@@ -42,6 +42,8 @@
+ GtkWidget *current_button;
+ GtkWidget *current_label;
+ GtkWidget *current_marker;
++ GtkWidget *current_spacer;
++ GtkSizeGroup *current_group;
+ GtkSizeGroup *button_group;
+
+ GtkWidget *weather_icon;
+@@ -157,6 +159,11 @@
+ priv->button_group = NULL;
+ }
+
++ if (priv->current_group) {
++ g_object_unref (priv->current_group);
++ priv->current_group = NULL;
++ }
++
+ G_OBJECT_CLASS (clock_location_tile_parent_class)->finalize (g_obj);
+ }
+
+@@ -213,25 +220,43 @@
+ if (event->mode != GDK_CROSSING_NORMAL) {
+ return TRUE;
+ }
++
++ if (clock_location_is_current (priv->location)) {
++ gtk_widget_hide (priv->current_button);
++ gtk_widget_hide (priv->current_spacer);
++ gtk_widget_show (priv->current_marker);
++
++ return TRUE;
++ }
++
+ if (event->type == GDK_ENTER_NOTIFY) {
+- gint can_set;
++ gint can_set;
+
+ can_set = can_set_system_timezone ();
+- if (!clock_location_is_current (priv->location) &&
+- can_set != 0) {
++ if (can_set != 0) {
+ gtk_label_set_markup (GTK_LABEL (priv->current_label),
+ can_set == 1 ?
+ _("<small>Set...</small>") :
+- _("<small>Set</small>"));
++ _("<small>Set</small>"));
++ gtk_widget_hide (priv->current_spacer);
++ gtk_widget_hide (priv->current_marker);
+ gtk_widget_show (priv->current_button);
+ }
+- }
+- else {
+- if (event->detail != GDK_NOTIFY_INFERIOR)
+- gtk_widget_hide (priv->current_button);
+- }
++ else {
++ gtk_widget_hide (priv->current_marker);
++ gtk_widget_hide (priv->current_button);
++ gtk_widget_show (priv->current_spacer);
++ }
++ }
++ else {
++ if (event->detail != GDK_NOTIFY_INFERIOR) {
++ gtk_widget_hide (priv->current_button);
++ gtk_widget_hide (priv->current_marker);
++ gtk_widget_show (priv->current_spacer);
++ }
++ }
+
+- return TRUE;
++ return TRUE;
+ }
+
+ static void
+@@ -241,6 +266,7 @@
+ GtkWidget *align;
+ GtkWidget *strut;
+ GtkWidget *box;
++ gint can_set;
+
+ priv->box = gtk_event_box_new ();
+
+@@ -278,8 +304,16 @@
+ gtk_box_pack_start (GTK_BOX (box), align, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), priv->time_label, FALSE, FALSE, 0);
+
++ can_set = can_set_system_timezone ();
++
+ priv->current_button = gtk_button_new ();
+ priv->current_label = gtk_label_new ("");
++ if (can_set != 0) {
++ gtk_label_set_markup (GTK_LABEL (priv->current_label),
++ can_set == 1 ?
++ _("<small>Set...</small>") :
++ _("<small>Set</small>"));
++ }
+ gtk_widget_show (priv->current_label);
+ gtk_widget_set_no_show_all (priv->current_button, TRUE);
+ gtk_container_add (GTK_CONTAINER (priv->current_button),
priv->current_label);
+@@ -289,15 +323,25 @@
+ gtk_misc_set_alignment (GTK_MISC (priv->current_marker), 1.0, 0.5);
+ gtk_widget_set_no_show_all (priv->current_marker, TRUE);
+
++ priv->current_spacer = gtk_event_box_new ();
++ gtk_widget_set_no_show_all (priv->current_spacer, TRUE);
++
+ strut = gtk_event_box_new ();
+ gtk_box_pack_start (GTK_BOX (box), strut, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box), priv->current_button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), priv->current_marker, FALSE, FALSE, 0);
++ gtk_box_pack_start (GTK_BOX (box), priv->current_spacer, FALSE, FALSE, 0);
+ priv->button_group = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL);
+ gtk_size_group_set_ignore_hidden (priv->button_group, FALSE);
+ gtk_size_group_add_widget (priv->button_group, strut);
+ gtk_size_group_add_widget (priv->button_group, priv->current_button);
+
++ priv->current_group = gtk_size_group_new (GTK_SIZE_GROUP_BOTH);
++ gtk_size_group_set_ignore_hidden (priv->current_group, FALSE);
++ gtk_size_group_add_widget (priv->current_group, priv->current_button);
++ gtk_size_group_add_widget (priv->current_group, priv->current_marker);
++ gtk_size_group_add_widget (priv->current_group, priv->current_spacer);
++
+ g_signal_connect (priv->current_button, "clicked",
+ G_CALLBACK (make_current), this);
+
+@@ -443,11 +487,18 @@
+ g_return_if_fail (IS_CLOCK_LOCATION_TILE (this));
+
+ if (clock_location_is_current (priv->location)) {
+- gtk_widget_hide (priv->current_button);
+- gtk_widget_show (priv->current_marker);
+- }
+- else {
+- gtk_widget_hide (priv->current_marker);
++ if (!GTK_WIDGET_VISIBLE (priv->current_marker)) {
++ gtk_widget_hide (priv->current_spacer);
++ gtk_widget_hide (priv->current_button);
++ gtk_widget_show (priv->current_marker);
++ }
++ }
++ else {
++ if (GTK_WIDGET_VISIBLE (priv->current_marker)) {
++ gtk_widget_hide (priv->current_marker);
++ gtk_widget_hide (priv->current_button);
++ gtk_widget_show (priv->current_spacer);
++ }
+ }
+
+ if (clock_needs_face_refresh (this)) {
commit 23e2916e0bbdade6ea0cc80f530f45723576dffd
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Feb 20 03:25:43 2008 +0000
Some more intlclock fixes
diff --git a/dst-offset.patch b/dst-offset.patch
new file mode 100644
index 0000000..c1f1cda
--- /dev/null
+++ b/dst-offset.patch
@@ -0,0 +1,38 @@
+diff -up gnome-panel-2.21.91/applets/clock/clock-location.c.dst-offset
gnome-panel-2.21.91/applets/clock/clock-location.c
+--- gnome-panel-2.21.91/applets/clock/clock-location.c.dst-offset 2008-02-19
22:18:55.000000000 -0500
++++ gnome-panel-2.21.91/applets/clock/clock-location.c 2008-02-19 22:19:03.000000000
-0500
+@@ -645,17 +645,30 @@ glong
+ clock_location_get_offset (ClockLocation *loc)
+ {
+ ClockLocationPrivate *priv = PRIVATE (loc);
+- glong sys_timezone;
++ glong sys_timezone, local_timezone;
+ glong offset;
++ time_t t;
++ struct tm *tm;
+
++ t = time (NULL);
++
+ unsetenv ("TZ");
+- tzset ();
++ tm = localtime (&t);
+ sys_timezone = timezone;
+
++ if (tm->tm_isdst > 0) {
++ sys_timezone -= 3600;
++ }
++
+ setenv ("TZ", priv->timezone, 1);
+- tzset();
++ tm = localtime (&t);
++ local_timezone = timezone;
++
++ if (tm->tm_isdst > 0) {
++ local_timezone -= 3600;
++ }
+
+- offset = timezone - sys_timezone;
++ offset = local_timezone - sys_timezone;
+
+ if (priv->sys_timezone) {
+ setenv ("TZ", priv->sys_timezone, 1);
diff --git a/gnome-panel.spec b/gnome-panel.spec
index bc4e278..01d419d 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.21.91
-Release: 4%{?dist}
+Release: 5%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.21/%{name}-%{version}.tar...
@@ -108,21 +108,24 @@ Patch11: applet-error.patch
Patch14: gnome-panel-2.21.5-ck-shutdown.patch
-# fix display of times in location tiles in the clock
+# fix display of times in location tiles in the clock; fixed upstream
Patch15: localtime.patch
-# fix some focus issues with preference dialogs
+# fix some focus issues with preference dialogs; fixed upstream
Patch16: pref-dialogs.patch
-# make set buttons on location tiles work
+# make set buttons on location tiles work; fixed upstream
Patch17: set-button.patch
-# fix display of weather in the panel button
+# fix display of weather in the panel button; fixed upstream
Patch18: panel-weather.patch
-# make timezone setting asynchronous
+# make timezone setting asynchronous; fixed upstream
Patch19: async-timezone.patch
+# take daylight savings time into account for offsets
+Patch20: dst-offset.patch
+
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -173,6 +176,7 @@ Panel Applets using the libpanel-applet library.
%patch17 -p1 -b .set-button
%patch18 -p1 -b .panel-weather
%patch19 -p1 -b .async-timezone
+%patch20 -p1 -b .dst-offset
. %{SOURCE6}
@@ -357,6 +361,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Tue Feb 19 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.91-5
+- Take daylight savings time into account when calculating offsets
+
* Mon Feb 18 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.91-4
- Another round of intlclock fixes
commit b67bf81901f12fa6bf1149493d24a3272bb71758
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Feb 18 06:15:13 2008 +0000
more intlclock fixes
diff --git a/async-timezone.patch b/async-timezone.patch
new file mode 100644
index 0000000..7a3ce7c
--- /dev/null
+++ b/async-timezone.patch
@@ -0,0 +1,368 @@
+--- gnome-panel-2.21.91/applets/clock/set-timezone.c 2008-02-11 16:15:51.000000000 -0500
++++ hacked/applets/clock/set-timezone.c 2008-02-18 00:49:27.000000000 -0500
+@@ -91,108 +91,6 @@
+ return pk_context;
+ }
+
+-gboolean
+-set_system_timezone (const char *filename, GError **err)
+-{
+- DBusGConnection *session_bus;
+- DBusGConnection *system_bus;
+- DBusGProxy *mechanism_proxy;
+- DBusGProxy *polkit_gnome_proxy;
+- gboolean ret = FALSE;
+-
+- session_bus = get_session_bus ();
+- if (session_bus == NULL)
+- goto out;
+-
+- system_bus = get_system_bus ();
+- if (system_bus == NULL)
+- goto out;
+-
+- mechanism_proxy = dbus_g_proxy_new_for_name (system_bus,
+-
"org.gnome.ClockApplet.Mechanism",
+- "/",
+-
"org.gnome.ClockApplet.Mechanism");
+-
+- polkit_gnome_proxy = dbus_g_proxy_new_for_name (session_bus,
+-
"org.gnome.PolicyKit",
+-
"/org/gnome/PolicyKit/Manager",
+-
"org.gnome.PolicyKit.Manager");
+-
+- if (filename != NULL) {
+- GError *error;
+-
+- g_debug ("Trying to set timezone '%s'", filename);
+- try_again:
+- error = NULL;
+- /* first, try to call into the mechanism */
+- if (!dbus_g_proxy_call_with_timeout (mechanism_proxy,
+- "SetTimezone",
+- INT_MAX,
+- &error,
+- /* parameters: */
+- G_TYPE_STRING, filename,
+- G_TYPE_INVALID,
+- /* return values: */
+- G_TYPE_INVALID)) {
+- if (dbus_g_error_has_name (error,
"org.gnome.ClockApplet.Mechanism.NotPrivileged")) {
+- char **tokens;
+- char *polkit_result_textual;
+- char *polkit_action;
+- gboolean gained_privilege;
+-
+- tokens = g_strsplit (error->message, " ",
2);
+- g_error_free (error);
+- if (g_strv_length (tokens) != 2) {
+- g_warning ("helper return string
malformed");
+- g_strfreev (tokens);
+- goto out;
+- }
+- polkit_action = tokens[0];
+- polkit_result_textual = tokens[1];
+-
+- g_debug ("helper refused; returned
polkit_result='%s' and polkit_action='%s'",
+- polkit_result_textual, polkit_action);
+-
+- /* Now ask the user for auth... */
+- if (!dbus_g_proxy_call_with_timeout
(polkit_gnome_proxy,
+-
"ShowDialog",
+- INT_MAX,
+- &error,
+- /* parameters: */
+- G_TYPE_STRING,
polkit_action,
+- G_TYPE_UINT, 0, /*
X11 window ID; none */
+- G_TYPE_INVALID,
+- /* return values:
*/
+- G_TYPE_BOOLEAN,
&gained_privilege,
+- G_TYPE_INVALID)) {
+- g_propagate_error (err, error);
+- g_strfreev (tokens);
+- goto out;
+- }
+- g_strfreev (tokens);
+-
+- if (gained_privilege) {
+- g_debug ("Gained privilege; trying to set
timezone again");
+- goto try_again;
+- }
+-
+- } else {
+- g_propagate_error (err, error);
+- }
+- goto out;
+- }
+-
+- g_debug ("Successfully set time zone to '%s'",
filename);
+- }
+-
+- ret = TRUE;
+-out:
+- g_object_unref (mechanism_proxy);
+- g_object_unref (polkit_gnome_proxy);
+-
+- return ret;
+-}
+-
+ static gint
+ can_do (const gchar *pk_action_id)
+ {
+@@ -269,7 +167,9 @@
+
+ typedef struct {
+ gint ref_count;
++ gchar *call;
+ gint64 time;
++ gchar *filename;
+ GFunc callback;
+ gpointer data;
+ GDestroyNotify notify;
+@@ -284,6 +184,7 @@
+ if (data->ref_count == 0) {
+ if (data->notify)
+ data->notify (data->data);
++ g_free (data->filename);
+ g_free (data);
+ }
+ }
+@@ -392,16 +293,28 @@
+ "org.gnome.ClockApplet.Mechanism");
+
+ data->ref_count++;
+- dbus_g_proxy_begin_call_with_timeout (proxy,
+- "SetTime",
+- set_time_notify,
+- data, free_data,
+- INT_MAX,
+- /* parameters: */
+- G_TYPE_INT64, data->time,
+- G_TYPE_INVALID,
+- /* return values: */
+- G_TYPE_INVALID);
++ if (strcmp (data->call, "SetTime") == 0)
++ dbus_g_proxy_begin_call_with_timeout (proxy,
++ "SetTime",
++ set_time_notify,
++ data, free_data,
++ INT_MAX,
++ /* parameters: */
++ G_TYPE_INT64, data->time,
++ G_TYPE_INVALID,
++ /* return values: */
++ G_TYPE_INVALID);
++ else
++ dbus_g_proxy_begin_call_with_timeout (proxy,
++ "SetTimezone",
++ set_time_notify,
++ data, free_data,
++ INT_MAX,
++ /* parameters: */
++ G_TYPE_STRING, data->filename,
++ G_TYPE_INVALID,
++ /* return values: */
++ G_TYPE_INVALID);
+ }
+
+ void
+@@ -417,7 +330,33 @@
+
+ data = g_new (SetTimeCallbackData, 1);
+ data->ref_count = 1;
++ data->call = "SetTime";
+ data->time = time;
++ data->filename = NULL;
++ data->callback = callback;
++ data->data = d;
++ data->notify = notify;
++
++ set_time_async (data);
++ free_data (data);
++}
++
++void
++set_system_timezone_async (const gchar *filename,
++ GFunc callback,
++ gpointer d,
++ GDestroyNotify notify)
++{
++ SetTimeCallbackData *data;
++
++ if (filename == NULL)
++ return;
++
++ data = g_new (SetTimeCallbackData, 1);
++ data->ref_count = 1;
++ data->call = "SetTimezone";
++ data->time = -1;
++ data->filename = g_strdup (filename);
+ data->callback = callback;
+ data->data = d;
+ data->notify = notify;
+--- gnome-panel-2.21.91/applets/clock/set-timezone.h 2008-02-11 16:15:51.000000000 -0500
++++ hacked/applets/clock/set-timezone.h 2008-02-18 00:48:40.000000000 -0500
+@@ -23,8 +23,6 @@
+ #include <glib.h>
+ #include <time.h>
+
+-gboolean set_system_timezone (const char *filename,
+- GError **err);
+ gint can_set_system_timezone (void);
+
+ gint can_set_system_time (void);
+@@ -34,4 +32,9 @@
+ gpointer data,
+ GDestroyNotify notify);
+
++void set_system_timezone_async (const gchar *filename,
++ GFunc callback,
++ gpointer data,
++ GDestroyNotify notify);
++
+ #endif
+--- gnome-panel-2.21.91/applets/clock/clock-location.h 2008-02-11 16:15:51.000000000
-0500
++++ hacked/applets/clock/clock-location.h 2008-02-18 00:11:57.000000000 -0500
+@@ -52,7 +52,10 @@
+ void clock_location_localtime (ClockLocation *loc, struct tm *tm);
+
+ gboolean clock_location_is_current (ClockLocation *loc);
+-gboolean clock_location_make_current (ClockLocation *loc, GError **error);
++void clock_location_make_current (ClockLocation *loc,
++ GFunc callback,
++ gpointer data,
++ GDestroyNotify destroy);
+
+ const gchar *clock_location_get_weather_code (ClockLocation *loc);
+ void clock_location_set_weather_code (ClockLocation *loc, const gchar *code);
+--- gnome-panel-2.21.91/applets/clock/clock-location.c 2008-02-11 16:15:51.000000000
-0500
++++ hacked/applets/clock/clock-location.c 2008-02-18 00:50:53.000000000 -0500
+@@ -667,18 +667,20 @@
+ return offset;
+ }
+
+-gboolean
+-clock_location_make_current (ClockLocation *loc, GError **error)
+-{
+- ClockLocationPrivate *priv = PRIVATE (loc);
+- gchar *filename;
+- gboolean ret;
++typedef struct {
++ ClockLocation *location;
++ GFunc callback;
++ gpointer data;
++ GDestroyNotify destroy;
++} MakeCurrentData;
+
+- filename = g_build_filename (SYSTEM_ZONEINFODIR, priv->timezone, NULL);
+- ret = set_system_timezone (filename, error);
+- g_free (filename);
++static void
++make_current_cb (gpointer data, GError *error)
++{
++ MakeCurrentData *mcdata = data;
++ ClockLocationPrivate *priv = PRIVATE (mcdata->location);
+
+- if (ret) {
++ if (error == NULL) {
+ /* FIXME this ugly shortcut is necessary until we move the
+ * current timezone tracking to clock.c and emit the
+ * signal from there
+@@ -687,7 +689,47 @@
+ current_zone = g_strdup (priv->timezone);
+ }
+
+- return ret;
++ if (mcdata->callback)
++ mcdata->callback (mcdata->data, error);
++ else
++ g_error_free (error);
++}
++
++static void
++free_make_current_data (gpointer data)
++{
++ MakeCurrentData *mcdata = data;
++
++ if (mcdata->destroy)
++ mcdata->destroy (mcdata->data);
++
++ g_object_unref (mcdata->location);
++ g_free (mcdata);
++}
++
++void
++clock_location_make_current (ClockLocation *loc,
++ GFunc callback,
++ gpointer data,
++ GDestroyNotify destroy)
++{
++ ClockLocationPrivate *priv = PRIVATE (loc);
++ gchar *filename;
++ MakeCurrentData *mcdata;
++
++ mcdata = g_new (MakeCurrentData, 1);
++
++ mcdata->location = g_object_ref (loc);
++ mcdata->callback = callback;
++ mcdata->data = data;
++ mcdata->destroy = destroy;
++
++ filename = g_build_filename (SYSTEM_ZONEINFODIR, priv->timezone, NULL);
++ set_system_timezone_async (filename,
++ (GFunc)make_current_cb,
++ mcdata,
++ free_make_current_data);
++ g_free (filename);
+ }
+
+ const gchar *
+--- gnome-panel-2.21.91/applets/clock/clock-location-tile.c 2008-02-18 01:08:29.000000000
-0500
++++ hacked/applets/clock/clock-location-tile.c 2008-02-18 01:10:17.000000000 -0500
+@@ -104,7 +104,7 @@
+ NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
+- signals[TILE_PRESSED] = g_signal_new ("timezone-set",
++ signals[TIMEZONE_SET] = g_signal_new ("timezone-set",
+ G_TYPE_FROM_CLASS (g_obj_class),
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (ClockLocationTileClass, timezone_set),
+@@ -171,16 +171,15 @@
+ }
+
+ static void
+-make_current (GtkWidget *widget, ClockLocationTile *tile)
++make_current_cb (gpointer data, GError *error)
+ {
+- ClockLocationTilePrivate *priv = PRIVATE (tile);
+- GError *error = NULL;
+- GtkWidget *dialog;
++ ClockLocationTile *tile = data;
++ GtkWidget *dialog;
+
+- if (clock_location_make_current (priv->location, &error)) {
++ if (error == NULL) {
+ g_signal_emit (tile, signals[TIMEZONE_SET], 0);
+ }
+- else if (error) {
++ else {
+ dialog = gtk_message_dialog_new (NULL,
+ 0,
+ GTK_MESSAGE_ERROR,
+@@ -195,6 +194,15 @@
+ }
+ }
+
++static void
++make_current (GtkWidget *widget, ClockLocationTile *tile)
++{
++ ClockLocationTilePrivate *priv = PRIVATE (tile);
++
++ clock_location_make_current (priv->location,
++ (GFunc)make_current_cb, tile, NULL);
++}
++
+ static gboolean
+ enter_or_leave_tile (GtkWidget *widget,
+ GdkEventCrossing *event,
diff --git a/gnome-panel.spec b/gnome-panel.spec
index c744c23..bc4e278 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -120,6 +120,9 @@ Patch17: set-button.patch
# fix display of weather in the panel button
Patch18: panel-weather.patch
+# make timezone setting asynchronous
+Patch19: async-timezone.patch
+
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -169,6 +172,7 @@ Panel Applets using the libpanel-applet library.
%patch16 -p1 -b .pref-dialogs
%patch17 -p1 -b .set-button
%patch18 -p1 -b .panel-weather
+%patch19 -p1 -b .async-timezone
. %{SOURCE6}
diff --git a/panel-weather.patch b/panel-weather.patch
new file mode 100644
index 0000000..97cc508
--- /dev/null
+++ b/panel-weather.patch
@@ -0,0 +1,271 @@
+diff -up gnome-panel-2.21.91/applets/clock/clock.c.panel-weather
gnome-panel-2.21.91/applets/clock/clock.c
+--- gnome-panel-2.21.91/applets/clock/clock.c.panel-weather 2008-02-17 21:54:50.000000000
-0500
++++ gnome-panel-2.21.91/applets/clock/clock.c 2008-02-17 22:06:23.000000000 -0500
+@@ -211,6 +211,7 @@ struct _ClockData {
+
+ static void update_clock (ClockData * cd);
+ static void update_tooltip (ClockData * cd);
++static void update_panel_weather (ClockData *cd);
+ static int clock_timeout_callback (gpointer data);
+ static float get_itime (time_t current_time);
+
+@@ -1131,8 +1132,6 @@ create_cities_section (ClockData *cd)
+ G_CALLBACK (location_tile_pressed_cb), cd);
+ g_signal_connect (city, "timezone-set",
+ G_CALLBACK (location_tile_timezone_set_cb), cd);
+- g_signal_connect (city, "weather-updated",
+- G_CALLBACK (location_tile_weather_updated_cb), cd);
+ g_signal_connect (city, "need-clock-format",
+ G_CALLBACK (location_tile_need_clock_format_cb), cd);
+
+@@ -1299,7 +1298,6 @@ create_main_clock_button (void)
+ GtkWidget *button;
+
+ button = gtk_toggle_button_new ();
+- gtk_container_set_resize_mode (GTK_CONTAINER (button), GTK_RESIZE_IMMEDIATE);
+ gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
+
+ force_no_focus_padding (button);
+@@ -1408,6 +1406,8 @@ create_clock_widget (ClockData *cd)
+ cd->orient = -1;
+ cd->size = panel_applet_get_size (PANEL_APPLET (cd->applet));
+
++ update_panel_weather (cd);
++
+ /* Refresh the clock so that it paints its first state */
+ refresh_clock_timeout (cd);
+ applet_change_orient (PANEL_APPLET (cd->applet),
+@@ -1974,9 +1974,6 @@ show_date_changed (GConfClient *client,
+ static void
+ update_panel_weather (ClockData *cd)
+ {
+- GtkWidget *weatherbox;
+-
+- weatherbox = gtk_widget_get_parent (cd->panel_weather_icon);
+ if (cd->show_weather)
+ gtk_widget_show (cd->panel_weather_icon);
+ else
+@@ -1988,9 +1985,11 @@ update_panel_weather (ClockData *cd)
+ gtk_widget_hide (cd->panel_temperature_label);
+
+ if (cd->show_weather || cd->show_temperature)
+- gtk_widget_show (weatherbox);
++ gtk_widget_show (cd->weather_obox);
+ else
+- gtk_widget_hide (weatherbox);
++ gtk_widget_hide (cd->weather_obox);
++
++ gtk_widget_queue_resize (cd->applet);
+ }
+
+ static void
+@@ -2036,17 +2035,64 @@ show_temperature_changed (GConfClient *
+ }
+
+ static void
+-set_locations (ClockData *cd, GList *locations)
++location_weather_updated_cb (ClockLocation *location,
++ WeatherInfo *info,
++ gpointer data)
+ {
+- free_locations (cd);
++ ClockData *cd = data;
++ const gchar *icon_name;
++ const gchar *temp;
++ GtkIconTheme *theme;
++ GdkPixbuf *pixbuf;
+
+- cd->locations = locations;
++ if (!info || !weather_info_is_valid (info))
++ return;
+
+- if (cd->map_widget)
+- clock_map_refresh (CLOCK_MAP (cd->map_widget));
++ if (!clock_location_is_current (location))
++ return;
++
++ icon_name = weather_info_get_icon_name (info);
++ theme = gtk_icon_theme_get_default ();
++ pixbuf = gtk_icon_theme_load_icon (theme, icon_name, 16, 0, NULL);
++
++ temp = weather_info_get_temp_summary (info);
++
++ gtk_image_set_from_pixbuf (GTK_IMAGE (cd->panel_weather_icon), pixbuf);
++ gtk_label_set_text (GTK_LABEL (cd->panel_temperature_label), temp);
++}
++
++static void
++locations_changed (ClockData *cd)
++{
++ GList *l;
++ ClockLocation *loc;
++ glong id;
++
++ for (l = cd->locations; l; l = l->next) {
++ loc = l->data;
++
++ id = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (loc),
"weather-updated"));
++ if (id == 0) {
++ id = g_signal_connect (loc, "weather-updated",
++ G_CALLBACK (location_weather_updated_cb), cd);
++ g_object_set_data (G_OBJECT (loc), "weather-updated", GINT_TO_POINTER
(id));
++ }
++ }
++
++ if (cd->map_widget)
++ clock_map_refresh (CLOCK_MAP (cd->map_widget));
+
+ if (cd->clock_vbox)
+- create_cities_section (cd);
++ create_cities_section (cd);
++}
++
++
++static void
++set_locations (ClockData *cd, GList *locations)
++{
++ free_locations (cd);
++ cd->locations = locations;
++ locations_changed (cd);
+ }
+
+ typedef struct {
+@@ -2948,7 +2994,6 @@ run_prefs_edit_save (GtkButton *button,
+ clock_location_set_coords (loc, lat, lon);
+ clock_location_set_weather_code (loc, weather_code);
+ } else {
+- GList *locs;
+ WeatherPrefs prefs;
+
+ prefs.temperature_unit = cd->temperature_unit;
+@@ -2956,9 +3001,8 @@ run_prefs_edit_save (GtkButton *button,
+
+ loc = clock_location_new (name, clock_zoneinfo_get_name (info), lat,
lon, weather_code, &prefs);
+
+- locs = g_list_copy (cd->locations);
+- locs = g_list_append (locs, loc);
+- set_locations (cd, locs);
++ cd->locations = g_list_append (cd->locations, loc);
++ locations_changed (cd);
+ }
+
+ save_cities_store (cd);
+@@ -3522,14 +3566,13 @@ remove_tree_row (GtkTreeModel *model, Gt
+ {
+ ClockData *cd = data;
+ ClockLocation *loc = NULL;
+- GList *list = g_list_copy (cd->locations);
+
+ gtk_tree_model_get (model, iter, COL_CITY_LOC, &loc, -1);
+
+- list = g_list_remove (list, loc);
+-
+ gtk_list_store_remove (cd->cities_store, iter);
+- set_locations (cd, list);
++ cd->locations = g_list_remove (cd->locations, loc);
++ locations_changed (cd);
++ g_object_unref (loc);
+
+ save_cities_store (cd);
+ }
+diff -up gnome-panel-2.21.91/applets/clock/clock-location-tile.c.panel-weather
gnome-panel-2.21.91/applets/clock/clock-location-tile.c
+--- gnome-panel-2.21.91/applets/clock/clock-location-tile.c.panel-weather 2008-02-17
21:54:42.000000000 -0500
++++ gnome-panel-2.21.91/applets/clock/clock-location-tile.c 2008-02-17 22:06:39.000000000
-0500
+@@ -20,7 +20,6 @@ G_DEFINE_TYPE (ClockLocationTile, clock_
+ enum {
+ TILE_PRESSED,
+ TIMEZONE_SET,
+- WEATHER_UPDATED,
+ NEED_CLOCK_FORMAT,
+ LAST_SIGNAL
+ };
+@@ -113,17 +112,6 @@ clock_location_tile_class_init (ClockLoc
+ NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
+- signals[WEATHER_UPDATED] = g_signal_new ("weather-updated",
+- G_TYPE_FROM_CLASS (g_obj_class),
+- G_SIGNAL_RUN_FIRST,
+- G_STRUCT_OFFSET (ClockLocationTileClass, weather_updated),
+- NULL,
+- NULL,
+- _clock_marshal_VOID__OBJECT_STRING,
+- G_TYPE_NONE, 2,
+- G_TYPE_OBJECT,
+- G_TYPE_STRING);
+-
+ signals[NEED_CLOCK_FORMAT] = g_signal_new ("need-clock-format",
+ G_TYPE_FROM_CLASS (g_obj_class),
+ G_SIGNAL_RUN_LAST,
+@@ -377,12 +365,6 @@ copy_tm (struct tm *from, struct tm *to)
+ to->tm_yday = from->tm_yday;
+ }
+
+-static void
+-emit_weather_updated (ClockLocationTile *this, GdkPixbuf *weather_icon, const char
*temperature)
+-{
+- g_signal_emit (this, signals[WEATHER_UPDATED], 0, weather_icon, temperature);
+-}
+-
+ static char *
+ format_time (struct tm *now,
+ char *tzname,
+@@ -447,23 +429,12 @@ clock_location_tile_refresh (ClockLocati
+ ClockLocationTilePrivate *priv = PRIVATE (this);
+ gchar *tmp, *tzname;
+ struct tm now;
+- long offset, hours, minutes;
++ long offset;
+ int format;
+
+ g_return_if_fail (IS_CLOCK_LOCATION_TILE (this));
+
+ if (clock_location_is_current (priv->location)) {
+- if (!GTK_WIDGET_VISIBLE (priv->current_marker)) {
+- GdkPixbuf *pixbuf;
+- const gchar *temp = NULL;
+-
+- pixbuf = gtk_image_get_pixbuf (GTK_IMAGE (priv->weather_icon));
+- if (clock_location_get_weather_info (priv->location))
+- temp = weather_info_get_temp_summary
(clock_location_get_weather_info (priv->location));
+-
+- emit_weather_updated (this, pixbuf, temp);
+- }
+-
+ gtk_widget_hide (priv->current_button);
+ gtk_widget_show (priv->current_marker);
+ }
+@@ -582,7 +553,6 @@ update_weather_icon (ClockLocation *loc,
+ GdkPixbuf *pixbuf = NULL;
+ GtkIconTheme *theme = NULL;
+ const gchar *icon_name;
+- const gchar *temp = NULL;
+
+ if (!info || !weather_info_is_valid (info))
+ return;
+@@ -591,14 +561,9 @@ update_weather_icon (ClockLocation *loc,
+ theme = gtk_icon_theme_get_default ();
+ pixbuf = gtk_icon_theme_load_icon (theme, icon_name, 16, 0, NULL);
+
+- temp = weather_info_get_temp_summary (info);
+-
+ if (pixbuf) {
+ gtk_image_set_from_pixbuf (GTK_IMAGE (priv->weather_icon), pixbuf);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (gtk_widget_get_parent
(priv->weather_icon)), 0, 0, 0, 6);
+- if (clock_location_is_current (loc)) {
+- emit_weather_updated (tile, pixbuf, temp);
+- }
+ }
+ }
+
+diff -up gnome-panel-2.21.91/applets/clock/clock-location-tile.h.panel-weather
gnome-panel-2.21.91/applets/clock/clock-location-tile.h
+--- gnome-panel-2.21.91/applets/clock/clock-location-tile.h.panel-weather 2008-02-17
21:54:33.000000000 -0500
++++ gnome-panel-2.21.91/applets/clock/clock-location-tile.h 2008-02-17 21:54:59.000000000
-0500
+@@ -27,7 +27,6 @@ typedef struct
+
+ void (* tile_pressed) (ClockLocationTile *tile);
+ void (* timezone_set) (ClockLocationTile *tile);
+- void (* weather_updated) (ClockLocationTile *tile, GdkPixbuf *weather_icon, const char
*temperature);
+ int (* need_clock_format) (ClockLocationTile *tile);
+ } ClockLocationTileClass;
+
commit a12f50864f61e496de42a92fe098e3d8cc85d396
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Feb 18 05:46:37 2008 +0000
more intlclock fixes
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 8e51452..c744c23 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.21.91
-Release: 3%{?dist}
+Release: 4%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.21/%{name}-%{version}.tar...
@@ -117,6 +117,9 @@ Patch16: pref-dialogs.patch
# make set buttons on location tiles work
Patch17: set-button.patch
+# fix display of weather in the panel button
+Patch18: panel-weather.patch
+
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -165,6 +168,7 @@ Panel Applets using the libpanel-applet library.
%patch15 -p1 -b .localtime
%patch16 -p1 -b .pref-dialogs
%patch17 -p1 -b .set-button
+%patch18 -p1 -b .panel-weather
. %{SOURCE6}
@@ -349,6 +353,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Mon Feb 18 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.91-4
+- Another round of intlclock fixes
+
* Sun Feb 17 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.91-3
- First round of intlclock fixes
commit 374723950b54a370553c88a5f3644888973a7fc5
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Feb 18 00:29:34 2008 +0000
try again
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 77cd75f..8e51452 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -163,8 +163,8 @@ Panel Applets using the libpanel-applet library.
%patch11 -p1 -b .applet-error
%patch14 -p1 -b .ck-shutdown
%patch15 -p1 -b .localtime
-#%patch16 -p1 -b .pref-dialogs
-#%patch17 -p1 -b .set-button
+%patch16 -p1 -b .pref-dialogs
+%patch17 -p1 -b .set-button
. %{SOURCE6}
diff --git a/localtime.patch b/localtime.patch
index 9b1a938..72ca62a 100644
--- a/localtime.patch
+++ b/localtime.patch
@@ -1,17 +1,16 @@
diff -up gnome-panel-2.21.91/applets/clock/clock-location-tile.h.localtime
gnome-panel-2.21.91/applets/clock/clock-location-tile.h
--- gnome-panel-2.21.91/applets/clock/clock-location-tile.h.localtime 2008-02-11
16:15:51.000000000 -0500
-+++ gnome-panel-2.21.91/applets/clock/clock-location-tile.h 2008-02-17 18:50:25.000000000
-0500
-@@ -28,7 +28,8 @@ typedef struct
++++ gnome-panel-2.21.91/applets/clock/clock-location-tile.h 2008-02-17 19:26:15.000000000
-0500
+@@ -28,7 +28,7 @@ typedef struct
void (* tile_pressed) (ClockLocationTile *tile);
void (* timezone_set) (ClockLocationTile *tile);
void (* weather_updated) (ClockLocationTile *tile, GdkPixbuf *weather_icon, const char
*temperature);
- char *(* need_formatted_time) (ClockLocationTile *tile);
-+ char *(* need_formatted_time) (ClockLocationTile *tile);
+ int (* need_clock_format) (ClockLocationTile *tile);
} ClockLocationTileClass;
GType clock_location_tile_get_type (void);
-@@ -40,7 +41,8 @@ ClockLocation *clock_location_tile_get_l
+@@ -40,7 +40,8 @@ ClockLocation *clock_location_tile_get_l
void weather_info_setup_tooltip (WeatherInfo *info, GtkTooltip *tip);
@@ -23,7 +22,7 @@ diff -up
gnome-panel-2.21.91/applets/clock/clock-location-tile.h.localtime gnome
#endif /* __CLOCK_H__ */
diff -up gnome-panel-2.21.91/applets/clock/clock.c.localtime
gnome-panel-2.21.91/applets/clock/clock.c
--- gnome-panel-2.21.91/applets/clock/clock.c.localtime 2008-02-11 16:15:51.000000000
-0500
-+++ gnome-panel-2.21.91/applets/clock/clock.c 2008-02-17 18:50:25.000000000 -0500
++++ gnome-panel-2.21.91/applets/clock/clock.c 2008-02-17 19:25:23.000000000 -0500
@@ -508,7 +508,7 @@ update_location_tiles (ClockData *cd)
ClockLocationTile *tile;
@@ -64,7 +63,7 @@ diff -up gnome-panel-2.21.91/applets/clock/clock.c.localtime
gnome-panel-2.21.91
GTK_WIDGET (city),
diff -up gnome-panel-2.21.91/applets/clock/clock-location-tile.c.localtime
gnome-panel-2.21.91/applets/clock/clock-location-tile.c
--- gnome-panel-2.21.91/applets/clock/clock-location-tile.c.localtime 2008-02-11
16:15:51.000000000 -0500
-+++ gnome-panel-2.21.91/applets/clock/clock-location-tile.c 2008-02-17 18:57:08.000000000
-0500
++++ gnome-panel-2.21.91/applets/clock/clock-location-tile.c 2008-02-17 19:26:03.000000000
-0500
@@ -11,6 +11,7 @@
#include "clock-face.h"
#include "clock-location-tile.h"
@@ -73,18 +72,27 @@ diff -up
gnome-panel-2.21.91/applets/clock/clock-location-tile.c.localtime gnome
#include "clock-marshallers.h"
#include "set-timezone.h"
-@@ -21,6 +22,7 @@ enum {
+@@ -20,7 +21,7 @@ enum {
+ TILE_PRESSED,
TIMEZONE_SET,
WEATHER_UPDATED,
- NEED_FORMATTED_TIME,
+- NEED_FORMATTED_TIME,
+ NEED_CLOCK_FORMAT,
LAST_SIGNAL
};
-@@ -130,6 +132,15 @@ clock_location_tile_class_init (ClockLoc
- NULL,
- _clock_marshal_STRING__VOID,
- G_TYPE_STRING, 0);
+@@ -122,14 +123,15 @@ clock_location_tile_class_init (ClockLoc
+ G_TYPE_NONE, 2,
+ G_TYPE_OBJECT,
+ G_TYPE_STRING);
+- signals[NEED_FORMATTED_TIME] = g_signal_new ("need-formatted-time",
+- G_TYPE_FROM_CLASS (g_obj_class),
+- G_SIGNAL_RUN_LAST,
+- G_STRUCT_OFFSET (ClockLocationTileClass, need_formatted_time),
+- NULL,
+- NULL,
+- _clock_marshal_STRING__VOID,
+- G_TYPE_STRING, 0);
+
+ signals[NEED_CLOCK_FORMAT] = g_signal_new ("need-clock-format",
+ G_TYPE_FROM_CLASS (g_obj_class),
@@ -97,7 +105,7 @@ diff -up
gnome-panel-2.21.91/applets/clock/clock-location-tile.c.localtime gnome
}
static void
-@@ -310,7 +321,7 @@ clock_location_tile_fill (ClockLocationT
+@@ -310,7 +312,7 @@ clock_location_tile_fill (ClockLocationT
gtk_container_add (GTK_CONTAINER (priv->box), alignment);
gtk_container_add (GTK_CONTAINER (this), priv->box);
@@ -106,7 +114,7 @@ diff -up
gnome-panel-2.21.91/applets/clock/clock-location-tile.c.localtime gnome
}
static gboolean
-@@ -378,13 +389,72 @@ emit_weather_updated (ClockLocationTile
+@@ -378,13 +380,72 @@ emit_weather_updated (ClockLocationTile
g_signal_emit (this, signals[WEATHER_UPDATED], 0, weather_icon, temperature);
}
@@ -181,7 +189,7 @@ diff -up
gnome-panel-2.21.91/applets/clock/clock-location-tile.c.localtime gnome
g_return_if_fail (IS_CLOCK_LOCATION_TILE (this));
-@@ -411,7 +481,7 @@ clock_location_tile_refresh (ClockLocati
+@@ -411,7 +472,7 @@ clock_location_tile_refresh (ClockLocati
clock_face_refresh (CLOCK_FACE (priv->clock_face));
}
@@ -190,7 +198,7 @@ diff -up
gnome-panel-2.21.91/applets/clock/clock-location-tile.c.localtime gnome
return;
}
-@@ -426,26 +496,15 @@ clock_location_tile_refresh (ClockLocati
+@@ -426,26 +487,15 @@ clock_location_tile_refresh (ClockLocati
gtk_label_set_markup (GTK_LABEL (priv->city_label), tmp);
g_free (tmp);
@@ -221,8 +229,8 @@ diff -up
gnome-panel-2.21.91/applets/clock/clock-location-tile.c.localtime gnome
void
diff -up gnome-panel-2.21.91/applets/clock/clock-marshallers.list.localtime
gnome-panel-2.21.91/applets/clock/clock-marshallers.list
---- gnome-panel-2.21.91/applets/clock/clock-marshallers.list.localtime 2008-02-17
18:51:58.000000000 -0500
-+++ gnome-panel-2.21.91/applets/clock/clock-marshallers.list 2008-02-17
18:51:26.000000000 -0500
+--- gnome-panel-2.21.91/applets/clock/clock-marshallers.list.localtime 2008-02-11
16:15:51.000000000 -0500
++++ gnome-panel-2.21.91/applets/clock/clock-marshallers.list 2008-02-17
19:25:23.000000000 -0500
@@ -3,4 +3,4 @@ VOID:OBJECT
VOID:POINTER
POINTER:VOID
commit 943c57b7529eb0201479fbfe0f83902be05b3042
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sun Feb 17 23:57:28 2008 +0000
fix patch
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 8e51452..77cd75f 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -163,8 +163,8 @@ Panel Applets using the libpanel-applet library.
%patch11 -p1 -b .applet-error
%patch14 -p1 -b .ck-shutdown
%patch15 -p1 -b .localtime
-%patch16 -p1 -b .pref-dialogs
-%patch17 -p1 -b .set-button
+#%patch16 -p1 -b .pref-dialogs
+#%patch17 -p1 -b .set-button
. %{SOURCE6}
diff --git a/localtime.patch b/localtime.patch
index e3da6ed..9b1a938 100644
--- a/localtime.patch
+++ b/localtime.patch
@@ -1,6 +1,30 @@
---- gnome-panel-2.21.91/applets/clock/clock.c 2008-02-11 16:15:51.000000000 -0500
-+++ hacked/applets/clock/clock.c 2008-02-16 01:23:14.000000000 -0500
-@@ -508,7 +508,7 @@
+diff -up gnome-panel-2.21.91/applets/clock/clock-location-tile.h.localtime
gnome-panel-2.21.91/applets/clock/clock-location-tile.h
+--- gnome-panel-2.21.91/applets/clock/clock-location-tile.h.localtime 2008-02-11
16:15:51.000000000 -0500
++++ gnome-panel-2.21.91/applets/clock/clock-location-tile.h 2008-02-17 18:50:25.000000000
-0500
+@@ -28,7 +28,8 @@ typedef struct
+ void (* tile_pressed) (ClockLocationTile *tile);
+ void (* timezone_set) (ClockLocationTile *tile);
+ void (* weather_updated) (ClockLocationTile *tile, GdkPixbuf *weather_icon, const char
*temperature);
+- char *(* need_formatted_time) (ClockLocationTile *tile);
++ char *(* need_formatted_time) (ClockLocationTile *tile);
++ int (* need_clock_format) (ClockLocationTile *tile);
+ } ClockLocationTileClass;
+
+ GType clock_location_tile_get_type (void);
+@@ -40,7 +41,8 @@ ClockLocation *clock_location_tile_get_l
+
+ void weather_info_setup_tooltip (WeatherInfo *info, GtkTooltip *tip);
+
+-void clock_location_tile_refresh (ClockLocationTile *this);
++void clock_location_tile_refresh (ClockLocationTile *this,
++ gboolean force_refresh);
+
+ G_END_DECLS
+ #endif /* __CLOCK_H__ */
+diff -up gnome-panel-2.21.91/applets/clock/clock.c.localtime
gnome-panel-2.21.91/applets/clock/clock.c
+--- gnome-panel-2.21.91/applets/clock/clock.c.localtime 2008-02-11 16:15:51.000000000
-0500
++++ gnome-panel-2.21.91/applets/clock/clock.c 2008-02-17 18:50:25.000000000 -0500
+@@ -508,7 +508,7 @@ update_location_tiles (ClockData *cd)
ClockLocationTile *tile;
tile = CLOCK_LOCATION_TILE (l->data);
@@ -9,7 +33,7 @@
}
}
-@@ -1084,12 +1084,12 @@
+@@ -1084,12 +1084,12 @@ location_tile_weather_updated_cb (ClockL
gtk_label_set_text (GTK_LABEL (cd->panel_temperature_label), temperature);
}
@@ -25,7 +49,7 @@
}
static void
-@@ -1133,8 +1133,10 @@
+@@ -1133,8 +1133,10 @@ create_cities_section (ClockData *cd)
G_CALLBACK (location_tile_timezone_set_cb), cd);
g_signal_connect (city, "weather-updated",
G_CALLBACK (location_tile_weather_updated_cb), cd);
@@ -38,30 +62,9 @@
gtk_box_pack_start (GTK_BOX (cd->cities_section),
GTK_WIDGET (city),
---- gnome-panel-2.21.91/applets/clock/clock-location-tile.h 2008-02-11 16:15:51.000000000
-0500
-+++ hacked/applets/clock/clock-location-tile.h 2008-02-16 23:42:35.000000000 -0500
-@@ -28,7 +28,8 @@
- void (* tile_pressed) (ClockLocationTile *tile);
- void (* timezone_set) (ClockLocationTile *tile);
- void (* weather_updated) (ClockLocationTile *tile, GdkPixbuf *weather_icon, const char
*temperature);
-- char *(* need_formatted_time) (ClockLocationTile *tile);
-+ char *(* need_formatted_time) (ClockLocationTile *tile);
-+ int (* need_clock_format) (ClockLocationTile *tile);
- } ClockLocationTileClass;
-
- GType clock_location_tile_get_type (void);
-@@ -40,7 +41,8 @@
-
- void weather_info_setup_tooltip (WeatherInfo *info, GtkTooltip *tip);
-
--void clock_location_tile_refresh (ClockLocationTile *this);
-+void clock_location_tile_refresh (ClockLocationTile *this,
-+ gboolean force_refresh);
-
- G_END_DECLS
- #endif /* __CLOCK_H__ */
---- gnome-panel-2.21.91/applets/clock/clock-location-tile.c 2008-02-11 16:15:51.000000000
-0500
-+++ hacked/applets/clock/clock-location-tile.c 2008-02-16 01:24:40.000000000 -0500
+diff -up gnome-panel-2.21.91/applets/clock/clock-location-tile.c.localtime
gnome-panel-2.21.91/applets/clock/clock-location-tile.c
+--- gnome-panel-2.21.91/applets/clock/clock-location-tile.c.localtime 2008-02-11
16:15:51.000000000 -0500
++++ gnome-panel-2.21.91/applets/clock/clock-location-tile.c 2008-02-17 18:57:08.000000000
-0500
@@ -11,6 +11,7 @@
#include "clock-face.h"
#include "clock-location-tile.h"
@@ -70,7 +73,7 @@
#include "clock-marshallers.h"
#include "set-timezone.h"
-@@ -21,6 +22,7 @@
+@@ -21,6 +22,7 @@ enum {
TIMEZONE_SET,
WEATHER_UPDATED,
NEED_FORMATTED_TIME,
@@ -78,7 +81,7 @@
LAST_SIGNAL
};
-@@ -130,6 +132,15 @@
+@@ -130,6 +132,15 @@ clock_location_tile_class_init (ClockLoc
NULL,
_clock_marshal_STRING__VOID,
G_TYPE_STRING, 0);
@@ -94,7 +97,7 @@
}
static void
-@@ -310,7 +321,7 @@
+@@ -310,7 +321,7 @@ clock_location_tile_fill (ClockLocationT
gtk_container_add (GTK_CONTAINER (priv->box), alignment);
gtk_container_add (GTK_CONTAINER (this), priv->box);
@@ -103,7 +106,7 @@
}
static gboolean
-@@ -378,13 +389,72 @@
+@@ -378,13 +389,72 @@ emit_weather_updated (ClockLocationTile
g_signal_emit (this, signals[WEATHER_UPDATED], 0, weather_icon, temperature);
}
@@ -149,10 +152,10 @@
+ minutes = labs (offset % 3600) / 60;
+
+ if (hours != 0 && minutes != 0) {
-+ tmp = g_strdup_printf ("%s <small>%s %+d:%d</small>", buf,
tzname, hours, minutes);
++ tmp = g_strdup_printf ("%s <small>%s %+ld:%ld</small>", buf,
tzname, hours, minutes);
+ }
+ else if (hours != 0) {
-+ tmp = g_strdup_printf ("%s <small>%s %+d</small>", buf, tzname,
hours);
++ tmp = g_strdup_printf ("%s <small>%s %+ld</small>", buf, tzname,
hours);
+ }
+ else {
+ tmp = g_strdup_printf ("%s <small>%s</small>", buf, tzname);
@@ -178,7 +181,7 @@
g_return_if_fail (IS_CLOCK_LOCATION_TILE (this));
-@@ -411,7 +481,7 @@
+@@ -411,7 +481,7 @@ clock_location_tile_refresh (ClockLocati
clock_face_refresh (CLOCK_FACE (priv->clock_face));
}
@@ -187,7 +190,7 @@
return;
}
-@@ -426,26 +496,15 @@
+@@ -426,26 +496,15 @@ clock_location_tile_refresh (ClockLocati
gtk_label_set_markup (GTK_LABEL (priv->city_label), tmp);
g_free (tmp);
@@ -217,3 +220,12 @@
}
void
+diff -up gnome-panel-2.21.91/applets/clock/clock-marshallers.list.localtime
gnome-panel-2.21.91/applets/clock/clock-marshallers.list
+--- gnome-panel-2.21.91/applets/clock/clock-marshallers.list.localtime 2008-02-17
18:51:58.000000000 -0500
++++ gnome-panel-2.21.91/applets/clock/clock-marshallers.list 2008-02-17
18:51:26.000000000 -0500
+@@ -3,4 +3,4 @@ VOID:OBJECT
+ VOID:POINTER
+ POINTER:VOID
+ VOID:OBJECT,STRING
+-STRING:VOID
++INT:VOID
commit 498bc6b5fb02c5ddb1e6653adcdaac2aa8be89bb
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sun Feb 17 20:56:40 2008 +0000
first round of intlclock fixes
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 5f9eee5..8e51452 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.21.91
-Release: 2%{?dist}
+Release: 3%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.21/%{name}-%{version}.tar...
@@ -108,6 +108,15 @@ Patch11: applet-error.patch
Patch14: gnome-panel-2.21.5-ck-shutdown.patch
+# fix display of times in location tiles in the clock
+Patch15: localtime.patch
+
+# fix some focus issues with preference dialogs
+Patch16: pref-dialogs.patch
+
+# make set buttons on location tiles work
+Patch17: set-button.patch
+
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -153,6 +162,9 @@ Panel Applets using the libpanel-applet library.
%patch10 -p1 -b .preferred-apps
%patch11 -p1 -b .applet-error
%patch14 -p1 -b .ck-shutdown
+%patch15 -p1 -b .localtime
+%patch16 -p1 -b .pref-dialogs
+%patch17 -p1 -b .set-button
. %{SOURCE6}
@@ -337,6 +349,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Sun Feb 17 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.91-3
+- First round of intlclock fixes
+
* Fri Feb 15 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.91-2
- Drop gnome-vfs BR
diff --git a/localtime.patch b/localtime.patch
new file mode 100644
index 0000000..e3da6ed
--- /dev/null
+++ b/localtime.patch
@@ -0,0 +1,219 @@
+--- gnome-panel-2.21.91/applets/clock/clock.c 2008-02-11 16:15:51.000000000 -0500
++++ hacked/applets/clock/clock.c 2008-02-16 01:23:14.000000000 -0500
+@@ -508,7 +508,7 @@
+ ClockLocationTile *tile;
+
+ tile = CLOCK_LOCATION_TILE (l->data);
+- clock_location_tile_refresh (tile);
++ clock_location_tile_refresh (tile, FALSE);
+ }
+ }
+
+@@ -1084,12 +1084,12 @@
+ gtk_label_set_text (GTK_LABEL (cd->panel_temperature_label), temperature);
+ }
+
+-static char *
+-location_tile_need_formatted_time_cb (ClockLocationTile *tile, gpointer data)
++static ClockFormat
++location_tile_need_clock_format_cb(ClockLocationTile *tile, gpointer data)
+ {
+ ClockData *cd = data;
+
+- return format_time (cd);
++ return cd->format;
+ }
+
+ static void
+@@ -1133,8 +1133,10 @@
+ G_CALLBACK (location_tile_timezone_set_cb), cd);
+ g_signal_connect (city, "weather-updated",
+ G_CALLBACK (location_tile_weather_updated_cb), cd);
+- g_signal_connect (city, "need-formatted-time",
+- G_CALLBACK (location_tile_need_formatted_time_cb),
cd);
++ g_signal_connect (city, "need-clock-format",
++ G_CALLBACK (location_tile_need_clock_format_cb), cd);
++
++ clock_location_tile_refresh (city, TRUE);
+
+ gtk_box_pack_start (GTK_BOX (cd->cities_section),
+ GTK_WIDGET (city),
+--- gnome-panel-2.21.91/applets/clock/clock-location-tile.h 2008-02-11 16:15:51.000000000
-0500
++++ hacked/applets/clock/clock-location-tile.h 2008-02-16 23:42:35.000000000 -0500
+@@ -28,7 +28,8 @@
+ void (* tile_pressed) (ClockLocationTile *tile);
+ void (* timezone_set) (ClockLocationTile *tile);
+ void (* weather_updated) (ClockLocationTile *tile, GdkPixbuf *weather_icon, const char
*temperature);
+- char *(* need_formatted_time) (ClockLocationTile *tile);
++ char *(* need_formatted_time) (ClockLocationTile *tile);
++ int (* need_clock_format) (ClockLocationTile *tile);
+ } ClockLocationTileClass;
+
+ GType clock_location_tile_get_type (void);
+@@ -40,7 +41,8 @@
+
+ void weather_info_setup_tooltip (WeatherInfo *info, GtkTooltip *tip);
+
+-void clock_location_tile_refresh (ClockLocationTile *this);
++void clock_location_tile_refresh (ClockLocationTile *this,
++ gboolean force_refresh);
+
+ G_END_DECLS
+ #endif /* __CLOCK_H__ */
+--- gnome-panel-2.21.91/applets/clock/clock-location-tile.c 2008-02-11 16:15:51.000000000
-0500
++++ hacked/applets/clock/clock-location-tile.c 2008-02-16 01:24:40.000000000 -0500
+@@ -11,6 +11,7 @@
+ #include "clock-face.h"
+ #include "clock-location-tile.h"
+ #include "clock-location.h"
++#include "clock-utils.h"
+ #include "clock-marshallers.h"
+ #include "set-timezone.h"
+
+@@ -21,6 +22,7 @@
+ TIMEZONE_SET,
+ WEATHER_UPDATED,
+ NEED_FORMATTED_TIME,
++ NEED_CLOCK_FORMAT,
+ LAST_SIGNAL
+ };
+
+@@ -130,6 +132,15 @@
+ NULL,
+ _clock_marshal_STRING__VOID,
+ G_TYPE_STRING, 0);
++
++ signals[NEED_CLOCK_FORMAT] = g_signal_new ("need-clock-format",
++ G_TYPE_FROM_CLASS (g_obj_class),
++ G_SIGNAL_RUN_LAST,
++ G_STRUCT_OFFSET (ClockLocationTileClass, need_clock_format),
++ NULL,
++ NULL,
++ _clock_marshal_INT__VOID,
++ G_TYPE_INT, 0);
+ }
+
+ static void
+@@ -310,7 +321,7 @@
+ gtk_container_add (GTK_CONTAINER (priv->box), alignment);
+ gtk_container_add (GTK_CONTAINER (this), priv->box);
+
+- clock_location_tile_refresh (this);
++ clock_location_tile_refresh (this, TRUE);
+ }
+
+ static gboolean
+@@ -378,13 +389,72 @@
+ g_signal_emit (this, signals[WEATHER_UPDATED], 0, weather_icon, temperature);
+ }
+
++static char *
++format_time (struct tm *now,
++ char *tzname,
++ ClockFormat clock_format,
++ long offset)
++{
++ char buf[256];
++ char *format;
++ time_t local_t;
++ struct tm local_now;
++ char *utf8;
++ char *tmp;
++ long hours, minutes;
++
++ time (&local_t);
++ localtime_r (&local_t, &local_now);
++
++ if (local_now.tm_wday != now->tm_wday) {
++ if (clock_format == CLOCK_FORMAT_12) {
++ format = _("%l:%M <small>%p (%A)</small>");
++ }
++ else {
++ format = _("%H:%M <small>(%A)</small>");
++ }
++ }
++ else {
++ if (clock_format == CLOCK_FORMAT_12) {
++ format = _("%l:%M <small>%p</small>");
++ }
++ else {
++ format = _("%H:%M");
++ }
++ }
++
++ if (strftime (buf, sizeof (buf), format, now) <= 0) {
++ strcpy (buf, "???");
++ }
++
++ hours = offset / 3600;
++ minutes = labs (offset % 3600) / 60;
++
++ if (hours != 0 && minutes != 0) {
++ tmp = g_strdup_printf ("%s <small>%s %+d:%d</small>", buf,
tzname, hours, minutes);
++ }
++ else if (hours != 0) {
++ tmp = g_strdup_printf ("%s <small>%s %+d</small>", buf, tzname,
hours);
++ }
++ else {
++ tmp = g_strdup_printf ("%s <small>%s</small>", buf, tzname);
++ }
++
++ utf8 = g_locale_to_utf8 (tmp, -1, NULL, NULL, NULL);
++
++ g_free (tmp);
++
++ return utf8;
++}
++
+ void
+-clock_location_tile_refresh (ClockLocationTile *this)
++clock_location_tile_refresh (ClockLocationTile *this, gboolean force_refresh)
+ {
+ ClockLocationTilePrivate *priv = PRIVATE (this);
+- gchar *tmp, *tmp2, *tzname;
++ gchar *tmp, *tzname;
+ struct tm now;
+ long offset, hours, minutes;
++ int format;
+
+ g_return_if_fail (IS_CLOCK_LOCATION_TILE (this));
+
+@@ -411,7 +481,7 @@
+ clock_face_refresh (CLOCK_FACE (priv->clock_face));
+ }
+
+- if (!clock_needs_label_refresh (this)) {
++ if (!force_refresh && !clock_needs_label_refresh (this)) {
+ return;
+ }
+
+@@ -426,26 +496,15 @@
+ gtk_label_set_markup (GTK_LABEL (priv->city_label), tmp);
+ g_free (tmp);
+
+- tmp = NULL;
+- g_signal_emit (this, signals[NEED_FORMATTED_TIME], 0, &tmp);
++ g_signal_emit (this, signals[NEED_CLOCK_FORMAT], 0, &format);
+
+ offset = - priv->last_offset;
+
+- hours = offset / 3600;
+- minutes = labs (offset % 3600) / 60;
++ tmp = format_time (&now, tzname, format, offset);
+
+- if (hours != 0 && minutes != 0)
+- tmp2 = g_strdup_printf ("%s <small>%+ld:%ld</small>", tmp ? tmp
: "", hours, minutes);
+- else if (hours != 0)
+- tmp2 = g_strdup_printf ("%s <small>%+ld</small>", tmp ? tmp :
"", hours);
+- else {
+- tmp2 = tmp;
+- tmp = NULL;
+- }
++ gtk_label_set_markup (GTK_LABEL (priv->time_label), tmp);
+
+- gtk_label_set_markup (GTK_LABEL (priv->time_label), tmp2);
+ g_free (tmp);
+- g_free (tmp2);
+ }
+
+ void
diff --git a/pref-dialogs.patch b/pref-dialogs.patch
new file mode 100644
index 0000000..d7ea7da
--- /dev/null
+++ b/pref-dialogs.patch
@@ -0,0 +1,29 @@
+--- gnome-panel-2.21.91/applets/clock/clock.glade 2008-02-11 16:15:51.000000000 -0500
++++ hacked/applets/clock/clock.glade 2008-02-16 01:43:05.000000000 -0500
+@@ -14,7 +14,7 @@
+ <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_NORMAL</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>
+@@ -484,7 +484,7 @@
+ <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_NORMAL</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>
+@@ -818,7 +818,7 @@
+ <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_NORMAL</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>
diff --git a/set-button.patch b/set-button.patch
new file mode 100644
index 0000000..a5c9635
--- /dev/null
+++ b/set-button.patch
@@ -0,0 +1,13 @@
+diff -up gnome-panel-2.21.91/applets/clock/clock-location-tile.c.set-button
gnome-panel-2.21.91/applets/clock/clock-location-tile.c
+--- gnome-panel-2.21.91/applets/clock/clock-location-tile.c.set-button 2008-02-17
15:52:17.000000000 -0500
++++ gnome-panel-2.21.91/applets/clock/clock-location-tile.c 2008-02-17 15:52:54.000000000
-0500
+@@ -223,6 +223,9 @@ enter_or_leave_tile (GtkWidget
+ {
+ ClockLocationTilePrivate *priv = PRIVATE (tile);
+
++ if (event->mode != GDK_CROSSING_NORMAL) {
++ return TRUE;
++ }
+ if (event->type == GDK_ENTER_NOTIFY) {
+ gint can_set;
+
commit d727311953e94014b902e35f9497ec65efd12424
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Fri Feb 15 14:35:51 2008 +0000
Update BRs
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 3fcebbb..5f9eee5 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.21.91
-Release: 1%{?dist}
+Release: 2%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.21/%{name}-%{version}.tar...
@@ -65,7 +65,6 @@ BuildRequires: libglade2-devel >= %{libglade2_version}
BuildRequires: libgnome-devel >= %{libgnome_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
-BuildRequires: gnome-vfs2-devel >= %{gnome_vfs2_version}
BuildRequires: libwnck-devel >= %{libwnck_version}
BuildRequires: GConf2-devel >= %{gconf_version}
BuildRequires: gnome-menus-devel >= %{gnome_menus_version}
@@ -338,6 +337,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Fri Feb 15 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.91-2
+- Drop gnome-vfs BR
+
* Wed Feb 12 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.91-1
- Update to 2.21.91
- Update patches
commit 88014b2ec59cfb19a6dd2aa385bb7df359fadf9b
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Feb 14 02:13:40 2008 +0000
2.21.91
diff --git a/.cvsignore b/.cvsignore
index 02bc5c6..e6929c5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.21.90.tar.bz2
+gnome-panel-2.21.91.tar.bz2
diff --git a/applet-error.patch b/applet-error.patch
index 26a8d35..d4ed3ec 100644
--- a/applet-error.patch
+++ b/applet-error.patch
@@ -1,7 +1,7 @@
-diff -up gnome-panel-2.20.0.1/gnome-panel/panel-applet-frame.c.applet-error
gnome-panel-2.20.0.1/gnome-panel/panel-applet-frame.c
---- gnome-panel-2.20.0.1/gnome-panel/panel-applet-frame.c.applet-error 2007-09-21
16:24:28.000000000 -0400
-+++ gnome-panel-2.20.0.1/gnome-panel/panel-applet-frame.c 2007-09-21 16:24:32.000000000
-0400
-@@ -1253,6 +1253,21 @@ panel_applet_frame_event_listener (Bonob
+diff -up gnome-panel-2.21.91/gnome-panel/panel-applet-frame.c.applet-error
gnome-panel-2.21.91/gnome-panel/panel-applet-frame.c
+--- gnome-panel-2.21.91/gnome-panel/panel-applet-frame.c.applet-error 2008-02-11
16:15:47.000000000 -0500
++++ gnome-panel-2.21.91/gnome-panel/panel-applet-frame.c 2008-02-13 20:35:59.000000000
-0500
+@@ -1242,6 +1242,21 @@ panel_applet_frame_event_listener (Bonob
panel_applet_frame_set_size_hints_from_any (frame, any);
}
@@ -21,18 +21,16 @@ diff -up
gnome-panel-2.20.0.1/gnome-panel/panel-applet-frame.c.applet-error gnom
+}
+
static void
- panel_applet_frame_activated (Bonobo_Unknown object,
- CORBA_Environment *ev,
-@@ -1275,8 +1290,10 @@ panel_applet_frame_activated (Bonobo_Unk
- if (BONOBO_EX (ev) || object == CORBA_OBJECT_NIL) {
- error = bonobo_exception_get_text (ev);
+ panel_applet_frame_activated (CORBA_Object object,
+ const char *error_reason,
+@@ -1266,7 +1281,9 @@ panel_applet_frame_activated (CORBA_Obje
+ if (error_reason != NULL || object == CORBA_OBJECT_NIL) {
g_warning (G_STRLOC ": failed to load applet %s:\n%s",
-- frame->priv->iid, error);
+ frame->priv->iid, error_reason);
- panel_applet_frame_loading_failed (frame, frame_act->id);
-+ frame->priv->iid, error);
+ if (!in_default_panel_config (frame_act->id)) {
+ panel_applet_frame_loading_failed (frame, frame_act->id);
+ }
g_free (frame_act->id);
g_free (frame_act);
- g_free (error);
+ return;
diff --git a/desktop-file-monitoring.patch b/desktop-file-monitoring.patch
index 20d2fa4..7048299 100644
--- a/desktop-file-monitoring.patch
+++ b/desktop-file-monitoring.patch
@@ -1,26 +1,26 @@
-diff -up gnome-panel-2.19.92/gnome-panel/launcher.h.desktop-file-monitoring
gnome-panel-2.19.92/gnome-panel/launcher.h
---- gnome-panel-2.19.92/gnome-panel/launcher.h.desktop-file-monitoring 2007-09-04
13:34:26.000000000 -0400
-+++ gnome-panel-2.19.92/gnome-panel/launcher.h 2007-09-13 12:23:44.000000000 -0400
-@@ -13,6 +13,7 @@
-
- #include "applet.h"
- #include "panel-widget.h"
-+#include <libgnomevfs/gnome-vfs.h>
-
- G_BEGIN_DECLS
-
-@@ -29,6 +30,8 @@ typedef struct {
+diff -up gnome-panel-2.21.91/gnome-panel/launcher.h.desktop-file-monitoring
gnome-panel-2.21.91/gnome-panel/launcher.h
+--- gnome-panel-2.21.91/gnome-panel/launcher.h.desktop-file-monitoring 2008-02-11
16:15:47.000000000 -0500
++++ gnome-panel-2.21.91/gnome-panel/launcher.h 2008-02-13 17:50:59.000000000 -0500
+@@ -29,6 +29,8 @@ typedef struct {
GSList *error_dialogs;
gulong destroy_handler;
+
-+ GnomeVFSMonitorHandle *monitor;
++ GFileMonitor *monitor;
} Launcher;
void panel_launcher_create (PanelToplevel *toplevel,
-diff -up gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.h.desktop-file-monitoring
gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.h
----
gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.h.desktop-file-monitoring 2007-09-04
13:34:26.000000000 -0400
-+++ gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.h 2007-09-13 12:23:44.000000000
-0400
+@@ -58,7 +60,6 @@ void launcher_load_from_gconf
+ gint position,
+ const char *id);
+
+-void panel_launcher_delete (Launcher *launcher);
+
+ void ask_about_launcher (const char *file,
+ PanelWidget *panel,
+diff -up gnome-panel-2.21.91/gnome-panel/panel-ditem-editor.h.desktop-file-monitoring
gnome-panel-2.21.91/gnome-panel/panel-ditem-editor.h
+---
gnome-panel-2.21.91/gnome-panel/panel-ditem-editor.h.desktop-file-monitoring 2008-02-11
16:15:47.000000000 -0500
++++ gnome-panel-2.21.91/gnome-panel/panel-ditem-editor.h 2008-02-13 17:34:43.000000000
-0500
@@ -101,6 +101,8 @@ void panel_ditem_editor_set_uri (PanelDI
const char *uri);
@@ -30,39 +30,39 @@ diff -up
gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.h.desktop-file-monit
void panel_ditem_register_save_uri_func (PanelDItemEditor *dialog,
PanelDitemSaveUri save_uri,
-diff -up gnome-panel-2.19.92/gnome-panel/launcher.c.desktop-file-monitoring
gnome-panel-2.19.92/gnome-panel/launcher.c
---- gnome-panel-2.19.92/gnome-panel/launcher.c.desktop-file-monitoring 2007-09-04
13:34:26.000000000 -0400
-+++ gnome-panel-2.19.92/gnome-panel/launcher.c 2007-09-13 12:23:44.000000000 -0400
-@@ -285,6 +285,8 @@ static void
+diff -up gnome-panel-2.21.91/gnome-panel/launcher.c.desktop-file-monitoring
gnome-panel-2.21.91/gnome-panel/launcher.c
+--- gnome-panel-2.21.91/gnome-panel/launcher.c.desktop-file-monitoring 2008-02-11
16:15:47.000000000 -0500
++++ gnome-panel-2.21.91/gnome-panel/launcher.c 2008-02-13 18:04:07.000000000 -0500
+@@ -307,6 +307,8 @@ static void
destroy_launcher (GtkWidget *widget,
Launcher *launcher)
{
-+ if (launcher->monitor)
-+ gnome_vfs_monitor_cancel (launcher->monitor);
++ if (launcher->monitor)
++ g_object_unref (launcher->monitor);
launcher_properties_destroy (launcher);
launcher_widget_destroy_open_dialogs (launcher);
}
-@@ -458,6 +460,37 @@ drag_data_get_cb (GtkWidget *widg
+@@ -488,6 +490,37 @@ drag_data_get_cb (GtkWidget *widg
}
+static void setup_button (Launcher *launcher);
+
+static void
-+desktop_file_changed (GnomeVFSMonitorHandle *handle,
-+ const gchar *monitor_uri,
-+ const gchar *info_uri,
-+ GnomeVFSMonitorEventType event_type,
++desktop_file_changed (GFileMonitor *monitor,
++ GFile *file,
++ GFile *other_file,
++ GFileMonitorEvent event_type,
+ gpointer user_data)
+{
+ Launcher *launcher = user_data;
+ GKeyFile *key_file;
+
-+ if (event_type == GNOME_VFS_MONITOR_EVENT_CHANGED ||
-+ event_type == GNOME_VFS_MONITOR_EVENT_CREATED) {
++ if (event_type == G_FILE_MONITOR_EVENT_CHANGED ||
++ event_type == G_FILE_MONITOR_EVENT_CREATED) {
+ gchar *path;
+
-+ path = gnome_vfs_get_local_path_from_uri (monitor_uri);
++ path = g_file_get_path (file);
+
+ key_file = g_key_file_new ();
+ if (g_key_file_load_from_file (key_file, path,
@@ -80,7 +80,7 @@ diff -up
gnome-panel-2.19.92/gnome-panel/launcher.c.desktop-file-monitoring gnom
static Launcher *
create_launcher (const char *location)
{
-@@ -534,6 +567,25 @@ create_launcher (const char *location)
+@@ -564,6 +597,21 @@ create_launcher (const char *location)
launcher->key_file = key_file;
launcher->prop_dialog = NULL;
launcher->destroy_handler = 0;
@@ -91,22 +91,18 @@ diff -up
gnome-panel-2.19.92/gnome-panel/launcher.c.desktop-file-monitoring gnom
+ * file contains a X-Panel-Monitor entry.
+ */
+ if (g_key_file_get_boolean (key_file, "Desktop Entry",
"X-Panel-Monitor", NULL)) {
-+ gchar *uri;
-+
-+
++ GFile *file;
+
-+ uri = g_strdup_printf ("file:%s", new_location);
-+ gnome_vfs_monitor_add (&launcher->monitor,
-+ uri,
-+ GNOME_VFS_MONITOR_FILE,
-+ desktop_file_changed,
-+ launcher);
-+ g_free (uri);
++ file = g_file_new_for_path (new_location);
++ launcher->monitor = g_file_monitor_file (file, 0, NULL, NULL);
++ g_signal_connect (launcher->monitor, "changed",
++ G_CALLBACK (desktop_file_changed), launcher);
++ g_object_unref (file);
+ }
/* Icon will be setup later */
launcher->button = button_widget_new (NULL /* icon */,
-@@ -662,6 +714,15 @@ static void
+@@ -694,6 +742,15 @@ static void
launcher_changed (PanelDItemEditor *dialog,
Launcher *launcher)
{
@@ -115,14 +111,14 @@ diff -up
gnome-panel-2.19.92/gnome-panel/launcher.c.desktop-file-monitoring gnom
+ * user changes.
+ */
+ if (launcher->monitor) {
-+ gnome_vfs_monitor_cancel (launcher->monitor);
++ g_object_unref (launcher->monitor);
+ launcher->monitor = NULL;
+ }
+
/* Setup the button look */
setup_button (launcher);
}
-@@ -733,6 +794,43 @@ launcher_save_uri (PanelDItemEditor *dia
+@@ -765,6 +822,42 @@ launcher_save_uri (PanelDItemEditor *dia
return NULL;
}
@@ -150,23 +146,22 @@ diff -up
gnome-panel-2.19.92/gnome-panel/launcher.c.desktop-file-monitoring gnom
+static void
+start_monitoring (Launcher *launcher)
+{
-+ gchar *uri;
++ GFile *file;
+
-+ uri = g_strdup_printf ("file:%s", launcher->location);
++ file = g_file_new_for_path (launcher->location);
+ if (launcher->monitor)
-+ gnome_vfs_monitor_cancel (launcher->monitor);
-+ gnome_vfs_monitor_add (&launcher->monitor,
-+ uri,
-+ GNOME_VFS_MONITOR_FILE,
-+ desktop_file_changed,
-+ launcher);
-+ g_free (uri);
++ g_object_unref (launcher->monitor);
++ launcher->monitor = g_file_monitor_file (file, 0, NULL, NULL);
++ g_signal_connect (launcher->monitor, "changed",
++ G_CALLBACK (desktop_file_changed),
++ launcher);
++ g_object_unref (file);
+}
+
static void
launcher_saved (GtkWidget *dialog,
Launcher *launcher)
-@@ -740,11 +838,15 @@ launcher_saved (GtkWidget *dialog,
+@@ -772,11 +865,15 @@ launcher_saved (GtkWidget *dialog,
const char *uri;
GConfClient *client;
const char *key;
@@ -182,7 +177,7 @@ diff -up
gnome-panel-2.19.92/gnome-panel/launcher.c.desktop-file-monitoring gnom
if (uri && launcher->location && strcmp (uri,
launcher->location)) {
client = panel_gconf_get_client ();
-@@ -757,6 +859,9 @@ launcher_saved (GtkWidget *dialog,
+@@ -789,6 +886,9 @@ launcher_saved (GtkWidget *dialog,
if (launcher->location)
g_free (launcher->location);
launcher->location = g_strdup (uri);
@@ -192,7 +187,7 @@ diff -up
gnome-panel-2.19.92/gnome-panel/launcher.c.desktop-file-monitoring gnom
}
}
-@@ -923,6 +1028,7 @@ launcher_new_saved (GtkWidget *dialog,
+@@ -955,6 +1055,7 @@ launcher_new_saved (GtkWidget *dialog,
PanelWidget *panel;
int pos;
const char *uri;
@@ -200,7 +195,7 @@ diff -up
gnome-panel-2.19.92/gnome-panel/launcher.c.desktop-file-monitoring gnom
pos = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (dialog), "pos"));
panel = g_object_get_data (G_OBJECT (dialog), "panel");
-@@ -930,6 +1036,10 @@ launcher_new_saved (GtkWidget *dialog,
+@@ -962,6 +1063,10 @@ launcher_new_saved (GtkWidget *dialog,
uri = panel_ditem_editor_get_uri (PANEL_DITEM_EDITOR (dialog));
if (panel_launcher_get_filename (uri) != NULL)
uri = panel_launcher_get_filename (uri);
@@ -211,9 +206,9 @@ diff -up
gnome-panel-2.19.92/gnome-panel/launcher.c.desktop-file-monitoring gnom
panel_launcher_create (panel->toplevel, pos, uri);
}
-diff -up gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.c.desktop-file-monitoring
gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.c
----
gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.c.desktop-file-monitoring 2007-09-13
12:23:44.000000000 -0400
-+++ gnome-panel-2.19.92/gnome-panel/panel-ditem-editor.c 2007-09-13 12:31:03.000000000
-0400
+diff -up gnome-panel-2.21.91/gnome-panel/panel-ditem-editor.c.desktop-file-monitoring
gnome-panel-2.21.91/gnome-panel/panel-ditem-editor.c
+---
gnome-panel-2.21.91/gnome-panel/panel-ditem-editor.c.desktop-file-monitoring 2008-02-13
17:34:43.000000000 -0500
++++ gnome-panel-2.21.91/gnome-panel/panel-ditem-editor.c 2008-02-13 17:34:43.000000000
-0500
@@ -80,6 +80,8 @@ struct _PanelDItemEditorPrivate
/* the directory of the theme for the icon, see bug #119208 */
diff --git a/gnome-panel.spec b/gnome-panel.spec
index bc37cbb..3fcebbb 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 glib2_version 2.15.5
%define gtk2_version 2.11.3
%define libglade2_version 2.5.0
%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 gnome_vfs2_version 2.14.2
%define libwnck_version 2.19.5
%define gconf_version 2.14
%define gnome_menus_version 2.11.1
@@ -21,8 +21,8 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.21.90
-Release: 3%{?dist}
+Version: 2.21.91
+Release: 1%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.21/%{name}-%{version}.tar...
@@ -95,8 +95,6 @@ Patch4: gnome-panel-2.16.1-search.patch
# Drop this patch for now, it should have AT LEAST been moved
# to an upstream bugzilla by now
#Patch6: gnome-panel-2.16.0-compiz-support.patch
-#
http://bugzilla.gnome.org/show_bug.cgi?id=456371
-Patch7: clock-timezones.patch
# the next three patches belong together
#
http://bugzilla.gnome.org/show_bug.cgi?id=470966
@@ -109,14 +107,8 @@ Patch10: preferred-apps.patch
# add a hard dependency on e.g. tomboy
Patch11: applet-error.patch
-# try to deal with the 22/24 madness in icon themes
-Patch12: more-sharp-icons.patch
-
Patch14: gnome-panel-2.21.5-ck-shutdown.patch
-#
http://bugzilla.gnome.org/show_bug.cgi?id=514026
-Patch15: logout-focus.patch
-
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -157,14 +149,11 @@ Panel Applets using the libpanel-applet library.
%patch3 -p1 -b .switch-user
%patch4 -p1 -b .search
#%patch6 -p0 -b .compiz-support
-%patch7 -p1 -b .clock-timezones
%patch8 -p1 -b .launcher-desktop-files
%patch9 -p1 -b .desktop-file-monitoring
%patch10 -p1 -b .preferred-apps
%patch11 -p1 -b .applet-error
-%patch12 -p1 -b .more-sharp-icons
%patch14 -p1 -b .ck-shutdown
-%patch15 -p1 -b .logout-focus
. %{SOURCE6}
@@ -349,6 +338,10 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Wed Feb 12 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.91-1
+- Update to 2.21.91
+- Update patches
+
* Sun Feb 3 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.90-3
- Ensure the logout dialog gets focus.
diff --git a/preferred-apps.patch b/preferred-apps.patch
index 0664b59..89357af 100644
--- a/preferred-apps.patch
+++ b/preferred-apps.patch
@@ -1,27 +1,34 @@
-diff -up gnome-panel-2.19.92/gnome-panel/panel-run-dialog.h.preferred-apps
gnome-panel-2.19.92/gnome-panel/panel-run-dialog.h
---- gnome-panel-2.19.92/gnome-panel/panel-run-dialog.h.preferred-apps 2007-09-04
13:34:26.000000000 -0400
-+++ gnome-panel-2.19.92/gnome-panel/panel-run-dialog.h 2007-09-10 13:22:09.000000000
-0400
-@@ -32,6 +32,8 @@ G_BEGIN_DECLS
- void panel_run_dialog_present (GdkScreen *screen,
- guint32 activate_time);
+diff -up gnome-panel-2.21.91/gnome-panel/main.c.preferred-apps
gnome-panel-2.21.91/gnome-panel/main.c
+--- gnome-panel-2.21.91/gnome-panel/main.c.preferred-apps 2008-02-11 16:15:47.000000000
-0500
++++ gnome-panel-2.21.91/gnome-panel/main.c 2008-02-13 20:44:49.000000000 -0500
+@@ -26,6 +26,7 @@
+ #include "panel-action-protocol.h"
+ #include "panel-lockdown.h"
+ #include "panel-icon-names.h"
++#include "launcher.h"
+ #include "xstuff.h"
-+GSList *get_all_applications (void);
-+
- G_END_DECLS
+ #include "nothing.cP"
+@@ -81,6 +82,7 @@ main (int argc, char **argv)
+ GCONF_CLIENT_PRELOAD_NONE,
+ NULL);
- #endif /* __PANEL_RUN_DIALOG_H__ */
-diff -up gnome-panel-2.19.92/gnome-panel/launcher.c.preferred-apps
gnome-panel-2.19.92/gnome-panel/launcher.c
---- gnome-panel-2.19.92/gnome-panel/launcher.c.preferred-apps 2007-09-10
13:22:09.000000000 -0400
-+++ gnome-panel-2.19.92/gnome-panel/launcher.c 2007-09-10 13:24:09.000000000 -0400
-@@ -22,6 +22,7 @@
++ panel_preferred_apps_init ();
+ panel_global_config_load ();
+ panel_lockdown_init ();
+ panel_profile_load ();
+diff -up gnome-panel-2.21.91/gnome-panel/launcher.c.preferred-apps
gnome-panel-2.21.91/gnome-panel/launcher.c
+--- gnome-panel-2.21.91/gnome-panel/launcher.c.preferred-apps 2008-02-13
20:44:49.000000000 -0500
++++ gnome-panel-2.21.91/gnome-panel/launcher.c 2008-02-13 20:44:49.000000000 -0500
+@@ -23,6 +23,7 @@
+ #include <libgnome/gnome-util.h>
#include <libgnomeui/gnome-url.h>
- #include <libgnomevfs/gnome-vfs.h>
#include <gdk/gdkx.h>
+#include <gmenu-tree.h>
#include "launcher.h"
-@@ -39,6 +40,7 @@
+@@ -40,6 +41,7 @@
#include "panel-compatibility.h"
#include "panel-ditem-editor.h"
#include "panel-icon-names.h"
@@ -29,7 +36,7 @@ diff -up gnome-panel-2.19.92/gnome-panel/launcher.c.preferred-apps
gnome-panel-2
static GdkScreen *
launcher_get_screen (Launcher *launcher)
-@@ -1284,3 +1286,173 @@ panel_launcher_set_dnd_enabled (Launcher
+@@ -1299,3 +1301,173 @@ panel_launcher_set_dnd_enabled (Launcher
} else
gtk_drag_source_unset (launcher->button);
}
@@ -203,10 +210,19 @@ diff -up gnome-panel-2.19.92/gnome-panel/launcher.c.preferred-apps
gnome-panel-2
+ filename, g_free, NULL);
+ }
+}
-diff -up gnome-panel-2.19.92/gnome-panel/launcher.h.preferred-apps
gnome-panel-2.19.92/gnome-panel/launcher.h
---- gnome-panel-2.19.92/gnome-panel/launcher.h.preferred-apps 2007-09-10
13:22:09.000000000 -0400
-+++ gnome-panel-2.19.92/gnome-panel/launcher.h 2007-09-10 13:22:09.000000000 -0400
-@@ -75,6 +75,7 @@ void launcher_properties_dest
+diff -up gnome-panel-2.21.91/gnome-panel/launcher.h.preferred-apps
gnome-panel-2.21.91/gnome-panel/launcher.h
+--- gnome-panel-2.21.91/gnome-panel/launcher.h.preferred-apps 2008-02-13
20:44:49.000000000 -0500
++++ gnome-panel-2.21.91/gnome-panel/launcher.h 2008-02-13 20:45:58.000000000 -0500
+@@ -14,6 +14,8 @@
+ #include "applet.h"
+ #include "panel-widget.h"
+
++#include <gio/gio.h>
++
+ G_BEGIN_DECLS
+
+ #define PANEL_LAUNCHERS_PATH "panel2.d/default/launchers"
+@@ -73,6 +75,7 @@ void launcher_properties_dest
void panel_launcher_set_dnd_enabled (Launcher *launcher,
gboolean dnd_enabled);
@@ -214,29 +230,22 @@ diff -up gnome-panel-2.19.92/gnome-panel/launcher.h.preferred-apps
gnome-panel-2
G_END_DECLS
-diff -up gnome-panel-2.19.92/gnome-panel/main.c.preferred-apps
gnome-panel-2.19.92/gnome-panel/main.c
---- gnome-panel-2.19.92/gnome-panel/main.c.preferred-apps 2007-09-04 13:34:26.000000000
-0400
-+++ gnome-panel-2.19.92/gnome-panel/main.c 2007-09-10 13:22:09.000000000 -0400
-@@ -26,6 +26,7 @@
- #include "panel-action-protocol.h"
- #include "panel-lockdown.h"
- #include "panel-icon-names.h"
-+#include "launcher.h"
- #include "xstuff.h"
+diff -up gnome-panel-2.21.91/gnome-panel/panel-run-dialog.h.preferred-apps
gnome-panel-2.21.91/gnome-panel/panel-run-dialog.h
+--- gnome-panel-2.21.91/gnome-panel/panel-run-dialog.h.preferred-apps 2008-02-11
16:15:47.000000000 -0500
++++ gnome-panel-2.21.91/gnome-panel/panel-run-dialog.h 2008-02-13 20:44:49.000000000
-0500
+@@ -32,6 +32,8 @@ G_BEGIN_DECLS
+ void panel_run_dialog_present (GdkScreen *screen,
+ guint32 activate_time);
- #include "nothing.cP"
-@@ -81,6 +82,7 @@ main (int argc, char **argv)
- GCONF_CLIENT_PRELOAD_NONE,
- NULL);
++GSList *get_all_applications (void);
++
+ G_END_DECLS
-+ panel_preferred_apps_init ();
- panel_global_config_load ();
- panel_lockdown_init ();
- panel_profile_load ();
-diff -up gnome-panel-2.19.92/gnome-panel/panel-run-dialog.c.preferred-apps
gnome-panel-2.19.92/gnome-panel/panel-run-dialog.c
---- gnome-panel-2.19.92/gnome-panel/panel-run-dialog.c.preferred-apps 2007-09-04
13:34:26.000000000 -0400
-+++ gnome-panel-2.19.92/gnome-panel/panel-run-dialog.c 2007-09-10 13:22:09.000000000
-0400
-@@ -813,7 +813,7 @@ get_all_applications_from_dir (GMenuTree
+ #endif /* __PANEL_RUN_DIALOG_H__ */
+diff -up gnome-panel-2.21.91/gnome-panel/panel-run-dialog.c.preferred-apps
gnome-panel-2.21.91/gnome-panel/panel-run-dialog.c
+--- gnome-panel-2.21.91/gnome-panel/panel-run-dialog.c.preferred-apps 2008-02-11
16:15:47.000000000 -0500
++++ gnome-panel-2.21.91/gnome-panel/panel-run-dialog.c 2008-02-13 20:44:49.000000000
-0500
+@@ -816,7 +816,7 @@ get_all_applications_from_dir (GMenuTree
return list;
}
diff --git a/sources b/sources
index 3078517..afc5e50 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-12285e7794e0c59d623f2d20817e92ee gnome-panel-2.21.90.tar.bz2
+4b2a79d02110fdb38e1573c13e85ab7a gnome-panel-2.21.91.tar.bz2
commit f5b219ea94709bb17b0afb83f93d331cd9b91cbf
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sun Feb 3 06:55:41 2008 +0000
bump rev
diff --git a/gnome-panel.spec b/gnome-panel.spec
index a80f3d0..bc37cbb 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -349,7 +349,7 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
-* Sun Feb 3 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.90-2
+* Sun Feb 3 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.90-3
- Ensure the logout dialog gets focus.
* Tue Jan 29 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.90-1
commit 9b3366093b970f3561dbf147c8c090ce51b13bb6
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sun Feb 3 06:53:56 2008 +0000
Ensure the logout dialog gets focus
diff --git a/gnome-panel.spec b/gnome-panel.spec
index c294433..a80f3d0 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.21.90
-Release: 2%{?dist}
+Release: 3%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.21/%{name}-%{version}.tar...
@@ -112,9 +112,11 @@ Patch11: applet-error.patch
# try to deal with the 22/24 madness in icon themes
Patch12: more-sharp-icons.patch
-# fix problems with the intlclock integration in 2.21.5
Patch14: gnome-panel-2.21.5-ck-shutdown.patch
+#
http://bugzilla.gnome.org/show_bug.cgi?id=514026
+Patch15: logout-focus.patch
+
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -162,6 +164,7 @@ Panel Applets using the libpanel-applet library.
%patch11 -p1 -b .applet-error
%patch12 -p1 -b .more-sharp-icons
%patch14 -p1 -b .ck-shutdown
+%patch15 -p1 -b .logout-focus
. %{SOURCE6}
@@ -346,6 +349,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Sun Feb 3 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.90-2
+- Ensure the logout dialog gets focus.
+
* Tue Jan 29 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.90-1
- Update to 2.21.90
- Drop upstreamed patch
diff --git a/logout-focus.patch b/logout-focus.patch
new file mode 100644
index 0000000..feb8eb6
--- /dev/null
+++ b/logout-focus.patch
@@ -0,0 +1,9 @@
+diff -up gnome-panel-2.21.90/gnome-panel/panel-logout.c.logout-focus
gnome-panel-2.21.90/gnome-panel/panel-logout.c
+--- gnome-panel-2.21.90/gnome-panel/panel-logout.c.logout-focus 2008-02-03
01:48:13.000000000 -0500
++++ gnome-panel-2.21.90/gnome-panel/panel-logout.c 2008-02-03 01:48:19.000000000 -0500
+@@ -449,4 +449,5 @@ panel_logout_new (PanelLogoutDialogType
+
+ gtk_window_set_screen (GTK_WINDOW (logout_dialog), screen);
+ gtk_widget_show (GTK_WIDGET (logout_dialog));
++ gdk_window_focus (GTK_WIDGET (current_dialog)->window, activate_time);
+ }
commit 4a0e59f596a3399af766324a203f957a2bcd78a3
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Jan 29 20:28:59 2008 +0000
fix file list
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 47e50c7..c294433 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -313,6 +313,7 @@ fi
%{_datadir}/icons/hicolor/22x22/apps/*
%{_datadir}/icons/hicolor/24x24/apps/*
%{_datadir}/icons/hicolor/32x32/apps/*
+%{_datadir}/icons/hicolor/48x48/apps/*
%{_datadir}/icons/hicolor/scalable/apps/*
%{_datadir}/gnome-panel
%exclude %{_datadir}/gnome-panelrc
commit 69dfa8f96abb71663da5307f2237191153903cb0
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Jan 29 18:51:54 2008 +0000
2.21.90
diff --git a/.cvsignore b/.cvsignore
index 434ebc3..02bc5c6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.21.5.tar.bz2
+gnome-panel-2.21.90.tar.bz2
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 5947636..47e50c7 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,7 +21,7 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.21.5
+Version: 2.21.90
Release: 2%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.21/%{name}-%{version}.tar...
@@ -113,9 +113,6 @@ Patch11: applet-error.patch
Patch12: more-sharp-icons.patch
# fix problems with the intlclock integration in 2.21.5
-Patch13: glue.patch
-
-# fix problems with the intlclock integration in 2.21.5
Patch14: gnome-panel-2.21.5-ck-shutdown.patch
Conflicts: gnome-power-manager < 2.15.3
@@ -164,7 +161,6 @@ Panel Applets using the libpanel-applet library.
%patch10 -p1 -b .preferred-apps
%patch11 -p1 -b .applet-error
%patch12 -p1 -b .more-sharp-icons
-%patch13 -p1 -b .glue
%patch14 -p1 -b .ck-shutdown
. %{SOURCE6}
@@ -349,6 +345,10 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Tue Jan 29 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.90-1
+- Update to 2.21.90
+- Drop upstreamed patch
+
* Fri Jan 25 2008 Jon McCann <jmccann(a)redhat.com> - 2.21.5-2
- Add ConsoleKit restart/shutdown support
diff --git a/sources b/sources
index 3f50754..3078517 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-967f0fc60b069921095ee642fcea1f55 gnome-panel-2.21.5.tar.bz2
+12285e7794e0c59d623f2d20817e92ee gnome-panel-2.21.90.tar.bz2
commit ef62569f2c1c796cca44c2299f2a0aecd7488f8f
Author: William Jon McCann <mccann(a)fedoraproject.org>
Date: Fri Jan 25 20:35:06 2008 +0000
- Add ConsoleKit restart/shutdown support
diff --git a/gnome-panel-2.21.5-ck-shutdown.patch b/gnome-panel-2.21.5-ck-shutdown.patch
new file mode 100644
index 0000000..314861f
--- /dev/null
+++ b/gnome-panel-2.21.5-ck-shutdown.patch
@@ -0,0 +1,920 @@
+Index: gnome-panel/gnome-panel/panel-consolekit.c
+===================================================================
+--- gnome-panel/gnome-panel/panel-consolekit.c (revision 0)
++++ gnome-panel/gnome-panel/panel-consolekit.c (revision 0)
+@@ -0,0 +1,597 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
++ *
++ * Copyright (C) 2008 Jon McCann <jmccann(a)redhat.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2, or (at your option)
++ * any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++ * 02111-1307, USA.
++ */
++
++#include "config.h"
++
++#include <errno.h>
++#include <string.h>
++#include <unistd.h>
++
++#include <glib.h>
++#include <glib-object.h>
++#include <glib/gi18n.h>
++
++#include <dbus/dbus-glib.h>
++
++#ifdef HAVE_POLKIT
++#include <polkit-gnome/polkit-gnome.h>
++#endif
++
++#include "panel-consolekit.h"
++
++#define CK_NAME "org.freedesktop.ConsoleKit"
++#define CK_PATH "/org/freedesktop/ConsoleKit"
++#define CK_INTERFACE "org.freedesktop.ConsoleKit"
++
++#define CK_MANAGER_PATH "/org/freedesktop/ConsoleKit/Manager"
++#define CK_MANAGER_INTERFACE "org.freedesktop.ConsoleKit.Manager"
++#define CK_SEAT_INTERFACE "org.freedesktop.ConsoleKit.Seat"
++#define CK_SESSION_INTERFACE "org.freedesktop.ConsoleKit.Session"
++
++#define PANEL_CONSOLEKIT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o),
PANEL_TYPE_CONSOLEKIT, PanelConsolekitPrivate))
++
++struct _PanelConsolekitPrivate {
++ DBusGConnection *dbus_connection;
++ DBusGProxy *bus_proxy;
++ DBusGProxy *ck_proxy;
++ guint32 is_connected : 1;
++};
++
++enum {
++ PROP_0 = 0,
++ PROP_IS_CONNECTED
++};
++
++enum {
++ REQUEST_COMPLETED = 0,
++ LAST_SIGNAL
++};
++
++static guint signals [LAST_SIGNAL];
++
++static void panel_consolekit_class_init (PanelConsolekitClass *klass);
++static void panel_consolekit_init (PanelConsolekit *ck);
++static void panel_consolekit_finalize (GObject *object);
++static void panel_consolekit_on_name_owner_changed (DBusGProxy *bus_proxy,
++ const char *name,
++ const char *prev_owner,
++ const char *new_owner,
++ PanelConsolekit *manager);
++
++G_DEFINE_TYPE (PanelConsolekit, panel_consolekit, G_TYPE_OBJECT);
++
++static void
++panel_consolekit_get_property (GObject *object,
++ guint prop_id,
++ GValue *value,
++ GParamSpec *pspec)
++{
++ PanelConsolekit *manager = PANEL_CONSOLEKIT (object);
++
++ switch (prop_id) {
++ case PROP_IS_CONNECTED:
++ g_value_set_boolean (value,
++ manager->priv->is_connected);
++ break;
++
++ default:
++ G_OBJECT_WARN_INVALID_PROPERTY_ID (object,
++ prop_id,
++ pspec);
++ }
++}
++
++static void
++panel_consolekit_class_init (PanelConsolekitClass *manager_class)
++{
++ GObjectClass *object_class;
++ GParamSpec *param_spec;
++
++ object_class = G_OBJECT_CLASS (manager_class);
++
++ object_class->finalize = panel_consolekit_finalize;
++ object_class->get_property = panel_consolekit_get_property;
++
++ param_spec = g_param_spec_boolean ("is-connected",
++ "Is connected",
++ "Whether the panel is connected to ConsoleKit",
++ FALSE,
++ G_PARAM_READABLE);
++ g_object_class_install_property (object_class, PROP_IS_CONNECTED,
++ param_spec);
++
++ signals [REQUEST_COMPLETED] =
++ g_signal_new ("request-completed",
++ G_OBJECT_CLASS_TYPE (object_class),
++ G_SIGNAL_RUN_LAST,
++ G_STRUCT_OFFSET (PanelConsolekitClass, request_completed),
++ NULL,
++ NULL,
++ g_cclosure_marshal_VOID__POINTER,
++ G_TYPE_NONE,
++ 1, G_TYPE_POINTER);
++
++ g_type_class_add_private (manager_class,
++ sizeof (PanelConsolekitPrivate));
++}
++
++static gboolean
++panel_consolekit_ensure_ck_connection (PanelConsolekit *manager,
++ GError **error)
++{
++ GError *connection_error;
++ gboolean is_connected;
++
++ connection_error = NULL;
++ if (manager->priv->dbus_connection == NULL) {
++ manager->priv->dbus_connection = dbus_g_bus_get (DBUS_BUS_SYSTEM,
++ &connection_error);
++
++ if (manager->priv->dbus_connection == NULL) {
++ g_propagate_error (error, connection_error);
++ is_connected = FALSE;
++ goto out;
++ }
++ }
++
++ if (manager->priv->bus_proxy == NULL) {
++ manager->priv->bus_proxy =
++ dbus_g_proxy_new_for_name_owner (manager->priv->dbus_connection,
++ DBUS_SERVICE_DBUS,
++ DBUS_PATH_DBUS,
++ DBUS_INTERFACE_DBUS,
++ &connection_error);
++
++ if (manager->priv->bus_proxy == NULL) {
++ g_propagate_error (error, connection_error);
++ is_connected = FALSE;
++ goto out;
++ }
++
++ dbus_g_proxy_add_signal (manager->priv->bus_proxy,
++ "NameOwnerChanged",
++ G_TYPE_STRING,
++ G_TYPE_STRING,
++ G_TYPE_STRING,
++ G_TYPE_INVALID);
++ dbus_g_proxy_connect_signal (manager->priv->bus_proxy,
++ "NameOwnerChanged",
++ G_CALLBACK (panel_consolekit_on_name_owner_changed),
++ manager, NULL);
++ }
++
++ if (manager->priv->ck_proxy == NULL) {
++ manager->priv->ck_proxy =
++ dbus_g_proxy_new_for_name_owner (manager->priv->dbus_connection,
++ "org.freedesktop.ConsoleKit",
++ "/org/freedesktop/ConsoleKit/Manager",
++ "org.freedesktop.ConsoleKit.Manager",
++ &connection_error);
++
++ if (manager->priv->ck_proxy == NULL) {
++ g_propagate_error (error, connection_error);
++ is_connected = FALSE;
++ goto out;
++ }
++ }
++ is_connected = TRUE;
++
++out:
++ if (manager->priv->is_connected != is_connected) {
++ manager->priv->is_connected = is_connected;
++ g_object_notify (G_OBJECT (manager), "is-connected");
++ }
++
++ if (!is_connected) {
++ if (manager->priv->dbus_connection == NULL) {
++ if (manager->priv->bus_proxy != NULL) {
++ g_object_unref (manager->priv->bus_proxy);
++ manager->priv->bus_proxy = NULL;
++ }
++
++ if (manager->priv->ck_proxy != NULL) {
++ g_object_unref (manager->priv->ck_proxy);
++ manager->priv->ck_proxy = NULL;
++ }
++ } else if (manager->priv->bus_proxy == NULL) {
++ if (manager->priv->ck_proxy != NULL) {
++ g_object_unref (manager->priv->ck_proxy);
++ manager->priv->ck_proxy = NULL;
++ }
++ }
++ }
++
++ return is_connected;
++}
++
++static void
++panel_consolekit_on_name_owner_changed (DBusGProxy *bus_proxy,
++ const char *name,
++ const char *prev_owner,
++ const char *new_owner,
++ PanelConsolekit *manager)
++{
++ if (strcmp (name, "org.freedesktop.ConsoleKit") != 0)
++ return;
++
++ if (manager->priv->ck_proxy != NULL) {
++ g_object_unref (manager->priv->ck_proxy);
++ manager->priv->ck_proxy = NULL;
++ }
++
++ panel_consolekit_ensure_ck_connection (manager, NULL);
++}
++
++static void
++panel_consolekit_init (PanelConsolekit *manager)
++{
++ GError *error;
++
++ manager->priv = PANEL_CONSOLEKIT_GET_PRIVATE (manager);
++
++ error = NULL;
++ if (!panel_consolekit_ensure_ck_connection (manager, &error)) {
++ g_message ("Could not connect to ConsoleKit: %s",
++ error->message);
++ g_error_free (error);
++ }
++}
++
++static void
++panel_consolekit_finalize (GObject *object)
++{
++ PanelConsolekit *manager;
++ GObjectClass *parent_class;
++
++ manager = PANEL_CONSOLEKIT (object);
++
++ parent_class = G_OBJECT_CLASS (panel_consolekit_parent_class);
++
++ if (parent_class->finalize != NULL)
++ parent_class->finalize (object);
++}
++
++GQuark
++panel_consolekit_error_quark (void)
++{
++ static GQuark error_quark = 0;
++
++ if (error_quark == 0)
++ error_quark = g_quark_from_static_string ("panel-consolekit-error");
++
++ return error_quark;
++}
++
++PanelConsolekit *
++panel_consolekit_new (void)
++{
++ PanelConsolekit *manager;
++
++ manager = g_object_new (PANEL_TYPE_CONSOLEKIT, NULL);
++
++ return manager;
++}
++
++static gboolean
++try_system_stop (DBusGConnection *connection,
++ GError **error)
++{
++ DBusGProxy *proxy;
++ gboolean res;
++
++ proxy = dbus_g_proxy_new_for_name (connection,
++ CK_NAME,
++ CK_MANAGER_PATH,
++ CK_MANAGER_INTERFACE);
++ res = dbus_g_proxy_call_with_timeout (proxy,
++ "Stop",
++ INT_MAX,
++ error,
++ /* parameters: */
++ G_TYPE_INVALID,
++ /* return values: */
++ G_TYPE_INVALID);
++ return res;
++}
++
++static gboolean
++try_system_restart (DBusGConnection *connection,
++ GError **error)
++{
++ DBusGProxy *proxy;
++ gboolean res;
++
++ proxy = dbus_g_proxy_new_for_name (connection,
++ CK_NAME,
++ CK_MANAGER_PATH,
++ CK_MANAGER_INTERFACE);
++ res = dbus_g_proxy_call_with_timeout (proxy,
++ "Restart",
++ INT_MAX,
++ error,
++ /* parameters: */
++ G_TYPE_INVALID,
++ /* return values: */
++ G_TYPE_INVALID);
++ return res;
++}
++
++static void
++emit_restart_complete (PanelConsolekit *manager,
++ GError *error)
++{
++ GError *call_error;
++
++ call_error = NULL;
++
++ if (error != NULL) {
++ call_error = g_error_new_literal (PANEL_CONSOLEKIT_ERROR,
++ PANEL_CONSOLEKIT_ERROR_RESTARTING,
++ error->message);
++ }
++
++ g_signal_emit (G_OBJECT (manager),
++ signals [REQUEST_COMPLETED],
++ 0, call_error);
++ if (call_error != NULL) {
++ g_error_free (call_error);
++ }
++}
++
++static void
++emit_stop_complete (PanelConsolekit *manager,
++ GError *error)
++{
++ GError *call_error;
++
++ call_error = NULL;
++
++ if (error != NULL) {
++ call_error = g_error_new_literal (PANEL_CONSOLEKIT_ERROR,
++ PANEL_CONSOLEKIT_ERROR_STOPPING,
++ error->message);
++ }
++
++ g_signal_emit (G_OBJECT (manager),
++ signals [REQUEST_COMPLETED],
++ 0, call_error);
++ if (call_error != NULL) {
++ g_error_free (call_error);
++ }
++}
++
++#ifdef HAVE_POLKIT
++static void
++system_restart_auth_cb (PolKitAction *action,
++ gboolean gained_privilege,
++ GError *error,
++ PanelConsolekit *manager)
++{
++ GError *local_error;
++ gboolean res;
++
++ if (! gained_privilege) {
++ if (error != NULL) {
++ g_warning ("system restart error: %s", error->message);
++ emit_restart_complete (manager, error);
++ }
++ return;
++ }
++
++ local_error = NULL;
++ res = try_system_restart (manager->priv->dbus_connection, &local_error);
++ if (! res) {
++ g_warning ("Unable to restart system: %s", local_error->message);
++ emit_restart_complete (manager, local_error);
++ g_error_free (local_error);
++ return;
++ }
++}
++
++static void
++system_stop_auth_cb (PolKitAction *action,
++ gboolean gained_privilege,
++ GError *error,
++ PanelConsolekit *manager)
++{
++ GError *local_error;
++ gboolean res;
++
++ if (! gained_privilege) {
++ if (error != NULL) {
++ g_warning ("system restart error: %s", error->message);
++ emit_restart_complete (manager, error);
++ }
++ return;
++ }
++
++ local_error = NULL;
++ res = try_system_restart (manager->priv->dbus_connection, &local_error);
++ if (! res) {
++ g_warning ("Unable to restart system: %s", local_error->message);
++ emit_restart_complete (manager, local_error);
++ g_error_free (local_error);
++ return;
++ }
++}
++
++static PolKitAction *
++get_action_from_error (GError *error)
++{
++ PolKitAction *action;
++ const char *paction;
++
++ action = polkit_action_new ();
++
++ paction = NULL;
++ if (g_str_has_prefix (error->message, "Not privileged for action:
")) {
++ paction = error->message + strlen ("Not privileged for action:
");
++ }
++ polkit_action_set_action_id (action, paction);
++
++ return action;
++}
++#endif /* HAVE_POLKIT */
++
++static void
++request_restart_priv (PanelConsolekit *manager,
++ GError *error)
++{
++ gboolean res = FALSE;
++#ifdef HAVE_POLKIT
++ PolKitAction *action;
++ guint xid;
++ pid_t pid;
++
++ action = get_action_from_error (error);
++
++ xid = 0;
++ pid = getpid ();
++
++ g_error_free (error);
++ error = NULL;
++ res = polkit_gnome_auth_obtain (action,
++ xid,
++ pid,
++ (PolKitGnomeAuthCB) system_restart_auth_cb,
++ manager,
++ &error);
++ polkit_action_unref (action);
++#endif /* HAVE POLKIT */
++ if (! res) {
++ emit_restart_complete (manager, error);
++ g_error_free (error);
++ }
++}
++
++static void
++request_stop_priv (PanelConsolekit *manager,
++ GError *error)
++{
++ gboolean res = FALSE;
++#ifdef HAVE_POLKIT
++ PolKitAction *action;
++ guint xid;
++ pid_t pid;
++
++ action = get_action_from_error (error);
++
++ xid = 0;
++ pid = getpid ();
++
++ g_error_free (error);
++ error = NULL;
++ res = polkit_gnome_auth_obtain (action,
++ xid,
++ pid,
++ (PolKitGnomeAuthCB) system_stop_auth_cb,
++ manager,
++ &error);
++ polkit_action_unref (action);
++#endif /* HAVE POLKIT */
++ if (! res) {
++ emit_stop_complete (manager, error);
++ g_error_free (error);
++ }
++}
++
++void
++panel_consolekit_attempt_restart (PanelConsolekit *manager)
++{
++ gboolean res;
++ GError *error;
++
++ error = NULL;
++
++ if (!panel_consolekit_ensure_ck_connection (manager, &error)) {
++ g_warning ("Could not connect to ConsoleKit: %s",
++ error->message);
++ g_error_free (error);
++ return;
++ }
++
++ res = try_system_restart (manager->priv->dbus_connection, &error);
++ if (! res) {
++ if (dbus_g_error_has_name (error,
"org.freedesktop.ConsoleKit.Manager.NotPrivileged")) {
++ request_restart_priv (manager, error);
++ } else {
++ emit_restart_complete (manager, error);
++ g_error_free (error);
++ }
++ }
++
++}
++
++void
++panel_consolekit_attempt_stop (PanelConsolekit *manager)
++{
++ gboolean res;
++ GError *error;
++
++ error = NULL;
++
++ if (!panel_consolekit_ensure_ck_connection (manager, &error)) {
++ g_warning ("Could not connect to ConsoleKit: %s",
++ error->message);
++ g_error_free (error);
++ return;
++ }
++
++ res = try_system_stop (manager->priv->dbus_connection, &error);
++ if (! res) {
++ if (dbus_g_error_has_name (error,
"org.freedesktop.ConsoleKit.Manager.NotPrivileged")) {
++ request_stop_priv (manager, error);
++ } else {
++ emit_stop_complete (manager, error);
++ g_error_free (error);
++ }
++ }
++}
++
++gboolean
++panel_consolekit_can_restart (PanelConsolekit *manager)
++{
++#ifdef HAVE_POLKIT
++ return TRUE;
++#else
++ return FALSE;
++#endif
++}
++
++gboolean
++panel_consolekit_can_stop (PanelConsolekit *manager)
++{
++#ifdef HAVE_POLKIT
++ return TRUE;
++#else
++ return FALSE;
++#endif
++}
++
++PanelConsolekit *
++panel_get_consolekit (void)
++{
++ static PanelConsolekit *manager = NULL;
++
++ if (manager == NULL)
++ manager = panel_consolekit_new ();
++
++ return g_object_ref (manager);
++}
+Index: gnome-panel/gnome-panel/panel-consolekit.h
+===================================================================
+--- gnome-panel/gnome-panel/panel-consolekit.h (revision 0)
++++ gnome-panel/gnome-panel/panel-consolekit.h (revision 0)
+@@ -0,0 +1,77 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
++ *
++ * Copyright (C) 2008 Jon McCann <jmccann(a)redhat.com>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of the
++ * License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++ * 02111-1307, USA.
++ *
++ * Authors:
++ * Jon McCann <jmccann(a)redhat.com>
++ */
++
++#ifndef PANEL_CONSOLEKIT_H
++#define PANEL_CONSOLEKIT_H
++
++#include <glib.h>
++#include <glib-object.h>
++
++G_BEGIN_DECLS
++
++#define PANEL_TYPE_CONSOLEKIT (panel_consolekit_get_type ())
++#define PANEL_CONSOLEKIT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
PANEL_TYPE_CONSOLEKIT, PanelConsolekit))
++#define PANEL_CONSOLEKIT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass),
PANEL_TYPE_CONSOLEKIT, PanelConsolekitClass))
++#define PANEL_IS_CONSOLEKIT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj),
PANEL_TYPE_CONSOLEKIT))
++#define PANEL_IS_CONSOLEKIT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),
PANEL_TYPE_CONSOLEKIT))
++#define PANEL_CONSOLEKIT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj),
PANEL_TYPE_CONSOLEKIT, PanelConsolekitClass))
++#define PANEL_CONSOLEKIT_ERROR (panel_consolekit_error_quark ())
++
++typedef struct _PanelConsolekit PanelConsolekit;
++typedef struct _PanelConsolekitClass PanelConsolekitClass;
++typedef struct _PanelConsolekitPrivate PanelConsolekitPrivate;
++typedef enum _PanelConsolekitError PanelConsolekitError;
++
++struct _PanelConsolekit {
++ GObject parent;
++ PanelConsolekitPrivate *priv;
++};
++
++struct _PanelConsolekitClass {
++ GObjectClass parent_class;
++
++ void (* request_completed) (PanelConsolekit *manager,
++ GError *error);
++};
++
++enum _PanelConsolekitError {
++ PANEL_CONSOLEKIT_ERROR_RESTARTING = 0,
++ PANEL_CONSOLEKIT_ERROR_STOPPING
++};
++
++GType panel_consolekit_get_type (void);
++GQuark panel_consolekit_error_quark (void);
++
++PanelConsolekit *panel_consolekit_new (void) G_GNUC_MALLOC;
++
++gboolean panel_consolekit_can_stop (PanelConsolekit *manager);
++gboolean panel_consolekit_can_restart (PanelConsolekit *manager);
++
++void panel_consolekit_attempt_stop (PanelConsolekit *manager);
++void panel_consolekit_attempt_restart (PanelConsolekit *manager);
++
++PanelConsolekit *panel_get_consolekit (void);
++
++G_END_DECLS
++
++#endif /* PANEL_CONSOLEKIT_H */
+Index: gnome-panel/gnome-panel/panel-logout.c
+===================================================================
+--- gnome-panel/gnome-panel/panel-logout.c (revision 10754)
++++ gnome-panel/gnome-panel/panel-logout.c (working copy)
+@@ -1,4 +1,5 @@
+-/*
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
++ *
+ * panel-logout.c:
+ *
+ * Copyright (C) 2006 Vincent Untz
+@@ -33,6 +34,7 @@
+ #include "panel-logout.h"
+ #include "panel-gdm.h"
+ #include "panel-power-manager.h"
++#include "panel-consolekit.h"
+ #include "panel-session.h"
+ #include "panel-icon-names.h"
+
+@@ -53,6 +55,7 @@ struct _PanelLogoutDialogPrivate {
+ PanelLogoutDialogType type;
+
+ PanelPowerManager *power_manager;
++ PanelConsolekit *consolekit;
+
+ int timeout;
+ unsigned int timeout_id;
+@@ -74,7 +77,7 @@ enum {
+ };
+ G_DEFINE_TYPE (PanelLogoutDialog, panel_logout, GTK_TYPE_MESSAGE_DIALOG);
+
+-static void
++static void
+ panel_logout_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+@@ -89,7 +92,7 @@ panel_logout_set_property (GObject
+ }
+ }
+
+-static void
++static void
+ panel_logout_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+@@ -142,6 +145,7 @@ panel_logout_init (PanelLogoutDialog *lo
+ gtk_window_stick (GTK_WINDOW (logout_dialog));
+
+ logout_dialog->priv->power_manager = panel_get_power_manager ();
++ logout_dialog->priv->consolekit = panel_get_consolekit ();
+
+ g_signal_connect (logout_dialog, "destroy",
+ G_CALLBACK (panel_logout_destroy), NULL);
+@@ -159,37 +163,91 @@ panel_logout_destroy (PanelLogoutDialog
+
+ g_object_unref (logout_dialog->priv->power_manager);
+ logout_dialog->priv->power_manager = NULL;
++ g_object_unref (logout_dialog->priv->consolekit);
++ logout_dialog->priv->consolekit = NULL;
+
+ current_dialog = NULL;
+ }
+
++static gboolean
++panel_logout_supports_reboot (PanelLogoutDialog *logout_dialog)
++{
++ gboolean ret;
++
++ ret = panel_consolekit_can_restart (logout_dialog->priv->consolekit);
++ if (! ret) {
++ ret = gdm_supports_logout_action (GDM_LOGOUT_ACTION_REBOOT);
++ }
++ return ret;
++}
++
++static gboolean
++panel_logout_supports_shutdown (PanelLogoutDialog *logout_dialog)
++{
++ gboolean ret;
++
++ ret = panel_consolekit_can_stop (logout_dialog->priv->consolekit);
++ if (! ret) {
++ ret = gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN);
++ }
++ return ret;
++}
++
++static void
++do_request_logout (PanelConsolekit *consolekit)
++{
++ gdm_set_logout_action (GDM_LOGOUT_ACTION_NONE);
++ panel_session_request_logout ();
++}
++
++static void
++do_request_reboot (PanelConsolekit *consolekit)
++{
++ if (panel_consolekit_can_restart (consolekit)) {
++ panel_consolekit_attempt_restart (consolekit);
++ } else {
++ gdm_set_logout_action (GDM_LOGOUT_ACTION_REBOOT);
++ panel_session_request_logout ();
++ }
++}
++
++static void
++do_request_shutdown (PanelConsolekit *consolekit)
++{
++ if (panel_consolekit_can_stop (consolekit)) {
++ panel_consolekit_attempt_stop (consolekit);
++ } else {
++ gdm_set_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN);
++ panel_session_request_logout ();
++ }
++}
++
+ static void
+ panel_logout_response (PanelLogoutDialog *logout_dialog,
+ guint response_id,
+ gpointer data)
+ {
+ PanelPowerManager *power_manager;
++ PanelConsolekit *consolekit;
+
+ power_manager = g_object_ref (logout_dialog->priv->power_manager);
++ consolekit = g_object_ref (logout_dialog->priv->consolekit);
+ gtk_widget_destroy (GTK_WIDGET (logout_dialog));
+
+ switch (response_id) {
+ case GTK_RESPONSE_CANCEL:
+ break;
+ case PANEL_LOGOUT_RESPONSE_LOGOUT:
+- gdm_set_logout_action (GDM_LOGOUT_ACTION_NONE);
+- panel_session_request_logout ();
++ do_request_logout (consolekit);
+ break;
+ case PANEL_LOGOUT_RESPONSE_SWITCH_USER:
+ gdm_new_login ();
+ break;
+ case PANEL_LOGOUT_RESPONSE_SHUTDOWN:
+- gdm_set_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN);
+- panel_session_request_logout ();
++ do_request_shutdown (consolekit);
+ break;
+ case PANEL_LOGOUT_RESPONSE_REBOOT:
+- gdm_set_logout_action (GDM_LOGOUT_ACTION_REBOOT);
+- panel_session_request_logout ();
++ do_request_reboot (consolekit);
+ break;
+ case PANEL_LOGOUT_RESPONSE_STD:
+ if (panel_power_manager_can_hibernate (power_manager))
+@@ -206,6 +264,7 @@ panel_logout_response (PanelLogoutDialog
+ g_assert_not_reached ();
+ }
+ g_object_unref (power_manager);
++ g_object_unref (consolekit);
+ }
+
+ static gboolean
+@@ -357,7 +416,7 @@ panel_logout_new (PanelLogoutDialogType
+ _("_Hibernate"),
+ PANEL_LOGOUT_RESPONSE_STD);
+
+- if (gdm_supports_logout_action (GDM_LOGOUT_ACTION_REBOOT))
++ if (panel_logout_supports_reboot (logout_dialog))
+ gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
+ _("_Restart"),
+ PANEL_LOGOUT_RESPONSE_REBOOT);
+@@ -366,7 +425,7 @@ panel_logout_new (PanelLogoutDialogType
+ GTK_STOCK_CANCEL,
+ GTK_RESPONSE_CANCEL);
+
+- if (gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN))
++ if (panel_logout_supports_shutdown (logout_dialog))
+ gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
+ _("_Shut Down"),
+ PANEL_LOGOUT_RESPONSE_SHUTDOWN);
+Index: gnome-panel/gnome-panel/panel-action-button.c
+===================================================================
+--- gnome-panel/gnome-panel/panel-action-button.c (revision 10754)
++++ gnome-panel/gnome-panel/panel-action-button.c (working copy)
+@@ -46,7 +46,6 @@
+ #include "panel-lockdown.h"
+ #include "panel-logout.h"
+ #include "panel-compatibility.h"
+-#include "panel-gdm.h"
+ #include "panel-icon-names.h"
+
+ G_DEFINE_TYPE (PanelActionButton, panel_action_button, BUTTON_TYPE_WIDGET);
+@@ -182,9 +181,7 @@ panel_action_shutdown (GtkWidget *widget
+ static gboolean
+ panel_action_shutdown_reboot_is_disabled (void)
+ {
+- return (panel_lockdown_get_disable_log_out() ||
+- (!gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN) &&
+- !gdm_supports_logout_action (GDM_LOGOUT_ACTION_REBOOT)));
++ return (panel_lockdown_get_disable_log_out());
+ }
+
+ /* Run Application
+Index: gnome-panel/gnome-panel/Makefile.am
+===================================================================
+--- gnome-panel/gnome-panel/Makefile.am (revision 10754)
++++ gnome-panel/gnome-panel/Makefile.am (working copy)
+@@ -16,6 +16,7 @@ INCLUDES = \
+ $(STANDARD_PROPERTIES_CFLAGS) \
+ $(PANEL_CFLAGS) \
+ $(PANELCONFIG_CFLAGS) \
++ $(POLKIT_GNOME_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(NULL)
+
+@@ -98,6 +99,7 @@ panel_sources = \
+ panel-logout.c \
+ panel-gdm.c \
+ panel-power-manager.c \
++ panel-consolekit.c \
+ panel-ditem-editor.c \
+ $(NULL)
+
+@@ -147,6 +149,7 @@ panel_headers = \
+ panel-logout.h \
+ panel-gdm.h \
+ panel-power-manager.h \
++ panel-consolekit.h \
+ panel-ditem-editor.h \
+ panel-icon-names.h \
+ $(NULL)
+@@ -159,6 +162,7 @@ gnome_panel_SOURCES = \
+
+ gnome_panel_LDADD = \
+ $(PANEL_LIBS) \
++ $(POLKIT_GNOME_LIBS) \
+ $(X_LIBS)
+
+ gnome_panel_LDFLAGS = -export-dynamic
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 70e966c..5947636 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.21.5
-Release: 1%{?dist}
+Release: 2%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.21/%{name}-%{version}.tar...
@@ -115,6 +115,9 @@ Patch12: more-sharp-icons.patch
# fix problems with the intlclock integration in 2.21.5
Patch13: glue.patch
+# fix problems with the intlclock integration in 2.21.5
+Patch14: gnome-panel-2.21.5-ck-shutdown.patch
+
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -162,6 +165,7 @@ Panel Applets using the libpanel-applet library.
%patch11 -p1 -b .applet-error
%patch12 -p1 -b .more-sharp-icons
%patch13 -p1 -b .glue
+%patch14 -p1 -b .ck-shutdown
. %{SOURCE6}
@@ -345,6 +349,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Fri Jan 25 2008 Jon McCann <jmccann(a)redhat.com> - 2.21.5-2
+- Add ConsoleKit restart/shutdown support
+
* Wed Jan 16 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.5-1
- Update to 2.21.5
- Drop separate intlclock
commit 4f11e7cfeb86aaa47a5c9827d59153f5a8fcdc78
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Jan 16 16:16:53 2008 +0000
forgotten patch
diff --git a/glue.patch b/glue.patch
new file mode 100644
index 0000000..dd5aac7
--- /dev/null
+++ b/glue.patch
@@ -0,0 +1,130 @@
+diff -up gnome-panel-2.21.5/applets/clock/gnome-clock-applet-mechanism.policy.glue
gnome-panel-2.21.5/applets/clock/gnome-clock-applet-mechanism.policy
+--- gnome-panel-2.21.5/applets/clock/gnome-clock-applet-mechanism.policy.glue 2008-01-16
10:57:15.000000000 -0500
++++ gnome-panel-2.21.5/applets/clock/gnome-clock-applet-mechanism.policy 2008-01-16
10:56:56.000000000 -0500
+@@ -0,0 +1,37 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE policyconfig PUBLIC
++ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
++ "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
++
++<!-- needs i18n work -->
++
++<policyconfig>
++
++ <action id="org.gnome.clockapplet.mechanism.settimezone">
++ <description>Change system time zone</description>
++ <message>Changing the system time zone requires privileges.</message>
++ <defaults>
++ <allow_inactive>no</allow_inactive>
++ <allow_active>auth_self_keep_always</allow_active>
++ </defaults>
++ </action>
++
++ <action id="org.gnome.clockapplet.mechanism.settime">
++ <description>Change system time</description>
++ <message>Changing the system time requires privileges.</message>
++ <defaults>
++ <allow_inactive>no</allow_inactive>
++ <allow_active>auth_self_keep_always</allow_active>
++ </defaults>
++ </action>
++
++ <action id="org.gnome.clockapplet.mechanism.configurehwclock">
++ <description>Configure hardware clock</description>
++ <message>Configuring the hardware clock requires privileges.</message>
++ <defaults>
++ <allow_inactive>no</allow_inactive>
++ <allow_active>auth_self_keep_always</allow_active>
++ </defaults>
++ </action>
++
++</policyconfig>
+diff -up gnome-panel-2.21.5/applets/clock/Makefile.am.glue
gnome-panel-2.21.5/applets/clock/Makefile.am
+--- gnome-panel-2.21.5/applets/clock/Makefile.am.glue 2008-01-14 18:05:22.000000000
-0500
++++ gnome-panel-2.21.5/applets/clock/Makefile.am 2008-01-16 10:54:37.000000000 -0500
+@@ -138,7 +138,7 @@ gnome_clock_applet_mechanism_SOURCES =
+ gnome-clock-applet-mechanism-main.c
+
+ if HAVE_POLKIT
+-BUILT_SOURCES += gnome-clock-applet-mechanism.h
++BUILT_SOURCES += gnome-clock-applet-mechanism-glue.h
+ endif
+
+ gnome_clock_applet_mechanism_INCLUDES = \
+diff -up gnome-panel-2.21.5/applets/clock/Makefile.in.glue
gnome-panel-2.21.5/applets/clock/Makefile.in
+--- gnome-panel-2.21.5/applets/clock/Makefile.in.glue 2008-01-14 18:18:16.000000000
-0500
++++ gnome-panel-2.21.5/applets/clock/Makefile.in 2008-01-16 10:54:43.000000000 -0500
+@@ -34,7 +34,7 @@ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-@HAVE_POLKIT_TRUE@am__append_1 = gnome-clock-applet-mechanism.h
++@HAVE_POLKIT_TRUE@am__append_1 = gnome-clock-applet-mechanism-glue.h
+ @CLOCK_INPROCESS_FALSE@libexec_PROGRAMS = clock-applet$(EXEEXT) \
+ @CLOCK_INPROCESS_FALSE@ $(am__EXEEXT_1)
+ @CLOCK_INPROCESS_TRUE@libexec_PROGRAMS = $(am__EXEEXT_1)
+@@ -43,6 +43,7 @@ subdir = applets/clock
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/d-type.m4 \
++ $(top_srcdir)/m4/gnome-compiler-flags.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
+ $(top_srcdir)/configure.in
+@@ -80,7 +81,7 @@ am__libclock_applet_la_SOURCES_DIST = ca
+ clock-zonetable.c clock-zonetable.h gweather-xml.c \
+ gweather-xml.h clock-marshallers.c clock-marshallers.h \
+ clock-typebuiltins.c clock-typebuiltins.h \
+- gnome-clock-applet-mechanism.h calendar-client.c \
++ gnome-clock-applet-mechanism-glue.h calendar-client.c \
+ calendar-client.h calendar-sources.c calendar-sources.h \
+ calendar-debug.h set-timezone-dummy.c set-timezone.h \
+ set-timezone.c
+@@ -132,7 +133,7 @@ am__clock_applet_SOURCES_DIST = calendar
+ clock-zoneinfo.h clock-zonetable.c clock-zonetable.h \
+ gweather-xml.c gweather-xml.h clock-marshallers.c \
+ clock-marshallers.h clock-typebuiltins.c clock-typebuiltins.h \
+- gnome-clock-applet-mechanism.h calendar-client.c \
++ gnome-clock-applet-mechanism-glue.h calendar-client.c \
+ calendar-client.h calendar-sources.c calendar-sources.h \
+ calendar-debug.h set-timezone-dummy.c set-timezone.h \
+ set-timezone.c
+@@ -346,6 +347,7 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+diff -up /dev/null
gnome-panel-2.21.5/applets/clock/org.gnome.ClockApplet.Mechanism.service.in
+--- /dev/null 2008-01-16 08:23:02.430982355 -0500
++++
gnome-panel-2.21.5/applets/clock/org.gnome.ClockApplet.Mechanism.service.in 2008-01-16
10:54:37.000000000 -0500
+@@ -0,0 +1,4 @@
++[D-BUS Service]
++Name=org.gnome.ClockApplet.Mechanism
++Exec=@LIBEXECDIR@/gnome-clock-applet-mechanism
++User=root
+diff -up /dev/null gnome-panel-2.21.5/applets/clock/org.gnome.ClockApplet.Mechanism.conf
+--- /dev/null 2008-01-16 08:23:02.430982355 -0500
++++ gnome-panel-2.21.5/applets/clock/org.gnome.ClockApplet.Mechanism.conf 2008-01-16
10:54:37.000000000 -0500
+@@ -0,0 +1,19 @@
++<?xml version="1.0" encoding="UTF-8"?> <!-- -*- XML -*-
-->
++
++<!DOCTYPE busconfig PUBLIC
++ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
++ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
++<busconfig>
++
++ <!-- Only root can own the service -->
++ <policy user="root">
++ <allow own="org.gnome.ClockApplet.Mechanism"/>
++ <allow
send_interface="org.gnome.ClockApplet.Mechanism.SetTimezoneInterface"/>
++ </policy>
++
++ <!-- Allow anyone to invoke methods on the interfaces -->
++ <policy context="default">
++ <allow
send_interface="org.gnome.ClockApplet.Mechanism.SetTimezoneInterface"/>
++ </policy>
++
++</busconfig>
commit 4c266738a5c2e52f112a7d380c8f818c7677d40d
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Jan 16 16:03:39 2008 +0000
fix the build
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 4f57769..70e966c 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -112,6 +112,9 @@ Patch11: applet-error.patch
# try to deal with the 22/24 madness in icon themes
Patch12: more-sharp-icons.patch
+# fix problems with the intlclock integration in 2.21.5
+Patch13: glue.patch
+
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -158,6 +161,7 @@ Panel Applets using the libpanel-applet library.
%patch10 -p1 -b .preferred-apps
%patch11 -p1 -b .applet-error
%patch12 -p1 -b .more-sharp-icons
+%patch13 -p1 -b .glue
. %{SOURCE6}
@@ -329,7 +333,6 @@ fi
%{_sysconfdir}/dbus-1/system.d/org.gnome.ClockApplet.Mechanism.conf
%{_datadir}/dbus-1/system-services/org.gnome.ClockApplet.Mechanism.service
%{_datadir}/PolicyKit/policy/gnome-clock-applet-mechanism.policy
-%{_datadir}/clock
%files libs
%{_libdir}/*.so.*
commit 569d2a8aac12ba59e0aa6fce64a23c2e3658d30c
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Jan 16 06:57:31 2008 +0000
fix spec
diff --git a/gnome-panel.spec b/gnome-panel.spec
index f5962f2..4f57769 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -82,6 +82,7 @@ BuildRequires: ORBit2-devel >= %{orbit_version}
BuildRequires: dbus-devel >= %{dbus_version}
%endif
BuildRequires: PolicyKit-devel
+BuildRequires: PolicyKit-gnome-devel
BuildRequires: libgweather-devel
BuildRequires: librsvg2-devel
BuildRequires: NetworkManager-devel
commit b05703cb37528dd2d174e7b2ad195ca4f9b59e6c
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Jan 16 06:36:33 2008 +0000
fix build
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 4ea9186..f5962f2 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -179,7 +179,7 @@ autoconf
--enable-eds=no
%endif
-make
+make CFLAGS="$RPM_CFLAGS -DGWEATHER_I_KNOW_THIS_IS_UNSTABLE"
%install
rm -rf $RPM_BUILD_ROOT
commit def1bc7cccbee6fd34b54593456a465139dd5b98
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Jan 16 06:00:57 2008 +0000
2.21.5
diff --git a/.cvsignore b/.cvsignore
index 5300989..434ebc3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.20.2.tar.bz2
+gnome-panel-2.21.5.tar.bz2
diff --git a/dont-build-clock.patch b/dont-build-clock.patch
deleted file mode 100644
index 4b88fe6..0000000
--- a/dont-build-clock.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -up gnome-panel-2.20.0.1/Makefile.am.replace-clock-by-intlclock
gnome-panel-2.20.0.1/Makefile.am
-diff -up gnome-panel-2.20.0.1/applets/Makefile.am.replace-clock-by-intlclock
gnome-panel-2.20.0.1/applets/Makefile.am
---- gnome-panel-2.20.0.1/applets/Makefile.am.replace-clock-by-intlclock 2007-10-05
10:04:56.000000000 -0400
-+++ gnome-panel-2.20.0.1/applets/Makefile.am 2007-10-05 10:05:03.000000000 -0400
-@@ -1,5 +1,4 @@
- SUBDIRS = \
-- clock \
- fish \
- notification_area \
- wncklet
diff --git a/gnome-panel-2.19.5-launcher-tooltip.patch
b/gnome-panel-2.19.5-launcher-tooltip.patch
deleted file mode 100644
index 60e6e44..0000000
--- a/gnome-panel-2.19.5-launcher-tooltip.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -up gnome-panel-2.19.5/gnome-panel/panel-util.c.launcher-tooltip
gnome-panel-2.19.5/gnome-panel/panel-util.c
---- gnome-panel-2.19.5/gnome-panel/panel-util.c.launcher-tooltip 2007-07-24
13:16:07.000000000 -0400
-+++ gnome-panel-2.19.5/gnome-panel/panel-util.c 2007-07-24 13:16:10.000000000 -0400
-@@ -1580,6 +1580,12 @@ void
- panel_util_set_tooltip_text (GtkWidget *widget,
- const char *text)
- {
-+ g_signal_handlers_disconnect_matched (widget,
-+ G_SIGNAL_MATCH_FUNC,
-+ 0, 0, NULL,
-+ panel_util_query_tooltip_cb,
-+ NULL);
-+
- if (string_empty (text)) {
- g_object_set (widget, "has-tooltip", FALSE, NULL);
- return;
diff --git a/gnome-panel.spec b/gnome-panel.spec
index ace997f..4ea9186 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -18,22 +18,13 @@
%define gnome_doc_utils_version 0.3.2
%define use_evolution_data_server 1
-%define build_intlclock 1
Summary: GNOME panel
Name: gnome-panel
-Version: 2.20.2
-Release: 2%{?dist}
+Version: 2.21.5
+Release: 1%{?dist}
URL:
http://www.gnome.org
-Source0:
http://download.gnome.org/sources/gnome-panel/2.20/%{name}-%{version}.tar...
-# we are upstream for this
-Source1: timezone.tar.gz
-# Novell intlclock, I don't think this has a canonical upstream location
-Source2: intlclock-20071113.tar.gz
-Patch98: timezone-changes.patch
-Patch100: dont-build-clock.patch
-Patch101: intlclock-build-fixes.patch
-Patch102: gweather-api.patch
+Source0:
http://download.gnome.org/sources/gnome-panel/2.21/%{name}-%{version}.tar...
Source3: redhat-panel-default-setup.entries
Source4: gnome-compiler-flags.m4
@@ -90,14 +81,10 @@ BuildRequires: evolution-data-server-devel >=
%{evolution_data_server_version}
BuildRequires: ORBit2-devel >= %{orbit_version}
BuildRequires: dbus-devel >= %{dbus_version}
%endif
-
-%if %{build_intlclock}
-# for intlclock
BuildRequires: PolicyKit-devel
-BuildRequires: gnome-applets-devel
+BuildRequires: libgweather-devel
BuildRequires: librsvg2-devel
BuildRequires: NetworkManager-devel
-%endif
Patch0: gnome-panel-2.19.5-vendor.patch
Patch1: gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch
@@ -157,12 +144,6 @@ Panel Applets using the libpanel-applet library.
%prep
%setup -q -n %{name}-%{version}
-tar xzf %{SOURCE1}
-pushd timezone
-%patch98 -p1 -b .timezone-changes
-popd
-
-tar xzf %{SOURCE2}
%patch0 -p1 -b .vendor
%patch1 -p1 -b .speak-to-us-ye-old-wise-fish
@@ -177,10 +158,6 @@ tar xzf %{SOURCE2}
%patch11 -p1 -b .applet-error
%patch12 -p1 -b .more-sharp-icons
-%patch100 -p1 -b .dont-build-clock
-%patch101 -p1 -b .intlclock-build-fixes
-%patch102 -p1 -b .gweather-api
-
. %{SOURCE6}
cp -f %{SOURCE3} gnome-panel/panel-default-setup.entries
@@ -204,22 +181,6 @@ autoconf
make
-%if %{build_intlclock}
-pushd timezone
-make
-popd
-
-pushd intlclock-1.0
-intltoolize --force --copy
-aclocal
-automake --add-missing
-autoheader
-autoconf
-%configure
-make
-popd
-%endif
-
%install
rm -rf $RPM_BUILD_ROOT
@@ -227,16 +188,6 @@ export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make DESTDIR=$RPM_BUILD_ROOT install
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-%if %{build_intlclock}
-pushd timezone
-make DESTDIR=$RPM_BUILD_ROOT install
-popd
-
-pushd intlclock-1.0
-make DESTDIR=$RPM_BUILD_ROOT install
-popd
-%endif
-
#
# Create pager and tasklist schemas for compatibility with older
# configurations which reference the old schema names
@@ -286,7 +237,7 @@ gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE
--recursive-unset /sch
# Install the schemas
#
gconftool-2 --makefile-install-rule \
- %{_sysconfdir}/gconf/schemas/intlclock.schemas \
+ %{_sysconfdir}/gconf/schemas/clock.schemas \
%{_sysconfdir}/gconf/schemas/fish.schemas \
%{_sysconfdir}/gconf/schemas/pager.schemas \
%{_sysconfdir}/gconf/schemas/panel-compatibility.schemas \
@@ -311,7 +262,7 @@ gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --load
%{_sysconfdir}/
if [ "$1" -gt 1 ]; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule \
- %{_sysconfdir}/gconf/schemas/intlclock.schemas \
+ %{_sysconfdir}/gconf/schemas/clock.schemas \
%{_sysconfdir}/gconf/schemas/fish.schemas \
%{_sysconfdir}/gconf/schemas/pager.schemas \
%{_sysconfdir}/gconf/schemas/panel-compatibility.schemas \
@@ -329,7 +280,7 @@ fi
if [ "$1" -eq 0 ]; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule \
- %{_sysconfdir}/gconf/schemas/intlclock.schemas \
+ %{_sysconfdir}/gconf/schemas/clock.schemas \
%{_sysconfdir}/gconf/schemas/fish.schemas \
%{_sysconfdir}/gconf/schemas/pager.schemas \
%{_sysconfdir}/gconf/schemas/panel-compatibility.schemas \
@@ -374,18 +325,10 @@ fi
%{_sysconfdir}/gconf/schemas/*.schemas
%{_sysconfdir}/gconf/schemas/*.entries
-%if %{build_intlclock}
-# intlclock files
%{_sysconfdir}/dbus-1/system.d/org.gnome.ClockApplet.Mechanism.conf
%{_datadir}/dbus-1/system-services/org.gnome.ClockApplet.Mechanism.service
%{_datadir}/PolicyKit/policy/gnome-clock-applet-mechanism.policy
-%{_datadir}/intlclock
-%{_libexecdir}/intlclock-applet
-%{_libexecdir}/gnome-clock-applet-mechanism
-%{_bindir}/gnome-clock-applet-mechanism-gtk
-%{_sysconfdir}/gconf/schemas/intlclock.schemas
-%{_libdir}/bonobo/servers/GNOME_IntlClockApplet_Factory.server
-%endif
+%{_datadir}/clock
%files libs
%{_libdir}/*.so.*
@@ -398,6 +341,10 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Wed Jan 16 2008 Matthias Clasen <mclasen(a)redhat.com> - 2.21.5-1
+- Update to 2.21.5
+- Drop separate intlclock
+
* Thu Dec 13 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.2-2
- Adapt to libgweather api changes
diff --git a/gweather-api.patch b/gweather-api.patch
deleted file mode 100644
index 5b5eed0..0000000
--- a/gweather-api.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -up gnome-panel-2.20.2/intlclock-1.0/src/intlclock-location-tile.c.gweatherapi
gnome-panel-2.20.2/intlclock-1.0/src/intlclock-location-tile.c
---- gnome-panel-2.20.2/intlclock-1.0/src/intlclock-location-tile.c.gweatherapi 2007-12-13
13:10:34.000000000 +0100
-+++ gnome-panel-2.20.2/intlclock-1.0/src/intlclock-location-tile.c 2007-12-13
13:26:32.000000000 +0100
-@@ -455,10 +455,15 @@ void
- weather_info_setup_tooltip (WeatherInfo *info, GtkTooltip *tooltip)
- {
- GdkPixbuf *pixbuf = NULL;
-+ GtkIconTheme *theme = NULL;
- gchar *conditions, *temp, *apparent, *wind;
- gchar *line1, *line2, *line3, *line4, *tip;
-+ const gchar *icon_name;
-
-- weather_info_get_pixbuf (info, &pixbuf);
-+ icon_name = weather_info_get_icon_name (info);
-+ theme = gtk_icon_theme_get_default ();
-+ pixbuf = gtk_icon_theme_load_icon (theme, icon_name, 48, 0, NULL);
-+
- if (pixbuf)
- gtk_tooltip_set_icon (tooltip, pixbuf);
-
-@@ -526,12 +531,16 @@ update_weather_icon (IntlClockLocation *
- IntlClockLocationTile *tile = data;
- IntlClockLocationTilePrivate *priv = PRIVATE (tile);
- GdkPixbuf *pixbuf = NULL;
-+ GtkIconTheme *theme = NULL;
-+ const gchar *icon_name;
- const gchar *temp = NULL;
-
- if (!info || !weather_info_is_valid (info))
- return;
-
-- weather_info_get_pixbuf_mini (info, &pixbuf);
-+ icon_name = weather_info_get_icon_name (info);
-+ theme = gtk_icon_theme_get_default ();
-+ pixbuf = gtk_icon_theme_load_icon (theme, icon_name, 16, 0, NULL);
- temp = weather_info_get_temp_summary (info);
-
- if (pixbuf) {
diff --git a/intlclock-build-fixes.patch b/intlclock-build-fixes.patch
deleted file mode 100644
index 9c6f278..0000000
--- a/intlclock-build-fixes.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -up gnome-panel-2.20.0.1/intlclock-1.0/src/Makefile.am.intlclock-build-fixes
gnome-panel-2.20.0.1/intlclock-1.0/src/Makefile.am
---- gnome-panel-2.20.0.1/intlclock-1.0/src/Makefile.am.intlclock-build-fixes 2007-10-05
11:43:24.000000000 -0400
-+++ gnome-panel-2.20.0.1/intlclock-1.0/src/Makefile.am 2007-10-05 11:46:42.000000000
-0400
-@@ -1,6 +1,8 @@
- ## We put the libpanel-applet dir here for when we build the applet
- ## inside the gnome-panel source tree
- INCLUDES = \
-+ -I$(srcdir)/../../libpanel-applet \
-+ -I$(top_builddir)/libpanel-applet \
- $(INTLCLOCK_CFLAGS) \
- -DGNOMELOCALEDIR=\"$(prefix)/$(DATADIRNAME)/locale\" \
- -DEVOLUTION_TEXTDOMAIN=\"evolution-2.12\" \
-@@ -28,7 +30,6 @@ intlclock-marshallers.c: intlclock-marsh
- intlclock-marshallers.h: intlclock-marshallers.list
- glib-genmarshal --prefix _intlclock_marshal --header $< > $@
-
--noinst_PROGRAMS = intlclock-standalone
- libexec_PROGRAMS = intlclock-applet
-
- COMMON_SOURCES = \
-@@ -75,7 +76,10 @@ intlclock_standalone_SOURCES = \
- $(COMMON_SOURCES) \
- standalone.c
-
--intlclock_applet_LDADD = $(INTLCLOCK_LIBS)
-+intlclock_applet_LDADD = \
-+ ../../libpanel-applet/libpanel-applet-2.la \
-+ $(INTLCLOCK_LIBS)
-+
- intlclock_standalone_LDADD = $(INTLCLOCK_LIBS)
-
- EXTRA_DIST = intlclock-marshallers.list
-diff -up gnome-panel-2.20.0.1/intlclock-1.0/configure.in.intlclock-build-fixes
gnome-panel-2.20.0.1/intlclock-1.0/configure.in
---- gnome-panel-2.20.0.1/intlclock-1.0/configure.in.intlclock-build-fixes 2007-10-05
11:43:24.000000000 -0400
-+++ gnome-panel-2.20.0.1/intlclock-1.0/configure.in 2007-10-05 11:43:24.000000000 -0400
-@@ -59,7 +59,7 @@ if test -n "$LIBECAL_REQUIREMENT"; then
- fi
- AM_CONDITIONAL(HAVE_LIBECAL, test -n "$LIBECAL_REQUIREMENT")
-
--PKG_CHECK_MODULES(INTLCLOCK, [ glib-2.0 gobject-2.0 gtk+-2.0 gdk-2.0 librsvg-2.0
libpanelapplet-2.0 libgnome-2.0 gconf-2.0 $LIBECAL_REQUIREMENT dbus-glib-1 gweather
libxml-2.0 polkit polkit-dbus ])
-+PKG_CHECK_MODULES(INTLCLOCK, [ glib-2.0 gobject-2.0 gtk+-2.0 gdk-2.0 librsvg-2.0
libgnome-2.0 libgnomeui-2.0 libbonobo-2.0 gconf-2.0 $LIBECAL_REQUIREMENT dbus-glib-1
gweather libxml-2.0 polkit polkit-dbus ])
-
- AC_SUBST(INTLCLOCK_CFLAGS)
- AC_SUBST(INTLCLOCK_LIBS)
diff --git a/power-management.patch b/power-management.patch
deleted file mode 100644
index 756744d..0000000
--- a/power-management.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -up gnome-panel-2.19.5/gnome-panel/panel-power-manager.c.power-management
gnome-panel-2.19.5/gnome-panel/panel-power-manager.c
---- gnome-panel-2.19.5/gnome-panel/panel-power-manager.c.power-management 2007-07-25
17:55:32.000000000 -0400
-+++ gnome-panel-2.19.5/gnome-panel/panel-power-manager.c 2007-07-25 17:55:37.000000000
-0400
-@@ -129,7 +129,7 @@ panel_power_manager_on_name_owner_change
- const char *new_owner,
- PanelPowerManager *manager)
- {
-- if (strcmp (name, "org.gnome.PowerManager") != 0)
-+ if (strcmp (name, "org.freedesktop.PowerManagement") != 0)
- return;
-
- if (manager->priv->gpm_proxy != NULL) {
-@@ -189,9 +189,9 @@ panel_power_manager_ensure_gpm_connectio
- manager->priv->gpm_proxy =
- dbus_g_proxy_new_for_name_owner (
- manager->priv->dbus_connection,
-- "org.gnome.PowerManager",
-- "/org/gnome/PowerManager",
-- "org.gnome.PowerManager",
-+ "org.freedesktop.PowerManagement",
-+ "/org/freedesktop/PowerManagement",
-+ "org.freedesktop.PowerManagement",
- &connection_error);
-
- if (manager->priv->gpm_proxy == NULL) {
-@@ -324,7 +324,7 @@ panel_power_manager_can_suspend (PanelPo
- }
-
- can_suspend = FALSE;
-- if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "AllowedSuspend",
-+ if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "CanSuspend",
- &error,
- G_TYPE_INVALID,
- G_TYPE_BOOLEAN, &can_suspend, G_TYPE_INVALID)) {
-@@ -355,7 +355,7 @@ panel_power_manager_can_hibernate (Panel
- }
-
- can_hibernate = FALSE;
-- if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "AllowedHibernate",
-+ if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "CanHibernate",
- &error,
- G_TYPE_INVALID,
- G_TYPE_BOOLEAN, &can_hibernate, G_TYPE_INVALID)) {
diff --git a/sources b/sources
index 769d90b..3f50754 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-400924a82c03ec04f7842348625e1f4a gnome-panel-2.20.2.tar.bz2
-7c313b9d3d3d659af4abf8119b5ecab7 intlclock-20071113.tar.gz
-717506485ee954b1d7ac6d2bfb3bb4f9 timezone.tar.gz
+967f0fc60b069921095ee642fcea1f55 gnome-panel-2.21.5.tar.bz2
diff --git a/timezone-changes.patch b/timezone-changes.patch
deleted file mode 100644
index 847135b..0000000
--- a/timezone-changes.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -up timezone/Makefile.timezone-changes timezone/Makefile
---- timezone/Makefile.timezone-changes 2007-09-28 18:44:36.000000000 -0400
-+++ timezone/Makefile 2007-10-05 01:22:40.000000000 -0400
-@@ -11,18 +11,23 @@ gnome-clock-applet-mechanism-gtk : demo.
- gcc -g -o gnome-clock-applet-mechanism-gtk `pkg-config --libs --cflags gthread-2.0
dbus-glib-1 gtk+-2.0` demo.c
-
- install:
-- cp org.gnome.ClockApplet.Mechanism.service /usr/share/dbus-1/system-services
-- cp org.gnome.ClockApplet.Mechanism.conf /etc/dbus-1/system.d
-- cp gnome-clock-applet-mechanism /usr/libexec
-- cp gnome-clock-applet-mechanism-gtk /usr/bin
-- cp gnome-clock-applet-mechanism.policy /usr/share/PolicyKit/policy
-+ ../mkinstalldirs $(DESTDIR)/usr/share/dbus-1/system-services
-+ cp org.gnome.ClockApplet.Mechanism.service $(DESTDIR)/usr/share/dbus-1/system-services
-+ ../mkinstalldirs $(DESTDIR)/etc/dbus-1/system.d
-+ cp org.gnome.ClockApplet.Mechanism.conf $(DESTDIR)/etc/dbus-1/system.d
-+ ../mkinstalldirs $(DESTDIR)/usr/libexec
-+ cp gnome-clock-applet-mechanism $(DESTDIR)/usr/libexec
-+ ../mkinstalldirs $(DESTDIR)/usr/bin
-+ cp gnome-clock-applet-mechanism-gtk $(DESTDIR)/usr/bin
-+ ../mkinstalldirs $(DESTDIR)/usr/share/PolicyKit/policy
-+ cp gnome-clock-applet-mechanism.policy $(DESTDIR)/usr/share/PolicyKit/policy
-
- uninstall:
-- rm -f /usr/share/dbus-1/system-services/org.gnome.ClockApplet.Mechanism.service
-- rm -f /etc/dbus-1/system.d/org.gnome.ClockApplet.Mechanism.conf
-- rm -f /usr/libexec/gnome-clock-applet-mechanism
-- rm -f /usr/bin/gnome-clock-applet-mechanism-gtk
-- rm -f /usr/share/PolicyKit/policy/gnome-clock-applet-mechanism.policy
-+ rm -f
$(DESTDIR)/usr/share/dbus-1/system-services/org.gnome.ClockApplet.Mechanism.service
-+ rm -f $(DESTDIR)/etc/dbus-1/system.d/org.gnome.ClockApplet.Mechanism.conf
-+ rm -f $(DESTDIR)/usr/libexec/gnome-clock-applet-mechanism
-+ rm -f $(DESTDIR)/usr/bin/gnome-clock-applet-mechanism-gtk
-+ rm -f $(DESTDIR)/usr/share/PolicyKit/policy/gnome-clock-applet-mechanism.policy
-
- test:
- dbus-send --system --print-reply --dest=org.gnome.ClockApplet.Mechanism /
org.freedesktop.DBus.Introspectable.Introspect
commit 6e71d467cba2a43a30b7c58516e0896a54b4ef7f
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Thu Dec 13 14:38:22 2007 +0000
Adapt to libgweather api changes
diff --git a/gnome-panel.spec b/gnome-panel.spec
index e3eba50..ace997f 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -23,7 +23,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.20.2
-Release: 1%{?dist}
+Release: 2%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.20/%{name}-%{version}.tar...
# we are upstream for this
@@ -33,6 +33,7 @@ Source2: intlclock-20071113.tar.gz
Patch98: timezone-changes.patch
Patch100: dont-build-clock.patch
Patch101: intlclock-build-fixes.patch
+Patch102: gweather-api.patch
Source3: redhat-panel-default-setup.entries
Source4: gnome-compiler-flags.m4
@@ -178,6 +179,7 @@ tar xzf %{SOURCE2}
%patch100 -p1 -b .dont-build-clock
%patch101 -p1 -b .intlclock-build-fixes
+%patch102 -p1 -b .gweather-api
. %{SOURCE6}
@@ -396,6 +398,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Thu Dec 13 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.2-2
+- Adapt to libgweather api changes
+
* Tue Nov 27 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.2-1
- Update to 2.20.2 (translation updates)
diff --git a/gweather-api.patch b/gweather-api.patch
new file mode 100644
index 0000000..5b5eed0
--- /dev/null
+++ b/gweather-api.patch
@@ -0,0 +1,38 @@
+diff -up gnome-panel-2.20.2/intlclock-1.0/src/intlclock-location-tile.c.gweatherapi
gnome-panel-2.20.2/intlclock-1.0/src/intlclock-location-tile.c
+--- gnome-panel-2.20.2/intlclock-1.0/src/intlclock-location-tile.c.gweatherapi 2007-12-13
13:10:34.000000000 +0100
++++ gnome-panel-2.20.2/intlclock-1.0/src/intlclock-location-tile.c 2007-12-13
13:26:32.000000000 +0100
+@@ -455,10 +455,15 @@ void
+ weather_info_setup_tooltip (WeatherInfo *info, GtkTooltip *tooltip)
+ {
+ GdkPixbuf *pixbuf = NULL;
++ GtkIconTheme *theme = NULL;
+ gchar *conditions, *temp, *apparent, *wind;
+ gchar *line1, *line2, *line3, *line4, *tip;
++ const gchar *icon_name;
+
+- weather_info_get_pixbuf (info, &pixbuf);
++ icon_name = weather_info_get_icon_name (info);
++ theme = gtk_icon_theme_get_default ();
++ pixbuf = gtk_icon_theme_load_icon (theme, icon_name, 48, 0, NULL);
++
+ if (pixbuf)
+ gtk_tooltip_set_icon (tooltip, pixbuf);
+
+@@ -526,12 +531,16 @@ update_weather_icon (IntlClockLocation *
+ IntlClockLocationTile *tile = data;
+ IntlClockLocationTilePrivate *priv = PRIVATE (tile);
+ GdkPixbuf *pixbuf = NULL;
++ GtkIconTheme *theme = NULL;
++ const gchar *icon_name;
+ const gchar *temp = NULL;
+
+ if (!info || !weather_info_is_valid (info))
+ return;
+
+- weather_info_get_pixbuf_mini (info, &pixbuf);
++ icon_name = weather_info_get_icon_name (info);
++ theme = gtk_icon_theme_get_default ();
++ pixbuf = gtk_icon_theme_load_icon (theme, icon_name, 16, 0, NULL);
+ temp = weather_info_get_temp_summary (info);
+
+ if (pixbuf) {
commit e7751e870e9a4b00dd171f3959edb5746f7f5b0a
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Nov 27 06:18:12 2007 +0000
2.20.2
diff --git a/.cvsignore b/.cvsignore
index 384d1f7..5300989 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-intlclock-20071113.tar.gz
+gnome-panel-2.20.2.tar.bz2
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 8f5480c..e3eba50 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,8 +22,8 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.20.1
-Release: 7%{?dist}
+Version: 2.20.2
+Release: 1%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.20/%{name}-%{version}.tar...
# we are upstream for this
@@ -396,6 +396,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Tue Nov 27 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.2-1
+- Update to 2.20.2 (translation updates)
+
* Tue Nov 13 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.1-7
- Fix a problem with the intlclock GConf schema
diff --git a/sources b/sources
index 57cab05..769d90b 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
+400924a82c03ec04f7842348625e1f4a gnome-panel-2.20.2.tar.bz2
7c313b9d3d3d659af4abf8119b5ecab7 intlclock-20071113.tar.gz
-87ef96c2cbb8ecaa328420c0d31cc4c0 gnome-panel-2.20.1.tar.bz2
717506485ee954b1d7ac6d2bfb3bb4f9 timezone.tar.gz
commit cac0db5a18d57af4479da47dfa838533096ac49a
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Wed Nov 14 03:50:42 2007 +0000
fix a gconf schema problem
diff --git a/.cvsignore b/.cvsignore
index 66f563c..384d1f7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-intlclock-20071029.tar.gz
+intlclock-20071113.tar.gz
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 668c485..8f5480c 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -23,13 +23,13 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.20.1
-Release: 6%{?dist}
+Release: 7%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.20/%{name}-%{version}.tar...
# we are upstream for this
Source1: timezone.tar.gz
# Novell intlclock, I don't think this has a canonical upstream location
-Source2: intlclock-20071029.tar.gz
+Source2: intlclock-20071113.tar.gz
Patch98: timezone-changes.patch
Patch100: dont-build-clock.patch
Patch101: intlclock-build-fixes.patch
@@ -396,6 +396,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Tue Nov 13 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.1-7
+- Fix a problem with the intlclock GConf schema
+
* Tue Nov 13 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.1-6
- Reenable intlclock
diff --git a/sources b/sources
index a6ac1b7..57cab05 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-d384a8a72c66f8ceee7273d772d2e37a intlclock-20071029.tar.gz
+7c313b9d3d3d659af4abf8119b5ecab7 intlclock-20071113.tar.gz
87ef96c2cbb8ecaa328420c0d31cc4c0 gnome-panel-2.20.1.tar.bz2
717506485ee954b1d7ac6d2bfb3bb4f9 timezone.tar.gz
commit 2bb2c353c0d076cb9482b4b3aac6fa02a6e04b0a
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Nov 13 19:43:53 2007 +0000
Reenable intlclock
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 71ff64f..668c485 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -18,12 +18,12 @@
%define gnome_doc_utils_version 0.3.2
%define use_evolution_data_server 1
-%define build_intlclock 0
+%define build_intlclock 1
Summary: GNOME panel
Name: gnome-panel
Version: 2.20.1
-Release: 5%{?dist}
+Release: 6%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.20/%{name}-%{version}.tar...
# we are upstream for this
@@ -396,6 +396,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Tue Nov 13 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.1-6
+- Reenable intlclock
+
* Tue Nov 13 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.1-5
- Split off a libs subpackage to break a cyclic dependency
- Build without intlclock for bootstrapping purposes
commit f4ea61d92653f88dff76ac6d05dbaed1a696299f
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Nov 13 16:45:43 2007 +0000
Build without intlclock for bootstrapping
diff --git a/gnome-panel.spec b/gnome-panel.spec
index f0fe855..71ff64f 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -18,6 +18,7 @@
%define gnome_doc_utils_version 0.3.2
%define use_evolution_data_server 1
+%define build_intlclock 0
Summary: GNOME panel
Name: gnome-panel
@@ -89,11 +90,13 @@ BuildRequires: ORBit2-devel >= %{orbit_version}
BuildRequires: dbus-devel >= %{dbus_version}
%endif
+%if %{build_intlclock}
# for intlclock
BuildRequires: PolicyKit-devel
BuildRequires: gnome-applets-devel
BuildRequires: librsvg2-devel
BuildRequires: NetworkManager-devel
+%endif
Patch0: gnome-panel-2.19.5-vendor.patch
Patch1: gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch
@@ -199,6 +202,7 @@ autoconf
make
+%if %{build_intlclock}
pushd timezone
make
popd
@@ -212,6 +216,7 @@ autoconf
%configure
make
popd
+%endif
%install
rm -rf $RPM_BUILD_ROOT
@@ -220,6 +225,7 @@ export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make DESTDIR=$RPM_BUILD_ROOT install
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+%if %{build_intlclock}
pushd timezone
make DESTDIR=$RPM_BUILD_ROOT install
popd
@@ -227,6 +233,7 @@ popd
pushd intlclock-1.0
make DESTDIR=$RPM_BUILD_ROOT install
popd
+%endif
#
# Create pager and tasklist schemas for compatibility with older
@@ -365,6 +372,7 @@ fi
%{_sysconfdir}/gconf/schemas/*.schemas
%{_sysconfdir}/gconf/schemas/*.entries
+%if %{build_intlclock}
# intlclock files
%{_sysconfdir}/dbus-1/system.d/org.gnome.ClockApplet.Mechanism.conf
%{_datadir}/dbus-1/system-services/org.gnome.ClockApplet.Mechanism.service
@@ -375,6 +383,7 @@ fi
%{_bindir}/gnome-clock-applet-mechanism-gtk
%{_sysconfdir}/gconf/schemas/intlclock.schemas
%{_libdir}/bonobo/servers/GNOME_IntlClockApplet_Factory.server
+%endif
%files libs
%{_libdir}/*.so.*
@@ -389,6 +398,7 @@ fi
%changelog
* Tue Nov 13 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.1-5
- Split off a libs subpackage to break a cyclic dependency
+- Build without intlclock for bootstrapping purposes
* Mon Oct 29 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.1-4
- Intlclock: make default units work correctly
commit b4dd6b928d4d4c8783e79fb0eb27da2bfdf8d90d
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Nov 13 16:31:31 2007 +0000
fix spec
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 39d5408..f0fe855 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -131,7 +131,7 @@ Summary: Libraries for Panel Applets
License: LGPLv2+
Group: Development/Libraries
-%description devel
+%description libs
This package contains the libpanel-applet library that
is needed by Panel Applets.
commit bf8606275708b332ffc9551fba4706c3af6de865
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Nov 13 16:30:32 2007 +0000
Fix spec
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 6b180f5..39d5408 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -127,7 +127,7 @@ The GNOME panel provides the window list, workspace switcher, menus,
and other
features for the GNOME desktop.
%package libs
-Summary Libraries for Panel Applets
+Summary: Libraries for Panel Applets
License: LGPLv2+
Group: Development/Libraries
commit 91cb582e2c7435a4f52854fa21494610e930d5e1
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Tue Nov 13 16:28:39 2007 +0000
Split off a libs subpackage to break a cyclic dependency
diff --git a/gnome-panel.spec b/gnome-panel.spec
index d7550c2..6b180f5 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.20.1
-Release: 4%{?dist}
+Release: 5%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.20/%{name}-%{version}.tar...
# we are upstream for this
@@ -126,11 +126,20 @@ Conflicts: gnome-power-manager < 2.15.3
The GNOME panel provides the window list, workspace switcher, menus, and other
features for the GNOME desktop.
+%package libs
+Summary Libraries for Panel Applets
+License: LGPLv2+
+Group: Development/Libraries
+
+%description devel
+This package contains the libpanel-applet library that
+is needed by Panel Applets.
+
%package devel
Summary: Headers and libraries for Panel Applet development
License: LGPLv2+
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
Requires: gtk2-devel >= %{gtk2_version}
Requires: libbonoboui-devel >= %{libbonoboui_version}
Requires: libgnomeui-devel >= %{libgnomeui_version}
@@ -355,8 +364,6 @@ fi
%{_libdir}/bonobo/servers/*.server
%{_sysconfdir}/gconf/schemas/*.schemas
%{_sysconfdir}/gconf/schemas/*.entries
-# LGPL
-%{_libdir}/*.so.*
# intlclock files
%{_sysconfdir}/dbus-1/system.d/org.gnome.ClockApplet.Mechanism.conf
@@ -369,6 +376,9 @@ fi
%{_sysconfdir}/gconf/schemas/intlclock.schemas
%{_libdir}/bonobo/servers/GNOME_IntlClockApplet_Factory.server
+%files libs
+%{_libdir}/*.so.*
+
%files devel
%defattr(-, root, root)
%{_libdir}/pkgconfig/*
@@ -377,6 +387,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Tue Nov 13 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.1-5
+- Split off a libs subpackage to break a cyclic dependency
+
* Mon Oct 29 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.1-4
- Intlclock: make default units work correctly
commit 7f7a96bce3f1081f9e7473817c3981ea51c42e1a
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Oct 29 17:01:16 2007 +0000
fix sources
diff --git a/sources b/sources
index cdaa23f..a6ac1b7 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
d384a8a72c66f8ceee7273d772d2e37a intlclock-20071029.tar.gz
+87ef96c2cbb8ecaa328420c0d31cc4c0 gnome-panel-2.20.1.tar.bz2
+717506485ee954b1d7ac6d2bfb3bb4f9 timezone.tar.gz
commit 76d3c721f8a7c6ad258886ebb05daa00bb459758
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Oct 29 16:55:28 2007 +0000
Make default units work correctly
diff --git a/.cvsignore b/.cvsignore
index 3483c8d..66f563c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-intlclock-20071028.tar.gz
+intlclock-20071029.tar.gz
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 5279855..d7550c2 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,13 +22,13 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.20.1
-Release: 3%{?dist}
+Release: 4%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.20/%{name}-%{version}.tar...
# we are upstream for this
Source1: timezone.tar.gz
# Novell intlclock, I don't think this has a canonical upstream location
-Source2: intlclock-20071028.tar.gz
+Source2: intlclock-20071029.tar.gz
Patch98: timezone-changes.patch
Patch100: dont-build-clock.patch
Patch101: intlclock-build-fixes.patch
@@ -377,6 +377,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Mon Oct 29 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.1-4
+- Intlclock: make default units work correctly
+
* Sun Oct 28 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.1-3
- Intlclock: add weather preferences, show temperature in panel
diff --git a/sources b/sources
index 8f2d135..cdaa23f 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-e0ef60b01721175c2871c526b5c14a39 intlclock-20071028.tar.gz
-87ef96c2cbb8ecaa328420c0d31cc4c0 gnome-panel-2.20.1.tar.bz2
-717506485ee954b1d7ac6d2bfb3bb4f9 timezone.tar.gz
+d384a8a72c66f8ceee7273d772d2e37a intlclock-20071029.tar.gz
commit acf55ce1aa8a6f933ba0d19d1cd9796c95ce6693
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Mon Oct 29 03:19:49 2007 +0000
more intlclock work
diff --git a/.cvsignore b/.cvsignore
index 475bce9..3483c8d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-intlclock-20071020.tar.gz
+intlclock-20071028.tar.gz
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 77c7345..5279855 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,13 +22,13 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.20.1
-Release: 2%{?dist}
+Release: 3%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.20/%{name}-%{version}.tar...
# we are upstream for this
Source1: timezone.tar.gz
# Novell intlclock, I don't think this has a canonical upstream location
-Source2: intlclock-20071020.tar.gz
+Source2: intlclock-20071028.tar.gz
Patch98: timezone-changes.patch
Patch100: dont-build-clock.patch
Patch101: intlclock-build-fixes.patch
@@ -377,6 +377,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Sun Oct 28 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.1-3
+- Intlclock: add weather preferences, show temperature in panel
+
* Sat Oct 20 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.1-2
- Fix some issues with the offset display in the intlclock
diff --git a/sources b/sources
index 3a46829..8f2d135 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
+e0ef60b01721175c2871c526b5c14a39 intlclock-20071028.tar.gz
87ef96c2cbb8ecaa328420c0d31cc4c0 gnome-panel-2.20.1.tar.bz2
-a8a0e4a41a4435542ff7a6d81d7173ba intlclock-20071020.tar.gz
717506485ee954b1d7ac6d2bfb3bb4f9 timezone.tar.gz
commit 211dc0a70f945c2f8c109b33cdf503624a6415e1
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sun Oct 21 03:32:04 2007 +0000
readd lost sources
diff --git a/sources b/sources
index 72e0a64..3a46829 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
+87ef96c2cbb8ecaa328420c0d31cc4c0 gnome-panel-2.20.1.tar.bz2
a8a0e4a41a4435542ff7a6d81d7173ba intlclock-20071020.tar.gz
+717506485ee954b1d7ac6d2bfb3bb4f9 timezone.tar.gz
commit 6aee147a784e4488fdae56cfc5c08029f4cab605
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sun Oct 21 03:26:13 2007 +0000
bump rev
diff --git a/gnome-panel.spec b/gnome-panel.spec
index c8c53a0..77c7345 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.20.1
-Release: 1%{?dist}
+Release: 2%{?dist}
URL:
http://www.gnome.org
Source0:
http://download.gnome.org/sources/gnome-panel/2.20/%{name}-%{version}.tar...
# we are upstream for this
@@ -377,6 +377,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Sat Oct 20 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.1-2
+- Fix some issues with the offset display in the intlclock
+
* Mon Oct 15 2007 Matthias Clasen <mclasen(a)redhat.com> - 2.20.1-1
- Update to 2.20.1
commit dc91fd981c16facfa77b443aded63ae0e6029b69
Author: Matthias Clasen <mclasen(a)fedoraproject.org>
Date: Sun Oct 21 03:24:45 2007 +0000
remove obsolete patch
diff --git a/intlclock-changes-20071014-2.patch b/intlclock-changes-20071014-2.patch
deleted file mode 100644
index da117ef..0000000
--- a/intlclock-changes-20071014-2.patch
+++ /dev/null
@@ -1,12330 +0,0 @@
-diff --git a/configure.in b/configure.in
-index 4e818da..6c75db1 100644
---- a/configure.in
-+++ b/configure.in
-@@ -59,7 +59,7 @@ if test -n "$LIBECAL_REQUIREMENT"; then
- fi
- AM_CONDITIONAL(HAVE_LIBECAL, test -n "$LIBECAL_REQUIREMENT")
-
--PKG_CHECK_MODULES(INTLCLOCK, [ glib-2.0 gobject-2.0 gtk+-2.0 gdk-2.0 librsvg-2.0
libpanelapplet-2.0 libgnome-2.0 gconf-2.0 $LIBECAL_REQUIREMENT ])
-+PKG_CHECK_MODULES(INTLCLOCK, [ glib-2.0 gobject-2.0 gtk+-2.0 gdk-2.0 librsvg-2.0
libpanelapplet-2.0 libgnome-2.0 gconf-2.0 $LIBECAL_REQUIREMENT dbus-glib-1 gweather
libxml-2.0 polkit polkit-dbus ])
-
- AC_SUBST(INTLCLOCK_CFLAGS)
- AC_SUBST(INTLCLOCK_LIBS)
-diff --git a/data/GNOME_IntlClockApplet.xml b/data/GNOME_IntlClockApplet.xml
-index dd2e8b8..a88dc3d 100644
---- a/data/GNOME_IntlClockApplet.xml
-+++ b/data/GNOME_IntlClockApplet.xml
-@@ -1,9 +1,14 @@
- <Root>
- <popups>
- <popup name="button3">
-+ <menuitem name="Clock Copy Time Item" verb="ClockCopyTime"
_label="Copy _Time"
-+ pixtype="stock" pixname="gtk-copy"/>
-+ <menuitem name="Clock Copy Date Item" verb="ClockCopyDate"
_label="Copy _Date"
-+ pixtype="stock" pixname="gtk-copy"/>
-+ <separator/>
- <menuitem name="Clock Configure Item"
verb="IntlClockConfig"
-- _label="Cha_nge Date or Time"
-- pixtype="stock" pixname="gtk-preferences"/>
-+ _label="Ad_just Date & Time"
-+ pixtype="stock" pixname="gtk-preferences"/>
- <menuitem name="Clock Preferences Item"
verb="IntlClockPreferences" _label="_Preferences"
- pixtype="stock" pixname="gtk-properties"/>
- </popup>
-diff --git a/data/GNOME_IntlClockApplet_Factory.server.in.in
b/data/GNOME_IntlClockApplet_Factory.server.in.in
-index 1446822..705fb76 100644
---- a/data/GNOME_IntlClockApplet_Factory.server.in.in
-+++ b/data/GNOME_IntlClockApplet_Factory.server.in.in
-@@ -20,7 +20,7 @@
- </oaf_attribute>
- <oaf_attribute name="name" type="string"
value="International Clock"/>
- <oaf_attribute name="description" type="string"
value="International Clock applet for the GNOME panel"/>
-- <oaf_attribute name="panel:icon" type="string"
value="clock.png"/>
-+ <oaf_attribute name="panel:icon" type="string"
value="gnome-panel-clock"/>
- </oaf_server>
-
- <oaf_server iid="OAFIID:GNOME_ClockApplet"
-diff --git a/data/intlclock.glade b/data/intlclock.glade
-index e7b8c01..626d835 100644
---- a/data/intlclock.glade
-+++ b/data/intlclock.glade
-@@ -21,12 +21,13 @@
-
- <child>
- <widget class="GtkVBox" id="vbox1">
-+ <property name="border_width">6</property>
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
-- <widget class="GtkNotebook" id="notebook1">
-+ <widget class="GtkNotebook" id="notebook">
- <property name="border_width">6</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
-@@ -37,194 +38,35 @@
- <property name="enable_popup">False</property>
-
- <child>
-- <widget class="GtkTable" id="table1">
-- <property name="border_width">6</property>
-+ <widget class="GtkVBox" id="vbox17">
-+ <property name="border_width">12</property>
- <property name="visible">True</property>
-- <property name="n_rows">4</property>
-- <property name="n_columns">3</property>
- <property name="homogeneous">False</property>
-- <property name="row_spacing">6</property>
-- <property name="column_spacing">6</property>
-+ <property name="spacing">18</property>
-
- <child>
-- <widget class="GtkLabel" id="label11">
-- <property name="visible">True</property>
-- <property name="label" translatable="yes">Clock
options:</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">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"></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="GtkLabel" id="label13">
-- <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</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">2</property>
-- <property name="bottom_attach">3</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"></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">3</property>
-- <property name="bottom_attach">4</property>
-- <property name="x_options">fill</property>
-- <property name="y_options"></property>
-- </packing>
-- </child>
--
-- <child>
-- <widget class="GtkLabel" id="label15">
-- <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</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">3</property>
-- <property name="bottom_attach">4</property>
-- <property name="x_options">fill</property>
-- <property name="y_options"></property>
-- </packing>
-- </child>
--
-- <child>
-- <widget class="GtkCheckButton" id="seconds_check">
-- <property name="visible">True</property>
-- <property name="can_focus">True</property>
-- <property name="label" translatable="yes">Show
s_econds</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="left_attach">1</property>
-- <property name="right_attach">3</property>
-- <property name="top_attach">2</property>
-- <property name="bottom_attach">3</property>
-- <property name="x_options">fill</property>
-- <property name="y_options"></property>
-- </packing>
-- </child>
--
-- <child>
-- <widget class="GtkHBox" id="hbox3">
-+ <widget class="GtkVBox" id="vbox18">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
-- <widget class="GtkRadioButton" id="12hr_radio">
-+ <widget class="GtkLabel" id="label210">
- <property name="visible">True</property>
-- <property name="can_focus">True</property>
-- <property name="label" translatable="yes">12 _hour
format</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="label"
translatable="yes"><b>Clock
Options</b></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>
-@@ -234,138 +76,150 @@
- </child>
-
- <child>
-- <widget class="GtkRadioButton" id="24hr_radio">
-+ <widget class="GtkHBox" id="hbox48">
- <property name="visible">True</property>
-- <property name="can_focus">True</property>
-- <property name="label" translatable="yes">24 h_our
format</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">12hr_radio</property>
-+ <property name="homogeneous">False</property>
-+ <property name="spacing">0</property>
-+
-+ <child>
-+ <widget class="GtkLabel" id="label211">
-+ <property name="visible">True</property>
-+ <property name="label"> </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="vbox19">
-+ <property name="visible">True</property>
-+ <property name="homogeneous">False</property>
-+ <property name="spacing">6</property>
-+
-+ <child>
-+ <widget class="GtkHBox" id="hbox49">
-+ <property name="visible">True</property>
-+ <property name="homogeneous">False</property>
-+ <property name="spacing">13</property>
-+
-+ <child>
-+ <widget class="GtkRadioButton" id="12hr_radio">
-+ <property name="visible">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="label" translatable="yes">12 _hour
format</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>
-+
-+ <child>
-+ <widget class="GtkRadioButton" id="24hr_radio">
-+ <property name="visible">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="label" translatable="yes">24 h_our
format</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">12hr_radio</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>
-+ <property name="expand">True</property>
-+ <property name="fill">True</property>
-+ </packing>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkCheckButton" id="date_check">
-+ <property name="visible">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="label" translatable="yes">Show the
_date</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>
-+
-+ <child>
-+ <widget class="GtkCheckButton" id="seconds_check">
-+ <property name="visible">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="label" translatable="yes">Show
_seconds</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>
-+ <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>
-+ <property name="expand">True</property>
-+ <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
-- <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">fill</property>
-- </packing>
-- </child>
--
-- <child>
-- <widget class="GtkCheckButton" id="date_check">
-- <property name="visible">True</property>
-- <property name="can_focus">True</property>
-- <property name="label" translatable="yes">Show the
_date</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="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>
--
-- <child>
-- <widget class="GtkLabel" id="label16">
-- <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</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="label17">
-- <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</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="GtkLabel" id="label201">
-- <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</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">1</property>
-- <property name="right_attach">2</property>
-- <property name="top_attach">3</property>
-- <property name="bottom_attach">4</property>
-- <property name="x_options">fill</property>
-- <property name="y_options"></property>
-+ <property name="padding">0</property>
-+ <property name="expand">False</property>
-+ <property name="fill">True</property>
- </packing>
- </child>
- </widget>
-@@ -376,7 +230,7 @@
- </child>
-
- <child>
-- <widget class="GtkLabel" id="label1">
-+ <widget class="GtkLabel" id="label209">
- <property name="visible">True</property>
- <property name="label"
translatable="yes">General</property>
- <property name="use_underline">False</property>
-@@ -399,332 +253,105 @@
- </child>
-
- <child>
-- <widget class="GtkTable" id="table5">
-- <property name="border_width">6</property>
-+ <widget class="GtkVBox" id="vbox24">
-+ <property name="border_width">12</property>
- <property name="visible">True</property>
-- <property name="n_rows">8</property>
-- <property name="n_columns">4</property>
- <property name="homogeneous">False</property>
-- <property name="row_spacing">6</property>
-- <property name="column_spacing">6</property>
--
-- <child>
-- <widget class="GtkLabel" id="label36">
-- <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</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">3</property>
-- <property name="right_attach">4</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="label37">
-- <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</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">3</property>
-- <property name="right_attach">4</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>
-+ <property name="spacing">18</property>
-
- <child>
-- <widget class="GtkScrolledWindow" id="scrolledwindow2">
-+ <widget class="GtkHBox" id="hbox54">
- <property name="visible">True</property>
-- <property name="can_focus">True</property>
-- <property
name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-- <property
name="vscrollbar_policy">GTK_POLICY_NEVER</property>
-- <property name="shadow_type">GTK_SHADOW_IN</property>
-- <property
name="window_placement">GTK_CORNER_TOP_LEFT</property>
-+ <property name="homogeneous">False</property>
-+ <property name="spacing">12</property>
-
- <child>
-- <widget class="GtkTreeView" id="cities_list">
-+ <widget class="GtkScrolledWindow"
id="scrolledwindow10">
- <property name="visible">True</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">True</property>
-+ <property
name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-+ <property
name="vscrollbar_policy">GTK_POLICY_NEVER</property>
-+ <property name="shadow_type">GTK_SHADOW_IN</property>
-+ <property
name="window_placement">GTK_CORNER_TOP_LEFT</property>
-+
-+ <child>
-+ <widget class="GtkTreeView" id="cities_list">
-+ <property name="visible">True</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">True</property>
-+ </widget>
-+ </child>
- </widget>
-+ <packing>
-+ <property name="padding">0</property>
-+ <property name="expand">True</property>
-+ <property name="fill">True</property>
-+ </packing>
- </child>
-- </widget>
-- <packing>
-- <property name="left_attach">0</property>
-- <property name="right_attach">3</property>
-- <property name="top_attach">2</property>
-- <property name="bottom_attach">8</property>
-- <property name="x_options">fill</property>
-- </packing>
-- </child>
--
-- <child>
-- <widget class="GtkAlignment" id="alignment6">
-- <property name="visible">True</property>
-- <property name="xalign">0</property>
-- <property name="yalign">0.5</property>
-- <property name="xscale">0</property>
-- <property name="yscale">1</property>
-- <property name="top_padding">0</property>
-- <property name="bottom_padding">0</property>
-- <property name="left_padding">0</property>
-- <property name="right_padding">0</property>
-
- <child>
-- <widget class="GtkVBox" id="vbox2">
-+ <widget class="GtkVButtonBox" id="vbuttonbox2">
- <property name="visible">True</property>
-- <property name="homogeneous">False</property>
-+ <property
name="layout_style">GTK_BUTTONBOX_START</property>
- <property name="spacing">6</property>
-
- <child>
-- <widget class="GtkLabel" id="label39">
-+ <widget class="GtkButton" id="prefs-locations-add-button">
-+ <property name="width_request">24</property>
-+ <property name="height_request">25</property>
- <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>
-+ <property name="can_default">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="label">gtk-add</property>
-+ <property name="use_stock">True</property>
-+ <property name="relief">GTK_RELIEF_NORMAL</property>
-+ <property name="focus_on_click">True</property>
- </widget>
-- <packing>
-- <property name="padding">0</property>
-- <property name="expand">False</property>
-- <property name="fill">False</property>
-- </packing>
- </child>
-
- <child>
-- <widget class="GtkVButtonBox" id="vbuttonbox1">
-+ <widget class="GtkButton"
id="prefs-locations-edit-button">
-+ <property name="width_request">24</property>
-+ <property name="height_request">24</property>
- <property name="visible">True</property>
-- <property name="layout_style">GTK_BUTTONBOX_START</property>
-- <property name="spacing">6</property>
--
-- <child>
-- <widget class="GtkButton"
id="prefs-locations-add-button">
-- <property name="width_request">24</property>
-- <property name="height_request">25</property>
-- <property name="visible">True</property>
-- <property name="can_default">True</property>
-- <property name="can_focus">True</property>
-- <property name="label">gtk-add</property>
-- <property name="use_stock">True</property>
-- <property name="relief">GTK_RELIEF_NORMAL</property>
-- <property name="focus_on_click">True</property>
-- </widget>
-- </child>
--
-- <child>
-- <widget class="GtkButton"
id="prefs-locations-edit-button">
-- <property name="width_request">24</property>
-- <property name="height_request">24</property>
-- <property name="visible">True</property>
-- <property name="can_default">True</property>
-- <property name="can_focus">True</property>
-- <property name="label">gtk-edit</property>
-- <property name="use_stock">True</property>
-- <property name="relief">GTK_RELIEF_NORMAL</property>
-- <property name="focus_on_click">True</property>
-- </widget>
-- </child>
--
-- <child>
-- <widget class="GtkButton"
id="prefs-locations-remove-button">
-- <property name="visible">True</property>
-- <property name="can_default">True</property>
-- <property name="can_focus">True</property>
-- <property name="label">gtk-remove</property>
-- <property name="use_stock">True</property>
-- <property name="relief">GTK_RELIEF_NORMAL</property>
-- <property name="focus_on_click">True</property>
-- </widget>
-- </child>
-+ <property name="can_default">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="label">gtk-edit</property>
-+ <property name="use_stock">True</property>
-+ <property name="relief">GTK_RELIEF_NORMAL</property>
-+ <property name="focus_on_click">True</property>
- </widget>
-- <packing>
-- <property name="padding">0</property>
-- <property name="expand">False</property>
-- <property name="fill">False</property>
-- </packing>
- </child>
-
- <child>
-- <widget class="GtkLabel" id="label38">
-+ <widget class="GtkButton"
id="prefs-locations-remove-button">
- <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>
-+ <property name="can_default">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="label">gtk-remove</property>
-+ <property name="use_stock">True</property>
-+ <property name="relief">GTK_RELIEF_NORMAL</property>
-+ <property name="focus_on_click">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>
-+ <property name="expand">False</property>
-+ <property name="fill">False</property>
-+ </packing>
- </child>
- </widget>
- <packing>
-- <property name="left_attach">3</property>
-- <property name="right_attach">4</property>
-- <property name="top_attach">2</property>
-- <property name="bottom_attach">8</property>
-- <property name="x_options"></property>
-- <property name="y_options">fill</property>
-- </packing>
-- </child>
--
-- <child>
-- <widget class="GtkCheckButton" id="show_map_check">
-- <property name="visible">True</property>
-- <property name="can_focus">True</property>
-- <property name="label" translatable="yes">Show the world
_map in the clock</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="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="GtkLabel" id="label41">
-- <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="left_attach">2</property>
-- <property name="right_attach">3</property>
-- <property name="top_attach">1</property>
-- <property name="bottom_attach">2</property>
-- <property name="y_options"></property>
-- </packing>
-- </child>
--
-- <child>
-- <widget class="GtkLabel" id="label160">
-- <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</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">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>
--
-- <child>
-- <widget class="GtkCheckButton" id="show_locations_check">
-- <property name="visible">True</property>
-- <property name="can_focus">True</property>
-- <property name="label" translatable="yes">S_how locations
in the clock</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="left_attach">0</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>
-+ <property name="padding">0</property>
-+ <property name="expand">True</property>
-+ <property name="fill">True</property>
- </packing>
- </child>
- </widget>
-@@ -735,7 +362,7 @@
- </child>
-
- <child>
-- <widget class="GtkLabel" id="label2">
-+ <widget class="GtkLabel" id="label220">
- <property name="visible">True</property>
- <property name="label"
translatable="yes">Locations</property>
- <property name="use_underline">False</property>
-@@ -772,95 +399,20 @@
- <property name="spacing">0</property>
-
- <child>
-- <widget class="GtkHButtonBox" id="hbuttonbox2">
-- <property name="visible">True</property>
-- <property
name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
-- <property name="spacing">0</property>
-- </widget>
-- <packing>
-- <property name="padding">0</property>
-- <property name="expand">False</property>
-- <property name="fill">False</property>
-- </packing>
-- </child>
--
-- <child>
-- <widget class="GtkHButtonBox" id="hbuttonbox3">
-+ <widget class="GtkHButtonBox" id="hbuttonbox22">
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
- <property name="spacing">6</property>
-
- <child>
-- <widget class="GtkButton" id="prefs-time-settings-button">
-+ <widget class="GtkButton" id="time-settings-button">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
-+ <property name="label" translatable="yes">Time
Settings</property>
-+ <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
--
-- <child>
-- <widget class="GtkAlignment" id="alignment5">
-- <property name="visible">True</property>
-- <property name="xalign">0.5</property>
-- <property name="yalign">0.5</property>
-- <property name="xscale">0</property>
-- <property name="yscale">0</property>
-- <property name="top_padding">0</property>
-- <property name="bottom_padding">0</property>
-- <property name="left_padding">0</property>
-- <property name="right_padding">0</property>
--
-- <child>
-- <widget class="GtkHBox" id="hbox8">
-- <property name="visible">True</property>
-- <property name="homogeneous">False</property>
-- <property name="spacing">2</property>
--
-- <child>
-- <widget class="GtkImage" id="image5">
-- <property name="visible">True</property>
-- <property name="stock">gtk-properties</property>
-- <property name="icon_size">4</property>
-- <property name="xalign">0.5</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>
--
-- <child>
-- <widget class="GtkLabel" id="label35">
-- <property name="visible">True</property>
-- <property name="label" translatable="yes">Time
_Settings</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.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>
-- </widget>
-- </child>
-- </widget>
-- </child>
- </widget>
- </child>
-
-@@ -910,13 +462,13 @@
-
- <child>
- <widget class="GtkVBox" id="vbox14">
-+ <property name="border_width">12</property>
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
-- <property name="spacing">0</property>
-+ <property name="spacing">24</property>
-
- <child>
- <widget class="GtkTable" id="table23">
-- <property name="border_width">6</property>
- <property name="visible">True</property>
- <property name="n_rows">1</property>
- <property name="n_columns">3</property>
-@@ -926,7 +478,6 @@
-
- <child>
- <widget class="GtkVBox" id="vbox15">
-- <property name="border_width">6</property>
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-@@ -974,62 +525,6 @@
- <property name="column_spacing">6</property>
-
- <child>
-- <widget class="GtkLabel" id="label174">
-- <property name="visible">True</property>
-- <property name="label"
translatable="yes">Timezone:</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">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="label175">
-- <property name="visible">True</property>
-- <property name="label" translatable="yes">Location
Name:</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="GtkVBox" id="vbox16">
- <property name="visible">True</property>
- <property name="homogeneous">True</property>
-@@ -1070,45 +565,6 @@
- </child>
-
- <child>
-- <widget class="GtkComboBoxEntry"
id="edit-location-timezone-combo">
-- <property name="visible">True</property>
-- <property name="items">Dummy Item</property>
-- <property name="add_tearoffs">False</property>
-- <property name="has_frame">True</property>
-- <property name="focus_on_click">True</property>
-- </widget>
-- <packing>
-- <property name="left_attach">1</property>
-- <property name="right_attach">4</property>
-- <property name="top_attach">0</property>
-- <property name="bottom_attach">1</property>
-- <property name="x_options">fill</property>
-- <property name="y_options">fill</property>
-- </packing>
-- </child>
--
-- <child>
-- <widget class="GtkEntry" id="edit-location-name-entry">
-- <property name="visible">True</property>
-- <property name="can_focus">True</property>
-- <property name="editable">True</property>
-- <property name="visibility">True</property>
-- <property name="max_length">0</property>
-- <property name="text"
translatable="yes"></property>
-- <property name="has_frame">True</property>
-- <property name="invisible_char"></property>
-- <property name="activates_default">False</property>
-- </widget>
-- <packing>
-- <property name="left_attach">1</property>
-- <property name="right_attach">4</property>
-- <property name="top_attach">1</property>
-- <property name="bottom_attach">2</property>
-- <property name="y_options"></property>
-- </packing>
-- </child>
--
-- <child>
- <widget class="GtkLabel" id="label208">
- <property name="visible">True</property>
- <property name="label"
translatable="yes">Longitude:</property>
-@@ -1145,7 +601,7 @@
- <property name="max_length">0</property>
- <property name="text"
translatable="yes"></property>
- <property name="has_frame">True</property>
-- <property name="invisible_char"></property>
-+ <property name="invisible_char"></property>
- <property name="activates_default">False</property>
- </widget>
- <packing>
-@@ -1258,7 +714,7 @@ South</property>
- <property name="max_length">0</property>
- <property name="text"
translatable="yes"></property>
- <property name="has_frame">True</property>
-- <property name="invisible_char"></property>
-+ <property name="invisible_char"></property>
- <property name="activates_default">False</property>
- </widget>
- <packing>
-@@ -1269,6 +725,131 @@ South</property>
- <property name="y_options"></property>
- </packing>
- </child>
-+
-+ <child>
-+ <widget class="GtkLabel" id="label175">
-+ <property name="visible">True</property>
-+ <property name="label" translatable="yes">Location
Name:</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">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="label174">
-+ <property name="visible">True</property>
-+ <property name="label"
translatable="yes">Timezone:</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="GtkHBox" id="hbox55">
-+ <property name="visible">True</property>
-+ <property name="homogeneous">False</property>
-+ <property name="spacing">6</property>
-+
-+ <child>
-+ <widget class="GtkEntry" id="edit-location-name-entry">
-+ <property name="visible">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="editable">True</property>
-+ <property name="visibility">True</property>
-+ <property name="max_length">0</property>
-+ <property name="text"
translatable="yes"></property>
-+ <property name="has_frame">True</property>
-+ <property name="invisible_char"></property>
-+ <property name="activates_default">False</property>
-+ </widget>
-+ <packing>
-+ <property name="padding">0</property>
-+ <property name="expand">True</property>
-+ <property name="fill">True</property>
-+ </packing>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkButton" id="find-location-button">
-+ <property name="visible">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="label"
translatable="yes">Find...</property>
-+ <property name="use_underline">True</property>
-+ <property name="relief">GTK_RELIEF_NORMAL</property>
-+ <property name="focus_on_click">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="left_attach">1</property>
-+ <property name="right_attach">4</property>
-+ <property name="top_attach">0</property>
-+ <property name="bottom_attach">1</property>
-+ <property name="x_options">fill</property>
-+ <property name="y_options">fill</property>
-+ </packing>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkComboBoxEntry"
id="edit-location-timezone-combo">
-+ <property name="visible">True</property>
-+ <property name="items">Dummy Item</property>
-+ <property name="add_tearoffs">False</property>
-+ <property name="has_frame">True</property>
-+ <property name="focus_on_click">True</property>
-+ </widget>
-+ <packing>
-+ <property name="left_attach">1</property>
-+ <property name="right_attach">4</property>
-+ <property name="top_attach">1</property>
-+ <property name="bottom_attach">2</property>
-+ <property name="x_options">fill</property>
-+ <property name="y_options">fill</property>
-+ </packing>
-+ </child>
- </widget>
- <packing>
- <property name="padding">0</property>
-@@ -1294,60 +875,33 @@ South</property>
- </child>
-
- <child>
-- <widget class="GtkHBox" id="hbox40">
-- <property name="border_width">6</property>
-+ <widget class="GtkHButtonBox" id="hbuttonbox20">
- <property name="visible">True</property>
-- <property name="homogeneous">False</property>
-- <property name="spacing">0</property>
-+ <property name="layout_style">GTK_BUTTONBOX_END</property>
-+ <property name="spacing">6</property>
-
- <child>
-- <widget class="GtkHButtonBox" id="hbuttonbox12">
-+ <widget class="GtkButton"
id="edit-location-cancel-button">
- <property name="visible">True</property>
-- <property
name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
-- <property name="spacing">0</property>
-+ <property name="can_default">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="label">gtk-cancel</property>
-+ <property name="use_stock">True</property>
-+ <property name="relief">GTK_RELIEF_NORMAL</property>
-+ <property name="focus_on_click">True</property>
- </widget>
-- <packing>
-- <property name="padding">0</property>
-- <property name="expand">False</property>
-- <property name="fill">False</property>
-- </packing>
- </child>
-
- <child>
-- <widget class="GtkHButtonBox" id="hbuttonbox18">
-+ <widget class="GtkButton" id="edit-location-ok-button">
- <property name="visible">True</property>
-- <property name="layout_style">GTK_BUTTONBOX_END</property>
-- <property name="spacing">6</property>
--
-- <child>
-- <widget class="GtkButton" id="edit-location-cancel-button">
-- <property name="visible">True</property>
-- <property name="can_default">True</property>
-- <property name="can_focus">True</property>
-- <property name="label">gtk-cancel</property>
-- <property name="use_stock">True</property>
-- <property name="relief">GTK_RELIEF_NORMAL</property>
-- <property name="focus_on_click">True</property>
-- </widget>
-- </child>
--
-- <child>
-- <widget class="GtkButton" id="edit-location-ok-button">
-- <property name="visible">True</property>
-- <property name="can_default">True</property>
-- <property name="can_focus">True</property>
-- <property name="label">gtk-ok</property>
-- <property name="use_stock">True</property>
-- <property name="relief">GTK_RELIEF_NORMAL</property>
-- <property name="focus_on_click">True</property>
-- </widget>
-- </child>
-+ <property name="can_default">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="label">gtk-ok</property>
-+ <property name="use_stock">True</property>
-+ <property name="relief">GTK_RELIEF_NORMAL</property>
-+ <property name="focus_on_click">True</property>
- </widget>
-- <packing>
-- <property name="padding">0</property>
-- <property name="expand">True</property>
-- <property name="fill">True</property>
-- </packing>
- </child>
- </widget>
- <packing>
-@@ -1723,4 +1277,580 @@ South</property>
- </child>
- </widget>
-
-+<widget class="GtkWindow" id="find-location-window">
-+ <property name="title" translatable="yes"></property>
-+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
-+ <property name="window_position">GTK_WIN_POS_NONE</property>
-+ <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_NORMAL</property>
-+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-+ <property name="focus_on_map">True</property>
-+ <property name="urgency_hint">False</property>
-+
-+ <child>
-+ <widget class="GtkVBox" id="vbox25">
-+ <property name="border_width">12</property>
-+ <property name="visible">True</property>
-+ <property name="homogeneous">False</property>
-+ <property name="spacing">24</property>
-+
-+ <child>
-+ <widget class="GtkVBox" id="vbox26">
-+ <property name="visible">True</property>
-+ <property name="homogeneous">False</property>
-+ <property name="spacing">6</property>
-+
-+ <child>
-+ <widget class="GtkScrolledWindow" id="scrolledwindow11">
-+ <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="find-location-tree">
-+ <property name="visible">True</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">False</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>
-+ <property name="expand">True</property>
-+ <property name="fill">True</property>
-+ </packing>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkHBox" id="hbox56">
-+ <property name="visible">True</property>
-+ <property name="homogeneous">False</property>
-+ <property name="spacing">6</property>
-+
-+ <child>
-+ <widget class="GtkLabel" id="label221">
-+ <property name="visible">True</property>
-+ <property name="label"
translatable="yes">_Find:</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.5</property>
-+ <property name="yalign">0.5</property>
-+ <property name="xpad">0</property>
-+ <property name="ypad">0</property>
-+ <property
name="mnemonic_widget">find-location-entry</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="GtkEntry" id="find-location-entry">
-+ <property name="visible">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="editable">True</property>
-+ <property name="visibility">True</property>
-+ <property name="max_length">0</property>
-+ <property name="text"
translatable="yes"></property>
-+ <property name="has_frame">True</property>
-+ <property name="invisible_char"></property>
-+ <property name="activates_default">False</property>
-+ </widget>
-+ <packing>
-+ <property name="padding">0</property>
-+ <property name="expand">True</property>
-+ <property name="fill">True</property>
-+ </packing>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkButton" id="find-next-location-button">
-+ <property name="visible">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="relief">GTK_RELIEF_NORMAL</property>
-+ <property name="focus_on_click">True</property>
-+
-+ <child>
-+ <widget class="GtkAlignment" id="alignment31">
-+ <property name="visible">True</property>
-+ <property name="xalign">0.5</property>
-+ <property name="yalign">0.5</property>
-+ <property name="xscale">0</property>
-+ <property name="yscale">0</property>
-+ <property name="top_padding">0</property>
-+ <property name="bottom_padding">0</property>
-+ <property name="left_padding">0</property>
-+ <property name="right_padding">0</property>
-+
-+ <child>
-+ <widget class="GtkHBox" id="hbox57">
-+ <property name="visible">True</property>
-+ <property name="homogeneous">False</property>
-+ <property name="spacing">2</property>
-+
-+ <child>
-+ <widget class="GtkImage" id="image29">
-+ <property name="visible">True</property>
-+ <property name="stock">gtk-find</property>
-+ <property name="icon_size">4</property>
-+ <property name="xalign">0.5</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>
-+
-+ <child>
-+ <widget class="GtkLabel" id="label222">
-+ <property name="visible">True</property>
-+ <property name="label" translatable="yes">Find
_Next</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.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>
-+ </widget>
-+ </child>
-+ </widget>
-+ </child>
-+ </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>
-+ <property name="expand">False</property>
-+ <property name="fill">False</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="GtkHButtonBox" id="hbuttonbox19">
-+ <property name="visible">True</property>
-+ <property name="layout_style">GTK_BUTTONBOX_END</property>
-+ <property name="spacing">0</property>
-+
-+ <child>
-+ <widget class="GtkButton"
id="find-location-cancel-button">
-+ <property name="visible">True</property>
-+ <property name="can_default">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="label">gtk-cancel</property>
-+ <property name="use_stock">True</property>
-+ <property name="relief">GTK_RELIEF_NORMAL</property>
-+ <property name="focus_on_click">True</property>
-+ </widget>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkButton" id="find-location-ok-button">
-+ <property name="visible">True</property>
-+ <property name="can_default">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="label">gtk-ok</property>
-+ <property name="use_stock">True</property>
-+ <property name="relief">GTK_RELIEF_NORMAL</property>
-+ <property name="focus_on_click">True</property>
-+ </widget>
-+ </child>
-+ </widget>
-+ <packing>
-+ <property name="padding">0</property>
-+ <property name="expand">False</property>
-+ <property name="fill">False</property>
-+ </packing>
-+ </child>
-+ </widget>
-+ </child>
-+</widget>
-+
-+<widget class="GtkWindow" id="set-time-window">
-+ <property name="border_width">12</property>
-+ <property name="title" translatable="yes">Time
Settings</property>
-+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
-+ <property name="window_position">GTK_WIN_POS_NONE</property>
-+ <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_NORMAL</property>
-+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-+ <property name="focus_on_map">True</property>
-+ <property name="urgency_hint">False</property>
-+
-+ <child>
-+ <widget class="GtkVBox" id="vbox20">
-+ <property name="visible">True</property>
-+ <property name="homogeneous">False</property>
-+ <property name="spacing">6</property>
-+
-+ <child>
-+ <widget class="GtkLabel" id="label212">
-+ <property name="visible">True</property>
-+ <property name="label"
translatable="yes"><b>Time
Settings</b></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="time_settings_box">
-+ <property name="visible">True</property>
-+ <property name="homogeneous">False</property>
-+ <property name="spacing">0</property>
-+
-+ <child>
-+ <widget class="GtkLabel" id="label217">
-+ <property name="visible">True</property>
-+ <property name="label"> </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="GtkHBox" id="hbox52">
-+ <property name="visible">True</property>
-+ <property name="homogeneous">False</property>
-+ <property name="spacing">12</property>
-+
-+ <child>
-+ <widget class="GtkCalendar" id="calendar">
-+ <property name="visible">True</property>
-+ <property name="can_focus">True</property>
-+ <property
name="display_options">GTK_CALENDAR_SHOW_HEADING</property>
-+ </widget>
-+ <packing>
-+ <property name="padding">0</property>
-+ <property name="expand">True</property>
-+ <property name="fill">True</property>
-+ </packing>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkVBox" id="vbox22">
-+ <property name="visible">True</property>
-+ <property name="homogeneous">False</property>
-+ <property name="spacing">6</property>
-+
-+ <child>
-+ <widget class="GtkLabel" id="label218">
-+ <property name="visible">True</property>
-+ <property name="label" translatable="yes">Current
Time:</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="padding">0</property>
-+ <property name="expand">False</property>
-+ <property name="fill">False</property>
-+ </packing>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkLabel" id="label219">
-+ <property name="visible">True</property>
-+ <property name="label"
translatable="yes">Time:</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="padding">0</property>
-+ <property name="expand">False</property>
-+ <property name="fill">False</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="GtkVBox" id="vbox23">
-+ <property name="visible">True</property>
-+ <property name="homogeneous">False</property>
-+ <property name="spacing">6</property>
-+
-+ <child>
-+ <widget class="GtkLabel" id="current_time_label">
-+ <property name="visible">True</property>
-+ <property name="label">23:59:59</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="padding">0</property>
-+ <property name="expand">False</property>
-+ <property name="fill">False</property>
-+ </packing>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkHBox" id="hbox53">
-+ <property name="visible">True</property>
-+ <property name="homogeneous">False</property>
-+ <property name="spacing">0</property>
-+
-+ <child>
-+ <widget class="GtkSpinButton" id="hours_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">True</property>
-+ <property name="adjustment">23 0 23 1 12 12</property>
-+ </widget>
-+ <packing>
-+ <property name="padding">0</property>
-+ <property name="expand">True</property>
-+ <property name="fill">True</property>
-+ </packing>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkSpinButton" id="minutes_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">True</property>
-+ <property name="adjustment">59 0 59 1 30 30</property>
-+ </widget>
-+ <packing>
-+ <property name="padding">0</property>
-+ <property name="expand">True</property>
-+ <property name="fill">True</property>
-+ </packing>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkSpinButton" id="seconds_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">True</property>
-+ <property name="adjustment">59 0 59 1 30 30</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">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">False</property>
-+ </packing>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkHBox" id="hbox58">
-+ <property name="visible">True</property>
-+ <property name="homogeneous">False</property>
-+ <property name="spacing">0</property>
-+
-+ <child>
-+ <widget class="GtkHButtonBox" id="hbuttonbox21">
-+ <property name="visible">True</property>
-+ <property name="layout_style">GTK_BUTTONBOX_END</property>
-+ <property name="spacing">6</property>
-+
-+ <child>
-+ <widget class="GtkButton" id="cancel-set-time-button">
-+ <property name="visible">True</property>
-+ <property name="can_default">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="label">gtk-cancel</property>
-+ <property name="use_stock">True</property>
-+ <property name="relief">GTK_RELIEF_NORMAL</property>
-+ <property name="focus_on_click">True</property>
-+ </widget>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkButton" id="set-time-button">
-+ <property name="visible">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="label" translatable="yes">Set System
Time</property>
-+ <property name="use_underline">True</property>
-+ <property name="relief">GTK_RELIEF_NORMAL</property>
-+ <property name="focus_on_click">True</property>
-+ </widget>
-+ </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">False</property>
-+ <property name="pack_type">GTK_PACK_END</property>
-+ </packing>
-+ </child>
-+ </widget>
-+ </child>
-+</widget>
-+
- </glade-interface>
-diff --git a/data/intlclock.schemas.in b/data/intlclock.schemas.in
-index 2ab6772..00fee4f 100644
---- a/data/intlclock.schemas.in
-+++ b/data/intlclock.schemas.in
-@@ -89,41 +89,54 @@
- </schema>
-
- <schema>
-- <key>/schemas/apps/intlclock_applet/prefs/show_locations</key>
-+ <key>/schemas/apps/intlclock_applet/prefs/cities</key>
-+ <owner>clock-applet</owner>
-+ <type>list</type>
-+ <list_type>string</list_type>
-+ <default>[]</default>
-+ <locale name="C">
-+ <short>List of cities for the clock.</short>
-+ <long>
-+ List of cities to display in the international clock.
-+ </long>
-+ </locale>
-+ </schema>
-+
-+ <schema>
-+ <key>/schemas/apps/intlclock_applet/prefs/expand_locations</key>
- <owner>clock-applet</owner>
- <type>bool</type>
- <default>true</default>
- <locale name="C">
-- <short>Show other locations in clock</short>
-+ <short>Expand the location section in clock</short>
- <long>
-- If true, show a list of locations in the international clock.
-+ If true, expand the list of locations in the international clock.
- </long>
- </locale>
- </schema>
-
- <schema>
-- <key>/schemas/apps/intlclock_applet/prefs/show_map</key>
-+ <key>/schemas/apps/intlclock_applet/prefs/expand_tasks</key>
- <owner>clock-applet</owner>
- <type>bool</type>
- <default>true</default>
- <locale name="C">
-- <short>Show world map in clock</short>
-+ <short>Expand the tasks section in clock</short>
- <long>
-- If true, show the world map in the international clock.
-+ If true, expand the list of tasks in the international clock.
- </long>
- </locale>
- </schema>
-
- <schema>
-- <key>/schemas/apps/intlclock_applet/prefs/cities</key>
-+ <key>/schemas/apps/intlclock_applet/prefs/expand_appointments</key>
- <owner>clock-applet</owner>
-- <type>list</type>
-- <list_type>string</list_type>
-- <default>[]</default>
-+ <type>bool</type>
-+ <default>true</default>
- <locale name="C">
-- <short>List of cities for the clock.</short>
-+ <short>Expand the appointments section in clock</short>
- <long>
-- List of cities to display in the international clock.
-+ If true, expand the list of appointments in the international clock.
- </long>
- </locale>
- </schema>
-diff --git a/intltool-extract.in b/intltool-extract.in
-deleted file mode 100755
-index bb6c368..340fc8d
---- a/intltool-extract.in
-+++ /dev/null
-@@ -1,841 +0,0 @@
--#!@INTLTOOL_PERL@ -w
--# -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*-
--
--#
--# The Intltool Message Extractor
--#
--# Copyright (C) 2000-2001, 2003 Free Software Foundation.
--#
--# Intltool is free software; you can redistribute it and/or
--# modify it under the terms of the GNU General Public License as
--# published by the Free Software Foundation; either version 2 of the
--# License, or (at your option) any later version.
--#
--# Intltool is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
--# General Public License for more details.
--#
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
--#
--# As a special exception to the GNU General Public License, if you
--# distribute this file as part of a program that contains a
--# configuration script generated by Autoconf, you may include it under
--# the same distribution terms that you use for the rest of that program.
--#
--# Authors: Kenneth Christiansen <kenneth(a)gnu.org>
--# Darin Adler <darin(a)bentspoon.com>
--#
--
--## Release information
--my $PROGRAM = "intltool-extract";
--my $PACKAGE = "intltool";
--my $VERSION = "0.35.0";
--
--## Loaded modules
--use strict;
--use File::Basename;
--use Getopt::Long;
--
--## Scalars used by the option stuff
--my $TYPE_ARG = "0";
--my $LOCAL_ARG = "0";
--my $HELP_ARG = "0";
--my $VERSION_ARG = "0";
--my $UPDATE_ARG = "0";
--my $QUIET_ARG = "0";
--my $SRCDIR_ARG = ".";
--
--my $FILE;
--my $OUTFILE;
--
--my $gettext_type = "";
--my $input;
--my %messages = ();
--my %loc = ();
--my %count = ();
--my %comments = ();
--my $strcount = 0;
--
--my $XMLCOMMENT = "";
--
--## Use this instead of \w for XML files to handle more possible characters.
--my $w = "[-A-Za-z0-9._:]";
--
--## Always print first
--$| = 1;
--
--## Handle options
--GetOptions (
-- "type=s" => \$TYPE_ARG,
-- "local|l" => \$LOCAL_ARG,
-- "help|h" => \$HELP_ARG,
-- "version|v" => \$VERSION_ARG,
-- "update" => \$UPDATE_ARG,
-- "quiet|q" => \$QUIET_ARG,
-- "srcdir=s" => \$SRCDIR_ARG,
-- ) or &error;
--
--&split_on_argument;
--
--
--## Check for options.
--## This section will check for the different options.
--
--sub split_on_argument {
--
-- if ($VERSION_ARG) {
-- &version;
--
-- } elsif ($HELP_ARG) {
-- &help;
--
-- } elsif ($LOCAL_ARG) {
-- &place_local;
-- &extract;
--
-- } elsif ($UPDATE_ARG) {
-- &place_normal;
-- &extract;
--
-- } elsif (@ARGV > 0) {
-- &place_normal;
-- &message;
-- &extract;
--
-- } else {
-- &help;
--
-- }
--}
--
--sub place_normal {
-- $FILE = $ARGV[0];
-- $OUTFILE = "$FILE.h";
--}
--
--sub place_local {
-- $FILE = $ARGV[0];
-- $OUTFILE = fileparse($FILE, ());
-- if (!-e "tmp/") {
-- system("mkdir tmp/");
-- }
-- $OUTFILE = "./tmp/$OUTFILE.h"
--}
--
--sub determine_type {
-- if ($TYPE_ARG =~ /^gettext\/(.*)/) {
-- $gettext_type=$1
-- }
--}
--
--## Sub for printing release information
--sub version{
-- print <<_EOF_;
--${PROGRAM} (${PACKAGE}) $VERSION
--Copyright (C) 2000, 2003 Free Software Foundation, Inc.
--Written by Kenneth Christiansen, 2000.
--
--This is free software; see the source for copying conditions. There is NO
--warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--_EOF_
-- exit;
--}
--
--## Sub for printing usage information
--sub help {
-- print <<_EOF_;
--Usage: ${PROGRAM} [OPTION]... [FILENAME]
--Generates a header file from an XML source file.
--
--It grabs all strings between <_translatable_node> and its end tag in
--XML files. Read manpage (man ${PROGRAM}) for more info.
--
-- --type=TYPE Specify the file type of FILENAME. Currently supports:
-- "gettext/glade", "gettext/ini",
"gettext/keys"
-- "gettext/rfc822deb", "gettext/schemas",
-- "gettext/scheme", "gettext/xml"
-- -l, --local Writes output into current working directory
-- (conflicts with --update)
-- --update Writes output into the same directory the source file
-- reside (conflicts with --local)
-- --srcdir Root of the source tree
-- -v, --version Output version information and exit
-- -h, --help Display this help and exit
-- -q, --quiet Quiet mode
--
--Report bugs to
http://bugzilla.gnome.org/ (product name "$PACKAGE")
--or send email to <xml-i18n-tools\(a)gnome.org>.
--_EOF_
-- exit;
--}
--
--## Sub for printing error messages
--sub error{
-- print STDERR "Try `${PROGRAM} --help' for more information.\n";
-- exit;
--}
--
--sub message {
-- print "Generating C format header file for translation.\n" unless
$QUIET_ARG;
--}
--
--sub extract {
-- &determine_type;
--
-- &convert;
--
-- open OUT, ">$OUTFILE";
-- binmode (OUT) if $^O eq 'MSWin32';
-- &msg_write;
-- close OUT;
--
-- print "Wrote $OUTFILE\n" unless $QUIET_ARG;
--}
--
--sub convert {
--
-- ## Reading the file
-- {
-- local (*IN);
-- local $/; #slurp mode
-- open (IN, "<$SRCDIR_ARG/$FILE") || die "can't open
$SRCDIR_ARG/$FILE: $!";
-- $input = <IN>;
-- }
--
-- &type_ini if $gettext_type eq "ini";
-- &type_keys if $gettext_type eq "keys";
-- &type_xml if $gettext_type eq "xml";
-- &type_glade if $gettext_type eq "glade";
-- &type_scheme if $gettext_type eq "scheme";
-- &type_schemas if $gettext_type eq "schemas";
-- &type_rfc822deb if $gettext_type eq "rfc822deb";
--}
--
--sub entity_decode_minimal
--{
-- local ($_) = @_;
--
-- s/'/'/g; # '
-- s/"/"/g; # "
-- s/&/&/g;
--
-- return $_;
--}
--
--sub entity_decode
--{
-- local ($_) = @_;
--
-- s/'/'/g; # '
-- s/"/"/g; # "
-- s/&/&/g;
-- s/</</g;
-- s/>/>/g;
--
-- return $_;
--}
--
--sub escape_char
--{
-- return '\"' if $_ eq '"';
-- return '\n' if $_ eq "\n";
-- return '\\' if $_ eq '\\';
--
-- return $_;
--}
--
--sub escape
--{
-- my ($string) = @_;
-- return join "", map &escape_char, split //, $string;
--}
--
--sub type_ini {
-- ### For generic translatable desktop files ###
-- while ($input =~ /^_.*=(.*)$/mg) {
-- $messages{$1} = [];
-- }
--}
--
--sub type_keys {
-- ### For generic translatable mime/keys files ###
-- while ($input =~ /^\s*_\w+=(.*)$/mg) {
-- $messages{$1} = [];
-- }
--}
--
--sub type_xml {
-- ### For generic translatable XML files ###
-- my $tree = readXml($input);
-- parseTree(0, $tree);
--}
--
--sub print_var {
-- my $var = shift;
-- my $vartype = ref $var;
--
-- if ($vartype =~ /ARRAY/) {
-- my @arr = @{$var};
-- print "[ ";
-- foreach my $el (@arr) {
-- print_var($el);
-- print ", ";
-- }
-- print "] ";
-- } elsif ($vartype =~ /HASH/) {
-- my %hash = %{$var};
-- print "{ ";
-- foreach my $key (keys %hash) {
-- print "$key => ";
-- print_var($hash{$key});
-- print ", ";
-- }
-- print "} ";
-- } else {
-- print $var;
-- }
--}
--
--# Same syntax as getAttributeString in intltool-merge.in.in, similar logic (look for ##
differences comment)
--sub getAttributeString
--{
-- my $sub = shift;
-- my $do_translate = shift || 1;
-- my $language = shift || "";
-- my $translate = shift;
-- my $result = "";
-- foreach my $e (reverse(sort(keys %{ $sub }))) {
-- my $key = $e;
-- my $string = $sub->{$e};
-- my $quote = '"';
--
-- $string =~ s/^[\s]+//;
-- $string =~ s/[\s]+$//;
--
-- if ($string =~ /^'.*'$/)
-- {
-- $quote = "'";
-- }
-- $string =~ s/^['"]//g;
-- $string =~ s/['"]$//g;
--
-- ## differences from intltool-merge.in.in
-- if ($key =~ /^_/) {
-- $comments{entity_decode($string)} = $XMLCOMMENT if $XMLCOMMENT;
-- $messages{entity_decode($string)} = [];
-- $$translate = 2;
-- }
-- ## differences end here from intltool-merge.in.in
-- $result .= " $key=$quote$string$quote";
-- }
-- return $result;
--}
--
--# Verbatim copy from intltool-merge.in.in
--sub getXMLstring
--{
-- my $ref = shift;
-- my $spacepreserve = shift || 0;
-- my @list = @{ $ref };
-- my $result = "";
--
-- my $count = scalar(@list);
-- my $attrs = $list[0];
-- my $index = 1;
--
-- $spacepreserve = 1 if ((exists $attrs->{"xml:space"}) &&
($attrs->{"xml:space"} =~ /^["']?preserve["']?$/));
-- $spacepreserve = 0 if ((exists $attrs->{"xml:space"}) &&
($attrs->{"xml:space"} =~ /^["']?default["']?$/));
--
-- while ($index < $count) {
-- my $type = $list[$index];
-- my $content = $list[$index+1];
-- if (! $type ) {
-- # We've got CDATA
-- if ($content) {
-- # lets strip the whitespace here, and *ONLY* here
-- $content =~ s/\s+/ /gs if (!$spacepreserve);
-- $result .= $content;
-- }
-- } elsif ( "$type" ne "1" ) {
-- # We've got another element
-- $result .= "<$type";
-- $result .= getAttributeString(@{$content}[0], 0); # no nested translatable
elements
-- if ($content) {
-- my $subresult = getXMLstring($content, $spacepreserve);
-- if ($subresult) {
-- $result .= ">".$subresult . "</$type>";
-- } else {
-- $result .= "/>";
-- }
-- } else {
-- $result .= "/>";
-- }
-- }
-- $index += 2;
-- }
-- return $result;
--}
--
--# Verbatim copy from intltool-merge.in.in, except for MULTIPLE_OUTPUT handling removed
--# Translate list of nodes if necessary
--sub translate_subnodes
--{
-- my $fh = shift;
-- my $content = shift;
-- my $language = shift || "";
-- my $singlelang = shift || 0;
-- my $spacepreserve = shift || 0;
--
-- my @nodes = @{ $content };
--
-- my $count = scalar(@nodes);
-- my $index = 0;
-- while ($index < $count) {
-- my $type = $nodes[$index];
-- my $rest = $nodes[$index+1];
-- traverse($fh, $type, $rest, $language, $spacepreserve);
-- $index += 2;
-- }
--}
--
--# Based on traverse() in intltool-merge.in.in
--sub traverse
--{
-- my $fh = shift; # unused, to allow us to sync code between -merge and -extract
-- my $nodename = shift;
-- my $content = shift;
-- my $language = shift || "";
-- my $spacepreserve = shift || 0;
--
-- if ($nodename && "$nodename" eq "1") {
-- $XMLCOMMENT = $content;
-- } elsif ($nodename) {
-- # element
-- my @all = @{ $content };
-- my $attrs = shift @all;
-- my $translate = 0;
-- my $outattr = getAttributeString($attrs, 1, $language, \$translate);
--
-- if ($nodename =~ /^_/) {
-- $translate = 1;
-- $nodename =~ s/^_//;
-- }
-- my $lookup = '';
--
-- $spacepreserve = 0 if ((exists $attrs->{"xml:space"}) &&
($attrs->{"xml:space"} =~ /^["']?default["']?$/));
-- $spacepreserve = 1 if ((exists $attrs->{"xml:space"}) &&
($attrs->{"xml:space"} =~ /^["']?preserve["']?$/));
--
-- if ($translate) {
-- $lookup = getXMLstring($content, $spacepreserve);
-- if (!$spacepreserve) {
-- $lookup =~ s/^\s+//s;
-- $lookup =~ s/\s+$//s;
-- }
--
-- if ($lookup && $translate != 2) {
-- $comments{$lookup} = $XMLCOMMENT if $XMLCOMMENT;
-- $messages{$lookup} = [];
-- } elsif ($translate == 2) {
-- translate_subnodes($fh, \@all, $language, 1, $spacepreserve);
-- }
-- } else {
-- $XMLCOMMENT = "";
-- my $count = scalar(@all);
-- if ($count > 0) {
-- my $index = 0;
-- while ($index < $count) {
-- my $type = $all[$index];
-- my $rest = $all[$index+1];
-- traverse($fh, $type, $rest, $language, $spacepreserve);
-- $index += 2;
-- }
-- }
-- }
-- $XMLCOMMENT = "";
-- }
--}
--
--
--# Verbatim copy from intltool-merge.in.in, $fh for compatibility
--sub parseTree
--{
-- my $fh = shift;
-- my $ref = shift;
-- my $language = shift || "";
--
-- my $name = shift @{ $ref };
-- my $cont = shift @{ $ref };
--
-- while (!$name || "$name" eq "1") {
-- $name = shift @{ $ref };
-- $cont = shift @{ $ref };
-- }
--
-- my $spacepreserve = 0;
-- my $attrs = @{$cont}[0];
-- $spacepreserve = 1 if ((exists $attrs->{"xml:space"}) &&
($attrs->{"xml:space"} =~ /^["']?preserve["']?$/));
--
-- traverse($fh, $name, $cont, $language, $spacepreserve);
--}
--
--# Verbatim copy from intltool-merge.in.in
--sub intltool_tree_comment
--{
-- my $expat = shift;
-- my $data = $expat->original_string();
-- my $clist = $expat->{Curlist};
-- my $pos = $#$clist;
--
-- $data =~ s/^<!--//s;
-- $data =~ s/-->$//s;
-- push @$clist, 1 => $data;
--}
--
--# Verbatim copy from intltool-merge.in.in
--sub intltool_tree_cdatastart
--{
-- my $expat = shift;
-- my $clist = $expat->{Curlist};
-- my $pos = $#$clist;
--
-- push @$clist, 0 => $expat->original_string();
--}
--
--# Verbatim copy from intltool-merge.in.in
--sub intltool_tree_cdataend
--{
-- my $expat = shift;
-- my $clist = $expat->{Curlist};
-- my $pos = $#$clist;
--
-- $clist->[$pos] .= $expat->original_string();
--}
--
--# Verbatim copy from intltool-merge.in.in
--sub intltool_tree_char
--{
-- my $expat = shift;
-- my $text = shift;
-- my $clist = $expat->{Curlist};
-- my $pos = $#$clist;
--
-- # Use original_string so that we retain escaped entities
-- # in CDATA sections.
-- #
-- if ($pos > 0 and $clist->[$pos - 1] eq '0') {
-- $clist->[$pos] .= $expat->original_string();
-- } else {
-- push @$clist, 0 => $expat->original_string();
-- }
--}
--
--# Verbatim copy from intltool-merge.in.in
--sub intltool_tree_start
--{
-- my $expat = shift;
-- my $tag = shift;
-- my @origlist = ();
--
-- # Use original_string so that we retain escaped entities
-- # in attribute values. We must convert the string to an
-- # @origlist array to conform to the structure of the Tree
-- # Style.
-- #
-- my @original_array = split /\x/, $expat->original_string();
-- my $source = $expat->original_string();
--
-- # Remove leading tag.
-- #
-- $source =~ s|^\s*<\s*(\S+)||s;
--
-- # Grab attribute key/value pairs and push onto @origlist array.
-- #
-- while ($source)
-- {
-- if ($source =~ /^\s*([\w:-]+)\s*[=]\s*["]/)
-- {
-- $source =~ s|^\s*([\w:-]+)\s*[=]\s*["]([^"]*)["]||s;
-- push @origlist, $1;
-- push @origlist, '"' . $2 . '"';
-- }
-- elsif ($source =~ /^\s*([\w:-]+)\s*[=]\s*[']/)
-- {
-- $source =~ s|^\s*([\w:-]+)\s*[=]\s*[']([^']*)[']||s;
-- push @origlist, $1;
-- push @origlist, "'" . $2 . "'";
-- }
-- else
-- {
-- last;
-- }
-- }
--
-- my $ol = [ { @origlist } ];
--
-- push @{ $expat->{Lists} }, $expat->{Curlist};
-- push @{ $expat->{Curlist} }, $tag => $ol;
-- $expat->{Curlist} = $ol;
--}
--
--# Copied from intltool-merge.in.in and added comment handler.
--sub readXml
--{
-- my $xmldoc = shift || return;
-- my $ret = eval 'require XML::Parser';
-- if(!$ret) {
-- die "You must have XML::Parser installed to run $0\n\n";
-- }
-- my $xp = new XML::Parser(Style => 'Tree');
-- $xp->setHandlers(Char => \&intltool_tree_char);
-- $xp->setHandlers(Start => \&intltool_tree_start);
-- $xp->setHandlers(CdataStart => \&intltool_tree_cdatastart);
-- $xp->setHandlers(CdataEnd => \&intltool_tree_cdataend);
--
-- ## differences from intltool-merge.in.in
-- $xp->setHandlers(Comment => \&intltool_tree_comment);
-- ## differences end here from intltool-merge.in.in
--
-- my $tree = $xp->parse($xmldoc);
-- #print_var($tree);
--
--# <foo><!-- comment --><head id="a">Hello
<em>there</em></head><bar>Howdy<ref/></bar>do</foo>
--# would be:
--# [foo, [{}, 1, "comment", head, [{id => "a"}, 0, "Hello
", em, [{}, 0, "there"]], bar,
--# [{}, 0, "Howdy", ref, [{}]], 0, "do" ] ]
--
-- return $tree;
--}
--
--sub type_schemas {
-- ### For schemas XML files ###
--
-- # FIXME: We should handle escaped < (less than)
-- while ($input =~ /
-- <locale\ name="C">\s*
--
(<default>\s*(?:<!--([^>]*?)-->\s*)?(.*?)\s*<\/default>\s*)?
--
(<short>\s*(?:<!--([^>]*?)-->\s*)?(.*?)\s*<\/short>\s*)?
--
(<long>\s*(?:<!--([^>]*?)-->\s*)?(.*?)\s*<\/long>\s*)?
-- <\/locale>
-- /sgx) {
-- my @totranslate = ($3,$6,$9);
-- my @eachcomment = ($2,$5,$8);
-- foreach (@totranslate) {
-- my $currentcomment = shift @eachcomment;
-- next if !$_;
-- s/\s+/ /g;
-- $messages{entity_decode_minimal($_)} = [];
-- $comments{entity_decode_minimal($_)} = $currentcomment if
(defined($currentcomment));
-- }
-- }
--}
--
--sub type_rfc822deb {
-- ### For rfc822-style Debian configuration files ###
--
-- my $lineno = 1;
-- my $type = '';
-- while ($input =~ /\G(.*?)(^|\n)(_+)([^:]+):[ \t]*(.*?)(?=\n\S|$)/sg)
-- {
-- my ($pre, $newline, $underscore, $tag, $text) = ($1, $2, $3, $4, $5);
-- while ($pre =~ m/\n/g)
-- {
-- $lineno ++;
-- }
-- $lineno += length($newline);
-- my @str_list = rfc822deb_split(length($underscore), $text);
-- for my $str (@str_list)
-- {
-- $strcount++;
-- $messages{$str} = [];
-- $loc{$str} = $lineno;
-- $count{$str} = $strcount;
-- my $usercomment = '';
-- while($pre =~ s/(^|\n)#([^\n]*)$//s)
-- {
-- $usercomment = "\n" . $2 . $usercomment;
-- }
-- $comments{$str} = $tag . $usercomment;
-- }
-- $lineno += ($text =~ s/\n//g);
-- }
--}
--
--sub rfc822deb_split {
-- # Debian defines a special way to deal with rfc822-style files:
-- # when a value contain newlines, it consists of
-- # 1. a short form (first line)
-- # 2. a long description, all lines begin with a space,
-- # and paragraphs are separated by a single dot on a line
-- # This routine returns an array of all paragraphs, and reformat
-- # them.
-- # When first argument is 2, the string is a comma separated list of
-- # values.
-- my $type = shift;
-- my $text = shift;
-- $text =~ s/^[ \t]//mg;
-- return (split(/, */, $text, 0)) if $type ne 1;
-- return ($text) if $text !~ /\n/;
--
-- $text =~ s/([^\n]*)\n//;
-- my @list = ($1);
-- my $str = '';
-- for my $line (split (/\n/, $text))
-- {
-- chomp $line;
-- if ($line =~ /^\.\s*$/)
-- {
-- # New paragraph
-- $str =~ s/\s*$//;
-- push(@list, $str);
-- $str = '';
-- }
-- elsif ($line =~ /^\s/)
-- {
-- # Line which must not be reformatted
-- $str .= "\n" if length ($str) && $str !~ /\n$/;
-- $line =~ s/\s+$//;
-- $str .= $line."\n";
-- }
-- else
-- {
-- # Continuation line, remove newline
-- $str .= " " if length ($str) && $str !~ /\n$/;
-- $str .= $line;
-- }
-- }
-- $str =~ s/\s*$//;
-- push(@list, $str) if length ($str);
-- return @list;
--}
--
--sub type_glade {
-- ### For translatable Glade XML files ###
--
-- my $tags =
"label|title|text|format|copyright|comments|preview_text|tooltip|message";
--
-- while ($input =~ /<($tags)>([^<]+)<\/($tags)>/sg) {
-- # Glade sometimes uses tags that normally mark translatable things for
-- # little bits of non-translatable content. We work around this by not
-- # translating strings that only includes something like label4 or window1.
-- $messages{entity_decode($2)} = [] unless $2 =~ /^(window|label|dialog)[0-9]+$/;
-- }
--
-- while ($input =~ /<items>(..[^<]*)<\/items>/sg) {
-- for my $item (split (/\n/, $1)) {
-- $messages{entity_decode($item)} = [];
-- }
-- }
--
-- ## handle new glade files
-- while ($input =~
/<(property|atkproperty)\s+[^>]*translatable\s*=\s*"yes"(?:\s+[^>]*comments\s*=\s*"([^"]*)")?[^>]*>([^<]+)<\/\1>/sg)
{
-- $messages{entity_decode($3)} = [] unless $3 =~ /^(window|label)[0-9]+$/;
-- if (defined($2) and !($3 =~ /^(window|label)[0-9]+$/)) {
-- $comments{entity_decode($3)} = entity_decode($2) ;
-- }
-- }
-- while ($input =~
/<atkaction\s+action_name="([^>]*)"\s+description="([^>]+)"\/>/sg)
{
-- $messages{entity_decode_minimal($2)} = [];
-- }
--}
--
--sub type_scheme {
-- my ($line, $i, $state, $str, $trcomment, $char);
-- for $line (split(/\n/, $input)) {
-- $i = 0;
-- $state = 0; # 0 - nothing, 1 - string, 2 - translatable string
-- while ($i < length($line)) {
-- if (substr($line,$i,1) eq "\"") {
-- if ($state == 2) {
-- $comments{$str} = $trcomment if ($trcomment);
-- $messages{$str} = [];
-- $str = '';
-- $state = 0; $trcomment = "";
-- } elsif ($state == 1) {
-- $str = '';
-- $state = 0; $trcomment = "";
-- } else {
-- $state = 1;
-- $str = '';
-- if ($i>0 && substr($line,$i-1,1) eq '_') {
-- $state = 2;
-- }
-- }
-- } elsif (!$state) {
-- if (substr($line,$i,1) eq ";") {
-- $trcomment = substr($line,$i+1);
-- $trcomment =~ s/^;*\s*//;
-- $i = length($line);
-- } elsif ($trcomment && substr($line,$i,1) !~ /\s|\(|\)|_/) {
-- $trcomment = "";
-- }
-- } else {
-- if (substr($line,$i,1) eq "\\") {
-- $char = substr($line,$i+1,1);
-- if ($char ne "\"" && $char ne "\\")
{
-- $str = $str . "\\";
-- }
-- $i++;
-- }
-- $str = $str . substr($line,$i,1);
-- }
-- $i++;
-- }
-- }
--}
--
--sub msg_write {
-- my @msgids;
-- if (%count)
-- {
-- @msgids = sort { $count{$a} <=> $count{$b} } keys %count;
-- }
-- else
-- {
-- @msgids = sort keys %messages;
-- }
-- for my $message (@msgids)
-- {
-- my $offsetlines = 1;
-- $offsetlines++ if $message =~ /%/;
-- if (defined ($comments{$message}))
-- {
-- while ($comments{$message} =~ m/\n/g)
-- {
-- $offsetlines++;
-- }
-- }
-- print OUT "# ".($loc{$message} - $offsetlines). "
\"$FILE\"\n"
-- if defined $loc{$message};
-- print OUT "/* ".$comments{$message}." */\n"
-- if defined $comments{$message};
-- print OUT "/* xgettext:no-c-format */\n" if $message =~ /%/;
--
-- my @lines = split (/\n/, $message, -1);
-- for (my $n = 0; $n < @lines; $n++)
-- {
-- if ($n == 0)
-- {
-- print OUT "char *s = N_(\"";
-- }
-- else
-- {
-- print OUT " \"";
-- }
--
-- print OUT escape($lines[$n]);
--
-- if ($n < @lines - 1)
-- {
-- print OUT "\\n\"\n";
-- }
-- else
-- {
-- print OUT "\");\n";
-- }
-- }
-- }
--}
--
-diff --git a/intltool-extract.in b/intltool-extract.in
-new file mode 120000
-index bb6c368..340fc8d
---- /dev/null
-+++ b/intltool-extract.in
-@@ -0,0 +1 @@
-+/usr/share/intltool/intltool-extract.in
-\ No newline at end of file
-diff --git a/intltool-merge.in b/intltool-merge.in
-deleted file mode 100755
-index d0535ab..2238bbd
---- a/intltool-merge.in
-+++ /dev/null
-@@ -1,1356 +0,0 @@
--#!@INTLTOOL_PERL@ -w
--# -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*-
--
--#
--# The Intltool Message Merger
--#
--# Copyright (C) 2000, 2003 Free Software Foundation.
--# Copyright (C) 2000, 2001 Eazel, Inc
--#
--# Intltool is free software; you can redistribute it and/or
--# modify it under the terms of the GNU General Public License
--# version 2 published by the Free Software Foundation.
--#
--# Intltool is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
--# General Public License for more details.
--#
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
--#
--# As a special exception to the GNU General Public License, if you
--# distribute this file as part of a program that contains a
--# configuration script generated by Autoconf, you may include it under
--# the same distribution terms that you use for the rest of that program.
--#
--# Authors: Maciej Stachowiak <mjs(a)noisehavoc.org>
--# Kenneth Christiansen <kenneth(a)gnu.org>
--# Darin Adler <darin(a)bentspoon.com>
--#
--# Proper XML UTF-8'ification written by Cyrille Chepelov
<chepelov(a)calixo.net>
--#
--
--## Release information
--my $PROGRAM = "intltool-merge";
--my $PACKAGE = "intltool";
--my $VERSION = "0.35.0";
--
--## Loaded modules
--use strict;
--use Getopt::Long;
--use Text::Wrap;
--use File::Basename;
--
--my $must_end_tag = -1;
--my $last_depth = -1;
--my $translation_depth = -1;
--my @tag_stack = ();
--my @entered_tag = ();
--my @translation_strings = ();
--my $leading_space = "";
--
--## Scalars used by the option stuff
--my $HELP_ARG = 0;
--my $VERSION_ARG = 0;
--my $BA_STYLE_ARG = 0;
--my $XML_STYLE_ARG = 0;
--my $KEYS_STYLE_ARG = 0;
--my $DESKTOP_STYLE_ARG = 0;
--my $SCHEMAS_STYLE_ARG = 0;
--my $RFC822DEB_STYLE_ARG = 0;
--my $QUIET_ARG = 0;
--my $PASS_THROUGH_ARG = 0;
--my $UTF8_ARG = 0;
--my $MULTIPLE_OUTPUT = 0;
--my $cache_file;
--
--## Handle options
--GetOptions
--(
-- "help" => \$HELP_ARG,
-- "version" => \$VERSION_ARG,
-- "quiet|q" => \$QUIET_ARG,
-- "oaf-style|o" => \$BA_STYLE_ARG, ## for compatibility
-- "ba-style|b" => \$BA_STYLE_ARG,
-- "xml-style|x" => \$XML_STYLE_ARG,
-- "keys-style|k" => \$KEYS_STYLE_ARG,
-- "desktop-style|d" => \$DESKTOP_STYLE_ARG,
-- "schemas-style|s" => \$SCHEMAS_STYLE_ARG,
-- "rfc822deb-style|r" => \$RFC822DEB_STYLE_ARG,
-- "pass-through|p" => \$PASS_THROUGH_ARG,
-- "utf8|u" => \$UTF8_ARG,
-- "multiple-output|m" => \$MULTIPLE_OUTPUT,
-- "cache|c=s" => \$cache_file
-- ) or &error;
--
--my $PO_DIR;
--my $FILE;
--my $OUTFILE;
--
--my %po_files_by_lang = ();
--my %translations = ();
--my $iconv = $ENV{"ICONV"} || $ENV{"INTLTOOL_ICONV"} ||
"@INTLTOOL_ICONV@";
--my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null');
--
--# Use this instead of \w for XML files to handle more possible characters.
--my $w = "[-A-Za-z0-9._:]";
--
--# XML quoted string contents
--my $q = "[^\\\"]*";
--
--## Check for options.
--
--if ($VERSION_ARG)
--{
-- &print_version;
--}
--elsif ($HELP_ARG)
--{
-- &print_help;
--}
--elsif ($BA_STYLE_ARG && @ARGV > 2)
--{
-- &utf8_sanity_check;
-- &preparation;
-- &print_message;
-- &ba_merge_translations;
-- &finalize;
--}
--elsif ($XML_STYLE_ARG && @ARGV > 2)
--{
-- &utf8_sanity_check;
-- &preparation;
-- &print_message;
-- &xml_merge_output;
-- &finalize;
--}
--elsif ($KEYS_STYLE_ARG && @ARGV > 2)
--{
-- &utf8_sanity_check;
-- &preparation;
-- &print_message;
-- &keys_merge_translations;
-- &finalize;
--}
--elsif ($DESKTOP_STYLE_ARG && @ARGV > 2)
--{
-- &utf8_sanity_check;
-- &preparation;
-- &print_message;
-- &desktop_merge_translations;
-- &finalize;
--}
--elsif ($SCHEMAS_STYLE_ARG && @ARGV > 2)
--{
-- &utf8_sanity_check;
-- &preparation;
-- &print_message;
-- &schemas_merge_translations;
-- &finalize;
--}
--elsif ($RFC822DEB_STYLE_ARG && @ARGV > 2)
--{
-- &preparation;
-- &print_message;
-- &rfc822deb_merge_translations;
-- &finalize;
--}
--else
--{
-- &print_help;
--}
--
--exit;
--
--## Sub for printing release information
--sub print_version
--{
-- print <<_EOF_;
--${PROGRAM} (${PACKAGE}) ${VERSION}
--Written by Maciej Stachowiak, Darin Adler and Kenneth Christiansen.
--
--Copyright (C) 2000-2003 Free Software Foundation, Inc.
--Copyright (C) 2000-2001 Eazel, Inc.
--This is free software; see the source for copying conditions. There is NO
--warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--_EOF_
-- exit;
--}
--
--## Sub for printing usage information
--sub print_help
--{
-- print <<_EOF_;
--Usage: ${PROGRAM} [OPTION]... PO_DIRECTORY FILENAME OUTPUT_FILE
--Generates an output file that includes some localized attributes from an
--untranslated source file.
--
--Mandatory options: (exactly one must be specified)
-- -b, --ba-style includes translations in the bonobo-activation style
-- -d, --desktop-style includes translations in the desktop style
-- -k, --keys-style includes translations in the keys style
-- -s, --schemas-style includes translations in the schemas style
-- -r, --rfc822deb-style includes translations in the RFC822 style
-- -x, --xml-style includes translations in the standard xml style
--
--Other options:
-- -u, --utf8 convert all strings to UTF-8 before merging
-- (default for everything except RFC822 style)
-- -p, --pass-through deprecated, does nothing and issues a warning
-- -m, --multiple-output output one localized file per locale, instead of
-- a single file containing all localized elements
-- -c, --cache=FILE specify cache file name
-- (usually \$top_builddir/po/.intltool-merge-cache)
-- -q, --quiet suppress most messages
-- --help display this help and exit
-- --version output version information and exit
--
--Report bugs to
http://bugzilla.gnome.org/ (product name "$PACKAGE")
--or send email to <xml-i18n-tools\(a)gnome.org>.
--_EOF_
-- exit;
--}
--
--
--## Sub for printing error messages
--sub print_error
--{
-- print STDERR "Try `${PROGRAM} --help' for more information.\n";
-- exit;
--}
--
--
--sub print_message
--{
-- print "Merging translations into $OUTFILE.\n" unless $QUIET_ARG;
--}
--
--
--sub preparation
--{
-- $PO_DIR = $ARGV[0];
-- $FILE = $ARGV[1];
-- $OUTFILE = $ARGV[2];
--
-- &gather_po_files;
-- &get_translation_database;
--}
--
--# General-purpose code for looking up translations in .po files
--
--sub po_file2lang
--{
-- my ($tmp) = @_;
-- $tmp =~ s/^.*\/(.*)\.po$/$1/;
-- return $tmp;
--}
--
--sub gather_po_files
--{
-- for my $po_file (glob "$PO_DIR/*.po") {
-- $po_files_by_lang{po_file2lang($po_file)} = $po_file;
-- }
--}
--
--sub get_local_charset
--{
-- my ($encoding) = @_;
-- my $alias_file = $ENV{"G_CHARSET_ALIAS"} ||
"@INTLTOOL_LIBDIR(a)/charset.alias";
--
-- # seek character encoding aliases in charset.alias (glib)
--
-- if (open CHARSET_ALIAS, $alias_file)
-- {
-- while (<CHARSET_ALIAS>)
-- {
-- next if /^\#/;
-- return $1 if (/^\s*([-._a-zA-Z0-9]+)\s+$encoding\b/i)
-- }
--
-- close CHARSET_ALIAS;
-- }
--
-- # if not found, return input string
--
-- return $encoding;
--}
--
--sub get_po_encoding
--{
-- my ($in_po_file) = @_;
-- my $encoding = "";
--
-- open IN_PO_FILE, $in_po_file or die;
-- while (<IN_PO_FILE>)
-- {
-- ## example: "Content-Type: text/plain; charset=ISO-8859-1\n"
-- if (/Content-Type\:.*charset=([-a-zA-Z0-9]+)\\n/)
-- {
-- $encoding = $1;
-- last;
-- }
-- }
-- close IN_PO_FILE;
--
-- if (!$encoding)
-- {
-- print STDERR "Warning: no encoding found in $in_po_file. Assuming
ISO-8859-1\n" unless $QUIET_ARG;
-- $encoding = "ISO-8859-1";
-- }
--
-- system ("$iconv -f $encoding -t UTF-8 <$devnull 2>$devnull");
-- if ($?) {
-- $encoding = get_local_charset($encoding);
-- }
--
-- return $encoding
--}
--
--sub utf8_sanity_check
--{
-- print STDERR "Warning: option --pass-through has been removed.\n" if
$PASS_THROUGH_ARG;
-- $UTF8_ARG = 1;
--}
--
--sub get_translation_database
--{
-- if ($cache_file) {
-- &get_cached_translation_database;
-- } else {
-- &create_translation_database;
-- }
--}
--
--sub get_newest_po_age
--{
-- my $newest_age;
--
-- foreach my $file (values %po_files_by_lang)
-- {
-- my $file_age = -M $file;
-- $newest_age = $file_age if !$newest_age || $file_age < $newest_age;
-- }
--
-- $newest_age = 0 if !$newest_age;
--
-- return $newest_age;
--}
--
--sub create_cache
--{
-- print "Generating and caching the translation database\n" unless
$QUIET_ARG;
--
-- &create_translation_database;
--
-- open CACHE, ">$cache_file" || die;
-- print CACHE join "\x01", %translations;
-- close CACHE;
--}
--
--sub load_cache
--{
-- print "Found cached translation database\n" unless $QUIET_ARG;
--
-- my $contents;
-- open CACHE, "<$cache_file" || die;
-- {
-- local $/;
-- $contents = <CACHE>;
-- }
-- close CACHE;
-- %translations = split "\x01", $contents;
--}
--
--sub get_cached_translation_database
--{
-- my $cache_file_age = -M $cache_file;
-- if (defined $cache_file_age)
-- {
-- if ($cache_file_age <= &get_newest_po_age)
-- {
-- &load_cache;
-- return;
-- }
-- print "Found too-old cached translation database\n" unless
$QUIET_ARG;
-- }
--
-- &create_cache;
--}
--
--sub create_translation_database
--{
-- for my $lang (keys %po_files_by_lang)
-- {
-- my $po_file = $po_files_by_lang{$lang};
--
-- if ($UTF8_ARG)
-- {
-- my $encoding = get_po_encoding ($po_file);
--
-- if (lc $encoding eq "utf-8")
-- {
-- open PO_FILE, "<$po_file";
-- }
-- else
-- {
-- print "NOTICE: $po_file is not in UTF-8 but $encoding, converting...\n"
unless $QUIET_ARG;;
--
-- open PO_FILE, "$iconv -f $encoding -t UTF-8 $po_file|";
-- }
-- }
-- else
-- {
-- open PO_FILE, "<$po_file";
-- }
--
-- my $nextfuzzy = 0;
-- my $inmsgid = 0;
-- my $inmsgstr = 0;
-- my $msgid = "";
-- my $msgstr = "";
--
-- while (<PO_FILE>)
-- {
-- $nextfuzzy = 1 if /^#, fuzzy/;
--
-- if (/^msgid "((\\.|[^\\])*)"/ )
-- {
-- $translations{$lang, $msgid} = $msgstr if $inmsgstr && $msgid &&
$msgstr;
-- $msgid = "";
-- $msgstr = "";
--
-- if ($nextfuzzy) {
-- $inmsgid = 0;
-- } else {
-- $msgid = unescape_po_string($1);
-- $inmsgid = 1;
-- }
-- $inmsgstr = 0;
-- $nextfuzzy = 0;
-- }
--
-- if (/^msgstr "((\\.|[^\\])*)"/)
-- {
-- $msgstr = unescape_po_string($1);
-- $inmsgstr = 1;
-- $inmsgid = 0;
-- }
--
-- if (/^"((\\.|[^\\])*)"/)
-- {
-- $msgid .= unescape_po_string($1) if $inmsgid;
-- $msgstr .= unescape_po_string($1) if $inmsgstr;
-- }
-- }
-- $translations{$lang, $msgid} = $msgstr if $inmsgstr && $msgid &&
$msgstr;
-- }
--}
--
--sub finalize
--{
--}
--
--sub unescape_one_sequence
--{
-- my ($sequence) = @_;
--
-- return "\\" if $sequence eq "\\\\";
-- return "\"" if $sequence eq "\\\"";
-- return "\n" if $sequence eq "\\n";
-- return "\r" if $sequence eq "\\r";
-- return "\t" if $sequence eq "\\t";
-- return "\b" if $sequence eq "\\b";
-- return "\f" if $sequence eq "\\f";
-- return "\a" if $sequence eq "\\a";
-- return chr(11) if $sequence eq "\\v"; # vertical tab, see ascii(7)
--
-- return chr(hex($1)) if ($sequence =~ /\\x([0-9a-fA-F]{2})/);
-- return chr(oct($1)) if ($sequence =~ /\\([0-7]{3})/);
--
-- # FIXME: Is \0 supported as well? Kenneth and Rodney don't want it, see bug
#48489
--
-- return $sequence;
--}
--
--sub unescape_po_string
--{
-- my ($string) = @_;
--
-- $string =~ s/(\\x[0-9a-fA-F]{2}|\\[0-7]{3}|\\.)/unescape_one_sequence($1)/eg;
--
-- return $string;
--}
--
--## NOTE: deal with < - < but not > - > because it seems its ok to
have
--## > in the entity. For further info please look at #84738.
--sub entity_decode
--{
-- local ($_) = @_;
--
-- s/'/'/g; # '
-- s/"/"/g; # "
-- s/&/&/g;
-- s/</</g;
--
-- return $_;
--}
--
--# entity_encode: (string)
--#
--# Encode the given string to XML format (encode '<' etc).
--
--sub entity_encode
--{
-- my ($pre_encoded) = @_;
--
-- my @list_of_chars = unpack ('C*', $pre_encoded);
--
-- # with UTF-8 we only encode minimalistic
-- return join ('', map (&entity_encode_int_minimalist, @list_of_chars));
--}
--
--sub entity_encode_int_minimalist
--{
-- return """ if $_ == 34;
-- return "&" if $_ == 38;
-- return "'" if $_ == 39;
-- return "<" if $_ == 60;
-- return chr $_;
--}
--
--sub entity_encoded_translation
--{
-- my ($lang, $string) = @_;
--
-- my $translation = $translations{$lang, $string};
-- return $string if !$translation;
-- return entity_encode ($translation);
--}
--
--## XML (bonobo-activation specific) merge code
--
--sub ba_merge_translations
--{
-- my $source;
--
-- {
-- local $/; # slurp mode
-- open INPUT, "<$FILE" or die "can't open $FILE: $!";
-- $source = <INPUT>;
-- close INPUT;
-- }
--
-- open OUTPUT, ">$OUTFILE" or die "can't open $OUTFILE:
$!";
-- # Binmode so that selftest works ok if using a native Win32 Perl...
-- binmode (OUTPUT) if $^O eq 'MSWin32';
--
-- while ($source =~ s|^(.*?)([
\t]*<\s*$w+\s+($w+\s*=\s*"$q"\s*)+/?>)([ \t]*\n)?||s)
-- {
-- print OUTPUT $1;
--
-- my $node = $2 . "\n";
--
-- my @strings = ();
-- $_ = $node;
-- while (s/(\s)_($w+\s*=\s*"($q)")/$1$2/s) {
-- push @strings, entity_decode($3);
-- }
-- print OUTPUT;
--
-- my %langs;
-- for my $string (@strings)
-- {
-- for my $lang (keys %po_files_by_lang)
-- {
-- $langs{$lang} = 1 if $translations{$lang, $string};
-- }
-- }
--
-- for my $lang (sort keys %langs)
-- {
-- $_ = $node;
-- s/(\sname\s*=\s*)"($q)"/$1"$2-$lang"/s;
-- s/(\s)_($w+\s*=\s*")($q)"/$1 . $2 . entity_encoded_translation($lang, $3)
. '"'/seg;
-- print OUTPUT;
-- }
-- }
--
-- print OUTPUT $source;
--
-- close OUTPUT;
--}
--
--
--## XML (non-bonobo-activation) merge code
--
--
--# Process tag attributes
--# Only parameter is a HASH containing attributes -> values mapping
--sub getAttributeString
--{
-- my $sub = shift;
-- my $do_translate = shift || 0;
-- my $language = shift || "";
-- my $result = "";
-- my $translate = shift;
-- foreach my $e (reverse(sort(keys %{ $sub }))) {
-- my $key = $e;
-- my $string = $sub->{$e};
-- my $quote = '"';
--
-- $string =~ s/^[\s]+//;
-- $string =~ s/[\s]+$//;
--
-- if ($string =~ /^'.*'$/)
-- {
-- $quote = "'";
-- }
-- $string =~ s/^['"]//g;
-- $string =~ s/['"]$//g;
--
-- if ($do_translate && $key =~ /^_/) {
-- $key =~ s|^_||g;
-- if ($language) {
-- # Handle translation
-- my $decode_string = entity_decode($string);
-- my $translation = $translations{$language, $decode_string};
-- if ($translation) {
-- $translation = entity_encode($translation);
-- $string = $translation;
-- }
-- $$translate = 2;
-- } else {
-- $$translate = 2 if ($translate && (!$$translate)); # watch not
to "overwrite" $translate
-- }
-- }
--
-- $result .= " $key=$quote$string$quote";
-- }
-- return $result;
--}
--
--# Returns a translatable string from XML node, it works on contents of every node in
XML::Parser tree
--sub getXMLstring
--{
-- my $ref = shift;
-- my $spacepreserve = shift || 0;
-- my @list = @{ $ref };
-- my $result = "";
--
-- my $count = scalar(@list);
-- my $attrs = $list[0];
-- my $index = 1;
--
-- $spacepreserve = 1 if ((exists $attrs->{"xml:space"}) &&
($attrs->{"xml:space"} =~ /^["']?preserve["']?$/));
-- $spacepreserve = 0 if ((exists $attrs->{"xml:space"}) &&
($attrs->{"xml:space"} =~ /^["']?default["']?$/));
--
-- while ($index < $count) {
-- my $type = $list[$index];
-- my $content = $list[$index+1];
-- if (! $type ) {
-- # We've got CDATA
-- if ($content) {
-- # lets strip the whitespace here, and *ONLY* here
-- $content =~ s/\s+/ /gs if (!$spacepreserve);
-- $result .= $content;
-- }
-- } elsif ( "$type" ne "1" ) {
-- # We've got another element
-- $result .= "<$type";
-- $result .= getAttributeString(@{$content}[0], 0); # no nested translatable
elements
-- if ($content) {
-- my $subresult = getXMLstring($content, $spacepreserve);
-- if ($subresult) {
-- $result .= ">".$subresult . "</$type>";
-- } else {
-- $result .= "/>";
-- }
-- } else {
-- $result .= "/>";
-- }
-- }
-- $index += 2;
-- }
-- return $result;
--}
--
--# Translate list of nodes if necessary
--sub translate_subnodes
--{
-- my $fh = shift;
-- my $content = shift;
-- my $language = shift || "";
-- my $singlelang = shift || 0;
-- my $spacepreserve = shift || 0;
--
-- my @nodes = @{ $content };
--
-- my $count = scalar(@nodes);
-- my $index = 0;
-- while ($index < $count) {
-- my $type = $nodes[$index];
-- my $rest = $nodes[$index+1];
-- if ($singlelang) {
-- my $oldMO = $MULTIPLE_OUTPUT;
-- $MULTIPLE_OUTPUT = 1;
-- traverse($fh, $type, $rest, $language, $spacepreserve);
-- $MULTIPLE_OUTPUT = $oldMO;
-- } else {
-- traverse($fh, $type, $rest, $language, $spacepreserve);
-- }
-- $index += 2;
-- }
--}
--
--sub isWellFormedXmlFragment
--{
-- my $ret = eval 'require XML::Parser';
-- if(!$ret) {
-- die "You must have XML::Parser installed to run $0\n\n";
-- }
--
-- my $fragment = shift;
-- return 0 if (!$fragment);
--
-- $fragment = "<root>$fragment</root>";
-- my $xp = new XML::Parser(Style => 'Tree');
-- my $tree = 0;
-- eval { $tree = $xp->parse($fragment); };
-- return $tree;
--}
--
--sub traverse
--{
-- my $fh = shift;
-- my $nodename = shift;
-- my $content = shift;
-- my $language = shift || "";
-- my $spacepreserve = shift || 0;
--
-- if (!$nodename) {
-- if ($content =~ /^[\s]*$/) {
-- $leading_space .= $content;
-- }
-- print $fh $content;
-- } else {
-- # element
-- my @all = @{ $content };
-- my $attrs = shift @all;
-- my $translate = 0;
-- my $outattr = getAttributeString($attrs, 1, $language, \$translate);
--
-- if ($nodename =~ /^_/) {
-- $translate = 1;
-- $nodename =~ s/^_//;
-- }
-- my $lookup = '';
--
-- $spacepreserve = 0 if ((exists $attrs->{"xml:space"}) &&
($attrs->{"xml:space"} =~ /^["']?default["']?$/));
-- $spacepreserve = 1 if ((exists $attrs->{"xml:space"}) &&
($attrs->{"xml:space"} =~ /^["']?preserve["']?$/));
--
-- print $fh "<$nodename", $outattr;
-- if ($translate) {
-- $lookup = getXMLstring($content, $spacepreserve);
-- if (!$spacepreserve) {
-- $lookup =~ s/^\s+//s;
-- $lookup =~ s/\s+$//s;
-- }
--
-- if ($lookup || $translate == 2) {
-- my $translation = $translations{$language, $lookup} if
isWellFormedXmlFragment($translations{$language, $lookup});
-- if ($MULTIPLE_OUTPUT && ($translation || $translate == 2)) {
-- $translation = $lookup if (!$translation);
-- print $fh " xml:lang=\"", $language,
"\"" if $language;
-- print $fh ">";
-- if ($translate == 2) {
-- translate_subnodes($fh, \@all, $language, 1, $spacepreserve);
-- } else {
-- print $fh $translation;
-- }
-- print $fh "</$nodename>";
--
-- return; # this means there will be no same translation with
xml:lang="$language"...
-- # if we want them both, just remove this "return"
-- } else {
-- print $fh ">";
-- if ($translate == 2) {
-- translate_subnodes($fh, \@all, $language, 1, $spacepreserve);
-- } else {
-- print $fh $lookup;
-- }
-- print $fh "</$nodename>";
-- }
-- } else {
-- print $fh "/>";
-- }
--
-- for my $lang (sort keys %po_files_by_lang) {
-- if ($MULTIPLE_OUTPUT && $lang ne "$language") {
-- next;
-- }
-- if ($lang) {
-- # Handle translation
-- #
-- my $translate = 0;
-- my $localattrs = getAttributeString($attrs, 1, $lang,
\$translate);
-- my $translation = $translations{$lang, $lookup} if
isWellFormedXmlFragment($translations{$lang, $lookup});
-- if ($translate && !$translation) {
-- $translation = $lookup;
-- }
--
-- if ($translation || $translate) {
-- print $fh "\n";
-- $leading_space =~ s/.*\n//g;
-- print $fh $leading_space;
-- print $fh "<", $nodename, " xml:lang=\"", $lang,
"\"", $localattrs, ">";
-- if ($translate == 2) {
-- translate_subnodes($fh, \@all, $lang, 1,
$spacepreserve);
-- } else {
-- print $fh $translation;
-- }
-- print $fh "</$nodename>";
-- }
-- }
-- }
--
-- } else {
-- my $count = scalar(@all);
-- if ($count > 0) {
-- print $fh ">";
-- my $index = 0;
-- while ($index < $count) {
-- my $type = $all[$index];
-- my $rest = $all[$index+1];
-- traverse($fh, $type, $rest, $language, $spacepreserve);
-- $index += 2;
-- }
-- print $fh "</$nodename>";
-- } else {
-- print $fh "/>";
-- }
-- }
-- }
--}
--
--sub intltool_tree_comment
--{
-- my $expat = shift;
-- my $data = shift;
-- my $clist = $expat->{Curlist};
-- my $pos = $#$clist;
--
-- push @$clist, 1 => $data;
--}
--
--sub intltool_tree_cdatastart
--{
-- my $expat = shift;
-- my $clist = $expat->{Curlist};
-- my $pos = $#$clist;
--
-- push @$clist, 0 => $expat->original_string();
--}
--
--sub intltool_tree_cdataend
--{
-- my $expat = shift;
-- my $clist = $expat->{Curlist};
-- my $pos = $#$clist;
--
-- $clist->[$pos] .= $expat->original_string();
--}
--
--sub intltool_tree_char
--{
-- my $expat = shift;
-- my $text = shift;
-- my $clist = $expat->{Curlist};
-- my $pos = $#$clist;
--
-- # Use original_string so that we retain escaped entities
-- # in CDATA sections.
-- #
-- if ($pos > 0 and $clist->[$pos - 1] eq '0') {
-- $clist->[$pos] .= $expat->original_string();
-- } else {
-- push @$clist, 0 => $expat->original_string();
-- }
--}
--
--sub intltool_tree_start
--{
-- my $expat = shift;
-- my $tag = shift;
-- my @origlist = ();
--
-- # Use original_string so that we retain escaped entities
-- # in attribute values. We must convert the string to an
-- # @origlist array to conform to the structure of the Tree
-- # Style.
-- #
-- my @original_array = split /\x/, $expat->original_string();
-- my $source = $expat->original_string();
--
-- # Remove leading tag.
-- #
-- $source =~ s|^\s*<\s*(\S+)||s;
--
-- # Grab attribute key/value pairs and push onto @origlist array.
-- #
-- while ($source)
-- {
-- if ($source =~ /^\s*([\w:-]+)\s*[=]\s*["]/)
-- {
-- $source =~ s|^\s*([\w:-]+)\s*[=]\s*["]([^"]*)["]||s;
-- push @origlist, $1;
-- push @origlist, '"' . $2 . '"';
-- }
-- elsif ($source =~ /^\s*([\w:-]+)\s*[=]\s*[']/)
-- {
-- $source =~ s|^\s*([\w:-]+)\s*[=]\s*[']([^']*)[']||s;
-- push @origlist, $1;
-- push @origlist, "'" . $2 . "'";
-- }
-- else
-- {
-- last;
-- }
-- }
--
-- my $ol = [ { @origlist } ];
--
-- push @{ $expat->{Lists} }, $expat->{Curlist};
-- push @{ $expat->{Curlist} }, $tag => $ol;
-- $expat->{Curlist} = $ol;
--}
--
--sub readXml
--{
-- my $filename = shift || return;
-- if(!-f $filename) {
-- die "ERROR Cannot find filename: $filename\n";
-- }
--
-- my $ret = eval 'require XML::Parser';
-- if(!$ret) {
-- die "You must have XML::Parser installed to run $0\n\n";
-- }
-- my $xp = new XML::Parser(Style => 'Tree');
-- $xp->setHandlers(Char => \&intltool_tree_char);
-- $xp->setHandlers(Start => \&intltool_tree_start);
-- $xp->setHandlers(CdataStart => \&intltool_tree_cdatastart);
-- $xp->setHandlers(CdataEnd => \&intltool_tree_cdataend);
-- my $tree = $xp->parsefile($filename);
--
--# <foo><head id="a">Hello
<em>there</em></head><bar>Howdy<ref/></bar>do</foo>
--# would be:
--# [foo, [{}, head, [{id => "a"}, 0, "Hello ", em, [{}, 0,
"there"]], bar, [{},
--# 0, "Howdy", ref, [{}]], 0, "do" ] ]
--
-- return $tree;
--}
--
--sub print_header
--{
-- my $infile = shift;
-- my $fh = shift;
-- my $source;
--
-- if(!-f $infile) {
-- die "ERROR Cannot find filename: $infile\n";
-- }
--
-- print $fh qq{<?xml version="1.0" encoding="UTF-8"?>\n};
-- {
-- local $/;
-- open DOCINPUT, "<${FILE}" or die;
-- $source = <DOCINPUT>;
-- close DOCINPUT;
-- }
-- if ($source =~ /(<!DOCTYPE.*\[.*\]\s*>)/s)
-- {
-- print $fh "$1\n";
-- }
-- elsif ($source =~ /(<!DOCTYPE[^>]*>)/s)
-- {
-- print $fh "$1\n";
-- }
--}
--
--sub parseTree
--{
-- my $fh = shift;
-- my $ref = shift;
-- my $language = shift || "";
--
-- my $name = shift @{ $ref };
-- my $cont = shift @{ $ref };
--
-- while (!$name || "$name" eq "1") {
-- $name = shift @{ $ref };
-- $cont = shift @{ $ref };
-- }
--
-- my $spacepreserve = 0;
-- my $attrs = @{$cont}[0];
-- $spacepreserve = 1 if ((exists $attrs->{"xml:space"}) &&
($attrs->{"xml:space"} =~ /^["']?preserve["']?$/));
--
-- traverse($fh, $name, $cont, $language, $spacepreserve);
--}
--
--sub xml_merge_output
--{
-- my $source;
--
-- if ($MULTIPLE_OUTPUT) {
-- for my $lang (sort keys %po_files_by_lang) {
-- if ( ! -e $lang ) {
-- mkdir $lang or die "Cannot create subdirectory $lang: $!\n";
-- }
-- open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open
$lang/$OUTFILE: $!\n";
-- binmode (OUTPUT) if $^O eq 'MSWin32';
-- my $tree = readXml($FILE);
-- print_header($FILE, \*OUTPUT);
-- parseTree(\*OUTPUT, $tree, $lang);
-- close OUTPUT;
-- print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG;
-- }
-- }
-- open OUTPUT, ">$OUTFILE" or die "Cannot open $OUTFILE:
$!\n";
-- binmode (OUTPUT) if $^O eq 'MSWin32';
-- my $tree = readXml($FILE);
-- print_header($FILE, \*OUTPUT);
-- parseTree(\*OUTPUT, $tree);
-- close OUTPUT;
-- print "CREATED $OUTFILE\n" unless $QUIET_ARG;
--}
--
--sub keys_merge_translations
--{
-- open INPUT, "<${FILE}" or die;
-- open OUTPUT, ">${OUTFILE}" or die;
-- binmode (OUTPUT) if $^O eq 'MSWin32';
--
-- while (<INPUT>)
-- {
-- if (s/^(\s*)_(\w+=(.*))/$1$2/)
-- {
-- my $string = $3;
--
-- print OUTPUT;
--
-- my $non_translated_line = $_;
--
-- for my $lang (sort keys %po_files_by_lang)
-- {
-- my $translation = $translations{$lang, $string};
-- next if !$translation;
--
-- $_ = $non_translated_line;
-- s/(\w+)=.*/[$lang]$1=$translation/;
-- print OUTPUT;
-- }
-- }
-- else
-- {
-- print OUTPUT;
-- }
-- }
--
-- close OUTPUT;
-- close INPUT;
--}
--
--sub desktop_merge_translations
--{
-- open INPUT, "<${FILE}" or die;
-- open OUTPUT, ">${OUTFILE}" or die;
-- binmode (OUTPUT) if $^O eq 'MSWin32';
--
-- while (<INPUT>)
-- {
-- if (s/^(\s*)_(\w+=(.*))/$1$2/)
-- {
-- my $string = $3;
--
-- print OUTPUT;
--
-- my $non_translated_line = $_;
--
-- for my $lang (sort keys %po_files_by_lang)
-- {
-- my $translation = $translations{$lang, $string};
-- next if !$translation;
--
-- $_ = $non_translated_line;
-- s/(\w+)=.*/${1}[$lang]=$translation/;
-- print OUTPUT;
-- }
-- }
-- else
-- {
-- print OUTPUT;
-- }
-- }
--
-- close OUTPUT;
-- close INPUT;
--}
--
--sub schemas_merge_translations
--{
-- my $source;
--
-- {
-- local $/; # slurp mode
-- open INPUT, "<$FILE" or die "can't open $FILE: $!";
-- $source = <INPUT>;
-- close INPUT;
-- }
--
-- open OUTPUT, ">$OUTFILE" or die;
-- binmode (OUTPUT) if $^O eq 'MSWin32';
--
-- # FIXME: support attribute translations
--
-- # Empty nodes never need translation, so unmark all of them.
-- # For example, <_foo/> is just replaced by <foo/>.
-- $source =~ s|<\s*_($w+)\s*/>|<$1/>|g;
--
-- while ($source =~ s/
-- (.*?)
-- (\s+)(<locale\ name="C">(\s*)
--
(<default>\s*(?:<!--[^>]*?-->\s*)?(.*?)\s*<\/default>)?(\s*)
--
(<short>\s*(?:<!--[^>]*?-->\s*)?(.*?)\s*<\/short>)?(\s*)
--
(<long>\s*(?:<!--[^>]*?-->\s*)?(.*?)\s*<\/long>)?(\s*)
-- <\/locale>)
-- //sx)
-- {
-- print OUTPUT $1;
--
-- my $locale_start_spaces = $2 ? $2 : '';
-- my $default_spaces = $4 ? $4 : '';
-- my $short_spaces = $7 ? $7 : '';
-- my $long_spaces = $10 ? $10 : '';
-- my $locale_end_spaces = $13 ? $13 : '';
-- my $c_default_block = $3 ? $3 : '';
-- my $default_string = $6 ? $6 : '';
-- my $short_string = $9 ? $9 : '';
-- my $long_string = $12 ? $12 : '';
--
-- print OUTPUT "$locale_start_spaces$c_default_block";
--
-- $default_string =~ s/\s+/ /g;
-- $default_string = entity_decode($default_string);
-- $short_string =~ s/\s+/ /g;
-- $short_string = entity_decode($short_string);
-- $long_string =~ s/\s+/ /g;
-- $long_string = entity_decode($long_string);
--
-- for my $lang (sort keys %po_files_by_lang)
-- {
-- my $default_translation = $translations{$lang, $default_string};
-- my $short_translation = $translations{$lang, $short_string};
-- my $long_translation = $translations{$lang, $long_string};
--
-- next if (!$default_translation && !$short_translation &&
-- !$long_translation);
--
-- print OUTPUT "\n$locale_start_spaces<locale
name=\"$lang\">";
--
-- print OUTPUT "$default_spaces";
--
-- if ($default_translation)
-- {
-- $default_translation = entity_encode($default_translation);
-- print OUTPUT
"<default>$default_translation</default>";
-- }
--
-- print OUTPUT "$short_spaces";
--
-- if ($short_translation)
-- {
-- $short_translation = entity_encode($short_translation);
-- print OUTPUT "<short>$short_translation</short>";
-- }
--
-- print OUTPUT "$long_spaces";
--
-- if ($long_translation)
-- {
-- $long_translation = entity_encode($long_translation);
-- print OUTPUT "<long>$long_translation</long>";
-- }
--
-- print OUTPUT "$locale_end_spaces</locale>";
-- }
-- }
--
-- print OUTPUT $source;
--
-- close OUTPUT;
--}
--
--sub rfc822deb_merge_translations
--{
-- my %encodings = ();
-- for my $lang (keys %po_files_by_lang) {
-- $encodings{$lang} = ($UTF8_ARG ? 'UTF-8' :
get_po_encoding($po_files_by_lang{$lang}));
-- }
--
-- my $source;
--
-- $Text::Wrap::huge = 'overflow';
-- $Text::Wrap::break = qr/\n|\s(?=\S)/;
--
-- {
-- local $/; # slurp mode
-- open INPUT, "<$FILE" or die "can't open $FILE: $!";
-- $source = <INPUT>;
-- close INPUT;
-- }
--
-- open OUTPUT, ">${OUTFILE}" or die;
-- binmode (OUTPUT) if $^O eq 'MSWin32';
--
-- while ($source =~ /(^|\n+)(_*)([^:\s]+)(:[ \t]*)(.*?)(?=\n[\S\n]|$)/sg)
-- {
-- my $sep = $1;
-- my $non_translated_line = $3.$4;
-- my $string = $5;
-- my $underscore = length($2);
-- next if $underscore eq 0 && $non_translated_line =~ /^#/;
-- # Remove [] dummy strings
-- my $stripped = $string;
-- $stripped =~ s/\[\s[^\[\]]*\],/,/g if $underscore eq 2;
-- $stripped =~ s/\[\s[^\[\]]*\]$//;
-- $non_translated_line .= $stripped;
--
-- print OUTPUT $sep.$non_translated_line;
--
-- if ($underscore)
-- {
-- my @str_list = rfc822deb_split($underscore, $string);
--
-- for my $lang (sort keys %po_files_by_lang)
-- {
-- my $is_translated = 1;
-- my $str_translated = '';
-- my $first = 1;
--
-- for my $str (@str_list)
-- {
-- my $translation = $translations{$lang, $str};
--
-- if (!$translation)
-- {
-- $is_translated = 0;
-- last;
-- }
--
-- # $translation may also contain [] dummy
-- # strings, mostly to indicate an empty string
-- $translation =~ s/\[\s[^\[\]]*\]$//;
--
-- if ($first)
-- {
-- if ($underscore eq 2)
-- {
-- $str_translated .= $translation;
-- }
-- else
-- {
-- $str_translated .=
-- Text::Tabs::expand($translation) .
-- "\n";
-- }
-- }
-- else
-- {
-- if ($underscore eq 2)
-- {
-- $str_translated .= ', ' . $translation;
-- }
-- else
-- {
-- $str_translated .= Text::Tabs::expand(
-- Text::Wrap::wrap(' ', ' ',
$translation)) .
-- "\n .\n";
-- }
-- }
-- $first = 0;
--
-- # To fix some problems with Text::Wrap::wrap
-- $str_translated =~ s/(\n )+\n/\n .\n/g;
-- }
-- next unless $is_translated;
--
-- $str_translated =~ s/\n \.\n$//;
-- $str_translated =~ s/\s+$//;
--
-- $_ = $non_translated_line;
-- s/^(\w+):\s*.*/$sep${1}-$lang.$encodings{$lang}: $str_translated/s;
-- print OUTPUT;
-- }
-- }
-- }
-- print OUTPUT "\n";
--
-- close OUTPUT;
-- close INPUT;
--}
--
--sub rfc822deb_split
--{
-- # Debian defines a special way to deal with rfc822-style files:
-- # when a value contain newlines, it consists of
-- # 1. a short form (first line)
-- # 2. a long description, all lines begin with a space,
-- # and paragraphs are separated by a single dot on a line
-- # This routine returns an array of all paragraphs, and reformat
-- # them.
-- # When first argument is 2, the string is a comma separated list of
-- # values.
-- my $type = shift;
-- my $text = shift;
-- $text =~ s/^[ \t]//mg;
-- return (split(/, */, $text, 0)) if $type ne 1;
-- return ($text) if $text !~ /\n/;
--
-- $text =~ s/([^\n]*)\n//;
-- my @list = ($1);
-- my $str = '';
--
-- for my $line (split (/\n/, $text))
-- {
-- chomp $line;
-- if ($line =~ /^\.\s*$/)
-- {
-- # New paragraph
-- $str =~ s/\s*$//;
-- push(@list, $str);
-- $str = '';
-- }
-- elsif ($line =~ /^\s/)
-- {
-- # Line which must not be reformatted
-- $str .= "\n" if length ($str) && $str !~ /\n$/;
-- $line =~ s/\s+$//;
-- $str .= $line."\n";
-- }
-- else
-- {
-- # Continuation line, remove newline
-- $str .= " " if length ($str) && $str !~ /\n$/;
-- $str .= $line;
-- }
-- }
--
-- $str =~ s/\s*$//;
-- push(@list, $str) if length ($str);
--
-- return @list;
--}
--
-diff --git a/intltool-merge.in b/intltool-merge.in
-new file mode 120000
-index d0535ab..2238bbd
---- /dev/null
-+++ b/intltool-merge.in
-@@ -0,0 +1 @@
-+/usr/share/intltool/intltool-merge.in
-\ No newline at end of file
-diff --git a/intltool-update.in b/intltool-update.in
-deleted file mode 100755
-index 661d8fe..0b1800f
---- a/intltool-update.in
-+++ /dev/null
-@@ -1,1089 +0,0 @@
--#!@INTLTOOL_PERL@ -w
--# -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*-
--
--#
--# The Intltool Message Updater
--#
--# Copyright (C) 2000-2003 Free Software Foundation.
--#
--# Intltool is free software; you can redistribute it and/or
--# modify it under the terms of the GNU General Public License
--# version 2 published by the Free Software Foundation.
--#
--# Intltool is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
--# General Public License for more details.
--#
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
--#
--# As a special exception to the GNU General Public License, if you
--# distribute this file as part of a program that contains a
--# configuration script generated by Autoconf, you may include it under
--# the same distribution terms that you use for the rest of that program.
--#
--# Authors: Kenneth Christiansen <kenneth(a)gnu.org>
--# Maciej Stachowiak
--# Darin Adler <darin(a)bentspoon.com>
--
--## Release information
--my $PROGRAM = "intltool-update";
--my $VERSION = "0.35.0";
--my $PACKAGE = "intltool";
--
--## Loaded modules
--use strict;
--use Getopt::Long;
--use Cwd;
--use File::Copy;
--use File::Find;
--
--## Scalars used by the option stuff
--my $HELP_ARG = 0;
--my $VERSION_ARG = 0;
--my $DIST_ARG = 0;
--my $POT_ARG = 0;
--my $HEADERS_ARG = 0;
--my $MAINTAIN_ARG = 0;
--my $REPORT_ARG = 0;
--my $VERBOSE = 0;
--my $GETTEXT_PACKAGE = "";
--my $OUTPUT_FILE = "";
--
--my @languages;
--my %varhash = ();
--my %po_files_by_lang = ();
--
--# Regular expressions to categorize file types.
--# FIXME: Please check if the following is correct
--
--my $xml_support =
--"xml(?:\\.in)*|". #
http://www.w3.org/XML/ (Note: .in is not required)
--"ui|". # Bonobo specific - User Interface desc. files
--"lang|". # ?
--"glade2?(?:\\.in)*|". # Glade specific - User Interface desc. files (Note: .in
is not required)
--"scm(?:\\.in)*|". # ? (Note: .in is not required)
--"oaf(?:\\.in)+|". # DEPRECATED: Replaces by Bonobo .server files
--"etspec|". # ?
--"server(?:\\.in)+|". # Bonobo specific
--"sheet(?:\\.in)+|". # ?
--"schemas(?:\\.in)+|". # GConf specific
--"pong(?:\\.in)+|". # DEPRECATED: PONG is not used [by GNOME] any longer.
--"kbd(?:\\.in)+"; # GOK specific.
--
--my $ini_support =
--"icon(?:\\.in)+|". #
http://www.freedesktop.org/Standards/icon-theme-spec
--"desktop(?:\\.in)+|". #
http://www.freedesktop.org/Standards/menu-spec
--"caves(?:\\.in)+|". # GNOME Games specific
--"directory(?:\\.in)+|". #
http://www.freedesktop.org/Standards/menu-spec
--"soundlist(?:\\.in)+|". # GNOME specific
--"keys(?:\\.in)+|". # GNOME Mime database specific
--"theme(?:\\.in)+|". #
http://www.freedesktop.org/Standards/icon-theme-spec
--"service(?:\\.in)+"; # DBus specific
--
--my $buildin_gettext_support =
--"c|y|cs|cc|cpp|c\\+\\+|h|hh|gob|py";
--
--## Always flush buffer when printing
--$| = 1;
--
--## Sometimes the source tree will be rooted somewhere else.
--my $SRCDIR = ".";
--my $POTFILES_in;
--
--$SRCDIR = $ENV{"srcdir"} if $ENV{"srcdir"};
--$POTFILES_in = "<$SRCDIR/POTFILES.in";
--
--my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null');
--
--## Handle options
--GetOptions
--(
-- "help" => \$HELP_ARG,
-- "version" => \$VERSION_ARG,
-- "dist|d" => \$DIST_ARG,
-- "pot|p" => \$POT_ARG,
-- "headers|s" => \$HEADERS_ARG,
-- "maintain|m" => \$MAINTAIN_ARG,
-- "report|r" => \$REPORT_ARG,
-- "verbose|x" => \$VERBOSE,
-- "gettext-package|g=s" => \$GETTEXT_PACKAGE,
-- "output-file|o=s" => \$OUTPUT_FILE,
-- ) or &Console_WriteError_InvalidOption;
--
--&Console_Write_IntltoolHelp if $HELP_ARG;
--&Console_Write_IntltoolVersion if $VERSION_ARG;
--
--my $arg_count = ($DIST_ARG > 0)
-- + ($POT_ARG > 0)
-- + ($HEADERS_ARG > 0)
-- + ($MAINTAIN_ARG > 0)
-- + ($REPORT_ARG > 0);
--
--&Console_Write_IntltoolHelp if $arg_count > 1;
--
--# --version and --help don't require a module name
--my $MODULE = $GETTEXT_PACKAGE || &FindPackageName || "unknown";
--
--if ($POT_ARG)
--{
-- &GenerateHeaders;
-- &GeneratePOTemplate;
--}
--elsif ($HEADERS_ARG)
--{
-- &GenerateHeaders;
--}
--elsif ($MAINTAIN_ARG)
--{
-- &FindLeftoutFiles;
--}
--elsif ($REPORT_ARG)
--{
-- &GenerateHeaders;
-- &GeneratePOTemplate;
-- &Console_Write_CoverageReport;
--}
--elsif ((defined $ARGV[0]) && $ARGV[0] =~ /^[a-z]/)
--{
-- my $lang = $ARGV[0];
--
-- ## Report error if the language file supplied
-- ## to the command line is non-existent
-- &Console_WriteError_NotExisting("$SRCDIR/$lang.po")
-- if ! -s "$SRCDIR/$lang.po";
--
-- if (!$DIST_ARG)
-- {
-- print "Working, please wait..." if $VERBOSE;
-- &GenerateHeaders;
-- &GeneratePOTemplate;
-- }
-- &POFile_Update ($lang, $OUTPUT_FILE);
-- &Console_Write_TranslationStatus ($lang, $OUTPUT_FILE);
--}
--else
--{
-- &Console_Write_IntltoolHelp;
--}
--
--exit;
--
--#########
--
--sub Console_Write_IntltoolVersion
--{
-- print <<_EOF_;
--${PROGRAM} (${PACKAGE}) $VERSION
--Written by Kenneth Christiansen, Maciej Stachowiak, and Darin Adler.
--
--Copyright (C) 2000-2003 Free Software Foundation, Inc.
--This is free software; see the source for copying conditions. There is NO
--warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--_EOF_
-- exit;
--}
--
--sub Console_Write_IntltoolHelp
--{
-- print <<_EOF_;
--Usage: ${PROGRAM} [OPTION]... LANGCODE
--Updates PO template files and merge them with the translations.
--
--Mode of operation (only one is allowed):
-- -p, --pot generate the PO template only
-- -s, --headers generate the header files in POTFILES.in
-- -m, --maintain search for left out files from POTFILES.in
-- -r, --report display a status report for the module
-- -d, --dist merge LANGCODE.po with existing PO template
--
--Extra options:
-- -g, --gettext-package=NAME override PO template name, useful with --pot
-- -o, --output-file=FILE write merged translation to FILE
-- -x, --verbose display lots of feedback
-- --help display this help and exit
-- --version output version information and exit
--
--Examples of use:
--${PROGRAM} --pot just create a new PO template
--${PROGRAM} xy create new PO template and merge xy.po with it
--
--Report bugs to
http://bugzilla.gnome.org/ (product name "$PACKAGE")
--or send email to <xml-i18n-tools\(a)gnome.org>.
--_EOF_
-- exit;
--}
--
--sub echo_n
--{
-- my $str = shift;
-- my $ret = `echo "$str"`;
--
-- $ret =~ s/\n$//; # do we need the "s" flag?
--
-- return $ret;
--}
--
--sub POFile_DetermineType ($)
--{
-- my $type = $_;
-- my $gettext_type;
--
-- my $xml_regex = "(?:" . $xml_support . ")";
-- my $ini_regex = "(?:" . $ini_support . ")";
-- my $buildin_regex = "(?:" . $buildin_gettext_support . ")";
--
-- if ($type =~ /\[type: gettext\/([^\]].*)]/)
-- {
-- $gettext_type=$1;
-- }
-- elsif ($type =~ /schemas(\.in)+$/)
-- {
-- $gettext_type="schemas";
-- }
-- elsif ($type =~ /glade2?(\.in)*$/)
-- {
-- $gettext_type="glade";
-- }
-- elsif ($type =~ /scm(\.in)*$/)
-- {
-- $gettext_type="scheme";
-- }
-- elsif ($type =~ /keys(\.in)+$/)
-- {
-- $gettext_type="keys";
-- }
--
-- # bucket types
--
-- elsif ($type =~ /$xml_regex$/)
-- {
-- $gettext_type="xml";
-- }
-- elsif ($type =~ /$ini_regex$/)
-- {
-- $gettext_type="ini";
-- }
-- elsif ($type =~ /$buildin_regex$/)
-- {
-- $gettext_type="buildin";
-- }
-- else
-- {
-- $gettext_type="unknown";
-- }
--
-- return "gettext\/$gettext_type";
--}
--
--sub TextFile_DetermineEncoding ($)
--{
-- my $gettext_code="ASCII"; # All files are ASCII by default
-- my $filetype=`file $_ | cut -d ' ' -f 2`;
--
-- if ($? eq "0")
-- {
-- if ($filetype =~ /^(ISO|UTF)/)
-- {
-- chomp ($gettext_code = $filetype);
-- }
-- elsif ($filetype =~ /^XML/)
-- {
-- $gettext_code="UTF-8"; # We asume that .glade and other .xml files are
UTF-8
-- }
-- }
--
-- return $gettext_code;
--}
--
--sub isNotValidMissing
--{
-- my ($file) = @_;
--
-- return if $file =~ /^\{arch\}\/.*$/;
-- return if $file =~
/^$varhash{"PACKAGE"}-$varhash{"VERSION"}\/.*$/;
--}
--
--sub FindLeftoutFiles
--{
-- my (@buf_i18n_plain,
-- @buf_i18n_xml,
-- @buf_i18n_xml_unmarked,
-- @buf_i18n_ini,
-- @buf_potfiles,
-- @buf_potfiles_ignore,
-- @buf_allfiles,
-- @buf_allfiles_sorted,
-- @buf_potfiles_sorted
-- );
--
-- ## Search and find all translatable files
-- find sub {
-- push @buf_i18n_plain, "$File::Find::name" if
/\.($buildin_gettext_support)$/;
-- push @buf_i18n_xml, "$File::Find::name" if /\.($xml_support)$/;
-- push @buf_i18n_ini, "$File::Find::name" if /\.($ini_support)$/;
-- push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/;
-- }, "..";
--
--
-- open POTFILES, $POTFILES_in or die "$PROGRAM: there's no
POTFILES.in!\n";
-- @buf_potfiles = grep !/^(#|\s*$)/, <POTFILES>;
-- close POTFILES;
--
-- foreach (@buf_potfiles) {
-- s/^\[.*]\s*//;
-- }
--
-- print "Searching for missing translatable files...\n" if $VERBOSE;
--
-- ## Check if we should ignore some found files, when
-- ## comparing with POTFILES.in
-- foreach my $ignore ("POTFILES.skip", "POTFILES.ignore")
-- {
-- (-s $ignore) or next;
--
-- if ("$ignore" eq "POTFILES.ignore")
-- {
-- print "The usage of POTFILES.ignore is deprecated. Please consider moving
the\n".
-- "content of this file to POTFILES.skip.\n";
-- }
--
-- print "Found $ignore: Ignoring files...\n" if $VERBOSE;
-- open FILE, "<$ignore" or die "ERROR: Failed to open
$ignore!\n";
--
-- while (<FILE>)
-- {
-- push @buf_potfiles_ignore, $_ unless /^(#|\s*$)/;
-- }
-- close FILE;
--
-- @buf_potfiles = (@buf_potfiles_ignore, @buf_potfiles);
-- }
--
-- foreach my $file (@buf_i18n_plain)
-- {
-- my $in_comment = 0;
-- my $in_macro = 0;
--
-- open FILE, "<$file";
-- while (<FILE>)
-- {
-- # Handle continued multi-line comment.
-- if ($in_comment)
-- {
-- next unless s-.*\*/--;
-- $in_comment = 0;
-- }
--
-- # Handle continued macro.
-- if ($in_macro)
-- {
-- $in_macro = 0 unless /\\$/;
-- next;
-- }
--
-- # Handle start of macro (or any preprocessor directive).
-- if (/^\s*\#/)
-- {
-- $in_macro = 1 if /^([^\\]|\\.)*\\$/;
-- next;
-- }
--
-- # Handle comments and quoted text.
-- while (m-(/\*|//|\'|\")-) # \' and \" keep emacs perl mode happy
-- {
-- my $match = $1;
-- if ($match eq "/*")
-- {
-- if (!s-/\*.*?\*/--)
-- {
-- s-/\*.*--;
-- $in_comment = 1;
-- }
-- }
-- elsif ($match eq "//")
-- {
-- s-//.*--;
-- }
-- else # ' or "
-- {
-- if (!s-$match([^\\]|\\.)*?$match-QUOTEDTEXT-)
-- {
-- warn "mismatched quotes at line $. in $file\n";
-- s-$match.*--;
-- }
-- }
-- }
--
-- if (/\.GetString ?\(QUOTEDTEXT/)
-- {
-- if (defined isNotValidMissing (unpack("x3 A*", $file))) {
-- ## Remove the first 3 chars and add newline
-- push @buf_allfiles, unpack("x3 A*", $file) .
"\n";
-- }
-- last;
-- }
--
-- if (/_\(QUOTEDTEXT/)
-- {
-- if (defined isNotValidMissing (unpack("x3 A*", $file))) {
-- ## Remove the first 3 chars and add newline
-- push @buf_allfiles, unpack("x3 A*", $file) .
"\n";
-- }
-- last;
-- }
-- }
-- close FILE;
-- }
--
-- foreach my $file (@buf_i18n_xml)
-- {
-- open FILE, "<$file";
--
-- while (<FILE>)
-- {
-- # FIXME: share the pattern matching code with intltool-extract
-- if (/\s_[-A-Za-z0-9._:]+\s*=\s*\"([^"]+)\"/ || /<_[^>]+>/
|| /translatable=\"yes\"/)
-- {
-- if (defined isNotValidMissing (unpack("x3 A*", $file))) {
-- push @buf_allfiles, unpack("x3 A*", $file) .
"\n";
-- }
-- last;
-- }
-- }
-- close FILE;
-- }
--
-- foreach my $file (@buf_i18n_ini)
-- {
-- open FILE, "<$file";
-- while (<FILE>)
-- {
-- if (/_(.*)=/)
-- {
-- if (defined isNotValidMissing (unpack("x3 A*", $file))) {
-- push @buf_allfiles, unpack("x3 A*", $file) .
"\n";
-- }
-- last;
-- }
-- }
-- close FILE;
-- }
--
-- foreach my $file (@buf_i18n_xml_unmarked)
-- {
-- if (defined isNotValidMissing (unpack("x3 A*", $file))) {
-- push @buf_allfiles, unpack("x3 A*", $file) . "\n";
-- }
-- }
--
--
-- @buf_allfiles_sorted = sort (@buf_allfiles);
-- @buf_potfiles_sorted = sort (@buf_potfiles);
--
-- my %in2;
-- foreach (@buf_potfiles_sorted)
-- {
-- $in2{$_} = 1;
-- }
--
-- my @result;
--
-- foreach (@buf_allfiles_sorted)
-- {
-- if (!exists($in2{$_}))
-- {
-- push @result, $_
-- }
-- }
--
-- my @buf_potfiles_notexist;
--
-- foreach (@buf_potfiles_sorted)
-- {
-- chomp (my $dummy = $_);
-- if ("$dummy" ne "" and ! -f "../$dummy")
-- {
-- push @buf_potfiles_notexist, $_;
-- }
-- }
--
-- ## Save file with information about the files missing
-- ## if any, and give information about this procedure.
-- if (@result + @buf_potfiles_notexist > 0)
-- {
-- if (@result)
-- {
-- print "\n" if $VERBOSE;
-- unlink "missing";
-- open OUT, ">missing";
-- print OUT @result;
-- close OUT;
-- warn "\e[1mThe following files contain translations and are currently not in
use. Please\e[0m\n".
-- "\e[1mconsider adding these to the POTFILES.in file, located in the po/
directory.\e[0m\n\n";
-- print STDERR @result, "\n";
-- warn "If some of these files are left out on purpose then please add them
to\n".
-- "POTFILES.skip instead of POTFILES.in. A file \e[1m'missing'\e[0m
containing this list\n".
-- "of left out files has been written in the current directory.\n";
-- }
-- if (@buf_potfiles_notexist)
-- {
-- unlink "notexist";
-- open OUT, ">notexist";
-- print OUT @buf_potfiles_notexist;
-- close OUT;
-- warn "\n" if ($VERBOSE or @result);
-- warn "\e[1mThe following files do not exist anymore:\e[0m\n\n";
-- warn @buf_potfiles_notexist, "\n";
-- warn "Please remove them from POTFILES.in or POTFILES.skip. A file
\e[1m'notexist'\e[0m\n".
-- "containing this list of absent files has been written in the current
directory.\n";
-- }
-- }
--
-- ## If there is nothing to complain about, notify the user
-- else {
-- print "\nAll files containing translations are present in POTFILES.in.\n" if
$VERBOSE;
-- }
--}
--
--sub Console_WriteError_InvalidOption
--{
-- ## Handle invalid arguments
-- print STDERR "Try `${PROGRAM} --help' for more information.\n";
-- exit 1;
--}
--
--sub GenerateHeaders
--{
-- my $EXTRACT = "@INTLTOOL_EXTRACT@";
-- chomp $EXTRACT;
--
-- $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} if
$ENV{"INTLTOOL_EXTRACT"};
--
-- ## Generate the .h header files, so we can allow glade and
-- ## xml translation support
-- if (! -x "$EXTRACT")
-- {
-- print STDERR "\n *** The intltool-extract script wasn't found!"
-- ."\n *** Without it, intltool-update can not generate files.\n";
-- exit;
-- }
-- else
-- {
-- open (FILE, $POTFILES_in) or die "$PROGRAM: POTFILES.in not found.\n";
--
-- while (<FILE>)
-- {
-- chomp;
-- next if /^\[\s*encoding/;
--
-- ## Find xml files in POTFILES.in and generate the
-- ## files with help from the extract script
--
-- my $gettext_type= &POFile_DetermineType ($1);
--
-- if (/\.($xml_support|$ini_support)$/ || /^\[/)
-- {
-- s/^\[[^\[].*]\s*//;
--
-- my $filename = "../$_";
--
-- if ($VERBOSE)
-- {
-- system ($EXTRACT, "--update", "--srcdir=$SRCDIR",
-- "--type=$gettext_type", $filename);
-- }
-- else
-- {
-- system ($EXTRACT, "--update", "--type=$gettext_type",
-- "--srcdir=$SRCDIR", "--quiet", $filename);
-- }
-- }
-- }
-- close FILE;
-- }
--}
--
--#
--# Generate .pot file from POTFILES.in
--#
--sub GeneratePOTemplate
--{
-- my $XGETTEXT = $ENV{"XGETTEXT"} || "@INTLTOOL_XGETTEXT@";
-- my $XGETTEXT_ARGS = $ENV{"XGETTEXT_ARGS"} || '';
-- chomp $XGETTEXT;
--
-- if (! -x $XGETTEXT)
-- {
-- print STDERR " *** xgettext is not found on this system!\n".
-- " *** Without it, intltool-update can not extract strings.\n";
-- exit;
-- }
--
-- print "Building $MODULE.pot...\n" if $VERBOSE;
--
-- open INFILE, $POTFILES_in;
-- unlink "POTFILES.in.temp";
-- open OUTFILE, ">POTFILES.in.temp" or die("Cannot open
POTFILES.in.temp for writing");
--
-- my $gettext_support_nonascii = 0;
--
-- # checks for GNU gettext >= 0.12
-- my $dummy = `$XGETTEXT --version --from-code=UTF-8 >$devnull 2>$devnull`;
-- if ($? == 0)
-- {
-- $gettext_support_nonascii = 1;
-- }
-- else
-- {
-- # urge everybody to upgrade gettext
-- print STDERR "WARNING: This version of gettext does not support extracting
non-ASCII\n".
-- " strings. That means you should install a version of
gettext\n".
-- " that supports non-ASCII strings (such as GNU gettext >=
0.12),\n".
-- " or have to let non-ASCII strings untranslated. (If there is
any)\n";
-- }
--
-- my $encoding = "ASCII";
-- my $forced_gettext_code;
-- my @temp_headers;
-- my $encoding_problem_is_reported = 0;
--
-- while (<INFILE>)
-- {
-- next if (/^#/ or /^\s*$/);
--
-- chomp;
--
-- my $gettext_code;
--
-- if (/^\[\s*encoding:\s*(.*)\s*\]/)
-- {
-- $forced_gettext_code=$1;
-- }
-- elsif (/\.($xml_support|$ini_support)$/ || /^\[/)
-- {
-- s/^\[.*]\s*//;
-- print OUTFILE "../$_.h\n";
-- push @temp_headers, "../$_.h";
-- $gettext_code = &TextFile_DetermineEncoding ("../$_.h") if
($gettext_support_nonascii and not defined $forced_gettext_code);
-- }
-- else
-- {
-- if ($SRCDIR eq ".") {
-- print OUTFILE "../$_\n";
-- } else {
-- print OUTFILE "$SRCDIR/../$_\n";
-- }
-- $gettext_code = &TextFile_DetermineEncoding ("../$_") if
($gettext_support_nonascii and not defined $forced_gettext_code);
-- }
--
-- next if (! $gettext_support_nonascii);
--
-- if (defined $forced_gettext_code)
-- {
-- $encoding=$forced_gettext_code;
-- }
-- elsif (defined $gettext_code and "$encoding" ne "$gettext_code")
-- {
-- if ($encoding eq "ASCII")
-- {
-- $encoding=$gettext_code;
-- }
-- elsif ($gettext_code ne "ASCII")
-- {
-- # Only report once because the message is quite long
-- if (! $encoding_problem_is_reported)
-- {
-- print STDERR "WARNING: You should use the same file encoding for all your
project files,\n".
-- " but $PROGRAM thinks that most of the source files are in\n".
-- " $encoding encoding, while \"$_\" is (likely) in\n".
-- " $gettext_code encoding. If you are sure that all translatable
strings\n".
-- " are in same encoding (say UTF-8), please \e[1m*prepend*\e[0m the
following\n".
-- " line to POTFILES.in:\n\n".
-- " [encoding: UTF-8]\n\n".
-- " and make sure that configure.in/ac checks for $PACKAGE >= 0.27
.\n".
-- "(such warning message will only be reported once.)\n";
-- $encoding_problem_is_reported = 1;
-- }
-- }
-- }
-- }
--
-- close OUTFILE;
-- close INFILE;
--
-- unlink "$MODULE.pot";
-- my @xgettext_argument=("$XGETTEXT",
-- "--add-comments",
-- "--directory\=\.",
-- "--output\=$MODULE\.pot",
-- "--files-from\=\.\/POTFILES\.in\.temp");
-- my $XGETTEXT_KEYWORDS = &FindPOTKeywords;
-- push @xgettext_argument, $XGETTEXT_KEYWORDS;
-- my $MSGID_BUGS_ADDRESS = &FindMakevarsBugAddress;
-- push @xgettext_argument, "--msgid-bugs-address\=$MSGID_BUGS_ADDRESS" if
$MSGID_BUGS_ADDRESS;
-- push @xgettext_argument, "--from-code\=$encoding" if
($gettext_support_nonascii);
-- push @xgettext_argument, $XGETTEXT_ARGS if $XGETTEXT_ARGS;
-- my $xgettext_command = join ' ', @xgettext_argument;
--
-- # intercept xgettext error message
-- print "Running $xgettext_command\n" if $VERBOSE;
-- my $xgettext_error_msg = `$xgettext_command 2>\&1`;
-- my $command_failed = $?;
--
-- unlink "POTFILES.in.temp";
--
-- print "Removing generated header (.h) files..." if $VERBOSE;
-- unlink foreach (@temp_headers);
-- print "done.\n" if $VERBOSE;
--
-- if (! $command_failed)
-- {
-- if (! -e "$MODULE.pot")
-- {
-- print "None of the files in POTFILES.in contain strings marked for
translation.\n" if $VERBOSE;
-- }
-- else
-- {
-- print "Wrote $MODULE.pot\n" if $VERBOSE;
-- }
-- }
-- else
-- {
-- if ($xgettext_error_msg =~ /--from-code/)
-- {
-- # replace non-ASCII error message with a more useful one.
-- print STDERR "ERROR: xgettext failed to generate PO template file because
there is non-ASCII\n".
-- " string marked for translation. Please make sure that all strings
marked\n".
-- " for translation are in uniform encoding (say UTF-8), then
\e[1m*prepend*\e[0m the\n".
-- " following line to POTFILES.in and rerun $PROGRAM:\n\n".
-- " [encoding: UTF-8]\n\n";
-- }
-- else
-- {
-- print STDERR "$xgettext_error_msg";
-- if (-e "$MODULE.pot")
-- {
-- # is this possible?
-- print STDERR "ERROR: xgettext failed but still managed to generate PO template
file.\n".
-- " Please consult error message above if there is any.\n";
-- }
-- else
-- {
-- print STDERR "ERROR: xgettext failed to generate PO template file. Please
consult\n".
-- " error message above if there is any.\n";
-- }
-- }
-- exit (1);
-- }
--}
--
--sub POFile_Update
--{
-- -f "$MODULE.pot" or die "$PROGRAM: $MODULE.pot does not
exist.\n";
--
-- my $MSGMERGE = $ENV{"MSGMERGE"} || "@INTLTOOL_MSGMERGE@";
-- my ($lang, $outfile) = @_;
--
-- print "Merging $SRCDIR/$lang.po with $MODULE.pot..." if $VERBOSE;
--
-- my $infile = "$SRCDIR/$lang.po";
-- $outfile = "$SRCDIR/$lang.po" if ($outfile eq "");
--
-- # I think msgmerge won't overwrite old file if merge is not successful
-- system ("$MSGMERGE", "-o", $outfile, $infile,
"$MODULE.pot");
--}
--
--sub Console_WriteError_NotExisting
--{
-- my ($file) = @_;
--
-- ## Report error if supplied language file is non-existing
-- print STDERR "$PROGRAM: $file does not exist!\n";
-- print STDERR "Try '$PROGRAM --help' for more information.\n";
-- exit;
--}
--
--sub GatherPOFiles
--{
-- my @po_files = glob ("./*.po");
--
-- @languages = map (&POFile_GetLanguage, @po_files);
--
-- foreach my $lang (@languages)
-- {
-- $po_files_by_lang{$lang} = shift (@po_files);
-- }
--}
--
--sub POFile_GetLanguage ($)
--{
-- s/^(.*\/)?(.+)\.po$/$2/;
-- return $_;
--}
--
--sub Console_Write_TranslationStatus
--{
-- my ($lang, $output_file) = @_;
-- my $MSGFMT = $ENV{"MSGFMT"} || "@INTLTOOL_MSGFMT@";
--
-- $output_file = "$SRCDIR/$lang.po" if ($output_file eq "");
--
-- system ("$MSGFMT", "-o", "$devnull",
"--verbose", $output_file);
--}
--
--sub Console_Write_CoverageReport
--{
-- my $MSGFMT = $ENV{"MSGFMT"} || "@INTLTOOL_MSGFMT@";
--
-- &GatherPOFiles;
--
-- foreach my $lang (@languages)
-- {
-- print "$lang: ";
-- &POFile_Update ($lang, "");
-- }
--
-- print "\n\n * Current translation support in $MODULE \n\n";
--
-- foreach my $lang (@languages)
-- {
-- print "$lang: ";
-- system ("$MSGFMT", "-o", "$devnull",
"--verbose", "$SRCDIR/$lang.po");
-- }
--}
--
--sub SubstituteVariable
--{
-- my ($str) = @_;
--
-- # always need to rewind file whenever it has been accessed
-- seek (CONF, 0, 0);
--
-- # cache each variable. varhash is global to we can add
-- # variables elsewhere.
-- while (<CONF>)
-- {
-- if (/^(\w+)=(.*)$/)
-- {
-- ($varhash{$1} = $2) =~ s/^["'](.*)["']$/$1/;
-- }
-- }
--
-- if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)
-- {
-- my $rest = $3;
-- my $untouched = $1;
-- my $sub = "";
-- # Ignore recursive definitions of variables
-- $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\${?$2}?/;
--
-- return SubstituteVariable ("$untouched$sub$rest");
-- }
--
-- # We're using Perl backticks ` and "echo -n" here in order to
-- # expand any shell escapes (such as backticks themselves) in every variable
-- return echo_n ($str);
--}
--
--sub CONF_Handle_Open
--{
-- my $base_dirname = getcwd();
-- $base_dirname =~ s@.*/@@;
--
-- my ($conf_in, $src_dir);
--
-- if ($base_dirname =~ /^po(-.+)?$/)
-- {
-- if (-f "Makevars")
-- {
-- my $makefile_source;
--
-- local (*IN);
-- open (IN, "<Makevars") || die "can't open Makevars:
$!";
--
-- while (<IN>)
-- {
-- if (/^top_builddir[ \t]*=/)
-- {
-- $src_dir = $_;
-- $src_dir =~ s/^top_builddir[ \t]*=[ \t]*([^ \t\n\r]*)/$1/;
--
-- chomp $src_dir;
-- if (-f "$src_dir" . "/configure.ac") {
-- $conf_in = "$src_dir" . "/configure.ac" .
"\n";
-- } else {
-- $conf_in = "$src_dir" . "/configure.in" .
"\n";
-- }
-- last;
-- }
-- }
-- close IN;
--
-- $conf_in || die "Cannot find top_builddir in Makevars.";
-- }
-- elsif (-f "../configure.ac")
-- {
-- $conf_in = "../configure.ac";
-- }
-- elsif (-f "../configure.in")
-- {
-- $conf_in = "../configure.in";
-- }
-- else
-- {
-- my $makefile_source;
--
-- local (*IN);
-- open (IN, "<Makefile") || return;
--
-- while (<IN>)
-- {
-- if (/^top_srcdir[ \t]*=/)
-- {
-- $src_dir = $_;
-- $src_dir =~ s/^top_srcdir[ \t]*=[ \t]*([^ \t\n\r]*)/$1/;
--
-- chomp $src_dir;
-- $conf_in = "$src_dir" . "/configure.in" . "\n";
--
-- last;
-- }
-- }
-- close IN;
--
-- $conf_in || die "Cannot find top_srcdir in Makefile.";
-- }
--
-- open (CONF, "<$conf_in");
-- }
-- else
-- {
-- print STDERR "$PROGRAM: Unable to proceed.\n" .
-- "Make sure to run this script inside the po directory.\n";
-- exit;
-- }
--}
--
--sub FindPackageName
--{
-- my $version;
-- my $domain = &FindMakevarsDomain;
-- my $name = $domain || "untitled";
--
-- &CONF_Handle_Open;
--
-- my $conf_source; {
-- local (*IN);
-- open (IN, "<&CONF") || return $name;
-- seek (IN, 0, 0);
-- local $/; # slurp mode
-- $conf_source = <IN>;
-- close IN;
-- }
--
-- # priority for getting package name:
-- # 1. GETTEXT_PACKAGE
-- # 2. first argument of AC_INIT (with >= 2 arguments)
-- # 3. first argument of AM_INIT_AUTOMAKE (with >= 2 argument)
--
-- # /^AM_INIT_AUTOMAKE\([\s\[]*([^,\)\s\]]+)/m
-- # the \s makes this not work, why?
-- if ($conf_source =~ /^AM_INIT_AUTOMAKE\(([^,\)]+),([^,\)]+)/m)
-- {
-- ($name, $version) = ($1, $2);
-- $name =~ s/[\[\]\s]//g;
-- $version =~ s/[\[\]\s]//g;
-- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
-- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
-- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~
/\${?AC_PACKAGE_VERSION}?/);
-- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
-- }
--
-- if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)/m)
-- {
-- ($name, $version) = ($1, $2);
-- $name =~ s/[\[\]\s]//g;
-- $version =~ s/[\[\]\s]//g;
-- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
-- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
-- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~
/\${?AC_PACKAGE_VERSION}?/);
-- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
-- }
--
-- # \s makes this not work, why?
-- $name = $1 if $conf_source =~ /^GETTEXT_PACKAGE=\[?([^\n\]]+)/m;
--
-- # m4 macros AC_PACKAGE_NAME, AC_PACKAGE_VERSION etc. have same value
-- # as corresponding $PACKAGE_NAME, $PACKAGE_VERSION etc. shell variables.
-- $name =~ s/\bAC_PACKAGE_/\$PACKAGE_/g;
--
-- $name = $domain if $domain;
--
-- $name = SubstituteVariable ($name);
-- $name =~ s/^["'](.*)["']$/$1/;
--
-- return $name if $name;
--}
--
--
--sub FindPOTKeywords
--{
--
-- my $keywords = "--keyword\=\_ --keyword\=N\_ --keyword\=U\_
--keyword\=Q\_";
-- my $varname = "XGETTEXT_OPTIONS";
-- my $make_source; {
-- local (*IN);
-- open (IN, "<Makevars") || (open(IN, "<Makefile.in.in")
&& ($varname = "XGETTEXT_KEYWORDS")) || return $keywords;
-- seek (IN, 0, 0);
-- local $/; # slurp mode
-- $make_source = <IN>;
-- close IN;
-- }
--
-- $keywords = $1 if $make_source =~ /^$varname[ ]*=\[?([^\n\]]+)/m;
--
-- return $keywords;
--}
--
--sub FindMakevarsDomain
--{
--
-- my $domain = "";
-- my $makevars_source; {
-- local (*IN);
-- open (IN, "<Makevars") || return $domain;
-- seek (IN, 0, 0);
-- local $/; # slurp mode
-- $makevars_source = <IN>;
-- close IN;
-- }
--
-- $domain = $1 if $makevars_source =~ /^DOMAIN[ ]*=\[?([^\n\]\$]+)/m;
-- $domain =~ s/^\s+//;
-- $domain =~ s/\s+$//;
--
-- return $domain;
--}
--
--sub FindMakevarsBugAddress
--{
--
-- my $address = "";
-- my $makevars_source; {
-- local (*IN);
-- open (IN, "<Makevars") || return undef;
-- seek (IN, 0, 0);
-- local $/; # slurp mode
-- $makevars_source = <IN>;
-- close IN;
-- }
--
-- $address = $1 if $makevars_source =~ /^MSGID_BUGS_ADDRESS[ ]*=\[?([^\n\]\$]+)/m;
-- $address =~ s/^\s+//;
-- $address =~ s/\s+$//;
--
-- return $address;
--}
-diff --git a/intltool-update.in b/intltool-update.in
-new file mode 120000
-index 661d8fe..0b1800f
---- /dev/null
-+++ b/intltool-update.in
-@@ -0,0 +1 @@
-+/usr/share/intltool/intltool-update.in
-\ No newline at end of file
-diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
-index f5dd164..e2ec4b2 100644
---- a/pixmaps/Makefile.am
-+++ b/pixmaps/Makefile.am
-@@ -3,8 +3,14 @@ icon_DATA = \
- intlclock-calendar-icon.png \
- intlclock-face-large.svg \
- intlclock-face-small.svg \
-+ intlclock-face-small-morning.svg \
-+ intlclock-face-small-day.svg \
-+ intlclock-face-small-evening.svg \
-+ intlclock-face-small-night.svg \
- intlclock-map.svg \
-- intlclock-map-location-marker.svg
-+ intlclock-map-location-marker.png \
-+ intlclock-map-location-current.png \
-+ intlclock-map-location-hilight.png
-
- EXTRA_DIST = $(icon_DATA)
-
-diff --git a/pixmaps/intlclock-face-small-day.svg b/pixmaps/intlclock-face-small-day.svg
-new file mode 100644
-index 0000000..bd4b5b2
---- /dev/null
-+++ b/pixmaps/intlclock-face-small-day.svg
-@@ -0,0 +1,290 @@
-+<?xml version="1.0" encoding="UTF-8"
standalone="no"?>
-+<!-- Created with Inkscape (
http://www.inkscape.org/) -->
-+<svg
-+
xmlns:dc="http://purl.org/dc/elements/1.1/"
-+
xmlns:cc="http://web.resource.org/cc/"
-+
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-+
xmlns:svg="http://www.w3.org/2000/svg"
-+
xmlns="http://www.w3.org/2000/svg"
-+
xmlns:xlink="http://www.w3.org/1999/xlink"
-+
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd&q...
-+
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-+ width="36"
-+ height="36"
-+ id="svg5416"
-+ sodipodi:version="0.32"
-+ inkscape:version="0.45+devel"
-+ version="1.0"
-+ sodipodi:docbase="/home/garrett/Desktop"
-+ sodipodi:docname="clock-face-small-2.svg"
-+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
-+ <defs
-+ id="defs5418">
-+ <linearGradient
-+ id="linearGradient10653">
-+ <stop
-+ id="stop10655"
-+ offset="0.0000000"
-+ style="stop-color:#f3f4ff;stop-opacity:1.0000000;" />
-+ <stop
-+ id="stop10657"
-+ offset="1.0000000"
-+ style="stop-color:#9193af;stop-opacity:1.0000000;" />
-+ </linearGradient>
-+ <linearGradient
-+ id="linearGradient42174">
-+ <stop
-+ id="stop42176"
-+ offset="0.0000000"
-+ style="stop-color:#a0a0a0;stop-opacity:1.0000000;" />
-+ <stop
-+ id="stop42178"
-+ offset="1.0000000"
-+ style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-+ </linearGradient>
-+ <linearGradient
-+ id="linearGradient2145">
-+ <stop
-+ id="stop2147"
-+ offset="0.0000000"
-+ style="stop-color:#fffffd;stop-opacity:1.0000000;" />
-+ <stop
-+ id="stop2149"
-+ offset="1"
-+ style="stop-color:#d9d9d8;stop-opacity:1;" />
-+ </linearGradient>
-+ <linearGradient
-+ id="linearGradient37935">
-+ <stop
-+ style="stop-color:#9497b3;stop-opacity:1.0000000;"
-+ offset="0.0000000"
-+ id="stop37937" />
-+ <stop
-+ style="stop-color:#4c4059;stop-opacity:1.0000000;"
-+ offset="1.0000000"
-+ id="stop37939" />
-+ </linearGradient>
-+ <linearGradient
-+ id="linearGradient3816"
-+ inkscape:collect="always">
-+ <stop
-+ id="stop3818"
-+ offset="0"
-+ style="stop-color:#000000;stop-opacity:1;" />
-+ <stop
-+ id="stop3820"
-+ offset="1"
-+ style="stop-color:#000000;stop-opacity:0;" />
-+ </linearGradient>
-+ <radialGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient3816"
-+ id="radialGradient5847"
-+ gradientUnits="userSpaceOnUse"
-+ cx="31.112698"
-+ cy="19.008621"
-+ fx="31.112698"
-+ fy="19.008621"
-+ r="8.6620579" />
-+ <radialGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient37935"
-+ id="radialGradient5849"
-+ gradientUnits="userSpaceOnUse"
-+ cx="8.7468252"
-+ cy="6.8283234"
-+ fx="8.7468252"
-+ fy="6.8283234"
-+ r="29.889715" />
-+ <radialGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient2145"
-+ id="radialGradient5851"
-+ gradientUnits="userSpaceOnUse"
-+ cx="11.901996"
-+ cy="10.045444"
-+ fx="11.901996"
-+ fy="10.045444"
-+ r="29.292715" />
-+ <linearGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient42174"
-+ id="linearGradient5853"
-+ gradientUnits="userSpaceOnUse"
-+ x1="6.342216"
-+ y1="7.7893324"
-+ x2="22.218424"
-+ y2="25.884274" />
-+ <radialGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient10653"
-+ id="radialGradient5855"
-+ gradientUnits="userSpaceOnUse"
-+ cx="11.3292"
-+ cy="10.58397"
-+ fx="11.3292"
-+ fy="10.58397"
-+ r="15.532059" />
-+ <radialGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient2145"
-+ id="radialGradient5857"
-+ gradientUnits="userSpaceOnUse"
-+ cx="11.901996"
-+ cy="10.045444"
-+ fx="11.901996"
-+ fy="10.045444"
-+ r="29.292715" />
-+ <linearGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient42174"
-+ id="linearGradient5859"
-+ gradientUnits="userSpaceOnUse"
-+ x1="6.342216"
-+ y1="7.7893324"
-+ x2="22.218424"
-+ y2="25.884274" />
-+ </defs>
-+ <sodipodi:namedview
-+ id="base"
-+ pagecolor="#ffffff"
-+ bordercolor="#666666"
-+ borderopacity="1.0"
-+ inkscape:pageopacity="0.0"
-+ inkscape:pageshadow="2"
-+ inkscape:zoom="26.388889"
-+ inkscape:cx="18"
-+ inkscape:cy="18"
-+ inkscape:document-units="px"
-+ inkscape:current-layer="layer1"
-+ inkscape:window-width="1600"
-+ inkscape:window-height="1154"
-+ inkscape:window-x="0"
-+ inkscape:window-y="0"
-+ width="36px"
-+ height="36px" />
-+ <metadata
-+ id="metadata5421">
-+ <rdf:RDF>
-+ <cc:Work
-+ rdf:about="">
-+ <dc:format>image/svg+xml</dc:format>
-+ <dc:type
-+
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-+ </cc:Work>
-+ </rdf:RDF>
-+ </metadata>
-+ <g
-+ inkscape:label="Layer 1"
-+ inkscape:groupmode="layer"
-+ id="layer1"
-+ style="display:inline">
-+ <path
-+ d="M 39.774755,19.008621 A 8.6620579,8.6620579 0 1 1 22.45064,19.008621 A
8.6620579,8.6620579 0 1 1 39.774755,19.008621 z"
-+ sodipodi:ry="8.6620579"
-+ sodipodi:rx="8.6620579"
-+ sodipodi:cy="19.008621"
-+ sodipodi:cx="31.112698"
-+ id="path4415"
-+
style="color:#000000;fill:url(#radialGradient5847);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-+ sodipodi:type="arc"
-+ transform="matrix(1.6624224,0,0,0.7910143,-33.728278,14.112097)" />
-+ <path
-+ transform="matrix(1.1148631,0,0,1.1148631,-0.1165205,-0.8531387)"
-+ d="M 31.160714,16.910715 A 14.910714,14.910714 0 1 1 1.3392859,16.910715 A
14.910714,14.910714 0 1 1 31.160714,16.910715 z"
-+ sodipodi:ry="14.910714"
-+ sodipodi:rx="14.910714"
-+ sodipodi:cy="16.910715"
-+ sodipodi:cx="16.25"
-+ id="path4417"
-+
style="fill:url(#radialGradient5849);fill-opacity:1;fill-rule:evenodd;stroke:#605773;stroke-width:1.6359601;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-+ sodipodi:type="arc" />
-+ <path
-+ transform="matrix(0.9318866,0,0,0.9318866,2.7831211,2.1674291)"
-+ d="M 31.160714,16.910715 A 14.910714,14.910714 0 1 1 1.3392859,16.910715 A
14.910714,14.910714 0 1 1 31.160714,16.910715 z"
-+ sodipodi:ry="14.910714"
-+ sodipodi:rx="14.910714"
-+ sodipodi:cy="16.910715"
-+ sodipodi:cx="16.25"
-+ id="path4419"
-+
style="fill:url(#radialGradient5851);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5853);stroke-width:1.6660347;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-+ sodipodi:type="arc" />
-+ <path
-+ sodipodi:type="arc"
-+
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#radialGradient5855);stroke-width:1.72497916;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-+ id="path4421"
-+ sodipodi:cx="16.25"
-+ sodipodi:cy="16.910715"
-+ sodipodi:rx="14.910714"
-+ sodipodi:ry="14.910714"
-+ d="M 31.160714,16.910715 A 14.910714,14.910714 0 1 1 1.3392859,16.910715 A
14.910714,14.910714 0 1 1 31.160714,16.910715 z"
-+ transform="matrix(1.0573301,0,0,1.0573301,0.8183498,5.0961231e-2)"
/>
-+ <path
-+ transform="matrix(0.9318866,0,0,0.9318866,2.7831211,2.1674291)"
-+ d="M 31.160714,16.910715 A 14.910714,14.910714 0 1 1 1.3392859,16.910715 A
14.910714,14.910714 0 1 1 31.160714,16.910715 z"
-+ sodipodi:ry="14.910714"
-+ sodipodi:rx="14.910714"
-+ sodipodi:cy="16.910715"
-+ sodipodi:cx="16.25"
-+ id="path4429"
-+
style="opacity:0.53921569;fill:url(#radialGradient5857);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5859);stroke-width:1.6660347;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-+ sodipodi:type="arc" />
-+ <path
-+ id="path5543"
-+ d="M 19,18 C 19,18.552 18.551999,19 18,19 C 17.448,19 17,18.552 17,18 C
17,17.448 17.448,17 18,17 C 18.551999,17 19,17.448 19,18 z"
-+
style="fill:#999c9c;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
/>
-+ <g
-+ id="g5802"
-+ style="fill:#888a85;fill-opacity:1"
-+
transform="matrix(0.9954167,0,0,0.9954167,8.2499251e-2,8.2498405e-2)">
-+ <path
-+
style="fill:#888a85;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
-+ d="M 7.9470493,18 C 7.9470493,18.414 7.6110484,18.75 7.1970493,18.75 C
6.7830492,18.75 6.4470493,18.414 6.4470493,18 C 6.4470493,17.586 6.7830492,17.25
7.1970493,17.25 C 7.6110484,17.25 7.9470493,17.586 7.9470493,18 z"
-+ id="path5545" />
-+ <path
-+
style="fill:#888a85;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
-+ d="M 29.552951,18 C 29.552951,18.414 29.21695,18.75 28.802951,18.75 C
28.388951,18.75 28.052951,18.414 28.052951,18 C 28.052951,17.586 28.388951,17.25
28.802951,17.25 C 29.21695,17.25 29.552951,17.586 29.552951,18 z"
-+ id="path5557" />
-+ <path
-+ id="path5649"
-+ d="M 9.2938893,23.026476 C 9.5008893,23.38501 9.377904,23.843995
9.0193703,24.050995 C 8.6608357,24.257995 8.2018512,24.13501 7.9948512,23.776476 C
7.7878512,23.417941 7.9108357,22.958957 8.2693703,22.751956 C 8.627904,22.544957
9.0868893,22.667941 9.2938893,23.026476 z"
-+
style="fill:#888a85;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
/>
-+ <path
-+ id="path5651"
-+ d="M 28.005149,12.223525 C 28.212149,12.582059 28.089164,13.041044
27.73063,13.248044 C 27.372095,13.455044 26.913111,13.332059 26.706111,12.973525 C
26.499111,12.61499 26.622095,12.156006 26.98063,11.949006 C 27.339164,11.742006
27.798149,11.86499 28.005149,12.223525 z"
-+
style="fill:#888a85;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
/>
-+ <path
-+
style="fill:#888a85;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
-+ d="M 12.973525,26.706111 C 13.332059,26.913111 13.455043,27.372097
13.248044,27.730631 C 13.041044,28.089165 12.582059,28.21215 12.223525,28.00515 C
11.86499,27.79815 11.742006,27.339165 11.949006,26.980631 C 12.156005,26.622097
12.61499,26.499111 12.973525,26.706111 z"
-+ id="path5655" />
-+ <path
-+
style="fill:#888a85;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
-+ d="M 23.776476,7.9948518 C 24.13501,8.2018518 24.257994,8.6608372
24.050995,9.0193708 C 23.843995,9.3779054 23.38501,9.5008899 23.026476,9.2938899 C
22.667941,9.0868899 22.544956,8.6279054 22.751956,8.2693708 C 22.958956,7.9108372
23.417941,7.7878518 23.776476,7.9948518 z"
-+ id="path5657" />
-+ <path
-+ id="path5661"
-+ d="M 18,28.052952 C 18.414,28.052952 18.75,28.388953 18.75,28.802952 C
18.75,29.216952 18.414,29.552952 18,29.552952 C 17.586,29.552952 17.25,29.216952
17.25,28.802952 C 17.25,28.388953 17.586,28.052952 18,28.052952 z"
-+
style="fill:#888a85;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
/>
-+ <path
-+ id="path5663"
-+ d="M 18,6.44705 C 18.414,6.44705 18.75,6.783051 18.75,7.19705 C
18.75,7.61105 18.414,7.94705 18,7.94705 C 17.586,7.94705 17.25,7.61105 17.25,7.19705 C
17.25,6.783051 17.586,6.44705 18,6.44705 z"
-+
style="fill:#888a85;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
/>
-+ <path
-+
style="fill:#888a85;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
-+ d="M 23.026476,26.706111 C 23.38501,26.499111 23.843995,26.622097
24.050995,26.980631 C 24.257995,27.339165 24.13501,27.79815 23.776476,28.00515 C
23.417941,28.21215 22.958957,28.089165 22.751956,27.730631 C 22.544957,27.372097
22.667941,26.913111 23.026476,26.706111 z"
-+ id="path5667" />
-+ <path
-+
style="fill:#888a85;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
-+ d="M 12.223525,7.9948518 C 12.582059,7.7878518 13.041044,7.9108372
13.248044,8.2693708 C 13.455044,8.6279054 13.332059,9.0868899 12.973525,9.2938899 C
12.61499,9.5008899 12.156006,9.3779054 11.949006,9.0193708 C 11.742006,8.6608372
11.86499,8.2018518 12.223525,7.9948518 z"
-+ id="path5669" />
-+ <path
-+ id="path5673"
-+ d="M 26.706111,23.026476 C 26.913111,22.667942 27.372097,22.544958
27.730631,22.751957 C 28.089165,22.958957 28.21215,23.417942 28.00515,23.776476 C
27.79815,24.135011 27.339165,24.257995 26.980631,24.050995 C 26.622097,23.843996
26.499111,23.385011 26.706111,23.026476 z"
-+
style="fill:#888a85;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
/>
-+ <path
-+ id="path5675"
-+ d="M 7.9948518,12.223525 C 8.2018518,11.864991 8.6608372,11.742007
9.0193708,11.949006 C 9.3779054,12.156006 9.5008899,12.614991 9.2938899,12.973525 C
9.0868899,13.33206 8.6279054,13.455044 8.2693708,13.248044 C 7.9108372,13.041045
7.7878518,12.58206 7.9948518,12.223525 z"
-+
style="fill:#888a85;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
/>
-+ </g>
-+ </g>
-+</svg>
-diff --git a/pixmaps/intlclock-face-small-evening.svg
b/pixmaps/intlclock-face-small-evening.svg
-new file mode 100644
-index 0000000..17a9840
---- /dev/null
-+++ b/pixmaps/intlclock-face-small-evening.svg
-@@ -0,0 +1,290 @@
-+<?xml version="1.0" encoding="UTF-8"
standalone="no"?>
-+<!-- Created with Inkscape (
http://www.inkscape.org/) -->
-+<svg
-+
xmlns:dc="http://purl.org/dc/elements/1.1/"
-+
xmlns:cc="http://web.resource.org/cc/"
-+
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-+
xmlns:svg="http://www.w3.org/2000/svg"
-+
xmlns="http://www.w3.org/2000/svg"
-+
xmlns:xlink="http://www.w3.org/1999/xlink"
-+
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd&q...
-+
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-+ width="36"
-+ height="36"
-+ id="svg5416"
-+ sodipodi:version="0.32"
-+ inkscape:version="0.45.1"
-+ version="1.0"
-+ sodipodi:docbase="/home/mclasen/Desktop/intlclock-1.0/pixmaps"
-+ sodipodi:docname="intlclock-face-small-morning.svg"
-+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
-+ <defs
-+ id="defs5418">
-+ <linearGradient
-+ id="linearGradient10653">
-+ <stop
-+ id="stop10655"
-+ offset="0.0000000"
-+ style="stop-color:#f3f4ff;stop-opacity:1.0000000;" />
-+ <stop
-+ id="stop10657"
-+ offset="1.0000000"
-+ style="stop-color:#9193af;stop-opacity:1.0000000;" />
-+ </linearGradient>
-+ <linearGradient
-+ id="linearGradient42174">
-+ <stop
-+ id="stop42176"
-+ offset="0"
-+ style="stop-color:#434343;stop-opacity:0.53535354;" />
-+ <stop
-+ id="stop42178"
-+ offset="1.0000000"
-+ style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-+ </linearGradient>
-+ <linearGradient
-+ id="linearGradient2145">
-+ <stop
-+ id="stop2147"
-+ offset="0.0000000"
-+ style="stop-color:#fffffd;stop-opacity:1.0000000;" />
-+ <stop
-+ id="stop2149"
-+ offset="1"
-+ style="stop-color:#d9d9d8;stop-opacity:1;" />
-+ </linearGradient>
-+ <linearGradient
-+ id="linearGradient37935">
-+ <stop
-+ style="stop-color:#9497b3;stop-opacity:1.0000000;"
-+ offset="0.0000000"
-+ id="stop37937" />
-+ <stop
-+ style="stop-color:#4c4059;stop-opacity:1.0000000;"
-+ offset="1.0000000"
-+ id="stop37939" />
-+ </linearGradient>
-+ <linearGradient
-+ id="linearGradient3816"
-+ inkscape:collect="always">
-+ <stop
-+ id="stop3818"
-+ offset="0"
-+ style="stop-color:#000000;stop-opacity:1;" />
-+ <stop
-+ id="stop3820"
-+ offset="1"
-+ style="stop-color:#000000;stop-opacity:0;" />
-+ </linearGradient>
-+ <radialGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient3816"
-+ id="radialGradient5847"
-+ gradientUnits="userSpaceOnUse"
-+ cx="31.112698"
-+ cy="19.008621"
-+ fx="31.112698"
-+ fy="19.008621"
-+ r="8.6620579" />
-+ <radialGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient37935"
-+ id="radialGradient5849"
-+ gradientUnits="userSpaceOnUse"
-+ cx="8.7468252"
-+ cy="6.8283234"
-+ fx="8.7468252"
-+ fy="6.8283234"
-+ r="29.889715" />
-+ <radialGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient2145"
-+ id="radialGradient5851"
-+ gradientUnits="userSpaceOnUse"
-+ cx="11.901996"
-+ cy="10.045444"
-+ fx="11.901996"
-+ fy="10.045444"
-+ r="29.292715" />
-+ <linearGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient42174"
-+ id="linearGradient5853"
-+ gradientUnits="userSpaceOnUse"
-+ x1="6.342216"
-+ y1="7.7893324"
-+ x2="22.218424"
-+ y2="25.884274" />
-+ <radialGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient10653"
-+ id="radialGradient5855"
-+ gradientUnits="userSpaceOnUse"
-+ cx="11.3292"
-+ cy="10.58397"
-+ fx="11.3292"
-+ fy="10.58397"
-+ r="15.532059" />
-+ <radialGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient42174"
-+ id="radialGradient5857"
-+ gradientUnits="userSpaceOnUse"
-+ cx="11.901996"
-+ cy="10.045444"
-+ fx="11.901996"
-+ fy="10.045444"
-+ r="29.292715" />
-+ <linearGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient42174"
-+ id="linearGradient5859"
-+ gradientUnits="userSpaceOnUse"
-+ x1="6.342216"
-+ y1="7.7893324"
-+ x2="22.218424"
-+ y2="25.884274" />
-+ </defs>
-+ <sodipodi:namedview
-+ id="base"
-+ pagecolor="#ffffff"
-+ bordercolor="#666666"
-+ borderopacity="1.0"
-+ inkscape:pageopacity="0.0"
-+ inkscape:pageshadow="2"
-+ inkscape:zoom="26.388889"
-+ inkscape:cx="18"
-+ inkscape:cy="39.221053"
-+ inkscape:document-units="px"
-+ inkscape:current-layer="layer1"
-+ inkscape:window-width="1600"
-+ inkscape:window-height="1115"
-+ inkscape:window-x="0"
-+ inkscape:window-y="31"
-+ width="36px"
-+ height="36px" />
-+ <metadata
-+ id="metadata5421">
-+ <rdf:RDF>
-+ <cc:Work
-+ rdf:about="">
-+ <dc:format>image/svg+xml</dc:format>
-+ <dc:type
-+
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-+ </cc:Work>
-+ </rdf:RDF>
-+ </metadata>
-+ <g
-+ inkscape:label="Layer 1"
-+ inkscape:groupmode="layer"
-+ id="layer1"
-+ style="display:inline">
-+ <path
-+ d="M 39.774755,19.008621 A 8.6620579,8.6620579 0 1 1 22.45064,19.008621 A
8.6620579,8.6620579 0 1 1 39.774755,19.008621 z"
-+ sodipodi:ry="8.6620579"
-+ sodipodi:rx="8.6620579"
-+ sodipodi:cy="19.008621"
-+ sodipodi:cx="31.112698"
-+ id="path4415"
-+
style="color:#000000;fill:url(#radialGradient5847);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-+ sodipodi:type="arc"
-+ transform="matrix(1.6624224,0,0,0.7910143,-33.728278,14.112097)" />
-+ <path
-+ transform="matrix(1.1148631,0,0,1.1148631,-0.1165205,-0.8531387)"
-+ d="M 31.160714,16.910715 A 14.910714,14.910714 0 1 1 1.3392859,16.910715 A
14.910714,14.910714 0 1 1 31.160714,16.910715 z"
-+ sodipodi:ry="14.910714"
-+ sodipodi:rx="14.910714"
-+ sodipodi:cy="16.910715"
-+ sodipodi:cx="16.25"
-+ id="path4417"
-+
style="fill:url(#radialGradient5849);fill-opacity:1;fill-rule:evenodd;stroke:#605773;stroke-width:1.6359601;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-+ sodipodi:type="arc" />
-+ <path
-+ transform="matrix(0.9318866,0,0,0.9318866,2.7831211,2.1674291)"
-+ d="M 31.160714,16.910715 A 14.910714,14.910714 0 1 1 1.3392859,16.910715 A
14.910714,14.910714 0 1 1 31.160714,16.910715 z"
-+ sodipodi:ry="14.910714"
-+ sodipodi:rx="14.910714"
-+ sodipodi:cy="16.910715"
-+ sodipodi:cx="16.25"
-+ id="path4419"
-+
style="fill:url(#radialGradient5851);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5853);stroke-width:1.6660347;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-+ sodipodi:type="arc" />
-+ <path
-+ sodipodi:type="arc"
-+
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#radialGradient5855);stroke-width:1.72497916;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-+ id="path4421"
-+ sodipodi:cx="16.25"
-+ sodipodi:cy="16.910715"
-+ sodipodi:rx="14.910714"
-+ sodipodi:ry="14.910714"
-+ d="M 31.160714,16.910715 A 14.910714,14.910714 0 1 1 1.3392859,16.910715 A
14.910714,14.910714 0 1 1 31.160714,16.910715 z"
-+ transform="matrix(1.0573301,0,0,1.0573301,0.8183498,5.0961231e-2)"
/>
-+ <path
-+ transform="matrix(0.9318866,0,0,0.9318866,2.7831211,2.1674291)"
-+ d="M 31.160714,16.910715 A 14.910714,14.910714 0 1 1 1.3392859,16.910715 A
14.910714,14.910714 0 1 1 31.160714,16.910715 z"
-+ sodipodi:ry="14.910714"
-+ sodipodi:rx="14.910714"
-+ sodipodi:cy="16.910715"
-+ sodipodi:cx="16.25"
-+ id="path4429"
-+
style="opacity:0.53921569;fill:url(#radialGradient5857);fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient5859);stroke-width:1.6660347;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-+ sodipodi:type="arc" />
-+ <path
-+ id="path5543"
-+ d="M 19,18 C 19,18.552 18.551999,19 18,19 C 17.448,19 17,18.552 17,18 C
17,17.448 17.448,17 18,17 C 18.551999,17 19,17.448 19,18 z"
-+
style="fill:#999c9c;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
/>
-+ <g
-+ id="g5802"
-+ style="fill:#888a85;fill-opacity:1"
-+
transform="matrix(0.9954167,0,0,0.9954167,8.2499251e-2,8.2498405e-2)">
-+ <path
-+
style="fill:#888a85;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
-+ d="M 7.9470493,18 C 7.9470493,18.414 7.6110484,18.75 7.1970493,18.75 C
6.7830492,18.75 6.4470493,18.414 6.4470493,18 C 6.4470493,17.586 6.7830492,17.25
7.1970493,17.25 C 7.6110484,17.25 7.9470493,17.586 7.9470493,18 z"
-+ id="path5545" />
-+ <path
-+
style="fill:#888a85;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
-+ d="M 29.552951,18 C 29.552951,18.414 29.21695,18.75 28.802951,18.75 C
28.388951,18.75 28.052951,18.414 28.052951,18 C 28.052951,17.586 28.388951,17.25
28.802951,17.25 C 29.21695,17.25 29.552951,17.586 29.552951,18 z"
-+ id="path5557" />
-+ <path
-+ id="path5649"
-+ d="M 9.2938893,23.026476 C 9.5008893,23.38501 9.377904,23.843995
9.0193703,24.050995 C 8.6608357,24.257995 8.2018512,24.13501 7.9948512,23.776476 C
7.7878512,23.417941 7.9108357,22.958957 8.2693703,22.751956 C 8.627904,22.544957
9.0868893,22.667941 9.2938893,23.026476 z"
-+
style="fill:#888a85;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
/>
-+ <path
-+ id="path5651"
-+ d="M 28.005149,12.223525 C 28.212149,12.582059 28.089164,13.041044
27.73063,13.248044 C 27.372095,13.455044 26.913111,13.332059 26.706111,12.973525 C
26.499111,12.61499 26.622095,12.156006 26.98063,11.949006 C 27.339164,11.742006
27.798149,11.86499 28.005149,12.223525 z"
-+
style="fill:#888a85;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
/>
-+ <path
-+
style="fill:#888a85;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
-+ d="M 12.973525,26.706111 C 13.332059,26.913111 13.455043,27.372097
13.248044,27.730631 C 13.041044,28.089165 12.582059,28.21215 12.223525,28.00515 C
11.86499,27.79815 11.742006,27.339165 11.949006,26.980631 C 12.156005,26.622097
12.61499,26.499111 12.973525,26.706111 z"
-+ id="path5655" />
-+ <path
-+
style="fill:#888a85;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
-+ d="M 23.776476,7.9948518 C 24.13501,8.2018518 24.257994,8.6608372
24.050995,9.0193708 C 23.843995,9.3779054 23.38501,9.5008899 23.026476,9.2938899 C
22.667941,9.0868899 22.544956,8.6279054 22.751956,8.2693708 C 22.958956,7.9108372
23.417941,7.7878518 23.776476,7.9948518 z"
-+ id="path5657" />
-+ <path
-+ id="path5661"
-+ d="M 18,28.052952 C 18.414,28.052952 18.75,28.388953 18.75,28.802952 C
18.75,29.216952 18.414,29.552952 18,29.552952 C 17.586,29.552952 17.25,29.216952
17.25,28.802952 C 17.25,28.388953 17.586,28.052952 18,28.052952 z"
-+
style="fill:#888a85;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
/>
-+ <path
-+ id="path5663"
-+ d="M 18,6.44705 C 18.414,6.44705 18.75,6.783051 18.75,7.19705 C
18.75,7.61105 18.414,7.94705 18,7.94705 C 17.586,7.94705 17.25,7.61105 17.25,7.19705 C
17.25,6.783051 17.586,6.44705 18,6.44705 z"
-+
style="fill:#888a85;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
/>
-+ <path
-+
style="fill:#888a85;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
-+ d="M 23.026476,26.706111 C 23.38501,26.499111 23.843995,26.622097
24.050995,26.980631 C 24.257995,27.339165 24.13501,27.79815 23.776476,28.00515 C
23.417941,28.21215 22.958957,28.089165 22.751956,27.730631 C 22.544957,27.372097
22.667941,26.913111 23.026476,26.706111 z"
-+ id="path5667" />
-+ <path
-+
style="fill:#888a85;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
-+ d="M 12.223525,7.9948518 C 12.582059,7.7878518 13.041044,7.9108372
13.248044,8.2693708 C 13.455044,8.6279054 13.332059,9.0868899 12.973525,9.2938899 C
12.61499,9.5008899 12.156006,9.3779054 11.949006,9.0193708 C 11.742006,8.6608372
11.86499,8.2018518 12.223525,7.9948518 z"
-+ id="path5669" />
-+ <path
-+ id="path5673"
-+ d="M 26.706111,23.026476 C 26.913111,22.667942 27.372097,22.544958
27.730631,22.751957 C 28.089165,22.958957 28.21215,23.417942 28.00515,23.776476 C
27.79815,24.135011 27.339165,24.257995 26.980631,24.050995 C 26.622097,23.843996
26.499111,23.385011 26.706111,23.026476 z"
-+
style="fill:#888a85;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
/>
-+ <path
-+ id="path5675"
-+ d="M 7.9948518,12.223525 C 8.2018518,11.864991 8.6608372,11.742007
9.0193708,11.949006 C 9.3779054,12.156006 9.5008899,12.614991 9.2938899,12.973525 C
9.0868899,13.33206 8.6279054,13.455044 8.2693708,13.248044 C 7.9108372,13.041045
7.7878518,12.58206 7.9948518,12.223525 z"
-+
style="fill:#888a85;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
/>
-+ </g>
-+ </g>
-+</svg>
-diff --git a/pixmaps/intlclock-face-small-morning.svg
b/pixmaps/intlclock-face-small-morning.svg
-new file mode 100644
-index 0000000..17a9840
---- /dev/null
-+++ b/pixmaps/intlclock-face-small-morning.svg
-@@ -0,0 +1,290 @@
-+<?xml version="1.0" encoding="UTF-8"
standalone="no"?>
-+<!-- Created with Inkscape (
http://www.inkscape.org/) -->
-+<svg
-+
xmlns:dc="http://purl.org/dc/elements/1.1/"
-+
xmlns:cc="http://web.resource.org/cc/"
-+
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-+
xmlns:svg="http://www.w3.org/2000/svg"
-+
xmlns="http://www.w3.org/2000/svg"
-+
xmlns:xlink="http://www.w3.org/1999/xlink"
-+
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd&q...
-+
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-+ width="36"
-+ height="36"
-+ id="svg5416"
-+ sodipodi:version="0.32"
-+ inkscape:version="0.45.1"
-+ version="1.0"
-+ sodipodi:docbase="/home/mclasen/Desktop/intlclock-1.0/pixmaps"
-+ sodipodi:docname="intlclock-face-small-morning.svg"
-+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
-+ <defs
-+ id="defs5418">
-+ <linearGradient
-+ id="linearGradient10653">
-+ <stop
-+ id="stop10655"
-+ offset="0.0000000"
-+ style="stop-color:#f3f4ff;stop-opacity:1.0000000;" />
-+ <stop
-+ id="stop10657"
-+ offset="1.0000000"
-+ style="stop-color:#9193af;stop-opacity:1.0000000;" />
-+ </linearGradient>
-+ <linearGradient
-+ id="linearGradient42174">
-+ <stop
-+ id="stop42176"
-+ offset="0"
-+ style="stop-color:#434343;stop-opacity:0.53535354;" />
-+ <stop
-+ id="stop42178"
-+ offset="1.0000000"
-+ style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-+ </linearGradient>
-+ <linearGradient
-+ id="linearGradient2145">
-+ <stop
-+ id="stop2147"
-+ offset="0.0000000"
-+ style="stop-color:#fffffd;stop-opacity:1.0000000;" />
-+ <stop
-+ id="stop2149"
-+ offset="1"
-+ style="stop-color:#d9d9d8;stop-opacity:1;" />
-+ </linearGradient>
-+ <linearGradient
-+ id="linearGradient37935">
-+ <stop
-+ style="stop-color:#9497b3;stop-opacity:1.0000000;"
-+ offset="0.0000000"
-+ id="stop37937" />
-+ <stop
-+ style="stop-color:#4c4059;stop-opacity:1.0000000;"
-+ offset="1.0000000"
-+ id="stop37939" />
-+ </linearGradient>
-+ <linearGradient
-+ id="linearGradient3816"
-+ inkscape:collect="always">
-+ <stop
-+ id="stop3818"
-+ offset="0"
-+ style="stop-color:#000000;stop-opacity:1;" />
-+ <stop
-+ id="stop3820"
-+ offset="1"
-+ style="stop-color:#000000;stop-opacity:0;" />
-+ </linearGradient>
-+ <radialGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient3816"
-+ id="radialGradient5847"
-+ gradientUnits="userSpaceOnUse"
-+ cx="31.112698"
-+ cy="19.008621"
-+ fx="31.112698"
-+ fy="19.008621"
-+ r="8.6620579" />
-+ <radialGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient37935"
-+ id="radialGradient5849"
-+ gradientUnits="userSpaceOnUse"
-+ cx="8.7468252"
-+ cy="6.8283234"
-+ fx="8.7468252"
-+ fy="6.8283234"
-+ r="29.889715" />
-+ <radialGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient2145"
-+ id="radialGradient5851"
-+ gradientUnits="userSpaceOnUse"
-+ cx="11.901996"
-+ cy="10.045444"
-+ fx="11.901996"
-+ fy="10.045444"
-+ r="29.292715" />
-+ <linearGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient42174"
-+ id="linearGradient5853"
-+ gradientUnits="userSpaceOnUse"
-+ x1="6.342216"
-+ y1="7.7893324"
-+ x2="22.218424"
-+ y2="25.884274" />
-+ <radialGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient10653"
-+ id="radialGradient5855"
-+ gradientUnits="userSpaceOnUse"
-+ cx="11.3292"
-+ cy="10.58397"
-+ fx="11.3292"
-+ fy="10.58397"
-+ r="15.532059" />
-+ <radialGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient42174"
-+ id="radialGradient5857"
-+ gradientUnits="userSpaceOnUse"
-+ cx="11.901996"
-+ cy="10.045444"
-+ fx="11.901996"
-+ fy="10.045444"
-+ r="29.292715" />
-+ <linearGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient42174"
-+ id="linearGradient5859"
-+ gradientUnits="userSpaceOnUse"
-+ x1="6.342216"
-+ y1="7.7893324"
-+ x2="22.218424"
-+ y2="25.884274" />
-+ </defs>
-+ <sodipodi:namedview
-+ id="base"
-+ pagecolor="#ffffff"
-+ bordercolor="#666666"
-+ borderopacity="1.0"
-+ inkscape:pageopacity="0.0"
-+ inkscape:pageshadow="2"
-+ inkscape:zoom="26.388889"
-+ inkscape:cx="18"
-+ inkscape:cy="39.221053"
-+ inkscape:document-units="px"
-+ inkscape:current-layer="layer1"
-+ inkscape:window-width="1600"
-+ inkscape:window-height="1115"
-+ inkscape:window-x="0"
-+ inkscape:window-y="31"
-+ width="36px"
-+ height="36px" />
-+ <metadata
-+ id="metadata5421">
-+ <rdf:RDF>
-+ <cc:Work
-+ rdf:about="">
-+ <dc:format>image/svg+xml</dc:format>
-+ <dc:type
-+
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-+ </cc:Work>
-+ </rdf:RDF>
-+ </metadata>
-+ <g
-+ inkscape:label="Layer 1"
-+ inkscape:groupmode="layer"
-+ id="layer1"
-+ style="display:inline">
-+ <path
-+ d="M 39.774755,19.008621 A 8.6620579,8.6620579 0 1 1 22.45064,19.008621 A
8.6620579,8.6620579 0 1 1 39.774755,19.008621 z"
-+ sodipodi:ry="8.6620579"
-+ sodipodi:rx="8.6620579"
-+ sodipodi:cy="19.008621"
-+ sodipodi:cx="31.112698"
-+ id="path4415"
-+
style="color:#000000;fill:url(#radialGradient5847);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-+ sodipodi:type="arc"
-+ transform="matrix(1.6624224,0,0,0.7910143,-33.728278,14.112097)" />
-+ <path
-+ transform="matrix(1.1148631,0,0,1.1148631,-0.1165205,-0.8531387)"
-+ d="M 31.160714,16.910715 A 14.910714,14.910714 0 1 1 1.3392859,16.910715 A
14.910714,14.910714 0 1 1 31.160714,16.910715 z"
-+ sodipodi:ry="14.910714"
-+ sodipodi:rx="14.910714"
-+ sodipodi:cy="16.910715"
-+ sodipodi:cx="16.25"
-+ id="path4417"
-+
style="fill:url(#radialGradient5849);fill-opacity:1;fill-rule:evenodd;stroke:#605773;stroke-width:1.6359601;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-+ sodipodi:type="arc" />
-+ <path
-+ transform="matrix(0.9318866,0,0,0.9318866,2.7831211,2.1674291)"
-+ d="M 31.160714,16.910715 A 14.910714,14.910714 0 1 1 1.3392859,16.910715 A
14.910714,14.910714 0 1 1 31.160714,16.910715 z"
-+ sodipodi:ry="14.910714"
-+ sodipodi:rx="14.910714"
-+ sodipodi:cy="16.910715"
-+ sodipodi:cx="16.25"
-+ id="path4419"
-+
style="fill:url(#radialGradient5851);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5853);stroke-width:1.6660347;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-+ sodipodi:type="arc" />
-+ <path
-+ sodipodi:type="arc"
-+
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#radialGradient5855);stroke-width:1.72497916;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-+ id="path4421"
-+ sodipodi:cx="16.25"
-+ sodipodi:cy="16.910715"
-+ sodipodi:rx="14.910714"
-+ sodipodi:ry="14.910714"
-+ d="M 31.160714,16.910715 A 14.910714,14.910714 0 1 1 1.3392859,16.910715 A
14.910714,14.910714 0 1 1 31.160714,16.910715 z"
-+ transform="matrix(1.0573301,0,0,1.0573301,0.8183498,5.0961231e-2)"
/>
-+ <path
-+ transform="matrix(0.9318866,0,0,0.9318866,2.7831211,2.1674291)"
-+ d="M 31.160714,16.910715 A 14.910714,14.910714 0 1 1 1.3392859,16.910715 A
14.910714,14.910714 0 1 1 31.160714,16.910715 z"
-+ sodipodi:ry="14.910714"
-+ sodipodi:rx="14.910714"
-+ sodipodi:cy="16.910715"
-+ sodipodi:cx="16.25"
-+ id="path4429"
-+
style="opacity:0.53921569;fill:url(#radialGradient5857);fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient5859);stroke-width:1.6660347;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-+ sodipodi:type="arc" />
-+ <path
-+ id="path5543"
-+ d="M 19,18 C 19,18.552 18.551999,19 18,19 C 17.448,19 17,18.552 17,18 C
17,17.448 17.448,17 18,17 C 18.551999,17 19,17.448 19,18 z"
-+
style="fill:#999c9c;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
/>
-+ <g
-+ id="g5802"
-+ style="fill:#888a85;fill-opacity:1"
-+
transform="matrix(0.9954167,0,0,0.9954167,8.2499251e-2,8.2498405e-2)">
-+ <path
-+
style="fill:#888a85;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
-+ d="M 7.9470493,18 C 7.9470493,18.414 7.6110484,18.75 7.1970493,18.75 C
6.7830492,18.75 6.4470493,18.414 6.4470493,18 C 6.4470493,17.586 6.7830492,17.25
7.1970493,17.25 C 7.6110484,17.25 7.9470493,17.586 7.9470493,18 z"
-+ id="path5545" />
-+ <path
-+
style="fill:#888a85;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
-+ d="M 29.552951,18 C 29.552951,18.414 29.21695,18.75 28.802951,18.75 C
28.388951,18.75 28.052951,18.414 28.052951,18 C 28.052951,17.586 28.388951,17.25
28.802951,17.25 C 29.21695,17.25 29.552951,17.586 29.552951,18 z"
-+ id="path5557" />
-+ <path
-+ id="path5649"
-+ d="M 9.2938893,23.026476 C 9.5008893,23.38501 9.377904,23.843995
9.0193703,24.050995 C 8.6608357,24.257995 8.2018512,24.13501 7.9948512,23.776476 C
7.7878512,23.417941 7.9108357,22.958957 8.2693703,22.751956 C 8.627904,22.544957
9.0868893,22.667941 9.2938893,23.026476 z"
-+
style="fill:#888a85;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
/>
-+ <path
-+ id="path5651"
-+ d="M 28.005149,12.223525 C 28.212149,12.582059 28.089164,13.041044
27.73063,13.248044 C 27.372095,13.455044 26.913111,13.332059 26.706111,12.973525 C
26.499111,12.61499 26.622095,12.156006 26.98063,11.949006 C 27.339164,11.742006
27.798149,11.86499 28.005149,12.223525 z"
-+
style="fill:#888a85;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
/>
-+ <path
-+
style="fill:#888a85;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
-+ d="M 12.973525,26.706111 C 13.332059,26.913111 13.455043,27.372097
13.248044,27.730631 C 13.041044,28.089165 12.582059,28.21215 12.223525,28.00515 C
11.86499,27.79815 11.742006,27.339165 11.949006,26.980631 C 12.156005,26.622097
12.61499,26.499111 12.973525,26.706111 z"
-+ id="path5655" />
-+ <path
-+
style="fill:#888a85;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
-+ d="M 23.776476,7.9948518 C 24.13501,8.2018518 24.257994,8.6608372
24.050995,9.0193708 C 23.843995,9.3779054 23.38501,9.5008899 23.026476,9.2938899 C
22.667941,9.0868899 22.544956,8.6279054 22.751956,8.2693708 C 22.958956,7.9108372
23.417941,7.7878518 23.776476,7.9948518 z"
-+ id="path5657" />
-+ <path
-+ id="path5661"
-+ d="M 18,28.052952 C 18.414,28.052952 18.75,28.388953 18.75,28.802952 C
18.75,29.216952 18.414,29.552952 18,29.552952 C 17.586,29.552952 17.25,29.216952
17.25,28.802952 C 17.25,28.388953 17.586,28.052952 18,28.052952 z"
-+
style="fill:#888a85;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
/>
-+ <path
-+ id="path5663"
-+ d="M 18,6.44705 C 18.414,6.44705 18.75,6.783051 18.75,7.19705 C
18.75,7.61105 18.414,7.94705 18,7.94705 C 17.586,7.94705 17.25,7.61105 17.25,7.19705 C
17.25,6.783051 17.586,6.44705 18,6.44705 z"
-+
style="fill:#888a85;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
/>
-+ <path
-+
style="fill:#888a85;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
-+ d="M 23.026476,26.706111 C 23.38501,26.499111 23.843995,26.622097
24.050995,26.980631 C 24.257995,27.339165 24.13501,27.79815 23.776476,28.00515 C
23.417941,28.21215 22.958957,28.089165 22.751956,27.730631 C 22.544957,27.372097
22.667941,26.913111 23.026476,26.706111 z"
-+ id="path5667" />
-+ <path
-+
style="fill:#888a85;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
-+ d="M 12.223525,7.9948518 C 12.582059,7.7878518 13.041044,7.9108372
13.248044,8.2693708 C 13.455044,8.6279054 13.332059,9.0868899 12.973525,9.2938899 C
12.61499,9.5008899 12.156006,9.3779054 11.949006,9.0193708 C 11.742006,8.6608372
11.86499,8.2018518 12.223525,7.9948518 z"
-+ id="path5669" />
-+ <path
-+ id="path5673"
-+ d="M 26.706111,23.026476 C 26.913111,22.667942 27.372097,22.544958
27.730631,22.751957 C 28.089165,22.958957 28.21215,23.417942 28.00515,23.776476 C
27.79815,24.135011 27.339165,24.257995 26.980631,24.050995 C 26.622097,23.843996
26.499111,23.385011 26.706111,23.026476 z"
-+
style="fill:#888a85;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
/>
-+ <path
-+ id="path5675"
-+ d="M 7.9948518,12.223525 C 8.2018518,11.864991 8.6608372,11.742007
9.0193708,11.949006 C 9.3779054,12.156006 9.5008899,12.614991 9.2938899,12.973525 C
9.0868899,13.33206 8.6279054,13.455044 8.2693708,13.248044 C 7.9108372,13.041045
7.7878518,12.58206 7.9948518,12.223525 z"
-+
style="fill:#888a85;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
/>
-+ </g>
-+ </g>
-+</svg>
-diff --git a/pixmaps/intlclock-face-small-night.svg
b/pixmaps/intlclock-face-small-night.svg
-new file mode 100644
-index 0000000..d5a7d8e
---- /dev/null
-+++ b/pixmaps/intlclock-face-small-night.svg
-@@ -0,0 +1,291 @@
-+<?xml version="1.0" encoding="UTF-8"
standalone="no"?>
-+<!-- Created with Inkscape (
http://www.inkscape.org/) -->
-+<svg
-+
xmlns:dc="http://purl.org/dc/elements/1.1/"
-+
xmlns:cc="http://web.resource.org/cc/"
-+
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-+
xmlns:svg="http://www.w3.org/2000/svg"
-+
xmlns="http://www.w3.org/2000/svg"
-+
xmlns:xlink="http://www.w3.org/1999/xlink"
-+
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd&q...
-+
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-+ width="36"
-+ height="36"
-+ id="svg5416"
-+ sodipodi:version="0.32"
-+ inkscape:version="0.45.1"
-+ version="1.0"
-+ sodipodi:docbase="/home/mclasen/Desktop/intlclock-1.0/pixmaps"
-+ sodipodi:docname="intlclock-face-dark-small.svg"
-+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
-+ <defs
-+ id="defs5418">
-+ <linearGradient
-+ id="linearGradient10653">
-+ <stop
-+ id="stop10655"
-+ offset="0.0000000"
-+ style="stop-color:#f3f4ff;stop-opacity:1.0000000;" />
-+ <stop
-+ id="stop10657"
-+ offset="1.0000000"
-+ style="stop-color:#9193af;stop-opacity:1.0000000;" />
-+ </linearGradient>
-+ <linearGradient
-+ id="linearGradient42174">
-+ <stop
-+ id="stop42176"
-+ offset="0.0000000"
-+ style="stop-color:#a0a0a0;stop-opacity:1.0000000;" />
-+ <stop
-+ id="stop42178"
-+ offset="1.0000000"
-+ style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-+ </linearGradient>
-+ <linearGradient
-+ id="linearGradient2145">
-+ <stop
-+ id="stop2147"
-+ offset="0.0000000"
-+ style="stop-color:#fffffd;stop-opacity:1.0000000;" />
-+ <stop
-+ id="stop2149"
-+ offset="1"
-+ style="stop-color:#d9d9d8;stop-opacity:1;" />
-+ </linearGradient>
-+ <linearGradient
-+ id="linearGradient37935">
-+ <stop
-+ style="stop-color:#27293c;stop-opacity:1;"
-+ offset="0"
-+ id="stop37937" />
-+ <stop
-+ style="stop-color:#d6cae3;stop-opacity:1;"
-+ offset="1"
-+ id="stop37939" />
-+ </linearGradient>
-+ <linearGradient
-+ id="linearGradient3816"
-+ inkscape:collect="always">
-+ <stop
-+ id="stop3818"
-+ offset="0"
-+ style="stop-color:#000000;stop-opacity:1;" />
-+ <stop
-+ id="stop3820"
-+ offset="1"
-+ style="stop-color:#000000;stop-opacity:0;" />
-+ </linearGradient>
-+ <radialGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient3816"
-+ id="radialGradient5847"
-+ gradientUnits="userSpaceOnUse"
-+ cx="31.112698"
-+ cy="19.008621"
-+ fx="31.112698"
-+ fy="19.008621"
-+ r="8.6620579" />
-+ <radialGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient37935"
-+ id="radialGradient5849"
-+ gradientUnits="userSpaceOnUse"
-+ cx="8.7468252"
-+ cy="6.8283234"
-+ fx="8.7468252"
-+ fy="6.8283234"
-+ r="29.889715" />
-+ <radialGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient2145"
-+ id="radialGradient5851"
-+ gradientUnits="userSpaceOnUse"
-+ cx="11.901996"
-+ cy="10.045444"
-+ fx="11.901996"
-+ fy="10.045444"
-+ r="29.292715" />
-+ <linearGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient42174"
-+ id="linearGradient5853"
-+ gradientUnits="userSpaceOnUse"
-+ x1="6.342216"
-+ y1="7.7893324"
-+ x2="22.218424"
-+ y2="25.884274" />
-+ <radialGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient10653"
-+ id="radialGradient5855"
-+ gradientUnits="userSpaceOnUse"
-+ cx="11.3292"
-+ cy="10.58397"
-+ fx="11.3292"
-+ fy="10.58397"
-+ r="15.532059" />
-+ <linearGradient
-+ inkscape:collect="always"
-+ xlink:href="#linearGradient10653"
-+ id="linearGradient5859"
-+ gradientUnits="userSpaceOnUse"
-+ x1="6.342216"
-+ y1="7.7893324"
-+ x2="22.218424"
-+ y2="25.884274" />
-+ </defs>
-+ <sodipodi:namedview
-+ id="base"
-+ pagecolor="#ffffff"
-+ bordercolor="#666666"
-+ borderopacity="1.0"
-+ inkscape:pageopacity="0.0"
-+ inkscape:pageshadow="2"
-+ inkscape:zoom="26.388889"
-+ inkscape:cx="18"
-+ inkscape:cy="18"
-+ inkscape:document-units="px"
-+ inkscape:current-layer="layer1"
-+ inkscape:window-width="1600"
-+ inkscape:window-height="1115"
-+ inkscape:window-x="0"
-+ inkscape:window-y="31"
-+ width="36px"
-+ height="36px"
-+ showguides="true"
-+ inkscape:guide-bbox="true" />
-+ <metadata
-+ id="metadata5421">
-+ <rdf:RDF>
-+ <cc:Work
-+ rdf:about="">
-+ <dc:format>image/svg+xml</dc:format>
-+ <dc:type
-+
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-+ </cc:Work>
-+ </rdf:RDF>
-+ </metadata>
-+ <g
-+ inkscape:label="Layer 1"
-+ inkscape:groupmode="layer"
-+ id="layer1"
-+ style="display:inline">
-+ <path
-+ d="M 39.774755,19.008621 A 8.6620579,8.6620579 0 1 1 22.45064,19.008621 A
8.6620579,8.6620579 0 1 1 39.774755,19.008621 z"
-+ sodipodi:ry="8.6620579"
-+ sodipodi:rx="8.6620579"
-+ sodipodi:cy="19.008621"
-+ sodipodi:cx="31.112698"
-+ id="path4415"
-+
style="color:#000000;fill:url(#radialGradient5847);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-+ sodipodi:type="arc"
-+ transform="matrix(1.6624224,0,0,0.7910143,-33.728278,14.112097)" />
-+ <path
-+ transform="matrix(1.1148631,0,0,1.1148631,-0.1165205,-0.8531387)"
-+ d="M 31.160714,16.910715 A 14.910714,14.910714 0 1 1 1.3392859,16.910715 A
14.910714,14.910714 0 1 1 31.160714,16.910715 z"
-+ sodipodi:ry="14.910714"
-+ sodipodi:rx="14.910714"
-+ sodipodi:cy="16.910715"
-+ sodipodi:cx="16.25"
-+ id="path4417"
-+
style="fill:url(#radialGradient5849);fill-opacity:1.0;fill-rule:evenodd;stroke:#605773;stroke-width:1.6359601;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-+ sodipodi:type="arc" />
-+ <path
-+ transform="matrix(0.9318866,0,0,0.9318866,2.7831211,2.1674291)"
-+ d="M 31.160714,16.910715 A 14.910714,14.910714 0 1 1 1.3392859,16.910715 A
14.910714,14.910714 0 1 1 31.160714,16.910715 z"
-+ sodipodi:ry="14.910714"
-+ sodipodi:rx="14.910714"
-+ sodipodi:cy="16.910715"
-+ sodipodi:cx="16.25"
-+ id="path4419"
-+
style="fill:url(#radialGradient5851);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5853);stroke-width:1.6660347;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-+ sodipodi:type="arc" />
-+ <path
-+ sodipodi:type="arc"
-+
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#radialGradient5855);stroke-width:1.72497916;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-+ id="path4421"
-+ sodipodi:cx="16.25"
-+ sodipodi:cy="16.910715"
-+ sodipodi:rx="14.910714"
-+ sodipodi:ry="14.910714"
-+ d="M 31.160714,16.910715 A 14.910714,14.910714 0 1 1 1.3392859,16.910715 A
14.910714,14.910714 0 1 1 31.160714,16.910715 z"
-+ transform="matrix(1.0573301,0,0,1.0573301,0.8183498,5.0961231e-2)"
/>
-+ <path
-+ transform="matrix(0.9318866,0,0,0.9318866,2.7831211,2.1674291)"
-+ d="M 31.160714,16.910715 A 14.910714,14.910714 0 1 1 1.3392859,16.910715 A
14.910714,14.910714 0 1 1 31.160714,16.910715 z"
-+ sodipodi:ry="14.910714"
-+ sodipodi:rx="14.910714"
-+ sodipodi:cy="16.910715"
-+ sodipodi:cx="16.25"
-+ id="path4429"
-+
style="opacity:0.53921569;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5859);stroke-width:1.6660347;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-+ sodipodi:type="arc" />
-+ <path
-+ id="path5543"
-+ d="M 19,18 C 19,18.552 18.551999,19 18,19 C 17.448,19 17,18.552 17,18 C
17,17.448 17.448,17 18,17 C 18.551999,17 19,17.448 19,18 z"
-+
style="fill:#c3c9c9;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
/>
-+ <g
-+ id="g5802"
-+ style="fill:#eaece7;fill-opacity:1"
-+
transform="matrix(0.9954167,0,0,0.9954167,8.2499251e-2,8.2498405e-2)">
-+ <path
-+
style="fill:#eaece7;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
-+ d="M 7.9470493,18 C 7.9470493,18.414 7.6110484,18.75 7.1970493,18.75 C
6.7830492,18.75 6.4470493,18.414 6.4470493,18 C 6.4470493,17.586 6.7830492,17.25
7.1970493,17.25 C 7.6110484,17.25 7.9470493,17.586 7.9470493,18 z"
-+ id="path5545" />
-+ <path
-+
style="fill:#eaece7;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
-+ d="M 29.552951,18 C 29.552951,18.414 29.21695,18.75 28.802951,18.75 C
28.388951,18.75 28.052951,18.414 28.052951,18 C 28.052951,17.586 28.388951,17.25
28.802951,17.25 C 29.21695,17.25 29.552951,17.586 29.552951,18 z"
-+ id="path5557" />
-+ <path
-+ id="path5649"
-+ d="M 9.2938893,23.026476 C 9.5008893,23.38501 9.377904,23.843995
9.0193703,24.050995 C 8.6608357,24.257995 8.2018512,24.13501 7.9948512,23.776476 C
7.7878512,23.417941 7.9108357,22.958957 8.2693703,22.751956 C 8.627904,22.544957
9.0868893,22.667941 9.2938893,23.026476 z"
-+
style="fill:#eaece7;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
/>
-+ <path
-+ id="path5651"
-+ d="M 28.005149,12.223525 C 28.212149,12.582059 28.089164,13.041044
27.73063,13.248044 C 27.372095,13.455044 26.913111,13.332059 26.706111,12.973525 C
26.499111,12.61499 26.622095,12.156006 26.98063,11.949006 C 27.339164,11.742006
27.798149,11.86499 28.005149,12.223525 z"
-+
style="fill:#eaece7;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
/>
-+ <path
-+
style="fill:#eaece7;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
-+ d="M 12.973525,26.706111 C 13.332059,26.913111 13.455043,27.372097
13.248044,27.730631 C 13.041044,28.089165 12.582059,28.21215 12.223525,28.00515 C
11.86499,27.79815 11.742006,27.339165 11.949006,26.980631 C 12.156005,26.622097
12.61499,26.499111 12.973525,26.706111 z"
-+ id="path5655" />
-+ <path
-+
style="fill:#eaece7;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
-+ d="M 23.776476,7.9948518 C 24.13501,8.2018518 24.257994,8.6608372
24.050995,9.0193708 C 23.843995,9.3779054 23.38501,9.5008899 23.026476,9.2938899 C
22.667941,9.0868899 22.544956,8.6279054 22.751956,8.2693708 C 22.958956,7.9108372
23.417941,7.7878518 23.776476,7.9948518 z"
-+ id="path5657" />
-+ <path
-+ id="path5661"
-+ d="M 18,28.052952 C 18.414,28.052952 18.75,28.388953 18.75,28.802952 C
18.75,29.216952 18.414,29.552952 18,29.552952 C 17.586,29.552952 17.25,29.216952
17.25,28.802952 C 17.25,28.388953 17.586,28.052952 18,28.052952 z"
-+
style="fill:#eaece7;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
/>
-+ <path
-+ id="path5663"
-+ d="M 18,6.44705 C 18.414,6.44705 18.75,6.783051 18.75,7.19705 C
18.75,7.61105 18.414,7.94705 18,7.94705 C 17.586,7.94705 17.25,7.61105 17.25,7.19705 C
17.25,6.783051 17.586,6.44705 18,6.44705 z"
-+
style="fill:#eaece7;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
/>
-+ <path
-+
style="fill:#eaece7;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
-+ d="M 23.026476,26.706111 C 23.38501,26.499111 23.843995,26.622097
24.050995,26.980631 C 24.257995,27.339165 24.13501,27.79815 23.776476,28.00515 C
23.417941,28.21215 22.958957,28.089165 22.751956,27.730631 C 22.544957,27.372097
22.667941,26.913111 23.026476,26.706111 z"
-+ id="path5667" />
-+ <path
-+
style="fill:#eaece7;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
-+ d="M 12.223525,7.9948518 C 12.582059,7.7878518 13.041044,7.9108372
13.248044,8.2693708 C 13.455044,8.6279054 13.332059,9.0868899 12.973525,9.2938899 C
12.61499,9.5008899 12.156006,9.3779054 11.949006,9.0193708 C 11.742006,8.6608372
11.86499,8.2018518 12.223525,7.9948518 z"
-+ id="path5669" />
-+ <path
-+ id="path5673"
-+ d="M 26.706111,23.026476 C 26.913111,22.667942 27.372097,22.544958
27.730631,22.751957 C 28.089165,22.958957 28.21215,23.417942 28.00515,23.776476 C
27.79815,24.135011 27.339165,24.257995 26.980631,24.050995 C 26.622097,23.843996
26.499111,23.385011 26.706111,23.026476 z"
-+
style="fill:#eaece7;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
/>
-+ <path
-+ id="path5675"
-+ d="M 7.9948518,12.223525 C 8.2018518,11.864991 8.6608372,11.742007
9.0193708,11.949006 C 9.3779054,12.156006 9.5008899,12.614991 9.2938899,12.973525 C
9.0868899,13.33206 8.6279054,13.455044 8.2693708,13.248044 C 7.9108372,13.041045
7.7878518,12.58206 7.9948518,12.223525 z"
-+
style="fill:#eaece7;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1"
/>
-+ </g>
-+ <path
-+ sodipodi:type="arc"
-+
style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:10.30000019;stroke-miterlimit:3.9000001;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-+ id="path6095"
-+ sodipodi:cx="34.673683"
-+ sodipodi:cy="29.804211"
-+ sodipodi:rx="0"
-+ sodipodi:ry="2.103158"
-+ d="M 34.673683 29.804211 A 0 2.103158 0 1 1 34.673683,29.804211 A 0
2.103158 0 1 1 34.673683 29.804211 z" />
-+ </g>
-+</svg>
-diff --git a/pixmaps/intlclock-map-location-current.png
b/pixmaps/intlclock-map-location-current.png
-new file mode 100644
-index 0000000..5c505d1
---- /dev/null
-+++ b/pixmaps/intlclock-map-location-current.png
-@@ -0,0 +1,6 @@
-+PNG
-+
-+