GNOME.org
 

[gnome-flashback] idle-monitor: rename and reformat MetaIdleMonitorDBus

commit 197514ba2265527778681ae2ea5b3819bda6057d
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Fri Jul 10 15:33:02 2015 +0300

    idle-monitor: rename and reformat MetaIdleMonitorDBus

 gnome-flashback/flashback-application.c            |    6 +-
 gnome-flashback/libidle-monitor/Makefile.am        |   27 ++-
 ...dle-monitor-dbus.c => flashback-idle-monitor.c} |  289 ++++++++++++--------
 .../libidle-monitor/flashback-idle-monitor.h       |   33 +++
 .../libidle-monitor/meta-idle-monitor-dbus.h       |   53 ----
 .../libidle-monitor/meta-idle-monitor.c            |    1 -
 6 files changed, 225 insertions(+), 184 deletions(-)
---
diff --git a/gnome-flashback/flashback-application.c b/gnome-flashback/flashback-application.c
index 55440ca..a6bc6ca 100644
--- a/gnome-flashback/flashback-application.c
+++ b/gnome-flashback/flashback-application.c
@@ -23,7 +23,7 @@
 #include "libdesktop-background/desktop-background.h"
 #include "libdisplay-config/flashback-display-config.h"
 #include "libend-session-dialog/flashback-end-session-dialog.h"
-#include "libidle-monitor/meta-idle-monitor-dbus.h"
+#include "libidle-monitor/flashback-idle-monitor.h"
 #include "libscreencast/flashback-screencast.h"
 #include "libscreenshot/flashback-screenshot.h"
 #include "libshell/flashback-shell.h"
@@ -44,7 +44,7 @@ struct _FlashbackApplication
   DesktopBackground         *background;
   FlashbackDisplayConfig    *config;
   FlashbackEndSessionDialog *dialog;
-  MetaIdleMonitorDBus       *idle_monitor;
+  FlashbackIdleMonitor      *idle_monitor;
   FlashbackScreencast       *screencast;
   FlashbackScreenshot       *screenshot;
   FlashbackShell            *shell;
@@ -131,7 +131,7 @@ 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", meta_idle_monitor_dbus_new)
+  SETTING_CHANGED (idle_monitor, "idle-monitor", flashback_idle_monitor_new)
   SETTING_CHANGED (dialog, "end-session-dialog", flashback_end_session_dialog_new)
   SETTING_CHANGED (screencast, "screencast", flashback_screencast_new)
   SETTING_CHANGED (screenshot, "screenshot", flashback_screenshot_new)
diff --git a/gnome-flashback/libidle-monitor/Makefile.am b/gnome-flashback/libidle-monitor/Makefile.am
index 22d083d..5031d6b 100644
--- a/gnome-flashback/libidle-monitor/Makefile.am
+++ b/gnome-flashback/libidle-monitor/Makefile.am
@@ -1,24 +1,30 @@
+NULL =
+
 noinst_LTLIBRARIES = \
-       libidle-monitor.la
+       libidle-monitor.la \
+       $(NULL)
 
 AM_CPPFLAGS = \
        $(IDLE_MONITOR_CFLAGS) \
-       -I$(top_builddir)/gnome-flashback/libidle-monitor
+       -I$(top_builddir)/gnome-flashback/libidle-monitor \
+       $(NULL)
 
 libidle_monitor_la_SOURCES = \
+       flashback-idle-monitor.c \
+       flashback-idle-monitor.h \
        meta-dbus-idle-monitor.c \
        meta-dbus-idle-monitor.h \
        meta-backend.c \
        meta-backend.h \
        meta-idle-monitor.c \
        meta-idle-monitor.h \
-       meta-idle-monitor-dbus.c \
-       meta-idle-monitor-dbus.h \
        meta-idle-monitor-xsync.c \
