[gnome-flashback] screenshot: rename FlashbackScreenshot to GfScreenshot

[Alberts Muktupāvels <muktupavels src gnome org>]

commit 2136f8dd8579256237d94033dc894006e1068fa8
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Thu Sep 10 11:47:36 2015 +0300

    screenshot: rename FlashbackScreenshot to GfScreenshot

 gnome-flashback/flashback-application.c       |    6 ++--
 gnome-flashback/libscreenshot/gf-screenshot.c |   28 ++++++++++++------------
 gnome-flashback/libscreenshot/gf-screenshot.h |   11 ++++-----
 3 files changed, 22 insertions(+), 23 deletions(-)
---
diff --git a/gnome-flashback/flashback-application.c b/gnome-flashback/flashback-application.c
index 0609717..6d2967e 100644
--- a/gnome-flashback/flashback-application.c
+++ b/gnome-flashback/flashback-application.c
@@ -52,10 +52,10 @@ struct _FlashbackApplication
   FlashbackIdleMonitor      *idle_monitor;
   FlashbackPolkit           *polkit;
   FlashbackScreencast       *screencast;
-  FlashbackScreenshot       *screenshot;
   FlashbackShell            *shell;
   GfBluetoothApplet         *bluetooth;
   GfPowerApplet             *power;
+  GfScreenshot              *screenshot;
   GfSoundApplet             *sound;
   GfWorkarounds             *workarounds;
 };
