[gnome-flashback] idle-monitor: remove



commit 634fd26c41d27a6c712b5832ab98932c5968b07f
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sat Mar 21 16:22:44 2015 +0200

    idle-monitor: remove
    
    Idle monitor was added only to fix invisible cursor bug. Cursor
    plugin has been removed from gnome-settings-daemon since 3.15.92
    version.

 configure.ac                                     |    5 -----
 data/org.gnome.gnome-flashback.gschema.xml.in.in |    5 -----
 gnome-flashback/Makefile.am                      |    2 --
 gnome-flashback/flashback-application.c          |   14 --------------
 4 files changed, 0 insertions(+), 26 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 7170b3b..78f5d32 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,10 +53,6 @@ PKG_CHECK_MODULES(DISPLAY_CONFIG, gtk+-3.0 >= $GTK_REQUIRED)
 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(KEY_GRABBER, gtk+-3.0 >= $GTK_REQUIRED x11)
 AC_SUBST(KEY_GRABBER_CFLAGS)
 AC_SUBST(KEY_GRABBER_LIBS)
@@ -76,7 +72,6 @@ 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/libkey-grabber/Makefile
 gnome-flashback/libsound-applet/Makefile
 gnome-flashback/libsound-applet/gvc/Makefile
diff --git a/data/org.gnome.gnome-flashback.gschema.xml.in.in 
b/data/org.gnome.gnome-flashback.gschema.xml.in.in
index 9e91388..a546760 100644
--- a/data/org.gnome.gnome-flashback.gschema.xml.in.in
+++ b/data/org.gnome.gnome-flashback.gschema.xml.in.in
@@ -20,11 +20,6 @@
                        <_summary>End session dialog</_summary>
                        <_description>If set to true, then GNOME Flashback application will be used to show 
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="key-grabber" type="b">
                        <default>true</default>
                        <_summary>Key grabber</_summary>
diff --git a/gnome-flashback/Makefile.am b/gnome-flashback/Makefile.am
index b250193..7fcfde8 100644
--- a/gnome-flashback/Makefile.am
+++ b/gnome-flashback/Makefile.am
@@ -3,7 +3,6 @@ SUBDIRS = \
        libdesktop-background \
        libdisplay-config \
        libend-session-dialog \
-       libidle-monitor \
        libkey-grabber \
        libsound-applet
 
@@ -28,7 +27,6 @@ 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/libkey-grabber/libkey-grabber.la \
        $(top_builddir)/gnome-flashback/libsound-applet/libsound-applet.la
 
diff --git a/gnome-flashback/flashback-application.c b/gnome-flashback/flashback-application.c
index 457d1dd..445b9ce 100644
--- a/gnome-flashback/flashback-application.c
+++ b/gnome-flashback/flashback-application.c
@@ -23,7 +23,6 @@
 #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 "libkey-grabber/flashback-key-grabber.h"
 #include "libsound-applet/gvc-applet.h"
 
@@ -33,7 +32,6 @@
 #define KEY_DISPLAY_CONFIG     "display-config"
 #define KEY_END_SESSION_DIALOG "end-session-dialog"
 #define KEY_KEY_GRABBER        "key-grabber"
-#define KEY_IDLE_MONITOR       "idle-monitor"
 #define KEY_SOUND_APPLET       "sound-applet"
 
 struct _FlashbackApplicationPrivate {
@@ -43,7 +41,6 @@ struct _FlashbackApplicationPrivate {
        FlashbackDisplayConfig     *config;
        FlashbackEndSessionDialog  *dialog;
        FlashbackKeyGrabber        *grabber;
-       MetaIdleMonitorDBus        *idle_monitor;
        GvcApplet                  *applet;
 
        gint                        bus_name;
@@ -98,16 +95,6 @@ flashback_application_settings_changed (GSettings   *settings,
                }
        }
 
-       if (key == NULL || g_strcmp0 (key, KEY_IDLE_MONITOR) == 0) {
-               if (g_settings_get_boolean (settings, KEY_IDLE_MONITOR)) {
-                       if (app->priv->idle_monitor == NULL) {
-                               app->priv->idle_monitor = meta_idle_monitor_dbus_new ();
-                       }
-               } else {
-                       g_clear_object (&app->priv->idle_monitor);
-               }
-       }
-
        if (key == NULL || g_strcmp0 (key, KEY_KEY_GRABBER) == 0) {
                if (g_settings_get_boolean (settings, KEY_KEY_GRABBER)) {
                        if (app->priv->grabber == NULL) {
@@ -143,7 +130,6 @@ flashback_application_finalize (GObject *object)
        g_clear_object (&app->priv->background);
        g_clear_object (&app->priv->config);
        g_clear_object (&app->priv->dialog);
-       g_clear_object (&app->priv->idle_monitor);
        g_clear_object (&app->priv->grabber);
        g_clear_object (&app->priv->applet);
        g_clear_object (&app->priv->settings);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]