ekiga r6325 - in trunk: . src/gui

[dsandras svn gnome org]

Author: dsandras
Date: Mon May 26 20:24:24 2008
New Revision: 6325
URL: http://svn.gnome.org/viewvc/ekiga?rev=6325&view=rev

Log:
Fixed initial display for the status menu now that the long_status
gmconf key can be empty.


Modified:
   trunk/ChangeLog
   trunk/src/gui/statusmenu.cpp

Modified: trunk/src/gui/statusmenu.cpp
==============================================================================
--- trunk/src/gui/statusmenu.cpp	(original)
+++ trunk/src/gui/statusmenu.cpp	Mon May 26 20:24:24 2008
@@ -572,8 +572,7 @@
         break;
     }
     if (i == TYPE_ONLINE || i == TYPE_AWAY || i == TYPE_DND) {
-      if (!strcmp (status_types_names[i], short_status)
-	  && status && !strcmp (long_status, status))
+      if (!strcmp (status_types_names[i], short_status)) 
         break;
     }
 
@@ -876,7 +875,6 @@
                         long_status_message_changed, self);
   gm_conf_notifier_add (PERSONAL_DATA_KEY "short_status", 
                         short_status_message_changed, self);
-  gm_conf_notifier_trigger (PERSONAL_DATA_KEY "long_status");
   gm_conf_notifier_trigger (PERSONAL_DATA_KEY "short_status");
 }