diff options
author | Stefano Karapetsas <[email protected]> | 2012-12-07 06:06:41 -0800 |
---|---|---|
committer | Stefano Karapetsas <[email protected]> | 2012-12-07 06:06:41 -0800 |
commit | 12dcf19aa5f51901053c273cd7f5c17ce85e909d (patch) | |
tree | 5b71387df7bf817dd5d0dff60ecc09d8291dba0d /plugins/media-keys/cut-n-paste/gvc-mixer-event-role.c | |
parent | a279b02b4d563d2300ccb588e5969c7dfac8108e (diff) | |
parent | 6e61d207a2088479f5bb12ce4edb1d2886c40b53 (diff) | |
download | mate-settings-daemon-12dcf19aa5f51901053c273cd7f5c17ce85e909d.tar.bz2 mate-settings-daemon-12dcf19aa5f51901053c273cd7f5c17ce85e909d.tar.xz |
Merge pull request #29 from jasmineaura/develop
Fix #23, and some cleanups
Diffstat (limited to 'plugins/media-keys/cut-n-paste/gvc-mixer-event-role.c')
-rw-r--r-- | plugins/media-keys/cut-n-paste/gvc-mixer-event-role.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/media-keys/cut-n-paste/gvc-mixer-event-role.c b/plugins/media-keys/cut-n-paste/gvc-mixer-event-role.c index a2d1169..594f951 100644 --- a/plugins/media-keys/cut-n-paste/gvc-mixer-event-role.c +++ b/plugins/media-keys/cut-n-paste/gvc-mixer-event-role.c @@ -25,7 +25,7 @@ #include <unistd.h> #include <glib.h> -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <pulse/pulseaudio.h> #include <pulse/ext-stream-restore.h> @@ -58,7 +58,7 @@ update_settings (GvcMixerEventRole *role, { pa_operation *o; guint index; - GvcChannelMap *map; + const GvcChannelMap *map; pa_context *context; pa_ext_stream_restore_info info; @@ -87,8 +87,8 @@ update_settings (GvcMixerEventRole *role, return FALSE; } - if (op != NULL) - *op = o; + if (op != NULL) + *op = o; return TRUE; } |