[Pkg-xfce-commits] r2564 - in goodies/thunar-volman/debian: . patches

[corsac at alioth.debian.org]

Author: corsac
Date: 2008-11-29 08:30:25 +0000 (Sat, 29 Nov 2008)
New Revision: 2564

Added:
   goodies/thunar-volman/debian/patches/
   goodies/thunar-volman/debian/patches/01_display-volume-info-for-crypto-layer.patch
Modified:
   goodies/thunar-volman/debian/changelog
Log:
01_display-volume-info-for-crypto-layer added, display device
name when asking the passphrase of a crypto-container. (Xfce #4656)

Modified: goodies/thunar-volman/debian/changelog
===================================================================
--- goodies/thunar-volman/debian/changelog	2008-11-28 07:14:27 UTC (rev 2563)
+++ goodies/thunar-volman/debian/changelog	2008-11-29 08:30:25 UTC (rev 2564)
@@ -4,6 +4,8 @@
   * debian/patches:
     - 01_autoipod_command_only_for_music_players dropped, included upstream.
     - 02_encrypted-volumes dropped, included upstream.
+    - 01_display-volume-info-for-crypto-layer added, display device
+      name when asking the passphrase of a crypto-container. (Xfce #4656)
   * debian/copyright:
     - updated dates.
     - added copyright for Colin Leroy patch.
@@ -12,7 +14,7 @@
     - updated build-dep on exo for Xfce 4.6 Alpha.
     - add explicit build-dep on gtk.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 19 Oct 2008 19:09:11 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 29 Nov 2008 09:02:51 +0100
 
 thunar-volman (0.2.0-3) experimental; urgency=low
 

Added: goodies/thunar-volman/debian/patches/01_display-volume-info-for-crypto-layer.patch
===================================================================
--- goodies/thunar-volman/debian/patches/01_display-volume-info-for-crypto-layer.patch	                        (rev 0)
+++ goodies/thunar-volman/debian/patches/01_display-volume-info-for-crypto-layer.patch	2008-11-29 08:30:25 UTC (rev 2564)
@@ -0,0 +1,76 @@
+Index: thunar-volman/tvm-device.c
+===================================================================
+--- thunar-volman/tvm-device.c	(revision 6216)
++++ thunar-volman/tvm-device.c	(working copy)
+@@ -112,7 +112,7 @@
+   if (G_UNLIKELY (context == NULL))
+     {
+       /* out of memory */
+-      g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_NOMEM, g_strerror (ENOMEM));
++      g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_NOMEM, "%s", g_strerror (ENOMEM));
+       return FALSE;
+     }
+ 
+Index: thunar-volman/tvm-crypto-volume.c
+===================================================================
+--- thunar-volman/tvm-crypto-volume.c	(revision 6216)
++++ thunar-volman/tvm-crypto-volume.c	(working copy)
+@@ -278,6 +278,9 @@
+   GtkWidget *wait_progress;
+   GtkWidget *image;
+   guint animator_id;
++  const gchar *device_file = libhal_volume_get_device_file(volume);
++  gchar *text;
++
+   g_clear_error(error);
+ 
+   window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+@@ -294,7 +297,9 @@
+   gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
+   gtk_widget_show (image);
+ 
+-  label = gtk_label_new(_("<span weight=\"bold\" size=\"larger\">Mounting encrypted volume...</span>"));
++  text = g_strdup_printf(_("<span weight=\"bold\" size=\"larger\">Mounting %s...</span>"), device_file);
++  label = gtk_label_new(text);
++  g_free(text);
+   gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
+   gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+   gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, FALSE, 0);
+@@ -321,7 +326,7 @@
+   if (G_UNLIKELY (message == NULL))
+     {
+       /* out of memory */
+-oom:  g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_NOMEM, g_strerror (ENOMEM));
++oom:  g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_NOMEM, "%s", g_strerror (ENOMEM));
+       goto out;
+     }
+ 
+@@ -440,14 +445,21 @@
+   
+   for (num_tries = 0; num_tries < 3; num_tries++) {
+     gint response,len;
++    gchar *title, *text;
++    const gchar *device_file = libhal_volume_get_device_file(volume);
++    title = pass_error? g_strdup_printf(_("<span weight=\"bold\" size=\"larger\">"
++                                          "Wrong password.</span>"))
++                      : g_strdup_printf(_("<span weight=\"bold\" size=\"larger\">"
++                                          "Volume %s is encrypted.</span>"), device_file);
++    text = g_strdup_printf(_("Please enter your password to decrypt and mount the volume %s."), device_file);
++
+     response = tvm_crypto_volume_ask_password (context, udi, "gtk-dialog-authentication", _("Encrypted volume"),
+-               &password, FALSE, GTK_RESPONSE_OK,
+-                                             pass_error? _("<span weight=\"bold\" size=\"larger\">Wrong password.</span>")
+-                                :_("<span weight=\"bold\" size=\"larger\">This volume is encrypted.</span>"),
+-                                             _("Please enter your password to decrypt and mount the volume."),
+-                                             _("Ig_nore"), GTK_RESPONSE_CANCEL,
+-                                             _("_Mount"), GTK_RESPONSE_OK,
+-                                             NULL);
++	       &password, FALSE, GTK_RESPONSE_OK, title, text,
++	       _("Ig_nore"), GTK_RESPONSE_CANCEL,
++	       _("_Mount"), GTK_RESPONSE_OK,
++	       NULL);
++    g_free(title);
++    g_free(text);
+     if (response == GTK_RESPONSE_CANCEL || response == GTK_RESPONSE_DELETE_EVENT) {
+       g_clear_error(error);
+       num_tries = 3;