From fc859d2f0fb7936bcf5555286e23aba676c10e76 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Thu, 29 Nov 2012 12:55:08 +0200 Subject: [background] fix indentation --- plugins/background/msd-background-manager.c | 885 ++++++++++++++-------------- 1 file changed, 441 insertions(+), 444 deletions(-) diff --git a/plugins/background/msd-background-manager.c b/plugins/background/msd-background-manager.c index 5353c94..ed778c4 100644 --- a/plugins/background/msd-background-manager.c +++ b/plugins/background/msd-background-manager.c @@ -52,563 +52,560 @@ #define MSD_BACKGROUND_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), MSD_TYPE_BACKGROUND_MANAGER, MsdBackgroundManagerPrivate)) -//class MsdBackgroundManager -//{ - struct MsdBackgroundManagerPrivate { - GSettings* bg_settings; - GSettings* caja_settings; - MateBG* bg; - guint timeout_id; +struct MsdBackgroundManagerPrivate { + GSettings* bg_settings; + GSettings* caja_settings; + MateBG* bg; + guint timeout_id; - DBusConnection* dbus_connection; - }; + DBusConnection* dbus_connection; +}; - static void - msd_background_manager_class_init (MsdBackgroundManagerClass* klass); +static void +msd_background_manager_class_init (MsdBackgroundManagerClass* klass); - static void +static void - msd_background_manager_init (MsdBackgroundManager* background_manager); +msd_background_manager_init (MsdBackgroundManager* background_manager); - static void - msd_background_manager_finalize (GObject* object); +static void +msd_background_manager_finalize (GObject* object); - G_DEFINE_TYPE(MsdBackgroundManager, msd_background_manager, G_TYPE_OBJECT) +G_DEFINE_TYPE(MsdBackgroundManager, msd_background_manager, G_TYPE_OBJECT) - static gpointer manager_object = NULL; +static gpointer manager_object = NULL; - static gboolean - caja_is_running (void) - { - Atom window_id_atom; - Window caja_xid; - Atom actual_type; - int actual_format; - unsigned long nitems; - unsigned long bytes_after; - unsigned char* data; - int retval; - Atom wmclass_atom; - gboolean running; - gint error; - - window_id_atom = XInternAtom(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), - "CAJA_DESKTOP_WINDOW_ID", True); - - if (window_id_atom == None) - { - return FALSE; - } +static gboolean +caja_is_running (void) +{ + Atom window_id_atom; + Window caja_xid; + Atom actual_type; + int actual_format; + unsigned long nitems; + unsigned long bytes_after; + unsigned char* data; + int retval; + Atom wmclass_atom; + gboolean running; + gint error; - retval = XGetWindowProperty(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), - GDK_ROOT_WINDOW(), - window_id_atom, - 0, - 1, - False, - XA_WINDOW, - &actual_type, - &actual_format, - &nitems, - &bytes_after, - &data); - - if (data != NULL) - { - caja_xid = *(Window*) data; - XFree(data); - } - else - { - return FALSE; - } + window_id_atom = XInternAtom(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), + "CAJA_DESKTOP_WINDOW_ID", True); - if (actual_type != XA_WINDOW) - { - return FALSE; - } - - if (actual_format != 32) - { - return FALSE; - } - - wmclass_atom = XInternAtom(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), "WM_CLASS", False); - - gdk_error_trap_push(); - - retval = XGetWindowProperty(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), - caja_xid, - wmclass_atom, - 0, - 24, - False, - XA_STRING, - &actual_type, - &actual_format, - &nitems, - &bytes_after, - &data); - - error = gdk_error_trap_pop(); - - if (error == BadWindow) - { - return FALSE; - } - - if (actual_type == XA_STRING && - nitems == 24 && - bytes_after == 0 && - actual_format == 8 && - data != NULL && - !strcmp((char*) data, "desktop_window") && - !strcmp((char*) data + strlen((char*) data) + 1, "Caja")) - { - running = TRUE; - } - else - { - running = FALSE; - } - - if (data != NULL) - { - XFree(data); - } + if (window_id_atom == None) + { + return FALSE; + } - return running; + retval = XGetWindowProperty(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), + GDK_ROOT_WINDOW(), + window_id_atom, + 0, + 1, + False, + XA_WINDOW, + &actual_type, + &actual_format, + &nitems, + &bytes_after, + &data); + + if (data != NULL) + { + caja_xid = *(Window*) data; + XFree(data); + } + else + { + return FALSE; } - static void - draw_background (MsdBackgroundManager* manager, - gboolean use_crossfade) + if (actual_type != XA_WINDOW) { - GdkDisplay* display; - int n_screens; - int i; + return FALSE; + } - if (caja_is_running()) - { - return; - } + if (actual_format != 32) + { + return FALSE; + } - mate_settings_profile_start(NULL); + wmclass_atom = XInternAtom(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), "WM_CLASS", False); - display = gdk_display_get_default(); - n_screens = gdk_display_get_n_screens(display); + gdk_error_trap_push(); - for (i = 0; i < n_screens; ++i) - { - GdkScreen* screen; - GdkWindow* root_window; - GdkPixmap* pixmap; - - screen = gdk_display_get_screen(display, i); - - root_window = gdk_screen_get_root_window(screen); - - pixmap = mate_bg_create_pixmap(manager->priv->bg, - root_window, - gdk_screen_get_width(screen), - gdk_screen_get_height(screen), - TRUE); - - if (use_crossfade) - { - MateBGCrossfade* fade; - - fade = mate_bg_set_pixmap_as_root_with_crossfade(screen, pixmap); - g_signal_connect(fade, - "finished", - G_CALLBACK (g_object_unref), NULL); - } - else - { - mate_bg_set_pixmap_as_root(screen, pixmap); - } - - g_object_unref(pixmap); - } + retval = XGetWindowProperty(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), + caja_xid, + wmclass_atom, + 0, + 24, + False, + XA_STRING, + &actual_type, + &actual_format, + &nitems, + &bytes_after, + &data); - mate_settings_profile_end(NULL); - } + error = gdk_error_trap_pop(); - static void - on_bg_changed (MateBG* bg, - MsdBackgroundManager* manager) + if (error == BadWindow) { - draw_background(manager, TRUE); + return FALSE; } - static void - on_bg_transitioned (MateBG* bg, - MsdBackgroundManager* manager) + if (actual_type == XA_STRING && + nitems == 24 && + bytes_after == 0 && + actual_format == 8 && + data != NULL && + !strcmp((char*) data, "desktop_window") && + !strcmp((char*) data + strlen((char*) data) + 1, "Caja")) { - draw_background(manager, FALSE); + running = TRUE; } - - static void - settings_changed_callback (GSettings* settings, - gchar* key, - MsdBackgroundManager* manager) + else { - mate_bg_load_from_preferences(manager->priv->bg); + running = FALSE; } - static void - watch_bg_preferences (MsdBackgroundManager* manager) + if (data != NULL) { - g_signal_connect (manager->priv->bg_settings, - "changed", - G_CALLBACK (settings_changed_callback), - manager); + XFree(data); } - static void - setup_bg (MsdBackgroundManager* manager) - { - g_return_if_fail(manager->priv->bg == NULL); + return running; +} - manager->priv->bg = mate_bg_new(); +static void +draw_background (MsdBackgroundManager* manager, + gboolean use_crossfade) +{ + GdkDisplay* display; + int n_screens; + int i; - /*g_signal_connect(manager->priv->bg, - "changed", - G_CALLBACK(on_bg_changed), - manager);*/ + if (caja_is_running()) + { + return; + } - /*g_signal_connect(manager->priv->bg, - "transitioned", - G_CALLBACK(on_bg_transitioned), - manager);*/ + mate_settings_profile_start(NULL); - watch_bg_preferences(manager); - mate_bg_load_from_preferences(manager->priv->bg); - } + display = gdk_display_get_default(); + n_screens = gdk_display_get_n_screens(display); - static gboolean - queue_draw_background (MsdBackgroundManager* manager) + for (i = 0; i < n_screens; ++i) { - manager->priv->timeout_id = 0; + GdkScreen* screen; + GdkWindow* root_window; + GdkPixmap* pixmap; - if (caja_is_running()) - { - return FALSE; - } + screen = gdk_display_get_screen(display, i); - setup_bg(manager); - draw_background(manager, FALSE); + root_window = gdk_screen_get_root_window(screen); - return FALSE; - } + pixmap = mate_bg_create_pixmap(manager->priv->bg, + root_window, + gdk_screen_get_width(screen), + gdk_screen_get_height(screen), + TRUE); - static DBusHandlerResult - on_bus_message (DBusConnection* connection, - DBusMessage* message, - void* user_data) - { - MsdBackgroundManager* manager = user_data; + if (use_crossfade) + { + MateBGCrossfade* fade; - if (dbus_message_is_signal(message, "org.mate.SessionManager", "SessionRunning")) + fade = mate_bg_set_pixmap_as_root_with_crossfade(screen, pixmap); + g_signal_connect(fade, + "finished", + G_CALLBACK (g_object_unref), NULL); + } + else { - /* If the session finishes then check if caja is - * running and if not, set the background. - * - * We wait a few seconds after the session is up - * because caja tells the session manager that its - * ready before it sets the background. - */ - manager->priv->timeout_id = g_timeout_add_seconds(8, - (GSourceFunc) queue_draw_background, - manager); - dbus_connection_remove_filter(connection, - on_bus_message, - manager); - - manager->priv->dbus_connection = NULL; + mate_bg_set_pixmap_as_root(screen, pixmap); } - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + g_object_unref(pixmap); } - static void - draw_background_after_session_loads (MsdBackgroundManager* manager) + mate_settings_profile_end(NULL); +} + +static void +on_bg_changed (MateBG* bg, + MsdBackgroundManager* manager) +{ + draw_background(manager, TRUE); +} + +static void +on_bg_transitioned (MateBG* bg, + MsdBackgroundManager* manager) +{ + draw_background(manager, FALSE); +} + +static void +settings_changed_callback (GSettings* settings, + gchar* key, + MsdBackgroundManager* manager) +{ + mate_bg_load_from_preferences(manager->priv->bg); +} + +static void +watch_bg_preferences (MsdBackgroundManager* manager) +{ + g_signal_connect (manager->priv->bg_settings, + "changed", + G_CALLBACK (settings_changed_callback), + manager); +} + +static void +setup_bg (MsdBackgroundManager* manager) +{ + g_return_if_fail(manager->priv->bg == NULL); + + manager->priv->bg = mate_bg_new(); + + /*g_signal_connect(manager->priv->bg, + "changed", + G_CALLBACK(on_bg_changed), + manager);*/ + + /*g_signal_connect(manager->priv->bg, + "transitioned", + G_CALLBACK(on_bg_transitioned), + manager);*/ + + watch_bg_preferences(manager); + mate_bg_load_from_preferences(manager->priv->bg); +} + +static gboolean +queue_draw_background (MsdBackgroundManager* manager) +{ + manager->priv->timeout_id = 0; + + if (caja_is_running()) { - DBusConnection* connection; + return FALSE; + } - connection = dbus_bus_get(DBUS_BUS_SESSION, NULL); + setup_bg(manager); + draw_background(manager, FALSE); - if (connection == NULL) - { - return; - } + return FALSE; +} - if (!dbus_connection_add_filter(connection, on_bus_message, manager, NULL)) - { - return; - } +static DBusHandlerResult +on_bus_message (DBusConnection* connection, + DBusMessage* message, + void* user_data) +{ + MsdBackgroundManager* manager = user_data; - manager->priv->dbus_connection = connection; + if (dbus_message_is_signal(message, "org.mate.SessionManager", "SessionRunning")) + { + /* If the session finishes then check if caja is + * running and if not, set the background. + * + * We wait a few seconds after the session is up + * because caja tells the session manager that its + * ready before it sets the background. + */ + manager->priv->timeout_id = g_timeout_add_seconds(8, + (GSourceFunc) queue_draw_background, + manager); + dbus_connection_remove_filter(connection, + on_bus_message, + manager); + + manager->priv->dbus_connection = NULL; } - static void - on_screen_size_changed (GdkScreen* screen, - MsdBackgroundManager* manager) - { - gboolean caja_show_desktop; + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; +} - caja_show_desktop = g_settings_get_boolean (manager->priv->caja_settings, - CAJA_SHOW_DESKTOP_KEY); +static void +draw_background_after_session_loads (MsdBackgroundManager* manager) +{ + DBusConnection* connection; - if (!caja_is_running() || !caja_show_desktop) - { - if (manager->priv->bg == NULL) - { - setup_bg(manager); - } + connection = dbus_bus_get(DBUS_BUS_SESSION, NULL); - draw_background(manager, FALSE); - } + if (connection == NULL) + { + return; } - static void - disconnect_screen_signals (MsdBackgroundManager* manager) + if (!dbus_connection_add_filter(connection, on_bus_message, manager, NULL)) { - GdkDisplay* display; - int i; - int n_screens; - - display = gdk_display_get_default(); - n_screens = gdk_display_get_n_screens(display); + return; + } - for (i = 0; i < n_screens; ++i) - { - GdkScreen *screen; + manager->priv->dbus_connection = connection; +} - screen = gdk_display_get_screen(display, i); +static void +on_screen_size_changed (GdkScreen* screen, + MsdBackgroundManager* manager) +{ + gboolean caja_show_desktop; - g_signal_handlers_disconnect_by_func(screen, - G_CALLBACK(on_screen_size_changed), - manager); - } - } + caja_show_desktop = g_settings_get_boolean (manager->priv->caja_settings, + CAJA_SHOW_DESKTOP_KEY); - static void - connect_screen_signals (MsdBackgroundManager* manager) + if (!caja_is_running() || !caja_show_desktop) { - GdkDisplay* display; - int i; - int n_screens; - - display = gdk_display_get_default(); - n_screens = gdk_display_get_n_screens(display); - - for (i = 0; i < n_screens; ++i) + if (manager->priv->bg == NULL) { - GdkScreen* screen; - screen = gdk_display_get_screen(display, i); - g_signal_connect(screen, - "monitors-changed", - G_CALLBACK(on_screen_size_changed), - manager); - - g_signal_connect(screen, - "size-changed", - G_CALLBACK(on_screen_size_changed), - manager); + setup_bg(manager); } + + draw_background(manager, FALSE); } +} - gboolean - msd_background_manager_start (MsdBackgroundManager* manager, - GError** error) - { - gboolean caja_show_desktop; +static void +disconnect_screen_signals (MsdBackgroundManager* manager) +{ + GdkDisplay* display; + int i; + int n_screens; - g_debug("Starting background manager"); - mate_settings_profile_start(NULL); + display = gdk_display_get_default(); + n_screens = gdk_display_get_n_screens(display); - manager->priv->bg_settings = g_settings_new (MATE_BG_SCHEMA); - manager->priv->caja_settings = g_settings_new (CAJA_SCHEMA); + for (i = 0; i < n_screens; ++i) + { + GdkScreen *screen; - /* If this is set, caja will draw the background and is - * almost definitely in our session. however, it may not be - * running yet (so is_caja_running() will fail). so, on - * startup, just don't do anything if this key is set so we - * don't waste time setting the background only to have - * caja overwrite it. - */ - caja_show_desktop = g_settings_get_boolean (manager->priv->caja_settings, - CAJA_SHOW_DESKTOP_KEY); + screen = gdk_display_get_screen(display, i); - if (!caja_show_desktop) - { - setup_bg(manager); - } - else - { - draw_background_after_session_loads(manager); - } + g_signal_handlers_disconnect_by_func(screen, + G_CALLBACK(on_screen_size_changed), + manager); + } +} - connect_screen_signals(manager); +static void +connect_screen_signals (MsdBackgroundManager* manager) +{ + GdkDisplay* display; + int i; + int n_screens; - mate_settings_profile_end(NULL); + display = gdk_display_get_default(); + n_screens = gdk_display_get_n_screens(display); - return TRUE; + for (i = 0; i < n_screens; ++i) + { + GdkScreen* screen; + screen = gdk_display_get_screen(display, i); + g_signal_connect(screen, + "monitors-changed", + G_CALLBACK(on_screen_size_changed), + manager); + + g_signal_connect(screen, + "size-changed", + G_CALLBACK(on_screen_size_changed), + manager); } - - void - msd_background_manager_stop (MsdBackgroundManager* manager) +} + +gboolean +msd_background_manager_start (MsdBackgroundManager* manager, + GError** error) +{ + gboolean caja_show_desktop; + + g_debug("Starting background manager"); + mate_settings_profile_start(NULL); + + manager->priv->bg_settings = g_settings_new (MATE_BG_SCHEMA); + manager->priv->caja_settings = g_settings_new (CAJA_SCHEMA); + + /* If this is set, caja will draw the background and is + * almost definitely in our session. however, it may not be + * running yet (so is_caja_running() will fail). so, on + * startup, just don't do anything if this key is set so we + * don't waste time setting the background only to have + * caja overwrite it. + */ + caja_show_desktop = g_settings_get_boolean (manager->priv->caja_settings, + CAJA_SHOW_DESKTOP_KEY); + + if (!caja_show_desktop) + { + setup_bg(manager); + } + else { - MsdBackgroundManagerPrivate* p = manager->priv; + draw_background_after_session_loads(manager); + } - g_debug("Stopping background manager"); + connect_screen_signals(manager); - disconnect_screen_signals(manager); + mate_settings_profile_end(NULL); - if (manager->priv->dbus_connection != NULL) - { - dbus_connection_remove_filter(manager->priv->dbus_connection, - on_bus_message, - manager); - } + return TRUE; +} - if (p->bg_settings != NULL) - { - g_object_unref(p->bg_settings); - p->bg_settings = NULL; - } +void +msd_background_manager_stop (MsdBackgroundManager* manager) +{ + MsdBackgroundManagerPrivate* p = manager->priv; - if (p->caja_settings != NULL) - { - g_object_unref(p->caja_settings); - p->caja_settings = NULL; - } + g_debug("Stopping background manager"); - if (p->timeout_id != 0) - { - g_source_remove(p->timeout_id); - p->timeout_id = 0; - } + disconnect_screen_signals(manager); - if (p->bg != NULL) - { - g_object_unref(p->bg); - p->bg = NULL; - } + if (manager->priv->dbus_connection != NULL) + { + dbus_connection_remove_filter(manager->priv->dbus_connection, + on_bus_message, + manager); } - static void - msd_background_manager_set_property (GObject* object, - guint prop_id, - const GValue* value, - GParamSpec* pspec) + if (p->bg_settings != NULL) { - MsdBackgroundManager* self; + g_object_unref(p->bg_settings); + p->bg_settings = NULL; + } - self = MSD_BACKGROUND_MANAGER(object); + if (p->caja_settings != NULL) + { + g_object_unref(p->caja_settings); + p->caja_settings = NULL; + } - switch (prop_id) - { - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); - break; - } + if (p->timeout_id != 0) + { + g_source_remove(p->timeout_id); + p->timeout_id = 0; } - static void - msd_background_manager_get_property (GObject* object, - guint prop_id, - GValue* value, - GParamSpec* pspec) + if (p->bg != NULL) { - MsdBackgroundManager* self; + g_object_unref(p->bg); + p->bg = NULL; + } +} - self = MSD_BACKGROUND_MANAGER(object); +static void +msd_background_manager_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec) +{ + MsdBackgroundManager* self; - switch (prop_id) - { - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); - break; - } - } + self = MSD_BACKGROUND_MANAGER(object); - static GObject* - msd_background_manager_constructor (GType type, - guint n_construct_properties, - GObjectConstructParam* construct_properties) + switch (prop_id) { - MsdBackgroundManager* background_manager; - MsdBackgroundManagerClass* klass; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + break; + } +} - klass = MSD_BACKGROUND_MANAGER_CLASS(g_type_class_peek(MSD_TYPE_BACKGROUND_MANAGER)); +static void +msd_background_manager_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec) +{ + MsdBackgroundManager* self; - background_manager = MSD_BACKGROUND_MANAGER(G_OBJECT_CLASS(msd_background_manager_parent_class)->constructor(type, - n_construct_properties, - construct_properties)); - return G_OBJECT(background_manager); - } + self = MSD_BACKGROUND_MANAGER(object); - static void - msd_background_manager_dispose (GObject* object) + switch (prop_id) { - MsdBackgroundManager* background_manager; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + break; + } +} - background_manager = MSD_BACKGROUND_MANAGER(object); +static GObject* +msd_background_manager_constructor (GType type, + guint n_construct_properties, + GObjectConstructParam* construct_properties) +{ + MsdBackgroundManager* background_manager; + MsdBackgroundManagerClass* klass; - G_OBJECT_CLASS(msd_background_manager_parent_class)->dispose(object); - } + klass = MSD_BACKGROUND_MANAGER_CLASS(g_type_class_peek(MSD_TYPE_BACKGROUND_MANAGER)); - static void - msd_background_manager_class_init (MsdBackgroundManagerClass* klass) - { - GObjectClass* object_class = G_OBJECT_CLASS(klass); + background_manager = MSD_BACKGROUND_MANAGER(G_OBJECT_CLASS(msd_background_manager_parent_class)->constructor(type, + n_construct_properties, + construct_properties)); + return G_OBJECT(background_manager); +} - object_class->get_property = msd_background_manager_get_property; - object_class->set_property = msd_background_manager_set_property; - object_class->constructor = msd_background_manager_constructor; - object_class->dispose = msd_background_manager_dispose; - object_class->finalize = msd_background_manager_finalize; +static void +msd_background_manager_dispose (GObject* object) +{ + MsdBackgroundManager* background_manager; - g_type_class_add_private(klass, sizeof(MsdBackgroundManagerPrivate)); - } + background_manager = MSD_BACKGROUND_MANAGER(object); - static void - msd_background_manager_init (MsdBackgroundManager* manager) - { - manager->priv = MSD_BACKGROUND_MANAGER_GET_PRIVATE(manager); - } + G_OBJECT_CLASS(msd_background_manager_parent_class)->dispose(object); +} - static void - msd_background_manager_finalize (GObject* object) - { - MsdBackgroundManager* background_manager; +static void +msd_background_manager_class_init (MsdBackgroundManagerClass* klass) +{ + GObjectClass* object_class = G_OBJECT_CLASS(klass); - g_return_if_fail(object != NULL); - g_return_if_fail(MSD_IS_BACKGROUND_MANAGER(object)); + object_class->get_property = msd_background_manager_get_property; + object_class->set_property = msd_background_manager_set_property; + object_class->constructor = msd_background_manager_constructor; + object_class->dispose = msd_background_manager_dispose; + object_class->finalize = msd_background_manager_finalize; - background_manager = MSD_BACKGROUND_MANAGER(object); + g_type_class_add_private(klass, sizeof(MsdBackgroundManagerPrivate)); +} - g_return_if_fail(background_manager->priv != NULL); +static void +msd_background_manager_init (MsdBackgroundManager* manager) +{ + manager->priv = MSD_BACKGROUND_MANAGER_GET_PRIVATE(manager); +} - G_OBJECT_CLASS(msd_background_manager_parent_class)->finalize(object); - } +static void +msd_background_manager_finalize (GObject* object) +{ + MsdBackgroundManager* background_manager; - MsdBackgroundManager* - msd_background_manager_new (void) - { - if (manager_object != NULL) - { - g_object_ref(manager_object); - } - else - { - manager_object = g_object_new(MSD_TYPE_BACKGROUND_MANAGER, NULL); + g_return_if_fail(object != NULL); + g_return_if_fail(MSD_IS_BACKGROUND_MANAGER(object)); - g_object_add_weak_pointer(manager_object, (gpointer*) &manager_object); - } + background_manager = MSD_BACKGROUND_MANAGER(object); + + g_return_if_fail(background_manager->priv != NULL); - return MSD_BACKGROUND_MANAGER(manager_object); + G_OBJECT_CLASS(msd_background_manager_parent_class)->finalize(object); +} + +MsdBackgroundManager* +msd_background_manager_new (void) +{ + if (manager_object != NULL) + { + g_object_ref(manager_object); } -//} + else + { + manager_object = g_object_new(MSD_TYPE_BACKGROUND_MANAGER, NULL); + + g_object_add_weak_pointer(manager_object, (gpointer*) &manager_object); + } + + return MSD_BACKGROUND_MANAGER(manager_object); +} -- cgit v1.2.1 From d143a6dab467bf9bee642752978360a85e21ef1b Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Thu, 29 Nov 2012 14:58:26 +0200 Subject: [background] Adapt to MateBG API changes, and GTK3 rendering-cleanup http://git.gnome.org/browse/gnome-settings-daemon/commit/?id=d38bb683005b71f3bf483aafee2f7c36d800a0c7 --- plugins/background/msd-background-manager.c | 32 ++++++++++++++++++----------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/plugins/background/msd-background-manager.c b/plugins/background/msd-background-manager.c index ed778c4..dfcedbe 100644 --- a/plugins/background/msd-background-manager.c +++ b/plugins/background/msd-background-manager.c @@ -47,6 +47,14 @@ #include "mate-settings-profile.h" #include "msd-background-manager.h" +#if !GTK_CHECK_VERSION(3, 0, 0) +#define cairo_surface_t GdkPixmap +#define cairo_surface_destroy g_object_unref +#define mate_bg_create_surface mate_bg_create_pixmap +#define mate_bg_set_surface_as_root mate_bg_set_pixmap_as_root +#define mate_bg_set_surface_as_root_with_crossfade mate_bg_set_pixmap_as_root_with_crossfade +#endif + #define CAJA_SCHEMA "org.mate.caja.preferences" #define CAJA_SHOW_DESKTOP_KEY "show-desktop" @@ -182,7 +190,7 @@ static void draw_background (MsdBackgroundManager* manager, gboolean use_crossfade) { - GdkDisplay* display; + GdkDisplay *display; int n_screens; int i; @@ -198,35 +206,35 @@ draw_background (MsdBackgroundManager* manager, for (i = 0; i < n_screens; ++i) { - GdkScreen* screen; - GdkWindow* root_window; - GdkPixmap* pixmap; + GdkScreen *screen; + GdkWindow *root_window; + cairo_surface_t *surface; screen = gdk_display_get_screen(display, i); root_window = gdk_screen_get_root_window(screen); - pixmap = mate_bg_create_pixmap(manager->priv->bg, - root_window, - gdk_screen_get_width(screen), - gdk_screen_get_height(screen), - TRUE); + surface = mate_bg_create_surface (manager->priv->bg, + root_window, + gdk_screen_get_width(screen), + gdk_screen_get_height(screen), + TRUE); if (use_crossfade) { MateBGCrossfade* fade; - fade = mate_bg_set_pixmap_as_root_with_crossfade(screen, pixmap); + fade = mate_bg_set_surface_as_root_with_crossfade (screen, surface); g_signal_connect(fade, "finished", G_CALLBACK (g_object_unref), NULL); } else { - mate_bg_set_pixmap_as_root(screen, pixmap); + mate_bg_set_surface_as_root (screen, surface); } - g_object_unref(pixmap); + cairo_surface_destroy (surface); } mate_settings_profile_end(NULL); -- cgit v1.2.1 From 500dbfbd3018b11f4c1b5e3237dd9daaba8b9939 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Thu, 29 Nov 2012 14:43:08 +0200 Subject: [background] review GSettings, don't rely on Caja as a key component and use new mate-bg API ("show-desktop-icons") For reference, see: Port backround module to GSettings http://git.gnome.org/browse/gnome-settings-daemon/commit/?id=23b50dfc7078b78a513598060ee22ae46c262534 http://git.gnome.org/browse/gnome-settings-daemon/commit/?id=c9d62bab8acb166aa720fa5d0356657177be6be5 background: always check if Nautilus is running http://git.gnome.org/browse/gnome-settings-daemon/commit/?id=d22b75db508a792e3786a2011b707e930a0f0355 background: reintroduce GnomeBg "changed" signal http://git.gnome.org/browse/gnome-settings-daemon/commit/?id=d7a6f707c9e6f924fea7565967d9c5c1ad8b1533 background: Listen to screen changes only after GnomeBg is constructed http://git.gnome.org/browse/gnome-settings-daemon/commit/?id=d6d12b643aeec91fa3d1ed19104f1c0d1ded7870 --- plugins/background/msd-background-manager.c | 171 ++++++++++++++-------------- 1 file changed, 85 insertions(+), 86 deletions(-) diff --git a/plugins/background/msd-background-manager.c b/plugins/background/msd-background-manager.c index dfcedbe..c255dd3 100644 --- a/plugins/background/msd-background-manager.c +++ b/plugins/background/msd-background-manager.c @@ -55,18 +55,16 @@ #define mate_bg_set_surface_as_root_with_crossfade mate_bg_set_pixmap_as_root_with_crossfade #endif -#define CAJA_SCHEMA "org.mate.caja.preferences" -#define CAJA_SHOW_DESKTOP_KEY "show-desktop" +#define MATE_BG_SHOW_DESKTOP_ICONS "show-desktop-icons" #define MSD_BACKGROUND_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), MSD_TYPE_BACKGROUND_MANAGER, MsdBackgroundManagerPrivate)) struct MsdBackgroundManagerPrivate { - GSettings* bg_settings; - GSettings* caja_settings; - MateBG* bg; + GSettings *settings; + MateBG *bg; guint timeout_id; - DBusConnection* dbus_connection; + DBusConnection *dbus_connection; }; static void @@ -79,12 +77,15 @@ msd_background_manager_init (MsdBackgroundManager* background_manager); static void msd_background_manager_finalize (GObject* object); +static void setup_bg (MsdBackgroundManager *manager); +static void connect_screen_signals (MsdBackgroundManager *manager); + G_DEFINE_TYPE(MsdBackgroundManager, msd_background_manager, G_TYPE_OBJECT) static gpointer manager_object = NULL; static gboolean -caja_is_running (void) +caja_is_drawing_background (MsdBackgroundManager *manager) { Atom window_id_atom; Window caja_xid; @@ -97,12 +98,18 @@ caja_is_running (void) Atom wmclass_atom; gboolean running; gint error; + gboolean show_desktop_icons; + + show_desktop_icons = g_settings_get_boolean (manager->priv->settings, + MATE_BG_SHOW_DESKTOP_ICONS); + if (!show_desktop_icons) { + return FALSE; + } window_id_atom = XInternAtom(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), "CAJA_DESKTOP_WINDOW_ID", True); - if (window_id_atom == None) - { + if (window_id_atom == None) { return FALSE; } @@ -187,16 +194,16 @@ caja_is_running (void) } static void -draw_background (MsdBackgroundManager* manager, +draw_background (MsdBackgroundManager *manager, gboolean use_crossfade) { GdkDisplay *display; int n_screens; int i; - if (caja_is_running()) + if (caja_is_drawing_background (manager)) { - return; + return; } mate_settings_profile_start(NULL); @@ -241,69 +248,86 @@ draw_background (MsdBackgroundManager* manager, } static void -on_bg_changed (MateBG* bg, - MsdBackgroundManager* manager) +on_bg_transitioned (MateBG *bg, + MsdBackgroundManager *manager) { - draw_background(manager, TRUE); + draw_background (manager, FALSE); } -static void -on_bg_transitioned (MateBG* bg, - MsdBackgroundManager* manager) +static gboolean +settings_change_event_idle_cb (MsdBackgroundManager *manager) +{ + mate_bg_load_from_gsettings (manager->priv->bg, + manager->priv->settings); + + return FALSE; /* remove from the list of event sources */ +} + +static gboolean +settings_change_event_cb (GSettings *settings, + gpointer keys, + gint n_keys, + MsdBackgroundManager *manager) { - draw_background(manager, FALSE); + /* Defer signal processing to avoid making the dconf backend deadlock */ + g_idle_add ((GSourceFunc) settings_change_event_idle_cb, manager); + + return FALSE; /* let the event propagate further */ } static void -settings_changed_callback (GSettings* settings, - gchar* key, - MsdBackgroundManager* manager) +on_screen_size_changed (GdkScreen *screen, + MsdBackgroundManager *manager) { - mate_bg_load_from_preferences(manager->priv->bg); + draw_background (manager, FALSE); } static void -watch_bg_preferences (MsdBackgroundManager* manager) +on_bg_changed (MateBG *bg, + MsdBackgroundManager *manager) { - g_signal_connect (manager->priv->bg_settings, - "changed", - G_CALLBACK (settings_changed_callback), - manager); + draw_background (manager, TRUE); } static void -setup_bg (MsdBackgroundManager* manager) +setup_bg (MsdBackgroundManager *manager) { - g_return_if_fail(manager->priv->bg == NULL); + g_return_if_fail (manager->priv->bg == NULL); manager->priv->bg = mate_bg_new(); - /*g_signal_connect(manager->priv->bg, - "changed", - G_CALLBACK(on_bg_changed), - manager);*/ + g_signal_connect(manager->priv->bg, + "changed", + G_CALLBACK (on_bg_changed), + manager); + + g_signal_connect(manager->priv->bg, + "transitioned", + G_CALLBACK (on_bg_transitioned), + manager); - /*g_signal_connect(manager->priv->bg, - "transitioned", - G_CALLBACK(on_bg_transitioned), - manager);*/ + connect_screen_signals (manager); - watch_bg_preferences(manager); - mate_bg_load_from_preferences(manager->priv->bg); + mate_bg_load_from_gsettings (manager->priv->bg, + manager->priv->settings); + + /* Connect to "change-event" signal to receive *groups of changes* before + * they are split out into multiple emissions of the "changed" signal. + */ + g_signal_connect (manager->priv->settings, + "change-event", + G_CALLBACK (settings_change_event_cb), + manager); } static gboolean -queue_draw_background (MsdBackgroundManager* manager) +queue_draw_background (MsdBackgroundManager *manager) { manager->priv->timeout_id = 0; - if (caja_is_running()) - { - return FALSE; - } + setup_bg (manager); - setup_bg(manager); - draw_background(manager, FALSE); + draw_background (manager, FALSE); return FALSE; } @@ -357,26 +381,6 @@ draw_background_after_session_loads (MsdBackgroundManager* manager) manager->priv->dbus_connection = connection; } -static void -on_screen_size_changed (GdkScreen* screen, - MsdBackgroundManager* manager) -{ - gboolean caja_show_desktop; - - caja_show_desktop = g_settings_get_boolean (manager->priv->caja_settings, - CAJA_SHOW_DESKTOP_KEY); - - if (!caja_is_running() || !caja_show_desktop) - { - if (manager->priv->bg == NULL) - { - setup_bg(manager); - } - - draw_background(manager, FALSE); - } -} - static void disconnect_screen_signals (MsdBackgroundManager* manager) { @@ -426,16 +430,15 @@ connect_screen_signals (MsdBackgroundManager* manager) } gboolean -msd_background_manager_start (MsdBackgroundManager* manager, - GError** error) +msd_background_manager_start (MsdBackgroundManager *manager, + GError **error) { - gboolean caja_show_desktop; + gboolean show_desktop_icons; g_debug("Starting background manager"); mate_settings_profile_start(NULL); - manager->priv->bg_settings = g_settings_new (MATE_BG_SCHEMA); - manager->priv->caja_settings = g_settings_new (CAJA_SCHEMA); + manager->priv->settings = g_settings_new (MATE_BG_SCHEMA); /* If this is set, caja will draw the background and is * almost definitely in our session. however, it may not be @@ -444,10 +447,10 @@ msd_background_manager_start (MsdBackgroundManager* manager, * don't waste time setting the background only to have * caja overwrite it. */ - caja_show_desktop = g_settings_get_boolean (manager->priv->caja_settings, - CAJA_SHOW_DESKTOP_KEY); + show_desktop_icons = g_settings_get_boolean (manager->priv->settings, + MATE_BG_SHOW_DESKTOP_ICONS); - if (!caja_show_desktop) + if (!show_desktop_icons) { setup_bg(manager); } @@ -456,15 +459,13 @@ msd_background_manager_start (MsdBackgroundManager* manager, draw_background_after_session_loads(manager); } - connect_screen_signals(manager); - mate_settings_profile_end(NULL); return TRUE; } void -msd_background_manager_stop (MsdBackgroundManager* manager) +msd_background_manager_stop (MsdBackgroundManager *manager) { MsdBackgroundManagerPrivate* p = manager->priv; @@ -479,16 +480,14 @@ msd_background_manager_stop (MsdBackgroundManager* manager) manager); } - if (p->bg_settings != NULL) - { - g_object_unref(p->bg_settings); - p->bg_settings = NULL; - } + g_signal_handlers_disconnect_by_func (manager->priv->settings, + settings_change_event_cb, + manager); - if (p->caja_settings != NULL) + if (p->settings != NULL) { - g_object_unref(p->caja_settings); - p->caja_settings = NULL; + g_object_unref(p->settings); + p->settings = NULL; } if (p->timeout_id != 0) -- cgit v1.2.1 From e070627ac87c70799a1bb21ac86836a4959b5cbb Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Thu, 29 Nov 2012 15:59:05 +0200 Subject: [background] convert to GDBus (and fix delayed background drawing) http://git.gnome.org/browse/gnome-settings-daemon/commit/?id=34d6831d7bf5fdf869f1b4802d8920c4a90825db --- plugins/background/msd-background-manager.c | 105 +++++++++++++++++----------- 1 file changed, 64 insertions(+), 41 deletions(-) diff --git a/plugins/background/msd-background-manager.c b/plugins/background/msd-background-manager.c index c255dd3..6c692b4 100644 --- a/plugins/background/msd-background-manager.c +++ b/plugins/background/msd-background-manager.c @@ -32,8 +32,6 @@ #include -#include - #include #include #include @@ -56,6 +54,8 @@ #endif #define MATE_BG_SHOW_DESKTOP_ICONS "show-desktop-icons" +#define MATE_SESSION_MANAGER_DBUS_NAME "org.mate.SessionManager" +#define MATE_SESSION_MANAGER_DBUS_PATH "/org/mate/SessionManager" #define MSD_BACKGROUND_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), MSD_TYPE_BACKGROUND_MANAGER, MsdBackgroundManagerPrivate)) @@ -64,7 +64,8 @@ struct MsdBackgroundManagerPrivate { MateBG *bg; guint timeout_id; - DBusConnection *dbus_connection; + GDBusProxy *proxy; + guint proxy_signal_id; }; static void @@ -332,53 +333,76 @@ queue_draw_background (MsdBackgroundManager *manager) return FALSE; } -static DBusHandlerResult -on_bus_message (DBusConnection* connection, - DBusMessage* message, - void* user_data) +static void +queue_timeout (MsdBackgroundManager *manager) { - MsdBackgroundManager* manager = user_data; - - if (dbus_message_is_signal(message, "org.mate.SessionManager", "SessionRunning")) - { - /* If the session finishes then check if caja is - * running and if not, set the background. - * - * We wait a few seconds after the session is up - * because caja tells the session manager that its - * ready before it sets the background. - */ - manager->priv->timeout_id = g_timeout_add_seconds(8, - (GSourceFunc) queue_draw_background, - manager); - dbus_connection_remove_filter(connection, - on_bus_message, - manager); - - manager->priv->dbus_connection = NULL; - } + if (manager->priv->timeout_id > 0) + return; - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + /* If the session finishes then check if caja is + * running and if not, set the background. + * + * We wait a few seconds after the session is up + * because caja tells the session manager that its + * ready before it sets the background. + */ + manager->priv->timeout_id = g_timeout_add_seconds(8, + (GSourceFunc) queue_draw_background, + manager); } static void -draw_background_after_session_loads (MsdBackgroundManager* manager) +disconnect_session_manager_listener (MsdBackgroundManager* manager) { - DBusConnection* connection; + if (manager->priv->proxy && manager->priv->proxy_signal_id) { + g_signal_handler_disconnect (manager->priv->proxy, + manager->priv->proxy_signal_id); + manager->priv->proxy_signal_id = 0; + } +} - connection = dbus_bus_get(DBUS_BUS_SESSION, NULL); +static void +on_session_manager_signal (GDBusProxy *proxy, + const gchar *sender_name, + const gchar *signal_name, + GVariant *parameters, + gpointer user_data) +{ + MsdBackgroundManager *manager = MSD_BACKGROUND_MANAGER (user_data); - if (connection == NULL) - { - return; + if (g_strcmp0 (signal_name, "SessionRunning") == 0) { + queue_timeout (manager); + disconnect_session_manager_listener (manager); } +} - if (!dbus_connection_add_filter(connection, on_bus_message, manager, NULL)) - { +static void +draw_background_after_session_loads (MsdBackgroundManager *manager) +{ + GError *error = NULL; + GDBusProxyFlags flags; + + flags = G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES | + G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START; + manager->priv->proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION, + flags, + NULL, /* GDBusInterfaceInfo */ + MATE_SESSION_MANAGER_DBUS_NAME, + MATE_SESSION_MANAGER_DBUS_PATH, + MATE_SESSION_MANAGER_DBUS_NAME, + NULL, /* GCancellable */ + &error); + if (manager->priv->proxy == NULL) { + g_warning ("Could not listen to session manager: %s", + error->message); + g_error_free (error); return; } - manager->priv->dbus_connection = connection; + manager->priv->proxy_signal_id = g_signal_connect (manager->priv->proxy, + "g-signal", + G_CALLBACK (on_session_manager_signal), + manager); } static void @@ -473,11 +497,10 @@ msd_background_manager_stop (MsdBackgroundManager *manager) disconnect_screen_signals(manager); - if (manager->priv->dbus_connection != NULL) + if (manager->priv->proxy) { - dbus_connection_remove_filter(manager->priv->dbus_connection, - on_bus_message, - manager); + disconnect_session_manager_listener (manager); + g_object_unref (manager->priv->proxy); } g_signal_handlers_disconnect_by_func (manager->priv->settings, -- cgit v1.2.1 From d3d2f7ef7e49cc56f96c2ea6512390393c4e1e41 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Thu, 29 Nov 2012 16:00:48 +0200 Subject: [configure] bump GIO version to 2.26 need it for g_dbus_proxy_new_for_bus_sync(), used in previous commit. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index dc4513c..77aacfb 100644 --- a/configure.ac +++ b/configure.ac @@ -49,7 +49,7 @@ dnl --------------------------------------------------------------------------- DBUS_GLIB_REQUIRED_VERSION=0.74 GLIB_REQUIRED_VERSION=2.17.3 GTK_REQUIRED_VERSION=2.21.2 -GIO_REQUIRED_VERSION=2.25.0 +GIO_REQUIRED_VERSION=2.26.0 MATE_DESKTOP_REQUIRED_VERSION=1.5.0 LIBMATENOTIFY_REQUIRED_VERSION=1.1.0 -- cgit v1.2.1 From d7ed4e67e748117787810a021c8e15a7a97fe169 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Thu, 29 Nov 2012 16:22:04 +0200 Subject: [background] stop pending fades if new ones initiated prevents some strange flicker when quickly selecting multiple backgrounds http://git.gnome.org/browse/gnome-settings-daemon/commit/?id=5cb80995b6899c6ed185797333b709ea9342de42 --- plugins/background/msd-background-manager.c | 38 +++++++++++++++++------------ 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/plugins/background/msd-background-manager.c b/plugins/background/msd-background-manager.c index 6c692b4..234dc4a 100644 --- a/plugins/background/msd-background-manager.c +++ b/plugins/background/msd-background-manager.c @@ -64,6 +64,8 @@ struct MsdBackgroundManagerPrivate { MateBG *bg; guint timeout_id; + MateBGCrossfade *fade; + GDBusProxy *proxy; guint proxy_signal_id; }; @@ -194,6 +196,13 @@ caja_is_drawing_background (MsdBackgroundManager *manager) return running; } +static void +on_crossfade_finished (MsdBackgroundManager *manager) +{ + g_object_unref (manager->priv->fade); + manager->priv->fade = NULL; +} + static void draw_background (MsdBackgroundManager *manager, gboolean use_crossfade) @@ -215,30 +224,27 @@ draw_background (MsdBackgroundManager *manager, for (i = 0; i < n_screens; ++i) { GdkScreen *screen; - GdkWindow *root_window; cairo_surface_t *surface; screen = gdk_display_get_screen(display, i); - root_window = gdk_screen_get_root_window(screen); - surface = mate_bg_create_surface (manager->priv->bg, - root_window, - gdk_screen_get_width(screen), - gdk_screen_get_height(screen), - TRUE); + gdk_screen_get_root_window (screen), + gdk_screen_get_width (screen), + gdk_screen_get_height (screen), + TRUE); if (use_crossfade) { - MateBGCrossfade* fade; - - fade = mate_bg_set_surface_as_root_with_crossfade (screen, surface); - g_signal_connect(fade, - "finished", - G_CALLBACK (g_object_unref), NULL); - } - else - { + if (manager->priv->fade != NULL) + g_object_unref (manager->priv->fade); + + manager->priv->fade = mate_bg_set_surface_as_root_with_crossfade (screen, + surface); + g_signal_connect_swapped (manager->priv->fade, "finished", + G_CALLBACK (on_crossfade_finished), + manager); + } else { mate_bg_set_surface_as_root (screen, surface); } -- cgit v1.2.1 From 000d8ecc347642bc28fb4cbbb5f2dd730f89b519 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Thu, 29 Nov 2012 16:26:53 +0200 Subject: [background] GCC 4.6 warning fixes http://git.gnome.org/browse/gnome-settings-daemon/commit/?id=da9bd9769caa0f776edf5636c6ae09ba425d6f6e --- plugins/background/msd-background-manager.c | 64 +++++++++++------------------ 1 file changed, 24 insertions(+), 40 deletions(-) diff --git a/plugins/background/msd-background-manager.c b/plugins/background/msd-background-manager.c index 234dc4a..74d257c 100644 --- a/plugins/background/msd-background-manager.c +++ b/plugins/background/msd-background-manager.c @@ -97,7 +97,6 @@ caja_is_drawing_background (MsdBackgroundManager *manager) unsigned long nitems; unsigned long bytes_after; unsigned char* data; - int retval; Atom wmclass_atom; gboolean running; gint error; @@ -116,18 +115,18 @@ caja_is_drawing_background (MsdBackgroundManager *manager) return FALSE; } - retval = XGetWindowProperty(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), - GDK_ROOT_WINDOW(), - window_id_atom, - 0, - 1, - False, - XA_WINDOW, - &actual_type, - &actual_format, - &nitems, - &bytes_after, - &data); + XGetWindowProperty (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), + GDK_ROOT_WINDOW(), + window_id_atom, + 0, + 1, + False, + XA_WINDOW, + &actual_type, + &actual_format, + &nitems, + &bytes_after, + &data); if (data != NULL) { @@ -153,18 +152,18 @@ caja_is_drawing_background (MsdBackgroundManager *manager) gdk_error_trap_push(); - retval = XGetWindowProperty(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), - caja_xid, - wmclass_atom, - 0, - 24, - False, - XA_STRING, - &actual_type, - &actual_format, - &nitems, - &bytes_after, - &data); + XGetWindowProperty (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), + caja_xid, + wmclass_atom, + 0, + 24, + False, + XA_STRING, + &actual_type, + &actual_format, + &nitems, + &bytes_after, + &data); error = gdk_error_trap_pop(); @@ -538,10 +537,6 @@ msd_background_manager_set_property (GObject* object, const GValue* value, GParamSpec* pspec) { - MsdBackgroundManager* self; - - self = MSD_BACKGROUND_MANAGER(object); - switch (prop_id) { default: @@ -556,10 +551,6 @@ msd_background_manager_get_property (GObject* object, GValue* value, GParamSpec* pspec) { - MsdBackgroundManager* self; - - self = MSD_BACKGROUND_MANAGER(object); - switch (prop_id) { default: @@ -574,9 +565,6 @@ msd_background_manager_constructor (GType type, GObjectConstructParam* construct_properties) { MsdBackgroundManager* background_manager; - MsdBackgroundManagerClass* klass; - - klass = MSD_BACKGROUND_MANAGER_CLASS(g_type_class_peek(MSD_TYPE_BACKGROUND_MANAGER)); background_manager = MSD_BACKGROUND_MANAGER(G_OBJECT_CLASS(msd_background_manager_parent_class)->constructor(type, n_construct_properties, @@ -587,10 +575,6 @@ msd_background_manager_constructor (GType type, static void msd_background_manager_dispose (GObject* object) { - MsdBackgroundManager* background_manager; - - background_manager = MSD_BACKGROUND_MANAGER(object); - G_OBJECT_CLASS(msd_background_manager_parent_class)->dispose(object); } -- cgit v1.2.1 From 4d1c861ade36250c2650f4526c375c3f6f7db73c Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Thu, 29 Nov 2012 16:32:43 +0200 Subject: [background] Don't draw the background if "draw-background" is false https://bugzilla.gnome.org/show_bug.cgi?id=564909 --- plugins/background/msd-background-manager.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/plugins/background/msd-background-manager.c b/plugins/background/msd-background-manager.c index 74d257c..40d396b 100644 --- a/plugins/background/msd-background-manager.c +++ b/plugins/background/msd-background-manager.c @@ -54,6 +54,8 @@ #endif #define MATE_BG_SHOW_DESKTOP_ICONS "show-desktop-icons" +#define MATE_BG_DRAW_BACKGROUND "draw-background" + #define MATE_SESSION_MANAGER_DBUS_NAME "org.mate.SessionManager" #define MATE_SESSION_MANAGER_DBUS_PATH "/org/mate/SessionManager" @@ -87,6 +89,13 @@ G_DEFINE_TYPE(MsdBackgroundManager, msd_background_manager, G_TYPE_OBJECT) static gpointer manager_object = NULL; +static gboolean +dont_draw_background (MsdBackgroundManager *manager) +{ + return !g_settings_get_boolean (manager->priv->settings, + MATE_BG_DRAW_BACKGROUND); +} + static gboolean caja_is_drawing_background (MsdBackgroundManager *manager) { @@ -210,7 +219,7 @@ draw_background (MsdBackgroundManager *manager, int n_screens; int i; - if (caja_is_drawing_background (manager)) + if (caja_is_drawing_background (manager) || dont_draw_background (manager)) { return; } -- cgit v1.2.1 From d4fa668e674bbf38054aa8573539892738a1815d Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Sat, 1 Dec 2012 21:24:16 +0200 Subject: [background] listen for draw-background/show-desktop-icons changed signals Because we should handle the background drawing when either: - "draw-background" is re-enabled, or - "show-desktop-icons" is disabled. N.B. We may still need to consider this issue, which was never resolved in gnome, because they stopped auto-launching nautilus & removed it from 3.0 sessions: Nautilus registers with the session before it's ready. https://bugzilla.gnome.org/show_bug.cgi?id=568588 Would also be wise to import the (recent) changes made in the bug below: Provide a singleton SessionManager proxy object https://bugzilla.gnome.org/show_bug.cgi?id=686556 --- plugins/background/msd-background-manager.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/plugins/background/msd-background-manager.c b/plugins/background/msd-background-manager.c index 40d396b..c98a225 100644 --- a/plugins/background/msd-background-manager.c +++ b/plugins/background/msd-background-manager.c @@ -340,7 +340,8 @@ queue_draw_background (MsdBackgroundManager *manager) { manager->priv->timeout_id = 0; - setup_bg (manager); + if (manager->priv->bg == NULL) + setup_bg (manager); draw_background (manager, FALSE); @@ -467,6 +468,15 @@ connect_screen_signals (MsdBackgroundManager* manager) } } +static void +background_handling_changed (GSettings *settings, + const char *key, + MsdBackgroundManager *manager) +{ + if (dont_draw_background (manager) == FALSE) + queue_timeout (manager); +} + gboolean msd_background_manager_start (MsdBackgroundManager *manager, GError **error) @@ -477,6 +487,10 @@ msd_background_manager_start (MsdBackgroundManager *manager, mate_settings_profile_start(NULL); manager->priv->settings = g_settings_new (MATE_BG_SCHEMA); + g_signal_connect (manager->priv->settings, "changed::" MATE_BG_DRAW_BACKGROUND, + G_CALLBACK (background_handling_changed), manager); + g_signal_connect (manager->priv->settings, "changed::" MATE_BG_SHOW_DESKTOP_ICONS, + G_CALLBACK (background_handling_changed), manager); /* If this is set, caja will draw the background and is * almost definitely in our session. however, it may not be -- cgit v1.2.1 From 75003d6304a61488a1737733c423fd120e4bbb48 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Mon, 3 Dec 2012 03:53:33 +0200 Subject: [background] Also check if caja is drawing bg when detecting settings changes hopefully to avoid taking over background-drawing when Caja is doing it. --- plugins/background/msd-background-manager.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/plugins/background/msd-background-manager.c b/plugins/background/msd-background-manager.c index c98a225..b347c53 100644 --- a/plugins/background/msd-background-manager.c +++ b/plugins/background/msd-background-manager.c @@ -473,8 +473,11 @@ background_handling_changed (GSettings *settings, const char *key, MsdBackgroundManager *manager) { - if (dont_draw_background (manager) == FALSE) - queue_timeout (manager); + if (!dont_draw_background (manager) && + !caja_is_drawing_background (manager)) + { + queue_timeout (manager); + } } gboolean -- cgit v1.2.1 From eff871eb46d1b0b7578f8fd9f5e31c932437cb3b Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Mon, 3 Dec 2012 06:24:47 +0200 Subject: [background] fix XGetWindowProperty long_length & nitems_return params from 24 -> 20, to account for 'nautilus' -> 'caja' change (4 bytes less). --- plugins/background/msd-background-manager.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/background/msd-background-manager.c b/plugins/background/msd-background-manager.c index b347c53..033f8a3 100644 --- a/plugins/background/msd-background-manager.c +++ b/plugins/background/msd-background-manager.c @@ -165,7 +165,7 @@ caja_is_drawing_background (MsdBackgroundManager *manager) caja_xid, wmclass_atom, 0, - 24, + 20, False, XA_STRING, &actual_type, @@ -182,7 +182,7 @@ caja_is_drawing_background (MsdBackgroundManager *manager) } if (actual_type == XA_STRING && - nitems == 24 && + nitems == 20 && bytes_after == 0 && actual_format == 8 && data != NULL && -- cgit v1.2.1