ekiga r6660 - in trunk: . src/gui

[dsandras svn gnome org]

Author: dsandras
Date: Wed Aug 20 18:03:02 2008
New Revision: 6660
URL: http://svn.gnome.org/viewvc/ekiga?rev=6660&view=rev

Log:
Removed motion detection.


Modified:
   trunk/ChangeLog
   trunk/ekiga.schemas.in.in
   trunk/src/gui/main.cpp
   trunk/src/gui/preferences.cpp

Modified: trunk/ekiga.schemas.in.in
==============================================================================
--- trunk/ekiga.schemas.in.in	(original)
+++ trunk/ekiga.schemas.in.in	Wed Aug 20 18:03:02 2008
@@ -168,17 +168,6 @@
       </locale>
     </schema>
     <schema>
-      <key>/schemas/apps/@PACKAGE_NAME@/general/personal_data/auto_away_timeout</key>
-      <applyto>/apps/@PACKAGE_NAME@/general/personal_data/auto_away_timeout</applyto>
-      <owner>Ekiga</owner>
-      <type>int</type>
-      <default>2</default>
-      <locale name="C">
-	<short>Auto Away Timeout</short>
-	<long>Timeout after which the user is automatically set as away</long>
-      </locale>
-    </schema>
-    <schema>
       <key>/schemas/apps/@PACKAGE_NAME@/codecs/audio/list</key>
       <applyto>/apps/@PACKAGE_NAME@/codecs/audio/list</applyto>
       <owner>Ekiga</owner>

Modified: trunk/src/gui/main.cpp
==============================================================================
--- trunk/src/gui/main.cpp	(original)
+++ trunk/src/gui/main.cpp	Wed Aug 20 18:03:02 2008
@@ -355,13 +355,6 @@
 #endif
 
 
-/* DESCRIPTION  :  This callback is triggered every 5 seconds.
- * BEHAVIOR     :  Checks if the user has to be set as away or not.
- * PRE          :  /
- */
-static gboolean motion_detection_cb (gpointer data);
-
-
 /** Pull a trigger from a Ekiga::Service
  *
  * @param data is a pointer to the Ekiga::Trigger
@@ -2588,65 +2581,6 @@
 #endif
 
 
-static gboolean
-motion_detection_cb (gpointer data)
-{
-  GmIdleTime *idle = NULL;
-
-  GtkWidget *main_window = NULL;
-  
-  GdkModifierType mask;
-  gint x, y;
-  gint timeout = 0;
-  gchar *status = NULL;
-                  
-  idle = (GmIdleTime *) data;
-
-  main_window = GnomeMeeting::Process ()->GetMainWindow ();
-  gdk_window_get_pointer (GDK_WINDOW (GTK_WIDGET (main_window)->window), 
-                          &x, &y, &mask);
-
-  //gdk_threads_enter ();
-  timeout = gm_conf_get_int (PERSONAL_DATA_KEY "auto_away_timeout");
-  status = gm_conf_get_string (PERSONAL_DATA_KEY "short_status");
-  //gdk_threads_leave ();
-
-  if (x != idle->x && y != idle->y) {
-    
-    idle->x = x;
-    idle->y = y;
-    idle->counter = 0;
-
-    if (idle->idle == TRUE) {
-      
-      gm_conf_set_string (PERSONAL_DATA_KEY "short_status", idle->last_status);
-      idle->idle = FALSE;
-      g_free (idle->last_status);
-    }
-  }
-  else
-    idle->counter++;
-
-  if (status && strcmp ("online", status)) {
-    g_free (status);
-    return TRUE;
-  }
-  
-  if ((idle->counter > (unsigned) (timeout * 12)) && !idle->idle) {
-
-    idle->idle = TRUE;
-
-    //gdk_threads_enter ();
-    idle->last_status = g_strdup (status);
-    gm_conf_set_string (PERSONAL_DATA_KEY "short_status", "away");
-    //gdk_threads_leave ();
-  }
-  g_free (status);
-
-  return TRUE;
-}
-
-
 static void 
 pull_trigger_cb (GtkWidget * /*widget*/,
                  gpointer data)
@@ -4092,13 +4026,6 @@
   g_signal_connect (G_OBJECT (window), "expose-event", 
 		    GTK_SIGNAL_FUNC (video_window_expose_cb), NULL);
   
-  /* Idle for motion notify events */
-  g_timeout_add_full (G_PRIORITY_DEFAULT_IDLE,
-                      5000, 
-                      motion_detection_cb, 
-                      (gpointer) g_new0 (GmIdleTime, 1), 
-                      (GDestroyNotify) g_free);
-
   /* New Display Engine signals */
   Ekiga::VideoOutputCore *videooutput_core = dynamic_cast<Ekiga::VideoOutputCore *> (mw->core.get ("videooutput-core"));
 

Modified: trunk/src/gui/preferences.cpp
==============================================================================
--- trunk/src/gui/preferences.cpp	(original)
+++ trunk/src/gui/preferences.cpp	Wed Aug 20 18:03:02 2008
@@ -414,13 +414,6 @@
                                 _("Video Display"), 1, 2);
 
   gnome_prefs_toggle_new (subsection, _("Place windows displaying video _above other windows"), VIDEO_DISPLAY_KEY "stay_on_top", _("Place windows displaying video above other windows during calls"), 0);
-  
-  /* Auto Away */
-  subsection =
-    gnome_prefs_subsection_new (prefs_window, container, 
-                                _("Auto Away"), 1, 2);
-
-  gnome_prefs_spin_new (subsection, _("Timeout after which the user is automatically set as away (in minutes):"), PERSONAL_DATA_KEY "auto_away_timeout", _("Automatically set the user as away after the timeout has elapsed (in minutes)"), 1.0, 60.0, 1.0, 1, NULL, true);
 }
 
 static void