diff options
-rw-r--r-- | gnome-panel.spec | 9 | ||||
-rw-r--r-- | na-style-realize.patch | 47 |
2 files changed, 55 insertions, 1 deletions
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@laptop.org> - 3.6.2-5 +- Fix all-black icons in notification area + * Tue Dec 25 2012 Bruno Wolff III <bruno@wolff.to> - 3.6.2-4 - Drop gweather-xml.h include - Rebuild for multiple soname bumps 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@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 + |