=== modified file 'src/bubble.c' --- src/bubble.c 2012-07-28 18:35:57 +0000 +++ src/bubble.c 2013-04-17 21:55:57 +0000 @@ -676,12 +676,6 @@ cairo_paint (cr); cairo_set_operator (cr, CAIRO_OPERATOR_OVER); - GdkRGBA color; - gchar* color_string = NULL; - color_string = defaults_get_bubble_bg_color (d); - gdk_rgba_parse (&color, color_string); - g_free (color_string); - // Apply color tweaks NotifyHSVColor hsv_color; gtk_rgb_to_hsv (color.red, color.green, color.blue, @@ -712,16 +706,16 @@ cairo_fill (cr); cairo_set_operator (cr, CAIRO_OPERATOR_OVER); cairo_set_source_rgba (cr, - color.red, - color.green, - color.blue, + BUBBLE_BG_COLOR_R, + BUBBLE_BG_COLOR_G, + BUBBLE_BG_COLOR_B, BUBBLE_BG_COLOR_A); } else cairo_set_source_rgb (cr, - color.red, - color.green, - color.blue); + BUBBLE_BG_COLOR_R, + BUBBLE_BG_COLOR_G, + BUBBLE_BG_COLOR_B); draw_round_rect ( cr, === modified file 'src/defaults.c' --- src/defaults.c 2012-07-28 18:35:57 +0000 +++ src/defaults.c 2013-04-17 21:55:57 +0000 @@ -154,10 +154,6 @@ #define GNOME_DESKTOP_SCHEMA "org.gnome.desktop.interface" #define GSETTINGS_FONT_KEY "font-name" -/* unity settings */ -#define UNITY_SCHEMA "com.canonical.Unity" -#define GSETTINGS_AVG_BG_COL_KEY "average-bg-color" - static guint g_defaults_signals[LAST_SIGNAL] = { 0 }; /*-- internal API ------------------------------------------------------------*/ @@ -290,52 +286,6 @@ } void -defaults_refresh_bg_color_property (Defaults *self) -{ - Atom real_type; - gint result; - gint real_format; - gulong items_read; - gulong items_left; - gchar* colors; - Atom representative_colors_atom; - Display* display; - - g_return_if_fail ((self != NULL) && IS_DEFAULTS (self)); - - representative_colors_atom = gdk_x11_get_xatom_by_name ("_GNOME_BACKGROUND_REPRESENTATIVE_COLORS"); - display = gdk_x11_display_get_xdisplay (gdk_display_get_default ()); - - gdk_error_trap_push (); - result = XGetWindowProperty (display, - GDK_ROOT_WINDOW (), - representative_colors_atom, - 0L, - G_MAXLONG, - False, - XA_STRING, - &real_type, - &real_format, - &items_read, - &items_left, - (guchar **) &colors); - gdk_flush (); - gdk_error_trap_pop_ignored (); - - if (result == Success && items_read) - { - /* by treating the result as a nul-terminated string, we - * select the first colour in the list. - */ - g_object_set (self, - "bubble-bg-color", - colors, - NULL); - XFree (colors); - } -} - -void defaults_refresh_screen_dimension_properties (Defaults *self) { Atom real_type; @@ -416,7 +366,6 @@ self = DEFAULTS (gobject); defaults_refresh_screen_dimension_properties (self); - defaults_refresh_bg_color_property (self); /* grab system-wide font-face/size and DPI */ _get_font_size_dpi (self); @@ -533,7 +482,7 @@ { /* "connect" to the required GSettings schemas */ self->nosd_settings = g_settings_new (NOTIFY_OSD_SCHEMA); - self->gnome_settings = g_settings_new (GNOME_DESKTOP_SCHEMA); + self->gnome_settings = g_settings_new (GNOME_DESKTOP_SCHEMA);; g_signal_connect (self->gnome_settings, "changed", @@ -1798,8 +1747,6 @@ if (!self || !IS_DEFAULTS (self)) return NULL; - defaults_refresh_bg_color_property (self); - g_object_get (self, "bubble-bg-color", &bubble_bg_color, === modified file 'src/defaults.h' --- src/defaults.h 2012-07-28 18:35:57 +0000 +++ src/defaults.h 2013-04-17 21:55:57 +0000 @@ -252,9 +252,6 @@ defaults_get_screen_dpi (Defaults* self); void -defaults_refresh_bg_property (Defaults *self); - -void defaults_refresh_screen_dimension_properties (Defaults *self); void