Updating branch refs/heads/master
to 2d8ef63938e8a04f425ad20ef8d7176bac1b48c5 (commit)
from 2983de5d5e8c527e3da9659046881c5e8b0c567e (commit)
commit 2d8ef63938e8a04f425ad20ef8d7176bac1b48c5
Author: Sean Davis <smd.seanda...@gmail.com>
Date: Mon Oct 28 21:28:42 2013 -0400
Fix if/else for plugin installer
src/gst/parole-gst.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
index 8ca98c9..7fc18cd 100644
--- a/src/gst/parole-gst.c
+++ b/src/gst/parole-gst.c
@@ -1484,7 +1484,7 @@ parole_gst_missing_codec_dialog(ParoleGst *gst,
GstMessage *msg)
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
#if defined(__linux__)
GTK_MESSAGE_QUESTION,
-#elif defined(__FreeBSD__)
+#else
GTK_MESSAGE_WARNING,
#endif
GTK_BUTTONS_NONE,
@@ -1492,24 +1492,23 @@ parole_gst_missing_codec_dialog(ParoleGst *gst,
GstMessage *msg)
_("Additional software is required.")
));
-#if defined(__linux__)
gtk_dialog_add_buttons( GTK_DIALOG(dialog),
+#if defined(__linux__)
_("Don't Install"),
GTK_RESPONSE_REJECT,
_("Install"),
GTK_RESPONSE_ACCEPT,
- NULL );
-#elif defined(__FreeBSD__)
- gtk_dialog_add_button( GTK_DIALOG(dialog),
+#else
_("OK"),
- GTK_RESPONSE_ACCEPT);
+ GTK_RESPONSE_ACCEPT,
#endif
+ NULL );
gtk_message_dialog_format_secondary_markup(dialog,
#if defined(__linux__)
_("Parole needs <b>%s</b> to play
this file.\n"
"It can be installed
automatically."),
-#elif defined(__FreeBSD__)
+#else
_("Parole needs <b>%s</b> to play
this file."),
#endif
desc);
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