-       meta-idle-monitor-xsync.h
+       meta-idle-monitor-xsync.h \
+       $(NULL)
 
 libidle_monitor_la_LIBADD = \
-       $(IDLE_MONITOR_LIBS)
+       $(IDLE_MONITOR_LIBS) \
+       $(NULL)
 
 meta-dbus-idle-monitor.h:
 meta-dbus-idle-monitor.c: org.gnome.Mutter.IdleMonitor.xml
@@ -31,12 +37,15 @@ meta-dbus-idle-monitor.c: org.gnome.Mutter.IdleMonitor.xml
 
 BUILT_SOURCES = \
        meta-dbus-idle-monitor.h \
-       meta-dbus-idle-monitor.c
+       meta-dbus-idle-monitor.c \
+       $(NULL)
 
 EXTRA_DIST = \
-       org.gnome.Mutter.IdleMonitor.xml
+       org.gnome.Mutter.IdleMonitor.xml \
+       $(NULL)
 
 CLEANFILES = \
-       $(BUILT_SOURCES)
+       $(BUILT_SOURCES) \
+       $(NULL)
 
 -include $(top_srcdir)/git.mk
diff --git a/gnome-flashback/libidle-monitor/meta-idle-monitor-dbus.c 
b/gnome-flashback/libidle-monitor/flashback-idle-monitor.c
similarity index 53%
rename from gnome-flashback/libidle-monitor/meta-idle-monitor-dbus.c
rename to gnome-flashback/libidle-monitor/flashback-idle-monitor.c
index 19c6fed..0ae6fce 100644
--- a/gnome-flashback/libidle-monitor/meta-idle-monitor-dbus.c
+++ b/gnome-flashback/libidle-monitor/flashback-idle-monitor.c
@@ -1,5 +1,6 @@
 /*
- * Copyright 2013 Red Hat, Inc.
+ * Copyright (C) 2013 Red Hat, Inc.
+ * Copyright (C) 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
@@ -24,13 +25,15 @@
 #include <gdk/gdkx.h>
 #include <X11/extensions/sync.h>
 
+#include "flashback-idle-monitor.h"
 #include "meta-backend.h"
 #include "meta-idle-monitor.h"
-#include "meta-idle-monitor-dbus.h"
 #include "meta-dbus-idle-monitor.h"
 
-struct _MetaIdleMonitorDBusPrivate
+struct _FlashbackIdleMonitor
 {
+  GObject                   parent;
+
   gint                      dbus_name_id;
 
   gint                      xsync_event_base;
@@ -39,7 +42,7 @@ struct _MetaIdleMonitorDBusPrivate
   GDBusObjectManagerServer *server;
 };
 
-G_DEFINE_TYPE_WITH_PRIVATE (MetaIdleMonitorDBus, meta_idle_monitor_dbus, G_TYPE_OBJECT);
+G_DEFINE_TYPE (FlashbackIdleMonitor, flashback_idle_monitor, G_TYPE_OBJECT)
 
 static gboolean
 handle_get_idletime (MetaDBusIdleMonitor   *skeleton,
@@ -80,15 +83,22 @@ dbus_idle_callback (MetaIdleMonitor *monitor,
                     guint            watch_id,
                     gpointer         user_data)
 {
-  DBusWatch *watch = user_data;
-  GDBusInterfaceSkeleton *skeleton = G_DBUS_INTERFACE_SKELETON (watch->dbus_monitor);
+  DBusWatch *watch;
+  GDBusInterfaceSkeleton *skeleton;
+  GDBusConnection *connection;
+  const gchar *path;
 
-  g_dbus_connection_emit_signal (g_dbus_interface_skeleton_get_connection (skeleton),
-                                 watch->dbus_name,
-                                 g_dbus_interface_skeleton_get_object_path (skeleton),
+  watch = (DBusWatch *) user_data;
+  skeleton = G_DBUS_INTERFACE_SKELETON (watch->dbus_monitor);
+  connection = g_dbus_interface_skeleton_get_connection (skeleton);
+  path = g_dbus_interface_skeleton_get_object_path (skeleton);
+
+  if (connection == NULL)
+    return;
+
+  g_dbus_connection_emit_signal (connection, watch->dbus_name, path,
                                  "org.gnome.Mutter.IdleMonitor",
-                                 "WatchFired",
-                                 g_variant_new ("(u)", watch_id),
+                                 "WatchFired", g_variant_new ("(u)", watch_id),
                                  NULL);
 }
 
@@ -107,13 +117,18 @@ make_dbus_watch (MetaDBusIdleMonitor   *skeleton,
                  GDBusMethodInvocation *invocation,
                  MetaIdleMonitor       *monitor)
 {
+  GDBusConnection *connection;
+  const gchar *sender;
   DBusWatch *watch;
 
+  connection = g_dbus_method_invocation_get_connection (invocation);
+  sender = g_dbus_method_invocation_get_sender (invocation);
+
   watch = g_slice_new (DBusWatch);
   watch->dbus_monitor = g_object_ref (skeleton);
   watch->monitor = g_object_ref (monitor);
-  watch->dbus_name = g_strdup (g_dbus_method_invocation_get_sender (invocation));
-  watch->name_watcher_id = g_bus_watch_name_on_connection (g_dbus_method_invocation_get_connection 
(invocation),
+  watch->dbus_name = g_strdup (sender);
+  watch->name_watcher_id = g_bus_watch_name_on_connection (connection,
                                                            watch->dbus_name,
                                                            G_BUS_NAME_WATCHER_FLAGS_NONE,
                                                            NULL, /* appeared */
