From 23536328cce34467f2a106662e2bb2c0d8507467 Mon Sep 17 00:00:00 2001 From: Stefano Karapetsas Date: Sat, 24 Nov 2012 18:19:46 +0100 Subject: drivemount: remove mateconf usage --- drivemount/drive-button.c | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) (limited to 'drivemount/drive-button.c') diff --git a/drivemount/drive-button.c b/drivemount/drive-button.c index d692b490..bd738fb5 100644 --- a/drivemount/drive-button.c +++ b/drivemount/drive-button.c @@ -29,7 +29,6 @@ #include "drive-button.h" #include #include -#include #include @@ -40,8 +39,6 @@ enum { CMD_EJECT }; -#define MATECONF_ROOT_AUTOPLAY "/desktop/mate/volume_manager/" - /* type registration boilerplate code */ G_DEFINE_TYPE(DriveButton, drive_button, GTK_TYPE_BUTTON) @@ -809,34 +806,23 @@ eject_drive (DriveButton *self, GtkWidget *item) } } static void -play_autoplay_media (DriveButton *self, const char *autoplay_key, - const char *dflt) +play_autoplay_media (DriveButton *self, const char *dflt) { - MateConfClient *mateconf_client = mateconf_client_get_default (); - char *command = mateconf_client_get_string (mateconf_client, - autoplay_key, NULL); - - if (!command) - command = g_strdup (dflt); - - run_command (self, command); - - g_free (command); - g_object_unref (mateconf_client); + run_command (self, dflt); } static void play_dvd (DriveButton *self, GtkWidget *item) { - play_autoplay_media (self, MATECONF_ROOT_AUTOPLAY "autoplay_dvd_command", - "totem %d"); + /* FIXME add an option to set this */ + play_autoplay_media (self, "totem %d"); } static void play_cda (DriveButton *self, GtkWidget *item) { - play_autoplay_media (self, MATECONF_ROOT_AUTOPLAY "autoplay_cda_command", - "sound-juicer -d %d"); + /* FIXME add an option to set this */ + play_autoplay_media (self, "sound-juicer -d %d"); } static void -- cgit v1.2.1