[Xfce4-commits] <parole:master> Import patch for no gstreamer codec-installer in freebsd

[Landry Breuil]

On Mon, Jun 3, 2013 at 7:26 PM, Sean Davis <noreply at xfce.org> wrote:

> Updating branch refs/heads/master
>          to 4ea4c5a0acd0a16b08aa9d29490fb9ef6fda27d5 (commit)
>        from 56af953d22b0f5e28d5e77cae0a8ec6bc752a9a8 (commit)
>
> commit 4ea4c5a0acd0a16b08aa9d29490fb9ef6fda27d5
> Author: Sean Davis <smd.seandavis at gmail.com>
> Date:   Mon Jun 3 19:23:49 2013 -0400
>
>     Import patch for no gstreamer codec-installer in freebsd
>

And what about providing a fallback for the other OSes in an #else, instead
of breaking the build by providing no string/value ? :p

Landry


>   src/gst/parole-gst.c |   16 +++++++++++++++-
>  1 files changed, 15 insertions(+), 1 deletions(-)
>
> diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
> index bd44a8b..c347049 100644
> --- a/src/gst/parole-gst.c
> +++ b/src/gst/parole-gst.c
> @@ -1579,22 +1579,36 @@ parole_gst_missing_codec_dialog(ParoleGst *gst,
> GstMessage *msg)
>      dialog = GTK_MESSAGE_DIALOG(gtk_message_dialog_new_with_markup(
>                              NULL,
>                              GTK_DIALOG_MODAL |
> GTK_DIALOG_DESTROY_WITH_PARENT,
> +#if defined(__linux__)
>                              GTK_MESSAGE_QUESTION,
> +#elif defined(__FreeBSD__)
> +                            GTK_MESSAGE_WARNING,
> +#endif
>                              GTK_BUTTONS_NONE,
>                              "<b><big>%s</big></b>",
>                              _("Additional software is required.")
>                              ));
>
> +#if defined(__linux__)
>      gtk_dialog_add_buttons( GTK_DIALOG(dialog),
>                              _("Don't Install"),
>                              GTK_RESPONSE_REJECT,
>                              _("Install"),
>                              GTK_RESPONSE_ACCEPT,
>                              NULL );
> +#elif defined(__FreeBSD__)
> +    gtk_dialog_add_button( GTK_DIALOG(dialog),
> +                            GTK_STOCK_OK,
> +                            GTK_RESPONSE_ACCEPT);
> +#endif
>
>      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__)
> +                                             "Parole needs <b>%s</b> to
> play this file.",
> +#endif
>                                               desc);
>
>      return GTK_DIALOG(dialog);
> @@ -1718,7 +1732,7 @@ parole_gst_bus_event (GstBus *bus, GstMessage *msg,
> gpointer data)
>  #endif
>                      gst_install_plugins_context_free(ctx);
>                 }
> -               else if ( response == GTK_RESPONSE_REJECT )
> +               else if ( (response == GTK_RESPONSE_REJECT) || (response
> == GTK_RESPONSE_OK) )
>                     gtk_widget_destroy(GTK_WIDGET(dialog));
>          }
>             break;
> _______________________________________________
> Xfce4-commits mailing list
> Xfce4-commits at xfce.org
> https://mail.xfce.org/mailman/listinfo/xfce4-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.xfce.org/pipermail/xfce4-dev/attachments/20130604/e6b6d98e/attachment.html>