@@ -133,9 +148,12 @@ handle_add_idle_watch (MetaDBusIdleMonitor   *skeleton,
 
   watch = make_dbus_watch (skeleton, invocation, monitor);
   watch->watch_id = meta_idle_monitor_add_idle_watch (monitor, interval,
-                                                      dbus_idle_callback, watch, destroy_dbus_watch);
+                                                      dbus_idle_callback,
+                                                      watch,
+                                                      destroy_dbus_watch);
 
-  meta_dbus_idle_monitor_complete_add_idle_watch (skeleton, invocation, watch->watch_id);
+  meta_dbus_idle_monitor_complete_add_idle_watch (skeleton, invocation,
+                                                  watch->watch_id);
 
   return TRUE;
 }
@@ -145,15 +163,16 @@ handle_add_user_active_watch (MetaDBusIdleMonitor   *skeleton,
                               GDBusMethodInvocation *invocation,
                               MetaIdleMonitor       *monitor)
 {
-
   DBusWatch *watch;
 
   watch = make_dbus_watch (skeleton, invocation, monitor);
   watch->watch_id = meta_idle_monitor_add_user_active_watch (monitor,
-                                                             dbus_idle_callback, watch,
+                                                             dbus_idle_callback,
+                                                             watch,
                                                              destroy_dbus_watch);
 
-  meta_dbus_idle_monitor_complete_add_user_active_watch (skeleton, invocation, watch->watch_id);
+  meta_dbus_idle_monitor_complete_add_user_active_watch (skeleton, invocation,
+                                                         watch->watch_id);
 
   return TRUE;
 }
@@ -171,9 +190,9 @@ handle_remove_watch (MetaDBusIdleMonitor   *skeleton,
 }
 
 static void
