[gnome-flashback] screencast: rename FlashbackScreencast to GfScreencast

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

commit fe3dbc0285e28df2aee7220b5306c03ed3beedad
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Mon Sep 14 20:14:33 2015 +0300

    screencast: rename FlashbackScreencast to GfScreencast

 gnome-flashback/gf-application.c              |    6 ++--
 gnome-flashback/libscreencast/gf-screencast.c |   42 +++++++++++++------------
 gnome-flashback/libscreencast/gf-screencast.h |   11 +++---
 3 files changed, 30 insertions(+), 29 deletions(-)
---
diff --git a/gnome-flashback/gf-application.c b/gnome-flashback/gf-application.c
index efc8cb7..3816bdb 100644
--- a/gnome-flashback/gf-application.c
+++ b/gnome-flashback/gf-application.c
@@ -49,12 +49,12 @@ struct _GfApplication
   FlashbackDisplayConfig *config;
   FlashbackIdleMonitor   *idle_monitor;
   FlashbackPolkit        *polkit;
-  FlashbackScreencast    *screencast;
   FlashbackShell         *shell;
   GfBluetoothApplet      *bluetooth;
   GfDesktopBackground    *background;
   GfEndSessionDialog     *dialog;
   GfPowerApplet          *power;
+  GfScreencast           *screencast;
   GfScreenshot           *screenshot;
   GfSoundApplet          *sound;
   GfWorkarounds          *workarounds;
