vinagre r516 - trunk/src

[jwendell svn gnome org]

Author: jwendell
Date: Sat Nov 15 12:32:38 2008
New Revision: 516
URL: http://svn.gnome.org/viewvc/vinagre?rev=516&view=rev

Log:
minor tweeks

Modified:
   trunk/src/vinagre-commands.c
   trunk/src/vinagre-main.c
   trunk/src/vinagre-notebook.c
   trunk/src/vinagre-utils.c

Modified: trunk/src/vinagre-commands.c
==============================================================================
--- trunk/src/vinagre-commands.c	(original)
+++ trunk/src/vinagre-commands.c	Sat Nov 15 12:32:38 2008
@@ -88,6 +88,12 @@
     }
 }
 
+static void
+vinagre_cmd_free_string_list (gpointer str, gpointer user_data)
+{
+  g_free (str);
+}
+
 void
 vinagre_cmd_machine_open (GtkAction     *action,
 			  VinagreWindow *window)
@@ -98,7 +104,7 @@
   GtkFileFilter     *filter;
   GSList            *files, *l;
   gchar             *uri;
-  gchar             *error;
+  gchar             *error = NULL;
   GSList            *errors = NULL;
 
   g_return_if_fail (VINAGRE_IS_WINDOW (window));
@@ -135,9 +141,8 @@
 	    }
 	  else
 	    {
-	      errors = g_slist_append (errors, g_strdup (uri));
-	      if (error)
-	        g_free (error);
+	      errors = g_slist_append (errors, g_strdup_printf ("<i>%s</i>: %s", uri, error?error:_("Unknown error")));
+	      g_free (error);
 	    }
 
 	  g_free (uri);
@@ -146,14 +151,17 @@
     }
 
   if (errors)
-    vinagre_utils_show_many_errors (ngettext ("The following file could not be opened:",
-					      "The following files could not be opened:",
-					      g_slist_length (errors)),
-				    errors,
-				    GTK_WINDOW (window));
+    {
+      vinagre_utils_show_many_errors (ngettext ("The following file could not be opened:",
+						 "The following files could not be opened:",
+						 g_slist_length (errors)),
+				      errors,
+				      GTK_WINDOW (window));
+      g_slist_foreach (errors, vinagre_cmd_free_string_list, NULL);
+      g_slist_free (errors);
+    }
 
   gtk_widget_destroy (dialog);
-
 }
 
 void

Modified: trunk/src/vinagre-main.c
==============================================================================
--- trunk/src/vinagre-main.c	(original)
+++ trunk/src/vinagre-main.c	Sat Nov 15 12:32:38 2008
@@ -79,7 +79,7 @@
 	  else
 	    {
 	      errors = g_slist_prepend (errors,
-					g_strdup_printf ("%s: %s",
+					g_strdup_printf ("<i>%s</i>: %s",
 							files[i],
 							error ? error : _("Unknown error")));
 	      if (error)
@@ -98,7 +98,7 @@
 	    servers = g_slist_prepend (servers, conn);
 	  else
 	    errors = g_slist_prepend (errors,
-				      g_strdup_printf ("%s: %s",
+				      g_strdup_printf ("<i>%s</i>: %s",
 						       remaining_args[i],
 						       error ? error : _("Unknown error")));
 

Modified: trunk/src/vinagre-notebook.c
==============================================================================
--- trunk/src/vinagre-notebook.c	(original)
+++ trunk/src/vinagre-notebook.c	Sat Nov 15 12:32:38 2008
@@ -124,7 +124,7 @@
   gchar *message, *name;
 
   name = vinagre_connection_get_best_name (vinagre_tab_get_conn (tab));
-  message = g_strdup_printf (_("Connection to host \"%s\" was closed."),
+  message = g_strdup_printf (_("Connection to host <i>%s</i> was closed."),
 			     name);
   vinagre_utils_show_error (_("Connection closed"), message, GTK_WINDOW (nb->priv->window));
   g_free (message);

Modified: trunk/src/vinagre-utils.c
==============================================================================
--- trunk/src/vinagre-utils.c	(original)
+++ trunk/src/vinagre-utils.c	Sat Nov 15 12:32:38 2008
@@ -84,7 +84,7 @@
   g_free (t);
 
   if (message)
-    gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (d),
+    gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (d),
 					      "%s",
 					      message);