ekiga r7488 - in trunk: . lib/engine/components/opal lib/engine/gui/gtk-core lib/gui pixmaps

[dsandras svn gnome org]

Author: dsandras
Date: Mon Dec 29 20:44:45 2008
New Revision: 7488
URL: http://svn.gnome.org/viewvc/ekiga?rev=7488&view=rev

Log:
Added notifications for the ringing state. It allows making the difference
between somebody who is receiving an incoming call and somebody who is
in a call. Added new icon for that.


Added:
   trunk/pixmaps/status-ringing.png   (contents, props changed)
Removed:
   trunk/pixmaps/status-ringing-16.png
Modified:
   trunk/ChangeLog
   trunk/lib/engine/components/opal/sip-endpoint.cpp
   trunk/lib/engine/gui/gtk-core/gtk-core.cpp
   trunk/lib/gui/gmstockicons.c
   trunk/lib/gui/gmstockicons.h
   trunk/pixmaps/Makefile.am

Modified: trunk/lib/engine/components/opal/sip-endpoint.cpp
==============================================================================
--- trunk/lib/engine/components/opal/sip-endpoint.cpp	(original)
+++ trunk/lib/engine/components/opal/sip-endpoint.cpp	Mon Dec 29 20:44:45 2008
@@ -1060,9 +1060,10 @@
 
     if (s.Find ("Away") != P_MAX_INDEX)
       presence = "away";
-    else if (s.Find ("On the phone") != P_MAX_INDEX
-             || s.Find ("Ringing") != P_MAX_INDEX) 
+    else if (s.Find ("On the phone") != P_MAX_INDEX)
       presence = "inacall";
+    else if (s.Find ("Ringing") != P_MAX_INDEX)
+      presence = "ringing";
     else if (s.Find ("dnd") != P_MAX_INDEX
              || s.Find ("Do Not Disturb") != P_MAX_INDEX) 
       presence = "dnd";
@@ -1099,6 +1100,7 @@
 Opal::Sip::EndPoint::OnDialogInfoReceived (const SIPDialogNotification & info)
 {
   gchar* status = NULL;
+  std::string presence;
   PString uri = info.m_entity;
   PString remote_uri = info.m_remote.m_identity;
   PString remote_display_name = info.m_remote.m_display.IsEmpty () ? remote_uri : info.m_remote.m_display;
@@ -1110,12 +1112,14 @@
         status = g_strdup_printf (_("Incoming call from %s"), (const char *) remote_display_name);
       else
         status = g_strdup_printf (_("Incoming call"));
+      presence = "ringing";
       break;
     case SIPDialogNotification::Confirmed:
       if (!remote_display_name.IsEmpty ())
         status = g_strdup_printf (_("In a call with %s"), (const char *) remote_display_name);
       else
         status = g_strdup_printf (_("In a call"));
+      presence = "inacall";
       break;
     default:
     case SIPDialogNotification::Trying:
@@ -1124,7 +1128,7 @@
   }
 
   if (status)
