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

[fejj svn gnome org]

Author: fejj
Date: Sun Feb 15 20:50:38 2009
New Revision: 1417
URL: http://svn.gnome.org/viewvc/gnome-volume-manager?rev=1417&view=rev

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

	* src/manager.c: Changed all "import photos?" prompts to use the
	same gconf "don't ask again" key.
	(prompt_response_cb): Allow saving the result even if the response
	is GTK_RESPONSE_CANCEL. Fixes bug #557364.

	* gnome-volume-manager.schemas.in: Applied patch by Jerry Tan to
	default autophoto_command to `gthumb --import-photos`. Fixes bug
	#560735.

	* src/manager.c (gvm_console_kit_sesion_get_uid): ConsoleKit 0.3
	changed the return value from Int32 to UInt32 so check for either
	type. Based on a patch by Donnie Berkholz. Fixes bug #571872.



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/gnome-volume-manager.schemas.in
   trunk/src/manager.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun Feb 15 20:50:38 2009
@@ -1,6 +1,6 @@
 AC_PREREQ(2.52)
 
-AC_INIT(gnome-volume-manager, 2.24.0)
+AC_INIT(gnome-volume-manager, 2.24.1)
 AC_CONFIG_SRCDIR(src)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AM_CONFIG_HEADER(config.h)

Modified: trunk/gnome-volume-manager.schemas.in
==============================================================================
--- trunk/gnome-volume-manager.schemas.in	(original)
+++ trunk/gnome-volume-manager.schemas.in	Sun Feb 15 20:50:38 2009
@@ -200,7 +200,7 @@
         <key>/schemas/desktop/gnome/volume_manager/autophoto</key>
 	<applyto>/desktop/gnome/volume_manager/autophoto</applyto>
 	<type>bool</type>
-	<default>false</default>
+	<default>true</default>
 	<locale name="C">
 	  <short>Run photo management command</short>
 	  <long>Whether, when a digital camera is connected or media from a
@@ -213,7 +213,7 @@
         <key>/schemas/desktop/gnome/volume_manager/autophoto_command</key>
 	<applyto>/desktop/gnome/volume_manager/autophoto_command</applyto>
 	<type>string</type>
-	<default></default>
+	<default>gthumb --import-photos</default>
 	<locale name="C">
 	  <short>Photo management command</short>
 	  <long>Command to run when a digital camera is connected or media 
@@ -465,8 +465,8 @@
       </schema>
 
       <schema>
-        <key>/schemas/desktop/gnome/volume_manager/prompts/camera_import_photos</key>
-	<applyto>/desktop/gnome/volume_manager/prompts/camera_import_photos</applyto>
+        <key>/schemas/desktop/gnome/volume_manager/prompts/import_photos</key>
+	<applyto>/desktop/gnome/volume_manager/prompts/import_photos</applyto>
 	<type>int</type>
 	<default>0</default>
 	<locale name="C">
@@ -476,17 +476,6 @@
       </schema>
 
       <schema>
-        <key>/schemas/desktop/gnome/volume_manager/prompts/device_import_photos</key>
-	<applyto>/desktop/gnome/volume_manager/prompts/device_import_photos</applyto>
-	<type>int</type>
-	<default>0</default>
-	<locale name="C">
-	  <short>"Always take this action" checkbox for photo import from a device</short>
-	  <long>Action to take when a device containing photos is encountered.</long>
-	</locale>
-      </schema>
-
-      <schema>
         <key>/schemas/desktop/gnome/volume_manager/prompts/ipod_photo</key>
 	<applyto>/desktop/gnome/volume_manager/prompts/ipod_photo</applyto>
 	<type>int</type>

Modified: trunk/src/manager.c
==============================================================================
--- trunk/src/manager.c	(original)
+++ trunk/src/manager.c	Sun Feb 15 20:50:38 2009
@@ -371,21 +371,21 @@
 	  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/camera_import_photos", N_("_Always perform this action") },
+	  GCONF_ROOT "prompts/import_photos", 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/storage_camera_import_photos", N_("_Always perform this action") },
+	  GCONF_ROOT "prompts/import_photos", N_("_Always perform this action") },
 	{ 0, "camera-photo", NULL,
 	  GVM_BUTTONS_CAMERA, G_N_ELEMENTS (GVM_BUTTONS_CAMERA),
 	  GVM_RESPONSE_IMPORT_PHOTOS,
 	  N_("Photo Import"),
 	  N_("A photo card has been detected."),
 	  N_("There are photos on the card. Would you like to add these pictures to your album?"), FALSE, FALSE,
-	  GCONF_ROOT "prompts/device_import_photos", N_("_Always perform this action") },
+	  GCONF_ROOT "prompts/import_photos", N_("_Always perform this action") },
 	{ 0, "gnome-dev-ipod", NULL,
 	  GVM_BUTTONS_IPOD_PHOTO, G_N_ELEMENTS (GVM_BUTTONS_IPOD_PHOTO),
 	  GVM_RESPONSE_SYNC_MUSIC,
@@ -463,7 +463,7 @@
 	}
 	
 	checkbox = g_object_get_data ((GObject *) dialog, "checkbox");
-	if (checkbox && gtk_toggle_button_get_active (checkbox) && response != GTK_RESPONSE_CANCEL) {
+	if (checkbox && gtk_toggle_button_get_active (checkbox)) {
 		gconf = gconf_client_get_default ();
 		gconf_client_set_int (gconf, gvm_prompts[ctx->prompt].ask_again_key, response, NULL);
 		g_object_unref (gconf);