gnome-volume-manager r1421 - in trunk: . src

[fejj svn gnome org]

Author: fejj
Date: Mon Feb 16 23:16:32 2009
New Revision: 1421
URL: http://svn.gnome.org/viewvc/gnome-volume-manager?rev=1421&view=rev

Log:
2009-02-16  Jeffrey Stedfast  <fejj novell com>

	* src/manager.c: I think I was wrong about how all "import photos"
	keys should be the same, they have different options. Reverted
	that change.



Modified:
   trunk/ChangeLog
   trunk/src/manager.c

Modified: trunk/src/manager.c
==============================================================================
--- trunk/src/manager.c	(original)
+++ trunk/src/manager.c	Mon Feb 16 23:16:32 2009
@@ -371,14 +371,14 @@
 	  N_("Camera Import"),
 	  N_("A camera has been detected."),
 	  N_("There are photos on the camera. Would you like to add these pictures to your album?"), FALSE, FALSE,
-	  GCONF_ROOT "prompts/import_photos", N_("_Always perform this action") },
+	  GCONF_ROOT "prompts/import_camera", N_("_Always perform this action") },
 	{ 0, "camera-photo", NULL,
 	  GVM_BUTTONS_STORAGE_CAMERA, G_N_ELEMENTS (GVM_BUTTONS_STORAGE_CAMERA),
 	  GVM_RESPONSE_IMPORT_PHOTOS,
 	  N_("Camera Import"),
 	  N_("A camera has been detected."),
 	  N_("There are photos on the camera. Would you like to add these pictures to your album?"), FALSE, FALSE,
-	  GCONF_ROOT "prompts/import_photos", N_("_Always perform this action") },
+	  GCONF_ROOT "prompts/import_storage_camera", N_("_Always perform this action") },
 	{ 0, "camera-photo", NULL,
 	  GVM_BUTTONS_CAMERA, G_N_ELEMENTS (GVM_BUTTONS_CAMERA),
 	  GVM_RESPONSE_IMPORT_PHOTOS,