← Back to branch summary

~ubuntu-branches/ubuntu/lucid/xfce4-netload-plugin/lucid

« back to all changes in this revision

Viewing changes to debian/patches/02_fix-bar-colors.patch

  • Committer: Bazaar Package Importer
  • Author(s): Lionel Le Folgoc
  • Date: 2009-05-15 22:32:02 UTC
  • mfrom: (3.1.3 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090515223202-ua8e3ia28451nzwu
Tags: 0.4.0-3ubuntu4
https://launchpad.net/bugs/67945
* Fake-sync with Debian unstable (we're already in a time distortion anyway,
  with a different orig tarball and a higher ubuntu revision...).
  - remaining Ubuntu changes:
    + debian/patches/02_fix-bar-colors.patch: fix bar colors for some theme
      engines (LP: #67945 & Xfce #1889).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/02_fix-bar-colors.patch
 
1
Index: panel-plugin/netload.c
 
2
===================================================================
 
3
--- panel-plugin/netload.c      (revision 3275)
 
4
+++ panel-plugin/netload.c      (working copy)
 
5
@@ -257,7 +257,6 @@ static void run_update (t_global_monitor
 
6
 static void monitor_set_orientation (XfcePanelPlugin *plugin, GtkOrientation orientation, 
 
7
                                      t_global_monitor *global)
 
8
 {
 
9
-    GtkRcStyle *rc;
 
10
     gint i;
 
11
 
 
12
     if (global->timeout_id)
 
13
@@ -316,19 +315,16 @@ static void monitor_set_orientation (Xfc
 
14
 
 
15
     for (i = 0; i < SUM; i++)
 
16
     {
 
17
-        rc = gtk_widget_get_modifier_style(GTK_WIDGET(global->monitor->status[i]));
 
18
-        if (!rc) 
 
19
-        {
 
20
-            rc = gtk_rc_style_new();
 
21
-        }
 
22
-        else
 
23
-        {
 
24
-            rc->color_flags[GTK_STATE_PRELIGHT] |= GTK_RC_BG;
 
25
-            rc->bg[GTK_STATE_PRELIGHT] =
 
26
-                global->monitor->options.color[i];
 
27
-        }
 
28
-
 
29
-        gtk_widget_modify_style(GTK_WIDGET(global->monitor->status[i]), rc);
 
30
+        gtk_widget_modify_bg(GTK_WIDGET(global->monitor->status[i]),
 
31
+                             GTK_STATE_PRELIGHT,
 
32
+                             &global->monitor->options.color[i]);
 
33
+        gtk_widget_modify_bg(GTK_WIDGET(global->monitor->status[i]),
 
34
+                             GTK_STATE_SELECTED,
 
35
+                             &global->monitor->options.color[i]);
 
36
+        gtk_widget_modify_base(GTK_WIDGET(global->monitor->status[i]),
 
37
+                               GTK_STATE_SELECTED,
 
38
+                               &global->monitor->options.color[i]);
 
39
+        
 
40
         gtk_widget_show(GTK_WIDGET(global->monitor->status[i]));
 
41
 
 
42
         gtk_box_pack_start(GTK_BOX(global->monitor->box),
 
43
@@ -413,7 +409,6 @@ static t_global_monitor * monitor_new(Xf
 
44
 /* ---------------------------------------------------------------------------------------------- */
 
45
 static void setup_monitor(t_global_monitor *global, gboolean supress_warnings)
 
46
 {
 
47
-    GtkRcStyle *rc;
 
48
     gint i;
 
49
 
 
50
     gtk_widget_hide(GTK_WIDGET(global->monitor->box));
 
51
@@ -423,27 +418,15 @@ static void setup_monitor(t_global_monit
 
52
 
 
53
     for (i = 0; i < SUM; i++)
 
54
     {
 
55
-        gtk_widget_hide(GTK_WIDGET(global->monitor->status[i]));
 
56
-        rc = gtk_widget_get_modifier_style(GTK_WIDGET(global->monitor->status[i]));
 
57
-        
 
58
-        if (!rc) {
 
59
-            rc = gtk_rc_style_new();
 
60
-        } else {
 
61
-            /* to free the style safely in any case */
 
62
-            gtk_rc_style_ref(rc);
 
63
-        }
 
64
-                
 
65
-        if (rc) {
 
66
-            rc->color_flags[GTK_STATE_PRELIGHT] |= GTK_RC_BG;
 
67
-            rc->color_flags[GTK_STATE_SELECTED] |= GTK_RC_BASE;
 
68
-            rc->bg[GTK_STATE_PRELIGHT] = global->monitor->options.color[i];
 
69
-            rc->base[GTK_STATE_SELECTED] = global->monitor->options.color[i];
 
70
-            
 
71
-            gtk_widget_modify_style(GTK_WIDGET(global->monitor->status[i]), rc);
 
72
-            gtk_rc_style_unref(rc);
 
73
-        }
 
74
-        
 
75
-        gtk_widget_show(GTK_WIDGET(global->monitor->status[i]));
 
76
+        gtk_widget_modify_bg(GTK_WIDGET(global->monitor->status[i]),
 
77
+                             GTK_STATE_PRELIGHT,
 
78
+                             &global->monitor->options.color[i]);
 
79
+        gtk_widget_modify_bg(GTK_WIDGET(global->monitor->status[i]),
 
80
+                             GTK_STATE_SELECTED,
 
81
+                             &global->monitor->options.color[i]);
 
82
+        gtk_widget_modify_base(GTK_WIDGET(global->monitor->status[i]),
 
83
+                               GTK_STATE_SELECTED,
 
84
+                               &global->monitor->options.color[i]);
 
85
         
 
86
         /* Maximum */
 
87
         if( global->monitor->options.auto_max )