[Xfce4-commits] <xfdesktop:eric/wallpaper-and-settings-improvements> Fix warnings and add workspace-changed signal

[Eric Koegel]

Updating branch refs/heads/eric/wallpaper-and-settings-improvements
         to d51fb8ba1ca31f1f66f2855c4e514b80b88b15de (commit)
       from 59921a68c40f8115460553ae69bde5bda3bc7d76 (commit)

commit d51fb8ba1ca31f1f66f2855c4e514b80b88b15de
Author: Eric Koegel <eric.koegel at gmail.com>
Date:   Sun Mar 3 16:53:06 2013 +0300

    Fix warnings and add workspace-changed signal
    
    Removed the code attempting to bind to the brightness setting since
    that functionality was removed. In xfdesktop-settings connect to the
    workspace-changed signal to properly update the image_iconview.

 settings/main.c      |    4 ++++
 src/xfce-workspace.c |    5 -----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/settings/main.c b/settings/main.c
index d0d7996..239eab1 100644
--- a/settings/main.c
+++ b/settings/main.c
@@ -1158,8 +1158,12 @@ xfdesktop_settings_dialog_setup_tabs(GtkBuilder *main_gxml,
     if(wnck_window == NULL)
         wnck_window = wnck_screen_get_active_window(wnck_screen);
 
+    /* These callbacks are for updating the image_iconview when the window
+     * moves to another monitor or workspace */
     g_signal_connect(wnck_window, "geometry-changed",
                      G_CALLBACK(cb_update_background_tab), panel);
+    g_signal_connect(wnck_window, "workspace-changed",
+                     G_CALLBACK(cb_update_background_tab), panel);
 
     /* send invalid numbers so that the update_background_tab will update everything */
     panel->monitor = -1;
diff --git a/src/xfce-workspace.c b/src/xfce-workspace.c
index 1775fe9..eeb131b 100644
--- a/src/xfce-workspace.c
+++ b/src/xfce-workspace.c
@@ -364,11 +364,6 @@ xfce_workspace_connect_backdrop_settings(XfceWorkspace *workspace,
                            G_OBJECT(backdrop), "image-style");
 
     buf[pp_len] = 0;
-    g_strlcat(buf, "brightness", sizeof(buf));
-    xfconf_g_property_bind(channel, buf, G_TYPE_INT,
-                           G_OBJECT(backdrop), "brightness");
-
-    buf[pp_len] = 0;
     g_strlcat(buf, "backdrop-cycle-enable", sizeof(buf));
     xfconf_g_property_bind(channel, buf, G_TYPE_BOOLEAN,
                            G_OBJECT(backdrop), "backdrop-cycle-enable");