[gnome-panel] Revert "Pass the style colors along to the notification tray"

[Vincent Untz <vuntz src gnome org>]

commit 667d4da5ad4f730de3c12534ec42abbac44907f2
Author: Vincent Untz <vuntz gnome org>
Date:   Tue Feb 22 22:46:58 2011 +0100

    Revert "Pass the style colors along to the notification tray"
    
    This reverts commit ab27257717b024af7ce44b935b4199b7e42a060e.
    
    Not done the right way: we're diverging from gnome-shell here. I've done
    it the right way.

 applets/notification_area/main.c            |   23 ---------------
 applets/notification_area/na-tray-manager.c |   40 +++++++++++++-------------
 applets/notification_area/na-tray-manager.h |   16 +++++-----
 applets/notification_area/na-tray.c         |   10 +++---
 applets/notification_area/na-tray.h         |    8 +++---
 5 files changed, 37 insertions(+), 60 deletions(-)
---
diff --git a/applets/notification_area/main.c b/applets/notification_area/main.c
index b9c4690..26a72bc 100644
--- a/applets/notification_area/main.c
+++ b/applets/notification_area/main.c
@@ -107,11 +107,6 @@ on_applet_realized (GtkWidget *widget,
   NaTray         *tray;
   GtkActionGroup *action_group;
   gchar          *ui_path;
-  GtkStyleContext *context;
-  GdkRGBA          fg;
-  GdkRGBA          warning;
-  GdkRGBA          error;
-  GdkRGBA          success;
 
   applet = PANEL_APPLET (widget);
   data = g_object_get_data (G_OBJECT (widget), "system-tray-data");
@@ -121,24 +116,6 @@ on_applet_realized (GtkWidget *widget,
 
   tray = na_tray_new_for_screen (gtk_widget_get_screen (GTK_WIDGET (applet)),
                                  get_orientation_from_applet (applet));
-  context = gtk_widget_get_style_context (GTK_WIDGET (applet));
-
-  gtk_style_context_get_color (context, 0, &fg);
-
-  if (!gtk_style_context_lookup_color (context, "success_color", &success))
-    {
-      success = fg;
-    }
-  if (!gtk_style_context_lookup_color (context, "warning_color", &warning))
-    {
-      warning = fg;
-    }
-  if (!gtk_style_context_lookup_color (context, "error_color", &error))
-    {
-      error = fg;
-    }
-
-  na_tray_set_colors (tray, &fg, &error, &warning, &success);
 
   data = g_slice_new (AppletData);
   data->applet = applet;
diff --git a/applets/notification_area/na-tray-manager.c b/applets/notification_area/na-tray-manager.c
index a7a43a8..5354619 100644
--- a/applets/notification_area/na-tray-manager.c
+++ b/applets/notification_area/na-tray-manager.c
@@ -667,18 +667,18 @@ na_tray_manager_set_colors_property (NaTrayManager *manager)
   atom = gdk_x11_get_xatom_by_name_for_display (display,
                                                 "_NET_SYSTEM_TRAY_COLORS");
 
-  data[0] = manager->fg.red * 65535;
-  data[1] = manager->fg.green * 65535;
-  data[2] = manager->fg.blue * 65535;
-  data[3] = manager->error.red * 65535;
-  data[4] = manager->error.green * 65535;
-  data[5] = manager->error.blue * 65535;
-  data[6] = manager->warning.red * 65535;
-  data[7] = manager->warning.green * 65535;
-  data[8] = manager->warning.blue * 65535;
-  data[9] = manager->success.red * 65535;
-  data[10] = manager->success.green * 65535;
-  data[11] = manager->success.blue * 65535;
+  data[0] = manager->fg.red;
+  data[1] = manager->fg.green;
+  data[2] = manager->fg.blue;
+  data[3] = manager->error.red;
+  data[4] = manager->error.green;
+  data[5] = manager->error.blue;
+  data[6] = manager->warning.red;
+  data[7] = manager->warning.green;
+  data[8] = manager->warning.blue;
+  data[9] = manager->success.red;
+  data[10] = manager->success.green;
+  data[11] = manager->success.blue;
 
   XChangeProperty (GDK_DISPLAY_XDISPLAY (display),
                    GDK_WINDOW_XID (window),
@@ -871,17 +871,17 @@ na_tray_manager_set_orientation (NaTrayManager  *manager,
 
 void
 na_tray_manager_set_colors (NaTrayManager *manager,
-                            GdkRGBA       *fg,
-                            GdkRGBA       *error,
-                            GdkRGBA       *warning,
-                            GdkRGBA       *success)
+                            GdkColor      *fg,
+                            GdkColor      *error,
+                            GdkColor      *warning,
+                            GdkColor      *success)
 {
   g_return_if_fail (NA_IS_TRAY_MANAGER (manager));
 
-  if (!gdk_rgba_equal (&manager->fg, fg) ||
-      !gdk_rgba_equal (&manager->error, error) ||
-      !gdk_rgba_equal (&manager->warning, warning) ||
-      !gdk_rgba_equal (&manager->success, success))
+  if (!gdk_color_equal (&manager->fg, fg) ||
+      !gdk_color_equal (&manager->error, error) ||
+      !gdk_color_equal (&manager->warning, warning) ||
+      !gdk_color_equal (&manager->success, success))
     {
       manager->fg = *fg;
       manager->error = *error;
diff --git a/applets/notification_area/na-tray-manager.h b/applets/notification_area/na-tray-manager.h
index 2dc3f09..1350bdf 100644
--- a/applets/notification_area/na-tray-manager.h
+++ b/applets/notification_area/na-tray-manager.h
@@ -56,10 +56,10 @@ struct _NaTrayManager
   GtkWidget *invisible;
   GdkScreen *screen;
   GtkOrientation orientation;
-  GdkRGBA  fg;
-  GdkRGBA  error;
-  GdkRGBA  warning;
-  GdkRGBA  success;
+  GdkColor fg;
+  GdkColor error;
+  GdkColor warning;
+  GdkColor success;
 
   GList *messages;
   GHashTable *socket_table;
@@ -97,10 +97,10 @@ void            na_tray_manager_set_orientation (NaTrayManager      *manager,
 						 GtkOrientation      orientation);
 GtkOrientation  na_tray_manager_get_orientation (NaTrayManager      *manager);
 void            na_tray_manager_set_colors      (NaTrayManager      *manager,
-						 GdkRGBA            *fg,
-						 GdkRGBA            *error,
-						 GdkRGBA            *warning,
-						 GdkRGBA            *success);
+						 GdkColor           *fg,
+						 GdkColor           *error,
+						 GdkColor           *warning,
+						 GdkColor           *success);
 
 
 G_END_DECLS
diff --git a/applets/notification_area/na-tray.c b/applets/notification_area/na-tray.c
index cdc588c..a32a4ff 100644
--- a/applets/notification_area/na-tray.c
+++ b/applets/notification_area/na-tray.c
@@ -817,11 +817,11 @@ idle_redraw_cb (NaTray *tray)
 }
 
 void
-na_tray_set_colors (NaTray  *tray,
-                    GdkRGBA *fg,
-                    GdkRGBA *error,
-                    GdkRGBA *warning,
-                    GdkRGBA *success)
+na_tray_set_colors (NaTray   *tray,
+                    GdkColor *fg,
+                    GdkColor *error,
+                    GdkColor *warning,
+                    GdkColor *success)
 {
   NaTrayPrivate *priv = tray->priv;
 
diff --git a/applets/notification_area/na-tray.h b/applets/notification_area/na-tray.h
index 05ecb63..1a48eb0 100644
--- a/applets/notification_area/na-tray.h
+++ b/applets/notification_area/na-tray.h
@@ -61,10 +61,10 @@ void            na_tray_set_orientation	(NaTray        *tray,
 					 GtkOrientation orientation);
 GtkOrientation  na_tray_get_orientation (NaTray        *tray);
 void            na_tray_set_colors      (NaTray        *tray,
-					 GdkRGBA       *fg,
-					 GdkRGBA       *error,
-					 GdkRGBA       *warning,
-					 GdkRGBA       *success);
+					 GdkColor      *fg,
+					 GdkColor      *error,
+					 GdkColor      *warning,
+					 GdkColor      *success);
 void		na_tray_force_redraw	(NaTray        *tray);
 
 G_END_DECLS