empathy r1813 - trunk/libempathy-gtk

[xclaesse svn gnome org]

Author: xclaesse
Date: Fri Nov 21 16:18:38 2008
New Revision: 1813
URL: http://svn.gnome.org/viewvc/empathy?rev=1813&view=rev

Log:
Renamed ft_manager_get_state_change_reason_description to ft_manager_state_change_reason_to_string and fixed the default unknown state return type. (Jonny Lamb)

Signed-off-by: Jonny Lamb <jonny lamb collabora co uk>

Modified:
   trunk/libempathy-gtk/empathy-ft-manager.c

Modified: trunk/libempathy-gtk/empathy-ft-manager.c
==============================================================================
--- trunk/libempathy-gtk/empathy-ft-manager.c	(original)
+++ trunk/libempathy-gtk/empathy-ft-manager.c	Fri Nov 21 16:18:38 2008
@@ -207,7 +207,7 @@
 }
 
 static const gchar *
-ft_manager_get_state_change_reason_description (EmpFileTransferStateChangeReason reason)
+ft_manager_state_change_reason_to_string (EmpFileTransferStateChangeReason reason)
 {
   switch (reason)
     {
@@ -222,7 +222,7 @@
       case EMP_FILE_TRANSFER_STATE_CHANGE_REASON_REMOTE_ERROR:
         return _("The other participant is unable to transfer the file");
       default:
-        g_return_val_if_reached ("");
+        return _("Unknown reason");
     }
 }
 
@@ -343,7 +343,7 @@
             contact_name);
 
       second_line = g_strdup_printf (_("File transfer canceled: %s"),
-          ft_manager_get_state_change_reason_description (reason));
+          ft_manager_state_change_reason_to_string (reason));
 
       break;