-    runtime->run_in_main (sigc::bind (sigc::ptr_fun (presence_status_in_main), this, uri, "inacall", status));
+    runtime->run_in_main (sigc::bind (sigc::ptr_fun (presence_status_in_main), this, uri, presence, status));
   else
     runtime->run_in_main (sigc::bind (sigc::ptr_fun (presence_status_in_main), this, uri, uri_presences[uri].first, uri_presences[uri].second));
 }

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	Mon Dec 29 20:44:45 2008
@@ -71,8 +71,8 @@
   gtk_icon_factory_add (factory, "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, "freeforchat", icon_set);
+  icon_set = gtk_icon_factory_lookup_default (GM_STOCK_STATUS_RINGING);
+  gtk_icon_factory_add (factory, "ringing", icon_set);
   gtk_icon_set_unref (icon_set);
 
   icon_set = gtk_icon_factory_lookup_default (GTK_STOCK_ADD);

Modified: trunk/lib/gui/gmstockicons.c
==============================================================================
--- trunk/lib/gui/gmstockicons.c	(original)
+++ trunk/lib/gui/gmstockicons.c	Mon Dec 29 20:44:45 2008
@@ -61,15 +61,13 @@
 	{
 	        { GM_STOCK_COLOR_BRIGHTNESS_CONTRAST, gm_color_brightness_contrast_stock_data },
 
-		{ GM_STOCK_STATUS_FREEFORCHAT, gm_status_freeforchat_stock_data },
-		{ GM_STOCK_STATUS_RINGING, gm_status_ringing_stock_data },
-
 		{ GM_STOCK_STATUS_ONLINE, gm_status_online_stock_data },
 		{ GM_STOCK_STATUS_OFFLINE, gm_status_offline_stock_data },
 		{ 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_16 },
+		{ GM_STOCK_STATUS_RINGING, gm_status_ringing_stock_data_16 },
 
 		{ GM_STOCK_REMOTE_OBJECT, gm_remote_contact_stock_data},
 		{ GM_STOCK_LOCAL_OBJECT, gm_local_contact_stock_data},

Modified: trunk/lib/gui/gmstockicons.h
==============================================================================
--- trunk/lib/gui/gmstockicons.h	(original)
+++ trunk/lib/gui/gmstockicons.h	Mon Dec 29 20:44:45 2008
@@ -56,8 +56,6 @@
 
 /* True stock icons */
 #define GM_STOCK_COLOR_BRIGHTNESS_CONTRAST   "gm_color_brightness_contrast_stock"
-#define GM_STOCK_STATUS_FREEFORCHAT "gm_status_freeforchat_stock"
-#define GM_STOCK_STATUS_RINGING "gm_status_ringing_stock"
 #define GM_STOCK_LOCAL_OBJECT    "local-object"
 #define GM_STOCK_REMOTE_OBJECT   "remote-object"
 #define GM_STOCK_MESSAGE          "gm_message_stock"
@@ -72,6 +70,7 @@
 #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_inacall_stock_16"
+#define GM_STOCK_STATUS_RINGING "gm_status_ringing_stock_16"
 
 #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	Mon Dec 29 20:44:45 2008
@@ -37,7 +37,6 @@
 	24x24/contact-new.png \
 	24x24/internet-group-chat.png \
 	color-brightness-contrast.png \
-	status-ringing-16.png \
 	local_contact.png \
 	remote_contact.png \
 	message.png \
@@ -52,6 +51,7 @@
 	status-freeforchat.png \
 	status-dnd.png \
 	status-inacall.png \
+	status-ringing.png \
 	ekiga-logo.png \
 	24x24/phone-hang-up.png \
 	24x24/phone-pick-up.png \
@@ -84,7 +84,6 @@
 	gm_whiteness_16_stock_data $(srcdir)/16x16/stock_channel-blue.png \
 	gm_color_brightness_contrast_stock_data $(srcdir)/color-brightness-contrast.png \
 	gm_status_freeforchat_stock_data $(srcdir)/status-freeforchat.png \
-	gm_status_ringing_stock_data $(srcdir)/status-ringing-16.png \
 	gm_remote_contact_stock_data $(srcdir)/remote_contact.png \
 	gm_local_contact_stock_data $(srcdir)/local_contact.png \
 	gm_message_stock_data $(srcdir)/message.png \
@@ -97,6 +96,7 @@
 	gm_status_unknown_stock_data $(srcdir)/status-unknown.png \
 	gm_status_dnd_stock_data $(srcdir)/status-dnd.png \
 	gm_status_inacall_stock_data_16 $(srcdir)/16x16/multimedia-headset.png \
+	gm_status_ringing_stock_data_16 $(srcdir)/status-ringing.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-ringing.png
==============================================================================
Binary file. No diff available.