GNOME.org
 

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

Author: fejj
Date: Sat Apr 26 15:36:01 2008
New Revision: 1364
URL: http://svn.gnome.org/viewvc/gnome-volume-manager?rev=1364&view=rev

Log:
2008-04-26  Jeffrey Stedfast  <fejj novell com>

	* configure.in: Bumped version to 2.22.4

	* src/manager.c: Disabled more stuff and fixed up other stuff.

	* src/properties.c: Disabled UI for iPod preferences. Apparently
	this is also now handled by Nautilus.



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/src/gvm.h
   trunk/src/manager.c
   trunk/src/properties.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sat Apr 26 15:36:01 2008
@@ -1,6 +1,6 @@
 AC_PREREQ(2.52)
 
-AC_INIT(gnome-volume-manager, 2.22.3)
+AC_INIT(gnome-volume-manager, 2.22.4)
 AC_CONFIG_SRCDIR(src)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AM_CONFIG_HEADER(config.h)

Modified: trunk/src/gvm.h
==============================================================================
--- trunk/src/gvm.h	(original)
+++ trunk/src/gvm.h	Sat Apr 26 15:36:01 2008
@@ -15,6 +15,7 @@
 	
 	char *filemanager;
 	
+	/* Storage */
 	gboolean automount_drives;
 	gboolean automount_media;
 	gboolean autobrowse;
@@ -27,48 +28,45 @@
 	char *autoburn_audio_cd_command;
 	char *autoburn_data_cd_command;
 	
+	/* Multimedia */
 	gboolean autoplay_cda;
 	char *autoplay_cda_command;
-	
 	gboolean autoplay_dvd;
 	char *autoplay_dvd_command;
-	
 	gboolean autoplay_vcd;
 	char *autoplay_vcd_command;
+	gboolean autoipod;
+	char *autoipod_command;
 	
+	/* Cameras */
 	gboolean autophoto;
 	char *autophoto_command;
+	gboolean autowebcam;
+	char *autowebcam_command;
+	gboolean autovideocam;
+	char *autovideocam_command;
 	
-	gboolean autoipod;
-	char *autoipod_command;
+	/* PDAs */
+	gboolean autopilot;
+	char *autopilot_command;
+	gboolean autopocketpc;
+	char *autopocketpc_command;
 	
+	/* Printers / Scanners */
 	gboolean autoprinter;
 	char *autoprinter_command;
-	
-	gboolean autowebcam;
-	char *autowebcam_command;
-
 	gboolean autoscanner;
 	char *autoscanner_command;
 	
+	/* Input Devices */
 	gboolean autokeyboard;
 	char *autokeyboard_command;
-	
 	gboolean automouse;
 	char *automouse_command;
-	
 	gboolean autotablet;
 	char *autotablet_command;
 	
-	gboolean autovideocam;
-	char *autovideocam_command;
-	
-	gboolean autopilot;
-	char *autopilot_command;
-	
-	gboolean autopocketpc;
-	char *autopocketpc_command;
-        
+	/* Notification */
         double percent_threshold;
         double percent_used;
 };