-create_monitor_skeleton (GDBusObjectManagerServer *manager,
+create_monitor_skeleton (GDBusObjectManagerServer *server,
                          MetaIdleMonitor          *monitor,
-                         const char               *path)
+                         const gchar              *path)
 {
   MetaDBusIdleMonitor *skeleton;
   MetaDBusObjectSkeleton *object;
@@ -191,53 +210,63 @@ create_monitor_skeleton (GDBusObjectManagerServer *manager,
   object = meta_dbus_object_skeleton_new (path);
   meta_dbus_object_skeleton_set_idle_monitor (object, skeleton);
 
-  g_dbus_object_manager_server_export (manager, G_DBUS_OBJECT_SKELETON (object));
+  g_dbus_object_manager_server_export (server, G_DBUS_OBJECT_SKELETON (object));
 
   g_object_unref (skeleton);
   g_object_unref (object);
 }
 
 static void
-on_device_added (GdkDeviceManager         *device_manager,
-                 GdkDevice                *device,
-                 GDBusObjectManagerServer *manager)
+on_device_added (GdkDeviceManager *device_manager,
+                 GdkDevice        *device,
+                 gpointer          user_data)
 {
-
+  FlashbackIdleMonitor *idle_monitor;
   MetaIdleMonitor *monitor;
   gint device_id;
   gchar *path;
 
+  idle_monitor = FLASHBACK_IDLE_MONITOR (user_data);
+
   device_id = gdk_x11_device_get_id (device);
   monitor = meta_idle_monitor_get_for_device (device_id);
   path = g_strdup_printf ("/org/gnome/Mutter/IdleMonitor/Device%d", device_id);
 
-  create_monitor_skeleton (manager, monitor, path);
+  create_monitor_skeleton (idle_monitor->server, monitor, path);
   g_free (path);
 }
 
 static void
-on_device_removed (GdkDeviceManager         *device_manager,
-                   GdkDevice                *device,
-                   GDBusObjectManagerServer *manager)
+on_device_removed (GdkDeviceManager *device_manager,
+                   GdkDevice        *device,
+                   gpointer          user_data)
 {
+  FlashbackIdleMonitor *monitor;
   gint device_id;
   gchar *path;
 
+  monitor = FLASHBACK_IDLE_MONITOR (user_data);
+
   device_id = gdk_x11_device_get_id (device);
   path = g_strdup_printf ("/org/gnome/Mutter/IdleMonitor/Device%d", device_id);
-  g_dbus_object_manager_server_unexport (manager, path);
+
+  g_dbus_object_manager_server_unexport (monitor->server, path);
   g_free (path);
 }
 
 static void
-on_device_changed (GdkDeviceManager         *device_manager,
-                   GdkDevice                *device,
-                   GDBusObjectManagerServer *manager)
+on_device_changed (GdkDeviceManager *device_manager,
+                   GdkDevice        *device,
+                   gpointer          user_data)
 {
-       if (gdk_device_get_device_type (device) == GDK_DEVICE_TYPE_FLOATING)
-               on_device_removed (device_manager, device, manager);
-       else
-               on_device_added (device_manager, device, manager);
+  FlashbackIdleMonitor *monitor;
+
+  monitor = FLASHBACK_IDLE_MONITOR (user_data);
+
+  if (gdk_device_get_device_type (device) == GDK_DEVICE_TYPE_FLOATING)
+    on_device_removed (device_manager, device, monitor);
+  else
+    on_device_added (device_manager, device, monitor);
 }
 
 static void
@@ -245,42 +274,51 @@ on_bus_acquired (GDBusConnection *connection,
                  const char      *name,
                  gpointer         user_data)
 {
-  MetaIdleMonitorDBus *monitor_dbus;
-  GDBusObjectManagerServer *manager;
-  GdkDeviceManager *device_manager;
+  FlashbackIdleMonitor *idle_monitor;
+  const gchar *server_path;
   MetaIdleMonitor *monitor;
-  GList *devices, *iter;
-  char *path;
+  const gchar *core_path;
+  GdkDisplay *display;
+  GdkDeviceManager *device_manager;
+  GList *master;
+  GList *slave;
+  GList *devices;
+  GList *iter;
 
-  monitor_dbus = META_IDLE_MONITOR_DBUS (user_data);
-  manager = g_dbus_object_manager_server_new ("/org/gnome/Mutter/IdleMonitor");
+  idle_monitor = FLASHBACK_IDLE_MONITOR (user_data);
 
-  monitor_dbus->priv->server = manager;
+  server_path = "/org/gnome/Mutter/IdleMonitor";
+  idle_monitor->server = g_dbus_object_manager_server_new (server_path);
 
-  /* We never clear the core monitor, as that's supposed to cumulate idle times from
-     all devices */
   monitor = meta_idle_monitor_get_core ();
-  path = g_strdup ("/org/gnome/Mutter/IdleMonitor/Core");
-  create_monitor_skeleton (manager, monitor, path);
-  g_free (path);
+  core_path = "/org/gnome/Mutter/IdleMonitor/Core";
+  create_monitor_skeleton (idle_monitor->server, monitor, core_path);
 
-  device_manager = gdk_display_get_device_manager (gdk_display_get_default ());
-  devices = gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_MASTER);
-  devices = g_list_concat (devices, gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_SLAVE));
+  display = gdk_display_get_default ();
+  device_manager = gdk_display_get_device_manager (display);
+  master = gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_MASTER);
+  slave = gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_SLAVE);
+  devices = g_list_concat (master, slave);
 
   for (iter = devices; iter; iter = iter->next)
