Commit 0c203abb authored by Alberts Muktupāvels's avatar Alberts Muktupāvels
Browse files

desktop-background: rename DesktopBackground to GfDesktopBackground

parent 06f60af6
......@@ -46,7 +46,6 @@ struct _FlashbackApplication
GtkCssProvider *provider;
GsdAutomountManager *automount;
DesktopBackground *background;
FlashbackDisplayConfig *config;
FlashbackEndSessionDialog *dialog;
FlashbackIdleMonitor *idle_monitor;
......@@ -54,6 +53,7 @@ struct _FlashbackApplication
FlashbackScreencast *screencast;
FlashbackShell *shell;
GfBluetoothApplet *bluetooth;
GfDesktopBackground *background;
GfPowerApplet *power;
GfScreenshot *screenshot;
GfSoundApplet *sound;
......@@ -137,7 +137,6 @@ settings_changed (GSettings *settings,
}
SETTING_CHANGED (automount, "automount-manager", gsd_automount_manager_new)
SETTING_CHANGED (background, "desktop-background", desktop_background_new)
SETTING_CHANGED (config, "display-config", flashback_display_config_new)
SETTING_CHANGED (idle_monitor, "idle-monitor", flashback_idle_monitor_new)
SETTING_CHANGED (dialog, "end-session-dialog", flashback_end_session_dialog_new)
......@@ -145,6 +144,7 @@ settings_changed (GSettings *settings,
SETTING_CHANGED (screencast, "screencast", flashback_screencast_new)
SETTING_CHANGED (shell, "shell", flashback_shell_new)
SETTING_CHANGED (bluetooth, "bluetooth-applet", gf_bluetooth_applet_new)
SETTING_CHANGED (background, "desktop-background", gf_desktop_background_new)
SETTING_CHANGED (power, "power-applet", gf_power_applet_new)
SETTING_CHANGED (screenshot, "screenshot", gf_screenshot_new)
SETTING_CHANGED (sound, "sound-applet", gf_sound_applet_new)
......@@ -174,7 +174,6 @@ flashback_application_finalize (GObject *object)
remove_style_provider (application, gdk_screen_get_default ());
g_clear_object (&application->automount);
g_clear_object (&application->background);
g_clear_object (&application->config);
g_clear_object (&application->dialog);
g_clear_object (&application->idle_monitor);
......@@ -182,6 +181,7 @@ flashback_application_finalize (GObject *object)
g_clear_object (&application->screencast);
g_clear_object (&application->shell);
g_clear_object (&application->bluetooth);
g_clear_object (&application->background);
g_clear_object (&application->power);
g_clear_object (&application->screenshot);
g_clear_object (&application->sound);
......
/*
* Copyright (C) 2014 Alberts Muktupāvels
* Copyright (C) 2014 - 2015 Alberts Muktupāvels
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
......@@ -15,32 +15,18 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef DESKTOP_BACKGROUND_H
#define DESKTOP_BACKGROUND_H
#ifndef GF_DESKTOP_BACKGROUND_H
#define GF_DESKTOP_BACKGROUND_H
#include <glib-object.h>
G_BEGIN_DECLS
#define DESKTOP_BACKGROUND_TYPE (desktop_background_get_type ())
#define DESKTOP_BACKGROUND(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), DESKTOP_BACKGROUND_TYPE, DesktopBackground))
#define DESKTOP_BACKGROUND_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), DESKTOP_BACKGROUND_TYPE, DesktopBackgroundClass))
#define GF_TYPE_DESKTOP_BACKGROUND gf_desktop_background_get_type ()
G_DECLARE_FINAL_TYPE (GfDesktopBackground, gf_desktop_background,
GF, DESKTOP_BACKGROUND, GObject)
typedef struct _DesktopBackground DesktopBackground;
typedef struct _DesktopBackgroundClass DesktopBackgroundClass;
typedef struct _DesktopBackgroundPrivate DesktopBackgroundPrivate;
struct _DesktopBackground {
GObject parent;
DesktopBackgroundPrivate *priv;
};
struct _DesktopBackgroundClass {
GObjectClass parent_class;
};
GType desktop_background_get_type (void);
DesktopBackground *desktop_background_new (void);
GfDesktopBackground *gf_desktop_background_new (void);
G_END_DECLS
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment