Attachment #150149 for bug #195629

Lines 128-134 Link Here

(-)src/main.c 2014-11-30 14:34:46.890325981 +0500 (-2 / +1 lines)
128	_tmp6_ = i;	128	_tmp6_ = i;
129	_tmp7_ = g_enum_get_value (_tmp5_, _tmp6_);	129	_tmp7_ = g_enum_get_value (_tmp5_, _tmp6_);
130	enum_value = *_tmp7_;	130	enum_value = *_tmp7_;
131	_tmp8_ = g_strcmp0;	131	_tmp8_ = (GCompareFunc) g_strcmp0;
132	_tmp9_ = enum_value;	132	_tmp9_ = enum_value;
133	_tmp10_ = _tmp9_.value_name;	133	_tmp10_ = _tmp9_.value_name;
134	_tmp11_ = g_utf8_casefold (_tmp10_, (gssize) (-1));	134	_tmp11_ = g_utf8_casefold (_tmp10_, (gssize) (-1));
Lines 177-183 Link Here
177	int main (int argc, char ** argv) {	177	int main (int argc, char ** argv) {
178	g_type_init ();
179	return xfmpc_main (argv, argc);	178	return xfmpc_main (argv, argc);
180	}	179	}

Lines 106-112 Link Here

(-)src/mpdclient.c 2014-11-30 14:34:46.890325981 +0500 (-9 / +8 lines)
106	gboolean env_cached;	106	gboolean env_cached;
107	gboolean connecting;	107	gboolean connecting;
108	guint connection_count;	108	guint connection_count;
109	GMutex *mutex;	109	GMutex mutex;
110	};	110	};
Lines 275-282 Link Here
275	priv->mi = mpd_new_default ();	275	priv->mi = mpd_new_default ();
276	if (!g_thread_supported ()) g_thread_init (NULL);	276	g_mutex_init (&priv->mutex);
277	priv->mutex = g_mutex_new ();
278	mpd_signal_connect_status_changed (priv->mi, (StatusChangedCallback)cb_status_changed, mpdclient);	277	mpd_signal_connect_status_changed (priv->mi, (StatusChangedCallback)cb_status_changed, mpdclient);
279	}	278	}
Lines 288-294 Link Here
288	XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT (mpdclient)->priv;	287	XfmpcMpdclientPrivate *priv = XFMPC_MPDCLIENT (mpdclient)->priv;
289	mpd_free (priv->mi);	288	mpd_free (priv->mi);
290	g_mutex_free (priv->mutex);	289	g_mutex_clear (&priv->mutex);
291	(*G_OBJECT_CLASS (parent_class)->finalize) (object);	290	(*G_OBJECT_CLASS (parent_class)->finalize) (object);
292	}	291	}
Lines 389-396 Link Here
389	priv->connecting = FALSE;	388	priv->connecting = FALSE;
390	g_mutex_unlock (priv->mutex);
391
392	return NULL;	389	return NULL;
393	}	390	}
Lines 405-411 Link Here
405	return TRUE;	402	return TRUE;
406	/* return FALSE if a we are already trying to connect to mpd */	403	/* return FALSE if a we are already trying to connect to mpd */
407	if (!g_mutex_trylock (priv->mutex))	404	if (!g_mutex_trylock (&priv->mutex))
408	{	405	{
409	g_warning ("Already connecting to mpd");	406	g_warning ("Already connecting to mpd");
410	return FALSE;	407	return FALSE;
Lines 413-420 Link Here
413	priv->connecting = TRUE;	410	priv->connecting = TRUE;
414	thread = g_thread_create ((GThreadFunc) xfmpc_mpdclient_connect_thread,	411	thread = g_thread_new ("0", (GThreadFunc) xfmpc_mpdclient_connect_thread,
415	mpdclient, TRUE, NULL);	412	mpdclient);
416	while (priv->connecting)	413	while (priv->connecting)
417	{	414	{
Lines 427-432 Link Here
427	g_signal_emit (mpdclient, signals[SIG_CONNECTED], 0);	424	g_signal_emit (mpdclient, signals[SIG_CONNECTED], 0);
		425	g_mutex_unlock (&priv->mutex);
		426
428	return TRUE;	427	return TRUE;
429	}	428	}




               _g_object_unref0 (xfmpc_preferences_preferences);
               xfmpc_preferences_preferences = _tmp1_;
               _tmp2_ = xfmpc_preferences_preferences;
               g_object_add_weak_pointer ((GObject*) _tmp2_, (gpointer*) &xfmpc_preferences_preferences);
       } else {
               XfmpcPreferences* _tmp3_;
               _tmp3_ = xfmpc_preferences_preferences;

       {
               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_;

       {
               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_;

Lines 709-715 Link Here

(-)src/preferences-dialog.c 2014-11-30 14:34:46.890325981 +0500 (-1 / +1 lines)
709	notebook = _tmp4_;	709	notebook = _tmp4_;
710	_tmp5_ = notebook;	710	_tmp5_ = notebook;
711	gtk_container_set_border_width ((GtkContainer*) _tmp5_, (guint) 6);	711	gtk_container_set_border_width ((GtkContainer*) _tmp5_, (guint) 6);
712	_tmp6_ = ((GtkDialog*) self)->vbox;	712	_tmp6_ = (GtkVBox) ((GtkDialog) self)->vbox;
713	_tmp7_ = notebook;	713	_tmp7_ = notebook;
714	gtk_box_pack_start ((GtkBox) _tmp6_, (GtkWidget) _tmp7_, TRUE, TRUE, (guint) 0);	714	gtk_box_pack_start ((GtkBox) _tmp6_, (GtkWidget) _tmp7_, TRUE, TRUE, (guint) 0);
715	_tmp8_ = (GtkVBox*) gtk_vbox_new (FALSE, 6);	715	_tmp8_ = (GtkVBox*) gtk_vbox_new (FALSE, 6);

Lines 221-227 Link Here

(-)src/song-dialog.c 2014-11-30 14:34:46.890325981 +0500 (-2 / +2 lines)
221	_tmp4_ = self->priv->song;	221	_tmp4_ = self->priv->song;
222	_tmp5_ = _tmp4_->title;	222	_tmp5_ = _tmp4_->title;
223	gtk_window_set_title ((GtkWindow*) self, _tmp5_);	223	gtk_window_set_title ((GtkWindow*) self, _tmp5_);
224	_tmp6_ = ((GtkDialog*) self)->vbox;	224	_tmp6_ = (GtkVBox) ((GtkDialog) self)->vbox;
225	gtk_box_set_spacing ((GtkBox*) _tmp6_, 0);	225	gtk_box_set_spacing ((GtkBox*) _tmp6_, 0);
226	_tmp7_ = (GtkVBox*) gtk_vbox_new (FALSE, 0);	226	_tmp7_ = (GtkVBox*) gtk_vbox_new (FALSE, 0);
227	_tmp8_ = g_object_ref_sink (_tmp7_);	227	_tmp8_ = g_object_ref_sink (_tmp7_);
Lines 403-409 Link Here
403	gtk_box_pack_start ((GtkBox) _tmp114_, (GtkWidget) _tmp115_, FALSE, FALSE, (guint) 5);	403	gtk_box_pack_start ((GtkBox) _tmp114_, (GtkWidget) _tmp115_, FALSE, FALSE, (guint) 5);
404	_tmp116_ = hbox;	404	_tmp116_ = hbox;
405	gtk_box_pack_start ((GtkBox) vbox2, (GtkWidget) _tmp116_, FALSE, FALSE, (guint) 6);	405	gtk_box_pack_start ((GtkBox) vbox2, (GtkWidget) _tmp116_, FALSE, FALSE, (guint) 6);
406	_tmp117_ = ((GtkDialog*) self)->vbox;	406	_tmp117_ = (GtkVBox) ((GtkDialog) self)->vbox;
407	gtk_box_pack_start ((GtkBox*) _tmp117_, frame, TRUE, TRUE, (guint) 0);	407	gtk_box_pack_start ((GtkBox*) _tmp117_, frame, TRUE, TRUE, (guint) 0);
408	gtk_dialog_add_button ((GtkDialog*) self, GTK_STOCK_CLOSE, (gint) GTK_RESPONSE_CLOSE);	408	gtk_dialog_add_button ((GtkDialog*) self, GTK_STOCK_CLOSE, (gint) GTK_RESPONSE_CLOSE);
409	gtk_widget_show_all ((GtkWidget*) self);	409	gtk_widget_show_all ((GtkWidget*) self);

Return to bug 195629

Lines 181-187 Link Here

(-)src/preferences.c 2014-11-30 14:34:46.890325981 +0500 (-3 / +1 lines)
181	_g_object_unref0 (xfmpc_preferences_preferences);	181	_g_object_unref0 (xfmpc_preferences_preferences);
182	xfmpc_preferences_preferences = _tmp1_;	182	xfmpc_preferences_preferences = _tmp1_;
183	_tmp2_ = xfmpc_preferences_preferences;	183	_tmp2_ = xfmpc_preferences_preferences;
184	g_object_add_weak_pointer ((GObject*) _tmp2_, &xfmpc_preferences_preferences);	184	g_object_add_weak_pointer ((GObject) _tmp2_, (gpointer) &xfmpc_preferences_preferences);
185	} else {	185	} else {
186	XfmpcPreferences* _tmp3_;	186	XfmpcPreferences* _tmp3_;
187	_tmp3_ = xfmpc_preferences_preferences;	187	_tmp3_ = xfmpc_preferences_preferences;
Lines 230-236 Link Here
230	{	230	{
231	GParamSpec** spec_collection = NULL;	231	GParamSpec** spec_collection = NULL;
232	gint spec_collection_length1 = 0;	232	gint spec_collection_length1 = 0;
233	gint _spec_collection_size_ = 0;
234	gint spec_it = 0;	233	gint spec_it = 0;
235	spec_collection = _tmp7_;	234	spec_collection = _tmp7_;
236	spec_collection_length1 = _tmp6_;	235	spec_collection_length1 = _tmp6_;
Lines 310-316 Link Here
310	{	309	{
311	GParamSpec** spec_collection = NULL;	310	GParamSpec** spec_collection = NULL;
312	gint spec_collection_length1 = 0;	311	gint spec_collection_length1 = 0;
313	gint _spec_collection_size_ = 0;
314	gint spec_it = 0;	312	gint spec_it = 0;
315	spec_collection = _tmp7_;	313	spec_collection = _tmp7_;
316	spec_collection_length1 = _tmp6_;	314	spec_collection_length1 = _tmp6_;