rpms/xfce4-netload-plugin/F-11 xfce4-netload-plugin-0.4.0-fix-bar-colors.patch, NONE, 1.1 xfce4-netload-plugin.spec, 1.14, 1.15 xfce4-netload-0.4.0-asneeded.patch, 1.1, NONE

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-netload-plugin/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18992/F-11

Modified Files:
	xfce4-netload-plugin.spec 
Added Files:
	xfce4-netload-plugin-0.4.0-fix-bar-colors.patch 
Removed Files:
	xfce4-netload-0.4.0-asneeded.patch 
Log Message:
* Wed Sep 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-12
- Fix bar colors (#505214)


xfce4-netload-plugin-0.4.0-fix-bar-colors.patch:
 netload.c |   55 +++++++++++++++++++------------------------------------
 1 file changed, 19 insertions(+), 36 deletions(-)

--- NEW FILE xfce4-netload-plugin-0.4.0-fix-bar-colors.patch ---
Index: panel-plugin/netload.c
===================================================================
--- panel-plugin/netload.c	(revision 3275)
+++ panel-plugin/netload.c	(working copy)
@@ -257,7 +257,6 @@ static void run_update (t_global_monitor
 static void monitor_set_orientation (XfcePanelPlugin *plugin, GtkOrientation orientation, 
                                      t_global_monitor *global)
 {
-    GtkRcStyle *rc;
     gint i;
 
     if (global->timeout_id)
@@ -316,19 +315,16 @@ static void monitor_set_orientation (Xfc
 
     for (i = 0; i < SUM; i++)
     {
-        rc = gtk_widget_get_modifier_style(GTK_WIDGET(global->monitor->status[i]));
-        if (!rc) 
-        {
-            rc = gtk_rc_style_new();
-        }
-        else
-        {
-            rc->color_flags[GTK_STATE_PRELIGHT] |= GTK_RC_BG;
-            rc->bg[GTK_STATE_PRELIGHT] =
-                global->monitor->options.color[i];
-        }
-
-        gtk_widget_modify_style(GTK_WIDGET(global->monitor->status[i]), rc);
+        gtk_widget_modify_bg(GTK_WIDGET(global->monitor->status[i]),
+                             GTK_STATE_PRELIGHT,
+                             &global->monitor->options.color[i]);
+        gtk_widget_modify_bg(GTK_WIDGET(global->monitor->status[i]),
+                             GTK_STATE_SELECTED,
+                             &global->monitor->options.color[i]);
+        gtk_widget_modify_base(GTK_WIDGET(global->monitor->status[i]),
+                               GTK_STATE_SELECTED,
+                               &global->monitor->options.color[i]);
+        
         gtk_widget_show(GTK_WIDGET(global->monitor->status[i]));
 
         gtk_box_pack_start(GTK_BOX(global->monitor->box),
@@ -413,7 +409,6 @@ static t_global_monitor * monitor_new(Xf
 /* ---------------------------------------------------------------------------------------------- */
 static void setup_monitor(t_global_monitor *global, gboolean supress_warnings)
 {
-    GtkRcStyle *rc;
     gint i;
 
     gtk_widget_hide(GTK_WIDGET(global->monitor->box));
@@ -423,27 +418,15 @@ static void setup_monitor(t_global_monit
 
     for (i = 0; i < SUM; i++)
     {
-        gtk_widget_hide(GTK_WIDGET(global->monitor->status[i]));
-        rc = gtk_widget_get_modifier_style(GTK_WIDGET(global->monitor->status[i]));
-        
-        if (!rc) {
-            rc = gtk_rc_style_new();
-        } else {
-            /* to free the style safely in any case */
-            gtk_rc_style_ref(rc);
-        }
-                
-        if (rc) {
-            rc->color_flags[GTK_STATE_PRELIGHT] |= GTK_RC_BG;
-            rc->color_flags[GTK_STATE_SELECTED] |= GTK_RC_BASE;
-            rc->bg[GTK_STATE_PRELIGHT] = global->monitor->options.color[i];
-            rc->base[GTK_STATE_SELECTED] = global->monitor->options.color[i];
-            
-            gtk_widget_modify_style(GTK_WIDGET(global->monitor->status[i]), rc);
-            gtk_rc_style_unref(rc);
-        }
-        
-        gtk_widget_show(GTK_WIDGET(global->monitor->status[i]));
+        gtk_widget_modify_bg(GTK_WIDGET(global->monitor->status[i]),
+                             GTK_STATE_PRELIGHT,
+                             &global->monitor->options.color[i]);
+        gtk_widget_modify_bg(GTK_WIDGET(global->monitor->status[i]),
+                             GTK_STATE_SELECTED,
+                             &global->monitor->options.color[i]);
+        gtk_widget_modify_base(GTK_WIDGET(global->monitor->status[i]),
+                               GTK_STATE_SELECTED,
+                               &global->monitor->options.color[i]);
         
         /* Maximum */
         if( global->monitor->options.auto_max )


Index: xfce4-netload-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-netload-plugin/F-11/xfce4-netload-plugin.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- xfce4-netload-plugin.spec	29 Jun 2009 17:44:42 -0000	1.14
+++ xfce4-netload-plugin.spec	9 Sep 2009 17:02:11 -0000	1.15
@@ -1,13 +1,13 @@
 Name:		xfce4-netload-plugin
 Version:	0.4.0
-Release:	10%{?dist}
+Release:	12%{?dist}
 Summary:	Network-load monitor for the Xfce panel
 
 Group:		User Interface/Desktops
 License:	GPLv2
 URL:		http://goodies.xfce.org/projects/panel-plugins/%{name}
 Source0:	http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
-Patch0:		xfce4-netload-0.4.0-asneeded.patch
+Patch0:		xfce4-netload-plugin-0.4.0-fix-bar-colors.patch
 Patch1:		xfce4-netload-plugin-0.4.0-tooltip.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -20,7 +20,7 @@ A network-load monitor plugin for the Xf
 
 %prep
 %setup -q
-%patch0 -p1 -b .asneeded
+%patch0 -p0 -b .color
 %if 0%{?fedora} >= 11
 %patch1 -p1 -b .tooltip
 %endif
@@ -44,6 +44,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xfce4/panel-plugins/*.desktop
 
 %changelog
+* Wed Sep 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-12
+- Fix bar colors (#505214)
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jun 29 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.0-10
 - Bring back tooltips in GTK 2.16 with Dimitar Zhekov's patch (#508637)
 


--- xfce4-netload-0.4.0-asneeded.patch DELETED ---