@@ -140,12 +140,12 @@ settings_changed (GSettings   *settings,
   SETTING_CHANGED (config, "display-config", flashback_display_config_new)
   SETTING_CHANGED (idle_monitor, "idle-monitor", flashback_idle_monitor_new)
   SETTING_CHANGED (polkit, "polkit", flashback_polkit_new)
-  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 (dialog, "end-session-dialog", gf_end_session_dialog_new)
   SETTING_CHANGED (power, "power-applet", gf_power_applet_new)
+  SETTING_CHANGED (screencast, "screencast", gf_screencast_new)
   SETTING_CHANGED (screenshot, "screenshot", gf_screenshot_new)
   SETTING_CHANGED (sound, "sound-applet", gf_sound_applet_new)
   SETTING_CHANGED (workarounds, "workarounds", gf_workarounds_new)
@@ -179,12 +179,12 @@ gf_application_dispose (GObject *object)
   g_clear_object (&application->config);
   g_clear_object (&application->idle_monitor);
   g_clear_object (&application->polkit);
-  g_clear_object (&application->screencast);
   g_clear_object (&application->shell);
   g_clear_object (&application->bluetooth);
   g_clear_object (&application->background);
   g_clear_object (&application->dialog);
   g_clear_object (&application->power);
+  g_clear_object (&application->screencast);
   g_clear_object (&application->screenshot);
   g_clear_object (&application->sound);
   g_clear_object (&application->workarounds);
diff --git a/gnome-flashback/libscreencast/gf-screencast.c b/gnome-flashback/libscreencast/gf-screencast.c
index 2faaf95..0488b2d 100644
--- a/gnome-flashback/libscreencast/gf-screencast.c
+++ b/gnome-flashback/libscreencast/gf-screencast.c
@@ -15,23 +15,25 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
+
 #include <gtk/gtk.h>
+
 #include "flashback-dbus-screencast.h"
 #include "gf-screencast.h"
 
-#define SHELL_DBUS_NAME "org.gnome.Shell"
+#define SCREENCAST_DBUS_NAME "org.gnome.Shell.Screencast"
 #define SCREENCAST_DBUS_PATH "/org/gnome/Shell/Screencast"
 
-struct _FlashbackScreencast
+struct _GfScreencast
 {
-  GObject                  parent;
+  GObject                 parent;
 
-  gint                     bus_name;
-  GDBusInterfaceSkeleton  *iface;
+  gint                    bus_name;
+  GDBusInterfaceSkeleton *iface;
 };
 
-G_DEFINE_TYPE (FlashbackScreencast, flashback_screencast, G_TYPE_OBJECT)
+G_DEFINE_TYPE (GfScreencast, gf_screencast, G_TYPE_OBJECT)
 
 static gboolean
 handle_screencast (FlashbackDBusScreencast *dbus_screencast,
@@ -83,11 +85,11 @@ name_appeared_handler (GDBusConnection *connection,
                        const gchar     *name_owner,
                        gpointer         user_data)
 {
-  FlashbackScreencast *screencast;
+  GfScreencast *screencast;
   FlashbackDBusScreencast *skeleton;
   GError *error;
 
-  screencast = FLASHBACK_SCREENCAST (user_data);
+  screencast = GF_SCREENCAST (user_data);
   skeleton = flashback_dbus_screencast_skeleton_new ();
 
   g_signal_connect (skeleton, "handle-screencast",
@@ -111,11 +113,11 @@ name_appeared_handler (GDBusConnection *connection,
 }
 
 static void
-flashback_screencast_finalize (GObject *object)
+gf_screencast_finalize (GObject *object)
 {
-  FlashbackScreencast *screencast;
+  GfScreencast *screencast;
 
-  screencast = FLASHBACK_SCREENCAST (object);
+  screencast = GF_SCREENCAST (object);
 
   if (screencast->bus_name)
     {
@@ -123,24 +125,24 @@ flashback_screencast_finalize (GObject *object)
       screencast->bus_name = 0;
     }
 
-  G_OBJECT_CLASS (flashback_screencast_parent_class)->finalize (object);
+  G_OBJECT_CLASS (gf_screencast_parent_class)->finalize (object);
 }
 
 static void
-flashback_screencast_class_init (FlashbackScreencastClass *screencast_class)
+gf_screencast_class_init (GfScreencastClass *screencast_class)
 {
   GObjectClass *object_class;
 
   object_class = G_OBJECT_CLASS (screencast_class);
 
-  object_class->finalize = flashback_screencast_finalize;
+  object_class->finalize = gf_screencast_finalize;
 }
 
 static void
-flashback_screencast_init (FlashbackScreencast *screencast)
+gf_screencast_init (GfScreencast *screencast)
 {
   screencast->bus_name = g_bus_watch_name (G_BUS_TYPE_SESSION,
-                                           SHELL_DBUS_NAME,
+                                           SCREENCAST_DBUS_NAME,
                                            G_BUS_NAME_WATCHER_FLAGS_NONE,
                                            name_appeared_handler,
                                            NULL,
@@ -148,8 +150,8 @@ flashback_screencast_init (FlashbackScreencast *screencast)
                                            NULL);
 }
 
-FlashbackScreencast *
-flashback_screencast_new (void)
+GfScreencast *
+gf_screencast_new (void)
 {
-       return g_object_new (FLASHBACK_TYPE_SCREENCAST, NULL);
+  return g_object_new (GF_TYPE_SCREENCAST, NULL);
 }
diff --git a/gnome-flashback/libscreencast/gf-screencast.h b/gnome-flashback/libscreencast/gf-screencast.h
index 51daf57..397c864 100644
--- a/gnome-flashback/libscreencast/gf-screencast.h
+++ b/gnome-flashback/libscreencast/gf-screencast.h
@@ -15,18 +15,17 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef FLASHBACK_SCREENCAST_H
-#define FLASHBACK_SCREENCAST_H
+#ifndef GF_SCREENCAST_H
+#define GF_SCREENCAST_H
 
 #include <glib-object.h>
 
 G_BEGIN_DECLS
 
-#define FLASHBACK_TYPE_SCREENCAST flashback_screencast_get_type ()
-G_DECLARE_FINAL_TYPE (FlashbackScreencast, flashback_screencast,
-                      FLASHBACK, SCREENCAST, GObject)
+#define GF_TYPE_SCREENCAST gf_screencast_get_type ()
+G_DECLARE_FINAL_TYPE (GfScreencast, gf_screencast, GF, SCREENCAST, GObject)
 
-FlashbackScreencast *flashback_screencast_new (void);
+GfScreencast *gf_screencast_new (void);
 
 G_END_DECLS