ekiga r6341 - in trunk: . src/gui

[dsandras svn gnome org]

Author: dsandras
Date: Sun Jun  1 17:17:52 2008
New Revision: 6341
URL: http://svn.gnome.org/viewvc/ekiga?rev=6341&view=rev

Log:
Fixed problem when setting custom message. Done from Templehof
airport, Berlin :-)


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	Sun Jun  1 17:17:52 2008
@@ -567,12 +567,15 @@
                         COL_MESSAGE_TYPE, &i,
                         COL_MESSAGE, &status, -1); 
 
+    // Check if it is a custom status message and if it is in the list
     if (i == TYPE_CUSTOM_ONLINE || i == TYPE_CUSTOM_AWAY || i == TYPE_CUSTOM_DND) {
       if (!strcmp (status_types_names[i - NUM_STATUS_TYPES - 1], short_status) && !strcmp (long_status, status))
         break;
     }
+
+    // Long status empty, the user did not set a custom message
     if (i == TYPE_ONLINE || i == TYPE_AWAY || i == TYPE_DND) {
-      if (!strcmp (status_types_names[i], short_status)) 
+      if (long_status && !strcmp(long_status, "") && !strcmp (status_types_names[i], short_status)) 
         break;
     }