gnome-mount r166 - in trunk: . src

[davidz svn gnome org]

Author: davidz
Date: Wed Apr 16 23:23:41 2008
New Revision: 166
URL: http://svn.gnome.org/viewvc/gnome-mount?rev=166&view=rev

Log:
2008-04-16  David Zeuthen  <davidz redhat com>

        * src/gnome-mount.c (get_password): Mention the partition number
        in the unlock encrypted data dialog.



Modified:
   trunk/ChangeLog
   trunk/src/gnome-mount.c

Modified: trunk/src/gnome-mount.c
==============================================================================
--- trunk/src/gnome-mount.c	(original)
+++ trunk/src/gnome-mount.c	Wed Apr 16 23:23:41 2008
@@ -2159,7 +2159,7 @@
 	LibHalDrive     *drv;
 	char            *model;
 	char            *vendor;
-
+        char            *title;
 
 	keyring_password = NULL;
 	keyring_is_session = FALSE;
@@ -2229,11 +2229,23 @@
 	 */
 	notify_parent (TRUE);
 
-	prompt = g_strdup_printf (
-		_("The storage device %s contains encrypted data. Enter a password to unlock."), drive_name);
-	
-	dialog = gnome_password_dialog_new (_("Unlock Encrypted Data"), prompt, NULL, NULL, FALSE);
+        if (libhal_volume_is_partition (volume)) {
+                prompt = g_strdup_printf (_("The storage device %s contains encrypted data on partition %d. "
+                                            "Enter a password to unlock."),
+                                          drive_name,
+                                          libhal_volume_get_partition_number (volume));
+                title = g_strdup_printf (_("Unlock Encrypted Data (partition %d)"),
+                                         libhal_volume_get_partition_number (volume));
+        } else {
+                prompt = g_strdup_printf (_("The storage device %s contains encrypted data. "
+                                            "Enter a password to unlock."),
+                                          drive_name);
+                title = g_strdup_printf (_("Unlock Encrypted Data"));
+        }
+
+	dialog = gnome_password_dialog_new (title, prompt, NULL, NULL, FALSE);
 	g_free (prompt);
+        g_free (title);
 
 	gnome_password_dialog_set_show_username (GNOME_PASSWORD_DIALOG (dialog), FALSE);
 	gnome_password_dialog_set_show_userpass_buttons (GNOME_PASSWORD_DIALOG (dialog), FALSE);