Modified: trunk/src/manager.c
==============================================================================
--- trunk/src/manager.c	(original)
+++ trunk/src/manager.c	Sat Apr 26 15:36:01 2008
@@ -116,9 +116,10 @@
 } type_t;
 
 enum {
+	FILEMANAGER,
+	
 #ifdef ENABLE_AUTOMOUNT
 	/* Storage */
-	FILEMANAGER,
 	AUTOBROWSE,
 	AUTOBURN,
 	AUTOBURN_AUDIO_CD_COMMAND,
@@ -129,19 +130,17 @@
 	AUTOOPEN_PATH,
 	AUTORUN,
 	AUTORUN_PATH,
-#endif /* ENABLE_AUTOMOUNT */
 	
 	/* Multimedia */
-#ifdef ENABLE_AUTOMOUNT
 	AUTOPLAY_CDA,
 	AUTOPLAY_CDA_COMMAND,
 	AUTOPLAY_DVD,
 	AUTOPLAY_DVD_COMMAND,
 	AUTOPLAY_VCD,
 	AUTOPLAY_VCD_COMMAND,
-#endif /* ENABLE_AUTOMOUNT */
 	AUTOIPOD,
 	AUTOIPOD_COMMAND,
+#endif /* ENABLE_AUTOMOUNT */
 	
 	/* Cameras */
 	AUTOPHOTO,
@@ -182,9 +181,9 @@
 	type_t type;
 	void *var;
 } gvm_settings[] = {
+	{ GCONF_ROOT "filemanager",               TYPE_STRING, &config.filemanager               },
 #ifdef ENABLE_AUTOMOUNT
 	/* Storage */
-	{ GCONF_ROOT "filemanager",               TYPE_STRING, &config.filemanager               },
 	{ GCONF_ROOT "autobrowse",                TYPE_BOOL,   &config.autobrowse                },
 	{ GCONF_ROOT "autoburn",                  TYPE_BOOL,   &config.autoburn                  },
 	{ GCONF_ROOT "autoburn_audio_cd_command", TYPE_STRING, &config.autoburn_audio_cd_command },
@@ -195,19 +194,17 @@
 	{ GCONF_ROOT "autoopen_path",             TYPE_STRING, &config.autoopen_path             },
 	{ GCONF_ROOT "autorun",                   TYPE_BOOL,   &config.autorun                   },
 	{ GCONF_ROOT "autorun_path",              TYPE_STRING, &config.autorun_path              },
-#endif /* ENABLE_AUTOMOUNT */
 	
 	/* Multimedia */
-#ifdef ENABLE_AUTOMOUNT
 	{ GCONF_ROOT "autoplay_cda",              TYPE_BOOL,   &config.autoplay_cda              },
 	{ GCONF_ROOT "autoplay_cda_command",      TYPE_STRING, &config.autoplay_cda_command      },
 	{ GCONF_ROOT "autoplay_dvd",              TYPE_BOOL,   &config.autoplay_dvd              },
 	{ GCONF_ROOT "autoplay_dvd_command",      TYPE_STRING, &config.autoplay_dvd_command      },
 	{ GCONF_ROOT "autoplay_vcd",              TYPE_BOOL,   &config.autoplay_vcd              },
 	{ GCONF_ROOT "autoplay_vcd_command",      TYPE_STRING, &config.autoplay_vcd_command      },
-#endif /* ENABLE_AUTOMOUNT */
 	{ GCONF_ROOT "autoipod",                  TYPE_BOOL,   &config.autoipod                  },
 	{ GCONF_ROOT "autoipod_command",          TYPE_STRING, &config.autoipod_command          },
+#endif /* ENABLE_AUTOMOUNT */
 	
 	/* Cameras */
 	{ GCONF_ROOT "autophoto",                 TYPE_BOOL,   &config.autophoto                 },
@@ -898,6 +895,7 @@
 	return exists;
 }
 
+#ifdef ENABLE_AUTOMOUNT
 /*
  * gvm_check_dvd - is this a Video DVD?  If so, do something about it.
  *
@@ -933,6 +931,7 @@
 	
 	return is_vcd;
 }
+#endif /* ENABLE_AUTOMOUNT */
 
 /*
  * gvm_udi_is_storage_camera - checks if the udi is a mass-storage camera device
@@ -1073,6 +1072,7 @@
 }
 #endif
 
+#ifdef ENABLE_AUTOMOUNT
 /*
  * gvm_udi_is_portable_media_player - checks if the udi is the mountable volume of a media player
  *
@@ -1109,6 +1109,7 @@
 	
 	return is_player;
 }
+#endif /* ENABLE_AUTOMOUNT */
 
 /*
  * gvm_run_camera - launch the camera application
@@ -1295,15 +1296,6 @@
 		gvm_run_camera (ctx->udi, ctx->device, ctx->mount_point);
 }
 
-#ifdef ENABLE_AUTOMOUNT
-static gboolean
-is_exe (const char *path)
-{
-	size_t len;
-	
-	return (len = strlen (path)) > 4 && !g_ascii_strcasecmp (path + len - 4, ".exe");
-}
-
 static void
 gvm_run_filemanager (const char *udi, const char *device, const char *mount_point)
 {
@@ -1315,6 +1307,15 @@
 	gvm_run_command (command, udi, device, mount_point);
 }
 
+#ifdef ENABLE_AUTOMOUNT
+static gboolean
+is_exe (const char *path)
+{
+	size_t len;
+	
+	return (len = strlen (path)) > 4 && !g_ascii_strcasecmp (path + len - 4, ".exe");
+}
+
 static void
 autorun_cb (GvmPromptCtx *ctx, int action)
 {
@@ -1715,6 +1716,7 @@
 	
 	return gvm_autorun_prompt (GVM_PROMPT_AUTOOPEN, udi, device, mount_point, value);
 }
+#endif /* ENABLE_AUTOMOUNT */
 
 /*
  * gvm_autorun - automatically execute stuff
@@ -1724,16 +1726,19 @@
 static void
 gvm_autorun (const char *udi, const char *device, const char *mount_point)
 {
+#ifdef ENABLE_AUTOMOUNT
 	char **autopath, *argv[1], *path;
 	gboolean handled = FALSE;
+#endif
 	GvmPromptCtx *ctx;
-	int i;
 	
+#ifdef ENABLE_AUTOMOUNT
 	if (gvm_check_dvd (udi, device, mount_point))
 		return;
 	
 	if (gvm_check_vcd (udi, device, mount_point))
 		return;
+#endif /* ENABLE_AUTOMOUNT */
 	
 	if (config.autophoto && gvm_check_photos (udi, device, mount_point)) {
 		ctx = gvm_prompt_ctx_new (GVM_PROMPT_IMPORT_PHOTOS, import_photos_cb, udi, device, mount_point, NULL);
@@ -1741,8 +1746,10 @@
 		return;
 	}
 	