@@ -143,10 +143,10 @@ settings_changed (GSettings   *settings,
   SETTING_CHANGED (dialog, "end-session-dialog", flashback_end_session_dialog_new)
   SETTING_CHANGED (polkit, "polkit", flashback_polkit_new)
   SETTING_CHANGED (screencast, "screencast", flashback_screencast_new)
-  SETTING_CHANGED (screenshot, "screenshot", flashback_screenshot_new)
   SETTING_CHANGED (shell, "shell", flashback_shell_new)
   SETTING_CHANGED (bluetooth, "bluetooth-applet", gf_bluetooth_applet_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)
   SETTING_CHANGED (workarounds, "workarounds", gf_workarounds_new)
 
@@ -180,10 +180,10 @@ flashback_application_finalize (GObject *object)
   g_clear_object (&application->idle_monitor);
   g_clear_object (&application->polkit);
   g_clear_object (&application->screencast);
-  g_clear_object (&application->screenshot);
   g_clear_object (&application->shell);
   g_clear_object (&application->bluetooth);
   g_clear_object (&application->power);
+  g_clear_object (&application->screenshot);
   g_clear_object (&application->sound);
   g_clear_object (&application->workarounds);
 
diff --git a/gnome-flashback/libscreenshot/gf-screenshot.c b/gnome-flashback/libscreenshot/gf-screenshot.c
index 429aa47..49d064c 100644
--- a/gnome-flashback/libscreenshot/gf-screenshot.c
+++ b/gnome-flashback/libscreenshot/gf-screenshot.c
@@ -26,7 +26,7 @@
 #define SCREENSHOT_DBUS_NAME "org.gnome.Shell.Screenshot"
 #define SCREENSHOT_DBUS_PATH "/org/gnome/Shell/Screenshot"
 
-struct _FlashbackScreenshot
+struct _GfScreenshot
 {
   GObject                  parent;
 
@@ -34,7 +34,7 @@ struct _FlashbackScreenshot
   FlashbackDBusScreenshot *dbus_screenshot;
 };
 
-G_DEFINE_TYPE (FlashbackScreenshot, flashback_screenshot, G_TYPE_OBJECT)
+G_DEFINE_TYPE (GfScreenshot, gf_screenshot, G_TYPE_OBJECT)
 
 static gboolean
 handle_screenshot (FlashbackDBusScreenshot *dbus_screenshot,
@@ -137,13 +137,13 @@ bus_acquired_handler (GDBusConnection *connection,
                       const gchar     *name,
                       gpointer         user_data)
 {
-  FlashbackScreenshot *screenshot;
+  GfScreenshot *screenshot;
   FlashbackDBusScreenshot *dbus_screenshot;
   GDBusInterfaceSkeleton *skeleton;
   GError *error;
   gboolean exported;
 
-  screenshot = FLASHBACK_SCREENSHOT (user_data);
+  screenshot = GF_SCREENSHOT (user_data);
 
   dbus_screenshot = screenshot->dbus_screenshot;
   skeleton = G_DBUS_INTERFACE_SKELETON (dbus_screenshot);
@@ -173,12 +173,12 @@ bus_acquired_handler (GDBusConnection *connection,
 }
 
 static void
-flashback_screenshot_dispose (GObject *object)
+gf_screenshot_dispose (GObject *object)
 {
-  FlashbackScreenshot *screenshot;
+  GfScreenshot *screenshot;
   GDBusInterfaceSkeleton *skeleton;
 
-  screenshot = FLASHBACK_SCREENSHOT (object);
+  screenshot = GF_SCREENSHOT (object);
 
   if (screenshot->dbus_screenshot)
     {
@@ -194,21 +194,21 @@ flashback_screenshot_dispose (GObject *object)
       screenshot->bus_name = 0;
     }
 
-  G_OBJECT_CLASS (flashback_screenshot_parent_class)->dispose (object);
+  G_OBJECT_CLASS (gf_screenshot_parent_class)->dispose (object);
 }
 
 static void
-flashback_screenshot_class_init (FlashbackScreenshotClass *screenshot_class)
+gf_screenshot_class_init (GfScreenshotClass *screenshot_class)
 {
   GObjectClass *object_class;
 
   object_class = G_OBJECT_CLASS (screenshot_class);
 
-  object_class->dispose = flashback_screenshot_dispose;
+  object_class->dispose = gf_screenshot_dispose;
 }
 
 static void
-flashback_screenshot_init (FlashbackScreenshot *screenshot)
+gf_screenshot_init (GfScreenshot *screenshot)
 {
   screenshot->dbus_screenshot = flashback_dbus_screenshot_skeleton_new ();
   screenshot->bus_name = g_bus_own_name (G_BUS_TYPE_SESSION,
@@ -219,8 +219,8 @@ flashback_screenshot_init (FlashbackScreenshot *screenshot)
                                          NULL, NULL, screenshot, NULL);
 }
 
-FlashbackScreenshot *
-flashback_screenshot_new (void)
+GfScreenshot *
+gf_screenshot_new (void)
 {
-  return g_object_new (FLASHBACK_TYPE_SCREENSHOT, NULL);
+  return g_object_new (GF_TYPE_SCREENSHOT, NULL);
 }
diff --git a/gnome-flashback/libscreenshot/gf-screenshot.h b/gnome-flashback/libscreenshot/gf-screenshot.h
index 2a1a0fe..4dd2bd4 100644
--- a/gnome-flashback/libscreenshot/gf-screenshot.h
+++ b/gnome-flashback/libscreenshot/gf-screenshot.h
@@ -15,18 +15,17 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef FLASHBACK_SCREENSHOT_H
-#define FLASHBACK_SCREENSHOT_H
+#ifndef GF_SCREENSHOT_H
+#define GF_SCREENSHOT_H
 
 #include <glib-object.h>
 
 G_BEGIN_DECLS
 
-#define FLASHBACK_TYPE_SCREENSHOT flashback_screenshot_get_type ()
-G_DECLARE_FINAL_TYPE (FlashbackScreenshot, flashback_screenshot,
-                      FLASHBACK, SCREENSHOT, GObject)
+#define GF_TYPE_SCREENSHOT gf_screenshot_get_type ()
+G_DECLARE_FINAL_TYPE (GfScreenshot, gf_screenshot, GF, SCREENSHOT, GObject)
 
-FlashbackScreenshot *flashback_screenshot_new (void);
+GfScreenshot *gf_screenshot_new (void);
 
 G_END_DECLS