ekiga r6177 - in trunk: . src/clients src/endpoints src/gui

[dsandras svn gnome org]

Author: dsandras
Date: Sat Apr 12 12:13:34 2008
New Revision: 6177
URL: http://svn.gnome.org/viewvc/ekiga?rev=6177&view=rev

Log:
Removed use of deprecated "status" key.


Modified:
   trunk/ChangeLog
   trunk/src/clients/avahi.cpp
   trunk/src/endpoints/manager.cpp
   trunk/src/endpoints/sip.cpp
   trunk/src/gui/main.cpp
   trunk/src/gui/statusicon.cpp

Modified: trunk/src/clients/avahi.cpp
==============================================================================
--- trunk/src/clients/avahi.cpp	(original)
+++ trunk/src/clients/avahi.cpp	Sat Apr 12 12:13:34 2008
@@ -355,7 +355,7 @@
   full_name = gm_conf_get_string (PERSONAL_DATA_KEY "full_name");
   h323_port = gm_conf_get_int (H323_KEY "listen_port");
   sip_port = gm_conf_get_int (SIP_KEY "listen_port");
-  state = gm_conf_get_int (PERSONAL_DATA_KEY "status");
+  std::cout << "FIXME" << std::endl << std::flush;
   gnomemeeting_threads_leave ();
 
   // TODO: largely improve this

Modified: trunk/src/endpoints/manager.cpp
==============================================================================
--- trunk/src/endpoints/manager.cpp	(original)
+++ trunk/src/endpoints/manager.cpp	Sat Apr 12 12:13:34 2008
@@ -83,15 +83,6 @@
 
 
 
-/* DESCRIPTION  :  This callback is called when the status config value changes.
- * BEHAVIOR     :  Updates the presence for the endpoints.
- * PRE          :  /
- */
-static void status_changed_nt (G_GNUC_UNUSED gpointer id,
-                               GmConfEntry *entry,
-                               gpointer data);
-
-
 static  bool same_codec_desc (Ekiga::CodecDescription a, Ekiga::CodecDescription b)
 { 
   return (a.name == b.name && a.rate == b.rate); 
@@ -123,28 +114,6 @@
 }
 
 
-/* DESCRIPTION  :  This callback is called when the status config value changes.
- * BEHAVIOR     :  Updates the presence for the endpoints.
- * PRE          :  /
- */
-static void
-status_changed_nt (G_GNUC_UNUSED gpointer id,
-                   GmConfEntry *entry,
-                   gpointer data)
-{
-  GMManager *ep = (GMManager *) data;
-
-  guint status = CONTACT_ONLINE;
-
-  if (gm_conf_entry_get_type (entry) == GM_CONF_INT) {
-
-    status = gm_conf_entry_get_int (entry);
-    
-    ep->UpdatePublishers ();
-  }
-}
-
-
 class dialer : public PThread
 {
   PCLASSINFO(dialer, PThread);
@@ -906,8 +875,6 @@
   /* GMConf notifiers for what we manager */
   gm_conf_notifier_add (NAT_KEY "public_ip",
 			public_ip_changed_nt, this);
-  gm_conf_notifier_add (PERSONAL_DATA_KEY "status",
-			status_changed_nt, this);
 }
 
 

Modified: trunk/src/endpoints/sip.cpp
==============================================================================
--- trunk/src/endpoints/sip.cpp	(original)
+++ trunk/src/endpoints/sip.cpp	Sat Apr 12 12:13:34 2008
@@ -215,6 +215,7 @@
   // TODO: move this code outside of this class and allow a 
   // more complete document
   std::string status = ((Ekiga::PersonalDetails &) (details)).get_short_status ();
+  std::cout << "ici " << status << std::endl << std::flush;
   for (std::list<std::string>::iterator it = aors.begin ();
        it != aors.end ();
        it++) {

Modified: trunk/src/gui/main.cpp
==============================================================================
--- trunk/src/gui/main.cpp	(original)
+++ trunk/src/gui/main.cpp	Sat Apr 12 12:13:34 2008
@@ -179,7 +179,7 @@
   gint x;
   gint y;
   guint counter;
-  guint last_status;
+  std::string last_status;
   gboolean idle;
 };
 
@@ -2365,7 +2365,8 @@
   GdkModifierType mask;
   gint x, y;
   gint timeout = 0;
-  int status = CONTACT_ONLINE;
+  gchar *st = NULL;
+  std::string status;
                   
   idle = (GmIdleTime *) data;
 
@@ -2375,7 +2376,9 @@
 
   gdk_threads_enter ();
   timeout = gm_conf_get_int (PERSONAL_DATA_KEY "auto_away_timeout");
-  status = gm_conf_get_int (PERSONAL_DATA_KEY "status");
+  st = gm_conf_get_string (PERSONAL_DATA_KEY "short_status");
+  status = st;
+  g_free (st);
   gdk_threads_leave ();
 
   if (x != idle->x && y != idle->y) {
@@ -2393,7 +2396,7 @@
   else
     idle->counter++;
 
-  if (status != CONTACT_ONLINE)
+  if (status != "online")
     return TRUE;
   
   if ((idle->counter > (unsigned) (timeout * 12)) && !idle->idle) {

Modified: trunk/src/gui/statusicon.cpp
==============================================================================
--- trunk/src/gui/statusicon.cpp	(original)
+++ trunk/src/gui/statusicon.cpp	Sat Apr 12 12:13:34 2008
@@ -412,14 +412,10 @@
   Ekiga::ServiceCore *services = NULL;
   GtkFrontend *gtk_frontend = NULL;
 
-  guint status = 0;
-
   services = GnomeMeeting::Process ()->GetServiceCore ();
   gtk_frontend = dynamic_cast<GtkFrontend *>(services->get ("gtk-frontend"));
   main_window = GnomeMeeting::Process ()->GetMainWindow ();
 
-  status = gm_conf_get_int (PERSONAL_DATA_KEY "status");
-
   static MenuEntry menu [] =
     {
 #ifdef HAVE_GNOME