# Description: Disable media handling and the respective UI tabs, since nautilus does that now. # Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=509823 --- gnome-volume-manager-2.22.1/gnome-volume-manager.schemas.in 2007-12-07 18:55:47.000000000 +0100 +++ gnome-volume-manager.schemas.in 2008-02-29 16:30:08.000000000 +0100 @@ -16,7 +16,7 @@ /schemas/desktop/gnome/volume_manager/automount_drives /desktop/gnome/volume_manager/automount_drives bool - true + false Automount removable drives Whether gnome-volume-manager should automatically mount @@ -28,7 +28,7 @@ /schemas/desktop/gnome/volume_manager/automount_media /desktop/gnome/volume_manager/automount_media bool - true + false Automount removable media Whether gnome-volume-manager should automatically mount @@ -40,7 +40,7 @@ /schemas/desktop/gnome/volume_manager/autobrowse /desktop/gnome/volume_manager/autobrowse bool - true + false Autorun nautilus Open nautilus on removeable media insert. @@ -97,7 +97,7 @@ /schemas/desktop/gnome/volume_manager/autoplay_cda /desktop/gnome/volume_manager/autoplay_cda bool - true + false Play inserted audio CD's Whether, when an audio CD is inserted, gnome-volume-manager @@ -154,7 +154,7 @@ /schemas/desktop/gnome/volume_manager/autoplay_dvd /desktop/gnome/volume_manager/autoplay_dvd bool - true + false Play inserted video DVDs Whether, when a video DVD is inserted, @@ -177,7 +177,7 @@ /schemas/desktop/gnome/volume_manager/autoplay_vcd /desktop/gnome/volume_manager/autoplay_vcd bool - true + false Play inserted video VCDs Whether, when a video VCD is inserted, @@ -248,7 +248,7 @@ /schemas/desktop/gnome/volume_manager/autoprinter /desktop/gnome/volume_manager/autoprinter bool - true + false Run printer program Whether, when a printer is connected, gnome-volume-manager should run diff -Nur -x '*.orig' -x '*~' gnome-volume-manager-2.22.1/gnome-volume-properties.glade gnome-volume-manager-2.22.1.new/gnome-volume-properties.glade --- gnome-volume-manager-2.22.1/gnome-volume-properties.glade 2007-12-07 18:55:47.000000000 +0100 +++ gnome-volume-properties.glade 2008-02-29 16:30:08.000000000 +0100 @@ -68,1197 +68,6 @@ False - - 12 - True - False - 18 - - - - True - False - 6 - - - - True - Removable Storage - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 12 - - - - True - 0.5 - 0 - 0 - 0 - - - 0 - False - False - - - - - - True - False - 6 - - - - True - True - _Mount removable drives when hot-plugged - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - True - Mount removable media when _inserted - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - True - Browse _removable media when inserted - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - True - _Auto-run programs on new drives and media - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - True - Auto-_open files on new drives and media - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - False - True - - - - - - True - False - 6 - - - - True - Blank CD and DVD Discs - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 12 - - - - True - 0.5 - 0 - 0 - 0 - - - 0 - False - False - - - - - - True - False - 6 - - - - True - True - _Burn a CD or DVD when a blank disc is inserted - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - False - 12 - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 12 - - - - True - Command for A_udio CDs: - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - autoburn_audio_cd_command - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 10 - Select program to burn audio CDs - False - False - True - GTK_FILE_CHOOSER_ACTION_OPEN - - - - True - True - True - True - 0 - - True - * - False - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 12 - - - - True - Command for _Data CDs: - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - autoburn_data_cd_command - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 10 - Select program to burn data CDs - False - False - True - GTK_FILE_CHOOSER_ACTION_OPEN - - - - True - True - True - True - 0 - - True - * - False - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - False - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - False - True - - - - - False - True - - - - - - True - Storage - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - 12 - True - False - 18 - - - - True - False - 6 - - - - True - Audio CD Discs - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 12 - - - - True - 0.5 - 0 - 0 - 0 - - - 0 - False - False - - - - - - True - False - 6 - - - - True - True - Play _audio CD discs when inserted - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 12 - - - - True - C_ommand: - True - False - GTK_JUSTIFY_RIGHT - False - False - 0.5 - 0.5 - 0 - 0 - autoplay_cda_command - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 10 - Select program to play audio CDs - False - False - True - GTK_FILE_CHOOSER_ACTION_OPEN - - - - True - True - True - True - 0 - - True - * - False - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - False - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - False - True - - - - - - True - False - 6 - - - - True - Video DVD Discs - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 12 - - - - True - 0.5 - 0 - 0 - 0 - - - 0 - False - False - - - - - - True - False - 6 - - - - True - True - Play _video DVD discs when inserted - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 12 - - - - True - Comma_nd: - True - False - GTK_JUSTIFY_RIGHT - False - False - 0.5 - 0.5 - 0 - 0 - autoplay_dvd_command - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 10 - Select program to play DVDs - False - False - True - GTK_FILE_CHOOSER_ACTION_OPEN - - - - True - True - True - True - 0 - - True - * - False - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - False - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - False - True - - - - - - True - False - 6 - - - - True - Portable Music Players - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 12 - - - - True - 0.5 - 0 - 0 - 0 - - - 0 - False - False - - - - - - True - False - 6 - - - - True - True - Play _music files when connected - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 12 - - - - True - Comman_d: - True - False - GTK_JUSTIFY_RIGHT - False - False - 0.5 - 0.5 - 0 - 0 - autoipod_command - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 10 - Select program to play music files - False - False - True - GTK_FILE_CHOOSER_ACTION_OPEN - - - - True - True - True - True - 0 - - True - * - False - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - False - True - - - - - False - True - - - - - - True - Multimedia - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - 12 True diff -Nur -x '*.orig' -x '*~' gnome-volume-manager-2.22.1/src/manager.c gnome-volume-manager-2.22.1.new/src/manager.c --- gnome-volume-manager-2.22.1/src/manager.c 2008-01-18 17:30:22.000000000 +0100 +++ src/manager.c 2008-02-29 16:30:12.000000000 +0100 @@ -625,6 +625,27 @@ } } +static gboolean +filter_out_media_handling (gint key, gboolean value) +{ + switch (key) { + case AUTOBROWSE: + case AUTOBURN: + case AUTOIPOD: + case AUTOMOUNT_DRIVES: + case AUTOMOUNT_MEDIA: + case AUTOOPEN: + case AUTOPLAY_CDA: + case AUTOPLAY_DVD: + case AUTOPLAY_VCD: + case AUTORUN: + return FALSE; + default: + return value; + } +} + + /* * gvm_load_config - synchronize gconf => config structure */ @@ -644,7 +665,7 @@ *((char **) gvm_settings[i].var) ? *((char **) gvm_settings[i].var): "NULL"); } else if (gvm_settings[i].type == TYPE_BOOL) { *((int *) gvm_settings[i].var) = - gconf_client_get_bool (config.client, gvm_settings[i].key, NULL); + filter_out_media_handling (i, gconf_client_get_bool (config.client, gvm_settings[i].key, NULL)); dbg ("setting[%d]: bool: %s = %d\n", i, strrchr (gvm_settings[i].key, '/') + 1, *((int *) gvm_settings[i].var)); } else if (gvm_settings[i].type == TYPE_FLOAT) { @@ -693,7 +714,7 @@ dbg ("setting changed: string: %s = %s\n", strrchr (gvm_settings[which].key, '/') + 1, *((char **) gvm_settings[which].var)); } else if (gvm_settings[which].type == TYPE_BOOL) { - *((int *) gvm_settings[which].var) = gconf_value_get_bool (value); + *((int *) gvm_settings[which].var) = filter_out_media_handling (which, gconf_value_get_bool (value)); dbg ("setting changed: bool: %s = %d\n", strrchr (gvm_settings[which].key, '/') + 1, *((int *) gvm_settings[which].var)); } else if (gvm_settings[which].type == TYPE_FLOAT) { diff -Nur -x '*.orig' -x '*~' gnome-volume-manager-2.22.1/src/properties.c gnome-volume-manager-2.22.1.new/src/properties.c --- gnome-volume-manager-2.22.1/src/properties.c 2007-12-07 18:55:46.000000000 +0100 +++ src/properties.c 2008-02-29 16:30:08.000000000 +0100 @@ -36,77 +36,24 @@ TYPE_STRING, } type_t; -enum { - AUTOBROWSE, - AUTOBURN, - AUTOBURN_AUDIO_CD_COMMAND, - AUTOBURN_DATA_CD_COMMAND, - AUTOIPOD, - AUTOIPOD_COMMAND, - AUTOKEYBOARD, - AUTOKEYBOARD_COMMAND, - AUTOMOUNT_DRIVES, - AUTOMOUNT_MEDIA, - AUTOMOUSE, - AUTOMOUSE_COMMAND, - AUTOOPEN, - AUTOPHOTO, - AUTOPHOTO_COMMAND, - AUTOPILOT, - AUTOPILOT_COMMAND, - AUTOPLAY_CDA, - AUTOPLAY_CDA_COMMAND, - AUTOPLAY_DVD, - AUTOPLAY_DVD_COMMAND, - AUTOPOCKETPC, - AUTOPOCKETPC_COMMAND, - AUTOPRINTER, - AUTOPRINTER_COMMAND, - AUTORUN, - AUTOSCANNER, - AUTOSCANNER_COMMAND, - AUTOTABLET, - AUTOTABLET_COMMAND, - AUTOVIDEOCAM, - AUTOVIDEOCAM_COMMAND, - AUTOWEBCAM, - AUTOWEBCAM_COMMAND, - AUTORUN_PATH, - AUTOOPEN_PATH, -}; - static struct { char *key; type_t type; GtkWidget *widget; gboolean need_daemon; } gvm_settings[] = { - { GCONF_ROOT "autobrowse", TYPE_BOOL, NULL, TRUE }, - { GCONF_ROOT "autoburn", TYPE_BOOL, NULL, FALSE }, - { GCONF_ROOT "autoburn_audio_cd_command", TYPE_STRING, NULL, FALSE }, - { GCONF_ROOT "autoburn_data_cd_command", TYPE_STRING, NULL, FALSE }, - { GCONF_ROOT "autoipod", TYPE_BOOL, NULL, TRUE }, - { GCONF_ROOT "autoipod_command", TYPE_STRING, NULL, FALSE }, { GCONF_ROOT "autokeyboard", TYPE_BOOL, NULL, TRUE }, { GCONF_ROOT "autokeyboard_command", TYPE_STRING, NULL, FALSE }, - { GCONF_ROOT "automount_drives", TYPE_BOOL, NULL, TRUE }, - { GCONF_ROOT "automount_media", TYPE_BOOL, NULL, TRUE }, { GCONF_ROOT "automouse", TYPE_BOOL, NULL, TRUE }, { GCONF_ROOT "automouse_command", TYPE_STRING, NULL, FALSE }, - { GCONF_ROOT "autoopen", TYPE_BOOL, NULL, TRUE }, { GCONF_ROOT "autophoto", TYPE_BOOL, NULL, TRUE }, { GCONF_ROOT "autophoto_command", TYPE_STRING, NULL, FALSE }, { GCONF_ROOT "autopalmsync", TYPE_BOOL, NULL, TRUE }, { GCONF_ROOT "autopalmsync_command", TYPE_STRING, NULL, FALSE }, - { 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 }, { GCONF_ROOT "autopocketpc", TYPE_BOOL, NULL, TRUE }, { GCONF_ROOT "autopocketpc_command", TYPE_STRING, NULL, FALSE }, { GCONF_ROOT "autoprinter", TYPE_BOOL, NULL, TRUE }, { GCONF_ROOT "autoprinter_command", TYPE_STRING, NULL, FALSE }, - { GCONF_ROOT "autorun", TYPE_BOOL, NULL, TRUE }, { GCONF_ROOT "autoscanner", TYPE_BOOL, NULL, TRUE }, { GCONF_ROOT "autoscanner_command", TYPE_STRING, NULL, FALSE }, { GCONF_ROOT "autotablet", TYPE_BOOL, NULL, TRUE }, @@ -115,9 +62,6 @@ { GCONF_ROOT "autovideocam_command", TYPE_STRING, NULL, FALSE }, { GCONF_ROOT "autowebcam", TYPE_BOOL, NULL, TRUE }, { GCONF_ROOT "autowebcam_command", TYPE_STRING, NULL, FALSE }, - /* The following entries do not (yet) have a UI */ - /*{ GCONF_ROOT "autorun_path", TYPE_STRING, NULL, FALSE },*/ - /*{ GCONF_ROOT "autoopen_path", TYPE_STRING, NULL, FALSE },*/ }; static GHashTable *gvm_settings_hash = NULL; @@ -151,17 +95,10 @@ gconf_client_set_bool (gconf, key, bool, NULL); name = strrchr (key, '/') + 1; - if (!strncmp (name, "automount_", 10)) { - bool = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gvm_settings[AUTOMOUNT_MEDIA].widget)) || - gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gvm_settings[AUTOMOUNT_DRIVES].widget)); - gtk_widget_set_sensitive (gvm_settings[AUTOOPEN].widget, bool); - gtk_widget_set_sensitive (gvm_settings[AUTORUN].widget, bool); - } else { - name = g_strdup_printf ("%s_hbox", name); - if ((hbox = glade_xml_get_widget (xml, name))) - gtk_widget_set_sensitive (hbox, bool); - g_free (name); - } + name = g_strdup_printf ("%s_hbox", name); + if ((hbox = glade_xml_get_widget (xml, name))) + gtk_widget_set_sensitive (hbox, bool); + g_free (name); } static void @@ -205,11 +142,6 @@ gboolean bool; size_t i; - /* this is the only strange one */ - bool = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gvm_settings[AUTOMOUNT_MEDIA].widget)) || - gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gvm_settings[AUTOMOUNT_DRIVES].widget)); - gtk_widget_set_sensitive (gvm_settings[AUTORUN].widget, bool); - /* checkboxes can enable/disable the ability to change other settings */ for (i = 0; i < G_N_ELEMENTS (gvm_settings); i++) { if (gvm_settings[i].type == TYPE_BOOL) { @@ -277,17 +209,12 @@ const char *icon; const char *fallback; } icons[] = { - { "audio_cd_image", "gnome-dev-cdrom-audio", "media-optical" }, - { "blank_cd_image", "gnome-dev-disc-cdr", "media-optical" }, { "digital_camera_image", "camera-photo", NULL }, - { "dvd_video_image", "gnome-dev-dvd", "media-optical" }, - { "ipod_image", "multimedia-player", "gnome-dev-ipod" }, { "keyboard_image", "input-keyboard", NULL }, { "mouse_image", "input-mouse", NULL }, { "palm_image", "pda-palm", "palm-pilot" }, { "pocketpc_image", "pda-pocketpc", "palm-pilot" }, { "printer_image", "printer", NULL }, - { "removable_drives_image", "drive-removable-media", NULL }, { "scanner_image", "scanner", NULL }, { "tablet_image", "input-tablet", NULL }, { "videocam_image", "camera-video", NULL },