-    on_device_added (device_manager, iter->data, manager);
+    {
+      GdkDevice *device;
+
+      device = (GdkDevice *) iter->data;
+
+      on_device_added (device_manager, device, idle_monitor);
+    }
 
   g_list_free (devices);
 
   g_signal_connect_object (device_manager, "device-added",
-                           G_CALLBACK (on_device_added), manager, 0);
+                           G_CALLBACK (on_device_added), idle_monitor, 0);
   g_signal_connect_object (device_manager, "device-removed",
-                           G_CALLBACK (on_device_removed), manager, 0);
+                           G_CALLBACK (on_device_removed), idle_monitor, 0);
   g_signal_connect_object (device_manager, "device-changed",
-                           G_CALLBACK (on_device_changed), manager, 0);
+                           G_CALLBACK (on_device_changed), idle_monitor, 0);
 
-  g_dbus_object_manager_server_set_connection (manager, connection);
+  g_dbus_object_manager_server_set_connection (idle_monitor->server, connection);
 }
 
 static void
@@ -302,26 +340,32 @@ filter_func (GdkXEvent *xevent,
              GdkEvent  *event,
              gpointer   user_data)
 {
-       MetaIdleMonitorDBus *monitor = META_IDLE_MONITOR_DBUS (user_data);
-       MetaBackend *backend = meta_get_backend ();
-       XEvent *xev = (XEvent *) xevent;
-       int i;
-
-       if (xev->type == (monitor->priv->xsync_event_base + XSyncAlarmNotify)) {
-               for (i = 0; i <= backend->device_id_max; i++) {
-                       if (backend->device_monitors[i]) {
-                               meta_idle_monitor_xsync_handle_xevent (backend->device_monitors[i], 
(XSyncAlarmNotifyEvent*) xev);
-                       }
-               }
-       }
-
-       return GDK_FILTER_CONTINUE;
+  FlashbackIdleMonitor *monitor;
+  MetaBackend *backend;
+  XEvent *xev;
+  gint i;
+
+  monitor = FLASHBACK_IDLE_MONITOR (user_data);
+  backend = meta_get_backend ();
+  xev = (XEvent *) xevent;
+
+  if (xev->type == (monitor->xsync_event_base + XSyncAlarmNotify))
+    {
+      for (i = 0; i <= backend->device_id_max; i++)
+        {
+          if (backend->device_monitors[i])
+            meta_idle_monitor_xsync_handle_xevent (backend->device_monitors[i],
+                                                   (XSyncAlarmNotifyEvent*) xev);
+        }
+    }
+
+  return GDK_FILTER_CONTINUE;
 }
 
 static void
