[Xfce4-commits] [xfce/xfce4-panel] 01/02: Don't use GdkColor anymore

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

ochosi pushed a commit to branch master
in repository xfce/xfce4-panel.

commit eeafc08d8495350ded48354788366ca9646e0cea
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Fri Apr 14 23:59:19 2017 +0200

    Don't use GdkColor anymore
---
 panel/panel-application.c |  1 -
 panel/panel-base-window.c | 37 -------------------------------------
 panel/panel-window.c      |  2 +-
 3 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/panel/panel-application.c b/panel/panel-application.c
index f8c5131..54c1aa7 100644
--- a/panel/panel-application.c
+++ b/panel/panel-application.c
@@ -299,7 +299,6 @@ panel_application_xfconf_window_bindings (PanelApplication *application,
     { "leave-opacity", G_TYPE_UINT },
     { "background-style", G_TYPE_UINT },
     { "background-rgba", GDK_TYPE_RGBA },
-    { "background-color", GDK_TYPE_COLOR },
     { "background-image", G_TYPE_STRING },
     { "output-name", G_TYPE_STRING },
     { "position", G_TYPE_STRING },
diff --git a/panel/panel-base-window.c b/panel/panel-base-window.c
index 276f003..b8e29db 100644
--- a/panel/panel-base-window.c
+++ b/panel/panel-base-window.c
@@ -84,7 +84,6 @@ enum
   PROP_COMPOSITED,
   PROP_BACKGROUND_STYLE,
   PROP_BACKGROUND_RGBA,
-  PROP_BACKGROUND_COLOR,
   PROP_BACKGROUND_IMAGE
 };
 
@@ -160,13 +159,6 @@ panel_base_window_class_init (PanelBaseWindowClass *klass)
                                                        G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
   g_object_class_install_property (gobject_class,
-                                   PROP_BACKGROUND_COLOR,
-                                   g_param_spec_boxed ("background-color",
-                                                       NULL, NULL,
-                                                       GDK_TYPE_COLOR,
-                                                       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
-  g_object_class_install_property (gobject_class,
                                    PROP_BACKGROUND_IMAGE,
                                    g_param_spec_string ("background-image",
                                                         NULL, NULL,
@@ -209,7 +201,6 @@ panel_base_window_init (PanelBaseWindow *window)
   window->background_style = PANEL_BG_STYLE_NONE;
   window->background_image = NULL;
   window->background_rgba = NULL;
-  window->background_color = NULL;
 
   window->priv->css_provider = gtk_css_provider_new ();
   window->priv->enter_opacity = 1.00;
@@ -241,7 +232,6 @@ panel_base_window_get_property (GObject    *object,
   PanelBaseWindow         *window = PANEL_BASE_WINDOW (object);
   PanelBaseWindowPrivate  *priv = window->priv;
   GdkRGBA                 *rgba;
-  GdkColor                *color;
   GdkRGBA                  bg_color;
   GtkStyleContext         *ctx;
 
@@ -272,18 +262,6 @@ panel_base_window_get_property (GObject    *object,
       g_value_set_boxed (value, rgba);
       break;
 
-    case PROP_BACKGROUND_COLOR:
-      if (window->background_color != NULL)
-        color = window->background_color;
-      else
-        {
-          ctx = gtk_widget_get_style_context (GTK_WIDGET (window));
-          gtk_style_context_get_background_color (ctx, GTK_STATE_NORMAL, &bg_color);
-          color = &bg_color;
-        }
-      g_value_set_boxed (value, color);
-      break;
-
     case PROP_BACKGROUND_IMAGE:
       g_value_set_string (value, window->background_image);
       break;
@@ -380,19 +358,6 @@ panel_base_window_set_property (GObject      *object,
         }
       break;
 
-    case PROP_BACKGROUND_COLOR:
-      if (window->background_color != NULL)
-        gdk_color_free (window->background_color);
-      window->background_color = g_value_dup_boxed (value);
-
-      if (window->background_style == PANEL_BG_STYLE_COLOR)
-        {
-          gtk_widget_queue_draw (GTK_WIDGET (window));
-          panel_base_window_set_plugin_data (window,
-              panel_base_window_set_plugin_background_color);
-        }
-      break;
-
     case PROP_BACKGROUND_IMAGE:
       /* store new filename */
       g_free (window->background_image);
@@ -455,8 +420,6 @@ panel_base_window_finalize (GObject *object)
   g_free (window->background_image);
   if (window->background_rgba != NULL)
     gdk_rgba_free (window->background_rgba);
-  if (window->background_color != NULL)
-    gdk_color_free (window->background_color);
   g_object_unref (window->priv->css_provider);
 
   (*G_OBJECT_CLASS (panel_base_window_parent_class)->finalize) (object);
diff --git a/panel/panel-window.c b/panel/panel-window.c
index e719048..74d3a66 100644
--- a/panel/panel-window.c
+++ b/panel/panel-window.c
@@ -2486,7 +2486,7 @@ panel_window_set_autohide_behavior (PanelWindow *window,
   guint        i;
   const gchar *properties[] = { "enter-opacity", "leave-opacity",
                                 "borders", "background-style",
-                                "background-color",
+                                "background-rgba",
                                 "role", "screen" };
 
   panel_return_if_fail (PANEL_IS_WINDOW (window));

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.