[gnome-flashback] Revert "idle-monitor: remove"

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

commit 38ed7dd4317e55aacab2f019337493ec3055ee3e
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Tue Mar 31 14:29:49 2015 +0300

    Revert "idle-monitor: remove"
    
    This reverts commit 634fd26c41d27a6c712b5832ab98932c5968b07f.
    
    Conflicts:
        configure.ac
        data/org.gnome.gnome-flashback.gschema.xml.in.in
        gnome-flashback/Makefile.am
        gnome-flashback/flashback-application.c

 configure.ac                                     |    5 +++++
 data/org.gnome.gnome-flashback.gschema.xml.in.in |    5 +++++
 gnome-flashback/Makefile.am                      |    2 ++
 gnome-flashback/flashback-application.c          |    4 ++++
 4 files changed, 16 insertions(+), 0 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 69d0d98..758e912 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,6 +53,10 @@ PKG_CHECK_MODULES(DISPLAY_CONFIG, gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_RE
 AC_SUBST(DISPLAY_CONFIG_CFLAGS)
 AC_SUBST(DISPLAY_CONFIG_LIBS)
 
+PKG_CHECK_MODULES(IDLE_MONITOR, gtk+-3.0 >= $GTK_REQUIRED x11 xext)
+AC_SUBST(IDLE_MONITOR_CFLAGS)
+AC_SUBST(IDLE_MONITOR_LIBS)
+
 PKG_CHECK_MODULES(SCREENCAST, gtk+-3.0 >= $GTK_REQUIRED)
 AC_SUBST(SCREENCAST_CFLAGS)
 AC_SUBST(SCREENCAST_LIBS)
@@ -80,6 +84,7 @@ gnome-flashback/libautomount-manager/Makefile
 gnome-flashback/libdesktop-background/Makefile
 gnome-flashback/libdisplay-config/Makefile
 gnome-flashback/libend-session-dialog/Makefile
+gnome-flashback/libidle-monitor/Makefile
 gnome-flashback/libscreencast/Makefile
 gnome-flashback/libscreenshot/Makefile
 gnome-flashback/libshell/Makefile
diff --git a/data/org.gnome.gnome-flashback.gschema.xml.in.in 
b/data/org.gnome.gnome-flashback.gschema.xml.in.in
index 8271f33..09fb265 100644
--- a/data/org.gnome.gnome-flashback.gschema.xml.in.in
+++ b/data/org.gnome.gnome-flashback.gschema.xml.in.in
@@ -20,6 +20,11 @@
                        <_summary>End session dialog</_summary>
                        <_description>If set to true, then GNOME Flashback application will be used to show 
the end session dialog.</_description>
                </key>
+               <key name="idle-monitor" type="b">
+                       <default>true</default>
+                       <_summary>Idle monitor</_summary>
+                       <_description>If set to true, then GNOME Flashback application will be used for user 
activity monitoring.</_description>
+               </key>
                <key name="screencast" type="b">
                        <default>true</default>
                        <_summary>Screencasts</_summary>
diff --git a/gnome-flashback/Makefile.am b/gnome-flashback/Makefile.am
index df1e9e3..de87a1b 100644
--- a/gnome-flashback/Makefile.am
+++ b/gnome-flashback/Makefile.am
@@ -3,6 +3,7 @@ SUBDIRS = \
        libdesktop-background \
        libdisplay-config \
        libend-session-dialog \
+       libidle-monitor \
        libscreencast \
        libscreenshot \
        libshell \
@@ -30,6 +31,7 @@ gnome_flashback_LDADD = \
        $(top_builddir)/gnome-flashback/libdesktop-background/libdesktop-background.la \
        $(top_builddir)/gnome-flashback/libdisplay-config/libdisplay-config.la \
        $(top_builddir)/gnome-flashback/libend-session-dialog/libend-session-dialog.la \
+       $(top_builddir)/gnome-flashback/libidle-monitor/libidle-monitor.la \
        $(top_builddir)/gnome-flashback/libscreencast/libscreencast.la \
        $(top_builddir)/gnome-flashback/libscreenshot/libscreenshot.la \
        $(top_builddir)/gnome-flashback/libshell/libshell.la \
diff --git a/gnome-flashback/flashback-application.c b/gnome-flashback/flashback-application.c
index 8d8bb37..c61806e 100644
--- a/gnome-flashback/flashback-application.c
+++ b/gnome-flashback/flashback-application.c
@@ -23,6 +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 "libscreencast/flashback-screencast.h"
 #include "libscreenshot/flashback-screenshot.h"
 #include "libshell/flashback-shell.h"
@@ -42,6 +43,7 @@ struct _FlashbackApplication
   DesktopBackground         *background;
   FlashbackDisplayConfig    *config;
   FlashbackEndSessionDialog *dialog;
+  MetaIdleMonitorDBus       *idle_monitor;
   FlashbackScreencast       *screencast;
   FlashbackScreenshot       *screenshot;
   FlashbackShell            *shell;
@@ -127,6 +129,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 (dialog, "end-session-dialog", flashback_end_session_dialog_new)
   SETTING_CHANGED (screencast, "screencast", flashback_screencast_new)
   SETTING_CHANGED (screenshot, "screenshot", flashback_screenshot_new)
@@ -160,6 +163,7 @@ flashback_application_finalize (GObject *object)
   g_clear_object (&application->background);
   g_clear_object (&application->config);
   g_clear_object (&application->dialog);
+  g_clear_object (&application->idle_monitor);
   g_clear_object (&application->screencast);
   g_clear_object (&application->screenshot);
   g_clear_object (&application->shell);