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

[fejj svn gnome org]

Author: fejj
Date: Tue Apr 22 14:31:09 2008
New Revision: 1358
URL: http://svn.gnome.org/viewvc/gnome-volume-manager?rev=1358&view=rev

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

	* src/manager.c: Looks like we didn't have an AUTOMOUSE or
	AUTOMOUSE_COMMAND either, which I'm sure would have broken some
	stuff.



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

Modified: trunk/src/manager.c
==============================================================================
--- trunk/src/manager.c	(original)
+++ trunk/src/manager.c	Tue Apr 22 14:31:09 2008
@@ -114,41 +114,56 @@
 } type_t;
 
 enum {
+	/* Storage */
 	FILEMANAGER,
 	AUTOBROWSE,
 	AUTOBURN,
 	AUTOBURN_AUDIO_CD_COMMAND,
 	AUTOBURN_DATA_CD_COMMAND,
-	AUTOIPOD,
-	AUTOIPOD_COMMAND,
-	AUTOKEYBOARD,
-	AUTOKEYBOARD_COMMAND,
 	AUTOMOUNT_DRIVES,
 	AUTOMOUNT_MEDIA,
 	AUTOOPEN,
 	AUTOOPEN_PATH,
-	AUTOPHOTO,
-	AUTOPHOTO_COMMAND,
-	AUTOPILOT,
-	AUTOPILOT_COMMAND,
+	AUTORUN,
+	AUTORUN_PATH,
+	
+	/* Multimedia */
 	AUTOPLAY_CDA,
 	AUTOPLAY_CDA_COMMAND,
 	AUTOPLAY_DVD,
 	AUTOPLAY_DVD_COMMAND,
 	AUTOPLAY_VCD,
 	AUTOPLAY_VCD_COMMAND,
+	AUTOIPOD,
+	AUTOIPOD_COMMAND,
+	
+	/* Cameras */
+	AUTOPHOTO,
+	AUTOPHOTO_COMMAND,
+	AUTOWEBCAM,
+	AUTOWEBCAM_COMMAND,
+	
+	/* PDAs */
+	AUTOPILOT,
+	AUTOPILOT_COMMAND,
 	AUTOPOCKETPC,
 	AUTOPOCKETPC_COMMAND,
+	
+	/* Printers/Scanners */
 	AUTOPRINTER,
 	AUTOPRINTER_COMMAND,
-	AUTORUN,
-	AUTORUN_PATH,
 	AUTOSCANNER,
 	AUTOSCANNER_COMMAND,
+	
+	/* Input Devices */
+	AUTOKEYBOARD,
+	AUTOKEYBOARD_COMMAND,
+	AUTOMOUSE,
+	AUTOMOUSE_COMMAND,
 	AUTOTABLET,
 	AUTOTABLET_COMMAND,
-	AUTOWEBCAM,
-	AUTOWEBCAM_COMMAND,
+	
+	/* Notification */
 	PERCENT_THRESHOLD,
 	PERCENT_FREED,
 	PERCENT_USED
@@ -159,43 +174,56 @@
 	type_t type;
 	void *var;
 } gvm_settings[] = {
+	/* 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 },
 	{ GCONF_ROOT "autoburn_data_cd_command",  TYPE_STRING, &config.autoburn_data_cd_command  },
-	{ GCONF_ROOT "autoipod",                  TYPE_BOOL,   &config.autoipod                  },
-	{ GCONF_ROOT "autoipod_command",          TYPE_STRING, &config.autoipod_command          },
-	{ GCONF_ROOT "autokeyboard",              TYPE_BOOL,   &config.autokeyboard              },
-	{ GCONF_ROOT "autokeyboard_command",      TYPE_STRING, &config.autokeyboard_command      },
 	{ GCONF_ROOT "automount_drives",          TYPE_BOOL,   &config.automount_drives          },
 	{ GCONF_ROOT "automount_media",           TYPE_BOOL,   &config.automount_media           },
-	{ GCONF_ROOT "automouse",                 TYPE_BOOL,   &config.automouse                 },
-	{ GCONF_ROOT "automouse_command",         TYPE_STRING, &config.automouse_command         },
 	{ GCONF_ROOT "autoopen",                  TYPE_BOOL,   &config.autoopen                  },
 	{ GCONF_ROOT "autoopen_path",             TYPE_STRING, &config.autoopen_path             },
-	{ GCONF_ROOT "autophoto",                 TYPE_BOOL,   &config.autophoto                 },
-	{ GCONF_ROOT "autophoto_command",         TYPE_STRING, &config.autophoto_command         },
-	{ GCONF_ROOT "autopalmsync",              TYPE_BOOL,   &config.autopilot                 },
-	{ GCONF_ROOT "autopalmsync_command",      TYPE_STRING, &config.autopilot_command         },
+	{ GCONF_ROOT "autorun",                   TYPE_BOOL,   &config.autorun                   },
+	{ GCONF_ROOT "autorun_path",              TYPE_STRING, &config.autorun_path              },
+	
+	/* Multimedia */
 	{ 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      },
+	{ GCONF_ROOT "autoipod",                  TYPE_BOOL,   &config.autoipod                  },
+	{ GCONF_ROOT "autoipod_command",          TYPE_STRING, &config.autoipod_command          },
+	
+	/* Cameras */
+	{ GCONF_ROOT "autophoto",                 TYPE_BOOL,   &config.autophoto                 },
+	{ GCONF_ROOT "autophoto_command",         TYPE_STRING, &config.autophoto_command         },
+	{ GCONF_ROOT "autowebcam",                TYPE_BOOL,   &config.autowebcam                },
+	{ GCONF_ROOT "autowebcam_command",        TYPE_STRING, &config.autowebcam_command        },
+	
+	/* PDAs */
+	{ GCONF_ROOT "autopalmsync",              TYPE_BOOL,   &config.autopilot                 },
+	{ GCONF_ROOT "autopalmsync_command",      TYPE_STRING, &config.autopilot_command         },
 	{ GCONF_ROOT "autopocketpc",              TYPE_BOOL,   &config.autopocketpc              },
 	{ GCONF_ROOT "autopocketpc_command",      TYPE_STRING, &config.autopocketpc_command      },
+	
+	/* Printers/Scanners */
 	{ GCONF_ROOT "autoprinter",               TYPE_BOOL,   &config.autoprinter               },
 	{ GCONF_ROOT "autoprinter_command",       TYPE_STRING, &config.autoprinter_command       },
-	{ GCONF_ROOT "autorun",                   TYPE_BOOL,   &config.autorun                   },
-	{ GCONF_ROOT "autorun_path",              TYPE_STRING, &config.autorun_path              },
 	{ GCONF_ROOT "autoscanner",               TYPE_BOOL,   &config.autoscanner               },
 	{ GCONF_ROOT "autoscanner_command",       TYPE_STRING, &config.autoscanner_command       },
+	
+	/* Input Devices */
+	{ GCONF_ROOT "autokeyboard",              TYPE_BOOL,   &config.autokeyboard              },
+	{ GCONF_ROOT "autokeyboard_command",      TYPE_STRING, &config.autokeyboard_command      },
+	{ GCONF_ROOT "automouse",                 TYPE_BOOL,   &config.automouse                 },
+	{ GCONF_ROOT "automouse_command",         TYPE_STRING, &config.automouse_command         },
 	{ GCONF_ROOT "autotablet",                TYPE_BOOL,   &config.autotablet                },
 	{ GCONF_ROOT "autotablet_command",        TYPE_STRING, &config.autotablet_command        },
-	{ GCONF_ROOT "autowebcam",                TYPE_BOOL,   &config.autowebcam                },
-	{ GCONF_ROOT "autowebcam_command",        TYPE_STRING, &config.autowebcam_command        },
+	
+	/* Notification */
 	{ GCONF_ROOT "percent_threshold",         TYPE_FLOAT,  &config.percent_threshold         },
 	{ GCONF_ROOT "percent_used",              TYPE_FLOAT,  &config.percent_used              },
 };