-meta_idle_monitor_dbus_dispose (GObject *object)
+flashback_idle_monitor_dispose (GObject *object)
 {
-  MetaIdleMonitorDBus *monitor;
+  FlashbackIdleMonitor *monitor;
   GdkDisplay *display;
   GdkDeviceManager *device_manager;
   GList *master;
@@ -330,12 +374,12 @@ meta_idle_monitor_dbus_dispose (GObject *object)
   GList *iter;
   const gchar *core_path;
 
-  monitor = META_IDLE_MONITOR_DBUS (object);
+  monitor = FLASHBACK_IDLE_MONITOR (object);
 
-  if (monitor->priv->dbus_name_id)
+  if (monitor->dbus_name_id > 0)
     {
-      g_bus_unown_name (monitor->priv->dbus_name_id);
-      monitor->priv->dbus_name_id = 0;
+      g_bus_unown_name (monitor->dbus_name_id);
+      monitor->dbus_name_id = 0;
     }
 
   display = gdk_display_get_default ();
@@ -350,69 +394,78 @@ meta_idle_monitor_dbus_dispose (GObject *object)
 
       device = (GdkDevice *) iter->data;
 
-      on_device_removed (device_manager, device, monitor->priv->server);
+      on_device_removed (device_manager, device, monitor);
     }
 
   g_list_free (devices);
 
   core_path = "/org/gnome/Mutter/IdleMonitor/Core";
-  g_dbus_object_manager_server_unexport (monitor->priv->server, core_path);
+  g_dbus_object_manager_server_unexport (monitor->server, core_path);
 
-  g_clear_object (&monitor->priv->server);
+  g_clear_object (&monitor->server);
 
-  G_OBJECT_CLASS (meta_idle_monitor_dbus_parent_class)->dispose (object);
+  G_OBJECT_CLASS (flashback_idle_monitor_parent_class)->dispose (object);
 }
 
 static void
-meta_idle_monitor_dbus_finalize (GObject *object)
+flashback_idle_monitor_finalize (GObject *object)
 {
-       MetaIdleMonitorDBus *monitor = META_IDLE_MONITOR_DBUS (object);
+  FlashbackIdleMonitor *monitor;
 
-       gdk_window_remove_filter (NULL, filter_func, monitor);
+  monitor = FLASHBACK_IDLE_MONITOR (object);
 
-       G_OBJECT_CLASS (meta_idle_monitor_dbus_parent_class)->finalize (object);
+  gdk_window_remove_filter (NULL, (GdkFilterFunc) filter_func, monitor);
+
+  G_OBJECT_CLASS (flashback_idle_monitor_parent_class)->finalize (object);
 }
 
 static void
