--- /dev/null
+From be33e799d968a073c0a8856c96d11e8594b88bc4 Mon Sep 17 00:00:00 2001
+From: Yannick Gicquel <ygicquel@gmail.com>
+Date: Thu, 22 Nov 2012 08:37:26 +0100
+Subject: [PATCH] panel: Fix launcher icon animation ending with black artifact
+
+We simply need to hide the animation window before unref'ing the pixbuf.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=688618
+---
+ gnome-panel/xstuff.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/gnome-panel/xstuff.c b/gnome-panel/xstuff.c
+index 5acbf66..4f8b605 100644
+--- a/gnome-panel/xstuff.c
++++ b/gnome-panel/xstuff.c
+@@ -326,12 +326,13 @@ zoom_draw (GtkWidget *widget,
+ g_source_remove (zoom->timeout_id);
+ zoom->timeout_id = 0;
+
++ gtk_widget_hide (widget);
++ g_idle_add (idle_destroy, widget);
++
+ g_object_unref (zoom->pixbuf);
+ zoom->pixbuf = NULL;
+
+ g_slice_free (CompositedZoomData, zoom);
+-
+- g_idle_add (idle_destroy, widget);
+ } else {
+ GdkPixbuf *scaled;
+ int width, height;
+--
+1.8.2
+
--- /dev/null
+From f5550422e202041a70cce8776785e3e651a01d8d Mon Sep 17 00:00:00 2001
+From: Philipp Kaluza <phk@src.gnome.org>
+Date: Thu, 3 Jan 2013 11:51:19 +0100
+Subject: [PATCH] fix build error due to missing gweather-xml.h
+
+GWeather doesn't export the deprecated GWeatherXML anymore since
+commit 354f1aa9003ee08c6e63ecbaaa6b9179b9178184 . Luckily, our last
+usage of it is long gone. Remove leftover include.
+
+See https://bugzilla.redhat.com/show_bug.cgi?id=890219
+---
+ applets/clock/clock.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/applets/clock/clock.c b/applets/clock/clock.c
+index 90ee62b..6b62daa 100644
+--- a/applets/clock/clock.c
++++ b/applets/clock/clock.c
+@@ -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>
+--
+1.8.2
+
--- /dev/null
+From 58b73a9e3129eb25f030f8d02bcd15303b300814 Mon Sep 17 00:00:00 2001
+From: Daniel Drake <dsd@laptop.org>
+Date: Mon, 17 Dec 2012 14:58:20 +0000
+Subject: [PATCH] na: apply style after realize
+
+Under Fedora 18 (GTK-3.6.2), notification icons such as the battery/power
+icon from gnome-settings-daemon are appearing all-black on top of a black
+background.
+
+This is because style_updated is being called before the tray applet
+is realized, meaning that the following code in
+na_tray_applet_style_updated() causes a bail-out:
+
+ if (!applet->priv->tray)
+ return;
+
+and the style is never applied.
+
+Fix this by updating the style explicitly after realizing the widget.
+---
+ applets/notification_area/main.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/applets/notification_area/main.c b/applets/notification_area/main.c
+index 5fc4d1d..5dad715 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;
+@@ -78,6 +80,7 @@ na_tray_applet_realize (GtkWidget *widget)
+ get_gtk_orientation_from_applet_orient (orient));
+
+ gtk_container_add (GTK_CONTAINER (widget), GTK_WIDGET (applet->priv->tray));
++ na_tray_applet_style_updated (widget);
+ gtk_widget_show (GTK_WIDGET (applet->priv->tray));
+ }
+
+--
+1.8.2
+
--- /dev/null
+From 452f59be8f9babf0ae33654e754da65151760a76 Mon Sep 17 00:00:00 2001
+From: Philipp Kaluza <phk@src.gnome.org>
+Date: Fri, 8 Mar 2013 17:51:23 +0100
+Subject: [PATCH 4/6] drop support for commandline-based calendar/tasks
+ applications
+
+It's not worth the layering violations this would need.
+(Partial fix for bug #237308 .)
+---
+ applets/clock/calendar-window.c | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/applets/clock/calendar-window.c b/applets/clock/calendar-window.c
+index 458852c..708e921 100644
+--- a/applets/clock/calendar-window.c
++++ b/applets/clock/calendar-window.c
+@@ -42,9 +42,6 @@
+ #include <glib/gi18n.h>
+ #include <gio/gio.h>
+
+-#define GNOME_DESKTOP_USE_UNSTABLE_API
+-#include <libgnome-desktop/gnome-desktop-utils.h>
+-
+ #include "calendar-window.h"
+
+ #include "clock.h"
+@@ -168,6 +165,13 @@ clock_launch_calendar_tasks_app (CalendarWindow *calwin,
+ return;
+ }
+
++ /* FIXME: reintroduce terminal support if a proper GAppInfo port of gnome-panel is ever done */
++ if (terminal) {
++ g_printerr ("Terminal-based calendar/tasks applications are no longer supported, sorry. "
++ "Please configure a different application.\n");
++ return;
++ }
++
+ command_line = g_find_program_in_path (program);
+ if (command_line == NULL) {
+ g_printerr ("Cannot launch calendar/tasks application: %s in path\n", program);
+@@ -189,9 +193,6 @@ clock_launch_calendar_tasks_app (CalendarWindow *calwin,
+ screen = gtk_widget_get_screen (calwin->priv->calendar);
+ error = NULL;
+
+- if (terminal)
+- gnome_desktop_prepend_terminal_to_vector (&argc, &argv);
+-
+ display = gdk_screen_make_display_name (screen);
+
+ result = g_spawn_async (NULL, /* working directory */
+--
+1.8.2
+
--- /dev/null
+From bf6af945130299a69a244afaee4eecbd3fb77233 Mon Sep 17 00:00:00 2001
+From: Philipp Kaluza <phk@src.gnome.org>
+Date: Fri, 8 Mar 2013 18:08:32 +0100
+Subject: [PATCH 5/6] panel-run-dialog: resurrect function
+ gnome_desktop_prepend_terminal_to_vector
+
+, which was removed from gnome-desktop in commit
+9bab2144b7c8ace0c057720be3c48fb24a80a19d , and keep a local
+copy in panel-run-dialog.c (simple helper function, static).
+(Second half of fix for bug #237308 .)
+---
+ gnome-panel/panel-run-dialog.c | 135 ++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 133 insertions(+), 2 deletions(-)
+
+diff --git a/gnome-panel/panel-run-dialog.c b/gnome-panel/panel-run-dialog.c
+index 801b9bc..faf3d7e 100644
+--- a/gnome-panel/panel-run-dialog.c
++++ b/gnome-panel/panel-run-dialog.c
+@@ -25,6 +25,7 @@
+ * Havoc Pennington <hp@pobox.com>
+ * George Lebl <jirka@5z.com>
+ * Mark McLoughlin <mark@skynet.ie>
++ * Tom Tromey (Copyright (C) 1998)
+ */
+
+ #include <config.h>
+@@ -42,8 +43,6 @@
+ #include <gdk/gdkkeysyms.h>
+ #include <gmenu-tree.h>
+
+-#include <libgnome-desktop/gnome-desktop-utils.h>
+-
+ #include <libpanel-util/panel-error.h>
+ #include <libpanel-util/panel-glib.h>
+ #include <libpanel-util/panel-gtk.h>
+@@ -335,6 +334,138 @@ dummy_child_watch (GPid pid,
+ */
+ }
+
++
++/**
++ * gnome_desktop_prepend_terminal_to_vector:
++ * @argc: a pointer to the vector size
++ * @argv: a pointer to the vector
++ *
++ * Description: Prepends a terminal (either the one configured as default in
++ * the user's GNOME setup, or one of the common xterm emulators) to the passed
++ * in vector, modifying it in the process. The vector should be allocated with
++ * #g_malloc, as this will #g_free the original vector. Also all elements must
++ * have been allocated separately. That is the standard glib/GNOME way of
++ * doing vectors however. If the integer that @argc points to is negative, the
++ * size will first be computed. Also note that passing in pointers to a vector
++ * that is empty, will just create a new vector for you.
++ **/
++static void
++gnome_desktop_prepend_terminal_to_vector (int *argc, char ***argv)
++{
++#ifndef G_OS_WIN32
++ char **real_argv;
++ int real_argc;
++ int i, j;
++ char **term_argv = NULL;
++ int term_argc = 0;
++ GSettings *settings;
++
++ gchar *terminal = NULL;
++
++ char **the_argv;
++
++ g_return_if_fail (argc != NULL);
++ g_return_if_fail (argv != NULL);
++
++ // _gnome_desktop_init_i18n ();
++
++ /* sanity */
++ if(*argv == NULL)
++ *argc = 0;
++
++ the_argv = *argv;
++
++ /* compute size if not given */
++ if (*argc < 0) {
++ for (i = 0; the_argv[i] != NULL; i++)
++ ;
++ *argc = i;
++ }
++
++ settings = g_settings_new ("org.gnome.desktop.default-applications.terminal");
++ terminal = g_settings_get_string (settings, "exec");
++
++ if (terminal) {
++ gchar *command_line;
++ gchar *exec_flag;
++
++ exec_flag = g_settings_get_string (settings, "exec-arg");
++
++ if (exec_flag == NULL)
++ command_line = g_strdup (terminal);
++ else
++ command_line = g_strdup_printf ("%s %s", terminal,
++ exec_flag);
++
++ g_shell_parse_argv (command_line,
++ &term_argc,
++ &term_argv,
++ NULL /* error */);
++
++ g_free (command_line);
++ g_free (exec_flag);
++ g_free (terminal);
++ }
++
++ g_object_unref (settings);
++
++ if (term_argv == NULL) {
++ char *check;
++
++ term_argc = 2;
++ term_argv = g_new0 (char *, 3);
++
++ check = g_find_program_in_path ("gnome-terminal");
++ if (check != NULL) {
++ term_argv[0] = check;
++ /* Note that gnome-terminal takes -x and
++ * as -e in gnome-terminal is broken we use that. */
++ term_argv[1] = g_strdup ("-x");
++ } else {
++ if (check == NULL)
++ check = g_find_program_in_path ("nxterm");
++ if (check == NULL)
++ check = g_find_program_in_path ("color-xterm");
++ if (check == NULL)
++ check = g_find_program_in_path ("rxvt");
++ if (check == NULL)
++ check = g_find_program_in_path ("xterm");
++ if (check == NULL)
++ check = g_find_program_in_path ("dtterm");
++ if (check == NULL) {
++ g_warning (_("Cannot find a terminal, using "
++ "xterm, even if it may not work"));
++ check = g_strdup ("xterm");
++ }
++ term_argv[0] = check;
++ term_argv[1] = g_strdup ("-e");
++ }
++ }
++
++ real_argc = term_argc + *argc;
++ real_argv = g_new (char *, real_argc + 1);
++
++ for (i = 0; i < term_argc; i++)
++ real_argv[i] = term_argv[i];
++
++ for (j = 0; j < *argc; j++, i++)
++ real_argv[i] = (char *)the_argv[j];
++
++ real_argv[i] = NULL;
++
++ g_free (*argv);
++ *argv = real_argv;
++ *argc = real_argc;
++
++ /* we use g_free here as we sucked all the inner strings
++ * out from it into real_argv */
++ g_free (term_argv);
++#else
++ /* FIXME: Implement when needed */
++ g_warning ("gnome_prepend_terminal_to_vector: Not implemented");
++#endif
++}
++
+ static gboolean
+ panel_run_dialog_launch_command (PanelRunDialog *dialog,
+ const char *command,
+--
+1.8.2
+
--- /dev/null
+From 44eba7db43b227d9b15a2d64d0af97167522891d Mon Sep 17 00:00:00 2001
+From: Philipp Kaluza <phk@src.gnome.org>
+Date: Fri, 8 Mar 2013 18:48:04 +0100
+Subject: [PATCH 6/6] panel-run-dialog: rename helper function
+
+that I resurrected earlier from gnome_desktop_prepend_terminal_to_vector
+to panel_run_dialog_prepend_terminal_to_vector (use proper namespace).
+---
+ gnome-panel/panel-run-dialog.c | 14 ++++----------
+ 1 file changed, 4 insertions(+), 10 deletions(-)
+
+diff --git a/gnome-panel/panel-run-dialog.c b/gnome-panel/panel-run-dialog.c
+index faf3d7e..d89ac06 100644
+--- a/gnome-panel/panel-run-dialog.c
++++ b/gnome-panel/panel-run-dialog.c
+@@ -336,7 +336,7 @@ dummy_child_watch (GPid pid,
+
+
+ /**
+- * gnome_desktop_prepend_terminal_to_vector:
++ * panel_run_dialog_prepend_terminal_to_vector:
+ * @argc: a pointer to the vector size
+ * @argv: a pointer to the vector
+ *
+@@ -349,10 +349,10 @@ dummy_child_watch (GPid pid,
+ * size will first be computed. Also note that passing in pointers to a vector
+ * that is empty, will just create a new vector for you.
+ **/
++/* TODO: throw out this function if there ever is a proper GAppInfo port */
+ static void
+-gnome_desktop_prepend_terminal_to_vector (int *argc, char ***argv)
++panel_run_dialog_prepend_terminal_to_vector (int *argc, char ***argv)
+ {
+-#ifndef G_OS_WIN32
+ char **real_argv;
+ int real_argc;
+ int i, j;
+@@ -367,8 +367,6 @@ gnome_desktop_prepend_terminal_to_vector (int *argc, char ***argv)
+ g_return_if_fail (argc != NULL);
+ g_return_if_fail (argv != NULL);
+
+- // _gnome_desktop_init_i18n ();
+-
+ /* sanity */
+ if(*argv == NULL)
+ *argc = 0;
+@@ -460,10 +458,6 @@ gnome_desktop_prepend_terminal_to_vector (int *argc, char ***argv)
+ /* we use g_free here as we sucked all the inner strings
+ * out from it into real_argv */
+ g_free (term_argv);
+-#else
+- /* FIXME: Implement when needed */
+- g_warning ("gnome_prepend_terminal_to_vector: Not implemented");
+-#endif
+ }
+
+ static gboolean
+@@ -485,7 +479,7 @@ panel_run_dialog_launch_command (PanelRunDialog *dialog,
+ screen = gtk_window_get_screen (GTK_WINDOW (dialog->run_dialog));
+
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->terminal_checkbox)))
+- gnome_desktop_prepend_terminal_to_vector (&argc, &argv);
++ panel_run_dialog_prepend_terminal_to_vector (&argc, &argv);
+
+ display = gdk_screen_make_display_name (screen);
+
+--
+1.8.2
+
--- /dev/null
+From 1798ac8390d35824d98f716736647ff03ea151b3 Mon Sep 17 00:00:00 2001
+From: "Jasper St. Pierre" <jstpierre@mecheye.net>
+Date: Thu, 3 Jan 2013 21:58:47 -0500
+Subject: [PATCH] notification_area: Use the generic marshaller
+
+The copy/paste code in gnome-shell has this change, so
+make it here too as well.
+---
+ applets/notification_area/Makefile.am | 14 +-------------
+ applets/notification_area/fixedtip.c | 3 +--
+ applets/notification_area/na-marshal.list | 3 ---
+ applets/notification_area/na-tray-manager.c | 17 +++++------------
+ 4 files changed, 7 insertions(+), 30 deletions(-)
+ delete mode 100644 applets/notification_area/na-marshal.list
+
+diff --git a/applets/notification_area/Makefile.am b/applets/notification_area/Makefile.am
+index 9734536..355737e 100644
+--- a/applets/notification_area/Makefile.am
++++ b/applets/notification_area/Makefile.am
+@@ -17,8 +17,6 @@ AM_CFLAGS = $(WARN_CFLAGS)
+ libtray_la_SOURCES = \
+ fixedtip.h \
+ fixedtip.c \
+- na-marshal.c \
+- na-marshal.h \
+ na-tray.c \
+ na-tray.h \
+ na-tray-child.c \
+@@ -61,15 +59,6 @@ notification_area_applet_LDADD = $(NOTIFICATION_AREA_LDADD)
+ notification_area_applet_CFLAGS = $(AM_CFLAGS)
+ endif
+
+-na-marshal.h: na-marshal.list $(GLIB_GENMARSHAL)
+- $(AM_V_GEN)$(GLIB_GENMARSHAL) $< --header --prefix=_na_marshal > $@
+-
+-na-marshal.c: na-marshal.list $(GLIB_GENMARSHAL)
+- $(AM_V_GEN)echo "#include \"na-marshal.h\"" > $@ && \
+- $(GLIB_GENMARSHAL) $< --body --prefix=_na_marshal >> $@
+-
+-BUILT_SOURCES = na-marshal.c na-marshal.h
+-
+ appletdir = $(appletsdir)
+ applet_in_files = org.gnome.panel.NotificationAreaApplet.panel-applet.in
+ applet_DATA = $(applet_in_files:.panel-applet.in=.panel-applet)
+@@ -97,8 +86,7 @@ endif
+ EXTRA_DIST = \
+ org.gnome.panel.NotificationAreaApplet.panel-applet.in.in \
+ $(ui_DATA) \
+- $(service_in_files) \
+- na-marshal.list
++ $(service_in_files)
+
+ CLEANFILES = \
+ $(applet_DATA) \
+diff --git a/applets/notification_area/fixedtip.c b/applets/notification_area/fixedtip.c
+index 0e3c217..861e4ab 100644
+--- a/applets/notification_area/fixedtip.c
++++ b/applets/notification_area/fixedtip.c
+@@ -91,8 +91,7 @@ na_fixed_tip_class_init (NaFixedTipClass *class)
+ G_OBJECT_CLASS_TYPE (class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NaFixedTipClass, clicked),
+- NULL, NULL,
+- g_cclosure_marshal_VOID__VOID,
++ NULL, NULL, NULL,
+ G_TYPE_NONE, 0);
+
+ g_type_class_add_private (class, sizeof (NaFixedTipPrivate));
+diff --git a/applets/notification_area/na-marshal.list b/applets/notification_area/na-marshal.list
+deleted file mode 100644
+index e3fc399..0000000
+--- a/applets/notification_area/na-marshal.list
++++ /dev/null
+@@ -1,3 +0,0 @@
+-VOID:OBJECT,OBJECT
+-VOID:OBJECT,STRING,LONG,LONG
+-VOID:OBJECT,LONG
+diff --git a/applets/notification_area/na-tray-manager.c b/applets/notification_area/na-tray-manager.c
+index da98f00..8999350 100644
+--- a/applets/notification_area/na-tray-manager.c
++++ b/applets/notification_area/na-tray-manager.c
+@@ -34,8 +34,6 @@
+ #endif
+ #include <gtk/gtk.h>
+
+-#include "na-marshal.h"
+-
+ /* Signals */
+ enum
+ {
+@@ -146,8 +144,7 @@ na_tray_manager_class_init (NaTrayManagerClass *klass)
+ G_OBJECT_CLASS_TYPE (klass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NaTrayManagerClass, tray_icon_added),
+- NULL, NULL,
+- g_cclosure_marshal_VOID__OBJECT,
++ NULL, NULL, NULL,
+ G_TYPE_NONE, 1,
+ GTK_TYPE_SOCKET);
+
+@@ -156,8 +153,7 @@ na_tray_manager_class_init (NaTrayManagerClass *klass)
+ G_OBJECT_CLASS_TYPE (klass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NaTrayManagerClass, tray_icon_removed),
+- NULL, NULL,
+- g_cclosure_marshal_VOID__OBJECT,
++ NULL, NULL, NULL,
+ G_TYPE_NONE, 1,
+ GTK_TYPE_SOCKET);
+ manager_signals[MESSAGE_SENT] =
+@@ -165,8 +161,7 @@ na_tray_manager_class_init (NaTrayManagerClass *klass)
+ G_OBJECT_CLASS_TYPE (klass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NaTrayManagerClass, message_sent),
+- NULL, NULL,
+- _na_marshal_VOID__OBJECT_STRING_LONG_LONG,
++ NULL, NULL, NULL,
+ G_TYPE_NONE, 4,
+ GTK_TYPE_SOCKET,
+ G_TYPE_STRING,
+@@ -177,8 +172,7 @@ na_tray_manager_class_init (NaTrayManagerClass *klass)
+ G_OBJECT_CLASS_TYPE (klass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NaTrayManagerClass, message_cancelled),
+- NULL, NULL,
+- _na_marshal_VOID__OBJECT_LONG,
++ NULL, NULL, NULL,
+ G_TYPE_NONE, 2,
+ GTK_TYPE_SOCKET,
+ G_TYPE_LONG);
+@@ -187,8 +181,7 @@ na_tray_manager_class_init (NaTrayManagerClass *klass)
+ G_OBJECT_CLASS_TYPE (klass),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (NaTrayManagerClass, lost_selection),
+- NULL, NULL,
+- g_cclosure_marshal_VOID__VOID,
++ NULL, NULL, NULL,
+ G_TYPE_NONE, 0);
+
+ #if defined (GDK_WINDOWING_X11)
+--
+1.8.2
+
Summary(pl.UTF-8): Podstawowe programy środowiska graficznego GNOME
Name: gnome-panel
Version: 3.6.2
-Release: 3
+Release: 4
License: LGPL v2+ (library), GPL v2+ (the rest)
Group: X11/Applications
Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/3.6/%{name}-%{version}.tar.xz
# Source0-md5: f394ad73babbce95fd0bb65ec6fd3519
Patch0: am.patch
+Patch1: 0001-panel-Fix-launcher-icon-animation-ending-with-black-.patch
+Patch2: 0002-fix-build-error-due-to-missing-gweather-xml.h.patch
+Patch3: 0003-na-apply-style-after-realize.patch
+Patch4: 0004-drop-support-for-commandline-based-calendar-tasks-ap.patch
+Patch5: 0005-panel-run-dialog-resurrect-function-gnome_desktop_pr.patch
+Patch6: 0006-panel-run-dialog-rename-helper-function.patch
+Patch7: 0007-notification_area-Use-the-generic-marshaller.patch
URL: http://www.gnome.org/
BuildRequires: GConf2-devel >= 2.26.0
BuildRequires: NetworkManager-devel >= 0.6
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
# short circuit stopper (fix me!)
mv ChangeLog main-ChangeLog
projects / packages / gnome-panel.git / commitdiff