Attachment 150149 Details for Bug 195629 – xfmpc.patch

[patch] xfmpc.patch

file_195629.txt (text/plain), 5.21 KB, created by Andrey Akhmichin on 2014-12-03 17:51:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrey Akhmichin

Created: 2014-12-03 17:51:57 UTC

Size: 5.21 KB

patch

obsolete

>--- src/main.c.orig     2011-10-23 19:57:59.000000000 +0600
>+++ src/main.c  2014-11-30 14:34:46.890325981 +0500
>@@ -128,7 +128,7 @@
>                _tmp6_ = i;
>                _tmp7_ = g_enum_get_value (_tmp5_, _tmp6_);
>                enum_value = *_tmp7_;
>-               _tmp8_ = g_strcmp0;
>+               _tmp8_ = (GCompareFunc) g_strcmp0;
>                _tmp9_ = enum_value;
>                _tmp10_ = _tmp9_.value_name;
>                _tmp11_ = g_utf8_casefold (_tmp10_, (gssize) (-1));
>@@ -177,7 +177,6 @@
>
>
> int main (int argc, char ** argv) {
>-       g_type_init ();
>        return xfmpc_main (argv, argc);
> }
>
>--- src/mpdclient.c.orig        2011-02-01 23:13:51.000000000 +0500
>+++ src/mpdclient.c     2014-11-30 14:34:46.890325981 +0500
>@@ -106,7 +106,7 @@
>   gboolean                  env_cached;
>   gboolean                  connecting;
>   guint                     connection_count;
>-  GMutex                   *mutex;
>+  GMutex                    mutex;
> };
>
>
>@@ -275,8 +275,7 @@
>
>   priv->mi = mpd_new_default ();
>
>-  if (!g_thread_supported ()) g_thread_init (NULL);
>-  priv->mutex = g_mutex_new ();
>+  g_mutex_init (&priv->mutex);
>
>   mpd_signal_connect_status_changed (priv->mi, (StatusChangedCallback)cb_status_changed, mpdclient);
> }
>@@ -288,7 +287,7 @@
>   XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT (mpdclient)->priv;
>
>   mpd_free (priv->mi);
>-  g_mutex_free (priv->mutex);
>+  g_mutex_clear (&priv->mutex);
>
>   (*G_OBJECT_CLASS (parent_class)->finalize) (object);
> }
>@@ -389,8 +388,6 @@
>
>   priv->connecting = FALSE;
>
>-  g_mutex_unlock (priv->mutex);
>-
>   return NULL;
> }
>
>@@ -405,7 +402,7 @@
>     return TRUE;
>
>   /* return FALSE if a we are already trying to connect to mpd */
>-  if (!g_mutex_trylock (priv->mutex))
>+  if (!g_mutex_trylock (&priv->mutex))
>   {
>     g_warning ("Already connecting to mpd");
>     return FALSE;
>@@ -413,8 +410,8 @@
>
>   priv->connecting = TRUE;
>
>-  thread = g_thread_create ((GThreadFunc) xfmpc_mpdclient_connect_thread,
>-          mpdclient, TRUE, NULL);
>+  thread = g_thread_new ("0", (GThreadFunc) xfmpc_mpdclient_connect_thread,
>+          mpdclient);
>
>   while (priv->connecting)
>   {
>@@ -427,6 +424,8 @@
>
>   g_signal_emit (mpdclient, signals[SIG_CONNECTED], 0);
>
>+  g_mutex_unlock (&priv->mutex);
>+
>   return TRUE;
> }
>
>--- src/preferences.c.orig      2011-10-23 19:57:59.000000000 +0600
>+++ src/preferences.c   2014-11-30 14:34:46.890325981 +0500
>@@ -181,7 +181,7 @@
>                _g_object_unref0 (xfmpc_preferences_preferences);
>                xfmpc_preferences_preferences = _tmp1_;
>                _tmp2_ = xfmpc_preferences_preferences;
>-               g_object_add_weak_pointer ((GObject*) _tmp2_, &xfmpc_preferences_preferences);
>+               g_object_add_weak_pointer ((GObject*) _tmp2_, (gpointer*) &xfmpc_preferences_preferences);
>        } else {
>                XfmpcPreferences* _tmp3_;
>                _tmp3_ = xfmpc_preferences_preferences;
>@@ -230,7 +230,6 @@
>        {
>                GParamSpec** spec_collection = NULL;
>                gint spec_collection_length1 = 0;
>-               gint _spec_collection_size_ = 0;
>                gint spec_it = 0;
>                spec_collection = _tmp7_;
>                spec_collection_length1 = _tmp6_;
>@@ -310,7 +309,6 @@
>        {
>                GParamSpec** spec_collection = NULL;
>                gint spec_collection_length1 = 0;
>-               gint _spec_collection_size_ = 0;
>                gint spec_it = 0;
>                spec_collection = _tmp7_;
>                spec_collection_length1 = _tmp6_;
>--- src/preferences-dialog.c.orig       2011-10-23 19:57:58.000000000 +0600
>+++ src/preferences-dialog.c    2014-11-30 14:34:46.890325981 +0500
>@@ -709,7 +709,7 @@
>        notebook = _tmp4_;
>        _tmp5_ = notebook;
>        gtk_container_set_border_width ((GtkContainer*) _tmp5_, (guint) 6);
>-       _tmp6_ = ((GtkDialog*) self)->vbox;
>+       _tmp6_ = (GtkVBox*) ((GtkDialog*) self)->vbox;
>        _tmp7_ = notebook;
>        gtk_box_pack_start ((GtkBox*) _tmp6_, (GtkWidget*) _tmp7_, TRUE, TRUE, (guint) 0);
>        _tmp8_ = (GtkVBox*) gtk_vbox_new (FALSE, 6);
>
>--- src/song-dialog.c.orig      2011-10-23 19:57:58.000000000 +0600
>+++ src/song-dialog.c   2014-11-30 14:34:46.890325981 +0500
>@@ -221,7 +221,7 @@
>        _tmp4_ = self->priv->song;
>        _tmp5_ = _tmp4_->title;
>        gtk_window_set_title ((GtkWindow*) self, _tmp5_);
>-       _tmp6_ = ((GtkDialog*) self)->vbox;
>+       _tmp6_ = (GtkVBox*) ((GtkDialog*) self)->vbox;
>        gtk_box_set_spacing ((GtkBox*) _tmp6_, 0);
>        _tmp7_ = (GtkVBox*) gtk_vbox_new (FALSE, 0);
>        _tmp8_ = g_object_ref_sink (_tmp7_);
>@@ -403,7 +403,7 @@
>        gtk_box_pack_start ((GtkBox*) _tmp114_, (GtkWidget*) _tmp115_, FALSE, FALSE, (guint) 5);
>        _tmp116_ = hbox;
>        gtk_box_pack_start ((GtkBox*) vbox2, (GtkWidget*) _tmp116_, FALSE, FALSE, (guint) 6);
>-       _tmp117_ = ((GtkDialog*) self)->vbox;
>+       _tmp117_ = (GtkVBox*) ((GtkDialog*) self)->vbox;
>        gtk_box_pack_start ((GtkBox*) _tmp117_, frame, TRUE, TRUE, (guint) 0);
>        gtk_dialog_add_button ((GtkDialog*) self, GTK_STOCK_CLOSE, (gint) GTK_RESPONSE_CLOSE);
>        gtk_widget_show_all ((GtkWidget*) self);

Actions: View | Diff

Attachments on bug 195629: 150149 | 151291