[Xfce4-commits] [apps/xfce4-screensaver] 02/05: code cleanup

[noreply at xfce.org]

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

b   l   u   e   s   a   b   r   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository apps/xfce4-screensaver.

commit acce1cb5b29b1b8007cd18b71f4bb5548c7a04d7
Author: Alexander Butenko <a.butenka at gmail.com>
Date:   Mon Jul 8 05:15:57 2019 -0400

    code cleanup
    
    Signed-off-by: Sean Davis <smd.seandavis at gmail.com>
---
 src/gs-manager.c    | 11 -----------
 src/gs-window-x11.c | 15 +--------------
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/src/gs-manager.c b/src/gs-manager.c
index 9a6ca67..a0a4036 100644
--- a/src/gs-manager.c
+++ b/src/gs-manager.c
@@ -37,7 +37,6 @@
 #include "gs-manager.h"
 #include "gs-prefs.h"
 #include "gs-window.h"
-#include "xfce-bg.h"
 
 static void gs_manager_class_init (GSManagerClass *klass);
 static void gs_manager_init       (GSManager      *manager);
@@ -47,8 +46,6 @@ struct GSManagerPrivate {
     GSList         *windows;
     GHashTable     *jobs;
 
-    XfceBG         *bg;
-
     /* Policy */
     GSPrefs         *prefs;
     guint           throttled : 1;
@@ -563,12 +560,8 @@ gs_manager_init (GSManager *manager) {
 
     manager->priv->grab = gs_grab_new ();
 
-    manager->priv->bg = xfce_bg_new ();
-
     manager->priv->prefs = gs_prefs_new();
 
-    xfce_bg_load_from_preferences (manager->priv->bg, NULL);
-
     add_deepsleep_idle(manager);
 }
 
@@ -1038,10 +1031,6 @@ gs_manager_finalize (GObject *object) {
 
     g_return_if_fail (manager->priv != NULL);
 
-    if (manager->priv->bg != NULL) {
-        g_object_unref (manager->priv->bg);
-    }
-
     remove_deepsleep_idle (manager);
     remove_timers(manager);
 
diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c
index 8bf28fd..2b1de18 100644
--- a/src/gs-window-x11.c
+++ b/src/gs-window-x11.c
@@ -82,8 +82,6 @@ struct GSWindowPrivate {
     GtkWidget       *info_bar;
     GtkWidget       *info_content;
 
-    cairo_surface_t *background_surface;
-
     guint            popup_dialog_idle_id;
 
     guint            dialog_map_signal_id;
@@ -711,17 +709,9 @@ window_select_shape_events (GSWindow *window) {
 static gboolean
 gs_window_real_draw (GtkWidget *widget,
                      cairo_t   *cr) {
-    GSWindow        *window = GS_WINDOW (widget);
-    cairo_surface_t *bg_surface = window->priv->background_surface;
-
     cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
-    if (bg_surface != NULL) {
-        cairo_set_source_surface (cr, bg_surface, 0, 0);
-    } else {
-        cairo_set_source_rgb (cr, 0, 0, 0);
-    }
+    cairo_set_source_rgb (cr, 0, 0, 0);
     cairo_paint (cr);
-
     return FALSE;
 }
 
@@ -2151,9 +2141,6 @@ gs_window_finalize (GObject *object) {
 
     gs_window_dialog_finish (window);
 
-    if (window->priv->background_surface) {
-        cairo_surface_destroy (window->priv->background_surface);
-    }
     G_OBJECT_CLASS (gs_window_parent_class)->finalize (object);
 }
 

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