Updating branch refs/heads/master
to 4231c6afe0f7ac4f293176fafd7011fd2b82cec3 (commit)
from cf9140afb33b162d15b72ea7bbdfb8a4734fe4f5 (commit)
commit 4231c6afe0f7ac4f293176fafd7011fd2b82cec3
Author: Guido Berhoerster <guido+x...@berhoerster.name>
Date: Sat Oct 27 12:16:02 2012 +0200
Move the XFCE_MIXER_PLUGIN_DEFAULT_COMMAND macro to where it is used
panel-plugin/xfce-mixer-plugin.c | 2 ++
panel-plugin/xfce-plugin-dialog.h | 2 --
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/panel-plugin/xfce-mixer-plugin.c b/panel-plugin/xfce-mixer-plugin.c
index 2270b4f..f34a252 100644
--- a/panel-plugin/xfce-mixer-plugin.c
+++ b/panel-plugin/xfce-mixer-plugin.c
@@ -63,6 +63,8 @@ enum
+#define XFCE_MIXER_PLUGIN_DEFAULT_COMMAND "xfce4-mixer"
+
#ifdef HAVE_KEYBINDER
#define XFCE_MIXER_PLUGIN_RAISE_VOLUME_KEY "XF86AudioRaiseVolume"
#define XFCE_MIXER_PLUGIN_LOWER_VOLUME_KEY "XF86AudioLowerVolume"
diff --git a/panel-plugin/xfce-plugin-dialog.h
b/panel-plugin/xfce-plugin-dialog.h
index 890fe3f..11c0210 100644
--- a/panel-plugin/xfce-plugin-dialog.h
+++ b/panel-plugin/xfce-plugin-dialog.h
@@ -39,8 +39,6 @@ typedef struct _XfcePluginDialog XfcePluginDialog;
#define IS_XFCE_PLUGIN_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),
TYPE_XFCE_PLUGIN_DIALOG))
#define XFCE_PLUGIN_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),
TYPE_XFCE_PLUGIN_DIALOG, XfcePluginDialogClass))
-#define XFCE_MIXER_PLUGIN_DEFAULT_COMMAND "xfce4-mixer"
-
GType xfce_plugin_dialog_get_type (void) G_GNUC_CONST;
GtkWidget *xfce_plugin_dialog_new (XfcePanelPlugin *plugin);
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
