From d22aab3682bdd800f6a6e7c2a0ef6b6cfd8ffe03 Mon Sep 17 00:00:00 2001 From: Perberos Date: Tue, 5 Jun 2012 12:19:54 -0300 Subject: changing code format (http://imageshack.us/photo/my-images/9/254223656580e542a60a.jpg/) --- plugins/background/msd-background-manager.c | 1101 ++++++++++++++------------- plugins/background/msd-background-manager.h | 59 +- plugins/background/msd-background-plugin.c | 117 +-- plugins/background/msd-background-plugin.h | 51 +- plugins/background/test-background.c | 28 +- 5 files changed, 711 insertions(+), 645 deletions(-) (limited to 'plugins') diff --git a/plugins/background/msd-background-manager.c b/plugins/background/msd-background-manager.c index 25ab7ec..6a567c5 100644 --- a/plugins/background/msd-background-manager.c +++ b/plugins/background/msd-background-manager.c @@ -51,529 +51,578 @@ #define MSD_BACKGROUND_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), MSD_TYPE_BACKGROUND_MANAGER, MsdBackgroundManagerPrivate)) -struct MsdBackgroundManagerPrivate -{ - MateConfClient *client; - MateBG *bg; - guint bg_notify_id; - guint timeout_id; - - DBusConnection *dbus_connection; -}; - -static void msd_background_manager_class_init (MsdBackgroundManagerClass *klass); -static void msd_background_manager_init (MsdBackgroundManager *background_manager); -static void msd_background_manager_finalize (GObject *object); - -G_DEFINE_TYPE (MsdBackgroundManager, msd_background_manager, G_TYPE_OBJECT) - -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; - } - - 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; - } - - 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); - } - - return running; -} - -static void -draw_background (MsdBackgroundManager *manager, - gboolean use_crossfade) -{ - GdkDisplay *display; - int n_screens; - int i; - - if (caja_is_running ()) { - return; - } - - mate_settings_profile_start (NULL); - - display = gdk_display_get_default (); - n_screens = gdk_display_get_n_screens (display); - - 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); - } - - 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 -mateconf_changed_callback (MateConfClient *client, - guint cnxn_id, - MateConfEntry *entry, - MsdBackgroundManager *manager) -{ - mate_bg_load_from_preferences (manager->priv->bg, - manager->priv->client); -} - -static void -watch_bg_preferences (MsdBackgroundManager *manager) -{ - g_assert (manager->priv->bg_notify_id == 0); - - mateconf_client_add_dir (manager->priv->client, - MATE_BG_KEY_DIR, - MATECONF_CLIENT_PRELOAD_NONE, - NULL); - manager->priv->bg_notify_id = mateconf_client_notify_add (manager->priv->client, - MATE_BG_KEY_DIR, - (MateConfClientNotifyFunc)mateconf_changed_callback, - manager, - NULL, - NULL); -} - -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, - manager->priv->client); -} - -static gboolean -queue_draw_background (MsdBackgroundManager *manager) -{ - manager->priv->timeout_id = 0; - if (caja_is_running ()) { - return FALSE; - } - setup_bg (manager); - draw_background (manager, FALSE); - return FALSE; -} - -static DBusHandlerResult -on_bus_message (DBusConnection *connection, - DBusMessage *message, - void *user_data) -{ - 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; - } - - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; -} - -static void -draw_background_after_session_loads (MsdBackgroundManager *manager) -{ - DBusConnection *connection; - - connection = dbus_bus_get (DBUS_BUS_SESSION, NULL); - - if (connection == NULL) { - return; - } - - if (!dbus_connection_add_filter (connection, on_bus_message, manager, NULL)) { - return; - }; - - manager->priv->dbus_connection = connection; -} - -static void -on_screen_size_changed (GdkScreen *screen, - MsdBackgroundManager *manager) -{ - gboolean caja_show_desktop; - - caja_show_desktop = mateconf_client_get_bool (manager->priv->client, - CAJA_SHOW_DESKTOP_KEY, - NULL); - - 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) -{ - 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) { - GdkScreen *screen; - screen = gdk_display_get_screen (display, i); - g_signal_handlers_disconnect_by_func (screen, - G_CALLBACK (on_screen_size_changed), - manager); - } -} - -static void -connect_screen_signals (MsdBackgroundManager *manager) -{ - 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) { - 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); - } -} - -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->client = mateconf_client_get_default (); - - /* 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 = mateconf_client_get_bool (manager->priv->client, - CAJA_SHOW_DESKTOP_KEY, - NULL); - - if (!caja_show_desktop) { - setup_bg (manager); - } else { - draw_background_after_session_loads (manager); - } - - connect_screen_signals (manager); - - mate_settings_profile_end (NULL); - - return TRUE; -} - -void -msd_background_manager_stop (MsdBackgroundManager *manager) -{ - MsdBackgroundManagerPrivate *p = manager->priv; - - g_debug ("Stopping background manager"); - - disconnect_screen_signals (manager); - - if (manager->priv->dbus_connection != NULL) { - dbus_connection_remove_filter (manager->priv->dbus_connection, - on_bus_message, - manager); - } - - if (manager->priv->bg_notify_id != 0) { - mateconf_client_remove_dir (manager->priv->client, - MATE_BG_KEY_DIR, - NULL); - mateconf_client_notify_remove (manager->priv->client, - manager->priv->bg_notify_id); - manager->priv->bg_notify_id = 0; - } - - if (p->client != NULL) { - g_object_unref (p->client); - p->client = NULL; - } - - if (p->timeout_id != 0) { - g_source_remove (p->timeout_id); - p->timeout_id = 0; - } - - if (p->bg != NULL) { - g_object_unref (p->bg); - p->bg = NULL; - } -} - -static void -msd_background_manager_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) -{ - MsdBackgroundManager *self; - - self = MSD_BACKGROUND_MANAGER (object); - - switch (prop_id) { - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -msd_background_manager_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ - MsdBackgroundManager *self; - - self = MSD_BACKGROUND_MANAGER (object); - - switch (prop_id) { - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static GObject * -msd_background_manager_constructor (GType type, - guint n_construct_properties, - 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, - construct_properties)); - - return G_OBJECT (background_manager); -} - -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); -} - -static void -msd_background_manager_class_init (MsdBackgroundManagerClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - 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; - - g_type_class_add_private (klass, sizeof (MsdBackgroundManagerPrivate)); -} - -static void -msd_background_manager_init (MsdBackgroundManager *manager) -{ - manager->priv = MSD_BACKGROUND_MANAGER_GET_PRIVATE (manager); -} - -static void -msd_background_manager_finalize (GObject *object) -{ - MsdBackgroundManager *background_manager; - - g_return_if_fail (object != NULL); - g_return_if_fail (MSD_IS_BACKGROUND_MANAGER (object)); - - background_manager = MSD_BACKGROUND_MANAGER (object); - - g_return_if_fail (background_manager->priv != NULL); - - 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); -} +//class MsdBackgroundManager +//{ + struct MsdBackgroundManagerPrivate { + MateConfClient* client; + MateBG* bg; + guint bg_notify_id; + guint timeout_id; + + DBusConnection* dbus_connection; + }; + + static void + msd_background_manager_class_init (MsdBackgroundManagerClass* klass); + + static void + + msd_background_manager_init (MsdBackgroundManager* background_manager); + + static void + msd_background_manager_finalize (GObject* object); + + G_DEFINE_TYPE(MsdBackgroundManager, msd_background_manager, G_TYPE_OBJECT) + + 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; + } + + 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; + } + + 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); + } + + return running; + } + + static void + draw_background (MsdBackgroundManager* manager, + gboolean use_crossfade) + { + GdkDisplay* display; + int n_screens; + int i; + + if (caja_is_running()) + { + return; + } + + mate_settings_profile_start(NULL); + + display = gdk_display_get_default(); + n_screens = gdk_display_get_n_screens(display); + + 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); + } + + 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 + mateconf_changed_callback (MateConfClient* client, + guint cnxn_id, + MateConfEntry* entry, + MsdBackgroundManager* manager) + { + mate_bg_load_from_preferences(manager->priv->bg, + manager->priv->client); + } + + static void + watch_bg_preferences (MsdBackgroundManager* manager) + { + g_assert(manager->priv->bg_notify_id == 0); + + mateconf_client_add_dir(manager->priv->client, + MATE_BG_KEY_DIR, + MATECONF_CLIENT_PRELOAD_NONE, + NULL); + + manager->priv->bg_notify_id = mateconf_client_notify_add(manager->priv->client, + MATE_BG_KEY_DIR, + (MateConfClientNotifyFunc)mateconf_changed_callback, + manager, + NULL, + NULL); + } + + 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, manager->priv->client); + } + + static gboolean + queue_draw_background (MsdBackgroundManager* manager) + { + manager->priv->timeout_id = 0; + + if (caja_is_running()) + { + return FALSE; + } + + setup_bg(manager); + draw_background(manager, FALSE); + + return FALSE; + } + + static DBusHandlerResult + on_bus_message (DBusConnection* connection, + DBusMessage* message, + void* user_data) + { + 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; + } + + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + } + + static void + draw_background_after_session_loads (MsdBackgroundManager* manager) + { + DBusConnection* connection; + + connection = dbus_bus_get(DBUS_BUS_SESSION, NULL); + + if (connection == NULL) + { + return; + } + + if (!dbus_connection_add_filter(connection, on_bus_message, manager, NULL)) + { + return; + } + + manager->priv->dbus_connection = connection; + } + + static void + on_screen_size_changed (GdkScreen* screen, + MsdBackgroundManager* manager) + { + gboolean caja_show_desktop; + + caja_show_desktop = mateconf_client_get_bool(manager->priv->client, + CAJA_SHOW_DESKTOP_KEY, + NULL); + + 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) + { + 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) + { + GdkScreen *screen; + + screen = gdk_display_get_screen(display, i); + + g_signal_handlers_disconnect_by_func(screen, + G_CALLBACK(on_screen_size_changed), + manager); + } + } + + static void + connect_screen_signals (MsdBackgroundManager* manager) + { + 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) + { + 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); + } + } + + 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->client = mateconf_client_get_default(); + + /* 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 = mateconf_client_get_bool(manager->priv->client, + CAJA_SHOW_DESKTOP_KEY, + NULL); + + if (!caja_show_desktop) + { + setup_bg(manager); + } + else + { + draw_background_after_session_loads(manager); + } + + connect_screen_signals(manager); + + mate_settings_profile_end(NULL); + + return TRUE; + } + + void + msd_background_manager_stop (MsdBackgroundManager* manager) + { + MsdBackgroundManagerPrivate* p = manager->priv; + + g_debug("Stopping background manager"); + + disconnect_screen_signals(manager); + + if (manager->priv->dbus_connection != NULL) + { + dbus_connection_remove_filter(manager->priv->dbus_connection, + on_bus_message, + manager); + } + + if (manager->priv->bg_notify_id != 0) + { + mateconf_client_remove_dir(manager->priv->client, + MATE_BG_KEY_DIR, + NULL); + mateconf_client_notify_remove(manager->priv->client, + manager->priv->bg_notify_id); + manager->priv->bg_notify_id = 0; + } + + if (p->client != NULL) + { + g_object_unref(p->client); + p->client = NULL; + } + + if (p->timeout_id != 0) + { + g_source_remove(p->timeout_id); + p->timeout_id = 0; + } + + if (p->bg != NULL) + { + g_object_unref(p->bg); + p->bg = NULL; + } + } + + static void + msd_background_manager_set_property (GObject* object, + guint prop_id, + const GValue* value, + GParamSpec* pspec) + { + MsdBackgroundManager* self; + + self = MSD_BACKGROUND_MANAGER(object); + + switch (prop_id) + { + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + break; + } + } + + static void + msd_background_manager_get_property (GObject* object, + guint prop_id, + GValue* value, + GParamSpec* pspec) + { + MsdBackgroundManager* self; + + self = MSD_BACKGROUND_MANAGER(object); + + switch (prop_id) + { + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + break; + } + } + + static GObject* + msd_background_manager_constructor (GType type, + guint n_construct_properties, + 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, + construct_properties)); + return G_OBJECT(background_manager); + } + + 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); + } + + static void + msd_background_manager_class_init (MsdBackgroundManagerClass* klass) + { + GObjectClass* object_class = G_OBJECT_CLASS(klass); + + 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; + + g_type_class_add_private(klass, sizeof(MsdBackgroundManagerPrivate)); + } + + static void + msd_background_manager_init (MsdBackgroundManager* manager) + { + manager->priv = MSD_BACKGROUND_MANAGER_GET_PRIVATE(manager); + } + + static void + msd_background_manager_finalize (GObject* object) + { + MsdBackgroundManager* background_manager; + + g_return_if_fail(object != NULL); + g_return_if_fail(MSD_IS_BACKGROUND_MANAGER(object)); + + background_manager = MSD_BACKGROUND_MANAGER(object); + + g_return_if_fail(background_manager->priv != NULL); + + 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); + } +//} diff --git a/plugins/background/msd-background-manager.h b/plugins/background/msd-background-manager.h index 91e232c..e935a89 100644 --- a/plugins/background/msd-background-manager.h +++ b/plugins/background/msd-background-manager.h @@ -27,32 +27,39 @@ extern "C" { #endif -#define MSD_TYPE_BACKGROUND_MANAGER (msd_background_manager_get_type ()) -#define MSD_BACKGROUND_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), MSD_TYPE_BACKGROUND_MANAGER, MsdBackgroundManager)) -#define MSD_BACKGROUND_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), MSD_TYPE_BACKGROUND_MANAGER, MsdBackgroundManagerClass)) -#define MSD_IS_BACKGROUND_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), MSD_TYPE_BACKGROUND_MANAGER)) -#define MSD_IS_BACKGROUND_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), MSD_TYPE_BACKGROUND_MANAGER)) -#define MSD_BACKGROUND_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), MSD_TYPE_BACKGROUND_MANAGER, MsdBackgroundManagerClass)) - -typedef struct MsdBackgroundManagerPrivate MsdBackgroundManagerPrivate; - -typedef struct -{ - GObject parent; - MsdBackgroundManagerPrivate *priv; -} MsdBackgroundManager; - -typedef struct -{ - GObjectClass parent_class; -} MsdBackgroundManagerClass; - -GType msd_background_manager_get_type (void); - -MsdBackgroundManager * msd_background_manager_new (void); -gboolean msd_background_manager_start (MsdBackgroundManager *manager, - GError **error); -void msd_background_manager_stop (MsdBackgroundManager *manager); +//class MsdBackgroundManager +//{ + #define MSD_TYPE_BACKGROUND_MANAGER (msd_background_manager_get_type()) + #define MSD_BACKGROUND_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST((o), MSD_TYPE_BACKGROUND_MANAGER, MsdBackgroundManager)) + #define MSD_BACKGROUND_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), MSD_TYPE_BACKGROUND_MANAGER, MsdBackgroundManagerClass)) + #define MSD_IS_BACKGROUND_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), MSD_TYPE_BACKGROUND_MANAGER)) + #define MSD_IS_BACKGROUND_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), MSD_TYPE_BACKGROUND_MANAGER)) + #define MSD_BACKGROUND_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), MSD_TYPE_BACKGROUND_MANAGER, MsdBackgroundManagerClass)) + + typedef struct MsdBackgroundManagerPrivate MsdBackgroundManagerPrivate; + + typedef struct { + GObject parent; + MsdBackgroundManagerPrivate* priv; + } MsdBackgroundManager; + + typedef struct { + GObjectClass parent_class; + } MsdBackgroundManagerClass; + + GType + msd_background_manager_get_type (void); + + MsdBackgroundManager* + msd_background_manager_new (void); + + gboolean + msd_background_manager_start (MsdBackgroundManager* manager, + GError** error); + + void + msd_background_manager_stop (MsdBackgroundManager* manager); +//} #ifdef __cplusplus } diff --git a/plugins/background/msd-background-plugin.c b/plugins/background/msd-background-plugin.c index d12bb2b..924759b 100644 --- a/plugins/background/msd-background-plugin.c +++ b/plugins/background/msd-background-plugin.c @@ -27,78 +27,85 @@ #include "msd-background-plugin.h" #include "msd-background-manager.h" -struct MsdBackgroundPluginPrivate { - MsdBackgroundManager *manager; -}; +//class MsdBackgroundPlugin +//{ + struct MsdBackgroundPluginPrivate { + MsdBackgroundManager* manager; + }; -#define MSD_BACKGROUND_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), MSD_TYPE_BACKGROUND_PLUGIN, MsdBackgroundPluginPrivate)) + #define MSD_BACKGROUND_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE((object), MSD_TYPE_BACKGROUND_PLUGIN, MsdBackgroundPluginPrivate)) -MATE_SETTINGS_PLUGIN_REGISTER (MsdBackgroundPlugin, msd_background_plugin) + MATE_SETTINGS_PLUGIN_REGISTER(MsdBackgroundPlugin, msd_background_plugin) -static void -msd_background_plugin_init (MsdBackgroundPlugin *plugin) -{ - plugin->priv = MSD_BACKGROUND_PLUGIN_GET_PRIVATE (plugin); + static void + msd_background_plugin_init (MsdBackgroundPlugin* plugin) + { + plugin->priv = MSD_BACKGROUND_PLUGIN_GET_PRIVATE(plugin); - g_debug ("MsdBackgroundPlugin initializing"); + g_debug("MsdBackgroundPlugin initializing"); - plugin->priv->manager = msd_background_manager_new (); -} + plugin->priv->manager = msd_background_manager_new(); + } -static void -msd_background_plugin_finalize (GObject *object) -{ - MsdBackgroundPlugin *plugin; + static void + msd_background_plugin_finalize (GObject* object) + { + MsdBackgroundPlugin* plugin; - g_return_if_fail (object != NULL); - g_return_if_fail (MSD_IS_BACKGROUND_PLUGIN (object)); + g_return_if_fail(object != NULL); + g_return_if_fail(MSD_IS_BACKGROUND_PLUGIN(object)); - g_debug ("MsdBackgroundPlugin finalizing"); + g_debug("MsdBackgroundPlugin finalizing"); - plugin = MSD_BACKGROUND_PLUGIN (object); + plugin = MSD_BACKGROUND_PLUGIN(object); - g_return_if_fail (plugin->priv != NULL); + g_return_if_fail(plugin->priv != NULL); - if (plugin->priv->manager != NULL) { - g_object_unref (plugin->priv->manager); - } + if (plugin->priv->manager != NULL) + { + g_object_unref (plugin->priv->manager); + } - G_OBJECT_CLASS (msd_background_plugin_parent_class)->finalize (object); -} + G_OBJECT_CLASS(msd_background_plugin_parent_class)->finalize(object); + } -static void -impl_activate (MateSettingsPlugin *plugin) -{ - gboolean res; - GError *error; + static void + impl_activate (MateSettingsPlugin* plugin) + { + gboolean res; + GError* error; - g_debug ("Activating background plugin"); + g_debug("Activating background plugin"); - error = NULL; - res = msd_background_manager_start (MSD_BACKGROUND_PLUGIN (plugin)->priv->manager, &error); - if (! res) { - g_warning ("Unable to start background manager: %s", error->message); - g_error_free (error); - } -} + error = NULL; + res = msd_background_manager_start(MSD_BACKGROUND_PLUGIN(plugin)->priv->manager, &error); -static void -impl_deactivate (MateSettingsPlugin *plugin) -{ - g_debug ("Deactivating background plugin"); - msd_background_manager_stop (MSD_BACKGROUND_PLUGIN (plugin)->priv->manager); -} + if (!res) + { + g_warning("Unable to start background manager: %s", error->message); + g_error_free(error); + } + } -static void -msd_background_plugin_class_init (MsdBackgroundPluginClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - MateSettingsPluginClass *plugin_class = MATE_SETTINGS_PLUGIN_CLASS (klass); + static void + impl_deactivate (MateSettingsPlugin* plugin) + { + g_debug("Deactivating background plugin"); - object_class->finalize = msd_background_plugin_finalize; + msd_background_manager_stop(MSD_BACKGROUND_PLUGIN(plugin)->priv->manager); + } - plugin_class->activate = impl_activate; - plugin_class->deactivate = impl_deactivate; + static void + msd_background_plugin_class_init (MsdBackgroundPluginClass* klass) + { + GObjectClass* object_class = G_OBJECT_CLASS(klass); + MateSettingsPluginClass* plugin_class = MATE_SETTINGS_PLUGIN_CLASS(klass); - g_type_class_add_private (klass, sizeof (MsdBackgroundPluginPrivate)); -} + object_class->finalize = msd_background_plugin_finalize; + + plugin_class->activate = impl_activate; + plugin_class->deactivate = impl_deactivate; + + g_type_class_add_private(klass, sizeof(MsdBackgroundPluginPrivate)); + } +//} \ No newline at end of file diff --git a/plugins/background/msd-background-plugin.h b/plugins/background/msd-background-plugin.h index dd52572..ece5f1d 100644 --- a/plugins/background/msd-background-plugin.h +++ b/plugins/background/msd-background-plugin.h @@ -31,30 +31,33 @@ extern "C" { #endif -#define MSD_TYPE_BACKGROUND_PLUGIN (msd_background_plugin_get_type ()) -#define MSD_BACKGROUND_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), MSD_TYPE_BACKGROUND_PLUGIN, MsdBackgroundPlugin)) -#define MSD_BACKGROUND_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), MSD_TYPE_BACKGROUND_PLUGIN, MsdBackgroundPluginClass)) -#define MSD_IS_BACKGROUND_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), MSD_TYPE_BACKGROUND_PLUGIN)) -#define MSD_IS_BACKGROUND_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), MSD_TYPE_BACKGROUND_PLUGIN)) -#define MSD_BACKGROUND_PLUGIN_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), MSD_TYPE_BACKGROUND_PLUGIN, MsdBackgroundPluginClass)) - -typedef struct MsdBackgroundPluginPrivate MsdBackgroundPluginPrivate; - -typedef struct -{ - MateSettingsPlugin parent; - MsdBackgroundPluginPrivate *priv; -} MsdBackgroundPlugin; - -typedef struct -{ - MateSettingsPluginClass parent_class; -} MsdBackgroundPluginClass; - -GType msd_background_plugin_get_type (void) G_GNUC_CONST; - -/* All the plugins must implement this function */ -G_MODULE_EXPORT GType register_mate_settings_plugin (GTypeModule *module); +//class MsdBackgroundPlugin +//{ + #define MSD_TYPE_BACKGROUND_PLUGIN (msd_background_plugin_get_type()) + #define MSD_BACKGROUND_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_CAST((o), MSD_TYPE_BACKGROUND_PLUGIN, MsdBackgroundPlugin)) + #define MSD_BACKGROUND_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), MSD_TYPE_BACKGROUND_PLUGIN, MsdBackgroundPluginClass)) + #define MSD_IS_BACKGROUND_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), MSD_TYPE_BACKGROUND_PLUGIN)) + #define MSD_IS_BACKGROUND_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), MSD_TYPE_BACKGROUND_PLUGIN)) + #define MSD_BACKGROUND_PLUGIN_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), MSD_TYPE_BACKGROUND_PLUGIN, MsdBackgroundPluginClass)) + + typedef struct MsdBackgroundPluginPrivate MsdBackgroundPluginPrivate; + + typedef struct { + MateSettingsPlugin parent; + MsdBackgroundPluginPrivate* priv; + } MsdBackgroundPlugin; + + typedef struct { + MateSettingsPluginClass parent_class; + } MsdBackgroundPluginClass; + + GType + msd_background_plugin_get_type (void) G_GNUC_CONST; + + /* All the plugins must implement this function */ + G_MODULE_EXPORT GType + register_mate_settings_plugin (GTypeModule* module); +//} #ifdef __cplusplus } diff --git a/plugins/background/test-background.c b/plugins/background/test-background.c index f9b0849..1d0be35 100644 --- a/plugins/background/test-background.c +++ b/plugins/background/test-background.c @@ -31,29 +31,29 @@ #include "msd-background-manager.h" static gboolean -idle (MsdBackgroundManager *manager) +idle (MsdBackgroundManager* manager) { - msd_background_manager_start (manager, NULL); - return FALSE; + msd_background_manager_start (manager, NULL); + return FALSE; } int -main (int argc, char *argv[]) +main (int argc, char* argv[]) { - MsdBackgroundManager *manager; + MsdBackgroundManager* manager; - bindtextdomain (GETTEXT_PACKAGE, MATE_SETTINGS_LOCALEDIR); - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - textdomain (GETTEXT_PACKAGE); + bindtextdomain(GETTEXT_PACKAGE, MATE_SETTINGS_LOCALEDIR); + bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); + textdomain(GETTEXT_PACKAGE); - setlocale (LC_ALL, ""); + setlocale(LC_ALL, ""); - gtk_init (&argc, &argv); + gtk_init(&argc, &argv); - manager = msd_background_manager_new (); - g_idle_add ((GSourceFunc)idle, manager); + manager = msd_background_manager_new(); + g_idle_add((GSourceFunc) idle, manager); - gtk_main (); + gtk_main(); - return 0; + return 0; } -- cgit v1.2.1