[gnome-panel] remove panel_background_effective_type



commit 43942ebd18ad7da349a23d118a9f060df2f9e598
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Fri Oct 7 00:13:40 2016 +0300

    remove panel_background_effective_type

 gnome-panel/panel-background.c |   20 +++-----------------
 gnome-panel/panel-background.h |    3 ---
 2 files changed, 3 insertions(+), 20 deletions(-)
---
diff --git a/gnome-panel/panel-background.c b/gnome-panel/panel-background.c
index d7c05af..e247c95 100644
--- a/gnome-panel/panel-background.c
+++ b/gnome-panel/panel-background.c
@@ -47,7 +47,9 @@ panel_background_prepare (PanelBackground *background)
        if (!background->transformed)
                return FALSE;
 
-       effective_type = panel_background_effective_type (background);
+       effective_type = background->type;
+       if (background->type == PANEL_BACK_IMAGE && !background->composited_pattern)
+               effective_type = PANEL_BACK_NONE;
 
        switch (effective_type) {
        case PANEL_BACK_NONE:
@@ -840,19 +842,3 @@ panel_background_get_type (PanelBackground *background)
 {
        return background->type;
 }
-
-/* What are we actually rendering - e.g. if we're supposed to
- * be rendering an image, but haven't got a valid image, then
- * we're rendering the default gtk background.
- */
-PanelBackgroundType
-panel_background_effective_type (PanelBackground *background)
-{
-       PanelBackgroundType retval;
-
-       retval = background->type;
-       if (background->type == PANEL_BACK_IMAGE && !background->composited_pattern)
-               retval = PANEL_BACK_NONE;
-
-       return retval;
-}
diff --git a/gnome-panel/panel-background.h b/gnome-panel/panel-background.h
index 371ce62..7b6a4be 100644
--- a/gnome-panel/panel-background.h
+++ b/gnome-panel/panel-background.h
@@ -80,7 +80,4 @@ void  panel_background_change_region     (PanelBackground     *background,
 
 PanelBackgroundType  panel_background_get_type   (PanelBackground *background);
 
-PanelBackgroundType
-      panel_background_effective_type    (PanelBackground     *background);
-
 #endif /* __PANEL_BACKGROUND_H__ */


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]