empathy r1914 - trunk/src

[xclaesse svn gnome org]

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

Log:
If first_line xor second_line is NULL, use only one line in ft_manager_update_ft_row.

Modified:
   trunk/src/empathy-ft-manager.c

Modified: trunk/src/empathy-ft-manager.c
==============================================================================
--- trunk/src/empathy-ft-manager.c	(original)
+++ trunk/src/empathy-ft-manager.c	Fri Nov 21 16:25:15 2008
@@ -182,7 +182,8 @@
   GtkTreeIter iter;
   const gchar *filename;
   const gchar *contact_name;
-  gchar *msg = NULL;
+  const gchar *msg;
+  gchar *msg_dup = NULL;
   gchar *remaining_str = NULL;
   gchar *first_line_format;
   gchar *first_line = NULL;
@@ -309,7 +310,9 @@
     remaining_str = ft_manager_format_interval (remaining);
 
   if (first_line != NULL && second_line != NULL)
-    msg = g_strdup_printf ("%s\n%s", first_line, second_line);
+    msg = msg_dup = g_strdup_printf ("%s\n%s", first_line, second_line);
+  else
+    msg = first_line ? first_line : second_line;
 
   /* Set new values in the store */
   path = gtk_tree_row_reference_get_path (row_ref);
@@ -323,7 +326,7 @@
 
   gtk_tree_path_free (path);
 
-  g_free (msg);
+  g_free (msg_dup);
   g_free (first_line);
   g_free (second_line);
   g_free (remaining_str);