gnome-applets r10652 - in trunk/trashapplet: . src

[ryanl svn gnome org]

Author: ryanl
Date: Wed Feb 13 08:40:49 2008
New Revision: 10652
URL: http://svn.gnome.org/viewvc/gnome-applets?rev=10652&view=rev

Log:
2008-02-13  Ryan Lortie  <desrt desrt ca>

        * src/trash-empty.c:
        * src/trashapplet.c: revert accidental string changes



Modified:
   trunk/trashapplet/ChangeLog
   trunk/trashapplet/src/trash-empty.c
   trunk/trashapplet/src/trashapplet.c

Modified: trunk/trashapplet/src/trash-empty.c
==============================================================================
--- trunk/trashapplet/src/trash-empty.c	(original)
+++ trunk/trashapplet/src/trash-empty.c	Wed Feb 13 08:40:49 2008
@@ -69,12 +69,20 @@
   /* maybe the done() got processed first. */
   if (trash_empty_dialog)
     {
+      char *index_str, *total_str;
       char *text;
       char *tmp;
 
-      text = g_strdup_printf (_("Removing item %d of %d"),
-                              deleted + 1, total);
+      /* this is seriously broken, but we're string frozen... */
+      /* FIXME: change to %d of %d after branching.
+       */
+      index_str = g_strdup_printf (G_GSIZE_FORMAT, deleted + 1);
+      total_str = g_strdup_printf (G_GSIZE_FORMAT, total);
+      text = g_strdup_printf (_("Removing item %s of %s"),
+                              index_str, total_str);
       gtk_progress_bar_set_text (trash_empty_progress_bar, text);
+      g_free (total_str);
+      g_free (index_str);
       g_free (text);
 
       if (deleted > total)
@@ -95,7 +103,7 @@
       g_free (text);
 
       tmp = g_file_get_basename (file);
-      text = g_markup_printf_escaped ("<i>%s %s</i>", _("Removing:"), tmp);
+      text = g_markup_printf_escaped (_("<i>Removing: %s</i>"), tmp);
       gtk_label_set_markup (trash_empty_file, text);
       g_free (text);
       g_free (tmp);

Modified: trunk/trashapplet/src/trashapplet.c
==============================================================================
--- trunk/trashapplet/src/trashapplet.c	(original)
+++ trunk/trashapplet/src/trashapplet.c	Wed Feb 13 08:40:49 2008
@@ -727,10 +727,13 @@
 						trashed == NULL)) {
 			for (l = untrashable; l; l = l->next) {
 				if (!g_file_delete (l->data, NULL, &error)) {
+/*
+ * FIXME: uncomment me after branched (we're string frozen)
 					error_dialog (applet,
 						      _("Unable to delete '%s': %s"),
 							g_file_get_uri (l->data),
 							error->message);
+*/
 					g_clear_error (&error);
 				}	
 			}