+#ifdef ENABLE_AUTOMOUNT
 	if (config.autorun && config.autorun_path) {
 		struct stat st;
+		int i;
 		
 		autopath = g_strsplit (config.autorun_path, ":", -1);
 		
@@ -1773,6 +1780,7 @@
 	
 	if (config.autoopen && config.autoopen_path) {
 		FILE *fp;
+		int i;
 		
 		autopath = g_strsplit (config.autoopen_path, ":", -1);
 		
@@ -1798,9 +1806,10 @@
 	
 	if (config.autobrowse)
 		gvm_run_filemanager (udi, device, mount_point);
-}
 #endif /* ENABLE_AUTOMOUNT */
+}
 
+#ifdef ENABLE_AUTOMOUNT
 static gboolean
 gvm_udi_is_subfs_mount (const char *udi)
 {
@@ -1822,6 +1831,7 @@
 	
 	return subfs;
 }
+#endif
 
 static gboolean
 gvm_storage_device_is_cdrom (const char *storage)
@@ -1867,6 +1877,7 @@
 	}
 }
 
+#ifdef ENABLE_AUTOMOUNT
 static void
 ipod_photo_cb (GvmPromptCtx *ctx, int action)
 {
@@ -1881,6 +1892,7 @@
 		break;
 	}
 }
+#endif
 
 /*
  * gvm_device_mounted - called once a device has been
@@ -1893,8 +1905,10 @@
 gvm_device_mounted (const char *udi)
 {
 	char *mount_point = NULL;
-	char *device = NULL;
+#ifdef ENABLE_AUTOMOUNT
 	gboolean is_ipod = FALSE;
+#endif
+	char *device = NULL;
 	GvmPromptCtx *ctx;
 	DBusError error;
 	
@@ -1913,9 +1927,11 @@
 		goto out;
 	}
 	
+#ifdef ENABLE_AUTOMOUNT
 	/* this is where the magic happens */
 	if (config.autophoto && gvm_udi_is_storage_camera (udi)) {
-		ctx = gvm_prompt_ctx_new (GVM_PROMPT_IMPORT_STORAGE_CAMERA, import_storage_camera_cb, udi, device, mount_point, NULL);
+		ctx = gvm_prompt_ctx_new (GVM_PROMPT_IMPORT_STORAGE_CAMERA, import_storage_camera_cb,
+					  udi, device, mount_point, NULL);
 		gvm_prompt (ctx, 0, NULL);
 	} else if (config.autoipod && gvm_udi_is_portable_media_player (udi, &is_ipod)) {
 		char *ipod_control = NULL;
@@ -1930,7 +1946,8 @@
 		
 		if (gvm_check_photos (udi, device, photo_dir)) {
 			/* we have ourselves an iPod Photo - need to prompt what to do */
-			ctx = gvm_prompt_ctx_new (GVM_PROMPT_IPOD_PHOTO, ipod_photo_cb, udi, device, mount_point, photo_dir);
+			ctx = gvm_prompt_ctx_new (GVM_PROMPT_IPOD_PHOTO, ipod_photo_cb,
+						  udi, device, mount_point, photo_dir);
 			gvm_prompt (ctx, 0, NULL);
 		} else {
 			gvm_run_portable_media_player (udi, device, mount_point);
@@ -1940,6 +1957,16 @@
 	} else {
 		gvm_autorun (udi, device, mount_point);
 	}
+#else
+	/* launch f-spot or whatever if the device is a camera */
+	if (config.autophoto && gvm_udi_is_storage_camera (udi)) {
+		ctx = gvm_prompt_ctx_new (GVM_PROMPT_IMPORT_STORAGE_CAMERA, import_storage_camera_cb,
+					  udi, device, mount_point, NULL);
+		gvm_prompt (ctx, 0, NULL);
+	} else {
+		gvm_autorun (udi, device, mount_point);
+	}
+#endif /* ENABLE_AUTOMOUNT */
 	
  out:
 	
@@ -2643,7 +2670,6 @@
 	
 	libhal_free_string (device);
 }