-meta_idle_monitor_dbus_init (MetaIdleMonitorDBus *monitor)
+flashback_idle_monitor_init (FlashbackIdleMonitor *monitor)
 {
-       GdkDisplay *display;
-       Display *xdisplay;
-       int major, minor;
-
-       monitor->priv = meta_idle_monitor_dbus_get_instance_private (monitor);
-       monitor->priv->dbus_name_id = g_bus_own_name (G_BUS_TYPE_SESSION,
-                                                     "org.gnome.Mutter.IdleMonitor",
-                                                     G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT |
-                                                     G_BUS_NAME_OWNER_FLAGS_REPLACE,
-                                                     on_bus_acquired,
-                                                     on_name_acquired,
-                                                     on_name_lost,
-                                                     monitor, NULL);
-
-       display = gdk_display_get_default ();
-       xdisplay = gdk_x11_display_get_xdisplay (display);
-
-       if (!XSyncQueryExtension (xdisplay, &monitor->priv->xsync_event_base, 
&monitor->priv->xsync_error_base))
-       g_critical ("Could not query XSync extension");
-
-       if (!XSyncInitialize (xdisplay, &major, &minor))
-       g_critical ("Could not initialize XSync");
-
-       gdk_window_add_filter (NULL, filter_func, monitor);
+  GdkDisplay *display;
+  Display *xdisplay;
+  gint event_base;
+  gint error_base;
+  gint major;
+  gint minor;
+
+  monitor->dbus_name_id = g_bus_own_name (G_BUS_TYPE_SESSION,
+                                          "org.gnome.Mutter.IdleMonitor",
+                                          G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT |
+                                          G_BUS_NAME_OWNER_FLAGS_REPLACE,
+                                          (GBusAcquiredCallback) on_bus_acquired,
+                                          (GBusNameAcquiredCallback) on_name_acquired,
+                                          (GBusNameLostCallback) on_name_lost,
+                                          monitor, NULL);
+
+  display = gdk_display_get_default ();
+  xdisplay = gdk_x11_display_get_xdisplay (display);
+
+  if (!XSyncQueryExtension (xdisplay, &event_base, &error_base))
+    g_critical ("Could not query XSync extension");
+
+  monitor->xsync_event_base = event_base;
+  monitor->xsync_error_base = error_base;
+
+  if (!XSyncInitialize (xdisplay, &major, &minor))
+    g_critical ("Could not initialize XSync");
+
+  gdk_window_add_filter (NULL, (GdkFilterFunc) filter_func, monitor);
 }
 
 static void
-meta_idle_monitor_dbus_class_init (MetaIdleMonitorDBusClass *class)
+flashback_idle_monitor_class_init (FlashbackIdleMonitorClass *monitor_class)
 {
-       GObjectClass *object_class = G_OBJECT_CLASS (class);
+  GObjectClass *object_class;
+
+  object_class = G_OBJECT_CLASS (monitor_class);
 
-       object_class->dispose = meta_idle_monitor_dbus_dispose;
-       object_class->finalize = meta_idle_monitor_dbus_finalize;
+  object_class->dispose = flashback_idle_monitor_dispose;
+  object_class->finalize =flashback_idle_monitor_finalize;
 }
 
-MetaIdleMonitorDBus *
-meta_idle_monitor_dbus_new (void)
+FlashbackIdleMonitor *
+flashback_idle_monitor_new (void)
 {
-       return g_object_new (META_TYPE_IDLE_MONITOR_DBUS, NULL);
+  return g_object_new (FLASHBACK_TYPE_IDLE_MONITOR, NULL);
 }
diff --git a/gnome-flashback/libidle-monitor/flashback-idle-monitor.h 
b/gnome-flashback/libidle-monitor/flashback-idle-monitor.h
new file mode 100644
index 0000000..6f72089
--- /dev/null
+++ b/gnome-flashback/libidle-monitor/flashback-idle-monitor.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef FLASHBACK_IDLE_MONITOR_H
+#define FLASHBACK_IDLE_MONITOR_H
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define FLASHBACK_TYPE_IDLE_MONITOR flashback_idle_monitor_get_type ()
+G_DECLARE_FINAL_TYPE (FlashbackIdleMonitor, flashback_idle_monitor,
+                      FLASHBACK, IDLE_MONITOR, GObject)
+
+FlashbackIdleMonitor *flashback_idle_monitor_new (void);
+
+G_END_DECLS
+
+#endif
diff --git a/gnome-flashback/libidle-monitor/meta-idle-monitor.c 
b/gnome-flashback/libidle-monitor/meta-idle-monitor.c
index c323bdc..78704b8 100644
--- a/gnome-flashback/libidle-monitor/meta-idle-monitor.c
+++ b/gnome-flashback/libidle-monitor/meta-idle-monitor.c
@@ -30,7 +30,6 @@
 
 #include "meta-idle-monitor.h"
 #include "meta-idle-monitor-xsync.h"
-#include "meta-idle-monitor-dbus.h"
 #include "meta-backend.h"
 
 G_STATIC_ASSERT(sizeof(unsigned long) == sizeof(gpointer));
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]