ekiga r6294 - in trunk: . lib/engine/gui/gtk-core lib/gui pixmaps src/endpoints

[dsandras svn gnome org]

Author: dsandras
Date: Tue May 20 20:54:30 2008
New Revision: 6294
URL: http://svn.gnome.org/viewvc/ekiga?rev=6294&view=rev

Log:
Attempt to add an icon for the "On The Phone" state reported by
Asterisk..


Added:
   trunk/pixmaps/status-inacall.png   (contents, props changed)
Modified:
   trunk/ChangeLog
   trunk/lib/engine/gui/gtk-core/gtk-core.cpp
   trunk/lib/gui/gmstockicons.c
   trunk/lib/gui/gmstockicons.h
   trunk/pixmaps/Makefile.am
   trunk/src/endpoints/sip.cpp

Modified: trunk/lib/engine/gui/gtk-core/gtk-core.cpp
==============================================================================
--- trunk/lib/engine/gui/gtk-core/gtk-core.cpp	(original)
+++ trunk/lib/engine/gui/gtk-core/gtk-core.cpp	Tue May 20 20:54:30 2008
@@ -67,6 +67,10 @@
   gtk_icon_factory_add (factory, "presence-dnd", icon_set);
   gtk_icon_set_unref (icon_set);
 
+  icon_set = gtk_icon_factory_lookup_default (GM_STOCK_STATUS_INACALL);
+  gtk_icon_factory_add (factory, "presence-inacall", icon_set);
+  gtk_icon_set_unref (icon_set);
+
   icon_set = gtk_icon_factory_lookup_default (GM_STOCK_STATUS_FREEFORCHAT);
   gtk_icon_factory_add (factory, "presence-freeforchat", icon_set);
   gtk_icon_set_unref (icon_set);

Modified: trunk/lib/gui/gmstockicons.c
==============================================================================
--- trunk/lib/gui/gmstockicons.c	(original)
+++ trunk/lib/gui/gmstockicons.c	Tue May 20 20:54:30 2008
@@ -69,6 +69,7 @@
 		{ GM_STOCK_STATUS_UNKNOWN, gm_status_unknown_stock_data },
 		{ GM_STOCK_STATUS_AWAY, gm_status_away_stock_data },
 		{ GM_STOCK_STATUS_DND, gm_status_dnd_stock_data },
+		{ GM_STOCK_STATUS_INACALL, gm_status_inacall_stock_data },
 
 		{ GM_STOCK_REMOTE_CONTACT, gm_remote_contact_stock_data},
 		{ GM_STOCK_LOCAL_CONTACT, gm_local_contact_stock_data},

Modified: trunk/lib/gui/gmstockicons.h
==============================================================================
--- trunk/lib/gui/gmstockicons.h	(original)
+++ trunk/lib/gui/gmstockicons.h	Tue May 20 20:54:30 2008
@@ -70,6 +70,7 @@
 #define GM_STOCK_STATUS_UNKNOWN "gm_status_unknown_stock"
 #define GM_STOCK_STATUS_AWAY "gm_status_away_stock"
 #define GM_STOCK_STATUS_DND "gm_status_dnd_stock"
+#define GM_STOCK_STATUS_INACALL "gm_status_in_a_call_stock"
 
 #define GM_STOCK_PHONE_HANG_UP_16    "gm_phone_hang_up_stock_16"
 #define GM_STOCK_PHONE_PICK_UP_16    "gm_phone_pick_up_stock_16"

Modified: trunk/pixmaps/Makefile.am
==============================================================================
--- trunk/pixmaps/Makefile.am	(original)
+++ trunk/pixmaps/Makefile.am	Tue May 20 20:54:30 2008
@@ -38,6 +38,7 @@
 	status-away.png \
 	status-freeforchat.png \
 	status-dnd.png \
+	status-inacall.png \
 	24x24/phone-hang-up.png \
 	24x24/phone-pick-up.png \
 	16x16/phone-hang-up.png \
@@ -75,6 +76,7 @@
 	gm_status_offline_stock_data $(srcdir)/status-offline.png \
 	gm_status_unknown_stock_data $(srcdir)/status-unknown.png \
 	gm_status_dnd_stock_data $(srcdir)/status-dnd.png \
+	gm_status_inacall_stock_data $(srcdir)/status-inacall.png \
 	gm_status_away_stock_data $(srcdir)/status-away.png \
 	gm_phone_hang_up_stock_data_24 $(srcdir)/24x24/phone-hang-up.png \
 	gm_phone_pick_up_stock_data_24 $(srcdir)/24x24/phone-pick-up.png \

Added: trunk/pixmaps/status-inacall.png
==============================================================================
Binary file. No diff available.

Modified: trunk/src/endpoints/sip.cpp
==============================================================================
--- trunk/src/endpoints/sip.cpp	(original)
+++ trunk/src/endpoints/sip.cpp	Tue May 20 20:54:30 2008
@@ -892,6 +892,7 @@
   PCaselessString b = basic;
   PCaselessString s = note;
 
+  // TODO long status
   std::string status;
   std::string presence = "presence-unknown";
 
@@ -911,8 +912,11 @@
     status = _("Away");
   }
   else if (s.Find ("On the phone") != P_MAX_INDEX
-           || s.Find ("dnd") != P_MAX_INDEX
-           || s.Find ("Ringing") != P_MAX_INDEX
+           || s.Find ("Ringing") != P_MAX_INDEX) {
+    presence = "presence-inacall";
+    status = _("In A Call");
+  }
+  else if (s.Find ("dnd") != P_MAX_INDEX
            || s.Find ("Do Not Disturb") != P_MAX_INDEX) {
     presence = "presence-dnd";
     status = _("Do Not Disturb");