-#endif /* ENABLE_AUTOMOUNT */
 
 /*
  * gvm_media_changed - generic media change handler.
@@ -2679,6 +2705,7 @@
 	
 	return handled;
 }
+#endif /* ENABLE_AUTOMOUNT */
 
 
 static void
@@ -3011,11 +3038,12 @@
  *  @param  udi                 Universal Device Id
  */
 static void
-hal_device_removed (LibHalContext *ctx GNUC_UNUSED, 
-		    const char *udi)
+hal_device_removed (LibHalContext *ctx GNUC_UNUSED, const char *udi)
 {
 	GtkDialog *dialog;
+#ifdef ENABLE_AUTOMOUNT
 	char *device_udi;
+#endif
 	
 	dbg ("Device removed: %s\n", udi);
 	
@@ -3081,9 +3109,13 @@
 		       dbus_bool_t is_removed GNUC_UNUSED, 
 		       dbus_bool_t is_added GNUC_UNUSED)
 {
+#ifdef ENABLE_AUTOMOUNT
 	struct _MountPolicy *policy;
+#endif
 	gboolean mounted;
+#ifdef ENABLE_AUTOMOUNT
 	GSList *l, *n;
+#endif
 	
 	if (strcmp (key, "volume.is_mounted") != 0)
 		return;
@@ -3114,6 +3146,8 @@
 			dbg ("not in mount queue: %s\n", udi);
 			/*gvm_device_mounted (udi);*/
 		}
+#else
+		gvm_device_mounted (udi);
 #endif /* ENABLE_AUTOMOUNT */
 		
 #ifdef ENABLE_NOTIFY

Modified: trunk/src/properties.c
==============================================================================
--- trunk/src/properties.c	(original)
+++ trunk/src/properties.c	Sat Apr 26 15:36:01 2008
@@ -47,17 +47,15 @@
 	AUTOMOUNT_MEDIA,
 	AUTOOPEN,
 	AUTORUN,
-#endif /* ENABLE_AUTOMOUNT */
 	
 	/* Multimedia */
-#ifdef ENABLE_AUTOMOUNT
 	AUTOPLAY_CDA,
 	AUTOPLAY_CDA_COMMAND,
 	AUTOPLAY_DVD,
 	AUTOPLAY_DVD_COMMAND,
-#endif /* ENABLE_AUTOMOUNT */
 	AUTOIPOD,
 	AUTOIPOD_COMMAND,
+#endif /* ENABLE_AUTOMOUNT */
 	
 	/* Cameras */
 	AUTOPHOTO,
@@ -104,17 +102,15 @@
 	{ GCONF_ROOT "automount_media",           TYPE_BOOL,   NULL, TRUE  },
 	{ GCONF_ROOT "autoopen",                  TYPE_BOOL,   NULL, TRUE  },
 	{ GCONF_ROOT "autorun",                   TYPE_BOOL,   NULL, TRUE  },
-#endif /* ENABLE_AUTOMOUNT */
 	
 	/* Multimedia */
-#ifdef ENABLE_AUTOMOUNT
 	{ GCONF_ROOT "autoplay_cda",              TYPE_BOOL,   NULL, TRUE  },
 	{ GCONF_ROOT "autoplay_cda_command",      TYPE_STRING, NULL, FALSE },
 	{ GCONF_ROOT "autoplay_dvd",              TYPE_BOOL,   NULL, TRUE  },
 	{ GCONF_ROOT "autoplay_dvd_command",      TYPE_STRING, NULL, FALSE },
-#endif /* ENABLE_AUTOMOUNT */
 	{ GCONF_ROOT "autoipod",                  TYPE_BOOL,   NULL, TRUE  },
 	{ GCONF_ROOT "autoipod_command",          TYPE_STRING, NULL, FALSE },
+#endif /* ENABLE_AUTOMOUNT */
 	
 	/* Cameras */
 	{ GCONF_ROOT "autophoto",                 TYPE_BOOL,   NULL, TRUE  },
@@ -339,7 +335,7 @@
 static void
 disable_automount_props (void)
 {
-	static const char *automount_props[] = { "storage_vbox", "audio_cd_vbox", "dvd_video_vbox" };
+	static const char *automount_props[] = { "storage_vbox", "multimedia_vbox", };
 	GtkWidget *widget;
 	size_t i;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]