Attachment 48448 Details for Bug 114689

[patch] gnome-volume-manager-libgphoto.patch

gnome-volume-manager-libgphoto.patch (text/plain), 2.93 KB, created by Marcus Meissner on 2005-09-01 12:21:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcus Meissner

Created: 2005-09-01 12:21:15 UTC

Size: 2.93 KB

patch

obsolete

>--- gnome-volume-manager-1.3.5/src/manager.c.xx	2005-08-26 14:18:04.000000000 +0200
>+++ gnome-volume-manager-1.3.5/src/manager.c	2005-08-26 14:19:47.000000000 +0200
>@@ -141,7 +141,7 @@
> 	{ N_("Import _Photos"), NULL, GVM_RESPONSE_IMPORT_PHOTOS },
> };
> 
>-static struct _GvmPromptButton GVM_BUTTONS_PTP_CAMERA[] = {
>+static struct _GvmPromptButton GVM_BUTTONS_LIBGPHOTO2_CAMERA[] = {
> 	{ N_("_Ignore"), NULL, GTK_RESPONSE_CANCEL },
> 	{ N_("Import _Photos"), NULL, GVM_RESPONSE_IMPORT_PHOTOS },
> };
>@@ -172,7 +172,7 @@
> typedef enum {
> 	GVM_PROMPT_AUTORUN,
> 	GVM_PROMPT_IMPORT_CAMERA,
>-	GVM_PROMPT_IMPORT_PTP_CAMERA,
>+	GVM_PROMPT_IMPORT_LIBGPHOTO2_CAMERA,
> 	GVM_PROMPT_IMPORT_PHOTOS,
> 	GVM_PROMPT_IPOD_PHOTO,
> 	GVM_PROMPT_CDA_EXTRA,
>@@ -216,7 +216,7 @@
> 	  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") },
> 	{ 0, "applets-screenshooter", NULL,
>-	  GVM_BUTTONS_PTP_CAMERA, G_N_ELEMENTS (GVM_BUTTONS_PTP_CAMERA),
>+	  GVM_BUTTONS_LIBGPHOTO2_CAMERA, G_N_ELEMENTS (GVM_BUTTONS_LIBGPHOTO2_CAMERA),
> 	  GVM_RESPONSE_IMPORT_PHOTOS,
> 	  N_("Camera Import"),
> 	  N_("A camera has been detected."),
>@@ -721,14 +721,14 @@
> }
> 
> /*
>- * gvm_udi_is_ptp_camera - checks if the udi is a PTP camera device
>+ * gvm_udi_is_libgphoto2_camera - checks if the udi is a libgphoto2 camera device
>  *
>- * Returns TRUE if the device is a PTP camera with libgphoto2 support or FALSE otherwise.
>+ * Returns TRUE if the device is a camera with libgphoto2 support or FALSE otherwise.
>  */
> static gboolean
>-gvm_udi_is_ptp_camera (const char *udi)
>+gvm_udi_is_libgphoto2_camera (const char *udi)
> {
>-	gboolean is_ptp_camera = FALSE;
>+	gboolean is_libgphoto2_camera = FALSE;
> 	char *access_method;
> 	
> 	if (!libhal_device_query_capability (hal_ctx, udi, "camera", NULL))
>@@ -739,12 +739,16 @@
> 	
> 	if (!strcmp (access_method, "ptp")) {
> 		dbg ("PTP Camera detected: %s\n", udi);
>-		is_ptp_camera = TRUE;
>+		is_libgphoto2_camera = TRUE;
>+	}
>+	if (!strcmp (access_method, "libgphoto2")) {
>+		dbg ("libgphoto2 Camera detected: %s\n", udi);
>+		is_libgphoto2_camera = TRUE;
> 	}
> 	
> 	libhal_free_string (access_method);
> 	
>-	return is_ptp_camera;
>+	return is_libgphoto2_camera;
> }
> 
> /*
>@@ -1417,9 +1421,9 @@
> 	} else if (libhal_device_query_capability (hal_ctx, udi, "printer", NULL)) {
> 		if (config.autoprinter)
> 			gvm_run_printer (udi);
>-	} else if (gvm_udi_is_ptp_camera (udi)) {
>-		/* if the device is a PTP camera with libgphoto2 support, launch the user-specified application */
>-		if (config.autophoto && gvm_prompt (GVM_PROMPT_IMPORT_PTP_CAMERA, 0, NULL) == GVM_RESPONSE_IMPORT_PHOTOS)
>+	} else if (gvm_udi_is_libgphoto2_camera (udi)) {
>+		/* if the device is a camera with libgphoto2 support, launch the user-specified application */
>+		if (config.autophoto && gvm_prompt (GVM_PROMPT_IMPORT_LIBGPHOTO2_CAMERA, 0, NULL) == GVM_RESPONSE_IMPORT_PHOTOS)
> 			gvm_run_camera (udi, NULL, NULL);
> 	}
>

Actions: View | Diff

Attachments on bug 114689: 48448