summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--plugins/media-keys/acme.h1
-rw-r--r--plugins/media-keys/gsd-media-keys-manager.c10
2 files changed, 3 insertions, 8 deletions
diff --git a/plugins/media-keys/acme.h b/plugins/media-keys/acme.h
index bcf9567d..e696d7c2 100644
--- a/plugins/media-keys/acme.h
+++ b/plugins/media-keys/acme.h
@@ -24,7 +24,6 @@
#include "gsd-keygrab.h"
#define SETTINGS_BINDING_DIR "org.gnome.desktop.keybindings"
-#define SETTINGS_MISC_DIR "org.gnome.settings-daemon"
enum {
TOUCHPAD_KEY,
diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
index 0ade7555..fbad5e1e 100644
--- a/plugins/media-keys/gsd-media-keys-manager.c
+++ b/plugins/media-keys/gsd-media-keys-manager.c
@@ -157,6 +157,8 @@ get_term_command (GsdMediaKeysManager *manager)
settings = g_settings_new ("org.gnome.desktop.applications.terminal");
cmd_term = g_settings_get_string (settings, "exec");
+ if (strcmp (cmd_term, "") == 0)
+ cmd_term = g_strdup ("gnome-terminal");
cmd_args = g_settings_get_string (settings, "exec-arg");
if (strcmp (cmd_term, "") != 0) {
@@ -599,17 +601,11 @@ do_sound_action (GsdMediaKeysManager *manager,
guint vol, norm_vol_step;
int vol_step;
gboolean sound_changed;
- GSettings *settings;
if (manager->priv->stream == NULL)
return;
- settings = g_settings_new (SETTINGS_MISC_DIR);
- /* FIXME: why is this key under org.gnome.settings-daemon?? */
- vol_step = g_settings_get_int (settings, "volume_step");
-
- if (vol_step <= 0 || vol_step > 100)
- vol_step = VOLUME_STEP;
+ vol_step = VOLUME_STEP;
norm_vol_step = PA_VOLUME_NORM * vol_step / 100;