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

[dsandras svn gnome org]

Author: dsandras
Date: Sat Sep  6 19:49:50 2008
New Revision: 6849
URL: http://svn.gnome.org/viewvc/ekiga?rev=6849&view=rev

Log:
Added icon for transfer action. Renamed forward methods into transfer
methods, let's not confuse forwarding a call and transferring a call
in the API.


Added:
   trunk/pixmaps/call-transfer.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-endpoint.cpp
   trunk/src/endpoints/sip-endpoint.h

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	Sat Sep  6 19:49:50 2008
@@ -115,6 +115,10 @@
   gtk_icon_factory_add (factory, "clear", icon_set);
   gtk_icon_set_unref (icon_set);
 
+  icon_set = gtk_icon_factory_lookup_default (GM_STOCK_CALL_TRANSFER);
+  gtk_icon_factory_add (factory, "transfer", icon_set);
+  gtk_icon_set_unref (icon_set);
+
   gtk_icon_factory_add_default (factory);
   g_object_unref (factory);
 }

Modified: trunk/lib/gui/gmstockicons.c
==============================================================================
--- trunk/lib/gui/gmstockicons.c	(original)
+++ trunk/lib/gui/gmstockicons.c	Sat Sep  6 19:49:50 2008
@@ -77,6 +77,7 @@
 		{ GM_STOCK_CALL_PLACED, gm_call_placed_stock_data},
 		{ GM_STOCK_CALL_MISSED, gm_call_missed_stock_data},
 		{ GM_STOCK_CALL_RECEIVED, gm_call_received_stock_data},
+		{ GM_STOCK_CALL_TRANSFER, gm_call_transfer_stock_data},
 
 		{ GM_STOCK_PHONE_HANG_UP_16, gm_phone_hang_up_stock_data_16},
 		{ GM_STOCK_PHONE_PICK_UP_16, gm_phone_pick_up_stock_data_16},

Modified: trunk/lib/gui/gmstockicons.h
==============================================================================
--- trunk/lib/gui/gmstockicons.h	(original)
+++ trunk/lib/gui/gmstockicons.h	Sat Sep  6 19:49:50 2008
@@ -64,6 +64,7 @@
 #define GM_STOCK_CALL_PLACED      "gm_call_placed_stock"
 #define GM_STOCK_CALL_MISSED      "gm_call_missed_stock"
 #define GM_STOCK_CALL_RECEIVED    "gm_call_received_stock"
+#define GM_STOCK_CALL_TRANSFER    "gm_call_transfer_stock"
 
 #define GM_STOCK_STATUS_ONLINE "gm_status_online_stock"
 #define GM_STOCK_STATUS_OFFLINE "gm_status_offline_stock"

Modified: trunk/pixmaps/Makefile.am
==============================================================================
--- trunk/pixmaps/Makefile.am	(original)
+++ trunk/pixmaps/Makefile.am	Sat Sep  6 19:49:50 2008
@@ -44,6 +44,7 @@
 	call-placed.png \
 	call-missed.png \
 	call-received.png \
+	call-transfer.png \
 	status-online.png \
 	status-offline.png \
 	status-unknown.png \
@@ -92,6 +93,7 @@
 	gm_call_placed_stock_data $(srcdir)/call-placed.png \
 	gm_call_received_stock_data $(srcdir)/call-received.png \
 	gm_call_missed_stock_data $(srcdir)/call-missed.png \
+	gm_call_transfer_stock_data $(srcdir)/call-transfer.png \
 	gm_status_online_stock_data $(srcdir)/status-online.png \
 	gm_status_offline_stock_data $(srcdir)/status-offline.png \
 	gm_status_unknown_stock_data $(srcdir)/status-unknown.png \

Added: trunk/pixmaps/call-transfer.png
==============================================================================
Binary file. No diff available.

Modified: trunk/src/endpoints/sip-endpoint.cpp
==============================================================================
--- trunk/src/endpoints/sip-endpoint.cpp	(original)
+++ trunk/src/endpoints/sip-endpoint.cpp	Sat Sep  6 19:49:50 2008
@@ -268,22 +268,22 @@
        it++) {
 
     std::stringstream call_action;
-    std::stringstream forward_action;
+    std::stringstream transfer_action;
     if (!(*ita).empty ()) {
       call_action << _("Call") << " [" << (*ita) << "]";
-      forward_action << _("Transfer") << " [" << (*ita) << "]";
+      transfer_action << _("Transfer") << " [" << (*ita) << "]";
     }
     else {
       call_action << _("Call");
-      forward_action << _("Transfer");
+      transfer_action << _("Transfer");
     }
 
     if (0 == GetConnectionCount ())
       builder.add_action ("call", call_action.str (),
                           sigc::bind (sigc::mem_fun (this, &Opal::Sip::EndPoint::on_dial), (*it)));
     else 
-      builder.add_action ("transfer", forward_action.str (),
-                          sigc::bind (sigc::mem_fun (this, &Opal::Sip::EndPoint::on_forward), (*it)));
+      builder.add_action ("transfer", transfer_action.str (),
+                          sigc::bind (sigc::mem_fun (this, &Opal::Sip::EndPoint::on_transfer), (*it)));
 
     ita++;
   }
@@ -1112,7 +1112,7 @@
   dialect->start_chat_with (uri, name);
 }
 
-void Opal::Sip::EndPoint::on_forward (std::string uri)
+void Opal::Sip::EndPoint::on_transfer (std::string uri)
 {
   PStringList connections = GetAllConnections ();
   /* FIXME : we don't handle several connections here */

Modified: trunk/src/endpoints/sip-endpoint.h
==============================================================================
--- trunk/src/endpoints/sip-endpoint.h	(original)
+++ trunk/src/endpoints/sip-endpoint.h	Sat Sep  6 19:49:50 2008
@@ -166,7 +166,7 @@
       void on_dial (std::string uri);
       void on_message (std::string uri,
 		       std::string name);
-      void on_forward (std::string uri);
+      void on_transfer (std::string uri);
 
       PMutex msgDataMutex;
       msgDict msgData;