diff -Nru xnoise-0.2.20/ChangeLog xnoise-0.2.21/ChangeLog --- xnoise-0.2.20/ChangeLog 2013-12-12 17:28:37.000000000 +0000 +++ xnoise-0.2.21/ChangeLog 2014-01-27 10:24:17.000000000 +0000 @@ -1,3 +1,102 @@ +commit f9f29b6e0a5f6589224ac5eb1c4375f4413539dd +Author: Jörn Magens +Date: Mon Jan 27 11:24:14 2014 +0100 + + update NEWS + +commit a71aa12f838c113c4a7828a11a4e2776f1e7cc6e +Author: Jörn Magens +Date: Mon Jan 27 11:06:31 2014 +0100 + + update packaging data + +commit d3f151b445b2f273ee1c4e432818da98af5bc6c9 +Author: Jörn Magens +Date: Mon Jan 27 10:47:27 2014 +0100 + + update po/POTFILES.skip + +commit d05536486b87dfdad28c77631ce44a5d60e488fb +Author: Claudio Arseni +Date: Sat Jan 25 11:33:34 2014 +0100 + + update po/it.po + +commit 9dbbc53cb51c7fb81a7a248ec36bef99977dc986 +Author: Jörn Magens +Date: Fri Jan 17 16:18:53 2014 +0100 + + add another SSM Backend + +commit 94df95c0edfa6767f1aec6ca76f780b9f3684777 +Author: Jörn Magens +Date: Fri Jan 17 14:51:25 2014 +0100 + + Fix issue #72 : xnoise crash on fullscreen + +commit 1a936a1c0823499865b9283d2098896502093db4 +Author: Jörn Magens +Date: Fri Jan 17 14:50:16 2014 +0100 + + add ubuntu trusty packaging data + +commit 21481443970687f6a09c198d564e18749a6d91a1 +Author: Jörn Magens +Date: Sun Dec 22 12:04:34 2013 +0100 + + version update + +commit c161256636a453cc29e274fcc2b25452e723144b +Author: Jörn Magens +Date: Sun Dec 22 12:03:40 2013 +0100 + + packaging fixes + +commit 7fe9846cf89952283cb90b8075806d04dc0a5462 +Merge: 5a82321 f70d8c1 +Author: shuerhaaken +Date: Fri Dec 20 20:32:45 2013 +0100 + + Merged in michel-slm/xnoise/fix-#70-desktop-file-validation (pull request #20) + + Fix zh_TW translation of desktop file keywords + +commit f70d8c176d660b01cc83f0e70f8fd0f18c519b6e +Author: Michel Alexandre Salim +Date: Sat Dec 21 02:23:33 2013 +0700 + + Fix zh_TW translation of desktop file keywords + + Use the standard ; as separator instead of the Unicode equivalent - + needed by Freedesktop tools + +commit 5a823216ec25a376032227b7896308444626fd72 +Author: Ibai Oihanguren Sala +Date: Fri Dec 20 16:48:01 2013 +0100 + + update po/eu.po + +commit f6bfcdec7e5a120e7e94f4e7b93636b9a149e6ad +Author: Jörn Magens +Date: Sat Dec 14 09:14:49 2013 +0100 + + Fix a Ambience/Radience rendering issue with main toolbar + +commit 0a056ecf02cd398a5fa39ef3314a6a93b0acea96 +Author: Jörn Magens +Date: Fri Dec 13 14:47:17 2013 +0100 + + packaging updates + +commit 685c034defbbe15b4824d128c14e31478eadb18b +Merge: 0cc80f4 038feaa +Author: shuerhaaken +Date: Fri Dec 13 09:14:50 2013 +0100 + + Merged in yoseforb/xnoise (pull request #19) + + Add the authors and a translator credits to the about dialog + commit 0cc80f46692ba05a5517d9452199e0d8e31b938e Author: Jörn Magens Date: Thu Dec 12 18:28:20 2013 +0100 @@ -13,6 +112,14 @@ Updated Hebrew translation +commit 038feaafb760f6bdec431c72cef4e07caebc5215 +Author: Yosef Or Boczko +Date: Thu Dec 12 14:27:15 2013 +0200 + + Add the authors and a translator credits to the about dialog + + Signed-off-by: Yosef Or Boczko + commit 0ce1ce7a1a69ddb0d03323ec9ec55f0c2c4ed071 Author: Yosef Or Boczko Date: Thu Dec 12 14:08:36 2013 +0200 diff -Nru xnoise-0.2.20/Makefile.in xnoise-0.2.21/Makefile.in --- xnoise-0.2.20/Makefile.in 2013-12-12 11:25:05.000000000 +0000 +++ xnoise-0.2.21/Makefile.in 2014-01-27 09:26:20.000000000 +0000 @@ -84,7 +84,7 @@ $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/configure $(am__configure_deps) \ $(srcdir)/config.h.in COPYING compile config.guess config.sub \ - depcomp install-sh missing ltmain.sh + install-sh missing ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ diff -Nru xnoise-0.2.20/NEWS xnoise-0.2.21/NEWS --- xnoise-0.2.20/NEWS 2013-12-11 10:40:26.000000000 +0000 +++ xnoise-0.2.21/NEWS 2014-01-27 10:17:59.000000000 +0000 @@ -1,3 +1,13 @@ +xnoise (0.2.21) + +Changes +====================== + * Fix crasher bug with screen saver management + * Add new screen saver manager + * Update some translations + + + xnoise (0.2.20) Changes @@ -13,7 +23,7 @@ * Remove title-to-decoration plugin * Automatically activate some of the plugins * Use new libtaginfo API for tag reading/writing - * Udate tag editing mechanism + * Update tag editing mechanism * Many Bug fixes * update translations diff -Nru xnoise-0.2.20/configure xnoise-0.2.21/configure --- xnoise-0.2.20/configure 2013-12-12 11:25:04.000000000 +0000 +++ xnoise-0.2.21/configure 2014-01-27 09:26:19.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for xnoise 0.2.20. +# Generated by GNU Autoconf 2.69 for xnoise 0.2.21. # # Report bugs to . # @@ -650,8 +650,8 @@ # Identity of this package. PACKAGE_NAME='xnoise' PACKAGE_TARNAME='xnoise' -PACKAGE_VERSION='0.2.20' -PACKAGE_STRING='xnoise 0.2.20' +PACKAGE_VERSION='0.2.21' +PACKAGE_STRING='xnoise 0.2.21' PACKAGE_BUGREPORT='shuerhaakenATgo oglemail.com' PACKAGE_URL='' @@ -1515,7 +1515,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xnoise 0.2.20 to adapt to many kinds of systems. +\`configure' configures xnoise 0.2.21 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1585,7 +1585,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xnoise 0.2.20:";; + short | recursive ) echo "Configuration of xnoise 0.2.21:";; esac cat <<\_ACEOF @@ -1737,7 +1737,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xnoise configure 0.2.20 +xnoise configure 0.2.21 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2227,7 +2227,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xnoise $as_me 0.2.20, which was +It was created by xnoise $as_me 0.2.21, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3094,7 +3094,7 @@ # Define the identity of the package. PACKAGE='xnoise' - VERSION='0.2.20' + VERSION='0.2.21' cat >>confdefs.h <<_ACEOF @@ -19057,7 +19057,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xnoise $as_me 0.2.20, which was +This file was extended by xnoise $as_me 0.2.21, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19123,7 +19123,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -xnoise config.status 0.2.20 +xnoise config.status 0.2.21 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru xnoise-0.2.20/configure.ac xnoise-0.2.21/configure.ac --- xnoise-0.2.20/configure.ac 2013-12-06 13:04:51.000000000 +0000 +++ xnoise-0.2.21/configure.ac 2013-12-22 11:04:16.000000000 +0000 @@ -3,7 +3,7 @@ #xnoise version m4_define(xnoise_major_version, 0) m4_define(xnoise_minor_version, 2) -m4_define(xnoise_micro_version, 20) +m4_define(xnoise_micro_version, 21) m4_define(xnoise_version, xnoise_major_version.xnoise_minor_version.xnoise_micro_version) m4_define([xnoise_name], [xnoise]) diff -Nru xnoise-0.2.20/debian/changelog xnoise-0.2.21/debian/changelog --- xnoise-0.2.20/debian/changelog 2014-01-02 14:09:05.000000000 +0000 +++ xnoise-0.2.21/debian/changelog 2014-01-27 10:28:53.000000000 +0000 @@ -1,3 +1,12 @@ +xnoise (0.2.21-1ppa1~trusty) trusty; urgency=medium + * Fix crasher bug with screen saver management + * Add new screen saver manager + * Update some translations + + -- Jörn Magens Mon, 27 Jan 2014 10:54:45 +0100 + + + xnoise (0.2.20-2ppa1~trusty) trusty; urgency=medium * Redo the import dialog * Real-Time Monitor media folders for changes diff -Nru xnoise-0.2.20/libxnoise/AlbumImage/xnoise-album-image-loader.c xnoise-0.2.21/libxnoise/AlbumImage/xnoise-album-image-loader.c --- xnoise-0.2.20/libxnoise/AlbumImage/xnoise-album-image-loader.c 2013-12-11 11:24:21.000000000 +0000 +++ xnoise-0.2.21/libxnoise/AlbumImage/xnoise-album-image-loader.c 2014-01-27 09:32:54.000000000 +0000 @@ -249,20 +249,20 @@ GType xnoise_gst_player_get_type (void) G_GNUC_CONST; static void xnoise_album_image_loader_load_embedded (XnoiseAlbumImageLoader* self, GObject* sender, const gchar* uri, const gchar* _artist, const gchar* _album); static void _xnoise_album_image_loader_load_embedded_xnoise_gst_player_sign_found_embedded_image (XnoiseGstPlayer* _sender, const gchar* track_uri, const gchar* artist, const gchar* album, gpointer self); -static gboolean __lambda438_ (XnoiseAlbumImageLoader* self); -static gboolean ___lambda438__gsource_func (gpointer self); +static gboolean __lambda436_ (XnoiseAlbumImageLoader* self); +static gboolean ___lambda436__gsource_func (gpointer self); GType xnoise_icon_cache_get_type (void) G_GNUC_CONST; void xnoise_icon_cache_handle_image (XnoiseIconCache* self, const gchar* image_path); static gboolean xnoise_album_image_loader_check_image_for_current_tags (XnoiseAlbumImageLoader* self, GFile** f); -static gboolean ___lambda435_ (XnoiseAlbumImageLoader* self); +static gboolean ___lambda433_ (XnoiseAlbumImageLoader* self); void xnoise_album_image_loader_set_image_path_small (XnoiseAlbumImageLoader* self, const gchar* value); void xnoise_album_image_loader_set_image_path_large (XnoiseAlbumImageLoader* self, const gchar* value); void xnoise_album_image_loader_set_image_path_embedded (XnoiseAlbumImageLoader* self, const gchar* value); void xnoise_album_image_loader_set_image_small (XnoiseAlbumImageLoader* self, GdkPixbuf* value); void xnoise_album_image_loader_set_image_large (XnoiseAlbumImageLoader* self, GdkPixbuf* value); void xnoise_album_image_loader_set_image_embedded (XnoiseAlbumImageLoader* self, GdkPixbuf* value); -static gboolean ____lambda435__gsource_func (gpointer self); -static gboolean ___lambda436_ (XnoiseAlbumImageLoader* self); +static gboolean ____lambda433__gsource_func (gpointer self); +static gboolean ___lambda434_ (XnoiseAlbumImageLoader* self); gpointer xnoise_worker_job_ref (gpointer instance); void xnoise_worker_job_unref (gpointer instance); GParamSpec* xnoise_worker_param_spec_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -278,7 +278,7 @@ XnoiseWorkerJob* xnoise_worker_job_construct (GType object_type, XnoiseWorkerExecutionType execution_type, XnoiseWorkerWorkFunc func, void* func_target, XnoiseWorkerPriority priority, XnoiseWorkerFinishFunc finish_func, void* finish_func_target); GType xnoise_worker_get_type (void) G_GNUC_CONST; void xnoise_worker_push_job (XnoiseWorker* self, XnoiseWorkerJob* j); -static gboolean ____lambda436__gsource_func (gpointer self); +static gboolean ____lambda434__gsource_func (gpointer self); static XnoiseIAlbumCoverImage* xnoise_album_image_loader_get_provider (XnoiseAlbumImageLoader* self); const gchar* xnoise_global_access_get_current_albumartist (XnoiseGlobalAccess* self); const gchar* xnoise_global_access_get_current_artist (XnoiseGlobalAccess* self); @@ -288,14 +288,14 @@ gboolean xnoise_worker_is_same_thread (XnoiseWorker* self); static GdkPixbuf* xnoise_album_image_loader_create_image_from_file (XnoiseAlbumImageLoader* self, GFile** file); GdkPixbuf* xnoise_album_image_loader_get_image_small (XnoiseAlbumImageLoader* self); -static gboolean ___lambda437_ (XnoiseAlbumImageLoader* self); -static gboolean ____lambda437__gsource_func (gpointer self); +static gboolean ___lambda435_ (XnoiseAlbumImageLoader* self); +static gboolean ____lambda435__gsource_func (gpointer self); GdkPixbuf* xnoise_album_image_loader_get_image_large (XnoiseAlbumImageLoader* self); GdkPixbuf* xnoise_album_image_loader_get_image_embedded (XnoiseAlbumImageLoader* self); gboolean xnoise_plugin_module_container_get_is_album_image_plugin (XnoisePluginModuleContainer* self); void xnoise_album_image_loader_on_image_fetched (XnoiseAlbumImageLoader* self, const gchar* _artist, const gchar* _album, const gchar* _image_path); -static gboolean __lambda439_ (XnoiseAlbumImageLoader* self); -static gboolean ___lambda439__gsource_func (gpointer self); +static gboolean __lambda437_ (XnoiseAlbumImageLoader* self); +static gboolean ___lambda437__gsource_func (gpointer self); XnoiseIconCache* xnoise_global_access_get_icon_cache (XnoiseGlobalAccess* self); const gchar* xnoise_album_image_loader_get_image_path_small (XnoiseAlbumImageLoader* self); const gchar* xnoise_album_image_loader_get_image_path_large (XnoiseAlbumImageLoader* self); @@ -1248,7 +1248,7 @@ } -static gboolean __lambda438_ (XnoiseAlbumImageLoader* self) { +static gboolean __lambda436_ (XnoiseAlbumImageLoader* self) { gboolean result = FALSE; xnoise_album_image_loader_on_tag_changed (self); result = FALSE; @@ -1256,9 +1256,9 @@ } -static gboolean ___lambda438__gsource_func (gpointer self) { +static gboolean ___lambda436__gsource_func (gpointer self) { gboolean result; - result = __lambda438_ (self); + result = __lambda436_ (self); return result; } @@ -1299,7 +1299,7 @@ _g_object_unref0 (pf); return; } - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda438__gsource_func, g_object_ref (self), g_object_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda436__gsource_func, g_object_ref (self), g_object_unref); _tmp8_ = xnoise_album_art_view_icon_cache; _tmp9_ = pf; _tmp10_ = g_file_get_path (_tmp9_); @@ -1310,7 +1310,7 @@ } -static gboolean ___lambda435_ (XnoiseAlbumImageLoader* self) { +static gboolean ___lambda433_ (XnoiseAlbumImageLoader* self) { gboolean result = FALSE; xnoise_album_image_loader_set_image_path_small (self, NULL); xnoise_album_image_loader_set_image_path_large (self, NULL); @@ -1324,9 +1324,9 @@ } -static gboolean ____lambda435__gsource_func (gpointer self) { +static gboolean ____lambda433__gsource_func (gpointer self) { gboolean result; - result = ___lambda435_ (self); + result = ___lambda433_ (self); return result; } @@ -1338,7 +1338,7 @@ } -static gboolean ___lambda436_ (XnoiseAlbumImageLoader* self) { +static gboolean ___lambda434_ (XnoiseAlbumImageLoader* self) { gboolean result = FALSE; XnoiseWorkerJob* job = NULL; XnoiseWorkerJob* _tmp0_ = NULL; @@ -1354,9 +1354,9 @@ } -static gboolean ____lambda436__gsource_func (gpointer self) { +static gboolean ____lambda434__gsource_func (gpointer self) { gboolean result; - result = ___lambda436_ (self); + result = ___lambda434_ (self); return result; } @@ -1378,7 +1378,7 @@ _tmp3_ = self->priv->local_source; g_source_remove (_tmp3_); } - _tmp4_ = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ____lambda435__gsource_func, g_object_ref (self), g_object_unref); + _tmp4_ = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ____lambda433__gsource_func, g_object_ref (self), g_object_unref); self->priv->local_source = _tmp4_; _g_object_unref0 (f); return; @@ -1399,7 +1399,7 @@ _tmp8_ = self->priv->local_source; g_source_remove (_tmp8_); } - _tmp9_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 100, ____lambda436__gsource_func, g_object_ref (self), g_object_unref); + _tmp9_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 100, ____lambda434__gsource_func, g_object_ref (self), g_object_unref); self->priv->local_source = _tmp9_; } _g_object_unref0 (f); @@ -1531,7 +1531,7 @@ } -static gboolean ___lambda437_ (XnoiseAlbumImageLoader* self) { +static gboolean ___lambda435_ (XnoiseAlbumImageLoader* self) { gboolean result = FALSE; XnoiseIAlbumCoverImage* _tmp0_ = NULL; XnoiseIAlbumCoverImage* _tmp1_ = NULL; @@ -1544,9 +1544,9 @@ } -static gboolean ____lambda437__gsource_func (gpointer self) { +static gboolean ____lambda435__gsource_func (gpointer self) { gboolean result; - result = ___lambda437_ (self); + result = ___lambda435_ (self); return result; } @@ -1677,7 +1677,7 @@ g_source_remove (_tmp30_); self->priv->remote_source = (guint) 0; } - _tmp31_ = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ____lambda437__gsource_func, g_object_ref (self), g_object_unref); + _tmp31_ = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ____lambda435__gsource_func, g_object_ref (self), g_object_unref); self->priv->remote_source = _tmp31_; } _tmp33_ = xnoise_global; @@ -2044,7 +2044,7 @@ } -static gboolean __lambda439_ (XnoiseAlbumImageLoader* self) { +static gboolean __lambda437_ (XnoiseAlbumImageLoader* self) { gboolean result = FALSE; xnoise_album_image_loader_on_tag_changed (self); result = FALSE; @@ -2052,9 +2052,9 @@ } -static gboolean ___lambda439__gsource_func (gpointer self) { +static gboolean ___lambda437__gsource_func (gpointer self) { gboolean result; - result = __lambda439_ (self); + result = __lambda437_ (self); return result; } @@ -2081,7 +2081,7 @@ if (g_strcmp0 (_tmp0_, XNOISE_RESOURCES_EMPTYSTRING) == 0) { return; } - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda439__gsource_func, g_object_ref (self), g_object_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda437__gsource_func, g_object_ref (self), g_object_unref); _tmp1_ = _image_path; _tmp2_ = g_file_new_for_path (_tmp1_); f = _tmp2_; diff -Nru xnoise-0.2.20/libxnoise/AlbumImage/xnoise-album-image.c xnoise-0.2.21/libxnoise/AlbumImage/xnoise-album-image.c --- xnoise-0.2.20/libxnoise/AlbumImage/xnoise-album-image.c 2013-12-11 11:24:21.000000000 +0000 +++ xnoise-0.2.21/libxnoise/AlbumImage/xnoise-album-image.c 2014-01-27 09:32:54.000000000 +0000 @@ -168,20 +168,20 @@ GType xnoise_gst_player_get_type (void) G_GNUC_CONST; static void xnoise_album_image_on_image_changed (XnoiseAlbumImage* self); static void _xnoise_album_image_on_image_changed_g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); -static gboolean __lambda443_ (XnoiseAlbumImage* self, GtkWidget* s, GdkEventButton* e); +static gboolean __lambda441_ (XnoiseAlbumImage* self, GtkWidget* s, GdkEventButton* e); GType xnoise_main_window_get_type (void) G_GNUC_CONST; void xnoise_main_window_toggle_fullscreen (XnoiseMainWindow* self); gboolean xnoise_album_image_get_selected (XnoiseAlbumImage* self); void xnoise_album_image_set_selected (XnoiseAlbumImage* self, gboolean value); -static gboolean ___lambda443__gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self); -static gboolean __lambda444_ (XnoiseAlbumImage* self, GtkWidget* s, GdkEventCrossing* e); -static gboolean ___lambda444__gtk_widget_enter_notify_event (GtkWidget* _sender, GdkEventCrossing* event, gpointer self); -static gboolean __lambda445_ (XnoiseAlbumImage* self, GtkWidget* s, GdkEventCrossing* e); -static gboolean ___lambda445__gtk_widget_leave_notify_event (GtkWidget* _sender, GdkEventCrossing* event, gpointer self); -static gboolean __lambda442_ (XnoiseAlbumImage* self); +static gboolean ___lambda441__gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self); +static gboolean __lambda442_ (XnoiseAlbumImage* self, GtkWidget* s, GdkEventCrossing* e); +static gboolean ___lambda442__gtk_widget_enter_notify_event (GtkWidget* _sender, GdkEventCrossing* event, gpointer self); +static gboolean __lambda443_ (XnoiseAlbumImage* self, GtkWidget* s, GdkEventCrossing* e); +static gboolean ___lambda443__gtk_widget_leave_notify_event (GtkWidget* _sender, GdkEventCrossing* event, gpointer self); +static gboolean __lambda440_ (XnoiseAlbumImage* self); GdkPixbuf* xnoise_album_image_loader_get_image_embedded (XnoiseAlbumImageLoader* self); GdkPixbuf* xnoise_album_image_loader_get_image_small (XnoiseAlbumImageLoader* self); -static gboolean ___lambda442__gsource_func (gpointer self); +static gboolean ___lambda440__gsource_func (gpointer self); static gboolean xnoise_album_image_real_draw (GtkWidget* base, cairo_t* cr); GType xnoise_icon_repo_get_type (void) G_GNUC_CONST; GdkPixbuf* xnoise_icon_repo_get_album_art_default_icon (XnoiseIconRepo* self); @@ -197,7 +197,7 @@ } -static gboolean __lambda443_ (XnoiseAlbumImage* self, GtkWidget* s, GdkEventButton* e) { +static gboolean __lambda441_ (XnoiseAlbumImage* self, GtkWidget* s, GdkEventButton* e) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; GdkEventButton _tmp1_ = {0}; @@ -254,14 +254,14 @@ } -static gboolean ___lambda443__gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) { +static gboolean ___lambda441__gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) { gboolean result; - result = __lambda443_ (self, _sender, event); + result = __lambda441_ (self, _sender, event); return result; } -static gboolean __lambda444_ (XnoiseAlbumImage* self, GtkWidget* s, GdkEventCrossing* e) { +static gboolean __lambda442_ (XnoiseAlbumImage* self, GtkWidget* s, GdkEventCrossing* e) { gboolean result = FALSE; GtkStateFlags flags = 0; GtkStateFlags _tmp0_ = 0; @@ -281,14 +281,14 @@ } -static gboolean ___lambda444__gtk_widget_enter_notify_event (GtkWidget* _sender, GdkEventCrossing* event, gpointer self) { +static gboolean ___lambda442__gtk_widget_enter_notify_event (GtkWidget* _sender, GdkEventCrossing* event, gpointer self) { gboolean result; - result = __lambda444_ (self, _sender, event); + result = __lambda442_ (self, _sender, event); return result; } -static gboolean __lambda445_ (XnoiseAlbumImage* self, GtkWidget* s, GdkEventCrossing* e) { +static gboolean __lambda443_ (XnoiseAlbumImage* self, GtkWidget* s, GdkEventCrossing* e) { gboolean result = FALSE; g_return_val_if_fail (GTK_IS_WIDGET (s), FALSE); g_return_val_if_fail (e != NULL, FALSE); @@ -299,9 +299,9 @@ } -static gboolean ___lambda445__gtk_widget_leave_notify_event (GtkWidget* _sender, GdkEventCrossing* event, gpointer self) { +static gboolean ___lambda443__gtk_widget_leave_notify_event (GtkWidget* _sender, GdkEventCrossing* event, gpointer self) { gboolean result; - result = __lambda445_ (self, _sender, event); + result = __lambda443_ (self, _sender, event); return result; } @@ -347,9 +347,9 @@ _tmp9_ = _tmp8_->image_loader; g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, G_TYPE_OBJECT, GObject), "notify::image-embedded", (GCallback) _xnoise_album_image_on_image_changed_g_object_notify, self, 0); gtk_event_box_set_visible_window (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_EVENT_BOX, GtkEventBox), FALSE); - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), "button-press-event", (GCallback) ___lambda443__gtk_widget_button_press_event, self, 0); - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), "enter-notify-event", (GCallback) ___lambda444__gtk_widget_enter_notify_event, self, 0); - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), "leave-notify-event", (GCallback) ___lambda445__gtk_widget_leave_notify_event, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), "button-press-event", (GCallback) ___lambda441__gtk_widget_button_press_event, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), "enter-notify-event", (GCallback) ___lambda442__gtk_widget_enter_notify_event, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), "leave-notify-event", (GCallback) ___lambda443__gtk_widget_leave_notify_event, self, 0); _tmp10_ = gtk_widget_get_style_context (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget)); _tmp11_ = _g_object_ref0 (_tmp10_); context = _tmp11_; @@ -364,7 +364,7 @@ } -static gboolean __lambda442_ (XnoiseAlbumImage* self) { +static gboolean __lambda440_ (XnoiseAlbumImage* self) { gboolean result = FALSE; XnoiseGlobalAccess* _tmp0_ = NULL; XnoiseAlbumImageLoader* _tmp1_ = NULL; @@ -421,9 +421,9 @@ } -static gboolean ___lambda442__gsource_func (gpointer self) { +static gboolean ___lambda440__gsource_func (gpointer self) { gboolean result; - result = __lambda442_ (self); + result = __lambda440_ (self); return result; } @@ -438,7 +438,7 @@ _tmp1_ = self->priv->image_change_src; g_source_remove (_tmp1_); } - _tmp2_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 100, ___lambda442__gsource_func, g_object_ref (self), g_object_unref); + _tmp2_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 100, ___lambda440__gsource_func, g_object_ref (self), g_object_unref); self->priv->image_change_src = _tmp2_; } diff -Nru xnoise-0.2.20/libxnoise/DBus/xnoise-dbus-thumbnailer.c xnoise-0.2.21/libxnoise/DBus/xnoise-dbus-thumbnailer.c --- xnoise-0.2.20/libxnoise/DBus/xnoise-dbus-thumbnailer.c 2013-12-11 11:24:22.000000000 +0000 +++ xnoise-0.2.21/libxnoise/DBus/xnoise-dbus-thumbnailer.c 2014-01-27 09:32:55.000000000 +0000 @@ -139,12 +139,12 @@ static void _g_queue_free__g_free0_ (GQueue* self); void xnoise_dbus_thumbnailer_queue_uris (XnoiseDbusThumbnailer* self, gchar** uris, int uris_length1); static gboolean xnoise_dbus_thumbnailer_already_available (XnoiseDbusThumbnailer* self, const gchar* uri, GFile** _thumb); -static gboolean __lambda264_ (XnoiseDbusThumbnailer* self); +static gboolean __lambda262_ (XnoiseDbusThumbnailer* self); static void xnoise_dbus_thumbnailer_handle_queue (XnoiseDbusThumbnailer* self); -static gboolean ___lambda264__gsource_func (gpointer self); +static gboolean ___lambda262__gsource_func (gpointer self); static void xnoise_dbus_thumbnailer_on_name_appeared (XnoiseDbusThumbnailer* self, GDBusConnection* conn, const gchar* name); -static gboolean __lambda265_ (XnoiseDbusThumbnailer* self); -static gboolean ___lambda265__gsource_func (gpointer self); +static gboolean __lambda263_ (XnoiseDbusThumbnailer* self); +static gboolean ___lambda263__gsource_func (gpointer self); static void xnoise_dbus_thumbnailer_on_name_vanished (XnoiseDbusThumbnailer* self, GDBusConnection* conn, const gchar* name); static void xnoise_dbus_thumbnailer_get_dbus_data_free (gpointer _data); static void xnoise_dbus_thumbnailer_get_dbus (XnoiseDbusThumbnailer* self, GAsyncReadyCallback _callback_, gpointer _user_data_); @@ -155,9 +155,9 @@ static void _xnoise_dbus_thumbnailer_on_thumbnail_ready_thumbnailer_ready (Thumbnailer* _sender, guint32 handle, gchar** uris, int uris_length1, gpointer self); static void _xnoise_dbus_thumbnailer_on_name_appeared_gbus_name_appeared_callback (GDBusConnection* connection, const gchar* name, const gchar* name_owner, gpointer self); static void _xnoise_dbus_thumbnailer_on_name_vanished_gbus_name_vanished_callback (GDBusConnection* connection, const gchar* name, gpointer self); -static gboolean __lambda266_ (XnoiseDbusThumbnailer* self); +static gboolean __lambda264_ (XnoiseDbusThumbnailer* self); static void xnoise_dbus_thumbnailer_start (XnoiseDbusThumbnailer* self); -static gboolean ___lambda266__gsource_func (gpointer self); +static gboolean ___lambda264__gsource_func (gpointer self); static void _vala_array_add37 (gchar*** array, int* length, int* size, gchar* value); static void _vala_array_add38 (gchar*** array, int* length, int* size, gchar* value); XnoiseDbusThumbnailer* xnoise_dbus_thumbnailer_new (void); @@ -614,7 +614,7 @@ } -static gboolean __lambda264_ (XnoiseDbusThumbnailer* self) { +static gboolean __lambda262_ (XnoiseDbusThumbnailer* self) { gboolean result = FALSE; self->priv->handle_queue_timeout = (guint) 0; xnoise_dbus_thumbnailer_handle_queue (self); @@ -623,9 +623,9 @@ } -static gboolean ___lambda264__gsource_func (gpointer self) { +static gboolean ___lambda262__gsource_func (gpointer self) { gboolean result; - result = __lambda264_ (self); + result = __lambda262_ (self); return result; } @@ -672,12 +672,12 @@ if (_tmp7_ != ((guint) 0)) { return; } - _tmp8_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 200, ___lambda264__gsource_func, g_object_ref (self), g_object_unref); + _tmp8_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 200, ___lambda262__gsource_func, g_object_ref (self), g_object_unref); self->priv->handle_queue_timeout = _tmp8_; } -static gboolean __lambda265_ (XnoiseDbusThumbnailer* self) { +static gboolean __lambda263_ (XnoiseDbusThumbnailer* self) { gboolean result = FALSE; self->priv->handle_queue_timeout = (guint) 0; xnoise_dbus_thumbnailer_handle_queue (self); @@ -686,9 +686,9 @@ } -static gboolean ___lambda265__gsource_func (gpointer self) { +static gboolean ___lambda263__gsource_func (gpointer self) { gboolean result; - result = __lambda265_ (self); + result = __lambda263_ (self); return result; } @@ -709,7 +709,7 @@ if (_tmp1_ != ((guint) 0)) { return; } - _tmp2_ = g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda265__gsource_func, g_object_ref (self), g_object_unref); + _tmp2_ = g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda263__gsource_func, g_object_ref (self), g_object_unref); self->priv->handle_queue_timeout = _tmp2_; } @@ -986,7 +986,7 @@ } -static gboolean __lambda266_ (XnoiseDbusThumbnailer* self) { +static gboolean __lambda264_ (XnoiseDbusThumbnailer* self) { gboolean result = FALSE; xnoise_dbus_thumbnailer_start (self); result = FALSE; @@ -994,9 +994,9 @@ } -static gboolean ___lambda266__gsource_func (gpointer self) { +static gboolean ___lambda264__gsource_func (gpointer self) { gboolean result; - result = __lambda266_ (self); + result = __lambda264_ (self); return result; } @@ -1016,7 +1016,7 @@ xnoise_dbus_thumbnailer_get_dbus (self, NULL, NULL); return; } - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda266__gsource_func, g_object_ref (self), g_object_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda264__gsource_func, g_object_ref (self), g_object_unref); } diff -Nru xnoise-0.2.20/libxnoise/DBus/xnoise-dbus.c xnoise-0.2.21/libxnoise/DBus/xnoise-dbus.c --- xnoise-0.2.20/libxnoise/DBus/xnoise-dbus.c 2013-12-11 11:24:22.000000000 +0000 +++ xnoise-0.2.21/libxnoise/DBus/xnoise-dbus.c 2014-01-27 09:32:55.000000000 +0000 @@ -240,36 +240,36 @@ #define PLAYER_DBUS_SERVICE_INTERFACE_NAME "org.gtk.xnoise.PlayerEngine" XnoiseMain* xnoise_main_get_instance (void); GType xnoise_global_access_get_type (void) G_GNUC_CONST; -static void __lambda259_ (PlayerDbusService* self, GObject* s, GParamSpec* p); +static void __lambda257_ (PlayerDbusService* self, GObject* s, GParamSpec* p); gchar* player_dbus_service_get_PlaybackStatus (PlayerDbusService* self); static GVariant* _variant_new1 (gchar* value); static void player_dbus_service_queue_property_for_notification (PlayerDbusService* self, const gchar* property, GVariant* val); -static void ___lambda259__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); +static void ___lambda257__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); static void player_dbus_service_on_tag_changed (PlayerDbusService* self, XnoiseGlobalAccess* sender, const gchar* newuri, const gchar* tagname, const gchar* tagvalue); static void _player_dbus_service_on_tag_changed_xnoise_global_access_tag_changed (XnoiseGlobalAccess* _sender, const gchar* newuri, const gchar* tagname, const gchar* tagvalue, gpointer self); GType xnoise_gst_player_get_type (void) G_GNUC_CONST; -static void __lambda261_ (PlayerDbusService* self); +static void __lambda259_ (PlayerDbusService* self); gdouble xnoise_gst_player_get_volume (XnoiseGstPlayer* self); static GVariant* _variant_new2 (gdouble value); -static void ___lambda261__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); +static void ___lambda259__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); GType xnoise_album_image_loader_get_type (void) G_GNUC_CONST; -static void __lambda262_ (PlayerDbusService* self); +static void __lambda260_ (PlayerDbusService* self); const gchar* xnoise_album_image_loader_get_image_path_large (XnoiseAlbumImageLoader* self); #define XNOISE_RESOURCES_EMPTYSTRING "" static GVariant* _variant_new3 (const gchar* value); static GVariant* _variant_new4 (gchar* value); static GVariant* _variant_new5 (const gchar* value); static void player_dbus_service_trigger_metadata_update (PlayerDbusService* self); -static void ___lambda262__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); -static void __lambda263_ (PlayerDbusService* self); +static void ___lambda260__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); +static void __lambda261_ (PlayerDbusService* self); static GVariant* _variant_new6 (gint64 value); gint64 xnoise_gst_player_get_length_nsecs (XnoiseGstPlayer* self); static gint64 _variant_get7 (GVariant* value); static GVariant* _variant_new8 (gint64 value); -static void ___lambda263__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); -static gboolean __lambda260_ (PlayerDbusService* self); +static void ___lambda261__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); +static gboolean __lambda258_ (PlayerDbusService* self); static GVariant* _variant_new9 (GHashTable* value); -static gboolean ___lambda260__gsource_func (gpointer self); +static gboolean ___lambda258__gsource_func (gpointer self); static void _vala_array_add35 (gchar*** array, int* length, int* size, gchar* value); static GVariant* _variant_new10 (gchar** value, gint value_length1); static GVariant* _variant_new11 (const gchar* value); @@ -565,7 +565,7 @@ } -static void __lambda259_ (PlayerDbusService* self, GObject* s, GParamSpec* p) { +static void __lambda257_ (PlayerDbusService* self, GObject* s, GParamSpec* p) { GVariant* variant = NULL; gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; @@ -586,8 +586,8 @@ } -static void ___lambda259__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { - __lambda259_ (self, _sender, pspec); +static void ___lambda257__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { + __lambda257_ (self, _sender, pspec); } @@ -601,7 +601,7 @@ } -static void __lambda261_ (PlayerDbusService* self) { +static void __lambda259_ (PlayerDbusService* self) { GVariant* variant = NULL; XnoiseGstPlayer* _tmp0_ = NULL; gdouble _tmp1_ = 0.0; @@ -617,8 +617,8 @@ } -static void ___lambda261__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { - __lambda261_ (self); +static void ___lambda259__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { + __lambda259_ (self); } @@ -637,7 +637,7 @@ } -static void __lambda262_ (PlayerDbusService* self) { +static void __lambda260_ (PlayerDbusService* self) { gchar* s = NULL; XnoiseGlobalAccess* _tmp0_ = NULL; XnoiseAlbumImageLoader* _tmp1_ = NULL; @@ -700,8 +700,8 @@ } -static void ___lambda262__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { - __lambda262_ (self); +static void ___lambda260__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { + __lambda260_ (self); } @@ -720,7 +720,7 @@ } -static void __lambda263_ (PlayerDbusService* self) { +static void __lambda261_ (PlayerDbusService* self) { GHashTable* _tmp0_ = NULL; gconstpointer _tmp1_ = NULL; gint64 length_val = 0LL; @@ -767,8 +767,8 @@ } -static void ___lambda263__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { - __lambda263_ (self); +static void ___lambda261__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { + __lambda261_ (self); } @@ -791,16 +791,16 @@ _tmp2_ = _tmp1_; self->priv->xn = _tmp2_; _tmp3_ = xnoise_global; - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, G_TYPE_OBJECT, GObject), "notify::player-state", (GCallback) ___lambda259__g_object_notify, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, G_TYPE_OBJECT, GObject), "notify::player-state", (GCallback) ___lambda257__g_object_notify, self, 0); _tmp4_ = xnoise_global; g_signal_connect_object (_tmp4_, "tag-changed", (GCallback) _player_dbus_service_on_tag_changed_xnoise_global_access_tag_changed, self, 0); _tmp5_ = xnoise_gst_player; - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, G_TYPE_OBJECT, GObject), "notify::volume", (GCallback) ___lambda261__g_object_notify, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, G_TYPE_OBJECT, GObject), "notify::volume", (GCallback) ___lambda259__g_object_notify, self, 0); _tmp6_ = xnoise_global; _tmp7_ = _tmp6_->image_loader; - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, G_TYPE_OBJECT, GObject), "notify::image-path-large", (GCallback) ___lambda262__g_object_notify, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, G_TYPE_OBJECT, GObject), "notify::image-path-large", (GCallback) ___lambda260__g_object_notify, self, 0); _tmp8_ = xnoise_gst_player; - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, G_TYPE_OBJECT, GObject), "notify::length-time", (GCallback) ___lambda263__g_object_notify, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, G_TYPE_OBJECT, GObject), "notify::length-time", (GCallback) ___lambda261__g_object_notify, self, 0); return self; } @@ -828,7 +828,7 @@ } -static gboolean __lambda260_ (PlayerDbusService* self) { +static gboolean __lambda258_ (PlayerDbusService* self) { gboolean result = FALSE; GVariant* variant = NULL; GHashTable* _tmp0_ = NULL; @@ -844,9 +844,9 @@ } -static gboolean ___lambda260__gsource_func (gpointer self) { +static gboolean ___lambda258__gsource_func (gpointer self) { gboolean result; - result = __lambda260_ (self); + result = __lambda258_ (self); return result; } @@ -861,7 +861,7 @@ _tmp1_ = self->priv->update_metadata_source; g_source_remove (_tmp1_); } - _tmp2_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 120, ___lambda260__gsource_func, g_object_ref (self), g_object_unref); + _tmp2_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 120, ___lambda258__gsource_func, g_object_ref (self), g_object_unref); self->priv->update_metadata_source = _tmp2_; } diff -Nru xnoise-0.2.20/libxnoise/DBus/xnoise-desktop-notifications.c xnoise-0.2.21/libxnoise/DBus/xnoise-desktop-notifications.c --- xnoise-0.2.20/libxnoise/DBus/xnoise-desktop-notifications.c 2013-12-11 11:24:22.000000000 +0000 +++ xnoise-0.2.21/libxnoise/DBus/xnoise-desktop-notifications.c 2014-01-27 09:32:55.000000000 +0000 @@ -214,7 +214,7 @@ gboolean xnoise_params_is_inited (void); static void xnoise_desktop_notifications_get_dbus_proxy (XnoiseDesktopNotifications* self, GAsyncReadyCallback _callback_, gpointer _user_data_); static void xnoise_desktop_notifications_get_dbus_proxy_finish (XnoiseDesktopNotifications* self, GAsyncResult* _res_); -static gboolean __lambda267_ (XnoiseDesktopNotifications* self); +static gboolean __lambda265_ (XnoiseDesktopNotifications* self); static void xnoise_desktop_notifications_on_tag_changed (XnoiseDesktopNotifications* self); static void _xnoise_desktop_notifications_on_tag_changed_xnoise_global_access_tag_changed (XnoiseGlobalAccess* _sender, const gchar* newuri, const gchar* tagname, const gchar* tagvalue, gpointer self); GType xnoise_album_image_loader_get_type (void) G_GNUC_CONST; @@ -222,13 +222,13 @@ static void xnoise_desktop_notifications_on_image_changed (XnoiseDesktopNotifications* self); static void _xnoise_desktop_notifications_on_image_changed_xnoise_album_image_loader_image_path_small_changed (XnoiseAlbumImageLoader* _sender, gpointer self); static void _xnoise_desktop_notifications_on_image_changed_xnoise_album_image_loader_image_path_embedded_changed (XnoiseAlbumImageLoader* _sender, gpointer self); -static gboolean ___lambda267__gsource_func (gpointer self); +static gboolean ___lambda265__gsource_func (gpointer self); const gchar* xnoise_global_access_get_current_uri (XnoiseGlobalAccess* self); -static gboolean __lambda272_ (XnoiseDesktopNotifications* self); +static gboolean __lambda270_ (XnoiseDesktopNotifications* self); static void xnoise_desktop_notifications_setup_notification_in_idle (XnoiseDesktopNotifications* self); -static gboolean ___lambda272__gsource_func (gpointer self); -static gboolean __lambda268_ (XnoiseDesktopNotifications* self); -static gboolean ___lambda268__gsource_func (gpointer self); +static gboolean ___lambda270__gsource_func (gpointer self); +static gboolean __lambda266_ (XnoiseDesktopNotifications* self); +static gboolean ___lambda266__gsource_func (gpointer self); static Block3Data* block3_data_ref (Block3Data* _data3_); static void block3_data_unref (void * _userdata_); GType xnoise_main_window_get_type (void) G_GNUC_CONST; @@ -247,18 +247,18 @@ #define XNOISE_RESOURCES_UNKNOWN_TITLE "unknown title" const gchar* xnoise_album_image_loader_get_image_path_embedded (XnoiseAlbumImageLoader* self); const gchar* xnoise_album_image_loader_get_image_path_small (XnoiseAlbumImageLoader* self); -static gboolean __lambda269_ (Block3Data* _data3_); +static gboolean __lambda267_ (Block3Data* _data3_); void xnoise_desktop_notifications_send_notification (XnoiseDesktopNotifications* self, const gchar* icon, const gchar* summary, const gchar* body, gint32 timeout); -static gboolean ___lambda269__gsource_func (gpointer self); +static gboolean ___lambda267__gsource_func (gpointer self); static Block4Data* block4_data_ref (Block4Data* _data4_); static void block4_data_unref (void * _userdata_); -static gboolean ___lambda270_ (Block4Data* _data4_); -static gboolean ____lambda270__gsource_func (gpointer self); +static gboolean ___lambda268_ (Block4Data* _data4_); +static gboolean ____lambda268__gsource_func (gpointer self); static void _g_free0_ (gpointer var); static void _g_variant_unref0_ (gpointer var); -static gboolean ___lambda271_ (Block4Data* _data4_); +static gboolean ___lambda269_ (Block4Data* _data4_); void xnoise_desktop_notifications_close_notification (XnoiseDesktopNotifications* self, guint32 id); -static gboolean ____lambda271__gsource_func (gpointer self); +static gboolean ____lambda269__gsource_func (gpointer self); static void xnoise_desktop_notifications_on_name_appeared (XnoiseDesktopNotifications* self, GDBusConnection* conn, const gchar* name); static void xnoise_desktop_notifications_on_name_vanished (XnoiseDesktopNotifications* self, GDBusConnection* conn, const gchar* name); static void xnoise_desktop_notifications_get_dbus_proxy_data_free (gpointer _data); @@ -636,7 +636,7 @@ } -static gboolean __lambda267_ (XnoiseDesktopNotifications* self) { +static gboolean __lambda265_ (XnoiseDesktopNotifications* self) { gboolean result = FALSE; XnoiseGlobalAccess* _tmp0_ = NULL; XnoiseGlobalAccess* _tmp1_ = NULL; @@ -656,9 +656,9 @@ } -static gboolean ___lambda267__gsource_func (gpointer self) { +static gboolean ___lambda265__gsource_func (gpointer self) { gboolean result; - result = __lambda267_ (self); + result = __lambda265_ (self); return result; } @@ -673,7 +673,7 @@ _tmp1_ = xnoise_params_is_inited (); _vala_assert (_tmp1_, "Params.is_inited()"); xnoise_desktop_notifications_get_dbus_proxy (self, NULL, NULL); - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda267__gsource_func, g_object_ref (self), g_object_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda265__gsource_func, g_object_ref (self), g_object_unref); return self; } @@ -683,7 +683,7 @@ } -static gboolean __lambda272_ (XnoiseDesktopNotifications* self) { +static gboolean __lambda270_ (XnoiseDesktopNotifications* self) { gboolean result = FALSE; xnoise_desktop_notifications_setup_notification_in_idle (self); self->priv->data_changed_source = (guint) 0; @@ -692,9 +692,9 @@ } -static gboolean ___lambda272__gsource_func (gpointer self) { +static gboolean ___lambda270__gsource_func (gpointer self) { gboolean result; - result = __lambda272_ (self); + result = __lambda270_ (self); return result; } @@ -718,12 +718,12 @@ _tmp4_ = self->priv->data_changed_source; g_source_remove (_tmp4_); } - _tmp5_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 200, ___lambda272__gsource_func, g_object_ref (self), g_object_unref); + _tmp5_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 200, ___lambda270__gsource_func, g_object_ref (self), g_object_unref); self->priv->data_changed_source = _tmp5_; } -static gboolean __lambda268_ (XnoiseDesktopNotifications* self) { +static gboolean __lambda266_ (XnoiseDesktopNotifications* self) { gboolean result = FALSE; xnoise_desktop_notifications_setup_notification_in_idle (self); self->priv->data_changed_source = (guint) 0; @@ -732,9 +732,9 @@ } -static gboolean ___lambda268__gsource_func (gpointer self) { +static gboolean ___lambda266__gsource_func (gpointer self) { gboolean result; - result = __lambda268_ (self); + result = __lambda266_ (self); return result; } @@ -749,7 +749,7 @@ _tmp1_ = self->priv->data_changed_source; g_source_remove (_tmp1_); } - _tmp2_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 200, ___lambda268__gsource_func, g_object_ref (self), g_object_unref); + _tmp2_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 200, ___lambda266__gsource_func, g_object_ref (self), g_object_unref); self->priv->data_changed_source = _tmp2_; } @@ -775,7 +775,7 @@ } -static gboolean __lambda269_ (Block3Data* _data3_) { +static gboolean __lambda267_ (Block3Data* _data3_) { XnoiseDesktopNotifications * self; gboolean result = FALSE; const gchar* _tmp0_ = NULL; @@ -793,9 +793,9 @@ } -static gboolean ___lambda269__gsource_func (gpointer self) { +static gboolean ___lambda267__gsource_func (gpointer self) { gboolean result; - result = __lambda269_ (self); + result = __lambda267_ (self); return result; } @@ -1146,7 +1146,7 @@ _g_free0 (_data3_->image); _data3_->image = _tmp113_; } - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda269__gsource_func, block3_data_ref (_data3_), block3_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda267__gsource_func, block3_data_ref (_data3_), block3_data_unref); _g_free0 (_tmp75_); _g_free0 (_tmp63_); _g_object_unref0 (file); @@ -1180,7 +1180,7 @@ } -static gboolean ___lambda270_ (Block4Data* _data4_) { +static gboolean ___lambda268_ (Block4Data* _data4_) { XnoiseDesktopNotifications * self; gboolean result = FALSE; const gchar* _tmp0_ = NULL; @@ -1198,9 +1198,9 @@ } -static gboolean ____lambda270__gsource_func (gpointer self) { +static gboolean ____lambda268__gsource_func (gpointer self) { gboolean result; - result = ___lambda270_ (self); + result = ___lambda268_ (self); return result; } @@ -1215,7 +1215,7 @@ } -static gboolean ___lambda271_ (Block4Data* _data4_) { +static gboolean ___lambda269_ (Block4Data* _data4_) { XnoiseDesktopNotifications * self; gboolean result = FALSE; guint32 _tmp0_ = 0U; @@ -1228,9 +1228,9 @@ } -static gboolean ____lambda271__gsource_func (gpointer self) { +static gboolean ____lambda269__gsource_func (gpointer self) { gboolean result; - result = ___lambda271_ (self); + result = ___lambda269_ (self); return result; } @@ -1291,7 +1291,7 @@ } g_print ("Try waking up notification daemon...\n"); xnoise_desktop_notifications_get_dbus_proxy (self, NULL, NULL); - g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 2, ____lambda270__gsource_func, block4_data_ref (_data4_), block4_data_unref); + g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 2, ____lambda268__gsource_func, block4_data_ref (_data4_), block4_data_unref); } _tmp10_ = g_new0 (gchar*, 0 + 1); actions = _tmp10_; @@ -1348,7 +1348,7 @@ g_source_remove (_tmp25_); } _tmp26_ = _data4_->timeout; - _tmp27_ = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) _tmp26_, ____lambda271__gsource_func, block4_data_ref (_data4_), block4_data_unref); + _tmp27_ = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) _tmp26_, ____lambda269__gsource_func, block4_data_ref (_data4_), block4_data_unref); self->priv->removal_timeout = _tmp27_; } goto __finally14; diff -Nru xnoise-0.2.20/libxnoise/DockableMedia/History/xnoise-lastplayed-treeview-model.c xnoise-0.2.21/libxnoise/DockableMedia/History/xnoise-lastplayed-treeview-model.c --- xnoise-0.2.20/libxnoise/DockableMedia/History/xnoise-lastplayed-treeview-model.c 2013-12-11 11:24:22.000000000 +0000 +++ xnoise-0.2.21/libxnoise/DockableMedia/History/xnoise-lastplayed-treeview-model.c 2014-01-27 09:32:55.000000000 +0000 @@ -340,15 +340,15 @@ XnoiseLastplayedTreeviewModel* xnoise_lastplayed_treeview_model_construct (GType object_type, XnoisePlaylistTreeViewLastplayed* view, XnoiseDockableMedia* dock); static void xnoise_lastplayed_treeview_model_populate (XnoiseLastplayedTreeviewModel* self); GType xnoise_global_access_get_type (void) G_GNUC_CONST; -static void __lambda306_ (XnoiseLastplayedTreeviewModel* self, XnoiseGlobalAccess* s, const gchar* t); +static void __lambda304_ (XnoiseLastplayedTreeviewModel* self, XnoiseGlobalAccess* s, const gchar* t); gchar* xnoise_dockable_media_name (XnoiseDockableMedia* self); const gchar* xnoise_global_access_get_active_dockable_media_name (XnoiseGlobalAccess* self); -static gboolean ___lambda307_ (XnoiseLastplayedTreeviewModel* self); +static gboolean ___lambda305_ (XnoiseLastplayedTreeviewModel* self); void xnoise_lastplayed_treeview_model_filter (XnoiseLastplayedTreeviewModel* self); -static gboolean ____lambda307__gsource_func (gpointer self); -static gboolean ___lambda308_ (XnoiseLastplayedTreeviewModel* self); -static gboolean ____lambda308__gsource_func (gpointer self); -static void ___lambda306__xnoise_global_access_sign_searchtext_changed (XnoiseGlobalAccess* _sender, const gchar* text, gpointer self); +static gboolean ____lambda305__gsource_func (gpointer self); +static gboolean ___lambda306_ (XnoiseLastplayedTreeviewModel* self); +static gboolean ____lambda306__gsource_func (gpointer self); +static void ___lambda304__xnoise_global_access_sign_searchtext_changed (XnoiseGlobalAccess* _sender, const gchar* text, gpointer self); GType xnoise_database_writer_notification_data_get_type (void) G_GNUC_CONST; GType xnoise_database_writer_change_type_get_type (void) G_GNUC_CONST; XnoiseDatabaseWriterNotificationData* xnoise_database_writer_notification_data_dup (const XnoiseDatabaseWriterNotificationData* self); @@ -357,8 +357,8 @@ static void _xnoise_lastplayed_treeview_model_database_change_cb_xnoise_database_writer_change_notification_callback (XnoiseDatabaseWriterChangeType changetype, XnoiseItem* item, gpointer self); GType xnoise_database_writer_get_type (void) G_GNUC_CONST; void xnoise_database_writer_register_change_callback (XnoiseDatabaseWriter* self, XnoiseDatabaseWriterNotificationData* cbd); -static gboolean ___lambda309_ (XnoiseLastplayedTreeviewModel* self); -static gboolean ____lambda309__gsource_func (gpointer self); +static gboolean ___lambda307_ (XnoiseLastplayedTreeviewModel* self); +static gboolean ____lambda307__gsource_func (gpointer self); gpointer xnoise_worker_job_ref (gpointer instance); void xnoise_worker_job_unref (gpointer instance); GParamSpec* xnoise_worker_param_spec_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -400,10 +400,10 @@ void xnoise_dnd_data_copy (const XnoiseDndData* self, XnoiseDndData* dest); void xnoise_dnd_data_destroy (XnoiseDndData* self); static void _vala_XnoiseItem_array_free (XnoiseItem* array, gint array_length); -static gboolean __lambda305_ (Block7Data* _data7_); +static gboolean __lambda303_ (Block7Data* _data7_); gboolean xnoise_thumbnail_available (const gchar* uri, GFile** _thumb); #define XNOISE_RESOURCES_VIDEOTHUMBNAILSIZE 40 -static gboolean ___lambda305__gsource_func (gpointer self); +static gboolean ___lambda303__gsource_func (gpointer self); XnoiseDndData* xnoise_lastplayed_treeview_model_get_dnd_data_for_path (XnoiseLastplayedTreeviewModel* self, GtkTreePath** treepath, int* result_length1); gint xnoise_data_source_get_source_id (XnoiseDataSource* self); static void _vala_array_add40 (XnoiseDndData** array, int* length, int* size, const XnoiseDndData* value); @@ -428,7 +428,7 @@ } -static gboolean ___lambda307_ (XnoiseLastplayedTreeviewModel* self) { +static gboolean ___lambda305_ (XnoiseLastplayedTreeviewModel* self) { gboolean result = FALSE; xnoise_lastplayed_treeview_model_filter (self); self->priv->search_idlesource = (guint) 0; @@ -437,14 +437,14 @@ } -static gboolean ____lambda307__gsource_func (gpointer self) { +static gboolean ____lambda305__gsource_func (gpointer self) { gboolean result; - result = ___lambda307_ (self); + result = ___lambda305_ (self); return result; } -static gboolean ___lambda308_ (XnoiseLastplayedTreeviewModel* self) { +static gboolean ___lambda306_ (XnoiseLastplayedTreeviewModel* self) { gboolean result = FALSE; xnoise_lastplayed_treeview_model_filter (self); self->priv->search_idlesource = (guint) 0; @@ -453,14 +453,14 @@ } -static gboolean ____lambda308__gsource_func (gpointer self) { +static gboolean ____lambda306__gsource_func (gpointer self) { gboolean result; - result = ___lambda308_ (self); + result = ___lambda306_ (self); return result; } -static void __lambda306_ (XnoiseLastplayedTreeviewModel* self, XnoiseGlobalAccess* s, const gchar* t) { +static void __lambda304_ (XnoiseLastplayedTreeviewModel* self, XnoiseGlobalAccess* s, const gchar* t) { XnoiseDockableMedia* _tmp0_ = NULL; gchar* _tmp1_ = NULL; gchar* _tmp2_ = NULL; @@ -487,7 +487,7 @@ _tmp8_ = self->priv->search_idlesource; g_source_remove (_tmp8_); } - _tmp9_ = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ____lambda307__gsource_func, g_object_ref (self), g_object_unref); + _tmp9_ = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ____lambda305__gsource_func, g_object_ref (self), g_object_unref); self->priv->search_idlesource = _tmp9_; } else { guint _tmp10_ = 0U; @@ -498,14 +498,14 @@ _tmp11_ = self->priv->search_idlesource; g_source_remove (_tmp11_); } - _tmp12_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 200, ____lambda308__gsource_func, g_object_ref (self), g_object_unref); + _tmp12_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 200, ____lambda306__gsource_func, g_object_ref (self), g_object_unref); self->priv->search_idlesource = _tmp12_; } } -static void ___lambda306__xnoise_global_access_sign_searchtext_changed (XnoiseGlobalAccess* _sender, const gchar* text, gpointer self) { - __lambda306_ (self, _sender, text); +static void ___lambda304__xnoise_global_access_sign_searchtext_changed (XnoiseGlobalAccess* _sender, const gchar* text, gpointer self) { + __lambda304_ (self, _sender, text); } @@ -539,7 +539,7 @@ self->priv->dock = _tmp3_; xnoise_lastplayed_treeview_model_populate (self); _tmp4_ = xnoise_global; - g_signal_connect_object (_tmp4_, "sign-searchtext-changed", (GCallback) ___lambda306__xnoise_global_access_sign_searchtext_changed, self, 0); + g_signal_connect_object (_tmp4_, "sign-searchtext-changed", (GCallback) ___lambda304__xnoise_global_access_sign_searchtext_changed, self, 0); memset (&nd, 0, sizeof (XnoiseDatabaseWriterNotificationData)); nd.cb = _xnoise_lastplayed_treeview_model_database_change_cb_xnoise_database_writer_change_notification_callback; nd.cb_target = self; @@ -555,7 +555,7 @@ } -static gboolean ___lambda309_ (XnoiseLastplayedTreeviewModel* self) { +static gboolean ___lambda307_ (XnoiseLastplayedTreeviewModel* self) { gboolean result = FALSE; xnoise_lastplayed_treeview_model_filter (self); self->priv->src = (guint) 0; @@ -564,9 +564,9 @@ } -static gboolean ____lambda309__gsource_func (gpointer self) { +static gboolean ____lambda307__gsource_func (gpointer self) { gboolean result; - result = ___lambda309_ (self); + result = ___lambda307_ (self); return result; } @@ -584,7 +584,7 @@ _tmp2_ = self->priv->src; g_source_remove (_tmp2_); } - _tmp3_ = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 2, ____lambda309__gsource_func, g_object_ref (self), g_object_unref); + _tmp3_ = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 2, ____lambda307__gsource_func, g_object_ref (self), g_object_unref); self->priv->src = _tmp3_; } } @@ -667,7 +667,7 @@ } -static gboolean __lambda305_ (Block7Data* _data7_) { +static gboolean __lambda303_ (Block7Data* _data7_) { XnoiseLastplayedTreeviewModel * self; gboolean result = FALSE; GtkTreeIter iter = {0}; @@ -845,9 +845,9 @@ } -static gboolean ___lambda305__gsource_func (gpointer self) { +static gboolean ___lambda303__gsource_func (gpointer self) { gboolean result; - result = __lambda305_ (self); + result = __lambda303_ (self); return result; } @@ -882,7 +882,7 @@ _tmp2_->items = (_vala_XnoiseItem_array_free (_tmp2_->items, _tmp2_->items_length1), NULL); _tmp2_->items = _tmp8_; _tmp2_->items_length1 = _tmp7_; - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda305__gsource_func, block7_data_ref (_data7_), block7_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda303__gsource_func, block7_data_ref (_data7_), block7_data_unref); result = FALSE; block7_data_unref (_data7_); _data7_ = NULL; diff -Nru xnoise-0.2.20/libxnoise/DockableMedia/History/xnoise-lastplayed-treeview.c xnoise-0.2.21/libxnoise/DockableMedia/History/xnoise-lastplayed-treeview.c --- xnoise-0.2.20/libxnoise/DockableMedia/History/xnoise-lastplayed-treeview.c 2013-12-11 11:24:22.000000000 +0000 +++ xnoise-0.2.21/libxnoise/DockableMedia/History/xnoise-lastplayed-treeview.c 2014-01-27 09:32:55.000000000 +0000 @@ -471,7 +471,7 @@ GType xnoise_lastplayed_treeview_model_column_get_type (void) G_GNUC_CONST; XnoiseLastplayedTreeviewModel* xnoise_lastplayed_treeview_model_new (XnoisePlaylistTreeViewLastplayed* view, XnoiseDockableMedia* dock); XnoiseLastplayedTreeviewModel* xnoise_lastplayed_treeview_model_construct (GType object_type, XnoisePlaylistTreeViewLastplayed* view, XnoiseDockableMedia* dock); -static void __lambda310_ (XnoisePlaylistTreeViewLastplayed* self, GtkTreeView* s, GtkTreePath* tp, GtkTreeViewColumn* c); +static void __lambda308_ (XnoisePlaylistTreeViewLastplayed* self, GtkTreeView* s, GtkTreePath* tp, GtkTreeViewColumn* c); GType xnoise_item_get_type (void) G_GNUC_CONST; GType xnoise_item_type_get_type (void) G_GNUC_CONST; XnoiseItem* xnoise_item_dup (const XnoiseItem* self); @@ -494,7 +494,7 @@ GType xnoise_item_selection_type_get_type (void) G_GNUC_CONST; XnoiseAction* xnoise_item_handler_get_action (XnoiseItemHandler* self, XnoiseItemType type, XnoiseActionContext context, XnoiseItemSelectionType selection); static void _vala_GValue_free (GValue* self); -static void ___lambda310__gtk_tree_view_row_activated (GtkTreeView* _sender, GtkTreePath* path, GtkTreeViewColumn* column, gpointer self); +static void ___lambda308__gtk_tree_view_row_activated (GtkTreeView* _sender, GtkTreePath* path, GtkTreeViewColumn* column, gpointer self); static void xnoise_playlist_tree_view_lastplayed_on_drag_begin (XnoisePlaylistTreeViewLastplayed* self, GtkWidget* sender, GdkDragContext* context); static void _xnoise_playlist_tree_view_lastplayed_on_drag_begin_gtk_widget_drag_begin (GtkWidget* _sender, GdkDragContext* context, gpointer self); static void xnoise_playlist_tree_view_lastplayed_on_drag_data_get (XnoisePlaylistTreeViewLastplayed* self, GtkWidget* sender, GdkDragContext* context, GtkSelectionData* selection_data, guint info, guint etime); @@ -507,17 +507,17 @@ static gboolean _xnoise_playlist_tree_view_lastplayed_on_button_press_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self); static gboolean xnoise_playlist_tree_view_lastplayed_on_key_released (XnoisePlaylistTreeViewLastplayed* self, GtkWidget* sender, GdkEventKey* e); static gboolean _xnoise_playlist_tree_view_lastplayed_on_key_released_gtk_widget_key_release_event (GtkWidget* _sender, GdkEventKey* event, gpointer self); -static void __lambda312_ (XnoisePlaylistTreeViewLastplayed* self, GtkWidget* s, GtkAllocation* a); -static gboolean ___lambda313_ (XnoisePlaylistTreeViewLastplayed* self, GtkTreeModel* mo, GtkTreePath* pt, GtkTreeIter* it); -static gboolean ____lambda313__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self); -static void ___lambda312__gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self); -static void __lambda314_ (XnoisePlaylistTreeViewLastplayed* self); +static void __lambda310_ (XnoisePlaylistTreeViewLastplayed* self, GtkWidget* s, GtkAllocation* a); +static gboolean ___lambda311_ (XnoisePlaylistTreeViewLastplayed* self, GtkTreeModel* mo, GtkTreePath* pt, GtkTreeIter* it); +static gboolean ____lambda311__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self); +static void ___lambda310__gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self); +static void __lambda312_ (XnoisePlaylistTreeViewLastplayed* self); +static gboolean __lambda313_ (XnoisePlaylistTreeViewLastplayed* self); +static gboolean ___lambda314_ (XnoisePlaylistTreeViewLastplayed* self, GtkTreeModel* mo, GtkTreePath* pt, GtkTreeIter* it); +static gboolean ____lambda314__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self); +static gboolean ___lambda313__gsource_func (gpointer self); +static void ___lambda312__gtk_widget_realize (GtkWidget* _sender, gpointer self); static gboolean __lambda315_ (XnoisePlaylistTreeViewLastplayed* self); -static gboolean ___lambda316_ (XnoisePlaylistTreeViewLastplayed* self, GtkTreeModel* mo, GtkTreePath* pt, GtkTreeIter* it); -static gboolean ____lambda316__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self); -static gboolean ___lambda315__gsource_func (gpointer self); -static void ___lambda314__gtk_widget_realize (GtkWidget* _sender, gpointer self); -static gboolean __lambda317_ (XnoisePlaylistTreeViewLastplayed* self); GType xnoise_iparams_get_type (void) G_GNUC_CONST; GType xnoise_serial_button_get_type (void) G_GNUC_CONST; GType xnoise_album_art_view_get_type (void) G_GNUC_CONST; @@ -533,7 +533,7 @@ GType xnoise_track_infobar_get_type (void) G_GNUC_CONST; GType xnoise_music_browser_get_type (void) G_GNUC_CONST; GType xnoise_media_soure_widget_get_type (void) G_GNUC_CONST; -static gboolean ___lambda317__gsource_func (gpointer self); +static gboolean ___lambda315__gsource_func (gpointer self); static void xnoise_playlist_tree_view_lastplayed_rightclick_menu_popup (XnoisePlaylistTreeViewLastplayed* self, guint activateTime); static gint xnoise_playlist_tree_view_lastplayed_real_get_model_item_column (XnoisePlaylistQueryable* base); static XnoiseDynPlaylistType xnoise_playlist_tree_view_lastplayed_real_get_dynamic_playlist_type (XnoisePlaylistQueryable* base); @@ -545,8 +545,8 @@ GArray* xnoise_item_handler_manager_get_actions (XnoiseItemHandlerManager* self, XnoiseItemType type, XnoiseActionContext context, XnoiseItemSelectionType selection); static Block6Data* block6_data_ref (Block6Data* _data6_); static void block6_data_unref (void * _userdata_); -static void _____lambda311_ (Block6Data* _data6_); -static void ______lambda311__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self); +static void _____lambda309_ (Block6Data* _data6_); +static void ______lambda309__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self); GType xnoise_dnd_data_get_type (void) G_GNUC_CONST; XnoiseDndData* xnoise_dnd_data_dup (const XnoiseDndData* self); void xnoise_dnd_data_free (XnoiseDndData* self); @@ -599,7 +599,7 @@ } -static void __lambda310_ (XnoisePlaylistTreeViewLastplayed* self, GtkTreeView* s, GtkTreePath* tp, GtkTreeViewColumn* c) { +static void __lambda308_ (XnoisePlaylistTreeViewLastplayed* self, GtkTreeView* s, GtkTreePath* tp, GtkTreeViewColumn* c) { XnoiseItem* item = NULL; XnoiseItem _tmp0_ = {0}; XnoiseItem _tmp1_ = {0}; @@ -681,8 +681,8 @@ } -static void ___lambda310__gtk_tree_view_row_activated (GtkTreeView* _sender, GtkTreePath* path, GtkTreeViewColumn* column, gpointer self) { - __lambda310_ (self, _sender, path, column); +static void ___lambda308__gtk_tree_view_row_activated (GtkTreeView* _sender, GtkTreePath* path, GtkTreeViewColumn* column, gpointer self) { + __lambda308_ (self, _sender, path, column); } @@ -722,7 +722,7 @@ } -static gboolean ___lambda313_ (XnoisePlaylistTreeViewLastplayed* self, GtkTreeModel* mo, GtkTreePath* pt, GtkTreeIter* it) { +static gboolean ___lambda311_ (XnoisePlaylistTreeViewLastplayed* self, GtkTreeModel* mo, GtkTreePath* pt, GtkTreeIter* it) { gboolean result = FALSE; GtkTreeModel* _tmp0_ = NULL; GtkTreeModel* _tmp1_ = NULL; @@ -745,14 +745,14 @@ } -static gboolean ____lambda313__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self) { +static gboolean ____lambda311__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self) { gboolean result; - result = ___lambda313_ (self, model, path, iter); + result = ___lambda311_ (self, model, path, iter); return result; } -static void __lambda312_ (XnoisePlaylistTreeViewLastplayed* self, GtkWidget* s, GtkAllocation* a) { +static void __lambda310_ (XnoisePlaylistTreeViewLastplayed* self, GtkWidget* s, GtkAllocation* a) { GtkTreeViewColumn* tvc = NULL; GtkTreeViewColumn* _tmp0_ = NULL; gint current_width = 0; @@ -794,18 +794,18 @@ if (_tmp11_ != NULL) { GtkTreeModel* _tmp12_ = NULL; _tmp12_ = xm; - gtk_tree_model_foreach (_tmp12_, ____lambda313__gtk_tree_model_foreach_func, self); + gtk_tree_model_foreach (_tmp12_, ____lambda311__gtk_tree_model_foreach_func, self); } _g_object_unref0 (xm); } -static void ___lambda312__gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self) { - __lambda312_ (self, _sender, allocation); +static void ___lambda310__gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self) { + __lambda310_ (self, _sender, allocation); } -static gboolean ___lambda316_ (XnoisePlaylistTreeViewLastplayed* self, GtkTreeModel* mo, GtkTreePath* pt, GtkTreeIter* it) { +static gboolean ___lambda314_ (XnoisePlaylistTreeViewLastplayed* self, GtkTreeModel* mo, GtkTreePath* pt, GtkTreeIter* it) { gboolean result = FALSE; GtkTreeModel* _tmp0_ = NULL; GtkTreeModel* _tmp1_ = NULL; @@ -828,14 +828,14 @@ } -static gboolean ____lambda316__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self) { +static gboolean ____lambda314__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self) { gboolean result; - result = ___lambda316_ (self, model, path, iter); + result = ___lambda314_ (self, model, path, iter); return result; } -static gboolean __lambda315_ (XnoisePlaylistTreeViewLastplayed* self) { +static gboolean __lambda313_ (XnoisePlaylistTreeViewLastplayed* self) { gboolean result = FALSE; GtkTreeViewColumn* tvc = NULL; GtkTreeViewColumn* _tmp0_ = NULL; @@ -866,7 +866,7 @@ if (_tmp8_ != NULL) { GtkTreeModel* _tmp9_ = NULL; _tmp9_ = xm; - gtk_tree_model_foreach (_tmp9_, ____lambda316__gtk_tree_model_foreach_func, self); + gtk_tree_model_foreach (_tmp9_, ____lambda314__gtk_tree_model_foreach_func, self); } result = FALSE; _g_object_unref0 (xm); @@ -874,24 +874,24 @@ } -static gboolean ___lambda315__gsource_func (gpointer self) { +static gboolean ___lambda313__gsource_func (gpointer self) { gboolean result; - result = __lambda315_ (self); + result = __lambda313_ (self); return result; } -static void __lambda314_ (XnoisePlaylistTreeViewLastplayed* self) { - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda315__gsource_func, g_object_ref (self), g_object_unref); +static void __lambda312_ (XnoisePlaylistTreeViewLastplayed* self) { + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda313__gsource_func, g_object_ref (self), g_object_unref); } -static void ___lambda314__gtk_widget_realize (GtkWidget* _sender, gpointer self) { - __lambda314_ (self); +static void ___lambda312__gtk_widget_realize (GtkWidget* _sender, gpointer self) { + __lambda312_ (self); } -static gboolean __lambda317_ (XnoisePlaylistTreeViewLastplayed* self) { +static gboolean __lambda315_ (XnoisePlaylistTreeViewLastplayed* self) { gboolean result = FALSE; GtkStyleContext* ctx = NULL; XnoiseMainWindow* _tmp0_ = NULL; @@ -917,9 +917,9 @@ } -static gboolean ___lambda317__gsource_func (gpointer self) { +static gboolean ___lambda315__gsource_func (gpointer self) { gboolean result; - result = __lambda317_ (self); + result = __lambda315_ (self); return result; } @@ -988,7 +988,7 @@ self->priv->tvm = _tmp11_; _tmp12_ = self->priv->tvm; gtk_tree_view_set_model (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_TREE_VIEW, GtkTreeView), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GTK_TYPE_TREE_MODEL, GtkTreeModel)); - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_TREE_VIEW, GtkTreeView), "row-activated", (GCallback) ___lambda310__gtk_tree_view_row_activated, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_TREE_VIEW, GtkTreeView), "row-activated", (GCallback) ___lambda308__gtk_tree_view_row_activated, self, 0); gtk_drag_source_set (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), GDK_BUTTON1_MASK, XNOISE_PLAYLIST_TREE_VIEW_LASTPLAYED_src_target_entries, G_N_ELEMENTS (XNOISE_PLAYLIST_TREE_VIEW_LASTPLAYED_src_target_entries), GDK_ACTION_COPY); g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), "drag-begin", (GCallback) _xnoise_playlist_tree_view_lastplayed_on_drag_begin_gtk_widget_drag_begin, self, 0); g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), "drag-data-get", (GCallback) _xnoise_playlist_tree_view_lastplayed_on_drag_data_get_gtk_widget_drag_data_get, self, 0); @@ -997,15 +997,15 @@ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), "button-press-event", (GCallback) _xnoise_playlist_tree_view_lastplayed_on_button_press_gtk_widget_button_press_event, self, 0); g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), "key-release-event", (GCallback) _xnoise_playlist_tree_view_lastplayed_on_key_released_gtk_widget_key_release_event, self, 0); _tmp13_ = self->priv->ow; - g_signal_connect_object (_tmp13_, "size-allocate", (GCallback) ___lambda312__gtk_widget_size_allocate, self, G_CONNECT_AFTER); - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), "realize", (GCallback) ___lambda314__gtk_widget_realize, self, G_CONNECT_AFTER); + g_signal_connect_object (_tmp13_, "size-allocate", (GCallback) ___lambda310__gtk_widget_size_allocate, self, G_CONNECT_AFTER); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), "realize", (GCallback) ___lambda312__gtk_widget_realize, self, G_CONNECT_AFTER); gtk_style_context_save (context); gtk_style_context_get_background_color (context, GTK_STATE_FLAG_SELECTED, &_tmp14_); scolor = _tmp14_; gtk_style_context_add_class (context, GTK_STYLE_CLASS_PANE_SEPARATOR); gtk_style_context_get_background_color (context, GTK_STATE_FLAG_NORMAL, &_tmp15_); color = _tmp15_; - g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ___lambda317__gsource_func, g_object_ref (self), g_object_unref); + g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ___lambda315__gsource_func, g_object_ref (self), g_object_unref); _tmp16_ = scolor; gtk_widget_override_background_color (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), GTK_STATE_FLAG_SELECTED, &_tmp16_); gtk_style_context_restore (context); @@ -1143,7 +1143,7 @@ } -static void _____lambda311_ (Block6Data* _data6_) { +static void _____lambda309_ (Block6Data* _data6_) { Block5Data* _data5_; XnoisePlaylistTreeViewLastplayed * self; XnoiseAction* _tmp0_ = NULL; @@ -1167,8 +1167,8 @@ } -static void ______lambda311__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { - _____lambda311_ (self); +static void ______lambda309__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { + _____lambda309_ (self); } @@ -1306,7 +1306,7 @@ _tmp36_ = _tmp35_->info; gtk_menu_item_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GTK_TYPE_MENU_ITEM, GtkMenuItem), _tmp36_); _tmp37_ = menu_item; - g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GTK_TYPE_MENU_ITEM, GtkMenuItem), "activate", (GCallback) ______lambda311__gtk_menu_item_activate, block6_data_ref (_data6_), (GClosureNotify) block6_data_unref, 0); + g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GTK_TYPE_MENU_ITEM, GtkMenuItem), "activate", (GCallback) ______lambda309__gtk_menu_item_activate, block6_data_ref (_data6_), (GClosureNotify) block6_data_unref, 0); _tmp38_ = rightmenu; _tmp39_ = menu_item; gtk_menu_shell_append (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GTK_TYPE_MENU_SHELL, GtkMenuShell), (GtkWidget*) G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GTK_TYPE_MENU_ITEM, GtkMenuItem)); diff -Nru xnoise-0.2.20/libxnoise/DockableMedia/MostPlayed/xnoise-mostplayed-treeview-model.c xnoise-0.2.21/libxnoise/DockableMedia/MostPlayed/xnoise-mostplayed-treeview-model.c --- xnoise-0.2.20/libxnoise/DockableMedia/MostPlayed/xnoise-mostplayed-treeview-model.c 2013-12-11 11:24:22.000000000 +0000 +++ xnoise-0.2.21/libxnoise/DockableMedia/MostPlayed/xnoise-mostplayed-treeview-model.c 2014-01-27 09:32:55.000000000 +0000 @@ -340,15 +340,15 @@ XnoiseMostplayedTreeviewModel* xnoise_mostplayed_treeview_model_construct (GType object_type, XnoiseDockableMedia* dock, XnoisePlaylistTreeViewMostplayed* view); static void xnoise_mostplayed_treeview_model_populate (XnoiseMostplayedTreeviewModel* self); GType xnoise_global_access_get_type (void) G_GNUC_CONST; -static void __lambda293_ (XnoiseMostplayedTreeviewModel* self, XnoiseGlobalAccess* s, const gchar* t); +static void __lambda291_ (XnoiseMostplayedTreeviewModel* self, XnoiseGlobalAccess* s, const gchar* t); gchar* xnoise_dockable_media_name (XnoiseDockableMedia* self); const gchar* xnoise_global_access_get_active_dockable_media_name (XnoiseGlobalAccess* self); -static gboolean ___lambda294_ (XnoiseMostplayedTreeviewModel* self); +static gboolean ___lambda292_ (XnoiseMostplayedTreeviewModel* self); void xnoise_mostplayed_treeview_model_filter (XnoiseMostplayedTreeviewModel* self); -static gboolean ____lambda294__gsource_func (gpointer self); -static gboolean ___lambda295_ (XnoiseMostplayedTreeviewModel* self); -static gboolean ____lambda295__gsource_func (gpointer self); -static void ___lambda293__xnoise_global_access_sign_searchtext_changed (XnoiseGlobalAccess* _sender, const gchar* text, gpointer self); +static gboolean ____lambda292__gsource_func (gpointer self); +static gboolean ___lambda293_ (XnoiseMostplayedTreeviewModel* self); +static gboolean ____lambda293__gsource_func (gpointer self); +static void ___lambda291__xnoise_global_access_sign_searchtext_changed (XnoiseGlobalAccess* _sender, const gchar* text, gpointer self); GType xnoise_database_writer_notification_data_get_type (void) G_GNUC_CONST; GType xnoise_database_writer_change_type_get_type (void) G_GNUC_CONST; XnoiseDatabaseWriterNotificationData* xnoise_database_writer_notification_data_dup (const XnoiseDatabaseWriterNotificationData* self); @@ -357,8 +357,8 @@ static void _xnoise_mostplayed_treeview_model_database_change_cb_xnoise_database_writer_change_notification_callback (XnoiseDatabaseWriterChangeType changetype, XnoiseItem* item, gpointer self); GType xnoise_database_writer_get_type (void) G_GNUC_CONST; void xnoise_database_writer_register_change_callback (XnoiseDatabaseWriter* self, XnoiseDatabaseWriterNotificationData* cbd); -static gboolean ___lambda296_ (XnoiseMostplayedTreeviewModel* self); -static gboolean ____lambda296__gsource_func (gpointer self); +static gboolean ___lambda294_ (XnoiseMostplayedTreeviewModel* self); +static gboolean ____lambda294__gsource_func (gpointer self); gpointer xnoise_worker_job_ref (gpointer instance); void xnoise_worker_job_unref (gpointer instance); GParamSpec* xnoise_worker_param_spec_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -400,10 +400,10 @@ void xnoise_dnd_data_copy (const XnoiseDndData* self, XnoiseDndData* dest); void xnoise_dnd_data_destroy (XnoiseDndData* self); static void _vala_XnoiseItem_array_free (XnoiseItem* array, gint array_length); -static gboolean __lambda292_ (Block23Data* _data23_); +static gboolean __lambda290_ (Block23Data* _data23_); gboolean xnoise_thumbnail_available (const gchar* uri, GFile** _thumb); #define XNOISE_RESOURCES_VIDEOTHUMBNAILSIZE 40 -static gboolean ___lambda292__gsource_func (gpointer self); +static gboolean ___lambda290__gsource_func (gpointer self); XnoiseDndData* xnoise_mostplayed_treeview_model_get_dnd_data_for_path (XnoiseMostplayedTreeviewModel* self, GtkTreePath** treepath, int* result_length1); gint xnoise_data_source_get_source_id (XnoiseDataSource* self); static void _vala_array_add44 (XnoiseDndData** array, int* length, int* size, const XnoiseDndData* value); @@ -428,7 +428,7 @@ } -static gboolean ___lambda294_ (XnoiseMostplayedTreeviewModel* self) { +static gboolean ___lambda292_ (XnoiseMostplayedTreeviewModel* self) { gboolean result = FALSE; xnoise_mostplayed_treeview_model_filter (self); self->priv->search_idlesource = (guint) 0; @@ -437,14 +437,14 @@ } -static gboolean ____lambda294__gsource_func (gpointer self) { +static gboolean ____lambda292__gsource_func (gpointer self) { gboolean result; - result = ___lambda294_ (self); + result = ___lambda292_ (self); return result; } -static gboolean ___lambda295_ (XnoiseMostplayedTreeviewModel* self) { +static gboolean ___lambda293_ (XnoiseMostplayedTreeviewModel* self) { gboolean result = FALSE; xnoise_mostplayed_treeview_model_filter (self); self->priv->search_idlesource = (guint) 0; @@ -453,14 +453,14 @@ } -static gboolean ____lambda295__gsource_func (gpointer self) { +static gboolean ____lambda293__gsource_func (gpointer self) { gboolean result; - result = ___lambda295_ (self); + result = ___lambda293_ (self); return result; } -static void __lambda293_ (XnoiseMostplayedTreeviewModel* self, XnoiseGlobalAccess* s, const gchar* t) { +static void __lambda291_ (XnoiseMostplayedTreeviewModel* self, XnoiseGlobalAccess* s, const gchar* t) { XnoiseDockableMedia* _tmp0_ = NULL; gchar* _tmp1_ = NULL; gchar* _tmp2_ = NULL; @@ -487,7 +487,7 @@ _tmp8_ = self->priv->search_idlesource; g_source_remove (_tmp8_); } - _tmp9_ = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 2, ____lambda294__gsource_func, g_object_ref (self), g_object_unref); + _tmp9_ = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 2, ____lambda292__gsource_func, g_object_ref (self), g_object_unref); self->priv->search_idlesource = _tmp9_; } else { guint _tmp10_ = 0U; @@ -498,14 +498,14 @@ _tmp11_ = self->priv->search_idlesource; g_source_remove (_tmp11_); } - _tmp12_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 200, ____lambda295__gsource_func, g_object_ref (self), g_object_unref); + _tmp12_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 200, ____lambda293__gsource_func, g_object_ref (self), g_object_unref); self->priv->search_idlesource = _tmp12_; } } -static void ___lambda293__xnoise_global_access_sign_searchtext_changed (XnoiseGlobalAccess* _sender, const gchar* text, gpointer self) { - __lambda293_ (self, _sender, text); +static void ___lambda291__xnoise_global_access_sign_searchtext_changed (XnoiseGlobalAccess* _sender, const gchar* text, gpointer self) { + __lambda291_ (self, _sender, text); } @@ -539,7 +539,7 @@ self->priv->dock = _tmp3_; xnoise_mostplayed_treeview_model_populate (self); _tmp4_ = xnoise_global; - g_signal_connect_object (_tmp4_, "sign-searchtext-changed", (GCallback) ___lambda293__xnoise_global_access_sign_searchtext_changed, self, 0); + g_signal_connect_object (_tmp4_, "sign-searchtext-changed", (GCallback) ___lambda291__xnoise_global_access_sign_searchtext_changed, self, 0); memset (&nd, 0, sizeof (XnoiseDatabaseWriterNotificationData)); nd.cb = _xnoise_mostplayed_treeview_model_database_change_cb_xnoise_database_writer_change_notification_callback; nd.cb_target = self; @@ -555,7 +555,7 @@ } -static gboolean ___lambda296_ (XnoiseMostplayedTreeviewModel* self) { +static gboolean ___lambda294_ (XnoiseMostplayedTreeviewModel* self) { gboolean result = FALSE; xnoise_mostplayed_treeview_model_filter (self); self->priv->src = (guint) 0; @@ -564,9 +564,9 @@ } -static gboolean ____lambda296__gsource_func (gpointer self) { +static gboolean ____lambda294__gsource_func (gpointer self) { gboolean result; - result = ___lambda296_ (self); + result = ___lambda294_ (self); return result; } @@ -584,7 +584,7 @@ _tmp2_ = self->priv->src; g_source_remove (_tmp2_); } - _tmp3_ = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ____lambda296__gsource_func, g_object_ref (self), g_object_unref); + _tmp3_ = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ____lambda294__gsource_func, g_object_ref (self), g_object_unref); self->priv->src = _tmp3_; } } @@ -666,7 +666,7 @@ } -static gboolean __lambda292_ (Block23Data* _data23_) { +static gboolean __lambda290_ (Block23Data* _data23_) { XnoiseMostplayedTreeviewModel * self; gboolean result = FALSE; GtkTreeIter iter = {0}; @@ -844,9 +844,9 @@ } -static gboolean ___lambda292__gsource_func (gpointer self) { +static gboolean ___lambda290__gsource_func (gpointer self) { gboolean result; - result = __lambda292_ (self); + result = __lambda290_ (self); return result; } @@ -881,7 +881,7 @@ _tmp2_->items = (_vala_XnoiseItem_array_free (_tmp2_->items, _tmp2_->items_length1), NULL); _tmp2_->items = _tmp8_; _tmp2_->items_length1 = _tmp7_; - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda292__gsource_func, block23_data_ref (_data23_), block23_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda290__gsource_func, block23_data_ref (_data23_), block23_data_unref); result = FALSE; block23_data_unref (_data23_); _data23_ = NULL; diff -Nru xnoise-0.2.20/libxnoise/DockableMedia/MostPlayed/xnoise-mostplayed-treeview.c xnoise-0.2.21/libxnoise/DockableMedia/MostPlayed/xnoise-mostplayed-treeview.c --- xnoise-0.2.20/libxnoise/DockableMedia/MostPlayed/xnoise-mostplayed-treeview.c 2013-12-11 11:24:22.000000000 +0000 +++ xnoise-0.2.21/libxnoise/DockableMedia/MostPlayed/xnoise-mostplayed-treeview.c 2014-01-27 09:32:55.000000000 +0000 @@ -446,7 +446,7 @@ GType xnoise_mostplayed_treeview_model_column_get_type (void) G_GNUC_CONST; XnoiseMostplayedTreeviewModel* xnoise_mostplayed_treeview_model_new (XnoiseDockableMedia* dock, XnoisePlaylistTreeViewMostplayed* view); XnoiseMostplayedTreeviewModel* xnoise_mostplayed_treeview_model_construct (GType object_type, XnoiseDockableMedia* dock, XnoisePlaylistTreeViewMostplayed* view); -static void __lambda297_ (XnoisePlaylistTreeViewMostplayed* self, GtkTreeView* s, GtkTreePath* tp, GtkTreeViewColumn* c); +static void __lambda295_ (XnoisePlaylistTreeViewMostplayed* self, GtkTreeView* s, GtkTreePath* tp, GtkTreeViewColumn* c); GType xnoise_item_get_type (void) G_GNUC_CONST; GType xnoise_item_type_get_type (void) G_GNUC_CONST; XnoiseItem* xnoise_item_dup (const XnoiseItem* self); @@ -469,7 +469,7 @@ GType xnoise_item_selection_type_get_type (void) G_GNUC_CONST; XnoiseAction* xnoise_item_handler_get_action (XnoiseItemHandler* self, XnoiseItemType type, XnoiseActionContext context, XnoiseItemSelectionType selection); static void _vala_GValue_free (GValue* self); -static void ___lambda297__gtk_tree_view_row_activated (GtkTreeView* _sender, GtkTreePath* path, GtkTreeViewColumn* column, gpointer self); +static void ___lambda295__gtk_tree_view_row_activated (GtkTreeView* _sender, GtkTreePath* path, GtkTreeViewColumn* column, gpointer self); static void xnoise_playlist_tree_view_mostplayed_on_drag_begin (XnoisePlaylistTreeViewMostplayed* self, GtkWidget* sender, GdkDragContext* context); static void _xnoise_playlist_tree_view_mostplayed_on_drag_begin_gtk_widget_drag_begin (GtkWidget* _sender, GdkDragContext* context, gpointer self); static void xnoise_playlist_tree_view_mostplayed_on_drag_data_get (XnoisePlaylistTreeViewMostplayed* self, GtkWidget* sender, GdkDragContext* context, GtkSelectionData* selection_data, guint info, guint etime); @@ -482,17 +482,17 @@ static gboolean _xnoise_playlist_tree_view_mostplayed_on_button_press_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self); static gboolean xnoise_playlist_tree_view_mostplayed_on_key_released (XnoisePlaylistTreeViewMostplayed* self, GtkWidget* sender, GdkEventKey* e); static gboolean _xnoise_playlist_tree_view_mostplayed_on_key_released_gtk_widget_key_release_event (GtkWidget* _sender, GdkEventKey* event, gpointer self); -static void __lambda299_ (XnoisePlaylistTreeViewMostplayed* self, GtkWidget* s, GtkAllocation* a); -static gboolean ___lambda300_ (XnoisePlaylistTreeViewMostplayed* self, GtkTreeModel* mo, GtkTreePath* pt, GtkTreeIter* it); -static gboolean ____lambda300__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self); -static void ___lambda299__gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self); -static void __lambda301_ (XnoisePlaylistTreeViewMostplayed* self); +static void __lambda297_ (XnoisePlaylistTreeViewMostplayed* self, GtkWidget* s, GtkAllocation* a); +static gboolean ___lambda298_ (XnoisePlaylistTreeViewMostplayed* self, GtkTreeModel* mo, GtkTreePath* pt, GtkTreeIter* it); +static gboolean ____lambda298__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self); +static void ___lambda297__gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self); +static void __lambda299_ (XnoisePlaylistTreeViewMostplayed* self); +static gboolean __lambda300_ (XnoisePlaylistTreeViewMostplayed* self); +static gboolean ___lambda301_ (XnoisePlaylistTreeViewMostplayed* self, GtkTreeModel* mo, GtkTreePath* pt, GtkTreeIter* it); +static gboolean ____lambda301__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self); +static gboolean ___lambda300__gsource_func (gpointer self); +static void ___lambda299__gtk_widget_realize (GtkWidget* _sender, gpointer self); static gboolean __lambda302_ (XnoisePlaylistTreeViewMostplayed* self); -static gboolean ___lambda303_ (XnoisePlaylistTreeViewMostplayed* self, GtkTreeModel* mo, GtkTreePath* pt, GtkTreeIter* it); -static gboolean ____lambda303__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self); -static gboolean ___lambda302__gsource_func (gpointer self); -static void ___lambda301__gtk_widget_realize (GtkWidget* _sender, gpointer self); -static gboolean __lambda304_ (XnoisePlaylistTreeViewMostplayed* self); GType xnoise_iparams_get_type (void) G_GNUC_CONST; GType xnoise_serial_button_get_type (void) G_GNUC_CONST; GType xnoise_album_art_view_get_type (void) G_GNUC_CONST; @@ -508,7 +508,7 @@ GType xnoise_track_infobar_get_type (void) G_GNUC_CONST; GType xnoise_music_browser_get_type (void) G_GNUC_CONST; GType xnoise_media_soure_widget_get_type (void) G_GNUC_CONST; -static gboolean ___lambda304__gsource_func (gpointer self); +static gboolean ___lambda302__gsource_func (gpointer self); static void xnoise_playlist_tree_view_mostplayed_rightclick_menu_popup (XnoisePlaylistTreeViewMostplayed* self, guint activateTime); static GtkMenu* xnoise_playlist_tree_view_mostplayed_create_rightclick_menu (XnoisePlaylistTreeViewMostplayed* self); static Block21Data* block21_data_ref (Block21Data* _data21_); @@ -518,8 +518,8 @@ GArray* xnoise_item_handler_manager_get_actions (XnoiseItemHandlerManager* self, XnoiseItemType type, XnoiseActionContext context, XnoiseItemSelectionType selection); static Block22Data* block22_data_ref (Block22Data* _data22_); static void block22_data_unref (void * _userdata_); -static void _____lambda298_ (Block22Data* _data22_); -static void ______lambda298__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self); +static void _____lambda296_ (Block22Data* _data22_); +static void ______lambda296__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self); static gint xnoise_playlist_tree_view_mostplayed_real_get_model_item_column (XnoisePlaylistQueryable* base); static XnoiseDynPlaylistType xnoise_playlist_tree_view_mostplayed_real_get_dynamic_playlist_type (XnoisePlaylistQueryable* base); GType xnoise_dnd_data_get_type (void) G_GNUC_CONST; @@ -550,7 +550,7 @@ } -static void __lambda297_ (XnoisePlaylistTreeViewMostplayed* self, GtkTreeView* s, GtkTreePath* tp, GtkTreeViewColumn* c) { +static void __lambda295_ (XnoisePlaylistTreeViewMostplayed* self, GtkTreeView* s, GtkTreePath* tp, GtkTreeViewColumn* c) { XnoiseItem* item = NULL; XnoiseItem _tmp0_ = {0}; XnoiseItem _tmp1_ = {0}; @@ -632,8 +632,8 @@ } -static void ___lambda297__gtk_tree_view_row_activated (GtkTreeView* _sender, GtkTreePath* path, GtkTreeViewColumn* column, gpointer self) { - __lambda297_ (self, _sender, path, column); +static void ___lambda295__gtk_tree_view_row_activated (GtkTreeView* _sender, GtkTreePath* path, GtkTreeViewColumn* column, gpointer self) { + __lambda295_ (self, _sender, path, column); } @@ -673,7 +673,7 @@ } -static gboolean ___lambda300_ (XnoisePlaylistTreeViewMostplayed* self, GtkTreeModel* mo, GtkTreePath* pt, GtkTreeIter* it) { +static gboolean ___lambda298_ (XnoisePlaylistTreeViewMostplayed* self, GtkTreeModel* mo, GtkTreePath* pt, GtkTreeIter* it) { gboolean result = FALSE; GtkTreeModel* _tmp0_ = NULL; GtkTreeModel* _tmp1_ = NULL; @@ -696,14 +696,14 @@ } -static gboolean ____lambda300__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self) { +static gboolean ____lambda298__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self) { gboolean result; - result = ___lambda300_ (self, model, path, iter); + result = ___lambda298_ (self, model, path, iter); return result; } -static void __lambda299_ (XnoisePlaylistTreeViewMostplayed* self, GtkWidget* s, GtkAllocation* a) { +static void __lambda297_ (XnoisePlaylistTreeViewMostplayed* self, GtkWidget* s, GtkAllocation* a) { GtkTreeViewColumn* tvc = NULL; GtkTreeViewColumn* _tmp0_ = NULL; gint current_width = 0; @@ -745,18 +745,18 @@ if (_tmp11_ != NULL) { GtkTreeModel* _tmp12_ = NULL; _tmp12_ = xm; - gtk_tree_model_foreach (_tmp12_, ____lambda300__gtk_tree_model_foreach_func, self); + gtk_tree_model_foreach (_tmp12_, ____lambda298__gtk_tree_model_foreach_func, self); } _g_object_unref0 (xm); } -static void ___lambda299__gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self) { - __lambda299_ (self, _sender, allocation); +static void ___lambda297__gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self) { + __lambda297_ (self, _sender, allocation); } -static gboolean ___lambda303_ (XnoisePlaylistTreeViewMostplayed* self, GtkTreeModel* mo, GtkTreePath* pt, GtkTreeIter* it) { +static gboolean ___lambda301_ (XnoisePlaylistTreeViewMostplayed* self, GtkTreeModel* mo, GtkTreePath* pt, GtkTreeIter* it) { gboolean result = FALSE; GtkTreeModel* _tmp0_ = NULL; GtkTreeModel* _tmp1_ = NULL; @@ -779,14 +779,14 @@ } -static gboolean ____lambda303__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self) { +static gboolean ____lambda301__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self) { gboolean result; - result = ___lambda303_ (self, model, path, iter); + result = ___lambda301_ (self, model, path, iter); return result; } -static gboolean __lambda302_ (XnoisePlaylistTreeViewMostplayed* self) { +static gboolean __lambda300_ (XnoisePlaylistTreeViewMostplayed* self) { gboolean result = FALSE; GtkTreeViewColumn* tvc = NULL; GtkTreeViewColumn* _tmp0_ = NULL; @@ -817,7 +817,7 @@ if (_tmp8_ != NULL) { GtkTreeModel* _tmp9_ = NULL; _tmp9_ = xm; - gtk_tree_model_foreach (_tmp9_, ____lambda303__gtk_tree_model_foreach_func, self); + gtk_tree_model_foreach (_tmp9_, ____lambda301__gtk_tree_model_foreach_func, self); } result = FALSE; _g_object_unref0 (xm); @@ -825,24 +825,24 @@ } -static gboolean ___lambda302__gsource_func (gpointer self) { +static gboolean ___lambda300__gsource_func (gpointer self) { gboolean result; - result = __lambda302_ (self); + result = __lambda300_ (self); return result; } -static void __lambda301_ (XnoisePlaylistTreeViewMostplayed* self) { - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda302__gsource_func, g_object_ref (self), g_object_unref); +static void __lambda299_ (XnoisePlaylistTreeViewMostplayed* self) { + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda300__gsource_func, g_object_ref (self), g_object_unref); } -static void ___lambda301__gtk_widget_realize (GtkWidget* _sender, gpointer self) { - __lambda301_ (self); +static void ___lambda299__gtk_widget_realize (GtkWidget* _sender, gpointer self) { + __lambda299_ (self); } -static gboolean __lambda304_ (XnoisePlaylistTreeViewMostplayed* self) { +static gboolean __lambda302_ (XnoisePlaylistTreeViewMostplayed* self) { gboolean result = FALSE; GtkStyleContext* ctx = NULL; XnoiseMainWindow* _tmp0_ = NULL; @@ -868,9 +868,9 @@ } -static gboolean ___lambda304__gsource_func (gpointer self) { +static gboolean ___lambda302__gsource_func (gpointer self) { gboolean result; - result = __lambda304_ (self); + result = __lambda302_ (self); return result; } @@ -939,7 +939,7 @@ self->priv->tvm = _tmp11_; _tmp12_ = self->priv->tvm; gtk_tree_view_set_model (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_TREE_VIEW, GtkTreeView), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GTK_TYPE_TREE_MODEL, GtkTreeModel)); - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_TREE_VIEW, GtkTreeView), "row-activated", (GCallback) ___lambda297__gtk_tree_view_row_activated, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_TREE_VIEW, GtkTreeView), "row-activated", (GCallback) ___lambda295__gtk_tree_view_row_activated, self, 0); gtk_drag_source_set (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), GDK_BUTTON1_MASK, XNOISE_PLAYLIST_TREE_VIEW_MOSTPLAYED_src_target_entries, G_N_ELEMENTS (XNOISE_PLAYLIST_TREE_VIEW_MOSTPLAYED_src_target_entries), GDK_ACTION_COPY); g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), "drag-begin", (GCallback) _xnoise_playlist_tree_view_mostplayed_on_drag_begin_gtk_widget_drag_begin, self, 0); g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), "drag-data-get", (GCallback) _xnoise_playlist_tree_view_mostplayed_on_drag_data_get_gtk_widget_drag_data_get, self, 0); @@ -948,15 +948,15 @@ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), "button-press-event", (GCallback) _xnoise_playlist_tree_view_mostplayed_on_button_press_gtk_widget_button_press_event, self, 0); g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), "key-release-event", (GCallback) _xnoise_playlist_tree_view_mostplayed_on_key_released_gtk_widget_key_release_event, self, 0); _tmp13_ = self->priv->ow; - g_signal_connect_object (_tmp13_, "size-allocate", (GCallback) ___lambda299__gtk_widget_size_allocate, self, G_CONNECT_AFTER); - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), "realize", (GCallback) ___lambda301__gtk_widget_realize, self, G_CONNECT_AFTER); + g_signal_connect_object (_tmp13_, "size-allocate", (GCallback) ___lambda297__gtk_widget_size_allocate, self, G_CONNECT_AFTER); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), "realize", (GCallback) ___lambda299__gtk_widget_realize, self, G_CONNECT_AFTER); gtk_style_context_save (context); gtk_style_context_get_background_color (context, GTK_STATE_FLAG_SELECTED, &_tmp14_); scolor = _tmp14_; gtk_style_context_add_class (context, GTK_STYLE_CLASS_PANE_SEPARATOR); gtk_style_context_get_background_color (context, GTK_STATE_FLAG_NORMAL, &_tmp15_); color = _tmp15_; - g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ___lambda304__gsource_func, g_object_ref (self), g_object_unref); + g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ___lambda302__gsource_func, g_object_ref (self), g_object_unref); _tmp16_ = scolor; gtk_widget_override_background_color (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), GTK_STATE_FLAG_SELECTED, &_tmp16_); gtk_style_context_restore (context); @@ -1076,7 +1076,7 @@ } -static void _____lambda298_ (Block22Data* _data22_) { +static void _____lambda296_ (Block22Data* _data22_) { Block21Data* _data21_; XnoisePlaylistTreeViewMostplayed * self; XnoiseAction* _tmp0_ = NULL; @@ -1100,8 +1100,8 @@ } -static void ______lambda298__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { - _____lambda298_ (self); +static void ______lambda296__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { + _____lambda296_ (self); } @@ -1239,7 +1239,7 @@ _tmp36_ = _tmp35_->info; gtk_menu_item_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GTK_TYPE_MENU_ITEM, GtkMenuItem), _tmp36_); _tmp37_ = menu_item; - g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GTK_TYPE_MENU_ITEM, GtkMenuItem), "activate", (GCallback) ______lambda298__gtk_menu_item_activate, block22_data_ref (_data22_), (GClosureNotify) block22_data_unref, 0); + g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GTK_TYPE_MENU_ITEM, GtkMenuItem), "activate", (GCallback) ______lambda296__gtk_menu_item_activate, block22_data_ref (_data22_), (GClosureNotify) block22_data_unref, 0); _tmp38_ = rightmenu; _tmp39_ = menu_item; gtk_menu_shell_append (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GTK_TYPE_MENU_SHELL, GtkMenuShell), (GtkWidget*) G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GTK_TYPE_MENU_ITEM, GtkMenuItem)); diff -Nru xnoise-0.2.20/libxnoise/DockableMedia/MusicBrowser/xnoise-music-browser-model.c xnoise-0.2.21/libxnoise/DockableMedia/MusicBrowser/xnoise-music-browser-model.c --- xnoise-0.2.20/libxnoise/DockableMedia/MusicBrowser/xnoise-music-browser-model.c 2013-12-11 11:24:22.000000000 +0000 +++ xnoise-0.2.21/libxnoise/DockableMedia/MusicBrowser/xnoise-music-browser-model.c 2014-01-27 09:32:55.000000000 +0000 @@ -634,11 +634,11 @@ static void xnoise_music_browser_model_update_pixbufs (XnoiseMusicBrowserModel* self); static void _xnoise_music_browser_model_update_pixbufs_xnoise_icon_repo_icon_theme_changed (XnoiseIconRepo* _sender, gpointer self); GType xnoise_global_access_get_type (void) G_GNUC_CONST; -static void __lambda142_ (XnoiseMusicBrowserModel* self); -static gboolean __lambda143_ (XnoiseMusicBrowserModel* self); +static void __lambda140_ (XnoiseMusicBrowserModel* self); +static gboolean __lambda141_ (XnoiseMusicBrowserModel* self); static void xnoise_music_browser_model_update_album_image (XnoiseMusicBrowserModel* self); -static gboolean ___lambda143__gsource_func (gpointer self); -static void ___lambda142__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); +static gboolean ___lambda141__gsource_func (gpointer self); +static void ___lambda140__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); GType xnoise_database_writer_notification_data_get_type (void) G_GNUC_CONST; GType xnoise_database_writer_change_type_get_type (void) G_GNUC_CONST; XnoiseDatabaseWriterNotificationData* xnoise_database_writer_notification_data_dup (const XnoiseDatabaseWriterNotificationData* self); @@ -647,19 +647,19 @@ static void _xnoise_music_browser_model_database_change_cb_xnoise_database_writer_change_notification_callback (XnoiseDatabaseWriterChangeType changetype, XnoiseItem* item, gpointer self); GType xnoise_database_writer_get_type (void) G_GNUC_CONST; void xnoise_database_writer_register_change_callback (XnoiseDatabaseWriter* self, XnoiseDatabaseWriterNotificationData* cbd); -static void __lambda147_ (XnoiseMusicBrowserModel* self, XnoiseGlobalAccess* s, const gchar* t); +static void __lambda145_ (XnoiseMusicBrowserModel* self, XnoiseGlobalAccess* s, const gchar* t); gchar* xnoise_dockable_media_name (XnoiseDockableMedia* self); const gchar* xnoise_global_access_get_active_dockable_media_name (XnoiseGlobalAccess* self); GType xnoise_main_window_get_type (void) G_GNUC_CONST; gboolean xnoise_main_window_get_album_art_view_visible (XnoiseMainWindow* self); -static gboolean ___lambda148_ (XnoiseMusicBrowserModel* self); +static gboolean ___lambda146_ (XnoiseMusicBrowserModel* self); void xnoise_music_browser_model_filter (XnoiseMusicBrowserModel* self); -static gboolean ____lambda148__gsource_func (gpointer self); -static gboolean ___lambda149_ (XnoiseMusicBrowserModel* self); -static gboolean ____lambda149__gsource_func (gpointer self); -static void ___lambda147__xnoise_global_access_sign_searchtext_changed (XnoiseGlobalAccess* _sender, const gchar* text, gpointer self); -static void __lambda150_ (XnoiseMusicBrowserModel* self); -static void ___lambda150__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); +static gboolean ____lambda146__gsource_func (gpointer self); +static gboolean ___lambda147_ (XnoiseMusicBrowserModel* self); +static gboolean ____lambda147__gsource_func (gpointer self); +static void ___lambda145__xnoise_global_access_sign_searchtext_changed (XnoiseGlobalAccess* _sender, const gchar* text, gpointer self); +static void __lambda148_ (XnoiseMusicBrowserModel* self); +static void ___lambda148__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); gpointer xnoise_media_importer_ref (gpointer instance); void xnoise_media_importer_unref (gpointer instance); GParamSpec* xnoise_param_spec_media_importer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -667,10 +667,10 @@ void xnoise_value_take_media_importer (GValue* value, gpointer v_object); gpointer xnoise_value_get_media_importer (const GValue* value); GType xnoise_media_importer_get_type (void) G_GNUC_CONST; -static void __lambda151_ (XnoiseMusicBrowserModel* self); -static gboolean __lambda152_ (XnoiseMusicBrowserModel* self); -static gboolean ___lambda152__gsource_func (gpointer self); -static void ___lambda151__xnoise_media_importer_changed_library (XnoiseMediaImporter* _sender, gpointer self); +static void __lambda149_ (XnoiseMusicBrowserModel* self); +static gboolean __lambda150_ (XnoiseMusicBrowserModel* self); +static gboolean ___lambda150__gsource_func (gpointer self); +static void ___lambda149__xnoise_media_importer_changed_library (XnoiseMediaImporter* _sender, gpointer self); GType xnoise_collection_sort_mode_get_type (void) G_GNUC_CONST; XnoiseCollectionSortMode xnoise_global_access_get_collection_sort_mode (XnoiseGlobalAccess* self); gpointer xnoise_worker_job_ref (gpointer instance); @@ -717,25 +717,25 @@ GType xnoise_database_reader_get_type (void) G_GNUC_CONST; XnoiseItem* xnoise_database_reader_get_genreitem_by_genreid (XnoiseDatabaseReader* self, const gchar* searchtext, gint32 id, guint32 stmp); const gchar* xnoise_global_access_get_searchtext (XnoiseGlobalAccess* self); -static gboolean __lambda146_ (Block10Data* _data10_); +static gboolean __lambda144_ (Block10Data* _data10_); gboolean xnoise_music_browser_model_get_populating_model (XnoiseMusicBrowserModel* self); void xnoise_item_init (XnoiseItem *self, XnoiseItemType _type, const gchar* _uri, gint32 _db_id); #define XNOISE_RESOURCES_EMPTYSTRING "" -static gboolean ___lambda146__gsource_func (gpointer self); +static gboolean ___lambda144__gsource_func (gpointer self); static Block11Data* block11_data_ref (Block11Data* _data11_); static void block11_data_unref (void * _userdata_); XnoiseItem* xnoise_data_source_get_album_item_from_id (XnoiseDataSource* self, const gchar* searchtext, gint32 id, guint32 stamp); -static gboolean __lambda145_ (Block11Data* _data11_); +static gboolean __lambda143_ (Block11Data* _data11_); GFile* xnoise_get_albumimage_for_artistalbum (const gchar* artist, const gchar* album, const gchar* size); GType xnoise_icon_cache_get_type (void) G_GNUC_CONST; XnoiseIconCache* xnoise_global_access_get_icon_cache (XnoiseGlobalAccess* self); GdkPixbuf* xnoise_icon_cache_get_image (XnoiseIconCache* self, const gchar* path); -static gboolean ___lambda145__gsource_func (gpointer self); +static gboolean ___lambda143__gsource_func (gpointer self); static Block12Data* block12_data_ref (Block12Data* _data12_); static void block12_data_unref (void * _userdata_); XnoiseItem* xnoise_data_source_get_albumartist_item_from_id (XnoiseDataSource* self, const gchar* searchtext, gint32 id, guint32 stamp); -static gboolean __lambda144_ (Block12Data* _data12_); -static gboolean ___lambda144__gsource_func (gpointer self); +static gboolean __lambda142_ (Block12Data* _data12_); +static gboolean ___lambda142__gsource_func (gpointer self); GType xnoise_iparams_get_type (void) G_GNUC_CONST; GType xnoise_serial_button_get_type (void) G_GNUC_CONST; GType xnoise_album_art_view_get_type (void) G_GNUC_CONST; @@ -771,18 +771,18 @@ static void block13_data_unref (void * _userdata_); XnoiseItem* xnoise_database_reader_get_genres_with_search (XnoiseDatabaseReader* self, const gchar* searchtext, int* result_length1); static void _vala_XnoiseItem_array_free (XnoiseItem* array, gint array_length); -static gboolean __lambda139_ (Block13Data* _data13_); -static gboolean ___lambda139__gsource_func (gpointer self); +static gboolean __lambda137_ (Block13Data* _data13_); +static gboolean ___lambda137__gsource_func (gpointer self); static Block14Data* block14_data_ref (Block14Data* _data14_); static void block14_data_unref (void * _userdata_); XnoiseItem* xnoise_data_source_get_albums (XnoiseDataSource* self, const gchar* searchtext, XnoiseCollectionSortMode sort_mode, GHashTable* items, int* result_length1); -static gboolean __lambda140_ (Block14Data* _data14_); -static gboolean ___lambda140__gsource_func (gpointer self); +static gboolean __lambda138_ (Block14Data* _data14_); +static gboolean ___lambda138__gsource_func (gpointer self); static Block15Data* block15_data_ref (Block15Data* _data15_); static void block15_data_unref (void * _userdata_); XnoiseItem* xnoise_data_source_get_artists (XnoiseDataSource* self, const gchar* searchtext, XnoiseCollectionSortMode sort_mode, GHashTable* items, int* result_length1); -static gboolean __lambda141_ (Block15Data* _data15_); -static gboolean ___lambda141__gsource_func (gpointer self); +static gboolean __lambda139_ (Block15Data* _data15_); +static gboolean ___lambda139__gsource_func (gpointer self); void xnoise_music_browser_model_unload_children (XnoiseMusicBrowserModel* self, GtkTreeIter* iter); void xnoise_music_browser_model_load_children (XnoiseMusicBrowserModel* self, GtkTreeIter* iter); static gboolean xnoise_music_browser_model_row_is_resolved (XnoiseMusicBrowserModel* self, GtkTreeIter* iter); @@ -797,40 +797,40 @@ static Block16Data* block16_data_ref (Block16Data* _data16_); static void block16_data_unref (void * _userdata_); static void _xnoise_item_free0_ (gpointer var); -static gboolean ___lambda153_ (Block16Data* _data16_); +static gboolean ___lambda151_ (Block16Data* _data16_); GValue* xnoise_worker_job_get_arg (XnoiseWorkerJob* self, const gchar* name); static gboolean xnoise_music_browser_model_load_albums_job (XnoiseMusicBrowserModel* self, XnoiseWorkerJob* job); static gboolean _xnoise_music_browser_model_load_albums_job_xnoise_worker_work_func (XnoiseWorkerJob* jb, gpointer self); static XnoiseItem* _vala_array_dup1 (XnoiseItem* self, int length); static void xnoise_music_browser_model_remove_loader_child (XnoiseMusicBrowserModel* self, GtkTreeIter* iter); -static gboolean ____lambda153__gsource_func (gpointer self); +static gboolean ____lambda151__gsource_func (gpointer self); static Block17Data* block17_data_ref (Block17Data* _data17_); static void block17_data_unref (void * _userdata_); -static gboolean ___lambda155_ (Block17Data* _data17_); +static gboolean ___lambda153_ (Block17Data* _data17_); static gboolean xnoise_music_browser_model_load_titles_job (XnoiseMusicBrowserModel* self, XnoiseWorkerJob* job); static gboolean _xnoise_music_browser_model_load_titles_job_xnoise_worker_work_func (XnoiseWorkerJob* jb, gpointer self); -static gboolean ____lambda155__gsource_func (gpointer self); +static gboolean ____lambda153__gsource_func (gpointer self); static Block18Data* block18_data_ref (Block18Data* _data18_); static void block18_data_unref (void * _userdata_); const gchar* xnoise_item_type_to_string (XnoiseItemType self); -static gboolean ___lambda158_ (Block18Data* _data18_); +static gboolean ___lambda156_ (Block18Data* _data18_); static XnoiseItem* _vala_array_dup2 (XnoiseItem* self, int length); -static gboolean ____lambda158__gsource_func (gpointer self); +static gboolean ____lambda156__gsource_func (gpointer self); gboolean xnoise_global_access_get_media_import_in_progress (XnoiseGlobalAccess* self); const gchar* xnoise_global_access_get_current_artist (XnoiseGlobalAccess* self); const gchar* xnoise_global_access_get_current_album (XnoiseGlobalAccess* self); static Block19Data* block19_data_ref (Block19Data* _data19_); static void block19_data_unref (void * _userdata_); -static gboolean __lambda154_ (Block19Data* _data19_); -static gboolean ___lambda154__gsource_func (gpointer self); +static gboolean __lambda152_ (Block19Data* _data19_); +static gboolean ___lambda152__gsource_func (gpointer self); static Block20Data* block20_data_ref (Block20Data* _data20_); static void block20_data_unref (void * _userdata_); XnoiseTrackData** xnoise_data_source_get_trackdata_for_album (XnoiseDataSource* self, const gchar* searchtext, XnoiseCollectionSortMode sort_mode, GHashTable* items, int* result_length1); -static gboolean ___lambda156_ (Block20Data* _data20_); -static gboolean ____lambda156__gsource_func (gpointer self); +static gboolean ___lambda154_ (Block20Data* _data20_); +static gboolean ____lambda154__gsource_func (gpointer self); XnoiseTrackData** xnoise_data_source_get_trackdata_for_artist (XnoiseDataSource* self, const gchar* searchtext, XnoiseCollectionSortMode sort_mode, GHashTable* items, int* result_length1); -static gboolean ____lambda157_ (Block20Data* _data20_); -static gboolean _____lambda157__gsource_func (gpointer self); +static gboolean ____lambda155_ (Block20Data* _data20_); +static gboolean _____lambda155__gsource_func (gpointer self); XnoiseDndData* xnoise_music_browser_model_get_dnd_data_for_path (XnoiseMusicBrowserModel* self, GtkTreePath** treepath, int* result_length1); gint xnoise_data_source_get_source_id (XnoiseDataSource* self); static void _vala_array_add42 (XnoiseDndData** array, int* length, int* size, const XnoiseDndData* value); @@ -871,7 +871,7 @@ } -static gboolean __lambda143_ (XnoiseMusicBrowserModel* self) { +static gboolean __lambda141_ (XnoiseMusicBrowserModel* self) { gboolean result = FALSE; xnoise_music_browser_model_update_album_image (self); result = FALSE; @@ -879,20 +879,20 @@ } -static gboolean ___lambda143__gsource_func (gpointer self) { +static gboolean ___lambda141__gsource_func (gpointer self) { gboolean result; - result = __lambda143_ (self); + result = __lambda141_ (self); return result; } -static void __lambda142_ (XnoiseMusicBrowserModel* self) { - g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 100, ___lambda143__gsource_func, g_object_ref (self), g_object_unref); +static void __lambda140_ (XnoiseMusicBrowserModel* self) { + g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 100, ___lambda141__gsource_func, g_object_ref (self), g_object_unref); } -static void ___lambda142__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { - __lambda142_ (self); +static void ___lambda140__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { + __lambda140_ (self); } @@ -901,7 +901,7 @@ } -static gboolean ___lambda148_ (XnoiseMusicBrowserModel* self) { +static gboolean ___lambda146_ (XnoiseMusicBrowserModel* self) { gboolean result = FALSE; xnoise_music_browser_model_filter (self); self->priv->search_idlesource = (guint) 0; @@ -910,14 +910,14 @@ } -static gboolean ____lambda148__gsource_func (gpointer self) { +static gboolean ____lambda146__gsource_func (gpointer self) { gboolean result; - result = ___lambda148_ (self); + result = ___lambda146_ (self); return result; } -static gboolean ___lambda149_ (XnoiseMusicBrowserModel* self) { +static gboolean ___lambda147_ (XnoiseMusicBrowserModel* self) { gboolean result = FALSE; xnoise_music_browser_model_filter (self); self->priv->search_idlesource = (guint) 0; @@ -926,14 +926,14 @@ } -static gboolean ____lambda149__gsource_func (gpointer self) { +static gboolean ____lambda147__gsource_func (gpointer self) { gboolean result; - result = ___lambda149_ (self); + result = ___lambda147_ (self); return result; } -static void __lambda147_ (XnoiseMusicBrowserModel* self, XnoiseGlobalAccess* s, const gchar* t) { +static void __lambda145_ (XnoiseMusicBrowserModel* self, XnoiseGlobalAccess* s, const gchar* t) { gboolean _tmp0_ = FALSE; XnoiseDockableMedia* _tmp1_ = NULL; gchar* _tmp2_ = NULL; @@ -974,7 +974,7 @@ _tmp13_ = self->priv->search_idlesource; g_source_remove (_tmp13_); } - _tmp14_ = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 2, ____lambda148__gsource_func, g_object_ref (self), g_object_unref); + _tmp14_ = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 2, ____lambda146__gsource_func, g_object_ref (self), g_object_unref); self->priv->search_idlesource = _tmp14_; } else { guint _tmp15_ = 0U; @@ -985,28 +985,28 @@ _tmp16_ = self->priv->search_idlesource; g_source_remove (_tmp16_); } - _tmp17_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 700, ____lambda149__gsource_func, g_object_ref (self), g_object_unref); + _tmp17_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 700, ____lambda147__gsource_func, g_object_ref (self), g_object_unref); self->priv->search_idlesource = _tmp17_; } } -static void ___lambda147__xnoise_global_access_sign_searchtext_changed (XnoiseGlobalAccess* _sender, const gchar* text, gpointer self) { - __lambda147_ (self, _sender, text); +static void ___lambda145__xnoise_global_access_sign_searchtext_changed (XnoiseGlobalAccess* _sender, const gchar* text, gpointer self) { + __lambda145_ (self, _sender, text); } -static void __lambda150_ (XnoiseMusicBrowserModel* self) { +static void __lambda148_ (XnoiseMusicBrowserModel* self) { xnoise_music_browser_model_filter (self); } -static void ___lambda150__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { - __lambda150_ (self); +static void ___lambda148__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { + __lambda148_ (self); } -static gboolean __lambda152_ (XnoiseMusicBrowserModel* self) { +static gboolean __lambda150_ (XnoiseMusicBrowserModel* self) { gboolean result = FALSE; xnoise_music_browser_model_filter (self); result = FALSE; @@ -1014,20 +1014,20 @@ } -static gboolean ___lambda152__gsource_func (gpointer self) { +static gboolean ___lambda150__gsource_func (gpointer self) { gboolean result; - result = __lambda152_ (self); + result = __lambda150_ (self); return result; } -static void __lambda151_ (XnoiseMusicBrowserModel* self) { - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda152__gsource_func, g_object_ref (self), g_object_unref); +static void __lambda149_ (XnoiseMusicBrowserModel* self) { + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda150__gsource_func, g_object_ref (self), g_object_unref); } -static void ___lambda151__xnoise_media_importer_changed_library (XnoiseMediaImporter* _sender, gpointer self) { - __lambda151_ (self); +static void ___lambda149__xnoise_media_importer_changed_library (XnoiseMediaImporter* _sender, gpointer self) { + __lambda149_ (self); } @@ -1054,7 +1054,7 @@ _tmp2__length1 = self->priv->col_types_length1; gtk_tree_store_set_column_types (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_TREE_STORE, GtkTreeStore), _tmp2__length1, _tmp2_); _tmp3_ = xnoise_global; - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, G_TYPE_OBJECT, GObject), "notify::image-path-small", (GCallback) ___lambda142__g_object_notify, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, G_TYPE_OBJECT, GObject), "notify::image-path-small", (GCallback) ___lambda140__g_object_notify, self, 0); memset (&cbd, 0, sizeof (XnoiseDatabaseWriterNotificationData)); cbd.cb = _xnoise_music_browser_model_database_change_cb_xnoise_database_writer_change_notification_callback; cbd.cb_target = self; @@ -1062,11 +1062,11 @@ _tmp5_ = cbd; xnoise_database_writer_register_change_callback (_tmp4_, &_tmp5_); _tmp6_ = xnoise_global; - g_signal_connect_object (_tmp6_, "sign-searchtext-changed", (GCallback) ___lambda147__xnoise_global_access_sign_searchtext_changed, self, 0); + g_signal_connect_object (_tmp6_, "sign-searchtext-changed", (GCallback) ___lambda145__xnoise_global_access_sign_searchtext_changed, self, 0); _tmp7_ = xnoise_global; - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, G_TYPE_OBJECT, GObject), "notify::collection-sort-mode", (GCallback) ___lambda150__g_object_notify, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, G_TYPE_OBJECT, GObject), "notify::collection-sort-mode", (GCallback) ___lambda148__g_object_notify, self, 0); _tmp8_ = xnoise_media_importer; - g_signal_connect_object (_tmp8_, "changed-library", (GCallback) ___lambda151__xnoise_media_importer_changed_library, self, 0); + g_signal_connect_object (_tmp8_, "changed-library", (GCallback) ___lambda149__xnoise_media_importer_changed_library, self, 0); return self; } @@ -1281,7 +1281,7 @@ } -static gboolean __lambda146_ (Block10Data* _data10_) { +static gboolean __lambda144_ (Block10Data* _data10_) { XnoiseMusicBrowserModel * self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; @@ -1590,9 +1590,9 @@ } -static gboolean ___lambda146__gsource_func (gpointer self) { +static gboolean ___lambda144__gsource_func (gpointer self) { gboolean result; - result = __lambda146_ (self); + result = __lambda144_ (self); return result; } @@ -1649,7 +1649,7 @@ _data10_ = NULL; return result; } - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda146__gsource_func, block10_data_ref (_data10_), block10_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda144__gsource_func, block10_data_ref (_data10_), block10_data_unref); result = FALSE; block10_data_unref (_data10_); _data10_ = NULL; @@ -1676,7 +1676,7 @@ } -static gboolean __lambda145_ (Block11Data* _data11_) { +static gboolean __lambda143_ (Block11Data* _data11_) { XnoiseMusicBrowserModel * self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; @@ -2109,9 +2109,9 @@ } -static gboolean ___lambda145__gsource_func (gpointer self) { +static gboolean ___lambda143__gsource_func (gpointer self) { gboolean result; - result = __lambda145_ (self); + result = __lambda143_ (self); return result; } @@ -2168,7 +2168,7 @@ _data11_ = NULL; return result; } - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda145__gsource_func, block11_data_ref (_data11_), block11_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda143__gsource_func, block11_data_ref (_data11_), block11_data_unref); result = FALSE; block11_data_unref (_data11_); _data11_ = NULL; @@ -2195,7 +2195,7 @@ } -static gboolean __lambda144_ (Block12Data* _data12_) { +static gboolean __lambda142_ (Block12Data* _data12_) { XnoiseMusicBrowserModel * self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; @@ -2587,9 +2587,9 @@ } -static gboolean ___lambda144__gsource_func (gpointer self) { +static gboolean ___lambda142__gsource_func (gpointer self) { gboolean result; - result = __lambda144_ (self); + result = __lambda142_ (self); return result; } @@ -2646,7 +2646,7 @@ _data12_ = NULL; return result; } - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda144__gsource_func, block12_data_ref (_data12_), block12_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda142__gsource_func, block12_data_ref (_data12_), block12_data_unref); result = FALSE; block12_data_unref (_data12_); _data12_ = NULL; @@ -2891,7 +2891,7 @@ } -static gboolean __lambda139_ (Block13Data* _data13_) { +static gboolean __lambda137_ (Block13Data* _data13_) { XnoiseMusicBrowserModel * self; gboolean result = FALSE; XnoiseWorkerJob* _tmp0_ = NULL; @@ -2981,9 +2981,9 @@ } -static gboolean ___lambda139__gsource_func (gpointer self) { +static gboolean ___lambda137__gsource_func (gpointer self) { gboolean result; - result = __lambda139_ (self); + result = __lambda137_ (self); return result; } @@ -3030,7 +3030,7 @@ _tmp5_->items = (_vala_XnoiseItem_array_free (_tmp5_->items, _tmp5_->items_length1), NULL); _tmp5_->items = _tmp11_; _tmp5_->items_length1 = _tmp10_; - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda139__gsource_func, block13_data_ref (_data13_), block13_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda137__gsource_func, block13_data_ref (_data13_), block13_data_unref); result = FALSE; block13_data_unref (_data13_); _data13_ = NULL; @@ -3057,7 +3057,7 @@ } -static gboolean __lambda140_ (Block14Data* _data14_) { +static gboolean __lambda138_ (Block14Data* _data14_) { XnoiseMusicBrowserModel * self; gboolean result = FALSE; XnoiseWorkerJob* _tmp0_ = NULL; @@ -3227,9 +3227,9 @@ } -static gboolean ___lambda140__gsource_func (gpointer self) { +static gboolean ___lambda138__gsource_func (gpointer self) { gboolean result; - result = __lambda140_ (self); + result = __lambda138_ (self); return result; } @@ -3282,7 +3282,7 @@ _tmp5_->items = (_vala_XnoiseItem_array_free (_tmp5_->items, _tmp5_->items_length1), NULL); _tmp5_->items = _tmp14_; _tmp5_->items_length1 = _tmp13_; - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda140__gsource_func, block14_data_ref (_data14_), block14_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda138__gsource_func, block14_data_ref (_data14_), block14_data_unref); result = FALSE; block14_data_unref (_data14_); _data14_ = NULL; @@ -3309,7 +3309,7 @@ } -static gboolean __lambda141_ (Block15Data* _data15_) { +static gboolean __lambda139_ (Block15Data* _data15_) { XnoiseMusicBrowserModel * self; gboolean result = FALSE; XnoiseWorkerJob* _tmp0_ = NULL; @@ -3454,9 +3454,9 @@ } -static gboolean ___lambda141__gsource_func (gpointer self) { +static gboolean ___lambda139__gsource_func (gpointer self) { gboolean result; - result = __lambda141_ (self); + result = __lambda139_ (self); return result; } @@ -3509,7 +3509,7 @@ _tmp5_->items = (_vala_XnoiseItem_array_free (_tmp5_->items, _tmp5_->items_length1), NULL); _tmp5_->items = _tmp14_; _tmp5_->items_length1 = _tmp13_; - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda141__gsource_func, block15_data_ref (_data15_), block15_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda139__gsource_func, block15_data_ref (_data15_), block15_data_unref); result = FALSE; block15_data_unref (_data15_); _data15_ = NULL; @@ -3869,7 +3869,7 @@ } -static gboolean ___lambda153_ (Block16Data* _data16_) { +static gboolean ___lambda151_ (Block16Data* _data16_) { XnoiseMusicBrowserModel * self; gboolean result = FALSE; GtkTreeRowReference* row_ref = NULL; @@ -4046,9 +4046,9 @@ } -static gboolean ____lambda153__gsource_func (gpointer self) { +static gboolean ____lambda151__gsource_func (gpointer self) { gboolean result; - result = ___lambda153_ (self); + result = ___lambda151_ (self); return result; } @@ -4131,7 +4131,7 @@ _tmp16_->items = (_vala_XnoiseItem_array_free (_tmp16_->items, _tmp16_->items_length1), NULL); _tmp16_->items = _tmp26_; _tmp16_->items_length1 = _tmp25_; - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda153__gsource_func, block16_data_ref (_data16_), block16_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda151__gsource_func, block16_data_ref (_data16_), block16_data_unref); _g_hash_table_unref0 (item_ht); break; } @@ -4177,7 +4177,7 @@ } -static gboolean ___lambda155_ (Block17Data* _data17_) { +static gboolean ___lambda153_ (Block17Data* _data17_) { XnoiseMusicBrowserModel * self; gboolean result = FALSE; GtkTreeRowReference* row_ref = NULL; @@ -4456,9 +4456,9 @@ } -static gboolean ____lambda155__gsource_func (gpointer self) { +static gboolean ____lambda153__gsource_func (gpointer self) { gboolean result; - result = ___lambda155_ (self); + result = ___lambda153_ (self); return result; } @@ -4545,7 +4545,7 @@ _tmp16_->items = (_vala_XnoiseItem_array_free (_tmp16_->items, _tmp16_->items_length1), NULL); _tmp16_->items = _tmp26_; _tmp16_->items_length1 = _tmp25_; - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda155__gsource_func, block17_data_ref (_data17_), block17_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda153__gsource_func, block17_data_ref (_data17_), block17_data_unref); _g_hash_table_unref0 (item_ht); break; } @@ -4593,7 +4593,7 @@ } -static gboolean ___lambda158_ (Block18Data* _data18_) { +static gboolean ___lambda156_ (Block18Data* _data18_) { XnoiseMusicBrowserModel * self; gboolean result = FALSE; GtkTreeRowReference* row_ref = NULL; @@ -4770,9 +4770,9 @@ } -static gboolean ____lambda158__gsource_func (gpointer self) { +static gboolean ____lambda156__gsource_func (gpointer self) { gboolean result; - result = ___lambda158_ (self); + result = ___lambda156_ (self); return result; } @@ -4874,7 +4874,7 @@ _tmp32_ = _tmp31_.type; _tmp33_ = g_enum_get_value (g_type_class_ref (XNOISE_TYPE_ITEM_TYPE), _tmp32_); g_print ("job.items cnt = %d %s\n", _tmp28__length1, (_tmp33_ != NULL) ? _tmp33_->value_name : NULL); - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda158__gsource_func, block18_data_ref (_data18_), block18_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda156__gsource_func, block18_data_ref (_data18_), block18_data_unref); _g_hash_table_unref0 (item_ht); break; } @@ -5393,7 +5393,7 @@ } -static gboolean __lambda154_ (Block19Data* _data19_) { +static gboolean __lambda152_ (Block19Data* _data19_) { XnoiseMusicBrowserModel * self; gboolean result = FALSE; GtkTreeRowReference* row_ref = NULL; @@ -5617,9 +5617,9 @@ } -static gboolean ___lambda154__gsource_func (gpointer self) { +static gboolean ___lambda152__gsource_func (gpointer self) { gboolean result; - result = __lambda154_ (self); + result = __lambda152_ (self); return result; } @@ -5741,7 +5741,7 @@ _tmp31_->items = (_vala_XnoiseItem_array_free (_tmp31_->items, _tmp31_->items_length1), NULL); _tmp31_->items = _tmp41_; _tmp31_->items_length1 = _tmp40_; - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda154__gsource_func, block19_data_ref (_data19_), block19_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda152__gsource_func, block19_data_ref (_data19_), block19_data_unref); result = FALSE; _g_hash_table_unref0 (item_ht); block19_data_unref (_data19_); @@ -5774,7 +5774,7 @@ } -static gboolean ___lambda156_ (Block20Data* _data20_) { +static gboolean ___lambda154_ (Block20Data* _data20_) { XnoiseMusicBrowserModel * self; gboolean result = FALSE; GtkTreeRowReference* row_ref = NULL; @@ -5905,14 +5905,14 @@ } -static gboolean ____lambda156__gsource_func (gpointer self) { +static gboolean ____lambda154__gsource_func (gpointer self) { gboolean result; - result = ___lambda156_ (self); + result = ___lambda154_ (self); return result; } -static gboolean ____lambda157_ (Block20Data* _data20_) { +static gboolean ____lambda155_ (Block20Data* _data20_) { XnoiseMusicBrowserModel * self; gboolean result = FALSE; GtkTreeRowReference* row_ref = NULL; @@ -6002,9 +6002,9 @@ } -static gboolean _____lambda157__gsource_func (gpointer self) { +static gboolean _____lambda155__gsource_func (gpointer self) { gboolean result; - result = ____lambda157_ (self); + result = ____lambda155_ (self); return result; } @@ -6085,7 +6085,7 @@ _tmp16_->track_dat = (_vala_array_free (_tmp16_->track_dat, _tmp16_->track_dat_length1, (GDestroyNotify) xnoise_track_data_unref), NULL); _tmp16_->track_dat = _tmp26_; _tmp16_->track_dat_length1 = _tmp25_; - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda156__gsource_func, block20_data_ref (_data20_), block20_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda154__gsource_func, block20_data_ref (_data20_), block20_data_unref); } else { XnoiseGlobalAccess* _tmp27_ = NULL; XnoiseCollectionSortMode _tmp28_ = 0; @@ -6168,7 +6168,7 @@ _tmp50_->track_dat = (_vala_array_free (_tmp50_->track_dat, _tmp50_->track_dat_length1, (GDestroyNotify) xnoise_track_data_unref), NULL); _tmp50_->track_dat = _tmp60_; _tmp50_->track_dat_length1 = _tmp59_; - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _____lambda157__gsource_func, block20_data_ref (_data20_), block20_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _____lambda155__gsource_func, block20_data_ref (_data20_), block20_data_unref); } } result = FALSE; diff -Nru xnoise-0.2.20/libxnoise/DockableMedia/MusicBrowser/xnoise-music-browser.c xnoise-0.2.21/libxnoise/DockableMedia/MusicBrowser/xnoise-music-browser.c --- xnoise-0.2.20/libxnoise/DockableMedia/MusicBrowser/xnoise-music-browser.c 2013-12-11 11:24:22.000000000 +0000 +++ xnoise-0.2.21/libxnoise/DockableMedia/MusicBrowser/xnoise-music-browser.c 2014-01-27 09:32:55.000000000 +0000 @@ -508,7 +508,7 @@ static gboolean _xnoise_music_browser_on_key_released_gtk_widget_key_release_event (GtkWidget* _sender, GdkEventKey* event, gpointer self); static void xnoise_music_browser_on_drag_data_received (XnoiseMusicBrowser* self, GtkWidget* sender, GdkDragContext* context, gint x, gint y, GtkSelectionData* selection, guint target_type, guint time); static void _xnoise_music_browser_on_drag_data_received_gtk_widget_drag_data_received (GtkWidget* _sender, GdkDragContext* context, gint x, gint y, GtkSelectionData* selection_data, guint info, guint time_, gpointer self); -static gboolean __lambda167_ (XnoiseMusicBrowser* self); +static gboolean __lambda165_ (XnoiseMusicBrowser* self); GType xnoise_main_window_get_type (void) G_GNUC_CONST; GType xnoise_serial_button_get_type (void) G_GNUC_CONST; GType xnoise_album_art_view_get_type (void) G_GNUC_CONST; @@ -523,13 +523,13 @@ GType xnoise_thin_paned_get_type (void) G_GNUC_CONST; GType xnoise_track_infobar_get_type (void) G_GNUC_CONST; GType xnoise_media_soure_widget_get_type (void) G_GNUC_CONST; -static gboolean ___lambda167__gsource_func (gpointer self); +static gboolean ___lambda165__gsource_func (gpointer self); GType xnoise_global_access_get_type (void) G_GNUC_CONST; GType xnoise_collection_sort_mode_get_type (void) G_GNUC_CONST; XnoiseCollectionSortMode xnoise_global_access_get_collection_sort_mode (XnoiseGlobalAccess* self); -static gboolean ___lambda168_ (XnoiseMusicBrowser* self); +static gboolean ___lambda166_ (XnoiseMusicBrowser* self); void xnoise_music_browser_model_filter (XnoiseMusicBrowserModel* self); -static gboolean ____lambda168__gsource_func (gpointer self); +static gboolean ____lambda166__gsource_func (gpointer self); static void xnoise_music_browser_real_read_params_data (XnoiseIParams* base); gint xnoise_params_get_int_value (const gchar* key); void xnoise_music_browser_set_use_treelines (XnoiseMusicBrowser* self, gboolean value); @@ -566,21 +566,21 @@ void xnoise_item_init (XnoiseItem *self, XnoiseItemType _type, const gchar* _uri, gint32 _db_id); static Block9Data* block9_data_ref (Block9Data* _data9_); static void block9_data_unref (void * _userdata_); -static void _____lambda161_ (Block9Data* _data9_); +static void _____lambda159_ (Block9Data* _data9_); static void _vala_GValue_free (GValue* self); -static void ______lambda161__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self); +static void ______lambda159__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self); +static void __lambda160_ (XnoiseMusicBrowser* self); +static void ___lambda160__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self); +static GtkMenu* xnoise_music_browser_get_sort_submenu (XnoiseMusicBrowser* self); +static void __lambda161_ (XnoiseMusicBrowser* self); +void xnoise_global_access_set_collection_sort_mode (XnoiseGlobalAccess* self, XnoiseCollectionSortMode value); +static void ___lambda161__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self); static void __lambda162_ (XnoiseMusicBrowser* self); static void ___lambda162__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self); -static GtkMenu* xnoise_music_browser_get_sort_submenu (XnoiseMusicBrowser* self); static void __lambda163_ (XnoiseMusicBrowser* self); -void xnoise_global_access_set_collection_sort_mode (XnoiseGlobalAccess* self, XnoiseCollectionSortMode value); +static gboolean ___lambda164_ (XnoiseMusicBrowser* self); +static gboolean ____lambda164__gsource_func (gpointer self); static void ___lambda163__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self); -static void __lambda164_ (XnoiseMusicBrowser* self); -static void ___lambda164__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self); -static void __lambda165_ (XnoiseMusicBrowser* self); -static gboolean ___lambda166_ (XnoiseMusicBrowser* self); -static gboolean ____lambda166__gsource_func (gpointer self); -static void ___lambda165__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self); GType xnoise_dnd_data_get_type (void) G_GNUC_CONST; XnoiseDndData* xnoise_dnd_data_dup (const XnoiseDndData* self); void xnoise_dnd_data_free (XnoiseDndData* self); @@ -602,10 +602,10 @@ static void _xnoise_music_browser_on_row_expanded_gtk_tree_view_row_expanded (GtkTreeView* _sender, GtkTreeIter* iter, GtkTreePath* path, gpointer self); static XnoiseMusicBrowserMusicBrowserCellRenderer* xnoise_music_browser_music_browser_cell_renderer_new (GtkWidget* ow, GtkTreeViewColumn* col, gint expander, gint hsepar); static XnoiseMusicBrowserMusicBrowserCellRenderer* xnoise_music_browser_music_browser_cell_renderer_construct (GType object_type, GtkWidget* ow, GtkTreeViewColumn* col, gint expander, gint hsepar); -static void __lambda159_ (XnoiseMusicBrowser* self, GtkWidget* s, GtkAllocation* a); -static gboolean ___lambda160_ (XnoiseMusicBrowser* self, GtkTreeModel* mo, GtkTreePath* pt, GtkTreeIter* it); -static gboolean ____lambda160__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self); -static void ___lambda159__gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self); +static void __lambda157_ (XnoiseMusicBrowser* self, GtkWidget* s, GtkAllocation* a); +static gboolean ___lambda158_ (XnoiseMusicBrowser* self, GtkTreeModel* mo, GtkTreePath* pt, GtkTreeIter* it); +static gboolean ____lambda158__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self); +static void ___lambda157__gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self); #define XNOISE_MUSIC_BROWSER_MUSIC_BROWSER_CELL_RENDERER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), XNOISE_MUSIC_BROWSER_TYPE_MUSIC_BROWSER_CELL_RENDERER, XnoiseMusicBrowserMusicBrowserCellRendererPrivate)) enum { XNOISE_MUSIC_BROWSER_MUSIC_BROWSER_CELL_RENDERER_DUMMY_PROPERTY, @@ -705,7 +705,7 @@ } -static gboolean __lambda167_ (XnoiseMusicBrowser* self) { +static gboolean __lambda165_ (XnoiseMusicBrowser* self) { gboolean result = FALSE; GtkStyleContext* ctx = NULL; XnoiseMainWindow* _tmp0_ = NULL; @@ -731,14 +731,14 @@ } -static gboolean ___lambda167__gsource_func (gpointer self) { +static gboolean ___lambda165__gsource_func (gpointer self) { gboolean result; - result = __lambda167_ (self); + result = __lambda165_ (self); return result; } -static gboolean ___lambda168_ (XnoiseMusicBrowser* self) { +static gboolean ___lambda166_ (XnoiseMusicBrowser* self) { gboolean result = FALSE; XnoiseMusicBrowserModel* _tmp0_ = NULL; _tmp0_ = self->music_browser_model; @@ -749,9 +749,9 @@ } -static gboolean ____lambda168__gsource_func (gpointer self) { +static gboolean ____lambda166__gsource_func (gpointer self) { gboolean result; - result = ___lambda168_ (self); + result = ___lambda166_ (self); return result; } @@ -822,7 +822,7 @@ _tmp12_ = context; gtk_style_context_get_background_color (_tmp12_, GTK_STATE_FLAG_NORMAL, &_tmp13_); color = _tmp13_; - g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 100, ___lambda167__gsource_func, g_object_ref (self), g_object_unref); + g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 100, ___lambda165__gsource_func, g_object_ref (self), g_object_unref); _tmp14_ = scolor; gtk_widget_override_background_color (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), GTK_STATE_FLAG_SELECTED, &_tmp14_); _tmp15_ = context; @@ -831,7 +831,7 @@ _tmp17_ = xnoise_global_access_get_collection_sort_mode (_tmp16_); _tmp18_ = _tmp17_; if (_tmp18_ == XNOISE_COLLECTION_SORT_MODE_ALBUM_ARTIST_TITLE) { - g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 5, ____lambda168__gsource_func, g_object_ref (self), g_object_unref); + g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 5, ____lambda166__gsource_func, g_object_ref (self), g_object_unref); } _g_object_unref0 (context); return self; @@ -1452,7 +1452,7 @@ } -static void _____lambda161_ (Block9Data* _data9_) { +static void _____lambda159_ (Block9Data* _data9_) { Block8Data* _data8_; XnoiseMusicBrowser * self; XnoiseAction* _tmp0_ = NULL; @@ -1483,18 +1483,18 @@ } -static void ______lambda161__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { - _____lambda161_ (self); +static void ______lambda159__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { + _____lambda159_ (self); } -static void __lambda162_ (XnoiseMusicBrowser* self) { +static void __lambda160_ (XnoiseMusicBrowser* self) { gtk_tree_view_collapse_all (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_TREE_VIEW, GtkTreeView)); } -static void ___lambda162__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { - __lambda162_ (self); +static void ___lambda160__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { + __lambda160_ (self); } @@ -1774,7 +1774,7 @@ _tmp79_ = _tmp78_->info; gtk_menu_item_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, GTK_TYPE_MENU_ITEM, GtkMenuItem), _tmp79_); _tmp80_ = menu_item; - g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, GTK_TYPE_MENU_ITEM, GtkMenuItem), "activate", (GCallback) ______lambda161__gtk_menu_item_activate, block9_data_ref (_data9_), (GClosureNotify) block9_data_unref, 0); + g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, GTK_TYPE_MENU_ITEM, GtkMenuItem), "activate", (GCallback) ______lambda159__gtk_menu_item_activate, block9_data_ref (_data9_), (GClosureNotify) block9_data_unref, 0); _tmp81_ = rightmenu; _tmp82_ = menu_item; gtk_menu_shell_append (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, GTK_TYPE_MENU_SHELL, GtkMenuShell), (GtkWidget*) G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, GTK_TYPE_MENU_ITEM, GtkMenuItem)); @@ -1804,7 +1804,7 @@ collapse_item = _tmp88_; _tmp89_ = _ ("Collapse all"); gtk_menu_item_set_label (G_TYPE_CHECK_INSTANCE_CAST (collapse_item, GTK_TYPE_MENU_ITEM, GtkMenuItem), _tmp89_); - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (collapse_item, GTK_TYPE_MENU_ITEM, GtkMenuItem), "activate", (GCallback) ___lambda162__gtk_menu_item_activate, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (collapse_item, GTK_TYPE_MENU_ITEM, GtkMenuItem), "activate", (GCallback) ___lambda160__gtk_menu_item_activate, self, 0); _tmp90_ = rightmenu; gtk_menu_shell_append (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, GTK_TYPE_MENU_SHELL, GtkMenuShell), (GtkWidget*) G_TYPE_CHECK_INSTANCE_CAST (collapse_item, GTK_TYPE_MENU_ITEM, GtkMenuItem)); _tmp91_ = _ ("Sort Mode"); @@ -1831,7 +1831,7 @@ } -static void __lambda163_ (XnoiseMusicBrowser* self) { +static void __lambda161_ (XnoiseMusicBrowser* self) { XnoiseGlobalAccess* _tmp0_ = NULL; XnoiseGlobalAccess* _tmp1_ = NULL; XnoiseCollectionSortMode _tmp2_ = 0; @@ -1845,12 +1845,12 @@ } -static void ___lambda163__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { - __lambda163_ (self); +static void ___lambda161__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { + __lambda161_ (self); } -static void __lambda164_ (XnoiseMusicBrowser* self) { +static void __lambda162_ (XnoiseMusicBrowser* self) { XnoiseGlobalAccess* _tmp0_ = NULL; XnoiseGlobalAccess* _tmp1_ = NULL; XnoiseCollectionSortMode _tmp2_ = 0; @@ -1864,12 +1864,12 @@ } -static void ___lambda164__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { - __lambda164_ (self); +static void ___lambda162__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { + __lambda162_ (self); } -static gboolean ___lambda166_ (XnoiseMusicBrowser* self) { +static gboolean ___lambda164_ (XnoiseMusicBrowser* self) { gboolean result = FALSE; XnoiseMusicBrowserModel* _tmp0_ = NULL; _tmp0_ = self->music_browser_model; @@ -1880,14 +1880,14 @@ } -static gboolean ____lambda166__gsource_func (gpointer self) { +static gboolean ____lambda164__gsource_func (gpointer self) { gboolean result; - result = ___lambda166_ (self); + result = ___lambda164_ (self); return result; } -static void __lambda165_ (XnoiseMusicBrowser* self) { +static void __lambda163_ (XnoiseMusicBrowser* self) { XnoiseGlobalAccess* _tmp0_ = NULL; XnoiseGlobalAccess* _tmp1_ = NULL; XnoiseCollectionSortMode _tmp2_ = 0; @@ -1901,13 +1901,13 @@ xnoise_params_set_int_value ("collection_sort_mode", (gint) _tmp3_); _tmp4_ = self->priv->album_artist_title_sorting_inited; if (!_tmp4_) { - g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 5, ____lambda166__gsource_func, g_object_ref (self), g_object_unref); + g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 5, ____lambda164__gsource_func, g_object_ref (self), g_object_unref); } } -static void ___lambda165__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { - __lambda165_ (self); +static void ___lambda163__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { + __lambda163_ (self); } @@ -1942,7 +1942,7 @@ _tmp3_ = _ ("ARTIST-ALBUM-TITLE"); gtk_menu_item_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GTK_TYPE_MENU_ITEM, GtkMenuItem), _tmp3_); _tmp4_ = item; - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GTK_TYPE_MENU_ITEM, GtkMenuItem), "activate", (GCallback) ___lambda163__gtk_menu_item_activate, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GTK_TYPE_MENU_ITEM, GtkMenuItem), "activate", (GCallback) ___lambda161__gtk_menu_item_activate, self, 0); _tmp5_ = item; gtk_menu_shell_append (G_TYPE_CHECK_INSTANCE_CAST (m, GTK_TYPE_MENU_SHELL, GtkMenuShell), (GtkWidget*) G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GTK_TYPE_MENU_ITEM, GtkMenuItem)); _tmp6_ = (GtkImageMenuItem*) gtk_image_menu_item_new_from_stock (GTK_STOCK_UNINDENT, NULL); @@ -1953,7 +1953,7 @@ _tmp8_ = _ ("GENRE-ARTIST-ALBUM"); gtk_menu_item_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GTK_TYPE_MENU_ITEM, GtkMenuItem), _tmp8_); _tmp9_ = item; - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GTK_TYPE_MENU_ITEM, GtkMenuItem), "activate", (GCallback) ___lambda164__gtk_menu_item_activate, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GTK_TYPE_MENU_ITEM, GtkMenuItem), "activate", (GCallback) ___lambda162__gtk_menu_item_activate, self, 0); _tmp10_ = item; gtk_menu_shell_append (G_TYPE_CHECK_INSTANCE_CAST (m, GTK_TYPE_MENU_SHELL, GtkMenuShell), (GtkWidget*) G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GTK_TYPE_MENU_ITEM, GtkMenuItem)); _tmp11_ = (GtkImageMenuItem*) gtk_image_menu_item_new_from_stock (GTK_STOCK_UNINDENT, NULL); @@ -1964,7 +1964,7 @@ _tmp13_ = _ ("ALBUM-ARTIST-TITLE"); gtk_menu_item_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GTK_TYPE_MENU_ITEM, GtkMenuItem), _tmp13_); _tmp14_ = item; - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GTK_TYPE_MENU_ITEM, GtkMenuItem), "activate", (GCallback) ___lambda165__gtk_menu_item_activate, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GTK_TYPE_MENU_ITEM, GtkMenuItem), "activate", (GCallback) ___lambda163__gtk_menu_item_activate, self, 0); _tmp15_ = item; gtk_menu_shell_append (G_TYPE_CHECK_INSTANCE_CAST (m, GTK_TYPE_MENU_SHELL, GtkMenuShell), (GtkWidget*) G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GTK_TYPE_MENU_ITEM, GtkMenuItem)); result = m; @@ -2379,7 +2379,7 @@ } -static gboolean ___lambda160_ (XnoiseMusicBrowser* self, GtkTreeModel* mo, GtkTreePath* pt, GtkTreeIter* it) { +static gboolean ___lambda158_ (XnoiseMusicBrowser* self, GtkTreeModel* mo, GtkTreePath* pt, GtkTreeIter* it) { gboolean result = FALSE; GtkTreeModel* _tmp0_ = NULL; GtkTreeModel* _tmp1_ = NULL; @@ -2402,14 +2402,14 @@ } -static gboolean ____lambda160__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self) { +static gboolean ____lambda158__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self) { gboolean result; - result = ___lambda160_ (self, model, path, iter); + result = ___lambda158_ (self, model, path, iter); return result; } -static void __lambda159_ (XnoiseMusicBrowser* self, GtkWidget* s, GtkAllocation* a) { +static void __lambda157_ (XnoiseMusicBrowser* self, GtkWidget* s, GtkAllocation* a) { GtkTreeViewColumn* tvc = NULL; GtkTreeViewColumn* _tmp0_ = NULL; gint current_width = 0; @@ -2461,14 +2461,14 @@ if (_tmp14_) { GtkTreeModel* _tmp15_ = NULL; _tmp15_ = xm; - gtk_tree_model_foreach (_tmp15_, ____lambda160__gtk_tree_model_foreach_func, self); + gtk_tree_model_foreach (_tmp15_, ____lambda158__gtk_tree_model_foreach_func, self); } _g_object_unref0 (xm); } -static void ___lambda159__gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self) { - __lambda159_ (self, _sender, allocation); +static void ___lambda157__gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self) { + __lambda157_ (self, _sender, allocation); } @@ -2504,7 +2504,7 @@ _g_object_unref0 (self->priv->renderer); self->priv->renderer = _tmp4_; _tmp5_ = self->priv->ow; - g_signal_connect_object (_tmp5_, "size-allocate", (GCallback) ___lambda159__gtk_widget_size_allocate, self, G_CONNECT_AFTER); + g_signal_connect_object (_tmp5_, "size-allocate", (GCallback) ___lambda157__gtk_widget_size_allocate, self, G_CONNECT_AFTER); _tmp6_ = self->priv->renderer; gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (column, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GTK_TYPE_CELL_RENDERER, GtkCellRenderer), FALSE); _tmp7_ = self->priv->renderer; diff -Nru xnoise-0.2.20/libxnoise/DockableMedia/StreamListing/xnoise-treeview-streams-model.c xnoise-0.2.21/libxnoise/DockableMedia/StreamListing/xnoise-treeview-streams-model.c --- xnoise-0.2.20/libxnoise/DockableMedia/StreamListing/xnoise-treeview-streams-model.c 2013-12-11 11:24:22.000000000 +0000 +++ xnoise-0.2.21/libxnoise/DockableMedia/StreamListing/xnoise-treeview-streams-model.c 2014-01-27 09:32:55.000000000 +0000 @@ -363,15 +363,15 @@ GType xnoise_database_writer_get_type (void) G_GNUC_CONST; void xnoise_database_writer_register_change_callback (XnoiseDatabaseWriter* self, XnoiseDatabaseWriterNotificationData* cbd); GType xnoise_global_access_get_type (void) G_GNUC_CONST; -static void __lambda448_ (XnoiseTreeViewStreamsModel* self, XnoiseGlobalAccess* s, const gchar* t); +static void __lambda446_ (XnoiseTreeViewStreamsModel* self, XnoiseGlobalAccess* s, const gchar* t); gchar* xnoise_dockable_media_name (XnoiseDockableMedia* self); const gchar* xnoise_global_access_get_active_dockable_media_name (XnoiseGlobalAccess* self); -static gboolean ___lambda449_ (XnoiseTreeViewStreamsModel* self); +static gboolean ___lambda447_ (XnoiseTreeViewStreamsModel* self); void xnoise_tree_view_streams_model_filter (XnoiseTreeViewStreamsModel* self); -static gboolean ____lambda449__gsource_func (gpointer self); -static gboolean ___lambda450_ (XnoiseTreeViewStreamsModel* self); -static gboolean ____lambda450__gsource_func (gpointer self); -static void ___lambda448__xnoise_global_access_sign_searchtext_changed (XnoiseGlobalAccess* _sender, const gchar* text, gpointer self); +static gboolean ____lambda447__gsource_func (gpointer self); +static gboolean ___lambda448_ (XnoiseTreeViewStreamsModel* self); +static gboolean ____lambda448__gsource_func (gpointer self); +static void ___lambda446__xnoise_global_access_sign_searchtext_changed (XnoiseGlobalAccess* _sender, const gchar* text, gpointer self); void xnoise_tree_view_streams_model_remove_all (XnoiseTreeViewStreamsModel* self); gpointer xnoise_worker_job_ref (gpointer instance); void xnoise_worker_job_unref (gpointer instance); @@ -414,18 +414,18 @@ void xnoise_dnd_data_copy (const XnoiseDndData* self, XnoiseDndData* dest); void xnoise_dnd_data_destroy (XnoiseDndData* self); static void _vala_XnoiseItem_array_free (XnoiseItem* array, gint array_length); -static gboolean __lambda446_ (Block26Data* _data26_); +static gboolean __lambda444_ (Block26Data* _data26_); GType xnoise_icon_repo_get_type (void) G_GNUC_CONST; GdkPixbuf* xnoise_icon_repo_get_radios_icon (XnoiseIconRepo* self); -static gboolean ___lambda446__gsource_func (gpointer self); +static gboolean ___lambda444__gsource_func (gpointer self); static gboolean xnoise_tree_view_streams_model_add_imported_job (XnoiseTreeViewStreamsModel* self, XnoiseWorkerJob* job); static gboolean _xnoise_tree_view_streams_model_add_imported_job_xnoise_worker_work_func (XnoiseWorkerJob* jb, gpointer self); static Block27Data* block27_data_ref (Block27Data* _data27_); static void block27_data_unref (void * _userdata_); XnoiseItem* xnoise_database_reader_get_streamitem_by_id (XnoiseDatabaseReader* self, gint32 id, const gchar* searchtext); -static gboolean __lambda447_ (Block27Data* _data27_); +static gboolean __lambda445_ (Block27Data* _data27_); #define XNOISE_RESOURCES_EMPTYSTRING "" -static gboolean ___lambda447__gsource_func (gpointer self); +static gboolean ___lambda445__gsource_func (gpointer self); XnoiseDndData* xnoise_tree_view_streams_model_get_dnd_data_for_path (XnoiseTreeViewStreamsModel* self, GtkTreePath** treepath, int* result_length1); gint xnoise_data_source_get_source_id (XnoiseDataSource* self); static void _vala_array_add46 (XnoiseDndData** array, int* length, int* size, const XnoiseDndData* value); @@ -450,7 +450,7 @@ } -static gboolean ___lambda449_ (XnoiseTreeViewStreamsModel* self) { +static gboolean ___lambda447_ (XnoiseTreeViewStreamsModel* self) { gboolean result = FALSE; xnoise_tree_view_streams_model_filter (self); self->priv->search_idlesource = (guint) 0; @@ -459,14 +459,14 @@ } -static gboolean ____lambda449__gsource_func (gpointer self) { +static gboolean ____lambda447__gsource_func (gpointer self) { gboolean result; - result = ___lambda449_ (self); + result = ___lambda447_ (self); return result; } -static gboolean ___lambda450_ (XnoiseTreeViewStreamsModel* self) { +static gboolean ___lambda448_ (XnoiseTreeViewStreamsModel* self) { gboolean result = FALSE; xnoise_tree_view_streams_model_filter (self); self->priv->search_idlesource = (guint) 0; @@ -475,14 +475,14 @@ } -static gboolean ____lambda450__gsource_func (gpointer self) { +static gboolean ____lambda448__gsource_func (gpointer self) { gboolean result; - result = ___lambda450_ (self); + result = ___lambda448_ (self); return result; } -static void __lambda448_ (XnoiseTreeViewStreamsModel* self, XnoiseGlobalAccess* s, const gchar* t) { +static void __lambda446_ (XnoiseTreeViewStreamsModel* self, XnoiseGlobalAccess* s, const gchar* t) { XnoiseDockableMedia* _tmp0_ = NULL; gchar* _tmp1_ = NULL; gchar* _tmp2_ = NULL; @@ -509,7 +509,7 @@ _tmp8_ = self->priv->search_idlesource; g_source_remove (_tmp8_); } - _tmp9_ = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ____lambda449__gsource_func, g_object_ref (self), g_object_unref); + _tmp9_ = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ____lambda447__gsource_func, g_object_ref (self), g_object_unref); self->priv->search_idlesource = _tmp9_; } else { guint _tmp10_ = 0U; @@ -520,14 +520,14 @@ _tmp11_ = self->priv->search_idlesource; g_source_remove (_tmp11_); } - _tmp12_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 200, ____lambda450__gsource_func, g_object_ref (self), g_object_unref); + _tmp12_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 200, ____lambda448__gsource_func, g_object_ref (self), g_object_unref); self->priv->search_idlesource = _tmp12_; } } -static void ___lambda448__xnoise_global_access_sign_searchtext_changed (XnoiseGlobalAccess* _sender, const gchar* text, gpointer self) { - __lambda448_ (self, _sender, text); +static void ___lambda446__xnoise_global_access_sign_searchtext_changed (XnoiseGlobalAccess* _sender, const gchar* text, gpointer self) { + __lambda446_ (self, _sender, text); } @@ -559,7 +559,7 @@ _tmp4_ = cbd; xnoise_database_writer_register_change_callback (_tmp3_, &_tmp4_); _tmp5_ = xnoise_global; - g_signal_connect_object (_tmp5_, "sign-searchtext-changed", (GCallback) ___lambda448__xnoise_global_access_sign_searchtext_changed, self, 0); + g_signal_connect_object (_tmp5_, "sign-searchtext-changed", (GCallback) ___lambda446__xnoise_global_access_sign_searchtext_changed, self, 0); return self; } @@ -659,7 +659,7 @@ } -static gboolean __lambda446_ (Block26Data* _data26_) { +static gboolean __lambda444_ (Block26Data* _data26_) { XnoiseTreeViewStreamsModel * self; gboolean result = FALSE; XnoiseWorkerJob* _tmp0_ = NULL; @@ -730,9 +730,9 @@ } -static gboolean ___lambda446__gsource_func (gpointer self) { +static gboolean ___lambda444__gsource_func (gpointer self) { gboolean result; - result = __lambda446_ (self); + result = __lambda444_ (self); return result; } @@ -767,7 +767,7 @@ _tmp2_->items = (_vala_XnoiseItem_array_free (_tmp2_->items, _tmp2_->items_length1), NULL); _tmp2_->items = _tmp8_; _tmp2_->items_length1 = _tmp7_; - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda446__gsource_func, block26_data_ref (_data26_), block26_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda444__gsource_func, block26_data_ref (_data26_), block26_data_unref); result = FALSE; block26_data_unref (_data26_); _data26_ = NULL; @@ -859,7 +859,7 @@ } -static gboolean __lambda447_ (Block27Data* _data27_) { +static gboolean __lambda445_ (Block27Data* _data27_) { XnoiseTreeViewStreamsModel * self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; @@ -1111,9 +1111,9 @@ } -static gboolean ___lambda447__gsource_func (gpointer self) { +static gboolean ___lambda445__gsource_func (gpointer self) { gboolean result; - result = __lambda447_ (self); + result = __lambda445_ (self); return result; } @@ -1164,7 +1164,7 @@ _data27_ = NULL; return result; } - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda447__gsource_func, block27_data_ref (_data27_), block27_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda445__gsource_func, block27_data_ref (_data27_), block27_data_unref); result = FALSE; block27_data_unref (_data27_); _data27_ = NULL; diff -Nru xnoise-0.2.20/libxnoise/DockableMedia/StreamListing/xnoise-treeview-streams.c xnoise-0.2.21/libxnoise/DockableMedia/StreamListing/xnoise-treeview-streams.c --- xnoise-0.2.20/libxnoise/DockableMedia/StreamListing/xnoise-treeview-streams.c 2013-12-11 11:24:22.000000000 +0000 +++ xnoise-0.2.21/libxnoise/DockableMedia/StreamListing/xnoise-treeview-streams.c 2014-01-27 09:32:55.000000000 +0000 @@ -616,14 +616,14 @@ static GType xnoise_tree_view_streams_list_flowing_text_renderer_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; static XnoiseTreeViewStreamsListFlowingTextRenderer* xnoise_tree_view_streams_list_flowing_text_renderer_new (GtkTreeViewColumn* col, gint hsepar); static XnoiseTreeViewStreamsListFlowingTextRenderer* xnoise_tree_view_streams_list_flowing_text_renderer_construct (GType object_type, GtkTreeViewColumn* col, gint hsepar); -static void __lambda451_ (XnoiseTreeViewStreams* self); +static void __lambda449_ (XnoiseTreeViewStreams* self); GType xnoise_global_access_get_type (void) G_GNUC_CONST; GType xnoise_album_image_loader_get_type (void) G_GNUC_CONST; GType xnoise_gst_player_get_type (void) G_GNUC_CONST; -static void ___lambda451__gtk_cell_renderer_editing_started (GtkCellRenderer* _sender, GtkCellEditable* editable, const gchar* path, gpointer self); -static void __lambda452_ (XnoiseTreeViewStreams* self); -static void ___lambda452__gtk_cell_renderer_editing_canceled (GtkCellRenderer* _sender, gpointer self); -static void __lambda453_ (XnoiseTreeViewStreams* self, GtkCellRendererText* s, const gchar* ps, const gchar* t); +static void ___lambda449__gtk_cell_renderer_editing_started (GtkCellRenderer* _sender, GtkCellEditable* editable, const gchar* path, gpointer self); +static void __lambda450_ (XnoiseTreeViewStreams* self); +static void ___lambda450__gtk_cell_renderer_editing_canceled (GtkCellRenderer* _sender, gpointer self); +static void __lambda451_ (XnoiseTreeViewStreams* self, GtkCellRendererText* s, const gchar* ps, const gchar* t); #define XNOISE_RESOURCES_EMPTYSTRING "" GType xnoise_item_get_type (void) G_GNUC_CONST; GType xnoise_item_type_get_type (void) G_GNUC_CONST; @@ -666,10 +666,10 @@ void xnoise_dnd_data_destroy (XnoiseDndData* self); GType xnoise_worker_get_type (void) G_GNUC_CONST; void xnoise_worker_push_job (XnoiseWorker* self, XnoiseWorkerJob* j); -static void ___lambda453__gtk_cell_renderer_text_edited (GtkCellRendererText* _sender, const gchar* path, const gchar* new_text, gpointer self); +static void ___lambda451__gtk_cell_renderer_text_edited (GtkCellRendererText* _sender, const gchar* path, const gchar* new_text, gpointer self); XnoiseTreeViewStreamsModel* xnoise_tree_view_streams_model_new (XnoiseDockableMedia* dock, XnoiseTreeViewStreams* view); XnoiseTreeViewStreamsModel* xnoise_tree_view_streams_model_construct (GType object_type, XnoiseDockableMedia* dock, XnoiseTreeViewStreams* view); -static void __lambda454_ (XnoiseTreeViewStreams* self, GtkTreeView* s, GtkTreePath* tp, GtkTreeViewColumn* c); +static void __lambda452_ (XnoiseTreeViewStreams* self, GtkTreeView* s, GtkTreePath* tp, GtkTreeViewColumn* c); void xnoise_item_init (XnoiseItem *self, XnoiseItemType _type, const gchar* _uri, gint32 _db_id); GType xnoise_item_handler_get_type (void) G_GNUC_CONST; GType xnoise_item_handler_manager_get_type (void) G_GNUC_CONST; @@ -685,7 +685,7 @@ GType xnoise_action_context_get_type (void) G_GNUC_CONST; GType xnoise_item_selection_type_get_type (void) G_GNUC_CONST; XnoiseAction* xnoise_item_handler_get_action (XnoiseItemHandler* self, XnoiseItemType type, XnoiseActionContext context, XnoiseItemSelectionType selection); -static void ___lambda454__gtk_tree_view_row_activated (GtkTreeView* _sender, GtkTreePath* path, GtkTreeViewColumn* column, gpointer self); +static void ___lambda452__gtk_tree_view_row_activated (GtkTreeView* _sender, GtkTreePath* path, GtkTreeViewColumn* column, gpointer self); static void xnoise_tree_view_streams_on_drag_begin (XnoiseTreeViewStreams* self, GtkWidget* sender, GdkDragContext* context); static void _xnoise_tree_view_streams_on_drag_begin_gtk_widget_drag_begin (GtkWidget* _sender, GdkDragContext* context, gpointer self); static void xnoise_tree_view_streams_on_drag_data_get (XnoiseTreeViewStreams* self, GtkWidget* sender, GdkDragContext* context, GtkSelectionData* selection_data, guint info, guint etime); @@ -696,17 +696,17 @@ static gboolean _xnoise_tree_view_streams_on_button_release_gtk_widget_button_release_event (GtkWidget* _sender, GdkEventButton* event, gpointer self); static gboolean xnoise_tree_view_streams_on_button_press (XnoiseTreeViewStreams* self, GdkEventButton* e); static gboolean _xnoise_tree_view_streams_on_button_press_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self); -static void __lambda456_ (XnoiseTreeViewStreams* self, GtkWidget* s, GtkAllocation* a); -static gboolean ___lambda457_ (XnoiseTreeViewStreams* self, GtkTreeModel* mo, GtkTreePath* pt, GtkTreeIter* it); -static gboolean ____lambda457__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self); -static void ___lambda456__gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self); -static void __lambda458_ (XnoiseTreeViewStreams* self); +static void __lambda454_ (XnoiseTreeViewStreams* self, GtkWidget* s, GtkAllocation* a); +static gboolean ___lambda455_ (XnoiseTreeViewStreams* self, GtkTreeModel* mo, GtkTreePath* pt, GtkTreeIter* it); +static gboolean ____lambda455__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self); +static void ___lambda454__gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self); +static void __lambda456_ (XnoiseTreeViewStreams* self); +static gboolean __lambda457_ (XnoiseTreeViewStreams* self); +static gboolean ___lambda458_ (XnoiseTreeViewStreams* self, GtkTreeModel* mo, GtkTreePath* pt, GtkTreeIter* it); +static gboolean ____lambda458__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self); +static gboolean ___lambda457__gsource_func (gpointer self); +static void ___lambda456__gtk_widget_realize (GtkWidget* _sender, gpointer self); static gboolean __lambda459_ (XnoiseTreeViewStreams* self); -static gboolean ___lambda460_ (XnoiseTreeViewStreams* self, GtkTreeModel* mo, GtkTreePath* pt, GtkTreeIter* it); -static gboolean ____lambda460__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self); -static gboolean ___lambda459__gsource_func (gpointer self); -static void ___lambda458__gtk_widget_realize (GtkWidget* _sender, gpointer self); -static gboolean __lambda461_ (XnoiseTreeViewStreams* self); GType xnoise_iparams_get_type (void) G_GNUC_CONST; GType xnoise_serial_button_get_type (void) G_GNUC_CONST; GType xnoise_album_art_view_get_type (void) G_GNUC_CONST; @@ -722,7 +722,7 @@ GType xnoise_track_infobar_get_type (void) G_GNUC_CONST; GType xnoise_music_browser_get_type (void) G_GNUC_CONST; GType xnoise_media_soure_widget_get_type (void) G_GNUC_CONST; -static gboolean ___lambda461__gsource_func (gpointer self); +static gboolean ___lambda459__gsource_func (gpointer self); GType xnoise_database_writer_get_type (void) G_GNUC_CONST; void xnoise_database_writer_update_stream_name (XnoiseDatabaseWriter* self, XnoiseItem* item); static void _vala_XnoiseDndData_array_free (XnoiseDndData* array, gint array_length); @@ -741,9 +741,9 @@ GArray* xnoise_item_handler_manager_get_actions (XnoiseItemHandlerManager* self, XnoiseItemType type, XnoiseActionContext context, XnoiseItemSelectionType selection); static Block25Data* block25_data_ref (Block25Data* _data25_); static void block25_data_unref (void * _userdata_); -static void _____lambda455_ (Block25Data* _data25_); +static void _____lambda453_ (Block25Data* _data25_); static void _vala_GValue_free (GValue* self); -static void ______lambda455__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self); +static void ______lambda453__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self); #define XNOISE_TREE_VIEW_STREAMS_LIST_FLOWING_TEXT_RENDERER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), XNOISE_TREE_VIEW_STREAMS_TYPE_LIST_FLOWING_TEXT_RENDERER, XnoiseTreeViewStreamsListFlowingTextRendererPrivate)) enum { XNOISE_TREE_VIEW_STREAMS_LIST_FLOWING_TEXT_RENDERER_DUMMY_PROPERTY, @@ -769,27 +769,27 @@ } -static void __lambda451_ (XnoiseTreeViewStreams* self) { +static void __lambda449_ (XnoiseTreeViewStreams* self) { XnoiseGlobalAccess* _tmp0_ = NULL; _tmp0_ = xnoise_global; _tmp0_->cellrenderer_in_edit = TRUE; } -static void ___lambda451__gtk_cell_renderer_editing_started (GtkCellRenderer* _sender, GtkCellEditable* editable, const gchar* path, gpointer self) { - __lambda451_ (self); +static void ___lambda449__gtk_cell_renderer_editing_started (GtkCellRenderer* _sender, GtkCellEditable* editable, const gchar* path, gpointer self) { + __lambda449_ (self); } -static void __lambda452_ (XnoiseTreeViewStreams* self) { +static void __lambda450_ (XnoiseTreeViewStreams* self) { XnoiseGlobalAccess* _tmp0_ = NULL; _tmp0_ = xnoise_global; _tmp0_->cellrenderer_in_edit = FALSE; } -static void ___lambda452__gtk_cell_renderer_editing_canceled (GtkCellRenderer* _sender, gpointer self) { - __lambda452_ (self); +static void ___lambda450__gtk_cell_renderer_editing_canceled (GtkCellRenderer* _sender, gpointer self) { + __lambda450_ (self); } @@ -805,7 +805,7 @@ } -static void __lambda453_ (XnoiseTreeViewStreams* self, GtkCellRendererText* s, const gchar* ps, const gchar* t) { +static void __lambda451_ (XnoiseTreeViewStreams* self, GtkCellRendererText* s, const gchar* ps, const gchar* t) { const gchar* _tmp0_ = NULL; GtkTreePath* p = NULL; const gchar* _tmp1_ = NULL; @@ -888,12 +888,12 @@ } -static void ___lambda453__gtk_cell_renderer_text_edited (GtkCellRendererText* _sender, const gchar* path, const gchar* new_text, gpointer self) { - __lambda453_ (self, _sender, path, new_text); +static void ___lambda451__gtk_cell_renderer_text_edited (GtkCellRendererText* _sender, const gchar* path, const gchar* new_text, gpointer self) { + __lambda451_ (self, _sender, path, new_text); } -static void __lambda454_ (XnoiseTreeViewStreams* self, GtkTreeView* s, GtkTreePath* tp, GtkTreeViewColumn* c) { +static void __lambda452_ (XnoiseTreeViewStreams* self, GtkTreeView* s, GtkTreePath* tp, GtkTreeViewColumn* c) { XnoiseItem* item = NULL; XnoiseItem _tmp0_ = {0}; XnoiseItem _tmp1_ = {0}; @@ -970,8 +970,8 @@ } -static void ___lambda454__gtk_tree_view_row_activated (GtkTreeView* _sender, GtkTreePath* path, GtkTreeViewColumn* column, gpointer self) { - __lambda454_ (self, _sender, path, column); +static void ___lambda452__gtk_tree_view_row_activated (GtkTreeView* _sender, GtkTreePath* path, GtkTreeViewColumn* column, gpointer self) { + __lambda452_ (self, _sender, path, column); } @@ -1004,7 +1004,7 @@ } -static gboolean ___lambda457_ (XnoiseTreeViewStreams* self, GtkTreeModel* mo, GtkTreePath* pt, GtkTreeIter* it) { +static gboolean ___lambda455_ (XnoiseTreeViewStreams* self, GtkTreeModel* mo, GtkTreePath* pt, GtkTreeIter* it) { gboolean result = FALSE; GtkTreeModel* _tmp0_ = NULL; GtkTreeModel* _tmp1_ = NULL; @@ -1027,14 +1027,14 @@ } -static gboolean ____lambda457__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self) { +static gboolean ____lambda455__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self) { gboolean result; - result = ___lambda457_ (self, model, path, iter); + result = ___lambda455_ (self, model, path, iter); return result; } -static void __lambda456_ (XnoiseTreeViewStreams* self, GtkWidget* s, GtkAllocation* a) { +static void __lambda454_ (XnoiseTreeViewStreams* self, GtkWidget* s, GtkAllocation* a) { GtkTreeViewColumn* tvc = NULL; GtkTreeViewColumn* _tmp0_ = NULL; gint current_width = 0; @@ -1076,18 +1076,18 @@ if (_tmp11_ != NULL) { GtkTreeModel* _tmp12_ = NULL; _tmp12_ = xm; - gtk_tree_model_foreach (_tmp12_, ____lambda457__gtk_tree_model_foreach_func, self); + gtk_tree_model_foreach (_tmp12_, ____lambda455__gtk_tree_model_foreach_func, self); } _g_object_unref0 (xm); } -static void ___lambda456__gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self) { - __lambda456_ (self, _sender, allocation); +static void ___lambda454__gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self) { + __lambda454_ (self, _sender, allocation); } -static gboolean ___lambda460_ (XnoiseTreeViewStreams* self, GtkTreeModel* mo, GtkTreePath* pt, GtkTreeIter* it) { +static gboolean ___lambda458_ (XnoiseTreeViewStreams* self, GtkTreeModel* mo, GtkTreePath* pt, GtkTreeIter* it) { gboolean result = FALSE; GtkTreeModel* _tmp0_ = NULL; GtkTreeModel* _tmp1_ = NULL; @@ -1110,14 +1110,14 @@ } -static gboolean ____lambda460__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self) { +static gboolean ____lambda458__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self) { gboolean result; - result = ___lambda460_ (self, model, path, iter); + result = ___lambda458_ (self, model, path, iter); return result; } -static gboolean __lambda459_ (XnoiseTreeViewStreams* self) { +static gboolean __lambda457_ (XnoiseTreeViewStreams* self) { gboolean result = FALSE; GtkTreeViewColumn* tvc = NULL; GtkTreeViewColumn* _tmp0_ = NULL; @@ -1148,7 +1148,7 @@ if (_tmp8_ != NULL) { GtkTreeModel* _tmp9_ = NULL; _tmp9_ = xm; - gtk_tree_model_foreach (_tmp9_, ____lambda460__gtk_tree_model_foreach_func, self); + gtk_tree_model_foreach (_tmp9_, ____lambda458__gtk_tree_model_foreach_func, self); } result = FALSE; _g_object_unref0 (xm); @@ -1156,24 +1156,24 @@ } -static gboolean ___lambda459__gsource_func (gpointer self) { +static gboolean ___lambda457__gsource_func (gpointer self) { gboolean result; - result = __lambda459_ (self); + result = __lambda457_ (self); return result; } -static void __lambda458_ (XnoiseTreeViewStreams* self) { - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda459__gsource_func, g_object_ref (self), g_object_unref); +static void __lambda456_ (XnoiseTreeViewStreams* self) { + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda457__gsource_func, g_object_ref (self), g_object_unref); } -static void ___lambda458__gtk_widget_realize (GtkWidget* _sender, gpointer self) { - __lambda458_ (self); +static void ___lambda456__gtk_widget_realize (GtkWidget* _sender, gpointer self) { + __lambda456_ (self); } -static gboolean __lambda461_ (XnoiseTreeViewStreams* self) { +static gboolean __lambda459_ (XnoiseTreeViewStreams* self) { gboolean result = FALSE; GtkStyleContext* ctx = NULL; XnoiseMainWindow* _tmp0_ = NULL; @@ -1199,9 +1199,9 @@ } -static gboolean ___lambda461__gsource_func (gpointer self) { +static gboolean ___lambda459__gsource_func (gpointer self) { gboolean result; - result = __lambda461_ (self); + result = __lambda459_ (self); return result; } @@ -1263,9 +1263,9 @@ renderer = _tmp9_; g_object_set (G_TYPE_CHECK_INSTANCE_CAST (renderer, GTK_TYPE_CELL_RENDERER_TEXT, GtkCellRendererText), "editable", TRUE, NULL); g_object_set (G_TYPE_CHECK_INSTANCE_CAST (renderer, GTK_TYPE_CELL_RENDERER_TEXT, GtkCellRendererText), "editable-set", TRUE, NULL); - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (renderer, GTK_TYPE_CELL_RENDERER, GtkCellRenderer), "editing-started", (GCallback) ___lambda451__gtk_cell_renderer_editing_started, self, 0); - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (renderer, GTK_TYPE_CELL_RENDERER, GtkCellRenderer), "editing-canceled", (GCallback) ___lambda452__gtk_cell_renderer_editing_canceled, self, 0); - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (renderer, GTK_TYPE_CELL_RENDERER_TEXT, GtkCellRendererText), "edited", (GCallback) ___lambda453__gtk_cell_renderer_text_edited, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (renderer, GTK_TYPE_CELL_RENDERER, GtkCellRenderer), "editing-started", (GCallback) ___lambda449__gtk_cell_renderer_editing_started, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (renderer, GTK_TYPE_CELL_RENDERER, GtkCellRenderer), "editing-canceled", (GCallback) ___lambda450__gtk_cell_renderer_editing_canceled, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (renderer, GTK_TYPE_CELL_RENDERER_TEXT, GtkCellRendererText), "edited", (GCallback) ___lambda451__gtk_cell_renderer_text_edited, self, 0); _tmp10_ = (GtkCellRendererPixbuf*) gtk_cell_renderer_pixbuf_new (); g_object_ref_sink (_tmp10_); rendererPb = _tmp10_; @@ -1281,7 +1281,7 @@ self->priv->tvm = _tmp12_; _tmp13_ = self->priv->tvm; gtk_tree_view_set_model (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_TREE_VIEW, GtkTreeView), G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GTK_TYPE_TREE_MODEL, GtkTreeModel)); - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_TREE_VIEW, GtkTreeView), "row-activated", (GCallback) ___lambda454__gtk_tree_view_row_activated, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_TREE_VIEW, GtkTreeView), "row-activated", (GCallback) ___lambda452__gtk_tree_view_row_activated, self, 0); gtk_drag_source_set (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), GDK_BUTTON1_MASK, XNOISE_TREE_VIEW_STREAMS_src_target_entries, G_N_ELEMENTS (XNOISE_TREE_VIEW_STREAMS_src_target_entries), GDK_ACTION_COPY); g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), "drag-begin", (GCallback) _xnoise_tree_view_streams_on_drag_begin_gtk_widget_drag_begin, self, 0); g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), "drag-data-get", (GCallback) _xnoise_tree_view_streams_on_drag_data_get_gtk_widget_drag_data_get, self, 0); @@ -1289,15 +1289,15 @@ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), "button-release-event", (GCallback) _xnoise_tree_view_streams_on_button_release_gtk_widget_button_release_event, self, 0); g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), "button-press-event", (GCallback) _xnoise_tree_view_streams_on_button_press_gtk_widget_button_press_event, self, 0); _tmp14_ = self->priv->ow; - g_signal_connect_object (_tmp14_, "size-allocate", (GCallback) ___lambda456__gtk_widget_size_allocate, self, G_CONNECT_AFTER); - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), "realize", (GCallback) ___lambda458__gtk_widget_realize, self, G_CONNECT_AFTER); + g_signal_connect_object (_tmp14_, "size-allocate", (GCallback) ___lambda454__gtk_widget_size_allocate, self, G_CONNECT_AFTER); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), "realize", (GCallback) ___lambda456__gtk_widget_realize, self, G_CONNECT_AFTER); gtk_style_context_save (context); gtk_style_context_get_background_color (context, GTK_STATE_FLAG_SELECTED, &_tmp15_); scolor = _tmp15_; gtk_style_context_add_class (context, GTK_STYLE_CLASS_PANE_SEPARATOR); gtk_style_context_get_background_color (context, GTK_STATE_FLAG_NORMAL, &_tmp16_); color = _tmp16_; - g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ___lambda461__gsource_func, g_object_ref (self), g_object_unref); + g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ___lambda459__gsource_func, g_object_ref (self), g_object_unref); _tmp17_ = scolor; gtk_widget_override_background_color (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), GTK_STATE_FLAG_SELECTED, &_tmp17_); gtk_style_context_restore (context); @@ -1860,7 +1860,7 @@ } -static void _____lambda455_ (Block25Data* _data25_) { +static void _____lambda453_ (Block25Data* _data25_) { Block24Data* _data24_; XnoiseTreeViewStreams * self; XnoiseAction* _tmp0_ = NULL; @@ -1884,8 +1884,8 @@ } -static void ______lambda455__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { - _____lambda455_ (self); +static void ______lambda453__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { + _____lambda453_ (self); } @@ -2023,7 +2023,7 @@ _tmp36_ = _tmp35_->info; gtk_menu_item_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GTK_TYPE_MENU_ITEM, GtkMenuItem), _tmp36_); _tmp37_ = menu_item; - g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GTK_TYPE_MENU_ITEM, GtkMenuItem), "activate", (GCallback) ______lambda455__gtk_menu_item_activate, block25_data_ref (_data25_), (GClosureNotify) block25_data_unref, 0); + g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GTK_TYPE_MENU_ITEM, GtkMenuItem), "activate", (GCallback) ______lambda453__gtk_menu_item_activate, block25_data_ref (_data25_), (GClosureNotify) block25_data_unref, 0); _tmp38_ = rightmenu; _tmp39_ = menu_item; gtk_menu_shell_append (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GTK_TYPE_MENU_SHELL, GtkMenuShell), (GtkWidget*) G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GTK_TYPE_MENU_ITEM, GtkMenuItem)); diff -Nru xnoise-0.2.20/libxnoise/DockableMedia/VideoListing/xnoise-treeview-videos-model.c xnoise-0.2.21/libxnoise/DockableMedia/VideoListing/xnoise-treeview-videos-model.c --- xnoise-0.2.20/libxnoise/DockableMedia/VideoListing/xnoise-treeview-videos-model.c 2013-12-11 11:24:22.000000000 +0000 +++ xnoise-0.2.21/libxnoise/DockableMedia/VideoListing/xnoise-treeview-videos-model.c 2014-01-27 09:32:55.000000000 +0000 @@ -372,20 +372,20 @@ GType xnoise_database_writer_get_type (void) G_GNUC_CONST; void xnoise_database_writer_register_change_callback (XnoiseDatabaseWriter* self, XnoiseDatabaseWriterNotificationData* cbd); GType xnoise_global_access_get_type (void) G_GNUC_CONST; -static void __lambda322_ (XnoiseTreeViewVideosModel* self, XnoiseGlobalAccess* s, const gchar* t); +static void __lambda320_ (XnoiseTreeViewVideosModel* self, XnoiseGlobalAccess* s, const gchar* t); gchar* xnoise_dockable_media_name (XnoiseDockableMedia* self); const gchar* xnoise_global_access_get_active_dockable_media_name (XnoiseGlobalAccess* self); -static gboolean ___lambda323_ (XnoiseTreeViewVideosModel* self); +static gboolean ___lambda321_ (XnoiseTreeViewVideosModel* self); void xnoise_tree_view_videos_model_filter (XnoiseTreeViewVideosModel* self); -static gboolean ____lambda323__gsource_func (gpointer self); -static gboolean ___lambda324_ (XnoiseTreeViewVideosModel* self); -static gboolean ____lambda324__gsource_func (gpointer self); -static void ___lambda322__xnoise_global_access_sign_searchtext_changed (XnoiseGlobalAccess* _sender, const gchar* text, gpointer self); +static gboolean ____lambda321__gsource_func (gpointer self); +static gboolean ___lambda322_ (XnoiseTreeViewVideosModel* self); +static gboolean ____lambda322__gsource_func (gpointer self); +static void ___lambda320__xnoise_global_access_sign_searchtext_changed (XnoiseGlobalAccess* _sender, const gchar* text, gpointer self); GType xnoise_dbus_thumbnailer_get_type (void) G_GNUC_CONST; -static void __lambda325_ (XnoiseTreeViewVideosModel* self, const gchar* u, const gchar* t); -static gboolean __lambda326_ (XnoiseTreeViewVideosModel* self); -static gboolean ___lambda326__gsource_func (gpointer self); -static void ___lambda325__xnoise_dbus_thumbnailer_sign_got_thumbnail (XnoiseDbusThumbnailer* _sender, const gchar* uri, const gchar* thumb_uri, gpointer self); +static void __lambda323_ (XnoiseTreeViewVideosModel* self, const gchar* u, const gchar* t); +static gboolean __lambda324_ (XnoiseTreeViewVideosModel* self); +static gboolean ___lambda324__gsource_func (gpointer self); +static void ___lambda323__xnoise_dbus_thumbnailer_sign_got_thumbnail (XnoiseDbusThumbnailer* _sender, const gchar* uri, const gchar* thumb_uri, gpointer self); void xnoise_tree_view_videos_model_remove_all (XnoiseTreeViewVideosModel* self); gpointer xnoise_worker_job_ref (gpointer instance); void xnoise_worker_job_unref (gpointer instance); @@ -428,26 +428,26 @@ void xnoise_dnd_data_copy (const XnoiseDndData* self, XnoiseDndData* dest); void xnoise_dnd_data_destroy (XnoiseDndData* self); static void _vala_XnoiseItem_array_free (XnoiseItem* array, gint array_length); -static gboolean __lambda318_ (Block30Data* _data30_); +static gboolean __lambda316_ (Block30Data* _data30_); gboolean xnoise_thumbnail_available (const gchar* uri, GFile** _thumb); #define XNOISE_RESOURCES_VIDEOTHUMBNAILSIZE 40 -static gboolean _____lambda319_ (XnoiseTreeViewVideosModel* self); +static gboolean _____lambda317_ (XnoiseTreeViewVideosModel* self); gboolean xnoise_global_access_get_media_import_in_progress (XnoiseGlobalAccess* self); static void _vala_array_add48 (gchar*** array, int* length, int* size, gchar* value); void xnoise_dbus_thumbnailer_queue_uris (XnoiseDbusThumbnailer* self, gchar** uris, int uris_length1); -static gboolean ______lambda319__gsource_func (gpointer self); -static gboolean ___lambda318__gsource_func (gpointer self); +static gboolean ______lambda317__gsource_func (gpointer self); +static gboolean ___lambda316__gsource_func (gpointer self); static gboolean xnoise_tree_view_videos_model_add_imported_job (XnoiseTreeViewVideosModel* self, XnoiseWorkerJob* job); static gboolean _xnoise_tree_view_videos_model_add_imported_job_xnoise_worker_work_func (XnoiseWorkerJob* jb, gpointer self); static Block31Data* block31_data_ref (Block31Data* _data31_); static void block31_data_unref (void * _userdata_); XnoiseItem* xnoise_database_reader_get_videoitem_by_id (XnoiseDatabaseReader* self, gint32 id); -static gboolean __lambda320_ (Block31Data* _data31_); -static gboolean ___lambda321_ (XnoiseTreeViewVideosModel* self); +static gboolean __lambda318_ (Block31Data* _data31_); +static gboolean ___lambda319_ (XnoiseTreeViewVideosModel* self); static void _vala_array_add49 (gchar*** array, int* length, int* size, gchar* value); -static gboolean ____lambda321__gsource_func (gpointer self); +static gboolean ____lambda319__gsource_func (gpointer self); #define XNOISE_RESOURCES_EMPTYSTRING "" -static gboolean ___lambda320__gsource_func (gpointer self); +static gboolean ___lambda318__gsource_func (gpointer self); XnoiseDndData* xnoise_tree_view_videos_model_get_dnd_data_for_path (XnoiseTreeViewVideosModel* self, GtkTreePath** treepath, int* result_length1); gint xnoise_data_source_get_source_id (XnoiseDataSource* self); static void _vala_array_add50 (XnoiseDndData** array, int* length, int* size, const XnoiseDndData* value); @@ -485,7 +485,7 @@ } -static gboolean ___lambda323_ (XnoiseTreeViewVideosModel* self) { +static gboolean ___lambda321_ (XnoiseTreeViewVideosModel* self) { gboolean result = FALSE; xnoise_tree_view_videos_model_filter (self); self->priv->search_idlesource = (guint) 0; @@ -494,14 +494,14 @@ } -static gboolean ____lambda323__gsource_func (gpointer self) { +static gboolean ____lambda321__gsource_func (gpointer self) { gboolean result; - result = ___lambda323_ (self); + result = ___lambda321_ (self); return result; } -static gboolean ___lambda324_ (XnoiseTreeViewVideosModel* self) { +static gboolean ___lambda322_ (XnoiseTreeViewVideosModel* self) { gboolean result = FALSE; xnoise_tree_view_videos_model_filter (self); self->priv->search_idlesource = (guint) 0; @@ -510,14 +510,14 @@ } -static gboolean ____lambda324__gsource_func (gpointer self) { +static gboolean ____lambda322__gsource_func (gpointer self) { gboolean result; - result = ___lambda324_ (self); + result = ___lambda322_ (self); return result; } -static void __lambda322_ (XnoiseTreeViewVideosModel* self, XnoiseGlobalAccess* s, const gchar* t) { +static void __lambda320_ (XnoiseTreeViewVideosModel* self, XnoiseGlobalAccess* s, const gchar* t) { XnoiseDockableMedia* _tmp0_ = NULL; gchar* _tmp1_ = NULL; gchar* _tmp2_ = NULL; @@ -544,7 +544,7 @@ _tmp8_ = self->priv->search_idlesource; g_source_remove (_tmp8_); } - _tmp9_ = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ____lambda323__gsource_func, g_object_ref (self), g_object_unref); + _tmp9_ = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ____lambda321__gsource_func, g_object_ref (self), g_object_unref); self->priv->search_idlesource = _tmp9_; } else { guint _tmp10_ = 0U; @@ -555,18 +555,18 @@ _tmp11_ = self->priv->search_idlesource; g_source_remove (_tmp11_); } - _tmp12_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 200, ____lambda324__gsource_func, g_object_ref (self), g_object_unref); + _tmp12_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 200, ____lambda322__gsource_func, g_object_ref (self), g_object_unref); self->priv->search_idlesource = _tmp12_; } } -static void ___lambda322__xnoise_global_access_sign_searchtext_changed (XnoiseGlobalAccess* _sender, const gchar* text, gpointer self) { - __lambda322_ (self, _sender, text); +static void ___lambda320__xnoise_global_access_sign_searchtext_changed (XnoiseGlobalAccess* _sender, const gchar* text, gpointer self) { + __lambda320_ (self, _sender, text); } -static gboolean __lambda326_ (XnoiseTreeViewVideosModel* self) { +static gboolean __lambda324_ (XnoiseTreeViewVideosModel* self) { gboolean result = FALSE; xnoise_tree_view_videos_model_filter (self); self->priv->update_thumbnails_src = (guint) 0; @@ -575,14 +575,14 @@ } -static gboolean ___lambda326__gsource_func (gpointer self) { +static gboolean ___lambda324__gsource_func (gpointer self) { gboolean result; - result = __lambda326_ (self); + result = __lambda324_ (self); return result; } -static void __lambda325_ (XnoiseTreeViewVideosModel* self, const gchar* u, const gchar* t) { +static void __lambda323_ (XnoiseTreeViewVideosModel* self, const gchar* u, const gchar* t) { guint _tmp0_ = 0U; guint _tmp2_ = 0U; g_return_if_fail (u != NULL); @@ -593,13 +593,13 @@ _tmp1_ = self->priv->update_thumbnails_src; g_source_remove (_tmp1_); } - _tmp2_ = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ___lambda326__gsource_func, g_object_ref (self), g_object_unref); + _tmp2_ = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ___lambda324__gsource_func, g_object_ref (self), g_object_unref); self->priv->update_thumbnails_src = _tmp2_; } -static void ___lambda325__xnoise_dbus_thumbnailer_sign_got_thumbnail (XnoiseDbusThumbnailer* _sender, const gchar* uri, const gchar* thumb_uri, gpointer self) { - __lambda325_ (self, uri, thumb_uri); +static void ___lambda323__xnoise_dbus_thumbnailer_sign_got_thumbnail (XnoiseDbusThumbnailer* _sender, const gchar* uri, const gchar* thumb_uri, gpointer self) { + __lambda323_ (self, uri, thumb_uri); } @@ -632,9 +632,9 @@ _tmp4_ = cbd; xnoise_database_writer_register_change_callback (_tmp3_, &_tmp4_); _tmp5_ = xnoise_global; - g_signal_connect_object (_tmp5_, "sign-searchtext-changed", (GCallback) ___lambda322__xnoise_global_access_sign_searchtext_changed, self, 0); + g_signal_connect_object (_tmp5_, "sign-searchtext-changed", (GCallback) ___lambda320__xnoise_global_access_sign_searchtext_changed, self, 0); _tmp6_ = xnoise_thumbnailer; - g_signal_connect_object (_tmp6_, "sign-got-thumbnail", (GCallback) ___lambda325__xnoise_dbus_thumbnailer_sign_got_thumbnail, self, 0); + g_signal_connect_object (_tmp6_, "sign-got-thumbnail", (GCallback) ___lambda323__xnoise_dbus_thumbnailer_sign_got_thumbnail, self, 0); return self; } @@ -747,7 +747,7 @@ } -static gboolean _____lambda319_ (XnoiseTreeViewVideosModel* self) { +static gboolean _____lambda317_ (XnoiseTreeViewVideosModel* self) { gboolean result = FALSE; XnoiseGlobalAccess* _tmp0_ = NULL; gboolean _tmp1_ = FALSE; @@ -809,14 +809,14 @@ } -static gboolean ______lambda319__gsource_func (gpointer self) { +static gboolean ______lambda317__gsource_func (gpointer self) { gboolean result; - result = _____lambda319_ (self); + result = _____lambda317_ (self); return result; } -static gboolean __lambda318_ (Block30Data* _data30_) { +static gboolean __lambda316_ (Block30Data* _data30_) { XnoiseTreeViewVideosModel * self; gboolean result = FALSE; GtkTreeIter iter = {0}; @@ -958,7 +958,7 @@ _tmp32_ = self->priv->thumbnailer_src; g_source_remove (_tmp32_); } - _tmp33_ = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ______lambda319__gsource_func, g_object_ref (self), g_object_unref); + _tmp33_ = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ______lambda317__gsource_func, g_object_ref (self), g_object_unref); self->priv->thumbnailer_src = _tmp33_; } _g_object_unref0 (thumb); @@ -975,9 +975,9 @@ } -static gboolean ___lambda318__gsource_func (gpointer self) { +static gboolean ___lambda316__gsource_func (gpointer self) { gboolean result; - result = __lambda318_ (self); + result = __lambda316_ (self); return result; } @@ -1012,7 +1012,7 @@ _tmp2_->items = (_vala_XnoiseItem_array_free (_tmp2_->items, _tmp2_->items_length1), NULL); _tmp2_->items = _tmp8_; _tmp2_->items_length1 = _tmp7_; - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda318__gsource_func, block30_data_ref (_data30_), block30_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda316__gsource_func, block30_data_ref (_data30_), block30_data_unref); result = FALSE; block30_data_unref (_data30_); _data30_ = NULL; @@ -1100,7 +1100,7 @@ } -static gboolean ___lambda321_ (XnoiseTreeViewVideosModel* self) { +static gboolean ___lambda319_ (XnoiseTreeViewVideosModel* self) { gboolean result = FALSE; XnoiseGlobalAccess* _tmp0_ = NULL; gboolean _tmp1_ = FALSE; @@ -1162,9 +1162,9 @@ } -static gboolean ____lambda321__gsource_func (gpointer self) { +static gboolean ____lambda319__gsource_func (gpointer self) { gboolean result; - result = ___lambda321_ (self); + result = ___lambda319_ (self); return result; } @@ -1184,7 +1184,7 @@ } -static gboolean __lambda320_ (Block31Data* _data31_) { +static gboolean __lambda318_ (Block31Data* _data31_) { XnoiseTreeViewVideosModel * self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; @@ -1314,7 +1314,7 @@ _tmp20_ = self->priv->thumbnailer_src; g_source_remove (_tmp20_); } - _tmp21_ = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ____lambda321__gsource_func, g_object_ref (self), g_object_unref); + _tmp21_ = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ____lambda319__gsource_func, g_object_ref (self), g_object_unref); self->priv->thumbnailer_src = _tmp21_; } _tmp22_ = gtk_tree_model_iter_n_children (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_TREE_MODEL, GtkTreeModel), NULL); @@ -1574,9 +1574,9 @@ } -static gboolean ___lambda320__gsource_func (gpointer self) { +static gboolean ___lambda318__gsource_func (gpointer self) { gboolean result; - result = __lambda320_ (self); + result = __lambda318_ (self); return result; } @@ -1621,7 +1621,7 @@ _data31_ = NULL; return result; } - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda320__gsource_func, block31_data_ref (_data31_), block31_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda318__gsource_func, block31_data_ref (_data31_), block31_data_unref); result = FALSE; block31_data_unref (_data31_); _data31_ = NULL; diff -Nru xnoise-0.2.20/libxnoise/DockableMedia/VideoListing/xnoise-treeview-videos.c xnoise-0.2.21/libxnoise/DockableMedia/VideoListing/xnoise-treeview-videos.c --- xnoise-0.2.20/libxnoise/DockableMedia/VideoListing/xnoise-treeview-videos.c 2013-12-11 11:24:22.000000000 +0000 +++ xnoise-0.2.21/libxnoise/DockableMedia/VideoListing/xnoise-treeview-videos.c 2014-01-27 09:32:55.000000000 +0000 @@ -463,7 +463,7 @@ GType xnoise_tree_view_videos_model_column_get_type (void) G_GNUC_CONST; XnoiseTreeViewVideosModel* xnoise_tree_view_videos_model_new (XnoiseDockableMedia* dock, XnoiseTreeViewVideos* view); XnoiseTreeViewVideosModel* xnoise_tree_view_videos_model_construct (GType object_type, XnoiseDockableMedia* dock, XnoiseTreeViewVideos* view); -static void __lambda327_ (XnoiseTreeViewVideos* self, GtkTreeView* s, GtkTreePath* tp, GtkTreeViewColumn* c); +static void __lambda325_ (XnoiseTreeViewVideos* self, GtkTreeView* s, GtkTreePath* tp, GtkTreeViewColumn* c); GType xnoise_item_get_type (void) G_GNUC_CONST; GType xnoise_item_type_get_type (void) G_GNUC_CONST; XnoiseItem* xnoise_item_dup (const XnoiseItem* self); @@ -485,7 +485,7 @@ GType xnoise_action_context_get_type (void) G_GNUC_CONST; GType xnoise_item_selection_type_get_type (void) G_GNUC_CONST; XnoiseAction* xnoise_item_handler_get_action (XnoiseItemHandler* self, XnoiseItemType type, XnoiseActionContext context, XnoiseItemSelectionType selection); -static void ___lambda327__gtk_tree_view_row_activated (GtkTreeView* _sender, GtkTreePath* path, GtkTreeViewColumn* column, gpointer self); +static void ___lambda325__gtk_tree_view_row_activated (GtkTreeView* _sender, GtkTreePath* path, GtkTreeViewColumn* column, gpointer self); static void xnoise_tree_view_videos_on_drag_begin (XnoiseTreeViewVideos* self, GtkWidget* sender, GdkDragContext* context); static void _xnoise_tree_view_videos_on_drag_begin_gtk_widget_drag_begin (GtkWidget* _sender, GdkDragContext* context, gpointer self); static void xnoise_tree_view_videos_on_drag_data_get (XnoiseTreeViewVideos* self, GtkWidget* sender, GdkDragContext* context, GtkSelectionData* selection_data, guint info, guint etime); @@ -498,17 +498,17 @@ static gboolean _xnoise_tree_view_videos_on_button_press_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self); static gboolean xnoise_tree_view_videos_on_key_released (XnoiseTreeViewVideos* self, GtkWidget* sender, GdkEventKey* e); static gboolean _xnoise_tree_view_videos_on_key_released_gtk_widget_key_release_event (GtkWidget* _sender, GdkEventKey* event, gpointer self); -static void __lambda329_ (XnoiseTreeViewVideos* self, GtkWidget* s, GtkAllocation* a); -static gboolean ___lambda330_ (XnoiseTreeViewVideos* self, GtkTreeModel* mo, GtkTreePath* pt, GtkTreeIter* it); -static gboolean ____lambda330__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self); -static void ___lambda329__gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self); -static void __lambda331_ (XnoiseTreeViewVideos* self); +static void __lambda327_ (XnoiseTreeViewVideos* self, GtkWidget* s, GtkAllocation* a); +static gboolean ___lambda328_ (XnoiseTreeViewVideos* self, GtkTreeModel* mo, GtkTreePath* pt, GtkTreeIter* it); +static gboolean ____lambda328__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self); +static void ___lambda327__gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self); +static void __lambda329_ (XnoiseTreeViewVideos* self); +static gboolean __lambda330_ (XnoiseTreeViewVideos* self); +static gboolean ___lambda331_ (XnoiseTreeViewVideos* self, GtkTreeModel* mo, GtkTreePath* pt, GtkTreeIter* it); +static gboolean ____lambda331__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self); +static gboolean ___lambda330__gsource_func (gpointer self); +static void ___lambda329__gtk_widget_realize (GtkWidget* _sender, gpointer self); static gboolean __lambda332_ (XnoiseTreeViewVideos* self); -static gboolean ___lambda333_ (XnoiseTreeViewVideos* self, GtkTreeModel* mo, GtkTreePath* pt, GtkTreeIter* it); -static gboolean ____lambda333__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self); -static gboolean ___lambda332__gsource_func (gpointer self); -static void ___lambda331__gtk_widget_realize (GtkWidget* _sender, gpointer self); -static gboolean __lambda334_ (XnoiseTreeViewVideos* self); GType xnoise_iparams_get_type (void) G_GNUC_CONST; GType xnoise_serial_button_get_type (void) G_GNUC_CONST; GType xnoise_album_art_view_get_type (void) G_GNUC_CONST; @@ -524,7 +524,7 @@ GType xnoise_track_infobar_get_type (void) G_GNUC_CONST; GType xnoise_music_browser_get_type (void) G_GNUC_CONST; GType xnoise_media_soure_widget_get_type (void) G_GNUC_CONST; -static gboolean ___lambda334__gsource_func (gpointer self); +static gboolean ___lambda332__gsource_func (gpointer self); static void xnoise_tree_view_videos_rightclick_menu_popup (XnoiseTreeViewVideos* self, guint activateTime); GType xnoise_dnd_data_get_type (void) G_GNUC_CONST; XnoiseDndData* xnoise_dnd_data_dup (const XnoiseDndData* self); @@ -545,9 +545,9 @@ GArray* xnoise_item_handler_manager_get_actions (XnoiseItemHandlerManager* self, XnoiseItemType type, XnoiseActionContext context, XnoiseItemSelectionType selection); static Block29Data* block29_data_ref (Block29Data* _data29_); static void block29_data_unref (void * _userdata_); -static void _____lambda328_ (Block29Data* _data29_); +static void _____lambda326_ (Block29Data* _data29_); static void _vala_GValue_free (GValue* self); -static void ______lambda328__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self); +static void ______lambda326__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self); static void xnoise_tree_view_videos_finalize (GObject* obj); GType xnoise_custom_cell_renderer_pixbuf_get_type (void) G_GNUC_CONST; enum { @@ -569,7 +569,7 @@ } -static void __lambda327_ (XnoiseTreeViewVideos* self, GtkTreeView* s, GtkTreePath* tp, GtkTreeViewColumn* c) { +static void __lambda325_ (XnoiseTreeViewVideos* self, GtkTreeView* s, GtkTreePath* tp, GtkTreeViewColumn* c) { XnoiseItem* item = NULL; XnoiseItem _tmp0_ = {0}; XnoiseItem _tmp1_ = {0}; @@ -646,8 +646,8 @@ } -static void ___lambda327__gtk_tree_view_row_activated (GtkTreeView* _sender, GtkTreePath* path, GtkTreeViewColumn* column, gpointer self) { - __lambda327_ (self, _sender, path, column); +static void ___lambda325__gtk_tree_view_row_activated (GtkTreeView* _sender, GtkTreePath* path, GtkTreeViewColumn* column, gpointer self) { + __lambda325_ (self, _sender, path, column); } @@ -687,7 +687,7 @@ } -static gboolean ___lambda330_ (XnoiseTreeViewVideos* self, GtkTreeModel* mo, GtkTreePath* pt, GtkTreeIter* it) { +static gboolean ___lambda328_ (XnoiseTreeViewVideos* self, GtkTreeModel* mo, GtkTreePath* pt, GtkTreeIter* it) { gboolean result = FALSE; GtkTreeModel* _tmp0_ = NULL; GtkTreeModel* _tmp1_ = NULL; @@ -710,14 +710,14 @@ } -static gboolean ____lambda330__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self) { +static gboolean ____lambda328__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self) { gboolean result; - result = ___lambda330_ (self, model, path, iter); + result = ___lambda328_ (self, model, path, iter); return result; } -static void __lambda329_ (XnoiseTreeViewVideos* self, GtkWidget* s, GtkAllocation* a) { +static void __lambda327_ (XnoiseTreeViewVideos* self, GtkWidget* s, GtkAllocation* a) { GtkTreeViewColumn* tvc = NULL; GtkTreeViewColumn* _tmp0_ = NULL; gint current_width = 0; @@ -759,18 +759,18 @@ if (_tmp11_ != NULL) { GtkTreeModel* _tmp12_ = NULL; _tmp12_ = xm; - gtk_tree_model_foreach (_tmp12_, ____lambda330__gtk_tree_model_foreach_func, self); + gtk_tree_model_foreach (_tmp12_, ____lambda328__gtk_tree_model_foreach_func, self); } _g_object_unref0 (xm); } -static void ___lambda329__gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self) { - __lambda329_ (self, _sender, allocation); +static void ___lambda327__gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self) { + __lambda327_ (self, _sender, allocation); } -static gboolean ___lambda333_ (XnoiseTreeViewVideos* self, GtkTreeModel* mo, GtkTreePath* pt, GtkTreeIter* it) { +static gboolean ___lambda331_ (XnoiseTreeViewVideos* self, GtkTreeModel* mo, GtkTreePath* pt, GtkTreeIter* it) { gboolean result = FALSE; GtkTreeModel* _tmp0_ = NULL; GtkTreeModel* _tmp1_ = NULL; @@ -793,14 +793,14 @@ } -static gboolean ____lambda333__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self) { +static gboolean ____lambda331__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self) { gboolean result; - result = ___lambda333_ (self, model, path, iter); + result = ___lambda331_ (self, model, path, iter); return result; } -static gboolean __lambda332_ (XnoiseTreeViewVideos* self) { +static gboolean __lambda330_ (XnoiseTreeViewVideos* self) { gboolean result = FALSE; GtkTreeViewColumn* tvc = NULL; GtkTreeViewColumn* _tmp0_ = NULL; @@ -831,7 +831,7 @@ if (_tmp8_ != NULL) { GtkTreeModel* _tmp9_ = NULL; _tmp9_ = xm; - gtk_tree_model_foreach (_tmp9_, ____lambda333__gtk_tree_model_foreach_func, self); + gtk_tree_model_foreach (_tmp9_, ____lambda331__gtk_tree_model_foreach_func, self); } result = FALSE; _g_object_unref0 (xm); @@ -839,24 +839,24 @@ } -static gboolean ___lambda332__gsource_func (gpointer self) { +static gboolean ___lambda330__gsource_func (gpointer self) { gboolean result; - result = __lambda332_ (self); + result = __lambda330_ (self); return result; } -static void __lambda331_ (XnoiseTreeViewVideos* self) { - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda332__gsource_func, g_object_ref (self), g_object_unref); +static void __lambda329_ (XnoiseTreeViewVideos* self) { + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda330__gsource_func, g_object_ref (self), g_object_unref); } -static void ___lambda331__gtk_widget_realize (GtkWidget* _sender, gpointer self) { - __lambda331_ (self); +static void ___lambda329__gtk_widget_realize (GtkWidget* _sender, gpointer self) { + __lambda329_ (self); } -static gboolean __lambda334_ (XnoiseTreeViewVideos* self) { +static gboolean __lambda332_ (XnoiseTreeViewVideos* self) { gboolean result = FALSE; GtkStyleContext* ctx = NULL; XnoiseMainWindow* _tmp0_ = NULL; @@ -882,9 +882,9 @@ } -static gboolean ___lambda334__gsource_func (gpointer self) { +static gboolean ___lambda332__gsource_func (gpointer self) { gboolean result; - result = __lambda334_ (self); + result = __lambda332_ (self); return result; } @@ -961,7 +961,7 @@ self->priv->tvm = _tmp15_; _tmp16_ = self->priv->tvm; gtk_tree_view_set_model (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_TREE_VIEW, GtkTreeView), G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GTK_TYPE_TREE_MODEL, GtkTreeModel)); - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_TREE_VIEW, GtkTreeView), "row-activated", (GCallback) ___lambda327__gtk_tree_view_row_activated, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_TREE_VIEW, GtkTreeView), "row-activated", (GCallback) ___lambda325__gtk_tree_view_row_activated, self, 0); gtk_drag_source_set (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), GDK_BUTTON1_MASK, XNOISE_TREE_VIEW_VIDEOS_src_target_entries, G_N_ELEMENTS (XNOISE_TREE_VIEW_VIDEOS_src_target_entries), GDK_ACTION_COPY); g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), "drag-begin", (GCallback) _xnoise_tree_view_videos_on_drag_begin_gtk_widget_drag_begin, self, 0); g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), "drag-data-get", (GCallback) _xnoise_tree_view_videos_on_drag_data_get_gtk_widget_drag_data_get, self, 0); @@ -970,15 +970,15 @@ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), "button-press-event", (GCallback) _xnoise_tree_view_videos_on_button_press_gtk_widget_button_press_event, self, 0); g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), "key-release-event", (GCallback) _xnoise_tree_view_videos_on_key_released_gtk_widget_key_release_event, self, 0); _tmp17_ = self->priv->ow; - g_signal_connect_object (_tmp17_, "size-allocate", (GCallback) ___lambda329__gtk_widget_size_allocate, self, G_CONNECT_AFTER); - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), "realize", (GCallback) ___lambda331__gtk_widget_realize, self, G_CONNECT_AFTER); + g_signal_connect_object (_tmp17_, "size-allocate", (GCallback) ___lambda327__gtk_widget_size_allocate, self, G_CONNECT_AFTER); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), "realize", (GCallback) ___lambda329__gtk_widget_realize, self, G_CONNECT_AFTER); gtk_style_context_save (context); gtk_style_context_get_background_color (context, GTK_STATE_FLAG_SELECTED, &_tmp18_); scolor = _tmp18_; gtk_style_context_add_class (context, GTK_STYLE_CLASS_PANE_SEPARATOR); gtk_style_context_get_background_color (context, GTK_STATE_FLAG_NORMAL, &_tmp19_); color = _tmp19_; - g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ___lambda334__gsource_func, g_object_ref (self), g_object_unref); + g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ___lambda332__gsource_func, g_object_ref (self), g_object_unref); _tmp20_ = scolor; gtk_widget_override_background_color (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), GTK_STATE_FLAG_SELECTED, &_tmp20_); gtk_style_context_restore (context); @@ -1656,7 +1656,7 @@ } -static void _____lambda328_ (Block29Data* _data29_) { +static void _____lambda326_ (Block29Data* _data29_) { Block28Data* _data28_; XnoiseTreeViewVideos * self; XnoiseAction* _tmp0_ = NULL; @@ -1680,8 +1680,8 @@ } -static void ______lambda328__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { - _____lambda328_ (self); +static void ______lambda326__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { + _____lambda326_ (self); } @@ -1819,7 +1819,7 @@ _tmp36_ = _tmp35_->info; gtk_menu_item_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GTK_TYPE_MENU_ITEM, GtkMenuItem), _tmp36_); _tmp37_ = menu_item; - g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GTK_TYPE_MENU_ITEM, GtkMenuItem), "activate", (GCallback) ______lambda328__gtk_menu_item_activate, block29_data_ref (_data29_), (GClosureNotify) block29_data_unref, 0); + g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GTK_TYPE_MENU_ITEM, GtkMenuItem), "activate", (GCallback) ______lambda326__gtk_menu_item_activate, block29_data_ref (_data29_), (GClosureNotify) block29_data_unref, 0); _tmp38_ = rightmenu; _tmp39_ = menu_item; gtk_menu_shell_append (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GTK_TYPE_MENU_SHELL, GtkMenuShell), (GtkWidget*) G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GTK_TYPE_MENU_ITEM, GtkMenuItem)); diff -Nru xnoise-0.2.20/libxnoise/ExtDev/AudioPlayer/xnoise-audio-item-handler.c xnoise-0.2.21/libxnoise/ExtDev/AudioPlayer/xnoise-audio-item-handler.c --- xnoise-0.2.20/libxnoise/ExtDev/AudioPlayer/xnoise-audio-item-handler.c 2013-12-11 11:24:22.000000000 +0000 +++ xnoise-0.2.21/libxnoise/ExtDev/AudioPlayer/xnoise-audio-item-handler.c 2014-01-27 09:32:55.000000000 +0000 @@ -704,7 +704,7 @@ static Block32Data* block32_data_ref (Block32Data* _data32_); static void block32_data_unref (void * _userdata_); GType xnoise_main_window_get_type (void) G_GNUC_CONST; -static void ___lambda422_ (Block32Data* _data32_, GtkDialog* s, gint response_id); +static void ___lambda420_ (Block32Data* _data32_, GtkDialog* s, gint response_id); static void xnoise_handler_player_device_delete_from_database (XnoiseHandlerPlayerDevice* self, XnoiseItem* item); gpointer xnoise_worker_job_ref (gpointer instance); void xnoise_worker_job_unref (gpointer instance); @@ -721,8 +721,8 @@ XnoiseWorkerJob* xnoise_worker_job_construct (GType object_type, XnoiseWorkerExecutionType execution_type, XnoiseWorkerWorkFunc func, void* func_target, XnoiseWorkerPriority priority, XnoiseWorkerFinishFunc finish_func, void* finish_func_target); GType xnoise_worker_get_type (void) G_GNUC_CONST; void xnoise_worker_push_job (XnoiseWorker* self, XnoiseWorkerJob* j); -static void ____lambda422__gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self); -static void ____lambda424_ (Block32Data* _data32_, GtkDialog* s, gint response_id); +static void ____lambda420__gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self); +static void ____lambda422_ (Block32Data* _data32_, GtkDialog* s, gint response_id); static void _xnoise_item_free0_ (gpointer var); gpointer xnoise_track_data_ref (gpointer instance); void xnoise_track_data_unref (gpointer instance); @@ -738,12 +738,12 @@ GType xnoise_collection_sort_mode_get_type (void) G_GNUC_CONST; XnoiseTrackData** xnoise_data_source_get_trackdata_for_album (XnoiseDataSource* self, const gchar* searchtext, XnoiseCollectionSortMode sort_mode, GHashTable* items, int* result_length1); #define XNOISE_RESOURCES_EMPTYSTRING "" -static void _____lambda424__gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self); -static void _____lambda425_ (Block32Data* _data32_, GtkDialog* s, gint response_id); +static void _____lambda422__gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self); +static void _____lambda423_ (Block32Data* _data32_, GtkDialog* s, gint response_id); XnoiseTrackData** xnoise_data_source_get_trackdata_for_albumartist (XnoiseDataSource* self, const gchar* searchtext, XnoiseCollectionSortMode sort_mode, GHashTable* items, int* result_length1); -static void ______lambda425__gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self); -static gboolean __lambda426_ (XnoiseHandlerPlayerDevice* self); -static gboolean ___lambda426__gsource_func (gpointer self); +static void ______lambda423__gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self); +static gboolean __lambda424_ (XnoiseHandlerPlayerDevice* self); +static gboolean ___lambda424__gsource_func (gpointer self); static gboolean xnoise_handler_player_device_delete_from_database_cb (XnoiseHandlerPlayerDevice* self, XnoiseWorkerJob* job); static gboolean _xnoise_handler_player_device_delete_from_database_cb_xnoise_worker_work_func (XnoiseWorkerJob* jb, gpointer self); gpointer xnoise_file_data_ref (gpointer instance); @@ -759,12 +759,12 @@ void xnoise_dnd_data_copy (const XnoiseDndData* self, XnoiseDndData* dest); void xnoise_dnd_data_destroy (XnoiseDndData* self); void xnoise_ext_dev_audio_player_temp_db_remove_uri (XnoiseExtDevAudioPlayerTempDb* self, const gchar* uri); -static gboolean __lambda423_ (XnoiseHandlerPlayerDevice* self); +static gboolean __lambda421_ (XnoiseHandlerPlayerDevice* self); GType xnoise_imain_view_get_type (void) G_GNUC_CONST; GType xnoise_ext_dev_player_tree_view_get_type (void) G_GNUC_CONST; GType xnoise_ext_dev_player_tree_store_get_type (void) G_GNUC_CONST; void xnoise_ext_dev_player_tree_store_filter (XnoiseExtDevPlayerTreeStore* self); -static gboolean ___lambda423__gsource_func (gpointer self); +static gboolean ___lambda421__gsource_func (gpointer self); GType xnoise_tree_queryable_get_type (void) G_GNUC_CONST; static Block33Data* block33_data_ref (Block33Data* _data33_); static void _vala_XnoiseItem_array_free (XnoiseItem* array, gint array_length); @@ -775,7 +775,7 @@ GList* xnoise_tree_queryable_query_selection (XnoiseTreeQueryable* self); GtkTreeModel* xnoise_tree_queryable_get_queryable_model (XnoiseTreeQueryable* self); void xnoise_item_init (XnoiseItem *self, XnoiseItemType _type, const gchar* _uri, gint32 _db_id); -static gboolean __lambda418_ (Block33Data* _data33_); +static gboolean __lambda416_ (Block33Data* _data33_); GType xnoise_user_info_get_type (void) G_GNUC_CONST; GType xnoise_user_info_removal_type_get_type (void) G_GNUC_CONST; GType xnoise_user_info_content_class_get_type (void) G_GNUC_CONST; @@ -786,7 +786,7 @@ static void _vala_array_add51 (XnoiseItem** array, int* length, int* size, const XnoiseItem* value); static XnoiseItem* _vala_array_dup3 (XnoiseItem* self, int length); void xnoise_worker_job_set_arg (XnoiseWorkerJob* self, const gchar* name, GValue* val); -static gboolean ___lambda418__gsource_func (gpointer self); +static gboolean ___lambda416__gsource_func (gpointer self); static gboolean xnoise_handler_player_device_copy_files_job (XnoiseHandlerPlayerDevice* self, XnoiseWorkerJob* job); static gboolean _xnoise_handler_player_device_copy_files_job_xnoise_worker_work_func (XnoiseWorkerJob* jb, gpointer self); GValue* xnoise_worker_job_get_arg (XnoiseWorkerJob* self, const gchar* name); @@ -805,13 +805,13 @@ static void block34_data_unref (void * _userdata_); guint64 xnoise_ext_dev_player_device_get_free_space_size (XnoiseExtDevPlayerDevice* self); static void _vala_array_add56 (gchar*** array, int* length, int* size, gchar* value); -static gboolean __lambda419_ (Block34Data* _data34_); -static gboolean ___lambda419__gsource_func (gpointer self); -static gboolean __lambda420_ (Block34Data* _data34_); +static gboolean __lambda417_ (Block34Data* _data34_); +static gboolean ___lambda417__gsource_func (gpointer self); +static gboolean __lambda418_ (Block34Data* _data34_); void xnoise_user_info_popdown (XnoiseUserInfo* self, guint id); -static gboolean ___lambda420__gsource_func (gpointer self); -static gboolean __lambda421_ (XnoiseHandlerPlayerDevice* self); -static gboolean ___lambda421__gsource_func (gpointer self); +static gboolean ___lambda418__gsource_func (gpointer self); +static gboolean __lambda419_ (XnoiseHandlerPlayerDevice* self); +static gboolean ___lambda419__gsource_func (gpointer self); static void xnoise_handler_player_device_finalize (GObject* obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -1063,7 +1063,7 @@ } -static void ___lambda422_ (Block32Data* _data32_, GtkDialog* s, gint response_id) { +static void ___lambda420_ (Block32Data* _data32_, GtkDialog* s, gint response_id) { XnoiseHandlerPlayerDevice * self; gint _tmp0_ = 0; GtkDialog* _tmp12_ = NULL; @@ -1130,8 +1130,8 @@ } -static void ____lambda422__gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) { - ___lambda422_ (self, _sender, response_id); +static void ____lambda420__gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) { + ___lambda420_ (self, _sender, response_id); } @@ -1150,7 +1150,7 @@ } -static void ____lambda424_ (Block32Data* _data32_, GtkDialog* s, gint response_id) { +static void ____lambda422_ (Block32Data* _data32_, GtkDialog* s, gint response_id) { XnoiseHandlerPlayerDevice * self; gint _tmp0_ = 0; GtkDialog* _tmp30_ = NULL; @@ -1283,12 +1283,12 @@ } -static void _____lambda424__gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) { - ____lambda424_ (self, _sender, response_id); +static void _____lambda422__gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) { + ____lambda422_ (self, _sender, response_id); } -static void _____lambda425_ (Block32Data* _data32_, GtkDialog* s, gint response_id) { +static void _____lambda423_ (Block32Data* _data32_, GtkDialog* s, gint response_id) { XnoiseHandlerPlayerDevice * self; gint _tmp0_ = 0; GtkDialog* _tmp30_ = NULL; @@ -1421,12 +1421,12 @@ } -static void ______lambda425__gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) { - _____lambda425_ (self, _sender, response_id); +static void ______lambda423__gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) { + _____lambda423_ (self, _sender, response_id); } -static gboolean __lambda426_ (XnoiseHandlerPlayerDevice* self) { +static gboolean __lambda424_ (XnoiseHandlerPlayerDevice* self) { gboolean result = FALSE; XnoiseExtDevPlayerDevice* _tmp0_ = NULL; _tmp0_ = self->audio_player_device; @@ -1436,9 +1436,9 @@ } -static gboolean ___lambda426__gsource_func (gpointer self) { +static gboolean ___lambda424__gsource_func (gpointer self) { gboolean result; - result = __lambda426_ (self); + result = __lambda424_ (self); return result; } @@ -1494,7 +1494,7 @@ g_object_ref_sink (_tmp12_); msg = _tmp12_; _tmp13_ = msg; - g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GTK_TYPE_DIALOG, GtkDialog), "response", (GCallback) ____lambda422__gtk_dialog_response, block32_data_ref (_data32_), (GClosureNotify) block32_data_unref, 0); + g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GTK_TYPE_DIALOG, GtkDialog), "response", (GCallback) ____lambda420__gtk_dialog_response, block32_data_ref (_data32_), (GClosureNotify) block32_data_unref, 0); _tmp14_ = msg; gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GTK_TYPE_DIALOG, GtkDialog)); _g_object_unref0 (msg); @@ -1516,7 +1516,7 @@ g_object_ref_sink (_tmp19_); msg = _tmp19_; _tmp20_ = msg; - g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GTK_TYPE_DIALOG, GtkDialog), "response", (GCallback) _____lambda424__gtk_dialog_response, block32_data_ref (_data32_), (GClosureNotify) block32_data_unref, 0); + g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GTK_TYPE_DIALOG, GtkDialog), "response", (GCallback) _____lambda422__gtk_dialog_response, block32_data_ref (_data32_), (GClosureNotify) block32_data_unref, 0); _tmp21_ = msg; gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GTK_TYPE_DIALOG, GtkDialog)); _g_object_unref0 (msg); @@ -1538,14 +1538,14 @@ g_object_ref_sink (_tmp26_); msg = _tmp26_; _tmp27_ = msg; - g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GTK_TYPE_DIALOG, GtkDialog), "response", (GCallback) ______lambda425__gtk_dialog_response, block32_data_ref (_data32_), (GClosureNotify) block32_data_unref, 0); + g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GTK_TYPE_DIALOG, GtkDialog), "response", (GCallback) ______lambda423__gtk_dialog_response, block32_data_ref (_data32_), (GClosureNotify) block32_data_unref, 0); _tmp28_ = msg; gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GTK_TYPE_DIALOG, GtkDialog)); _g_object_unref0 (msg); } } } - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda426__gsource_func, g_object_ref (self), g_object_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda424__gsource_func, g_object_ref (self), g_object_unref); block32_data_unref (_data32_); _data32_ = NULL; } @@ -1616,7 +1616,7 @@ } -static gboolean __lambda423_ (XnoiseHandlerPlayerDevice* self) { +static gboolean __lambda421_ (XnoiseHandlerPlayerDevice* self) { gboolean result = FALSE; XnoiseExtDevPlayerDevice* _tmp0_ = NULL; XnoiseExtDevPlayerMainView* _tmp1_ = NULL; @@ -1632,9 +1632,9 @@ } -static gboolean ___lambda423__gsource_func (gpointer self) { +static gboolean ___lambda421__gsource_func (gpointer self) { gboolean result; - result = __lambda423_ (self); + result = __lambda421_ (self); return result; } @@ -1643,7 +1643,7 @@ gboolean result = FALSE; g_return_val_if_fail (XNOISE_IS_HANDLER_PLAYER_DEVICE (self), FALSE); g_return_val_if_fail (XNOISE_WORKER_IS_JOB (job), FALSE); - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda423__gsource_func, g_object_ref (self), g_object_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda421__gsource_func, g_object_ref (self), g_object_unref); result = FALSE; return result; } @@ -1733,7 +1733,7 @@ } -static gboolean __lambda418_ (Block33Data* _data33_) { +static gboolean __lambda416_ (Block33Data* _data33_) { XnoiseHandlerPlayerDevice * self; gboolean result = FALSE; XnoiseUserInfo* _tmp0_ = NULL; @@ -1822,9 +1822,9 @@ } -static gboolean ___lambda418__gsource_func (gpointer self) { +static gboolean ___lambda416__gsource_func (gpointer self) { gboolean result; - result = __lambda418_ (self); + result = __lambda416_ (self); return result; } @@ -1929,7 +1929,7 @@ _data33_->items_length1 = 0; _data33_->_items_size_ = _data33_->items_length1; _data33_->msg_id = (guint) 0; - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda418__gsource_func, block33_data_ref (_data33_), block33_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda416__gsource_func, block33_data_ref (_data33_), block33_data_unref); block33_data_unref (_data33_); _data33_ = NULL; } @@ -2358,7 +2358,7 @@ } -static gboolean __lambda419_ (Block34Data* _data34_) { +static gboolean __lambda417_ (Block34Data* _data34_) { XnoiseHandlerPlayerDevice * self; gboolean result = FALSE; GCancellable* _tmp0_ = NULL; @@ -2385,14 +2385,14 @@ } -static gboolean ___lambda419__gsource_func (gpointer self) { +static gboolean ___lambda417__gsource_func (gpointer self) { gboolean result; - result = __lambda419_ (self); + result = __lambda417_ (self); return result; } -static gboolean __lambda420_ (Block34Data* _data34_) { +static gboolean __lambda418_ (Block34Data* _data34_) { XnoiseHandlerPlayerDevice * self; gboolean result = FALSE; guint msg_id = 0U; @@ -2419,14 +2419,14 @@ } -static gboolean ___lambda420__gsource_func (gpointer self) { +static gboolean ___lambda418__gsource_func (gpointer self) { gboolean result; - result = __lambda420_ (self); + result = __lambda418_ (self); return result; } -static gboolean __lambda421_ (XnoiseHandlerPlayerDevice* self) { +static gboolean __lambda419_ (XnoiseHandlerPlayerDevice* self) { gboolean result = FALSE; XnoiseExtDevPlayerDevice* _tmp0_ = NULL; _tmp0_ = self->audio_player_device; @@ -2436,9 +2436,9 @@ } -static gboolean ___lambda421__gsource_func (gpointer self) { +static gboolean ___lambda419__gsource_func (gpointer self) { gboolean result; - result = __lambda421_ (self); + result = __lambda419_ (self); return result; } @@ -2666,9 +2666,9 @@ } } } - g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 200, ___lambda419__gsource_func, block34_data_ref (_data34_), block34_data_unref); - g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ___lambda420__gsource_func, block34_data_ref (_data34_), block34_data_unref); - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda421__gsource_func, g_object_ref (self), g_object_unref); + g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 200, ___lambda417__gsource_func, block34_data_ref (_data34_), block34_data_unref); + g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ___lambda418__gsource_func, block34_data_ref (_data34_), block34_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda419__gsource_func, g_object_ref (self), g_object_unref); result = FALSE; _g_object_unref0 (dest_base); block34_data_unref (_data34_); diff -Nru xnoise-0.2.20/libxnoise/ExtDev/AudioPlayer/xnoise-audio-player-main-view.c xnoise-0.2.21/libxnoise/ExtDev/AudioPlayer/xnoise-audio-player-main-view.c --- xnoise-0.2.20/libxnoise/ExtDev/AudioPlayer/xnoise-audio-player-main-view.c 2013-12-11 11:24:22.000000000 +0000 +++ xnoise-0.2.21/libxnoise/ExtDev/AudioPlayer/xnoise-audio-player-main-view.c 2014-01-27 09:32:55.000000000 +0000 @@ -204,7 +204,7 @@ XnoiseExtDevPlayerMainView* xnoise_ext_dev_player_main_view_construct (GType object_type, XnoiseExtDevPlayerDevice* audio_player_device, GCancellable* cancellable); DeviceMainView* device_main_view_construct (GType object_type, XnoiseExtDevDevice* device, GCancellable* cancellable); static void xnoise_ext_dev_player_main_view_setup_widgets (XnoiseExtDevPlayerMainView* self); -static void __lambda417_ (XnoiseExtDevPlayerMainView* self); +static void __lambda415_ (XnoiseExtDevPlayerMainView* self); gpointer xnoise_worker_job_ref (gpointer instance); void xnoise_worker_job_unref (gpointer instance); GParamSpec* xnoise_worker_param_spec_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -220,7 +220,7 @@ XnoiseWorkerJob* xnoise_worker_job_construct (GType object_type, XnoiseWorkerExecutionType execution_type, XnoiseWorkerWorkFunc func, void* func_target, XnoiseWorkerPriority priority, XnoiseWorkerFinishFunc finish_func, void* finish_func_target); GType xnoise_worker_get_type (void) G_GNUC_CONST; void xnoise_worker_push_job (XnoiseWorker* self, XnoiseWorkerJob* j); -static void ___lambda417__xnoise_ext_dev_player_device_sign_update_filesystem (XnoiseExtDevPlayerDevice* _sender, gpointer self); +static void ___lambda415__xnoise_ext_dev_player_device_sign_update_filesystem (XnoiseExtDevPlayerDevice* _sender, gpointer self); static gchar* xnoise_ext_dev_player_main_view_real_get_view_name (DeviceMainView* base); gchar* xnoise_ext_dev_device_get_identifier (XnoiseExtDevDevice* self); XnoiseExtDevPlayerTreeView* xnoise_ext_dev_player_main_view_get_tree_view (XnoiseExtDevPlayerMainView* self); @@ -228,15 +228,15 @@ static Block35Data* block35_data_ref (Block35Data* _data35_); static void block35_data_unref (void * _userdata_); gchar* device_main_view_get_localized_name (DeviceMainView* self); -static void __lambda416_ (Block35Data* _data35_); +static void __lambda414_ (Block35Data* _data35_); gboolean xnoise_ext_dev_device_get_in_loading (XnoiseExtDevDevice* self); -static void ___lambda416__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); +static void ___lambda414__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); static Block36Data* block36_data_ref (Block36Data* _data36_); static void block36_data_unref (void * _userdata_); gchar* xnoise_ext_dev_player_device_get_free_space_size_formatted (XnoiseExtDevPlayerDevice* self); gchar* xnoise_ext_dev_player_device_get_filesystem_size_formatted (XnoiseExtDevPlayerDevice* self); -static gboolean __lambda415_ (Block36Data* _data36_); -static gboolean ___lambda415__gsource_func (gpointer self); +static gboolean __lambda413_ (Block36Data* _data36_); +static gboolean ___lambda413__gsource_func (gpointer self); static void xnoise_ext_dev_player_main_view_finalize (GObject* obj); @@ -247,7 +247,7 @@ } -static void __lambda417_ (XnoiseExtDevPlayerMainView* self) { +static void __lambda415_ (XnoiseExtDevPlayerMainView* self) { XnoiseWorkerJob* job = NULL; XnoiseWorkerJob* _tmp0_ = NULL; XnoiseWorker* _tmp1_ = NULL; @@ -260,8 +260,8 @@ } -static void ___lambda417__xnoise_ext_dev_player_device_sign_update_filesystem (XnoiseExtDevPlayerDevice* _sender, gpointer self) { - __lambda417_ (self); +static void ___lambda415__xnoise_ext_dev_player_device_sign_update_filesystem (XnoiseExtDevPlayerDevice* _sender, gpointer self) { + __lambda415_ (self); } @@ -280,7 +280,7 @@ self->audio_player_device = _tmp2_; xnoise_ext_dev_player_main_view_setup_widgets (self); _tmp3_ = audio_player_device; - g_signal_connect_object (_tmp3_, "sign-update-filesystem", (GCallback) ___lambda417__xnoise_ext_dev_player_device_sign_update_filesystem, self, 0); + g_signal_connect_object (_tmp3_, "sign-update-filesystem", (GCallback) ___lambda415__xnoise_ext_dev_player_device_sign_update_filesystem, self, 0); return self; } @@ -329,7 +329,7 @@ } -static void __lambda416_ (Block35Data* _data35_) { +static void __lambda414_ (Block35Data* _data35_) { XnoiseExtDevPlayerMainView * self; XnoiseExtDevPlayerDevice* _tmp0_ = NULL; gboolean _tmp1_ = FALSE; @@ -350,8 +350,8 @@ } -static void ___lambda416__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { - __lambda416_ (self); +static void ___lambda414__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { + __lambda414_ (self); } @@ -435,7 +435,7 @@ gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget)); gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_data35_->spinner, GTK_TYPE_WIDGET, GtkWidget)); _tmp18_ = self->audio_player_device; - g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, G_TYPE_OBJECT, GObject), "notify::in-loading", (GCallback) ___lambda416__g_object_notify, block35_data_ref (_data35_), (GClosureNotify) block35_data_unref, 0); + g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, G_TYPE_OBJECT, GObject), "notify::in-loading", (GCallback) ___lambda414__g_object_notify, block35_data_ref (_data35_), (GClosureNotify) block35_data_unref, 0); gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_CONTAINER, GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (box, GTK_TYPE_WIDGET, GtkWidget)); _g_object_unref0 (sw); _xnoise_worker_job_unref0 (job); @@ -465,7 +465,7 @@ } -static gboolean __lambda415_ (Block36Data* _data36_) { +static gboolean __lambda413_ (Block36Data* _data36_) { XnoiseExtDevPlayerMainView * self; gboolean result = FALSE; GtkLabel* _tmp0_ = NULL; @@ -479,9 +479,9 @@ } -static gboolean ___lambda415__gsource_func (gpointer self) { +static gboolean ___lambda413__gsource_func (gpointer self) { gboolean result; - result = __lambda415_ (self); + result = __lambda413_ (self); return result; } @@ -540,7 +540,7 @@ _g_free0 (_tmp6_); _g_free0 (_tmp4_); _data36_->info = _tmp16_; - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda415__gsource_func, block36_data_ref (_data36_), block36_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda413__gsource_func, block36_data_ref (_data36_), block36_data_unref); result = FALSE; block36_data_unref (_data36_); _data36_ = NULL; diff -Nru xnoise-0.2.20/libxnoise/ExtDev/AudioPlayer/xnoise-audio-player-temp-db.c xnoise-0.2.21/libxnoise/ExtDev/AudioPlayer/xnoise-audio-player-temp-db.c --- xnoise-0.2.20/libxnoise/ExtDev/AudioPlayer/xnoise-audio-player-temp-db.c 2013-12-11 11:24:23.000000000 +0000 +++ xnoise-0.2.21/libxnoise/ExtDev/AudioPlayer/xnoise-audio-player-temp-db.c 2014-01-27 09:32:56.000000000 +0000 @@ -341,10 +341,10 @@ static gint xnoise_ext_dev_audio_player_temp_db_handle_genre (XnoiseExtDevAudioPlayerTempDb* self, gchar** genre); static Block46Data* block46_data_ref (Block46Data* _data46_); static void block46_data_unref (void * _userdata_); -static gboolean _____lambda398_ (Block46Data* _data46_); -static gboolean ______lambda398__gsource_func (gpointer self); -static gboolean __lambda399_ (XnoiseExtDevAudioPlayerTempDb* self); -static gboolean ___lambda399__gsource_func (gpointer self); +static gboolean _____lambda396_ (Block46Data* _data46_); +static gboolean ______lambda396__gsource_func (gpointer self); +static gboolean __lambda397_ (XnoiseExtDevAudioPlayerTempDb* self); +static gboolean ___lambda397__gsource_func (gpointer self); static void xnoise_ext_dev_audio_player_temp_db_setup_target_handle (XnoiseExtDevAudioPlayerTempDb* self); static gboolean xnoise_ext_dev_audio_player_temp_db_exec_stmnt_string (XnoiseExtDevAudioPlayerTempDb* self, const gchar* statement); void xnoise_ext_dev_audio_player_temp_db_remove_uri (XnoiseExtDevAudioPlayerTempDb* self, const gchar* uri); @@ -633,7 +633,7 @@ } -static gboolean _____lambda398_ (Block46Data* _data46_) { +static gboolean _____lambda396_ (Block46Data* _data46_) { XnoiseExtDevAudioPlayerTempDb * self; gboolean result = FALSE; gint _tmp0_ = 0; @@ -645,14 +645,14 @@ } -static gboolean ______lambda398__gsource_func (gpointer self) { +static gboolean ______lambda396__gsource_func (gpointer self) { gboolean result; - result = _____lambda398_ (self); + result = _____lambda396_ (self); return result; } -static gboolean __lambda399_ (XnoiseExtDevAudioPlayerTempDb* self) { +static gboolean __lambda397_ (XnoiseExtDevAudioPlayerTempDb* self) { gboolean result = FALSE; GCancellable* _tmp0_ = NULL; gboolean _tmp1_ = FALSE; @@ -670,9 +670,9 @@ } -static gboolean ___lambda399__gsource_func (gpointer self) { +static gboolean ___lambda397__gsource_func (gpointer self) { gboolean result; - result = __lambda399_ (self); + result = __lambda397_ (self); return result; } @@ -954,7 +954,7 @@ _data46_->self = g_object_ref (self); _tmp89_ = self->priv->count; _data46_->cz = _tmp89_; - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ______lambda398__gsource_func, block46_data_ref (_data46_), block46_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ______lambda396__gsource_func, block46_data_ref (_data46_), block46_data_unref); block46_data_unref (_data46_); _data46_ = NULL; } @@ -962,7 +962,7 @@ } } } - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda399__gsource_func, g_object_ref (self), g_object_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda397__gsource_func, g_object_ref (self), g_object_unref); } diff -Nru xnoise-0.2.20/libxnoise/ExtDev/AudioPlayer/xnoise-audio-player-tree-store.c xnoise-0.2.21/libxnoise/ExtDev/AudioPlayer/xnoise-audio-player-tree-store.c --- xnoise-0.2.20/libxnoise/ExtDev/AudioPlayer/xnoise-audio-player-tree-store.c 2013-12-11 11:24:23.000000000 +0000 +++ xnoise-0.2.21/libxnoise/ExtDev/AudioPlayer/xnoise-audio-player-tree-store.c 2014-01-27 09:32:55.000000000 +0000 @@ -506,12 +506,12 @@ void xnoise_dnd_data_destroy (XnoiseDndData* self); GType xnoise_worker_get_type (void) G_GNUC_CONST; void xnoise_worker_push_job (XnoiseWorker* self, XnoiseWorkerJob* j); -static gboolean __lambda403_ (XnoiseExtDevPlayerTreeStore* self); +static gboolean __lambda401_ (XnoiseExtDevPlayerTreeStore* self); void xnoise_ext_dev_player_tree_store_filter (XnoiseExtDevPlayerTreeStore* self); -static gboolean ___lambda403__gsource_func (gpointer self); -static gboolean __lambda400_ (XnoiseExtDevPlayerTreeStore* self); +static gboolean ___lambda401__gsource_func (gpointer self); +static gboolean __lambda398_ (XnoiseExtDevPlayerTreeStore* self); void xnoise_ext_dev_device_set_in_loading (XnoiseExtDevDevice* self, gboolean value); -static gboolean ___lambda400__gsource_func (gpointer self); +static gboolean ___lambda398__gsource_func (gpointer self); static gboolean xnoise_ext_dev_player_tree_store_read_media_folder_job (XnoiseExtDevPlayerTreeStore* self, XnoiseWorkerJob* job); static gboolean _xnoise_ext_dev_player_tree_store_read_media_folder_job_xnoise_worker_work_func (XnoiseWorkerJob* jb, gpointer self); gboolean xnoise_worker_is_same_thread (XnoiseWorker* self); @@ -520,8 +520,8 @@ static void _vala_array_add58 (XnoiseTrackData*** array, int* length, int* size, XnoiseTrackData* value); void xnoise_worker_job_set_arg (XnoiseWorkerJob* self, const gchar* name, GValue* val); GValue* xnoise_worker_job_get_arg (XnoiseWorkerJob* self, const gchar* name); -static gboolean __lambda401_ (XnoiseExtDevPlayerTreeStore* self); -static gboolean ___lambda401__gsource_func (gpointer self); +static gboolean __lambda399_ (XnoiseExtDevPlayerTreeStore* self); +static gboolean ___lambda399__gsource_func (gpointer self); void xnoise_ext_dev_audio_player_temp_db_begin_transaction (XnoiseExtDevAudioPlayerTempDb* self); void xnoise_ext_dev_audio_player_temp_db_insert_tracks (XnoiseExtDevAudioPlayerTempDb* self, XnoiseTrackData*** tda, int* tda_length1); void xnoise_ext_dev_audio_player_temp_db_commit_transaction (XnoiseExtDevAudioPlayerTempDb* self); @@ -545,26 +545,26 @@ GType xnoise_global_access_get_type (void) G_GNUC_CONST; XnoiseCollectionSortMode xnoise_global_access_get_collection_sort_mode (XnoiseGlobalAccess* self); static void _vala_XnoiseItem_array_free (XnoiseItem* array, gint array_length); -static gboolean __lambda404_ (Block37Data* _data37_); +static gboolean __lambda402_ (Block37Data* _data37_); GFile* xnoise_get_albumimage_for_artistalbum (const gchar* artist, const gchar* album, const gchar* size); GdkPixbuf* xnoise_icon_repo_get_album_icon (XnoiseIconRepo* self); static gboolean xnoise_ext_dev_player_tree_store_populate_title_job (XnoiseExtDevPlayerTreeStore* self, XnoiseWorkerJob* job); static gboolean _xnoise_ext_dev_player_tree_store_populate_title_job_xnoise_worker_work_func (XnoiseWorkerJob* jb, gpointer self); -static gboolean ___lambda404__gsource_func (gpointer self); +static gboolean ___lambda402__gsource_func (gpointer self); static Block38Data* block38_data_ref (Block38Data* _data38_); static void block38_data_unref (void * _userdata_); XnoiseTrackData** xnoise_data_source_get_trackdata_for_album (XnoiseDataSource* self, const gchar* searchtext, XnoiseCollectionSortMode sort_mode, GHashTable* items, int* result_length1); -static gboolean __lambda405_ (Block38Data* _data38_); +static gboolean __lambda403_ (Block38Data* _data38_); GdkPixbuf* xnoise_icon_repo_get_title_icon (XnoiseIconRepo* self); -static gboolean ___lambda405__gsource_func (gpointer self); +static gboolean ___lambda403__gsource_func (gpointer self); static gboolean xnoise_ext_dev_player_tree_store_populate_artists_job (XnoiseExtDevPlayerTreeStore* self, XnoiseWorkerJob* job); static gboolean _xnoise_ext_dev_player_tree_store_populate_artists_job_xnoise_worker_work_func (XnoiseWorkerJob* jb, gpointer self); static Block39Data* block39_data_ref (Block39Data* _data39_); static void block39_data_unref (void * _userdata_); XnoiseItem* xnoise_data_source_get_artists (XnoiseDataSource* self, const gchar* searchtext, XnoiseCollectionSortMode sort_mode, GHashTable* items, int* result_length1); -static gboolean __lambda402_ (Block39Data* _data39_); +static gboolean __lambda400_ (Block39Data* _data39_); GdkPixbuf* xnoise_icon_repo_get_artist_icon (XnoiseIconRepo* self); -static gboolean ___lambda402__gsource_func (gpointer self); +static gboolean ___lambda400__gsource_func (gpointer self); static void xnoise_ext_dev_player_tree_store_finalize (GObject* obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -888,7 +888,7 @@ } -static gboolean __lambda403_ (XnoiseExtDevPlayerTreeStore* self) { +static gboolean __lambda401_ (XnoiseExtDevPlayerTreeStore* self) { gboolean result = FALSE; GCancellable* _tmp0_ = NULL; gboolean _tmp1_ = FALSE; @@ -906,9 +906,9 @@ } -static gboolean ___lambda403__gsource_func (gpointer self) { +static gboolean ___lambda401__gsource_func (gpointer self) { gboolean result; - result = __lambda403_ (self); + result = __lambda401_ (self); return result; } @@ -923,12 +923,12 @@ _tmp1_ = self->priv->update_source; g_source_remove (_tmp1_); } - _tmp2_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 200, ___lambda403__gsource_func, g_object_ref (self), g_object_unref); + _tmp2_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 200, ___lambda401__gsource_func, g_object_ref (self), g_object_unref); self->priv->update_source = _tmp2_; } -static gboolean __lambda400_ (XnoiseExtDevPlayerTreeStore* self) { +static gboolean __lambda398_ (XnoiseExtDevPlayerTreeStore* self) { gboolean result = FALSE; XnoiseExtDevPlayerDevice* _tmp0_ = NULL; _tmp0_ = self->priv->audio_player_device; @@ -938,9 +938,9 @@ } -static gboolean ___lambda400__gsource_func (gpointer self) { +static gboolean ___lambda398__gsource_func (gpointer self) { gboolean result; - result = __lambda400_ (self); + result = __lambda398_ (self); return result; } @@ -958,7 +958,7 @@ XnoiseWorkerJob* _tmp1_ = NULL; XnoiseWorker* _tmp2_ = NULL; g_return_if_fail (XNOISE_EXT_DEV_IS_PLAYER_TREE_STORE (self)); - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda400__gsource_func, g_object_ref (self), g_object_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda398__gsource_func, g_object_ref (self), g_object_unref); _tmp0_ = g_new0 (XnoiseTrackData*, 0 + 1); self->priv->tda = (_vala_array_free (self->priv->tda, self->priv->tda_length1, (GDestroyNotify) xnoise_track_data_unref), NULL); self->priv->tda = _tmp0_; @@ -1372,7 +1372,7 @@ } -static gboolean __lambda401_ (XnoiseExtDevPlayerTreeStore* self) { +static gboolean __lambda399_ (XnoiseExtDevPlayerTreeStore* self) { gboolean result = FALSE; XnoiseExtDevPlayerDevice* _tmp0_ = NULL; GCancellable* _tmp1_ = NULL; @@ -1391,9 +1391,9 @@ } -static gboolean ___lambda401__gsource_func (gpointer self) { +static gboolean ___lambda399__gsource_func (gpointer self) { gboolean result; - result = __lambda401_ (self); + result = __lambda399_ (self); return result; } @@ -1401,7 +1401,7 @@ static void xnoise_ext_dev_player_tree_store_end_import (XnoiseExtDevPlayerTreeStore* self, XnoiseWorkerJob* job) { g_return_if_fail (XNOISE_EXT_DEV_IS_PLAYER_TREE_STORE (self)); g_return_if_fail (XNOISE_WORKER_IS_JOB (job)); - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda401__gsource_func, g_object_ref (self), g_object_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda399__gsource_func, g_object_ref (self), g_object_unref); } @@ -1782,7 +1782,7 @@ } -static gboolean __lambda404_ (Block37Data* _data37_) { +static gboolean __lambda402_ (Block37Data* _data37_) { XnoiseExtDevPlayerTreeStore * self; gboolean result = FALSE; GtkTreeRowReference* row_ref = NULL; @@ -2080,9 +2080,9 @@ } -static gboolean ___lambda404__gsource_func (gpointer self) { +static gboolean ___lambda402__gsource_func (gpointer self) { gboolean result; - result = __lambda404_ (self); + result = __lambda402_ (self); return result; } @@ -2152,7 +2152,7 @@ _tmp14_->items = (_vala_XnoiseItem_array_free (_tmp14_->items, _tmp14_->items_length1), NULL); _tmp14_->items = _tmp21_; _tmp14_->items_length1 = _tmp20_; - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda404__gsource_func, block37_data_ref (_data37_), block37_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda402__gsource_func, block37_data_ref (_data37_), block37_data_unref); result = FALSE; _g_hash_table_unref0 (item_ht); block37_data_unref (_data37_); @@ -2180,7 +2180,7 @@ } -static gboolean __lambda405_ (Block38Data* _data38_) { +static gboolean __lambda403_ (Block38Data* _data38_) { XnoiseExtDevPlayerTreeStore * self; gboolean result = FALSE; GtkTreeRowReference* row_ref = NULL; @@ -2287,9 +2287,9 @@ } -static gboolean ___lambda405__gsource_func (gpointer self) { +static gboolean ___lambda403__gsource_func (gpointer self) { gboolean result; - result = __lambda405_ (self); + result = __lambda403_ (self); return result; } @@ -2353,7 +2353,7 @@ _tmp14_->track_dat = (_vala_array_free (_tmp14_->track_dat, _tmp14_->track_dat_length1, (GDestroyNotify) xnoise_track_data_unref), NULL); _tmp14_->track_dat = _tmp18_; _tmp14_->track_dat_length1 = _tmp17_; - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda405__gsource_func, block38_data_ref (_data38_), block38_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda403__gsource_func, block38_data_ref (_data38_), block38_data_unref); result = FALSE; _g_hash_table_unref0 (item_ht); block38_data_unref (_data38_); @@ -2418,7 +2418,7 @@ } -static gboolean __lambda402_ (Block39Data* _data39_) { +static gboolean __lambda400_ (Block39Data* _data39_) { XnoiseExtDevPlayerTreeStore * self; gboolean result = FALSE; GtkTreeIter iter = {0}; @@ -2524,9 +2524,9 @@ } -static gboolean ___lambda402__gsource_func (gpointer self) { +static gboolean ___lambda400__gsource_func (gpointer self) { gboolean result; - result = __lambda402_ (self); + result = __lambda400_ (self); return result; } @@ -2571,7 +2571,7 @@ _tmp4_->items = (_vala_XnoiseItem_array_free (_tmp4_->items, _tmp4_->items_length1), NULL); _tmp4_->items = _tmp10_; _tmp4_->items_length1 = _tmp9_; - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda402__gsource_func, block39_data_ref (_data39_), block39_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda400__gsource_func, block39_data_ref (_data39_), block39_data_unref); result = FALSE; block39_data_unref (_data39_); _data39_ = NULL; diff -Nru xnoise-0.2.20/libxnoise/ExtDev/AudioPlayer/xnoise-audio-player-tree-view.c xnoise-0.2.21/libxnoise/ExtDev/AudioPlayer/xnoise-audio-player-tree-view.c --- xnoise-0.2.20/libxnoise/ExtDev/AudioPlayer/xnoise-audio-player-tree-view.c 2013-12-11 11:24:23.000000000 +0000 +++ xnoise-0.2.21/libxnoise/ExtDev/AudioPlayer/xnoise-audio-player-tree-view.c 2014-01-27 09:32:55.000000000 +0000 @@ -571,14 +571,14 @@ static void block40_data_unref (void * _userdata_); guint64 xnoise_ext_dev_player_device_get_free_space_size (XnoiseExtDevPlayerDevice* self); static void _vala_array_add60 (gchar*** array, int* length, int* size, gchar* value); -static gboolean __lambda412_ (Block40Data* _data40_); -static gboolean ___lambda412__gsource_func (gpointer self); -static gboolean __lambda413_ (Block40Data* _data40_); +static gboolean __lambda410_ (Block40Data* _data40_); +static gboolean ___lambda410__gsource_func (gpointer self); +static gboolean __lambda411_ (Block40Data* _data40_); GValue* xnoise_worker_job_get_arg (XnoiseWorkerJob* self, const gchar* name); void xnoise_user_info_popdown (XnoiseUserInfo* self, guint id); -static gboolean ___lambda413__gsource_func (gpointer self); -static gboolean __lambda414_ (XnoiseExtDevPlayerTreeView* self); -static gboolean ___lambda414__gsource_func (gpointer self); +static gboolean ___lambda411__gsource_func (gpointer self); +static gboolean __lambda412_ (XnoiseExtDevPlayerTreeView* self); +static gboolean ___lambda412__gsource_func (gpointer self); static Block41Data* block41_data_ref (Block41Data* _data41_); static void block41_data_unref (void * _userdata_); gboolean xnoise_worker_is_same_thread (XnoiseWorker* self); @@ -593,19 +593,19 @@ static XnoiseTrackData** _vala_array_dup7 (XnoiseTrackData** self, int length); static Block42Data* block42_data_ref (Block42Data* _data42_); static void block42_data_unref (void * _userdata_); -static gboolean ___lambda408_ (Block42Data* _data42_); +static gboolean ___lambda406_ (Block42Data* _data42_); static gboolean xnoise_ext_dev_player_tree_view_copy_files_job (XnoiseExtDevPlayerTreeView* self, XnoiseWorkerJob* job); static gboolean _xnoise_ext_dev_player_tree_view_copy_files_job_xnoise_worker_work_func (XnoiseWorkerJob* jb, gpointer self); -static gboolean ____lambda408__gsource_func (gpointer self); +static gboolean ____lambda406__gsource_func (gpointer self); static Block43Data* block43_data_ref (Block43Data* _data43_); static void block43_data_unref (void * _userdata_); static void _vala_array_add62 (gchar*** array, int* length, int* size, gchar* value); -static gboolean __lambda409_ (Block43Data* _data43_); +static gboolean __lambda407_ (Block43Data* _data43_); +static gboolean ___lambda407__gsource_func (gpointer self); +static gboolean __lambda408_ (Block43Data* _data43_); +static gboolean ___lambda408__gsource_func (gpointer self); +static gboolean __lambda409_ (XnoiseExtDevPlayerTreeView* self); static gboolean ___lambda409__gsource_func (gpointer self); -static gboolean __lambda410_ (Block43Data* _data43_); -static gboolean ___lambda410__gsource_func (gpointer self); -static gboolean __lambda411_ (XnoiseExtDevPlayerTreeView* self); -static gboolean ___lambda411__gsource_func (gpointer self); static void xnoise_ext_dev_player_tree_view_rightclick_menu_popup (XnoiseExtDevPlayerTreeView* self, guint activateTime); static GtkMenu* xnoise_ext_dev_player_tree_view_create_rightclick_menu (XnoiseExtDevPlayerTreeView* self); static Block44Data* block44_data_ref (Block44Data* _data44_); @@ -626,10 +626,10 @@ GArray* xnoise_item_handler_manager_get_actions (XnoiseItemHandlerManager* self, XnoiseItemType type, XnoiseActionContext context, XnoiseItemSelectionType selection); static Block45Data* block45_data_ref (Block45Data* _data45_); static void block45_data_unref (void * _userdata_); -static void _____lambda406_ (Block45Data* _data45_); -static void ______lambda406__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self); -static void __lambda407_ (XnoiseExtDevPlayerTreeView* self); -static void ___lambda407__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self); +static void _____lambda404_ (Block45Data* _data45_); +static void ______lambda404__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self); +static void __lambda405_ (XnoiseExtDevPlayerTreeView* self); +static void ___lambda405__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self); void xnoise_global_access_preview_uri (XnoiseGlobalAccess* self, const gchar* uri); static void xnoise_ext_dev_player_tree_view_on_row_expanded (XnoiseExtDevPlayerTreeView* self, GtkTreeIter* iter, GtkTreePath* path); void xnoise_ext_dev_player_tree_store_load_children (XnoiseExtDevPlayerTreeStore* self, GtkTreeIter* iter); @@ -1520,7 +1520,7 @@ } -static gboolean __lambda412_ (Block40Data* _data40_) { +static gboolean __lambda410_ (Block40Data* _data40_) { XnoiseExtDevPlayerTreeView * self; gboolean result = FALSE; GCancellable* _tmp0_ = NULL; @@ -1547,14 +1547,14 @@ } -static gboolean ___lambda412__gsource_func (gpointer self) { +static gboolean ___lambda410__gsource_func (gpointer self) { gboolean result; - result = __lambda412_ (self); + result = __lambda410_ (self); return result; } -static gboolean __lambda413_ (Block40Data* _data40_) { +static gboolean __lambda411_ (Block40Data* _data40_) { XnoiseExtDevPlayerTreeView * self; gboolean result = FALSE; guint msg_id = 0U; @@ -1581,14 +1581,14 @@ } -static gboolean ___lambda413__gsource_func (gpointer self) { +static gboolean ___lambda411__gsource_func (gpointer self) { gboolean result; - result = __lambda413_ (self); + result = __lambda411_ (self); return result; } -static gboolean __lambda414_ (XnoiseExtDevPlayerTreeView* self) { +static gboolean __lambda412_ (XnoiseExtDevPlayerTreeView* self) { gboolean result = FALSE; XnoiseExtDevPlayerDevice* _tmp0_ = NULL; _tmp0_ = self->audio_player_device; @@ -1598,9 +1598,9 @@ } -static gboolean ___lambda414__gsource_func (gpointer self) { +static gboolean ___lambda412__gsource_func (gpointer self) { gboolean result; - result = __lambda414_ (self); + result = __lambda412_ (self); return result; } @@ -1828,9 +1828,9 @@ } } } - g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 200, ___lambda412__gsource_func, block40_data_ref (_data40_), block40_data_unref); - g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ___lambda413__gsource_func, block40_data_ref (_data40_), block40_data_unref); - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda414__gsource_func, g_object_ref (self), g_object_unref); + g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 200, ___lambda410__gsource_func, block40_data_ref (_data40_), block40_data_unref); + g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ___lambda411__gsource_func, block40_data_ref (_data40_), block40_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda412__gsource_func, g_object_ref (self), g_object_unref); result = FALSE; _g_object_unref0 (dest_base); block40_data_unref (_data40_); @@ -1930,7 +1930,7 @@ } -static gboolean ___lambda408_ (Block42Data* _data42_) { +static gboolean ___lambda406_ (Block42Data* _data42_) { Block41Data* _data41_; XnoiseExtDevPlayerTreeView * self; gboolean result = FALSE; @@ -1980,9 +1980,9 @@ } -static gboolean ____lambda408__gsource_func (gpointer self) { +static gboolean ____lambda406__gsource_func (gpointer self) { gboolean result; - result = ___lambda408_ (self); + result = ___lambda406_ (self); return result; } @@ -2225,7 +2225,7 @@ _data42_->_ref_count_ = 1; _data42_->_data41_ = block41_data_ref (_data41_); _data42_->msg_id = (guint) 0; - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda408__gsource_func, block42_data_ref (_data42_), block42_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda406__gsource_func, block42_data_ref (_data42_), block42_data_unref); block42_data_unref (_data42_); _data42_ = NULL; } @@ -2268,7 +2268,7 @@ } -static gboolean __lambda409_ (Block43Data* _data43_) { +static gboolean __lambda407_ (Block43Data* _data43_) { XnoiseExtDevPlayerTreeView * self; gboolean result = FALSE; GCancellable* _tmp0_ = NULL; @@ -2295,14 +2295,14 @@ } -static gboolean ___lambda409__gsource_func (gpointer self) { +static gboolean ___lambda407__gsource_func (gpointer self) { gboolean result; - result = __lambda409_ (self); + result = __lambda407_ (self); return result; } -static gboolean __lambda410_ (Block43Data* _data43_) { +static gboolean __lambda408_ (Block43Data* _data43_) { XnoiseExtDevPlayerTreeView * self; gboolean result = FALSE; guint msg_id = 0U; @@ -2329,14 +2329,14 @@ } -static gboolean ___lambda410__gsource_func (gpointer self) { +static gboolean ___lambda408__gsource_func (gpointer self) { gboolean result; - result = __lambda410_ (self); + result = __lambda408_ (self); return result; } -static gboolean __lambda411_ (XnoiseExtDevPlayerTreeView* self) { +static gboolean __lambda409_ (XnoiseExtDevPlayerTreeView* self) { gboolean result = FALSE; XnoiseExtDevPlayerDevice* _tmp0_ = NULL; _tmp0_ = self->audio_player_device; @@ -2346,9 +2346,9 @@ } -static gboolean ___lambda411__gsource_func (gpointer self) { +static gboolean ___lambda409__gsource_func (gpointer self) { gboolean result; - result = __lambda411_ (self); + result = __lambda409_ (self); return result; } @@ -2576,9 +2576,9 @@ } } } - g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 200, ___lambda409__gsource_func, block43_data_ref (_data43_), block43_data_unref); - g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ___lambda410__gsource_func, block43_data_ref (_data43_), block43_data_unref); - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda411__gsource_func, g_object_ref (self), g_object_unref); + g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 200, ___lambda407__gsource_func, block43_data_ref (_data43_), block43_data_unref); + g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ___lambda408__gsource_func, block43_data_ref (_data43_), block43_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda409__gsource_func, g_object_ref (self), g_object_unref); result = FALSE; _g_object_unref0 (dest_base); block43_data_unref (_data43_); @@ -2858,7 +2858,7 @@ } -static void _____lambda406_ (Block45Data* _data45_) { +static void _____lambda404_ (Block45Data* _data45_) { Block44Data* _data44_; XnoiseExtDevPlayerTreeView * self; XnoiseAction* _tmp0_ = NULL; @@ -2877,18 +2877,18 @@ } -static void ______lambda406__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { - _____lambda406_ (self); +static void ______lambda404__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { + _____lambda404_ (self); } -static void __lambda407_ (XnoiseExtDevPlayerTreeView* self) { +static void __lambda405_ (XnoiseExtDevPlayerTreeView* self) { gtk_tree_view_collapse_all (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_TREE_VIEW, GtkTreeView)); } -static void ___lambda407__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { - __lambda407_ (self); +static void ___lambda405__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { + __lambda405_ (self); } @@ -3050,7 +3050,7 @@ _tmp41_ = g_array_index (_tmp39_, XnoiseAction*, (guint) _tmp40_); _data45_->x = _tmp41_; _tmp42_ = menu_item; - g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GTK_TYPE_MENU_ITEM, GtkMenuItem), "activate", (GCallback) ______lambda406__gtk_menu_item_activate, block45_data_ref (_data45_), (GClosureNotify) block45_data_unref, 0); + g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GTK_TYPE_MENU_ITEM, GtkMenuItem), "activate", (GCallback) ______lambda404__gtk_menu_item_activate, block45_data_ref (_data45_), (GClosureNotify) block45_data_unref, 0); _tmp43_ = rightmenu; _tmp44_ = menu_item; gtk_menu_shell_append (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GTK_TYPE_MENU_SHELL, GtkMenuShell), (GtkWidget*) G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GTK_TYPE_MENU_ITEM, GtkMenuItem)); @@ -3082,7 +3082,7 @@ _tmp52_ = _ ("Collapse all"); gtk_menu_item_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GTK_TYPE_MENU_ITEM, GtkMenuItem), _tmp52_); _tmp53_ = collapse_item; - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GTK_TYPE_MENU_ITEM, GtkMenuItem), "activate", (GCallback) ___lambda407__gtk_menu_item_activate, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GTK_TYPE_MENU_ITEM, GtkMenuItem), "activate", (GCallback) ___lambda405__gtk_menu_item_activate, self, 0); _tmp54_ = rightmenu; _tmp55_ = collapse_item; gtk_menu_shell_append (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GTK_TYPE_MENU_SHELL, GtkMenuShell), (GtkWidget*) G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, GTK_TYPE_MENU_ITEM, GtkMenuItem)); diff -Nru xnoise-0.2.20/libxnoise/ExtDev/CddaDevice/xnoise-cdda-main-view.c xnoise-0.2.21/libxnoise/ExtDev/CddaDevice/xnoise-cdda-main-view.c --- xnoise-0.2.20/libxnoise/ExtDev/CddaDevice/xnoise-cdda-main-view.c 2013-12-10 15:13:32.000000000 +0000 +++ xnoise-0.2.21/libxnoise/ExtDev/CddaDevice/xnoise-cdda-main-view.c 2014-01-17 15:05:35.000000000 +0000 @@ -166,9 +166,9 @@ gchar* device_main_view_get_localized_name (DeviceMainView* self); CddaTreeView* cdda_tree_view_new (XnoiseExtDevDevice* device); CddaTreeView* cdda_tree_view_construct (GType object_type, XnoiseExtDevDevice* device); -static void __lambda430_ (Block47Data* _data47_); +static void __lambda428_ (Block47Data* _data47_); gboolean cdda_tree_view_get_in_loading (CddaTreeView* self); -static void ___lambda430__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); +static void ___lambda428__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); static void xnoise_ext_dev_cdda_main_view_finalize (GObject* obj); @@ -236,7 +236,7 @@ } -static void __lambda430_ (Block47Data* _data47_) { +static void __lambda428_ (Block47Data* _data47_) { XnoiseExtDevCddaMainView * self; CddaTreeView* _tmp0_ = NULL; gboolean _tmp1_ = FALSE; @@ -257,8 +257,8 @@ } -static void ___lambda430__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { - __lambda430_ (self); +static void ___lambda428__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { + __lambda428_ (self); } @@ -338,7 +338,7 @@ gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget)); gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_data47_->spinner, GTK_TYPE_WIDGET, GtkWidget)); _tmp17_ = self->priv->treeview; - g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, G_TYPE_OBJECT, GObject), "notify::in-loading", (GCallback) ___lambda430__g_object_notify, block47_data_ref (_data47_), (GClosureNotify) block47_data_unref, 0); + g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, G_TYPE_OBJECT, GObject), "notify::in-loading", (GCallback) ___lambda428__g_object_notify, block47_data_ref (_data47_), (GClosureNotify) block47_data_unref, 0); gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_CONTAINER, GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (box, GTK_TYPE_WIDGET, GtkWidget)); _g_object_unref0 (sw); _g_object_unref0 (header_label); diff -Nru xnoise-0.2.20/libxnoise/ExtDev/CddaDevice/xnoise-cdda-tree-view.c xnoise-0.2.21/libxnoise/ExtDev/CddaDevice/xnoise-cdda-tree-view.c --- xnoise-0.2.20/libxnoise/ExtDev/CddaDevice/xnoise-cdda-tree-view.c 2013-12-10 17:15:58.000000000 +0000 +++ xnoise-0.2.21/libxnoise/ExtDev/CddaDevice/xnoise-cdda-tree-view.c 2014-01-17 15:05:35.000000000 +0000 @@ -287,17 +287,17 @@ void xnoise_worker_push_job (XnoiseWorker* self, XnoiseWorkerJob* j); static Block48Data* block48_data_ref (Block48Data* _data48_); static void block48_data_unref (void * _userdata_); -static gboolean ____lambda427_ (CddaTreeView* self); -static gboolean _____lambda427__gsource_func (gpointer self); +static gboolean ____lambda425_ (CddaTreeView* self); +static gboolean _____lambda425__gsource_func (gpointer self); #define XNOISE_RESOURCES_UNKNOWN_ARTIST "unknown artist" #define XNOISE_RESOURCES_UNKNOWN_ALBUM "unknown album" static Block49Data* block49_data_ref (Block49Data* _data49_); static void block49_data_unref (void * _userdata_); XnoiseItem* xnoise_item_handler_manager_create_item (const gchar* uri); -static gboolean ____lambda428_ (Block49Data* _data49_); -static gboolean _____lambda428__gsource_func (gpointer self); -static gboolean __lambda429_ (CddaTreeView* self); -static gboolean ___lambda429__gsource_func (gpointer self); +static gboolean ____lambda426_ (Block49Data* _data49_); +static gboolean _____lambda426__gsource_func (gpointer self); +static gboolean __lambda427_ (CddaTreeView* self); +static gboolean ___lambda427__gsource_func (gpointer self); gboolean cdda_tree_view_get_in_loading (CddaTreeView* self); static void cdda_tree_view_finalize (GObject* obj); static void _vala_cdda_tree_view_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); @@ -485,7 +485,7 @@ } -static gboolean ____lambda427_ (CddaTreeView* self) { +static gboolean ____lambda425_ (CddaTreeView* self) { gboolean result = FALSE; cdda_tree_view_set_in_loading (self, FALSE); result = FALSE; @@ -493,9 +493,9 @@ } -static gboolean _____lambda427__gsource_func (gpointer self) { +static gboolean _____lambda425__gsource_func (gpointer self) { gboolean result; - result = ____lambda427_ (self); + result = ____lambda425_ (self); return result; } @@ -522,7 +522,7 @@ } -static gboolean ____lambda428_ (Block49Data* _data49_) { +static gboolean ____lambda426_ (Block49Data* _data49_) { Block48Data* _data48_; CddaTreeView * self; gboolean result = FALSE; @@ -556,14 +556,14 @@ } -static gboolean _____lambda428__gsource_func (gpointer self) { +static gboolean _____lambda426__gsource_func (gpointer self) { gboolean result; - result = ____lambda428_ (self); + result = ____lambda426_ (self); return result; } -static gboolean __lambda429_ (CddaTreeView* self) { +static gboolean __lambda427_ (CddaTreeView* self) { gboolean result = FALSE; cdda_tree_view_set_in_loading (self, FALSE); result = FALSE; @@ -571,9 +571,9 @@ } -static gboolean ___lambda429__gsource_func (gpointer self) { +static gboolean ___lambda427__gsource_func (gpointer self) { gboolean result; - result = __lambda429_ (self); + result = __lambda427_ (self); return result; } @@ -629,7 +629,7 @@ _tmp5_ = info; if (_tmp5_ == NULL) { g_print ("Could not query CD\n"); - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _____lambda427__gsource_func, g_object_ref (self), g_object_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _____lambda425__gsource_func, g_object_ref (self), g_object_unref); result = FALSE; _g_object_unref0 (info); block48_data_unref (_data48_); @@ -797,7 +797,7 @@ _data49_->item = _tmp53_; _tmp54_ = i; _data49_->tracknumber = _tmp54_; - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _____lambda428__gsource_func, block49_data_ref (_data49_), block49_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _____lambda426__gsource_func, block49_data_ref (_data49_), block49_data_unref); _g_free0 (track_artist); block49_data_unref (_data49_); _data49_ = NULL; @@ -828,7 +828,7 @@ g_clear_error (&_inner_error_); return FALSE; } - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda429__gsource_func, g_object_ref (self), g_object_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda427__gsource_func, g_object_ref (self), g_object_unref); result = FALSE; _g_object_unref0 (dir); return result; diff -Nru xnoise-0.2.20/libxnoise/ExtDev/xnoise-device-manager.c xnoise-0.2.21/libxnoise/ExtDev/xnoise-device-manager.c --- xnoise-0.2.20/libxnoise/ExtDev/xnoise-device-manager.c 2013-12-11 11:24:23.000000000 +0000 +++ xnoise-0.2.21/libxnoise/ExtDev/xnoise-device-manager.c 2014-01-27 09:32:56.000000000 +0000 @@ -385,17 +385,17 @@ static XnoiseExtDevDevice* _xnoise_ext_dev_generic_player_device_get_device_xnoise_ext_dev_device_manager_identification_callback (GMount* mount, gpointer self); XnoiseExtDevDevice* xnoise_ext_dev_cdda_device_get_device (GMount* mount); static XnoiseExtDevDevice* _xnoise_ext_dev_cdda_device_get_device_xnoise_ext_dev_device_manager_identification_callback (GMount* mount, gpointer self); -static void __lambda431_ (XnoiseExtDevDeviceManager* self, GVolumeMonitor* s, GMount* m); +static void __lambda429_ (XnoiseExtDevDeviceManager* self, GVolumeMonitor* s, GMount* m); static void xnoise_ext_dev_device_manager_mount_added (XnoiseExtDevDeviceManager* self, GMount* mount); -static void ___lambda431__g_volume_monitor_mount_added (GVolumeMonitor* _sender, GMount* mount, gpointer self); -static void __lambda433_ (XnoiseExtDevDeviceManager* self, GVolumeMonitor* s, GMount* m); +static void ___lambda429__g_volume_monitor_mount_added (GVolumeMonitor* _sender, GMount* mount, gpointer self); +static void __lambda431_ (XnoiseExtDevDeviceManager* self, GVolumeMonitor* s, GMount* m); static void xnoise_ext_dev_device_manager_mount_removed (XnoiseExtDevDeviceManager* self, GMount* mount); -static void ___lambda433__g_volume_monitor_mount_removed (GVolumeMonitor* _sender, GMount* mount, gpointer self); +static void ___lambda431__g_volume_monitor_mount_removed (GVolumeMonitor* _sender, GMount* mount, gpointer self); static void xnoise_ext_dev_device_manager_check_existing_mounts (XnoiseExtDevDeviceManager* self); static Block50Data* block50_data_ref (Block50Data* _data50_); static void block50_data_unref (void * _userdata_); -static gboolean ____lambda434_ (Block50Data* _data50_); -static gboolean _____lambda434__gsource_func (gpointer self); +static gboolean ____lambda432_ (Block50Data* _data50_); +static gboolean _____lambda432__gsource_func (gpointer self); static void _g_list_free__g_object_unref0_ (GList* self); gpointer xnoise_worker_job_ref (gpointer instance); void xnoise_worker_job_unref (gpointer instance); @@ -418,7 +418,7 @@ GValue* xnoise_worker_job_get_arg (XnoiseWorkerJob* self, const gchar* name); gboolean xnoise_ext_dev_device_initialize (XnoiseExtDevDevice* self); gchar* xnoise_ext_dev_device_get_identifier (XnoiseExtDevDevice* self); -static gboolean ____lambda432_ (Block51Data* _data51_); +static gboolean ____lambda430_ (Block51Data* _data51_); GType xnoise_main_window_get_type (void) G_GNUC_CONST; GType xnoise_main_view_notebook_get_type (void) G_GNUC_CONST; XnoiseMainViewNotebook* xnoise_main_window_get_mainview_box (XnoiseMainWindow* self); @@ -448,7 +448,7 @@ XnoiseItemHandler* xnoise_ext_dev_device_get_item_handler (XnoiseExtDevDevice* self); GType xnoise_item_handler_manager_get_type (void) G_GNUC_CONST; void xnoise_item_handler_manager_add_handler (XnoiseItemHandlerManager* self, XnoiseItemHandler* handler); -static gboolean _____lambda432__gsource_func (gpointer self); +static gboolean _____lambda430__gsource_func (gpointer self); void xnoise_ext_dev_device_cancel (XnoiseExtDevDevice* self); void xnoise_item_handler_manager_remove_handler (XnoiseItemHandlerManager* self, XnoiseItemHandler* handler); void xnoise_serial_button_del (XnoiseSerialButton* self, const gchar* name); @@ -502,7 +502,7 @@ } -static void __lambda431_ (XnoiseExtDevDeviceManager* self, GVolumeMonitor* s, GMount* m) { +static void __lambda429_ (XnoiseExtDevDeviceManager* self, GVolumeMonitor* s, GMount* m) { GMount* _tmp0_ = NULL; g_return_if_fail (G_IS_VOLUME_MONITOR (s)); g_return_if_fail (G_IS_MOUNT (m)); @@ -511,12 +511,12 @@ } -static void ___lambda431__g_volume_monitor_mount_added (GVolumeMonitor* _sender, GMount* mount, gpointer self) { - __lambda431_ (self, _sender, mount); +static void ___lambda429__g_volume_monitor_mount_added (GVolumeMonitor* _sender, GMount* mount, gpointer self) { + __lambda429_ (self, _sender, mount); } -static void __lambda433_ (XnoiseExtDevDeviceManager* self, GVolumeMonitor* s, GMount* m) { +static void __lambda431_ (XnoiseExtDevDeviceManager* self, GVolumeMonitor* s, GMount* m) { GMount* _tmp0_ = NULL; g_return_if_fail (G_IS_VOLUME_MONITOR (s)); g_return_if_fail (G_IS_MOUNT (m)); @@ -525,8 +525,8 @@ } -static void ___lambda433__g_volume_monitor_mount_removed (GVolumeMonitor* _sender, GMount* mount, gpointer self) { - __lambda433_ (self, _sender, mount); +static void ___lambda431__g_volume_monitor_mount_removed (GVolumeMonitor* _sender, GMount* mount, gpointer self) { + __lambda431_ (self, _sender, mount); } @@ -585,9 +585,9 @@ _g_object_unref0 (self->priv->volume_monitor); self->priv->volume_monitor = _tmp11_; _tmp12_ = self->priv->volume_monitor; - g_signal_connect_object (_tmp12_, "mount-added", (GCallback) ___lambda431__g_volume_monitor_mount_added, self, 0); + g_signal_connect_object (_tmp12_, "mount-added", (GCallback) ___lambda429__g_volume_monitor_mount_added, self, 0); _tmp13_ = self->priv->volume_monitor; - g_signal_connect_object (_tmp13_, "mount-removed", (GCallback) ___lambda433__g_volume_monitor_mount_removed, self, 0); + g_signal_connect_object (_tmp13_, "mount-removed", (GCallback) ___lambda431__g_volume_monitor_mount_removed, self, 0); xnoise_ext_dev_device_manager_check_existing_mounts (self); return self; } @@ -638,7 +638,7 @@ } -static gboolean ____lambda434_ (Block50Data* _data50_) { +static gboolean ____lambda432_ (Block50Data* _data50_) { XnoiseExtDevDeviceManager * self; gboolean result = FALSE; GMount* _tmp0_ = NULL; @@ -650,9 +650,9 @@ } -static gboolean _____lambda434__gsource_func (gpointer self) { +static gboolean _____lambda432__gsource_func (gpointer self) { gboolean result; - result = ____lambda434_ (self); + result = ____lambda432_ (self); return result; } @@ -684,7 +684,7 @@ _data50_->_ref_count_ = 1; _data50_->self = g_object_ref (self); _data50_->m = m; - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _____lambda434__gsource_func, block50_data_ref (_data50_), block50_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _____lambda432__gsource_func, block50_data_ref (_data50_), block50_data_unref); block50_data_unref (_data50_); _data50_ = NULL; } @@ -760,7 +760,7 @@ } -static gboolean ____lambda432_ (Block51Data* _data51_) { +static gboolean ____lambda430_ (Block51Data* _data51_) { XnoiseExtDevDeviceManager * self; gboolean result = FALSE; XnoiseMainWindow* _tmp0_ = NULL; @@ -827,9 +827,9 @@ } -static gboolean _____lambda432__gsource_func (gpointer self) { +static gboolean _____lambda430__gsource_func (gpointer self) { gboolean result; - result = ____lambda432_ (self); + result = ____lambda430_ (self); return result; } @@ -997,7 +997,7 @@ return FALSE; } } - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _____lambda432__gsource_func, block51_data_ref (_data51_), block51_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _____lambda430__gsource_func, block51_data_ref (_data51_), block51_data_unref); } else { GMount* _tmp36_ = NULL; _tmp36_ = mount; diff -Nru xnoise-0.2.20/libxnoise/ExtraWidgets/AboutDialog/xnoise-about.c xnoise-0.2.21/libxnoise/ExtraWidgets/AboutDialog/xnoise-about.c --- xnoise-0.2.20/libxnoise/ExtraWidgets/AboutDialog/xnoise-about.c 2013-12-11 11:24:23.000000000 +0000 +++ xnoise-0.2.21/libxnoise/ExtraWidgets/AboutDialog/xnoise-about.c 2014-01-27 09:32:56.000000000 +0000 @@ -37,6 +37,7 @@ #include #include #include +#include #define XNOISE_TYPE_ABOUT_DIALOG (xnoise_about_dialog_get_type ()) @@ -84,10 +85,12 @@ #define XNOISE_RESOURCES_WEBSITE "http://www.xnoise-media-player.com/" #define XNOISE_RESOURCES_COPYRIGHT "Copyright \xc2\xa9 2008-2013 Jörn Magens" +extern const gchar* XNOISE_RESOURCES_AUTHORS[6]; XnoiseAboutDialog* xnoise_about_dialog_construct (GType object_type) { XnoiseAboutDialog * self = NULL; XnoiseMainWindow* _tmp0_ = NULL; + const gchar* _tmp1_ = NULL; self = (XnoiseAboutDialog*) g_object_new (object_type, NULL); gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WINDOW, GtkWindow), TRUE); _tmp0_ = xnoise_main_window; @@ -95,11 +98,14 @@ gtk_about_dialog_set_logo_icon_name (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_ABOUT_DIALOG, GtkAboutDialog), XNOISE_RESOURCES_PROGRAM_NAME); gtk_window_set_default_icon_name (XNOISE_RESOURCES_PROGRAM_NAME); gtk_about_dialog_set_logo_icon_name (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_ABOUT_DIALOG, GtkAboutDialog), XNOISE_RESOURCES_PROGRAM_NAME); + gtk_about_dialog_set_authors (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_ABOUT_DIALOG, GtkAboutDialog), XNOISE_RESOURCES_AUTHORS); gtk_about_dialog_set_program_name (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_ABOUT_DIALOG, GtkAboutDialog), XNOISE_RESOURCES_PROGRAM_NAME); gtk_about_dialog_set_version (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_ABOUT_DIALOG, GtkAboutDialog), PACKAGE_VERSION); gtk_about_dialog_set_website (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_ABOUT_DIALOG, GtkAboutDialog), XNOISE_RESOURCES_WEBSITE); gtk_about_dialog_set_website_label (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_ABOUT_DIALOG, GtkAboutDialog), "Xnoise media player - Home"); gtk_about_dialog_set_copyright (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_ABOUT_DIALOG, GtkAboutDialog), XNOISE_RESOURCES_COPYRIGHT); + _tmp1_ = _ ("translator-credits"); + gtk_about_dialog_set_translator_credits (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_ABOUT_DIALOG, GtkAboutDialog), _tmp1_); return self; } diff -Nru xnoise-0.2.20/libxnoise/ExtraWidgets/AboutDialog/xnoise-about.vala xnoise-0.2.21/libxnoise/ExtraWidgets/AboutDialog/xnoise-about.vala --- xnoise-0.2.20/libxnoise/ExtraWidgets/AboutDialog/xnoise-about.vala 2013-11-20 13:30:52.000000000 +0000 +++ xnoise-0.2.21/libxnoise/ExtraWidgets/AboutDialog/xnoise-about.vala 2013-12-13 13:47:00.000000000 +0000 @@ -45,11 +45,13 @@ set_default_icon_name(PROGRAM_NAME); this.set_logo_icon_name(PROGRAM_NAME); - this.program_name = PROGRAM_NAME; - this.version = Config.PACKAGE_VERSION; - this.website = WEBSITE; - this.website_label = "Xnoise media player - Home"; - this.copyright = COPYRIGHT; + this.authors = AUTHORS; + this.program_name = PROGRAM_NAME; + this.version = Config.PACKAGE_VERSION; + this.website = WEBSITE; + this.website_label = "Xnoise media player - Home"; + this.copyright = COPYRIGHT; + this.translator_credits = _("translator-credits"); } } diff -Nru xnoise-0.2.20/libxnoise/ExtraWidgets/AddMedia/xnoise-add-media-widget.c xnoise-0.2.21/libxnoise/ExtraWidgets/AddMedia/xnoise-add-media-widget.c --- xnoise-0.2.20/libxnoise/ExtraWidgets/AddMedia/xnoise-add-media-widget.c 2013-12-11 11:24:23.000000000 +0000 +++ xnoise-0.2.21/libxnoise/ExtraWidgets/AddMedia/xnoise-add-media-widget.c 2014-01-27 09:32:56.000000000 +0000 @@ -169,13 +169,13 @@ void xnoise_value_take_media_importer (GValue* value, gpointer v_object); gpointer xnoise_value_get_media_importer (const GValue* value); GType xnoise_media_importer_get_type (void) G_GNUC_CONST; -static void __lambda190_ (XnoiseAddMediaWidget* self); +static void __lambda188_ (XnoiseAddMediaWidget* self); static void xnoise_add_media_widget_update_item_list (XnoiseAddMediaWidget* self); -static void ___lambda190__xnoise_media_importer_folder_list_changed (XnoiseMediaImporter* _sender, gpointer self); -static gboolean __lambda191_ (XnoiseAddMediaWidget* self); -static gboolean ___lambda191__gsource_func (gpointer self); -static void __lambda192_ (XnoiseAddMediaWidget* self, XnoiseMediaImporter* s); -static void ___lambda192__xnoise_media_importer_media_folder_state_change (XnoiseMediaImporter* _sender, gpointer self); +static void ___lambda188__xnoise_media_importer_folder_list_changed (XnoiseMediaImporter* _sender, gpointer self); +static gboolean __lambda189_ (XnoiseAddMediaWidget* self); +static gboolean ___lambda189__gsource_func (gpointer self); +static void __lambda190_ (XnoiseAddMediaWidget* self, XnoiseMediaImporter* s); +static void ___lambda190__xnoise_media_importer_media_folder_state_change (XnoiseMediaImporter* _sender, gpointer self); GList* xnoise_media_importer_get_media_folder_list (XnoiseMediaImporter* self); static void _xnoise_item_free0_ (gpointer var); static void _g_list_free__xnoise_item_free0_ (GList* self); @@ -235,17 +235,17 @@ } -static void __lambda190_ (XnoiseAddMediaWidget* self) { +static void __lambda188_ (XnoiseAddMediaWidget* self) { xnoise_add_media_widget_update_item_list (self); } -static void ___lambda190__xnoise_media_importer_folder_list_changed (XnoiseMediaImporter* _sender, gpointer self) { - __lambda190_ (self); +static void ___lambda188__xnoise_media_importer_folder_list_changed (XnoiseMediaImporter* _sender, gpointer self) { + __lambda188_ (self); } -static gboolean __lambda191_ (XnoiseAddMediaWidget* self) { +static gboolean __lambda189_ (XnoiseAddMediaWidget* self) { gboolean result = FALSE; xnoise_add_media_widget_update_item_list (self); result = FALSE; @@ -253,21 +253,21 @@ } -static gboolean ___lambda191__gsource_func (gpointer self) { +static gboolean ___lambda189__gsource_func (gpointer self) { gboolean result; - result = __lambda191_ (self); + result = __lambda189_ (self); return result; } -static void __lambda192_ (XnoiseAddMediaWidget* self, XnoiseMediaImporter* s) { +static void __lambda190_ (XnoiseAddMediaWidget* self, XnoiseMediaImporter* s) { g_return_if_fail (XNOISE_IS_MEDIA_IMPORTER (s)); xnoise_add_media_widget_update_item_list (self); } -static void ___lambda192__xnoise_media_importer_media_folder_state_change (XnoiseMediaImporter* _sender, gpointer self) { - __lambda192_ (self, _sender); +static void ___lambda190__xnoise_media_importer_media_folder_state_change (XnoiseMediaImporter* _sender, gpointer self) { + __lambda190_ (self, _sender); } @@ -512,10 +512,10 @@ _tmp71_ = self->priv->tv; gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, GTK_TYPE_WIDGET, GtkWidget)); _tmp72_ = xnoise_media_importer; - g_signal_connect_object (_tmp72_, "folder-list-changed", (GCallback) ___lambda190__xnoise_media_importer_folder_list_changed, self, 0); - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda191__gsource_func, g_object_ref (self), g_object_unref); + g_signal_connect_object (_tmp72_, "folder-list-changed", (GCallback) ___lambda188__xnoise_media_importer_folder_list_changed, self, 0); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda189__gsource_func, g_object_ref (self), g_object_unref); _tmp73_ = xnoise_media_importer; - g_signal_connect_object (_tmp73_, "media-folder-state-change", (GCallback) ___lambda192__xnoise_media_importer_media_folder_state_change, self, 0); + g_signal_connect_object (_tmp73_, "media-folder-state-change", (GCallback) ___lambda190__xnoise_media_importer_media_folder_state_change, self, 0); _g_object_unref0 (renderer); _g_object_unref0 (rendererpb); _g_object_unref0 (column); diff -Nru xnoise-0.2.20/libxnoise/ExtraWidgets/VideoScreen/xnoise-videoscreen.c xnoise-0.2.21/libxnoise/ExtraWidgets/VideoScreen/xnoise-videoscreen.c --- xnoise-0.2.20/libxnoise/ExtraWidgets/VideoScreen/xnoise-videoscreen.c 2013-12-11 11:24:23.000000000 +0000 +++ xnoise-0.2.21/libxnoise/ExtraWidgets/VideoScreen/xnoise-videoscreen.c 2014-01-27 09:32:56.000000000 +0000 @@ -76,16 +76,6 @@ typedef struct _XnoiseVideoScreen XnoiseVideoScreen; typedef struct _XnoiseVideoScreenClass XnoiseVideoScreenClass; - -#define XNOISE_TYPE_MAIN_WINDOW (xnoise_main_window_get_type ()) -#define XNOISE_MAIN_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), XNOISE_TYPE_MAIN_WINDOW, XnoiseMainWindow)) -#define XNOISE_MAIN_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), XNOISE_TYPE_MAIN_WINDOW, XnoiseMainWindowClass)) -#define XNOISE_IS_MAIN_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), XNOISE_TYPE_MAIN_WINDOW)) -#define XNOISE_IS_MAIN_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), XNOISE_TYPE_MAIN_WINDOW)) -#define XNOISE_MAIN_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), XNOISE_TYPE_MAIN_WINDOW, XnoiseMainWindowClass)) - -typedef struct _XnoiseMainWindow XnoiseMainWindow; -typedef struct _XnoiseMainWindowClass XnoiseMainWindowClass; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define XNOISE_TYPE_GST_PLAYER (xnoise_gst_player_get_type ()) @@ -169,6 +159,16 @@ #define _xnoise_worker_job_unref0(var) ((var == NULL) ? NULL : (var = (xnoise_worker_job_unref (var), NULL))) typedef struct _Block56Data Block56Data; typedef struct _Block57Data Block57Data; + +#define XNOISE_TYPE_MAIN_WINDOW (xnoise_main_window_get_type ()) +#define XNOISE_MAIN_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), XNOISE_TYPE_MAIN_WINDOW, XnoiseMainWindow)) +#define XNOISE_MAIN_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), XNOISE_TYPE_MAIN_WINDOW, XnoiseMainWindowClass)) +#define XNOISE_IS_MAIN_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), XNOISE_TYPE_MAIN_WINDOW)) +#define XNOISE_IS_MAIN_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), XNOISE_TYPE_MAIN_WINDOW)) +#define XNOISE_MAIN_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), XNOISE_TYPE_MAIN_WINDOW, XnoiseMainWindowClass)) + +typedef struct _XnoiseMainWindow XnoiseMainWindow; +typedef struct _XnoiseMainWindowClass XnoiseMainWindowClass; #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) #define __vala_PangoFontDescription_free0(var) ((var == NULL) ? NULL : (var = (_vala_PangoFontDescription_free (var), NULL))) #define _cairo_destroy0(var) ((var == NULL) ? NULL : (var = (cairo_destroy (var), NULL))) @@ -189,10 +189,6 @@ GtkBoxClass parent_class; }; -struct _XnoiseVideoViewWidgetPrivate { - XnoiseMainWindow* win; -}; - struct _XnoiseGstPlayer { GObject parent_instance; XnoiseGstPlayerPrivate * priv; @@ -285,14 +281,12 @@ GType xnoise_imain_view_get_type (void) G_GNUC_CONST; GType xnoise_video_view_widget_get_type (void) G_GNUC_CONST; GType xnoise_video_screen_get_type (void) G_GNUC_CONST; -GType xnoise_main_window_get_type (void) G_GNUC_CONST; -#define XNOISE_VIDEO_VIEW_WIDGET_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), XNOISE_TYPE_VIDEO_VIEW_WIDGET, XnoiseVideoViewWidgetPrivate)) enum { XNOISE_VIDEO_VIEW_WIDGET_DUMMY_PROPERTY }; #define XNOISE_VIDEO_VIEW_WIDGET_UI_FILE XN_UIDIR "video.ui" -XnoiseVideoViewWidget* xnoise_video_view_widget_new (XnoiseMainWindow* win); -XnoiseVideoViewWidget* xnoise_video_view_widget_construct (GType object_type, XnoiseMainWindow* win); +XnoiseVideoViewWidget* xnoise_video_view_widget_new (void); +XnoiseVideoViewWidget* xnoise_video_view_widget_construct (GType object_type); static void xnoise_video_view_widget_setup_widgets (XnoiseVideoViewWidget* self); static gchar* xnoise_video_view_widget_real_get_view_name (XnoiseIMainView* base); #define XNOISE_RESOURCES_VIDEOVIEW_NAME "VideoView" @@ -366,6 +360,7 @@ gboolean xnoise_gst_player_get_current_has_video_track (XnoiseGstPlayer* self); static void xnoise_video_screen_open_suburi_filechooser (XnoiseVideoScreen* self); static void _xnoise_video_screen_open_suburi_filechooser_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self); +GType xnoise_main_window_get_type (void) G_GNUC_CONST; gboolean xnoise_main_window_get_fullscreenwindowvisible (XnoiseMainWindow* self); static void __lambda20_ (XnoiseVideoScreen* self); void xnoise_main_window_toggle_fullscreen (XnoiseMainWindow* self); @@ -405,20 +400,16 @@ static void _vala_xnoise_video_screen_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); -XnoiseVideoViewWidget* xnoise_video_view_widget_construct (GType object_type, XnoiseMainWindow* win) { +XnoiseVideoViewWidget* xnoise_video_view_widget_construct (GType object_type) { XnoiseVideoViewWidget * self = NULL; - XnoiseMainWindow* _tmp0_ = NULL; - g_return_val_if_fail (XNOISE_IS_MAIN_WINDOW (win), NULL); self = (XnoiseVideoViewWidget*) g_object_new (object_type, "orientation", GTK_ORIENTATION_VERTICAL, "spacing", 0, NULL); - _tmp0_ = win; - self->priv->win = _tmp0_; xnoise_video_view_widget_setup_widgets (self); return self; } -XnoiseVideoViewWidget* xnoise_video_view_widget_new (XnoiseMainWindow* win) { - return xnoise_video_view_widget_construct (XNOISE_TYPE_VIDEO_VIEW_WIDGET, win); +XnoiseVideoViewWidget* xnoise_video_view_widget_new (void) { + return xnoise_video_view_widget_construct (XNOISE_TYPE_VIDEO_VIEW_WIDGET); } @@ -433,13 +424,19 @@ } +static gpointer _g_object_ref0 (gpointer self) { + return self ? g_object_ref (self) : NULL; +} + + static void xnoise_video_view_widget_setup_widgets (XnoiseVideoViewWidget* self) { GtkBox* _tmp0_ = NULL; XnoiseGstPlayer* _tmp1_ = NULL; XnoiseVideoScreen* _tmp2_ = NULL; - GtkBox* _tmp3_ = NULL; - XnoiseVideoScreen* _tmp4_ = NULL; - GtkBox* _tmp5_ = NULL; + XnoiseVideoScreen* _tmp3_ = NULL; + GtkBox* _tmp4_ = NULL; + XnoiseVideoScreen* _tmp5_ = NULL; + GtkBox* _tmp6_ = NULL; g_return_if_fail (XNOISE_IS_VIDEO_VIEW_WIDGET (self)); _tmp0_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); g_object_ref_sink (_tmp0_); @@ -447,18 +444,19 @@ self->videovbox = _tmp0_; _tmp1_ = xnoise_gst_player; _tmp2_ = _tmp1_->videoscreen; - self->videoscreen = _tmp2_; - _tmp3_ = self->videovbox; - _tmp4_ = self->videoscreen; - gtk_box_pack_start (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GTK_TYPE_WIDGET, GtkWidget), TRUE, TRUE, (guint) 0); - _tmp5_ = self->videovbox; - gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_BOX, GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GTK_TYPE_WIDGET, GtkWidget), TRUE, TRUE, (guint) 0); + _tmp3_ = _g_object_ref0 (_tmp2_); + _g_object_unref0 (self->videoscreen); + self->videoscreen = _tmp3_; + _tmp4_ = self->videovbox; + _tmp5_ = self->videoscreen; + gtk_box_pack_start (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GTK_TYPE_WIDGET, GtkWidget), TRUE, TRUE, (guint) 0); + _tmp6_ = self->videovbox; + gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_BOX, GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GTK_TYPE_WIDGET, GtkWidget), TRUE, TRUE, (guint) 0); } static void xnoise_video_view_widget_class_init (XnoiseVideoViewWidgetClass * klass) { xnoise_video_view_widget_parent_class = g_type_class_peek_parent (klass); - g_type_class_add_private (klass, sizeof (XnoiseVideoViewWidgetPrivate)); G_OBJECT_CLASS (klass)->finalize = xnoise_video_view_widget_finalize; } @@ -470,7 +468,6 @@ static void xnoise_video_view_widget_instance_init (XnoiseVideoViewWidget * self) { - self->priv = XNOISE_VIDEO_VIEW_WIDGET_GET_PRIVATE (self); } @@ -478,6 +475,7 @@ XnoiseVideoViewWidget * self; self = G_TYPE_CHECK_INSTANCE_CAST (obj, XNOISE_TYPE_VIDEO_VIEW_WIDGET, XnoiseVideoViewWidget); _g_object_unref0 (self->videovbox); + _g_object_unref0 (self->videoscreen); G_OBJECT_CLASS (xnoise_video_view_widget_parent_class)->finalize (obj); } @@ -1357,11 +1355,6 @@ } -static gpointer _g_object_ref0 (gpointer self) { - return self ? g_object_ref (self) : NULL; -} - - static gboolean __lambda8_ (XnoiseVideoScreen* self) { gboolean result = FALSE; gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget)); diff -Nru xnoise-0.2.20/libxnoise/ExtraWidgets/VideoScreen/xnoise-videoscreen.vala xnoise-0.2.21/libxnoise/ExtraWidgets/VideoScreen/xnoise-videoscreen.vala --- xnoise-0.2.20/libxnoise/ExtraWidgets/VideoScreen/xnoise-videoscreen.vala 2013-12-09 23:27:18.000000000 +0000 +++ xnoise-0.2.21/libxnoise/ExtraWidgets/VideoScreen/xnoise-videoscreen.vala 2014-01-17 13:27:31.000000000 +0000 @@ -39,13 +39,11 @@ private class Xnoise.VideoViewWidget : Gtk.Box, IMainView { private const string UI_FILE = Config.XN_UIDIR + "video.ui"; - private unowned MainWindow win; internal Gtk.Box videovbox; - internal unowned VideoScreen videoscreen; + internal VideoScreen videoscreen; - public VideoViewWidget(MainWindow win) { + public VideoViewWidget() { GLib.Object(orientation:Orientation.VERTICAL, spacing:0); - this.win = win; setup_widgets(); } diff -Nru xnoise-0.2.20/libxnoise/ExtraWidgets/xnoise-app-menu-button.c xnoise-0.2.21/libxnoise/ExtraWidgets/xnoise-app-menu-button.c --- xnoise-0.2.20/libxnoise/ExtraWidgets/xnoise-app-menu-button.c 2013-12-11 11:24:23.000000000 +0000 +++ xnoise-0.2.21/libxnoise/ExtraWidgets/xnoise-app-menu-button.c 2014-01-27 09:32:56.000000000 +0000 @@ -99,16 +99,16 @@ static gboolean _xnoise_app_menu_button_on_button_pressed_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self); static gboolean xnoise_app_menu_button_on_button_released (XnoiseAppMenuButton* self, GdkEventButton* e); static gboolean _xnoise_app_menu_button_on_button_released_gtk_widget_button_release_event (GtkWidget* _sender, GdkEventButton* event, gpointer self); -static void __lambda134_ (Block58Data* _data58_); -static gboolean __lambda135_ (Block58Data* _data58_); -static gboolean ___lambda135__gsource_func (gpointer self); -static void ___lambda134__gtk_menu_shell_deactivate (GtkMenuShell* _sender, gpointer self); +static void __lambda132_ (Block58Data* _data58_); +static gboolean __lambda133_ (Block58Data* _data58_); +static gboolean ___lambda133__gsource_func (gpointer self); +static void ___lambda132__gtk_menu_shell_deactivate (GtkMenuShell* _sender, gpointer self); static Block59Data* block59_data_ref (Block59Data* _data59_); static void block59_data_unref (void * _userdata_); -static gboolean __lambda133_ (Block59Data* _data59_); +static gboolean __lambda131_ (Block59Data* _data59_); static void xnoise_app_menu_button_position_menu (XnoiseAppMenuButton* self, GtkMenu* menu, gint* x, gint* y, gboolean* push); static void _xnoise_app_menu_button_position_menu_gtk_menu_position_func (GtkMenu* menu, gint* x, gint* y, gboolean* push_in, gpointer self); -static gboolean ___lambda133__gsource_func (gpointer self); +static gboolean ___lambda131__gsource_func (gpointer self); static void xnoise_app_menu_button_real_show_all (GtkWidget* base); static void xnoise_app_menu_button_finalize (GObject* obj); @@ -151,7 +151,7 @@ } -static gboolean __lambda135_ (Block58Data* _data58_) { +static gboolean __lambda133_ (Block58Data* _data58_) { XnoiseAppMenuButton * self; gboolean result = FALSE; GtkToggleButton* _tmp0_ = NULL; @@ -167,14 +167,14 @@ } -static gboolean ___lambda135__gsource_func (gpointer self) { +static gboolean ___lambda133__gsource_func (gpointer self) { gboolean result; - result = __lambda135_ (self); + result = __lambda133_ (self); return result; } -static void __lambda134_ (Block58Data* _data58_) { +static void __lambda132_ (Block58Data* _data58_) { XnoiseAppMenuButton * self; guint _tmp0_ = 0U; guint _tmp2_ = 0U; @@ -185,13 +185,13 @@ _tmp1_ = self->priv->deactivtion_src; g_source_remove (_tmp1_); } - _tmp2_ = g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda135__gsource_func, block58_data_ref (_data58_), block58_data_unref); + _tmp2_ = g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda133__gsource_func, block58_data_ref (_data58_), block58_data_unref); self->priv->deactivtion_src = _tmp2_; } -static void ___lambda134__gtk_menu_shell_deactivate (GtkMenuShell* _sender, gpointer self) { - __lambda134_ (self); +static void ___lambda132__gtk_menu_shell_deactivate (GtkMenuShell* _sender, gpointer self) { + __lambda132_ (self); } @@ -291,7 +291,7 @@ _tmp27_ = self->priv->content; g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GTK_TYPE_WIDGET, GtkWidget), "button-release-event", (GCallback) _xnoise_app_menu_button_on_button_released_gtk_widget_button_release_event, self, 0); _tmp28_ = self->priv->menu; - g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GTK_TYPE_MENU_SHELL, GtkMenuShell), "deactivate", (GCallback) ___lambda134__gtk_menu_shell_deactivate, block58_data_ref (_data58_), (GClosureNotify) block58_data_unref, 0); + g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GTK_TYPE_MENU_SHELL, GtkMenuShell), "deactivate", (GCallback) ___lambda132__gtk_menu_shell_deactivate, block58_data_ref (_data58_), (GClosureNotify) block58_data_unref, 0); gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget)); block58_data_unref (_data58_); _data58_ = NULL; @@ -327,7 +327,7 @@ } -static gboolean __lambda133_ (Block59Data* _data59_) { +static gboolean __lambda131_ (Block59Data* _data59_) { XnoiseAppMenuButton * self; gboolean result = FALSE; GtkToggleButton* _tmp0_ = NULL; @@ -365,9 +365,9 @@ } -static gboolean ___lambda133__gsource_func (gpointer self) { +static gboolean ___lambda131__gsource_func (gpointer self) { gboolean result; - result = __lambda133_ (self); + result = __lambda131_ (self); return result; } @@ -401,7 +401,7 @@ _tmp4_ = self->priv->button_press_src; g_source_remove (_tmp4_); } - _tmp5_ = g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda133__gsource_func, block59_data_ref (_data59_), block59_data_unref); + _tmp5_ = g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda131__gsource_func, block59_data_ref (_data59_), block59_data_unref); self->priv->button_press_src = _tmp5_; result = TRUE; block59_data_unref (_data59_); diff -Nru xnoise-0.2.20/libxnoise/ExtraWidgets/xnoise-combo-media-selector.c xnoise-0.2.21/libxnoise/ExtraWidgets/xnoise-combo-media-selector.c --- xnoise-0.2.20/libxnoise/ExtraWidgets/xnoise-combo-media-selector.c 2013-12-11 11:24:23.000000000 +0000 +++ xnoise-0.2.21/libxnoise/ExtraWidgets/xnoise-combo-media-selector.c 2014-01-27 09:32:56.000000000 +0000 @@ -190,14 +190,14 @@ XnoiseIconCellRenderer* xnoise_icon_cell_renderer_construct (GType object_type); static gboolean xnoise_combo_media_selector_separator_func (XnoiseComboMediaSelector* self, GtkTreeModel* model, GtkTreeIter* iter); static gboolean _xnoise_combo_media_selector_separator_func_gtk_tree_view_row_separator_func (GtkTreeModel* model, GtkTreeIter* iter, gpointer self); -static void __lambda462_ (XnoiseComboMediaSelector* self); +static void __lambda460_ (XnoiseComboMediaSelector* self); void xnoise_media_selector_select_without_signal_emmission (XnoiseMediaSelector* self, const gchar* name); const gchar* xnoise_media_selector_get_selected_dockable_media (XnoiseMediaSelector* self); GType xnoise_global_access_get_type (void) G_GNUC_CONST; void xnoise_global_access_set_active_dockable_media_name (XnoiseGlobalAccess* self, const gchar* value); -static void ___lambda462__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); -static void __lambda463_ (XnoiseComboMediaSelector* self, GtkComboBox* a); -static void ___lambda463__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self); +static void ___lambda460__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); +static void __lambda461_ (XnoiseComboMediaSelector* self, GtkComboBox* a); +static void ___lambda461__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self); static void xnoise_combo_media_selector_build_model (XnoiseComboMediaSelector* self); static void xnoise_combo_media_selector_connect_signal_handlers (XnoiseComboMediaSelector* self); gpointer xnoise_dockable_media_manager_ref (gpointer instance); @@ -269,7 +269,7 @@ } -static void __lambda462_ (XnoiseComboMediaSelector* self) { +static void __lambda460_ (XnoiseComboMediaSelector* self) { const gchar* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; XnoiseGlobalAccess* _tmp2_ = NULL; @@ -285,12 +285,12 @@ } -static void ___lambda462__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { - __lambda462_ (self); +static void ___lambda460__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { + __lambda460_ (self); } -static void __lambda463_ (XnoiseComboMediaSelector* self, GtkComboBox* a) { +static void __lambda461_ (XnoiseComboMediaSelector* self, GtkComboBox* a) { GtkTreeModel* _tmp0_ = NULL; GtkTreeIter iter = {0}; GtkTreeIter _tmp1_ = {0}; @@ -310,8 +310,8 @@ } -static void ___lambda463__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { - __lambda463_ (self, _sender); +static void ___lambda461__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { + __lambda461_ (self, _sender); } @@ -342,8 +342,8 @@ gtk_combo_box_set_row_separator_func (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_COMBO_BOX, GtkComboBox), _xnoise_combo_media_selector_separator_func_gtk_tree_view_row_separator_func, g_object_ref (self), g_object_unref); _tmp3_ = self->priv->store; gtk_combo_box_set_model (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_COMBO_BOX, GtkComboBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GTK_TYPE_TREE_MODEL, GtkTreeModel)); - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, G_TYPE_OBJECT, GObject), "notify::selected-dockable-media", (GCallback) ___lambda462__g_object_notify, self, 0); - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_COMBO_BOX, GtkComboBox), "changed", (GCallback) ___lambda463__gtk_combo_box_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, G_TYPE_OBJECT, GObject), "notify::selected-dockable-media", (GCallback) ___lambda460__g_object_notify, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_COMBO_BOX, GtkComboBox), "changed", (GCallback) ___lambda461__gtk_combo_box_changed, self, 0); gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget)); xnoise_combo_media_selector_build_model (self); xnoise_combo_media_selector_connect_signal_handlers (self); diff -Nru xnoise-0.2.20/libxnoise/ExtraWidgets/xnoise-equalizer-widget.c xnoise-0.2.21/libxnoise/ExtraWidgets/xnoise-equalizer-widget.c --- xnoise-0.2.20/libxnoise/ExtraWidgets/xnoise-equalizer-widget.c 2013-12-11 11:24:23.000000000 +0000 +++ xnoise-0.2.21/libxnoise/ExtraWidgets/xnoise-equalizer-widget.c 2014-01-27 09:32:56.000000000 +0000 @@ -182,11 +182,11 @@ static void xnoise_equalizer_widget_equalizer_scale_set_gain (XnoiseEqualizerWidgetEqualizerScale* self, gdouble gain); void xnoise_gst_equalizer_set (XnoiseGstEqualizer* self, gint idx, gdouble gain); gdouble xnoise_gst_equalizer_ten_band_preset_get_pre_gain (XnoiseGstEqualizerTenBandPreset* self); -static gboolean ___lambda209_ (XnoiseEqualizerWidget* self); -static gboolean ____lambda209__gsource_func (gpointer self); +static gboolean ___lambda207_ (XnoiseEqualizerWidget* self); +static gboolean ____lambda207__gsource_func (gpointer self); void xnoise_params_set_string_value (const gchar* key, const gchar* val); -static gboolean __lambda210_ (XnoiseEqualizerWidget* self); -static gboolean ___lambda210__gsource_func (gpointer self); +static gboolean __lambda208_ (XnoiseEqualizerWidget* self); +static gboolean ___lambda208__gsource_func (gpointer self); static void xnoise_equalizer_widget_on_eq_scale_value_changed (XnoiseEqualizerWidget* self, XnoiseEqualizerWidgetEqualizerScale* sender, gint idx, gdouble val); static void xnoise_equalizer_widget_on_preamp_changed (XnoiseEqualizerWidget* self, GtkRange* sender); GType xnoise_gst_player_get_type (void) G_GNUC_CONST; @@ -198,18 +198,18 @@ static void _xnoise_equalizer_widget_on_preset_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self); gboolean xnoise_params_get_bool_value (const gchar* key); void xnoise_equalizer_widget_set_eq_active (XnoiseEqualizerWidget* self, gboolean value); -static void __lambda211_ (XnoiseEqualizerWidget* self); +static void __lambda209_ (XnoiseEqualizerWidget* self); void xnoise_params_set_bool_value (const gchar* key, gboolean val); -static void ___lambda211__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); +static void ___lambda209__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); void xnoise_gst_equalizer_get_frequencies (XnoiseGstEqualizer* self, gint** freqs, int* freqs_length1); gdouble xnoise_gst_player_get_preamplification (XnoiseGstPlayer* self); static void _xnoise_equalizer_widget_on_preamp_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self); -static void __lambda212_ (XnoiseEqualizerWidget* self); +static void __lambda210_ (XnoiseEqualizerWidget* self); static void xnoise_equalizer_widget_equalizer_scale_restore (XnoiseEqualizerWidgetEqualizerScale* self); gdouble xnoise_params_get_double_value (const gchar* key); -static void ___lambda212__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); -static gboolean __lambda213_ (XnoiseEqualizerWidget* self); -static gboolean ___lambda213__gsource_func (gpointer self); +static void ___lambda210__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); +static gboolean __lambda211_ (XnoiseEqualizerWidget* self); +static gboolean ___lambda211__gsource_func (gpointer self); static XnoiseEqualizerWidgetEqualizerScale* xnoise_equalizer_widget_equalizer_scale_new (XnoiseEqualizerWidget* eq_widget, XnoiseGstEqualizer* equalizer, gint idx, gint frequency); static XnoiseEqualizerWidgetEqualizerScale* xnoise_equalizer_widget_equalizer_scale_construct (GType object_type, XnoiseEqualizerWidget* eq_widget, XnoiseGstEqualizer* equalizer, gint idx, gint frequency); static void _xnoise_equalizer_widget_on_eq_scale_value_changed_xnoise_equalizer_widget_equalizer_scale_value_changed (XnoiseEqualizerWidgetEqualizerScale* _sender, gint index, gdouble new_val, gpointer self); @@ -221,8 +221,8 @@ static void xnoise_equalizer_widget_equalizer_scale_on_value_changed (XnoiseEqualizerWidgetEqualizerScale* self, GtkRange* sender); gdouble xnoise_gst_equalizer_get (XnoiseGstEqualizer* self, gint idx); static void _xnoise_equalizer_widget_equalizer_scale_on_value_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self); -static void __lambda208_ (XnoiseEqualizerWidgetEqualizerScale* self); -static void ___lambda208__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); +static void __lambda206_ (XnoiseEqualizerWidgetEqualizerScale* self); +static void ___lambda206__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); static void g_cclosure_user_marshal_VOID__INT_DOUBLE (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); static void xnoise_equalizer_widget_equalizer_scale_finalize (GObject* obj); static void xnoise_equalizer_widget_finalize (GObject* obj); @@ -254,7 +254,7 @@ } -static gboolean ___lambda209_ (XnoiseEqualizerWidget* self) { +static gboolean ___lambda207_ (XnoiseEqualizerWidget* self) { gboolean result = FALSE; self->priv->in_load_preset = FALSE; result = FALSE; @@ -262,14 +262,14 @@ } -static gboolean ____lambda209__gsource_func (gpointer self) { +static gboolean ____lambda207__gsource_func (gpointer self) { gboolean result; - result = ___lambda209_ (self); + result = ___lambda207_ (self); return result; } -static gboolean __lambda210_ (XnoiseEqualizerWidget* self) { +static gboolean __lambda208_ (XnoiseEqualizerWidget* self) { gboolean result = FALSE; self->priv->in_load_preset = FALSE; result = FALSE; @@ -277,9 +277,9 @@ } -static gboolean ___lambda210__gsource_func (gpointer self) { +static gboolean ___lambda208__gsource_func (gpointer self) { gboolean result; - result = __lambda210_ (self); + result = __lambda208_ (self); return result; } @@ -388,7 +388,7 @@ _tmp24_ = xnoise_gst_equalizer_ten_band_preset_get_pre_gain (_tmp23_); _tmp25_ = _tmp24_; gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GTK_TYPE_RANGE, GtkRange), _tmp25_); - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda209__gsource_func, g_object_ref (self), g_object_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda207__gsource_func, g_object_ref (self), g_object_unref); _g_object_unref0 (sc); _xnoise_gst_equalizer_ten_band_preset_unref0 (pres); return; @@ -490,7 +490,7 @@ _tmp58_ = xnoise_gst_equalizer_ten_band_preset_get_pre_gain (_tmp57_); _tmp59_ = _tmp58_; gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GTK_TYPE_RANGE, GtkRange), _tmp59_); - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda210__gsource_func, g_object_ref (self), g_object_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda208__gsource_func, g_object_ref (self), g_object_unref); _g_free0 (s); _g_object_unref0 (sc); _xnoise_gst_equalizer_ten_band_preset_unref0 (pres); @@ -546,7 +546,7 @@ } -static void __lambda211_ (XnoiseEqualizerWidget* self) { +static void __lambda209_ (XnoiseEqualizerWidget* self) { GtkSwitch* _tmp0_ = NULL; gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; @@ -563,8 +563,8 @@ } -static void ___lambda211__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { - __lambda211_ (self); +static void ___lambda209__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { + __lambda209_ (self); } @@ -573,7 +573,7 @@ } -static void __lambda212_ (XnoiseEqualizerWidget* self) { +static void __lambda210_ (XnoiseEqualizerWidget* self) { GtkScale* _tmp0_ = NULL; gboolean _tmp1_ = FALSE; GtkComboBoxText* _tmp2_ = NULL; @@ -631,12 +631,12 @@ } -static void ___lambda212__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { - __lambda212_ (self); +static void ___lambda210__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { + __lambda210_ (self); } -static gboolean __lambda213_ (XnoiseEqualizerWidget* self) { +static gboolean __lambda211_ (XnoiseEqualizerWidget* self) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; _tmp0_ = self->priv->_eq_active; @@ -666,9 +666,9 @@ } -static gboolean ___lambda213__gsource_func (gpointer self) { +static gboolean ___lambda211__gsource_func (gpointer self) { gboolean result; - result = __lambda213_ (self); + result = __lambda211_ (self); return result; } @@ -860,7 +860,7 @@ _tmp37_ = self->priv->_eq_active; gtk_switch_set_active (_tmp36_, _tmp37_); _tmp38_ = self->priv->on_off_switch; - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, G_TYPE_OBJECT, GObject), "notify::active", (GCallback) ___lambda211__g_object_notify, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, G_TYPE_OBJECT, GObject), "notify::active", (GCallback) ___lambda209__g_object_notify, self, 0); _tmp39_ = (GtkLabel*) gtk_label_new (""); g_object_ref_sink (_tmp39_); l = _tmp39_; @@ -933,8 +933,8 @@ _tmp75_ = self->priv->c; _tmp76_ = self->priv->_eq_active; gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, GTK_TYPE_WIDGET, GtkWidget), _tmp76_); - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, G_TYPE_OBJECT, GObject), "notify::eq-active", (GCallback) ___lambda212__g_object_notify, self, 0); - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda213__gsource_func, g_object_ref (self), g_object_unref); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, G_TYPE_OBJECT, GObject), "notify::eq-active", (GCallback) ___lambda210__g_object_notify, self, 0); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda211__gsource_func, g_object_ref (self), g_object_unref); { gint i = 0; i = 0; @@ -1220,7 +1220,7 @@ } -static void __lambda208_ (XnoiseEqualizerWidgetEqualizerScale* self) { +static void __lambda206_ (XnoiseEqualizerWidgetEqualizerScale* self) { GtkScale* _tmp0_ = NULL; XnoiseEqualizerWidget* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; @@ -1233,8 +1233,8 @@ } -static void ___lambda208__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { - __lambda208_ (self); +static void ___lambda206__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { + __lambda206_ (self); } @@ -1349,7 +1349,7 @@ _tmp36_ = _tmp35_; gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GTK_TYPE_WIDGET, GtkWidget), _tmp36_); _tmp37_ = self->priv->eq_widget; - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, G_TYPE_OBJECT, GObject), "notify::eq-active", (GCallback) ___lambda208__g_object_notify, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, G_TYPE_OBJECT, GObject), "notify::eq-active", (GCallback) ___lambda206__g_object_notify, self, 0); _g_object_unref0 (l); } diff -Nru xnoise-0.2.20/libxnoise/ExtraWidgets/xnoise-first-start-widget.c xnoise-0.2.21/libxnoise/ExtraWidgets/xnoise-first-start-widget.c --- xnoise-0.2.20/libxnoise/ExtraWidgets/xnoise-first-start-widget.c 2013-12-11 11:24:23.000000000 +0000 +++ xnoise-0.2.21/libxnoise/ExtraWidgets/xnoise-first-start-widget.c 2014-01-27 09:32:56.000000000 +0000 @@ -210,12 +210,12 @@ void xnoise_media_importer_add_import_target_folder (XnoiseMediaImporter* self, XnoiseItem* target, gboolean add_folder_to_media_folders); static void _g_slist_free__g_free0_ (GSList* self); static void _xnoise_first_start_widget_on_add_folder_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self); -static void ___lambda184_ (XnoiseFirstStartWidget* self); -static void ____lambda184__gtk_button_clicked (GtkButton* _sender, gpointer self); +static void ___lambda182_ (XnoiseFirstStartWidget* self); +static void ____lambda182__gtk_button_clicked (GtkButton* _sender, gpointer self); GType xnoise_global_access_get_type (void) G_GNUC_CONST; -static void ___lambda185_ (XnoiseFirstStartWidget* self); +static void ___lambda183_ (XnoiseFirstStartWidget* self); gboolean xnoise_global_access_get_media_import_in_progress (XnoiseGlobalAccess* self); -static void ____lambda185__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); +static void ____lambda183__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); static void xnoise_first_start_widget_finalize (GObject* obj); @@ -420,19 +420,19 @@ } -static void ___lambda184_ (XnoiseFirstStartWidget* self) { +static void ___lambda182_ (XnoiseFirstStartWidget* self) { GtkNotebook* _tmp0_ = NULL; _tmp0_ = self->priv->nb; gtk_notebook_set_current_page (_tmp0_, 1); } -static void ____lambda184__gtk_button_clicked (GtkButton* _sender, gpointer self) { - ___lambda184_ (self); +static void ____lambda182__gtk_button_clicked (GtkButton* _sender, gpointer self) { + ___lambda182_ (self); } -static void ___lambda185_ (XnoiseFirstStartWidget* self) { +static void ___lambda183_ (XnoiseFirstStartWidget* self) { GtkSpinner* _tmp0_ = NULL; XnoiseGlobalAccess* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; @@ -516,8 +516,8 @@ } -static void ____lambda185__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { - ___lambda185_ (self); +static void ____lambda183__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { + ___lambda183_ (self); } @@ -721,7 +721,7 @@ _tmp26_ = _ ("Done"); gtk_button_set_label (_tmp25_, _tmp26_); _tmp27_ = self->finish_button; - g_signal_connect_object (_tmp27_, "clicked", (GCallback) ____lambda184__gtk_button_clicked, self, 0); + g_signal_connect_object (_tmp27_, "clicked", (GCallback) ____lambda182__gtk_button_clicked, self, 0); _tmp28_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 5); g_object_ref_sink (_tmp28_); _g_object_unref0 (self->priv->waitbox); @@ -784,7 +784,7 @@ _tmp63_ = _ ("Add more media folders"); gtk_button_set_label (_tmp62_, _tmp63_); _tmp64_ = xnoise_global; - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, G_TYPE_OBJECT, GObject), "notify::media-import-in-progress", (GCallback) ____lambda185__g_object_notify, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, G_TYPE_OBJECT, GObject), "notify::media-import-in-progress", (GCallback) ____lambda183__g_object_notify, self, 0); _tmp65_ = gb; _tmp66_ = gtk_builder_get_object (_tmp65_, "imported_folders_label"); _tmp67_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp66_, GTK_TYPE_LABEL) ? ((GtkLabel*) _tmp66_) : NULL); diff -Nru xnoise-0.2.20/libxnoise/ExtraWidgets/xnoise-media-source-widget.c xnoise-0.2.21/libxnoise/ExtraWidgets/xnoise-media-source-widget.c --- xnoise-0.2.20/libxnoise/ExtraWidgets/xnoise-media-source-widget.c 2013-12-11 11:24:23.000000000 +0000 +++ xnoise-0.2.21/libxnoise/ExtraWidgets/xnoise-media-source-widget.c 2014-01-27 09:32:56.000000000 +0000 @@ -214,8 +214,8 @@ GtkWidget* xnoise_dockable_media_create_widget (XnoiseDockableMedia* self, XnoiseMainWindow* window); static void xnoise_media_soure_widget_remove_page (XnoiseMediaSoureWidget* self, const gchar* name); void xnoise_dockable_media_remove_main_view (XnoiseDockableMedia* self); -static gboolean __lambda183_ (XnoiseMediaSoureWidget* self); -static gboolean ___lambda183__gsource_func (gpointer self); +static gboolean __lambda181_ (XnoiseMediaSoureWidget* self); +static gboolean ___lambda181__gsource_func (gpointer self); static void xnoise_media_soure_widget_on_media_inserted (XnoiseMediaSoureWidget* self, const gchar* name); static void xnoise_media_soure_widget_set_search_entry (XnoiseMediaSoureWidget* self, GtkEntry* value); GtkEntry* xnoise_media_soure_widget_get_search_entry (XnoiseMediaSoureWidget* self); @@ -223,9 +223,9 @@ XnoiseSideBarHeadline* xnoise_side_bar_headline_construct (GType object_type, const gchar* headline); static void xnoise_media_soure_widget_build_media_selector (XnoiseMediaSoureWidget* self); GType xnoise_global_access_get_type (void) G_GNUC_CONST; -static void __lambda182_ (XnoiseMediaSoureWidget* self); +static void __lambda180_ (XnoiseMediaSoureWidget* self); const gchar* xnoise_global_access_get_active_dockable_media_name (XnoiseGlobalAccess* self); -static void ___lambda182__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); +static void ___lambda180__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); GList* xnoise_dockable_media_manager_get_keys (XnoiseDockableMediaManager* self); static void xnoise_media_soure_widget_on_media_removed (XnoiseMediaSoureWidget* self, const gchar* name); static void _xnoise_media_soure_widget_on_media_removed_xnoise_dockable_media_manager_media_removed (XnoiseDockableMediaManager* _sender, const gchar* key, gpointer self); @@ -461,7 +461,7 @@ } -static gboolean __lambda183_ (XnoiseMediaSoureWidget* self) { +static gboolean __lambda181_ (XnoiseMediaSoureWidget* self) { gboolean result = FALSE; xnoise_media_soure_widget_set_focus_on_selector (self); result = FALSE; @@ -469,9 +469,9 @@ } -static gboolean ___lambda183__gsource_func (gpointer self) { +static gboolean ___lambda181__gsource_func (gpointer self) { gboolean result; - result = __lambda183_ (self); + result = __lambda181_ (self); return result; } @@ -520,7 +520,7 @@ _tmp14_ = gtk_notebook_page_num (_tmp11_, _tmp13_); gtk_notebook_remove_page (_tmp10_, _tmp14_); } - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda183__gsource_func, g_object_ref (self), g_object_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda181__gsource_func, g_object_ref (self), g_object_unref); _g_object_unref0 (d); } @@ -551,7 +551,7 @@ } -static void __lambda182_ (XnoiseMediaSoureWidget* self) { +static void __lambda180_ (XnoiseMediaSoureWidget* self) { XnoiseGlobalAccess* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; const gchar* _tmp2_ = NULL; @@ -562,8 +562,8 @@ } -static void ___lambda182__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { - __lambda182_ (self); +static void ___lambda180__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { + __lambda180_ (self); } @@ -678,7 +678,7 @@ gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_BOX, GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GTK_TYPE_WIDGET, GtkWidget), FALSE, FALSE, (guint) 0); xnoise_media_soure_widget_build_media_selector (self); _tmp25_ = xnoise_global; - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, G_TYPE_OBJECT, GObject), "notify::active-dockable-media-name", (GCallback) ___lambda182__g_object_notify, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, G_TYPE_OBJECT, GObject), "notify::active-dockable-media-name", (GCallback) ___lambda180__g_object_notify, self, 0); _tmp26_ = xnoise_side_bar_headline_new (""); g_object_ref_sink (_tmp26_); _g_object_unref0 (self->priv->current_selected_media); diff -Nru xnoise-0.2.20/libxnoise/ExtraWidgets/xnoise-trackinfo-bar.c xnoise-0.2.21/libxnoise/ExtraWidgets/xnoise-trackinfo-bar.c --- xnoise-0.2.20/libxnoise/ExtraWidgets/xnoise-trackinfo-bar.c 2013-12-11 11:24:23.000000000 +0000 +++ xnoise-0.2.21/libxnoise/ExtraWidgets/xnoise-trackinfo-bar.c 2014-01-27 09:32:56.000000000 +0000 @@ -182,9 +182,9 @@ static void _xnoise_track_infobar_on_eos_xnoise_global_access_caught_eos_from_player (XnoiseGlobalAccess* _sender, gpointer self); static void xnoise_track_infobar_on_stopped (XnoiseTrackInfobar* self); static void _xnoise_track_infobar_on_stopped_xnoise_gst_player_sign_stopped (XnoiseGstPlayer* _sender, gpointer self); -static void __lambda138_ (XnoiseTrackInfobar* self); +static void __lambda136_ (XnoiseTrackInfobar* self); gboolean xnoise_gst_player_get_is_stream (XnoiseGstPlayer* self); -static void ___lambda138__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); +static void ___lambda136__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); static gboolean xnoise_track_infobar_is_rtl (void); gboolean xnoise_gst_player_get_playing (XnoiseGstPlayer* self); gboolean xnoise_gst_player_get_paused (XnoiseGstPlayer* self); @@ -195,11 +195,11 @@ gint64 xnoise_gst_player_get_length_nsecs (XnoiseGstPlayer* self); static Block61Data* block61_data_ref (Block61Data* _data61_); static void block61_data_unref (void * _userdata_); -static gboolean __lambda137_ (Block61Data* _data61_); +static gboolean __lambda135_ (Block61Data* _data61_); GType xnoise_player_state_get_type (void) G_GNUC_CONST; XnoisePlayerState xnoise_global_access_get_player_state (XnoiseGlobalAccess* self); void xnoise_gst_player_request_time_offset (XnoiseGstPlayer* self, gint seconds); -static gboolean ___lambda137__gsource_func (gpointer self); +static gboolean ___lambda135__gsource_func (gpointer self); static XnoiseTrackInfobarCustomLabel* xnoise_track_infobar_custom_label_new (const gchar* txt); static XnoiseTrackInfobarCustomLabel* xnoise_track_infobar_custom_label_construct (GType object_type, const gchar* txt); static XnoiseTrackInfobarCustomProgress* xnoise_track_infobar_custom_progress_new (void); @@ -255,7 +255,7 @@ } -static void __lambda138_ (XnoiseTrackInfobar* self) { +static void __lambda136_ (XnoiseTrackInfobar* self) { XnoiseGstPlayer* _tmp0_ = NULL; gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; @@ -280,8 +280,8 @@ } -static void ___lambda138__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { - __lambda138_ (self); +static void ___lambda136__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { + __lambda136_ (self); } @@ -313,7 +313,7 @@ _tmp6_ = self->priv->player; g_signal_connect_object (_tmp6_, "sign-stopped", (GCallback) _xnoise_track_infobar_on_stopped_xnoise_gst_player_sign_stopped, self, 0); _tmp7_ = self->priv->player; - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, G_TYPE_OBJECT, GObject), "notify::is-stream", (GCallback) ___lambda138__g_object_notify, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, G_TYPE_OBJECT, GObject), "notify::is-stream", (GCallback) ___lambda136__g_object_notify, self, 0); return self; } @@ -680,7 +680,7 @@ } -static gboolean __lambda137_ (Block61Data* _data61_) { +static gboolean __lambda135_ (Block61Data* _data61_) { XnoiseTrackInfobar * self; gboolean result = FALSE; XnoiseGlobalAccess* _tmp0_ = NULL; @@ -712,9 +712,9 @@ } -static gboolean ___lambda137__gsource_func (gpointer self) { +static gboolean ___lambda135__gsource_func (gpointer self) { gboolean result; - result = __lambda137_ (self); + result = __lambda135_ (self); return result; } @@ -760,7 +760,7 @@ _tmp7_ = self->priv->scroll_source; g_source_remove (_tmp7_); } - _tmp8_ = g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda137__gsource_func, block61_data_ref (_data61_), block61_data_unref); + _tmp8_ = g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda135__gsource_func, block61_data_ref (_data61_), block61_data_unref); self->priv->scroll_source = _tmp8_; result = TRUE; block61_data_unref (_data61_); diff -Nru xnoise-0.2.20/libxnoise/ExtraWidgets/xnoise-tree-media-selector.c xnoise-0.2.21/libxnoise/ExtraWidgets/xnoise-tree-media-selector.c --- xnoise-0.2.20/libxnoise/ExtraWidgets/xnoise-tree-media-selector.c 2013-12-11 11:24:23.000000000 +0000 +++ xnoise-0.2.21/libxnoise/ExtraWidgets/xnoise-tree-media-selector.c 2014-01-27 09:32:56.000000000 +0000 @@ -385,12 +385,12 @@ static gboolean _xnoise_tree_media_selector_on_key_released_gtk_widget_key_release_event (GtkWidget* _sender, GdkEventKey* event, gpointer self); static gboolean xnoise_tree_media_selector_on_button_pressed (XnoiseTreeMediaSelector* self, GdkEventButton* e); static gboolean _xnoise_tree_media_selector_on_button_pressed_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self); -static void __lambda171_ (XnoiseTreeMediaSelector* self); +static void __lambda169_ (XnoiseTreeMediaSelector* self); GType xnoise_global_access_get_type (void) G_GNUC_CONST; const gchar* xnoise_media_selector_get_selected_dockable_media (XnoiseMediaSelector* self); void xnoise_global_access_set_active_dockable_media_name (XnoiseGlobalAccess* self, const gchar* value); void xnoise_media_selector_select_without_signal_emmission (XnoiseMediaSelector* self, const gchar* name); -static void ___lambda171__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); +static void ___lambda169__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); static void xnoise_tree_media_selector_build_model (XnoiseTreeMediaSelector* self); gpointer xnoise_dockable_media_manager_ref (gpointer instance); void xnoise_dockable_media_manager_unref (gpointer instance); @@ -403,36 +403,36 @@ static void _xnoise_tree_media_selector_on_media_inserted_xnoise_dockable_media_manager_media_inserted (XnoiseDockableMediaManager* _sender, const gchar* key, gpointer self); static void xnoise_tree_media_selector_on_media_removed (XnoiseTreeMediaSelector* self, const gchar* name); static void _xnoise_tree_media_selector_on_media_removed_xnoise_dockable_media_manager_media_removed (XnoiseDockableMediaManager* _sender, const gchar* key, gpointer self); -static gboolean __lambda176_ (Block62Data* _data62_); +static gboolean __lambda174_ (Block62Data* _data62_); +static gboolean ___lambda174__gsource_func (gpointer self); +static gboolean __lambda175_ (XnoiseTreeMediaSelector* self); +static gboolean ___lambda175__gsource_func (gpointer self); +static gboolean __lambda176_ (XnoiseTreeMediaSelector* self); static gboolean ___lambda176__gsource_func (gpointer self); -static gboolean __lambda177_ (XnoiseTreeMediaSelector* self); -static gboolean ___lambda177__gsource_func (gpointer self); -static gboolean __lambda178_ (XnoiseTreeMediaSelector* self); -static gboolean ___lambda178__gsource_func (gpointer self); static void xnoise_tree_media_selector_real_get_preferred_height (GtkWidget* base, gint* minimum_height, gint* natural_height); -static gboolean ____lambda179_ (XnoiseTreeMediaSelector* self); -static gboolean _____lambda179__gsource_func (gpointer self); -static gboolean ____lambda180_ (XnoiseTreeMediaSelector* self); -static gboolean _____lambda180__gsource_func (gpointer self); -static gboolean ___lambda181_ (XnoiseTreeMediaSelector* self); +static gboolean ____lambda177_ (XnoiseTreeMediaSelector* self); +static gboolean _____lambda177__gsource_func (gpointer self); +static gboolean ____lambda178_ (XnoiseTreeMediaSelector* self); +static gboolean _____lambda178__gsource_func (gpointer self); +static gboolean ___lambda179_ (XnoiseTreeMediaSelector* self); static void _gtk_tree_path_free0_ (gpointer var); static void _g_list_free__gtk_tree_path_free0_ (GList* self); -static gboolean ____lambda181__gsource_func (gpointer self); +static gboolean ____lambda179__gsource_func (gpointer self); static void xnoise_tree_media_selector_real_select_without_signal_emmission (XnoiseMediaSelector* base, const gchar* dockable_name); static Block63Data* block63_data_ref (Block63Data* _data63_); static void block63_data_unref (void * _userdata_); -static gboolean __lambda172_ (Block63Data* _data63_, GtkTreeModel* m, GtkTreePath* p, GtkTreeIter* i); -static gboolean ___lambda172__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self); -static gboolean ___lambda173_ (XnoiseTreeMediaSelector* self, GtkTreeModel* mo, GtkTreePath* px, GtkTreeIter* iy); -static gboolean ____lambda173__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self); +static gboolean __lambda170_ (Block63Data* _data63_, GtkTreeModel* m, GtkTreePath* p, GtkTreeIter* i); +static gboolean ___lambda170__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self); +static gboolean ___lambda171_ (XnoiseTreeMediaSelector* self, GtkTreeModel* mo, GtkTreePath* px, GtkTreeIter* iy); +static gboolean ____lambda171__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self); GType xnoise_icon_repo_get_type (void) G_GNUC_CONST; GdkPixbuf* xnoise_icon_repo_get_selected_collection_icon (XnoiseIconRepo* self); -static gboolean ___lambda174_ (Block63Data* _data63_); -static gboolean ____lambda174__gsource_func (gpointer self); -static gboolean __lambda170_ (XnoiseTreeMediaSelector* self, GtkTreeModel* mo, GtkTreePath* p, GtkTreeIter* iy); -static gboolean ___lambda170__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self); -static gboolean ____lambda169_ (XnoiseTreeMediaSelector* self, GtkTreeModel* mo, GtkTreePath* p, GtkTreeIter* iy); -static gboolean _____lambda169__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self); +static gboolean ___lambda172_ (Block63Data* _data63_); +static gboolean ____lambda172__gsource_func (gpointer self); +static gboolean __lambda168_ (XnoiseTreeMediaSelector* self, GtkTreeModel* mo, GtkTreePath* p, GtkTreeIter* iy); +static gboolean ___lambda168__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self); +static gboolean ____lambda167_ (XnoiseTreeMediaSelector* self, GtkTreeModel* mo, GtkTreePath* p, GtkTreeIter* iy); +static gboolean _____lambda167__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self); GType xnoise_dockable_media_get_type (void) G_GNUC_CONST; static void xnoise_tree_media_selector_set_row_data (XnoiseTreeMediaSelector* self, GtkTreeIter* iter, XnoiseDockableMedia* media); gchar* xnoise_dockable_media_get_icon_name (XnoiseDockableMedia* self); @@ -448,8 +448,8 @@ XnoiseDockableMedia* xnoise_dockable_media_manager_lookup (XnoiseDockableMediaManager* self, const gchar* key); static Block64Data* block64_data_ref (Block64Data* _data64_); static void block64_data_unref (void * _userdata_); -static gboolean __lambda175_ (Block64Data* _data64_, GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter); -static gboolean ___lambda175__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self); +static gboolean __lambda173_ (Block64Data* _data64_, GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter); +static gboolean ___lambda173__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self); static void xnoise_tree_media_selector_on_category_inserted (XnoiseTreeMediaSelector* self, XnoiseDockableMediaCategory category); static void xnoise_tree_media_selector_on_category_removed (XnoiseTreeMediaSelector* self, XnoiseDockableMediaCategory category); static void xnoise_tree_media_selector_finalize (GObject* obj); @@ -559,7 +559,7 @@ } -static void __lambda171_ (XnoiseTreeMediaSelector* self) { +static void __lambda169_ (XnoiseTreeMediaSelector* self) { XnoiseGlobalAccess* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; const gchar* _tmp2_ = NULL; @@ -575,8 +575,8 @@ } -static void ___lambda171__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { - __lambda171_ (self); +static void ___lambda169__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { + __lambda169_ (self); } @@ -590,7 +590,7 @@ } -static gboolean __lambda176_ (Block62Data* _data62_) { +static gboolean __lambda174_ (Block62Data* _data62_) { XnoiseTreeMediaSelector * self; gboolean result = FALSE; GdkWindow* _tmp0_ = NULL; @@ -625,9 +625,9 @@ } -static gboolean ___lambda176__gsource_func (gpointer self) { +static gboolean ___lambda174__gsource_func (gpointer self) { gboolean result; - result = __lambda176_ (self); + result = __lambda174_ (self); return result; } @@ -686,14 +686,14 @@ gtk_tree_view_set_model (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_TREE_VIEW, GtkTreeView), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GTK_TYPE_TREE_MODEL, GtkTreeModel)); g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), "key-release-event", (GCallback) _xnoise_tree_media_selector_on_key_released_gtk_widget_key_release_event, self, 0); g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), "button-press-event", (GCallback) _xnoise_tree_media_selector_on_button_pressed_gtk_widget_button_press_event, self, 0); - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, G_TYPE_OBJECT, GObject), "notify::selected-dockable-media", (GCallback) ___lambda171__g_object_notify, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, G_TYPE_OBJECT, GObject), "notify::selected-dockable-media", (GCallback) ___lambda169__g_object_notify, self, 0); gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget)); xnoise_tree_media_selector_build_model (self); _tmp10_ = xnoise_dockable_media_sources; g_signal_connect_object (_tmp10_, "media-inserted", (GCallback) _xnoise_tree_media_selector_on_media_inserted_xnoise_dockable_media_manager_media_inserted, self, 0); _tmp11_ = xnoise_dockable_media_sources; g_signal_connect_object (_tmp11_, "media-removed", (GCallback) _xnoise_tree_media_selector_on_media_removed_xnoise_dockable_media_manager_media_removed, self, 0); - g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ___lambda176__gsource_func, block62_data_ref (_data62_), block62_data_unref); + g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ___lambda174__gsource_func, block62_data_ref (_data62_), block62_data_unref); g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), "enter-notify-event", (GCallback) _xnoise_tree_media_selector_on_enter_gtk_widget_enter_notify_event, self, 0); g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), "leave-notify-event", (GCallback) _xnoise_tree_media_selector_on_leave_gtk_widget_leave_notify_event, self, 0); _g_object_unref0 (renderer); @@ -709,7 +709,7 @@ } -static gboolean __lambda177_ (XnoiseTreeMediaSelector* self) { +static gboolean __lambda175_ (XnoiseTreeMediaSelector* self) { gboolean result = FALSE; gtk_widget_queue_resize (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget)); result = FALSE; @@ -717,9 +717,9 @@ } -static gboolean ___lambda177__gsource_func (gpointer self) { +static gboolean ___lambda175__gsource_func (gpointer self) { gboolean result; - result = __lambda177_ (self); + result = __lambda175_ (self); return result; } @@ -728,13 +728,13 @@ gboolean result = FALSE; g_return_val_if_fail (XNOISE_IS_TREE_MEDIA_SELECTOR (self), FALSE); self->priv->mouse_over = TRUE; - g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 300, ___lambda177__gsource_func, g_object_ref (self), g_object_unref); + g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 300, ___lambda175__gsource_func, g_object_ref (self), g_object_unref); result = FALSE; return result; } -static gboolean __lambda178_ (XnoiseTreeMediaSelector* self) { +static gboolean __lambda176_ (XnoiseTreeMediaSelector* self) { gboolean result = FALSE; gtk_widget_queue_resize (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget)); result = FALSE; @@ -742,9 +742,9 @@ } -static gboolean ___lambda178__gsource_func (gpointer self) { +static gboolean ___lambda176__gsource_func (gpointer self) { gboolean result; - result = __lambda178_ (self); + result = __lambda176_ (self); return result; } @@ -753,13 +753,13 @@ gboolean result = FALSE; g_return_val_if_fail (XNOISE_IS_TREE_MEDIA_SELECTOR (self), FALSE); self->priv->mouse_over = FALSE; - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda178__gsource_func, g_object_ref (self), g_object_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda176__gsource_func, g_object_ref (self), g_object_unref); result = FALSE; return result; } -static gboolean ____lambda179_ (XnoiseTreeMediaSelector* self) { +static gboolean ____lambda177_ (XnoiseTreeMediaSelector* self) { gboolean result = FALSE; gtk_widget_queue_resize (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget)); result = FALSE; @@ -767,14 +767,14 @@ } -static gboolean _____lambda179__gsource_func (gpointer self) { +static gboolean _____lambda177__gsource_func (gpointer self) { gboolean result; - result = ____lambda179_ (self); + result = ____lambda177_ (self); return result; } -static gboolean ____lambda180_ (XnoiseTreeMediaSelector* self) { +static gboolean ____lambda178_ (XnoiseTreeMediaSelector* self) { gboolean result = FALSE; gtk_widget_queue_resize (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget)); result = FALSE; @@ -782,9 +782,9 @@ } -static gboolean _____lambda180__gsource_func (gpointer self) { +static gboolean _____lambda178__gsource_func (gpointer self) { gboolean result; - result = ____lambda180_ (self); + result = ____lambda178_ (self); return result; } @@ -800,7 +800,7 @@ } -static gboolean ___lambda181_ (XnoiseTreeMediaSelector* self) { +static gboolean ___lambda179_ (XnoiseTreeMediaSelector* self) { gboolean result = FALSE; GList* list = NULL; GtkTreeSelection* _tmp0_ = NULL; @@ -827,9 +827,9 @@ } -static gboolean ____lambda181__gsource_func (gpointer self) { +static gboolean ____lambda179__gsource_func (gpointer self) { gboolean result; - result = ___lambda181_ (self); + result = ___lambda179_ (self); return result; } @@ -888,7 +888,7 @@ _tmp16_ = _vala_minimum_height; _vala_natural_height = _tmp16_; _tmp17_ = self->priv->ANIMATION_SPEED; - g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) _tmp17_, _____lambda179__gsource_func, g_object_ref (self), g_object_unref); + g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) _tmp17_, _____lambda177__gsource_func, g_object_ref (self), g_object_unref); if (minimum_height) { *minimum_height = _vala_minimum_height; } @@ -934,7 +934,7 @@ _tmp28_ = _vala_minimum_height; _vala_natural_height = _tmp28_; _tmp29_ = self->priv->ANIMATION_SPEED; - g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) _tmp29_, _____lambda180__gsource_func, g_object_ref (self), g_object_unref); + g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) _tmp29_, _____lambda178__gsource_func, g_object_ref (self), g_object_unref); if (minimum_height) { *minimum_height = _vala_minimum_height; } @@ -956,7 +956,7 @@ _tmp33_ = self->priv->scroll_source; g_source_remove (_tmp33_); } - _tmp34_ = g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda181__gsource_func, g_object_ref (self), g_object_unref); + _tmp34_ = g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda179__gsource_func, g_object_ref (self), g_object_unref); self->priv->scroll_source = _tmp34_; } if (minimum_height) { @@ -990,7 +990,7 @@ } -static gboolean __lambda172_ (Block63Data* _data63_, GtkTreeModel* m, GtkTreePath* p, GtkTreeIter* i) { +static gboolean __lambda170_ (Block63Data* _data63_, GtkTreeModel* m, GtkTreePath* p, GtkTreeIter* i) { XnoiseTreeMediaSelector * self; gboolean result = FALSE; GtkTreeModel* _tmp0_ = NULL; @@ -1023,14 +1023,14 @@ } -static gboolean ___lambda172__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self) { +static gboolean ___lambda170__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self) { gboolean result; - result = __lambda172_ (self, model, path, iter); + result = __lambda170_ (self, model, path, iter); return result; } -static gboolean ___lambda173_ (XnoiseTreeMediaSelector* self, GtkTreeModel* mo, GtkTreePath* px, GtkTreeIter* iy) { +static gboolean ___lambda171_ (XnoiseTreeMediaSelector* self, GtkTreeModel* mo, GtkTreePath* px, GtkTreeIter* iy) { gboolean result = FALSE; GtkListStore* mx = NULL; GtkTreeModel* _tmp0_ = NULL; @@ -1050,14 +1050,14 @@ } -static gboolean ____lambda173__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self) { +static gboolean ____lambda171__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self) { gboolean result; - result = ___lambda173_ (self, model, path, iter); + result = ___lambda171_ (self, model, path, iter); return result; } -static gboolean ___lambda174_ (Block63Data* _data63_) { +static gboolean ___lambda172_ (Block63Data* _data63_) { XnoiseTreeMediaSelector * self; gboolean result = FALSE; GtkTreeSelection* _tmp0_ = NULL; @@ -1074,9 +1074,9 @@ } -static gboolean ____lambda174__gsource_func (gpointer self) { +static gboolean ____lambda172__gsource_func (gpointer self) { gboolean result; - result = ___lambda174_ (self); + result = ___lambda172_ (self); return result; } @@ -1107,7 +1107,7 @@ _data63_->name = NULL; _tmp4_ = gtk_tree_view_get_model (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_TREE_VIEW, GtkTreeView)); _tmp5_ = _tmp4_; - gtk_tree_model_foreach (_tmp5_, ___lambda172__gtk_tree_model_foreach_func, _data63_); + gtk_tree_model_foreach (_tmp5_, ___lambda170__gtk_tree_model_foreach_func, _data63_); _tmp6_ = _data63_->path; if (_tmp6_ != NULL) { GtkTreeModel* _tmp7_ = NULL; @@ -1125,7 +1125,7 @@ GdkPixbuf* _tmp18_ = NULL; _tmp7_ = gtk_tree_view_get_model (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_TREE_VIEW, GtkTreeView)); _tmp8_ = _tmp7_; - gtk_tree_model_foreach (_tmp8_, ____lambda173__gtk_tree_model_foreach_func, self); + gtk_tree_model_foreach (_tmp8_, ____lambda171__gtk_tree_model_foreach_func, self); _tmp9_ = gtk_tree_view_get_model (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_TREE_VIEW, GtkTreeView)); _tmp10_ = _tmp9_; _tmp11_ = _data63_->path; @@ -1138,7 +1138,7 @@ _tmp17_ = xnoise_icon_repo_get_selected_collection_icon (_tmp16_); _tmp18_ = _tmp17_; gtk_list_store_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GTK_TYPE_LIST_STORE, GtkListStore), &_tmp15_, XNOISE_TREE_MEDIA_SELECTOR_COLUMN_SELECTION_STATE, TRUE, XNOISE_TREE_MEDIA_SELECTOR_COLUMN_SELECTION_ICON, _tmp18_, -1); - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda174__gsource_func, block63_data_ref (_data63_), block63_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda172__gsource_func, block63_data_ref (_data63_), block63_data_unref); } else { g_print ("couldn't find treepath\n"); } @@ -1147,7 +1147,7 @@ } -static gboolean __lambda170_ (XnoiseTreeMediaSelector* self, GtkTreeModel* mo, GtkTreePath* p, GtkTreeIter* iy) { +static gboolean __lambda168_ (XnoiseTreeMediaSelector* self, GtkTreeModel* mo, GtkTreePath* p, GtkTreeIter* iy) { gboolean result = FALSE; GtkListStore* mx = NULL; GtkTreeModel* _tmp0_ = NULL; @@ -1167,9 +1167,9 @@ } -static gboolean ___lambda170__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self) { +static gboolean ___lambda168__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self) { gboolean result; - result = __lambda170_ (self, model, path, iter); + result = __lambda168_ (self, model, path, iter); return result; } @@ -1240,7 +1240,7 @@ _tmp13_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GTK_TYPE_LIST_STORE, GtkListStore)); m = _tmp13_; _tmp14_ = m; - gtk_tree_model_foreach (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GTK_TYPE_TREE_MODEL, GtkTreeModel), ___lambda170__gtk_tree_model_foreach_func, self); + gtk_tree_model_foreach (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GTK_TYPE_TREE_MODEL, GtkTreeModel), ___lambda168__gtk_tree_model_foreach_func, self); _tmp15_ = m; _tmp16_ = treepath; gtk_tree_model_get_iter (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp17_, _tmp16_); @@ -1277,7 +1277,7 @@ } -static gboolean ____lambda169_ (XnoiseTreeMediaSelector* self, GtkTreeModel* mo, GtkTreePath* p, GtkTreeIter* iy) { +static gboolean ____lambda167_ (XnoiseTreeMediaSelector* self, GtkTreeModel* mo, GtkTreePath* p, GtkTreeIter* iy) { gboolean result = FALSE; GtkListStore* mx = NULL; GtkTreeModel* _tmp0_ = NULL; @@ -1297,9 +1297,9 @@ } -static gboolean _____lambda169__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self) { +static gboolean _____lambda167__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self) { gboolean result; - result = ____lambda169_ (self, model, path, iter); + result = ____lambda167_ (self, model, path, iter); return result; } @@ -1381,7 +1381,7 @@ gtk_tree_model_get_iter (_tmp15_, &_tmp17_, _tmp16_); iter = _tmp17_; _tmp18_ = m; - gtk_tree_model_foreach (_tmp18_, _____lambda169__gtk_tree_model_foreach_func, self); + gtk_tree_model_foreach (_tmp18_, _____lambda167__gtk_tree_model_foreach_func, self); _tmp19_ = treepath; gtk_tree_view_set_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_TREE_VIEW, GtkTreeView), _tmp19_, NULL, FALSE); _tmp20_ = gtk_tree_view_get_model (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_TREE_VIEW, GtkTreeView)); @@ -1646,7 +1646,7 @@ } -static gboolean __lambda175_ (Block64Data* _data64_, GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter) { +static gboolean __lambda173_ (Block64Data* _data64_, GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter) { XnoiseTreeMediaSelector * self; gboolean result = FALSE; GValue v = {0}; @@ -1682,9 +1682,9 @@ } -static gboolean ___lambda175__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self) { +static gboolean ___lambda173__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self) { gboolean result; - result = __lambda175_ (self, model, path, iter); + result = __lambda173_ (self, model, path, iter); return result; } @@ -1704,7 +1704,7 @@ _g_free0 (_data64_->name); _data64_->name = _tmp1_; _tmp2_ = self->priv->store; - gtk_tree_model_foreach (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GTK_TYPE_TREE_MODEL, GtkTreeModel), ___lambda175__gtk_tree_model_foreach_func, _data64_); + gtk_tree_model_foreach (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GTK_TYPE_TREE_MODEL, GtkTreeModel), ___lambda173__gtk_tree_model_foreach_func, _data64_); block64_data_unref (_data64_); _data64_ = NULL; } diff -Nru xnoise-0.2.20/libxnoise/GlobalAccess/xnoise-global-access.c xnoise-0.2.21/libxnoise/GlobalAccess/xnoise-global-access.c --- xnoise-0.2.20/libxnoise/GlobalAccess/xnoise-global-access.c 2013-12-11 11:24:23.000000000 +0000 +++ xnoise-0.2.21/libxnoise/GlobalAccess/xnoise-global-access.c 2014-01-27 09:32:56.000000000 +0000 @@ -273,10 +273,10 @@ void xnoise_global_access_set_current_organization (XnoiseGlobalAccess* self, const gchar* value); static void g_cclosure_user_marshal_VOID__STRING_STRING_STRING (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); static GObject * xnoise_global_access_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties); -static void _xnoise_global_access___lambda440_ (XnoiseGlobalAccess* self, XnoiseGlobalAccess* s, const gchar* v); -static void __xnoise_global_access___lambda440__xnoise_global_access_uri_changed (XnoiseGlobalAccess* _sender, const gchar* uri, gpointer self); -static void _xnoise_global_access___lambda441_ (XnoiseGlobalAccess* self, GObject* s, GParamSpec* p); -static void __xnoise_global_access___lambda441__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); +static void _xnoise_global_access___lambda438_ (XnoiseGlobalAccess* self, XnoiseGlobalAccess* s, const gchar* v); +static void __xnoise_global_access___lambda438__xnoise_global_access_uri_changed (XnoiseGlobalAccess* _sender, const gchar* uri, gpointer self); +static void _xnoise_global_access___lambda439_ (XnoiseGlobalAccess* self, GObject* s, GParamSpec* p); +static void __xnoise_global_access___lambda439__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); static void xnoise_global_access_finalize (GObject* obj); static void _vala_xnoise_global_access_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_xnoise_global_access_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); @@ -1061,7 +1061,7 @@ } -static void _xnoise_global_access___lambda440_ (XnoiseGlobalAccess* self, XnoiseGlobalAccess* s, const gchar* v) { +static void _xnoise_global_access___lambda438_ (XnoiseGlobalAccess* self, XnoiseGlobalAccess* s, const gchar* v) { g_return_if_fail (XNOISE_IS_GLOBAL_ACCESS (s)); xnoise_global_access_set_current_artist (self, NULL); xnoise_global_access_set_current_albumartist (self, NULL); @@ -1073,12 +1073,12 @@ } -static void __xnoise_global_access___lambda440__xnoise_global_access_uri_changed (XnoiseGlobalAccess* _sender, const gchar* uri, gpointer self) { - _xnoise_global_access___lambda440_ (self, _sender, uri); +static void __xnoise_global_access___lambda438__xnoise_global_access_uri_changed (XnoiseGlobalAccess* _sender, const gchar* uri, gpointer self) { + _xnoise_global_access___lambda438_ (self, _sender, uri); } -static void _xnoise_global_access___lambda441_ (XnoiseGlobalAccess* self, GObject* s, GParamSpec* p) { +static void _xnoise_global_access___lambda439_ (XnoiseGlobalAccess* self, GObject* s, GParamSpec* p) { GParamSpec* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; const gchar* _tmp2_ = NULL; @@ -1184,8 +1184,8 @@ } -static void __xnoise_global_access___lambda441__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { - _xnoise_global_access___lambda441_ (self, _sender, pspec); +static void __xnoise_global_access___lambda439__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { + _xnoise_global_access___lambda439_ (self, _sender, pspec); } @@ -1200,8 +1200,8 @@ _tmp0_ = g_cancellable_new (); _g_object_unref0 (xnoise_global_access_main_cancellable); xnoise_global_access_main_cancellable = _tmp0_; - g_signal_connect_object (self, "uri-changed", (GCallback) __xnoise_global_access___lambda440__xnoise_global_access_uri_changed, self, 0); - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, G_TYPE_OBJECT, GObject), "notify", (GCallback) __xnoise_global_access___lambda441__g_object_notify, self, 0); + g_signal_connect_object (self, "uri-changed", (GCallback) __xnoise_global_access___lambda438__xnoise_global_access_uri_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, G_TYPE_OBJECT, GObject), "notify", (GCallback) __xnoise_global_access___lambda439__g_object_notify, self, 0); return obj; } diff -Nru xnoise-0.2.20/libxnoise/ItemHandlers/AddAllToTracklist/xnoise-handler-add-all-to-tracklist.c xnoise-0.2.21/libxnoise/ItemHandlers/AddAllToTracklist/xnoise-handler-add-all-to-tracklist.c --- xnoise-0.2.20/libxnoise/ItemHandlers/AddAllToTracklist/xnoise-handler-add-all-to-tracklist.c 2013-12-11 11:24:23.000000000 +0000 +++ xnoise-0.2.21/libxnoise/ItemHandlers/AddAllToTracklist/xnoise-handler-add-all-to-tracklist.c 2014-01-27 09:32:56.000000000 +0000 @@ -557,9 +557,9 @@ XnoiseTrackData** xnoise_data_source_get_all_tracks (XnoiseDataSource* self, const gchar* searchtext, int* result_length1); GType xnoise_global_access_get_type (void) G_GNUC_CONST; const gchar* xnoise_global_access_get_searchtext (XnoiseGlobalAccess* self); -static gboolean ___lambda388_ (Block67Data* _data67_); +static gboolean ___lambda386_ (Block67Data* _data67_); static void xnoise_handler_add_all_to_tracklist_append_tracks (XnoiseHandlerAddAllToTracklist* self, XnoiseTrackData*** tda, int* tda_length1); -static gboolean ____lambda388__gsource_func (gpointer self); +static gboolean ____lambda386__gsource_func (gpointer self); GType xnoise_dyn_playlist_type_get_type (void) G_GNUC_CONST; GType xnoise_playlist_queryable_get_type (void) G_GNUC_CONST; XnoiseDynPlaylistType xnoise_playlist_queryable_get_dynamic_playlist_type (XnoisePlaylistQueryable* self); @@ -578,21 +578,21 @@ XnoiseTrackData** xnoise_item_converter_to_trackdata (XnoiseItemConverter* self, XnoiseItem* item, const gchar* searchtext, GHashTable* extra_items, int* result_length1); static void _vala_array_add71 (XnoiseTrackData*** array, int* length, int* size, XnoiseTrackData* value); static XnoiseTrackData** _vala_array_dup8 (XnoiseTrackData** self, int length); -static gboolean ___lambda386_ (Block68Data* _data68_); -static gboolean ____lambda386__gsource_func (gpointer self); +static gboolean ___lambda384_ (Block68Data* _data68_); +static gboolean ____lambda384__gsource_func (gpointer self); static Block69Data* block69_data_ref (Block69Data* _data69_); static void block69_data_unref (void * _userdata_); XnoiseItem* xnoise_database_reader_get_last_played (XnoiseDatabaseReader* self, const gchar* searchtext, int* result_length1); static void _vala_array_add72 (XnoiseTrackData*** array, int* length, int* size, XnoiseTrackData* value); static XnoiseTrackData** _vala_array_dup9 (XnoiseTrackData** self, int length); -static gboolean ___lambda387_ (Block69Data* _data69_); -static gboolean ____lambda387__gsource_func (gpointer self); +static gboolean ___lambda385_ (Block69Data* _data69_); +static gboolean ____lambda385__gsource_func (gpointer self); static Block70Data* block70_data_ref (Block70Data* _data70_); static void block70_data_unref (void * _userdata_); XnoiseTrackData** xnoise_database_reader_get_trackdata_for_video (XnoiseDatabaseReader* self, const gchar* searchtext, int* result_length1); XnoiseTrackData** xnoise_database_reader_get_trackdata_for_streams (XnoiseDatabaseReader* self, const gchar* searchtext, int* result_length1); -static gboolean ___lambda385_ (Block70Data* _data70_); -static gboolean ____lambda385__gsource_func (gpointer self); +static gboolean ___lambda383_ (Block70Data* _data70_); +static gboolean ____lambda383__gsource_func (gpointer self); GType xnoise_track_list_model_get_type (void) G_GNUC_CONST; GType xnoise_player_state_get_type (void) G_GNUC_CONST; void xnoise_track_list_model_insert_title (XnoiseTrackListModel* self, XnoisePlayerState icon, XnoiseTrackData** td, gboolean bold, GtkTreeIter* result); @@ -891,7 +891,7 @@ } -static gboolean ___lambda388_ (Block67Data* _data67_) { +static gboolean ___lambda386_ (Block67Data* _data67_) { XnoiseHandlerAddAllToTracklist * self; gboolean result = FALSE; XnoiseWorkerJob* _tmp0_ = NULL; @@ -903,9 +903,9 @@ } -static gboolean ____lambda388__gsource_func (gpointer self) { +static gboolean ____lambda386__gsource_func (gpointer self) { gboolean result; - result = ___lambda388_ (self); + result = ___lambda386_ (self); return result; } @@ -972,7 +972,7 @@ _tmp16_ = _tmp15_->track_dat; _tmp16__length1 = _tmp15_->track_dat_length1; if (_tmp16_ != NULL) { - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda388__gsource_func, block67_data_ref (_data67_), block67_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda386__gsource_func, block67_data_ref (_data67_), block67_data_unref); } result = FALSE; _g_object_unref0 (ds); @@ -1201,7 +1201,7 @@ } -static gboolean ___lambda386_ (Block68Data* _data68_) { +static gboolean ___lambda384_ (Block68Data* _data68_) { XnoiseHandlerAddAllToTracklist * self; gboolean result = FALSE; XnoiseWorkerJob* _tmp0_ = NULL; @@ -1213,9 +1213,9 @@ } -static gboolean ____lambda386__gsource_func (gpointer self) { +static gboolean ____lambda384__gsource_func (gpointer self) { gboolean result; - result = ___lambda386_ (self); + result = ___lambda384_ (self); return result; } @@ -1371,7 +1371,7 @@ _tmp33_ = _tmp32_->track_dat; _tmp33__length1 = _tmp32_->track_dat_length1; if (_tmp33_ != NULL) { - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda386__gsource_func, block68_data_ref (_data68_), block68_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda384__gsource_func, block68_data_ref (_data68_), block68_data_unref); } result = FALSE; tda = (_vala_array_free (tda, tda_length1, (GDestroyNotify) xnoise_track_data_unref), NULL); @@ -1424,7 +1424,7 @@ } -static gboolean ___lambda387_ (Block69Data* _data69_) { +static gboolean ___lambda385_ (Block69Data* _data69_) { XnoiseHandlerAddAllToTracklist * self; gboolean result = FALSE; XnoiseWorkerJob* _tmp0_ = NULL; @@ -1436,9 +1436,9 @@ } -static gboolean ____lambda387__gsource_func (gpointer self) { +static gboolean ____lambda385__gsource_func (gpointer self) { gboolean result; - result = ___lambda387_ (self); + result = ___lambda385_ (self); return result; } @@ -1594,7 +1594,7 @@ _tmp33_ = _tmp32_->track_dat; _tmp33__length1 = _tmp32_->track_dat_length1; if (_tmp33_ != NULL) { - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda387__gsource_func, block69_data_ref (_data69_), block69_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda385__gsource_func, block69_data_ref (_data69_), block69_data_unref); } result = FALSE; tda = (_vala_array_free (tda, tda_length1, (GDestroyNotify) xnoise_track_data_unref), NULL); @@ -1624,7 +1624,7 @@ } -static gboolean ___lambda385_ (Block70Data* _data70_) { +static gboolean ___lambda383_ (Block70Data* _data70_) { XnoiseHandlerAddAllToTracklist * self; gboolean result = FALSE; XnoiseWorkerJob* _tmp0_ = NULL; @@ -1636,9 +1636,9 @@ } -static gboolean ____lambda385__gsource_func (gpointer self) { +static gboolean ____lambda383__gsource_func (gpointer self) { gboolean result; - result = ___lambda385_ (self); + result = ___lambda383_ (self); return result; } @@ -1742,7 +1742,7 @@ _tmp27_ = _tmp26_->track_dat; _tmp27__length1 = _tmp26_->track_dat_length1; if (_tmp27_ != NULL) { - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda385__gsource_func, block70_data_ref (_data70_), block70_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda383__gsource_func, block70_data_ref (_data70_), block70_data_unref); } result = FALSE; block70_data_unref (_data70_); diff -Nru xnoise-0.2.20/libxnoise/ItemHandlers/AddToTracklist/xnoise-handler-add-to-tracklist.c xnoise-0.2.21/libxnoise/ItemHandlers/AddToTracklist/xnoise-handler-add-to-tracklist.c --- xnoise-0.2.20/libxnoise/ItemHandlers/AddToTracklist/xnoise-handler-add-to-tracklist.c 2013-12-11 11:24:23.000000000 +0000 +++ xnoise-0.2.21/libxnoise/ItemHandlers/AddToTracklist/xnoise-handler-add-to-tracklist.c 2014-01-27 09:32:56.000000000 +0000 @@ -672,23 +672,23 @@ const gchar* xnoise_global_access_get_searchtext (XnoiseGlobalAccess* self); static void _vala_array_add77 (XnoiseTrackData*** array, int* length, int* size, XnoiseTrackData* value); static XnoiseTrackData** _vala_array_dup14 (XnoiseTrackData** self, int length); -static gboolean ___lambda338_ (Block71Data* _data71_); +static gboolean ___lambda336_ (Block71Data* _data71_); static void xnoise_handler_add_to_tracklist_append_tracks (XnoiseHandlerAddToTracklist* self, XnoiseTrackData*** tda, int* tda_length1, gboolean immediate_play); -static gboolean ____lambda338__gsource_func (gpointer self); +static gboolean ____lambda336__gsource_func (gpointer self); static Block72Data* block72_data_ref (Block72Data* _data72_); static void block72_data_unref (void * _userdata_); static void _vala_array_add78 (XnoiseTrackData*** array, int* length, int* size, XnoiseTrackData* value); static XnoiseTrackData** _vala_array_dup15 (XnoiseTrackData** self, int length); -static gboolean ___lambda337_ (Block72Data* _data72_); +static gboolean ___lambda335_ (Block72Data* _data72_); GValue* xnoise_worker_job_get_arg (XnoiseWorkerJob* self, const gchar* name); -static gboolean ____lambda337__gsource_func (gpointer self); +static gboolean ____lambda335__gsource_func (gpointer self); static Block73Data* block73_data_ref (Block73Data* _data73_); static void block73_data_unref (void * _userdata_); static void _xnoise_item_free0_ (gpointer var); static void _vala_array_add79 (XnoiseTrackData*** array, int* length, int* size, XnoiseTrackData* value); static XnoiseTrackData** _vala_array_dup16 (XnoiseTrackData** self, int length); -static gboolean ___lambda336_ (Block73Data* _data73_); -static gboolean ____lambda336__gsource_func (gpointer self); +static gboolean ___lambda334_ (Block73Data* _data73_); +static gboolean ____lambda334__gsource_func (gpointer self); static gboolean xnoise_handler_add_to_tracklist_add_requested_multi_job (XnoiseHandlerAddToTracklist* self, XnoiseWorkerJob* job); static gboolean _xnoise_handler_add_to_tracklist_add_requested_multi_job_xnoise_worker_work_func (XnoiseWorkerJob* jb, gpointer self); static XnoiseItem* _vala_array_dup17 (XnoiseItem* self, int length); @@ -698,19 +698,19 @@ static void block74_data_unref (void * _userdata_); static void _vala_array_add80 (XnoiseTrackData*** array, int* length, int* size, XnoiseTrackData* value); static XnoiseTrackData** _vala_array_dup18 (XnoiseTrackData** self, int length); -static gboolean ___lambda340_ (Block74Data* _data74_); -static gboolean ____lambda340__gsource_func (gpointer self); +static gboolean ___lambda338_ (Block74Data* _data74_); +static gboolean ____lambda338__gsource_func (gpointer self); static Block75Data* block75_data_ref (Block75Data* _data75_); static void block75_data_unref (void * _userdata_); -static gboolean ___lambda339_ (Block75Data* _data75_); -static gboolean ____lambda339__gsource_func (gpointer self); +static gboolean ___lambda337_ (Block75Data* _data75_); +static gboolean ____lambda337__gsource_func (gpointer self); static gboolean xnoise_handler_add_to_tracklist_add_item_job (XnoiseHandlerAddToTracklist* self, XnoiseWorkerJob* job); static gboolean _xnoise_handler_add_to_tracklist_add_item_job_xnoise_worker_work_func (XnoiseWorkerJob* jb, gpointer self); static Block76Data* block76_data_ref (Block76Data* _data76_); static void block76_data_unref (void * _userdata_); -static gboolean ___lambda335_ (Block76Data* _data76_); +static gboolean ___lambda333_ (Block76Data* _data76_); void xnoise_global_access_set_in_preview (XnoiseGlobalAccess* self, gboolean value); -static gboolean ____lambda335__gsource_func (gpointer self); +static gboolean ____lambda333__gsource_func (gpointer self); gboolean xnoise_main_is_same_thread (XnoiseMain* self); GType xnoise_track_list_model_get_type (void) G_GNUC_CONST; GType xnoise_player_state_get_type (void) G_GNUC_CONST; @@ -1921,7 +1921,7 @@ } -static gboolean ___lambda338_ (Block71Data* _data71_) { +static gboolean ___lambda336_ (Block71Data* _data71_) { XnoiseHandlerAddToTracklist * self; gboolean result = FALSE; XnoiseWorkerJob* _tmp0_ = NULL; @@ -1933,9 +1933,9 @@ } -static gboolean ____lambda338__gsource_func (gpointer self) { +static gboolean ____lambda336__gsource_func (gpointer self) { gboolean result; - result = ___lambda338_ (self); + result = ___lambda336_ (self); return result; } @@ -2068,7 +2068,7 @@ _tmp24_ = _tmp23_->track_dat; _tmp24__length1 = _tmp23_->track_dat_length1; if (_tmp24_ != NULL) { - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda338__gsource_func, block71_data_ref (_data71_), block71_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda336__gsource_func, block71_data_ref (_data71_), block71_data_unref); } result = FALSE; tda = (_vala_array_free (tda, tda_length1, (GDestroyNotify) xnoise_track_data_unref), NULL); @@ -2121,7 +2121,7 @@ } -static gboolean ___lambda337_ (Block72Data* _data72_) { +static gboolean ___lambda335_ (Block72Data* _data72_) { XnoiseHandlerAddToTracklist * self; gboolean result = FALSE; XnoiseWorkerJob* _tmp0_ = NULL; @@ -2137,9 +2137,9 @@ } -static gboolean ____lambda337__gsource_func (gpointer self) { +static gboolean ____lambda335__gsource_func (gpointer self) { gboolean result; - result = ___lambda337_ (self); + result = ___lambda335_ (self); return result; } @@ -2272,7 +2272,7 @@ _tmp24_ = _tmp23_->track_dat; _tmp24__length1 = _tmp23_->track_dat_length1; if (_tmp24_ != NULL) { - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda337__gsource_func, block72_data_ref (_data72_), block72_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda335__gsource_func, block72_data_ref (_data72_), block72_data_unref); } result = FALSE; tda = (_vala_array_free (tda, tda_length1, (GDestroyNotify) xnoise_track_data_unref), NULL); @@ -2330,7 +2330,7 @@ } -static gboolean ___lambda336_ (Block73Data* _data73_) { +static gboolean ___lambda334_ (Block73Data* _data73_) { XnoiseHandlerAddToTracklist * self; gboolean result = FALSE; XnoiseWorkerJob* _tmp0_ = NULL; @@ -2342,9 +2342,9 @@ } -static gboolean ____lambda336__gsource_func (gpointer self) { +static gboolean ____lambda334__gsource_func (gpointer self) { gboolean result; - result = ___lambda336_ (self); + result = ___lambda334_ (self); return result; } @@ -2526,7 +2526,7 @@ _tmp42_ = _tmp41_->track_dat; _tmp42__length1 = _tmp41_->track_dat_length1; if (_tmp42_ != NULL) { - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda336__gsource_func, block73_data_ref (_data73_), block73_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda334__gsource_func, block73_data_ref (_data73_), block73_data_unref); } result = FALSE; tda = (_vala_array_free (tda, tda_length1, (GDestroyNotify) xnoise_track_data_unref), NULL); @@ -2660,7 +2660,7 @@ } -static gboolean ___lambda340_ (Block74Data* _data74_) { +static gboolean ___lambda338_ (Block74Data* _data74_) { XnoiseHandlerAddToTracklist * self; gboolean result = FALSE; XnoiseWorkerJob* _tmp0_ = NULL; @@ -2672,9 +2672,9 @@ } -static gboolean ____lambda340__gsource_func (gpointer self) { +static gboolean ____lambda338__gsource_func (gpointer self) { gboolean result; - result = ___lambda340_ (self); + result = ___lambda338_ (self); return result; } @@ -2804,7 +2804,7 @@ } _tmp24_ = _tmp19_; if (_tmp24_) { - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda340__gsource_func, block74_data_ref (_data74_), block74_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda338__gsource_func, block74_data_ref (_data74_), block74_data_unref); } result = FALSE; tda = (_vala_array_free (tda, tda_length1, (GDestroyNotify) xnoise_track_data_unref), NULL); @@ -2833,7 +2833,7 @@ } -static gboolean ___lambda339_ (Block75Data* _data75_) { +static gboolean ___lambda337_ (Block75Data* _data75_) { XnoiseHandlerAddToTracklist * self; gboolean result = FALSE; XnoiseWorkerJob* _tmp0_ = NULL; @@ -2845,9 +2845,9 @@ } -static gboolean ____lambda339__gsource_func (gpointer self) { +static gboolean ____lambda337__gsource_func (gpointer self) { gboolean result; - result = ___lambda339_ (self); + result = ___lambda337_ (self); return result; } @@ -2893,7 +2893,7 @@ _tmp11_ = _tmp10_->track_dat; _tmp11__length1 = _tmp10_->track_dat_length1; if (_tmp11_ != NULL) { - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda339__gsource_func, block75_data_ref (_data75_), block75_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda337__gsource_func, block75_data_ref (_data75_), block75_data_unref); } result = FALSE; _xnoise_item_free0 (item); @@ -2996,7 +2996,7 @@ } -static gboolean ___lambda335_ (Block76Data* _data76_) { +static gboolean ___lambda333_ (Block76Data* _data76_) { XnoiseHandlerAddToTracklist * self; gboolean result = FALSE; XnoiseGlobalAccess* _tmp0_ = NULL; @@ -3011,9 +3011,9 @@ } -static gboolean ____lambda335__gsource_func (gpointer self) { +static gboolean ____lambda333__gsource_func (gpointer self) { gboolean result; - result = ___lambda335_ (self); + result = ___lambda333_ (self); return result; } @@ -3118,7 +3118,7 @@ _tmp32_ = _tmp31_->track_dat; _tmp32__length1 = _tmp31_->track_dat_length1; if (_tmp32_ != NULL) { - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda335__gsource_func, block76_data_ref (_data76_), block76_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda333__gsource_func, block76_data_ref (_data76_), block76_data_unref); } else { g_print ("converted item result was null\n"); } diff -Nru xnoise-0.2.20/libxnoise/ItemHandlers/EditTags/xnoise-handler-edit-tags.c xnoise-0.2.21/libxnoise/ItemHandlers/EditTags/xnoise-handler-edit-tags.c --- xnoise-0.2.20/libxnoise/ItemHandlers/EditTags/xnoise-handler-edit-tags.c 2013-12-11 11:24:23.000000000 +0000 +++ xnoise-0.2.21/libxnoise/ItemHandlers/EditTags/xnoise-handler-edit-tags.c 2014-01-27 09:32:56.000000000 +0000 @@ -360,24 +360,24 @@ static void xnoise_handler_edit_tags_open_tagartist_changer (XnoiseHandlerEditTags* self, XnoiseItem* item, GHashTable* restrictions); XnoiseTagTitleEditor* xnoise_tag_title_editor_new (XnoiseItem* _item); XnoiseTagTitleEditor* xnoise_tag_title_editor_construct (GType object_type, XnoiseItem* _item); -static void __lambda380_ (XnoiseHandlerEditTags* self); -static void ___lambda380__xnoise_tag_title_editor_sign_finish (XnoiseTagTitleEditor* _sender, gpointer self); +static void __lambda378_ (XnoiseHandlerEditTags* self); +static void ___lambda378__xnoise_tag_title_editor_sign_finish (XnoiseTagTitleEditor* _sender, gpointer self); XnoiseTagGenreEditor* xnoise_tag_genre_editor_new (XnoiseItem* _item, GHashTable* restrictions); XnoiseTagGenreEditor* xnoise_tag_genre_editor_construct (GType object_type, XnoiseItem* _item, GHashTable* restrictions); -static void __lambda382_ (XnoiseHandlerEditTags* self); -static void ___lambda382__xnoise_tag_genre_editor_sign_finish (XnoiseTagGenreEditor* _sender, gpointer self); +static void __lambda380_ (XnoiseHandlerEditTags* self); +static void ___lambda380__xnoise_tag_genre_editor_sign_finish (XnoiseTagGenreEditor* _sender, gpointer self); XnoiseTagAlbumArtistEditor* xnoise_tag_album_artist_editor_new (XnoiseItem* _item, GHashTable* restrictions); XnoiseTagAlbumArtistEditor* xnoise_tag_album_artist_editor_construct (GType object_type, XnoiseItem* _item, GHashTable* restrictions); -static void __lambda383_ (XnoiseHandlerEditTags* self); -static void ___lambda383__xnoise_tag_album_artist_editor_sign_finish (XnoiseTagAlbumArtistEditor* _sender, gpointer self); +static void __lambda381_ (XnoiseHandlerEditTags* self); +static void ___lambda381__xnoise_tag_album_artist_editor_sign_finish (XnoiseTagAlbumArtistEditor* _sender, gpointer self); XnoiseTagArtistEditor* xnoise_tag_artist_editor_new (XnoiseItem* _item, GHashTable* restrictions); XnoiseTagArtistEditor* xnoise_tag_artist_editor_construct (GType object_type, XnoiseItem* _item, GHashTable* restrictions); -static void __lambda384_ (XnoiseHandlerEditTags* self); -static void ___lambda384__xnoise_tag_artist_editor_sign_finish (XnoiseTagArtistEditor* _sender, gpointer self); +static void __lambda382_ (XnoiseHandlerEditTags* self); +static void ___lambda382__xnoise_tag_artist_editor_sign_finish (XnoiseTagArtistEditor* _sender, gpointer self); XnoiseTagAlbumEditor* xnoise_tag_album_editor_new (XnoiseItem* _item, GHashTable* restrictions); XnoiseTagAlbumEditor* xnoise_tag_album_editor_construct (GType object_type, XnoiseItem* _item, GHashTable* restrictions); -static void __lambda381_ (XnoiseHandlerEditTags* self); -static void ___lambda381__xnoise_tag_album_editor_sign_finish (XnoiseTagAlbumEditor* _sender, gpointer self); +static void __lambda379_ (XnoiseHandlerEditTags* self); +static void ___lambda379__xnoise_tag_album_editor_sign_finish (XnoiseTagAlbumEditor* _sender, gpointer self); static void xnoise_handler_edit_tags_finalize (GObject* obj); @@ -1028,14 +1028,14 @@ } -static void __lambda380_ (XnoiseHandlerEditTags* self) { +static void __lambda378_ (XnoiseHandlerEditTags* self) { _g_object_unref0 (self->priv->tte); self->priv->tte = NULL; } -static void ___lambda380__xnoise_tag_title_editor_sign_finish (XnoiseTagTitleEditor* _sender, gpointer self) { - __lambda380_ (self); +static void ___lambda378__xnoise_tag_title_editor_sign_finish (XnoiseTagTitleEditor* _sender, gpointer self) { + __lambda378_ (self); } @@ -1050,18 +1050,18 @@ _g_object_unref0 (self->priv->tte); self->priv->tte = _tmp1_; _tmp2_ = self->priv->tte; - g_signal_connect_object (_tmp2_, "sign-finish", (GCallback) ___lambda380__xnoise_tag_title_editor_sign_finish, self, 0); + g_signal_connect_object (_tmp2_, "sign-finish", (GCallback) ___lambda378__xnoise_tag_title_editor_sign_finish, self, 0); } -static void __lambda382_ (XnoiseHandlerEditTags* self) { +static void __lambda380_ (XnoiseHandlerEditTags* self) { _g_object_unref0 (self->priv->tge); self->priv->tge = NULL; } -static void ___lambda382__xnoise_tag_genre_editor_sign_finish (XnoiseTagGenreEditor* _sender, gpointer self) { - __lambda382_ (self); +static void ___lambda380__xnoise_tag_genre_editor_sign_finish (XnoiseTagGenreEditor* _sender, gpointer self) { + __lambda380_ (self); } @@ -1078,18 +1078,18 @@ _g_object_unref0 (self->priv->tge); self->priv->tge = _tmp2_; _tmp3_ = self->priv->tge; - g_signal_connect_object (_tmp3_, "sign-finish", (GCallback) ___lambda382__xnoise_tag_genre_editor_sign_finish, self, 0); + g_signal_connect_object (_tmp3_, "sign-finish", (GCallback) ___lambda380__xnoise_tag_genre_editor_sign_finish, self, 0); } -static void __lambda383_ (XnoiseHandlerEditTags* self) { +static void __lambda381_ (XnoiseHandlerEditTags* self) { _g_object_unref0 (self->priv->taae); self->priv->taae = NULL; } -static void ___lambda383__xnoise_tag_album_artist_editor_sign_finish (XnoiseTagAlbumArtistEditor* _sender, gpointer self) { - __lambda383_ (self); +static void ___lambda381__xnoise_tag_album_artist_editor_sign_finish (XnoiseTagAlbumArtistEditor* _sender, gpointer self) { + __lambda381_ (self); } @@ -1106,18 +1106,18 @@ _g_object_unref0 (self->priv->taae); self->priv->taae = _tmp2_; _tmp3_ = self->priv->taae; - g_signal_connect_object (_tmp3_, "sign-finish", (GCallback) ___lambda383__xnoise_tag_album_artist_editor_sign_finish, self, 0); + g_signal_connect_object (_tmp3_, "sign-finish", (GCallback) ___lambda381__xnoise_tag_album_artist_editor_sign_finish, self, 0); } -static void __lambda384_ (XnoiseHandlerEditTags* self) { +static void __lambda382_ (XnoiseHandlerEditTags* self) { _g_object_unref0 (self->priv->tae); self->priv->tae = NULL; } -static void ___lambda384__xnoise_tag_artist_editor_sign_finish (XnoiseTagArtistEditor* _sender, gpointer self) { - __lambda384_ (self); +static void ___lambda382__xnoise_tag_artist_editor_sign_finish (XnoiseTagArtistEditor* _sender, gpointer self) { + __lambda382_ (self); } @@ -1134,18 +1134,18 @@ _g_object_unref0 (self->priv->tae); self->priv->tae = _tmp2_; _tmp3_ = self->priv->tae; - g_signal_connect_object (_tmp3_, "sign-finish", (GCallback) ___lambda384__xnoise_tag_artist_editor_sign_finish, self, 0); + g_signal_connect_object (_tmp3_, "sign-finish", (GCallback) ___lambda382__xnoise_tag_artist_editor_sign_finish, self, 0); } -static void __lambda381_ (XnoiseHandlerEditTags* self) { +static void __lambda379_ (XnoiseHandlerEditTags* self) { _g_object_unref0 (self->priv->taled); self->priv->taled = NULL; } -static void ___lambda381__xnoise_tag_album_editor_sign_finish (XnoiseTagAlbumEditor* _sender, gpointer self) { - __lambda381_ (self); +static void ___lambda379__xnoise_tag_album_editor_sign_finish (XnoiseTagAlbumEditor* _sender, gpointer self) { + __lambda379_ (self); } @@ -1162,7 +1162,7 @@ _g_object_unref0 (self->priv->taled); self->priv->taled = _tmp2_; _tmp3_ = self->priv->taled; - g_signal_connect_object (_tmp3_, "sign-finish", (GCallback) ___lambda381__xnoise_tag_album_editor_sign_finish, self, 0); + g_signal_connect_object (_tmp3_, "sign-finish", (GCallback) ___lambda379__xnoise_tag_album_editor_sign_finish, self, 0); } diff -Nru xnoise-0.2.20/libxnoise/ItemHandlers/EditTags/xnoise-tag-album-editor.c xnoise-0.2.21/libxnoise/ItemHandlers/EditTags/xnoise-tag-album-editor.c --- xnoise-0.2.20/libxnoise/ItemHandlers/EditTags/xnoise-tag-album-editor.c 2013-12-11 11:24:23.000000000 +0000 +++ xnoise-0.2.21/libxnoise/ItemHandlers/EditTags/xnoise-tag-album-editor.c 2014-01-27 09:32:56.000000000 +0000 @@ -515,13 +515,13 @@ GType xnoise_music_browser_get_type (void) G_GNUC_CONST; GType xnoise_media_soure_widget_get_type (void) G_GNUC_CONST; GType xnoise_tree_queryable_get_type (void) G_GNUC_CONST; -static void __lambda375_ (XnoiseTagAlbumEditor* self); +static void __lambda373_ (XnoiseTagAlbumEditor* self); GType xnoise_global_access_get_type (void) G_GNUC_CONST; gboolean xnoise_global_access_get_media_import_in_progress (XnoiseGlobalAccess* self); gboolean xnoise_music_browser_model_get_populating_model (XnoiseMusicBrowserModel* self); -static void ___lambda375__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); -static void __lambda376_ (XnoiseTagAlbumEditor* self); -static void ___lambda376__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); +static void ___lambda373__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); +static void __lambda374_ (XnoiseTagAlbumEditor* self); +static void ___lambda374__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); static void xnoise_tag_album_editor_fill_entries (XnoiseTagAlbumEditor* self); gpointer xnoise_worker_job_ref (gpointer instance); void xnoise_worker_job_unref (gpointer instance); @@ -555,36 +555,36 @@ GType xnoise_item_converter_get_type (void) G_GNUC_CONST; XnoiseTrackData** xnoise_item_converter_to_trackdata (XnoiseItemConverter* self, XnoiseItem* item, const gchar* searchtext, GHashTable* extra_items, int* result_length1); const gchar* xnoise_global_access_get_searchtext (XnoiseGlobalAccess* self); -static gboolean ___lambda377_ (Block77Data* _data77_); +static gboolean ___lambda375_ (Block77Data* _data77_); GFile* xnoise_get_albumimage_for_artistalbum (const gchar* artist, const gchar* album, const gchar* size); GType xnoise_icon_cache_get_type (void) G_GNUC_CONST; GdkPixbuf* xnoise_icon_cache_get_image (XnoiseIconCache* self, const gchar* path); #define XNOISE_RESOURCES_ICON_LARGE_PIXELSIZE 180 -static void __lambda378_ (XnoiseTagAlbumEditor* self, GtkEditable* sender); -static void ___lambda378__gtk_editable_changed (GtkEditable* _sender, gpointer self); +static void __lambda376_ (XnoiseTagAlbumEditor* self, GtkEditable* sender); +static void ___lambda376__gtk_editable_changed (GtkEditable* _sender, gpointer self); +static gboolean ____lambda375__gsource_func (gpointer self); +static gboolean ___lambda377_ (XnoiseTagAlbumEditor* self); static gboolean ____lambda377__gsource_func (gpointer self); -static gboolean ___lambda379_ (XnoiseTagAlbumEditor* self); -static gboolean ____lambda379__gsource_func (gpointer self); static void xnoise_tag_album_editor_on_ok_button_clicked (XnoiseTagAlbumEditor* self, GtkButton* sender); static void _xnoise_tag_album_editor_on_ok_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self); static void xnoise_tag_album_editor_on_cancel_button_clicked (XnoiseTagAlbumEditor* self, GtkButton* sender); static void _xnoise_tag_album_editor_on_cancel_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self); #define XNOISE_RESOURCES_EMPTYSTRING "" static void xnoise_tag_album_editor_do_album_rename (XnoiseTagAlbumEditor* self); -static gboolean __lambda373_ (XnoiseTagAlbumEditor* self); -static gboolean ___lambda373__gsource_func (gpointer self); +static gboolean __lambda371_ (XnoiseTagAlbumEditor* self); +static gboolean ___lambda371__gsource_func (gpointer self); static gboolean xnoise_tag_album_editor_update_tags_job (XnoiseTagAlbumEditor* self, XnoiseWorkerJob* tag_job); static gboolean _xnoise_tag_album_editor_update_tags_job_xnoise_worker_work_func (XnoiseWorkerJob* jb, gpointer self); -static gboolean ___lambda372_ (XnoiseTagAlbumEditor* self); -static gboolean ____lambda372__gsource_func (gpointer self); +static gboolean ___lambda370_ (XnoiseTagAlbumEditor* self); +static gboolean ____lambda370__gsource_func (gpointer self); static XnoiseTrackData** _vala_array_dup19 (XnoiseTrackData** self, int length); gboolean xnoise_worker_is_same_thread (XnoiseWorker* self); void xnoise_global_access_set_in_tag_rename (XnoiseGlobalAccess* self, gboolean value); gboolean xnoise_tag_access_tag_writer_write_tag (GFile* file, XnoiseTrackData* td, gboolean read_before_write); -static gboolean __lambda371_ (XnoiseTagAlbumEditor* self); -static gboolean ___lambda371__gsource_func (gpointer self); -static gboolean __lambda374_ (XnoiseTagAlbumEditor* self); -static gboolean ___lambda374__gsource_func (gpointer self); +static gboolean __lambda369_ (XnoiseTagAlbumEditor* self); +static gboolean ___lambda369__gsource_func (gpointer self); +static gboolean __lambda372_ (XnoiseTagAlbumEditor* self); +static gboolean ___lambda372__gsource_func (gpointer self); static void xnoise_tag_album_editor_finalize (GObject* obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -600,7 +600,7 @@ } -static void __lambda375_ (XnoiseTagAlbumEditor* self) { +static void __lambda373_ (XnoiseTagAlbumEditor* self) { gboolean _tmp0_ = FALSE; XnoiseGlobalAccess* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; @@ -632,12 +632,12 @@ } -static void ___lambda375__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { - __lambda375_ (self); +static void ___lambda373__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { + __lambda373_ (self); } -static void __lambda376_ (XnoiseTagAlbumEditor* self) { +static void __lambda374_ (XnoiseTagAlbumEditor* self) { gboolean _tmp0_ = FALSE; XnoiseGlobalAccess* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; @@ -669,8 +669,8 @@ } -static void ___lambda376__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { - __lambda376_ (self); +static void ___lambda374__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { + __lambda374_ (self); } @@ -715,9 +715,9 @@ _tmp9_ = _tmp8_->music_browser_model; self->priv->mbm = _tmp9_; _tmp10_ = self->priv->mbm; - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, G_TYPE_OBJECT, GObject), "notify::populating-model", (GCallback) ___lambda375__g_object_notify, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, G_TYPE_OBJECT, GObject), "notify::populating-model", (GCallback) ___lambda373__g_object_notify, self, 0); _tmp11_ = xnoise_global; - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, G_TYPE_OBJECT, GObject), "notify::media-import-in-progress", (GCallback) ___lambda376__g_object_notify, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, G_TYPE_OBJECT, GObject), "notify::media-import-in-progress", (GCallback) ___lambda374__g_object_notify, self, 0); xnoise_tag_album_editor_fill_entries (self); _tmp12_ = self->priv->dialog; gtk_window_set_position (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GTK_TYPE_WINDOW, GtkWindow), GTK_WIN_POS_CENTER_ON_PARENT); @@ -783,7 +783,7 @@ } -static void __lambda378_ (XnoiseTagAlbumEditor* self, GtkEditable* sender) { +static void __lambda376_ (XnoiseTagAlbumEditor* self, GtkEditable* sender) { GtkEditable* _tmp0_ = NULL; gdouble _tmp1_ = 0.0; gdouble _tmp2_ = 0.0; @@ -810,12 +810,12 @@ } -static void ___lambda378__gtk_editable_changed (GtkEditable* _sender, gpointer self) { - __lambda378_ (self, _sender); +static void ___lambda376__gtk_editable_changed (GtkEditable* _sender, gpointer self) { + __lambda376_ (self, _sender); } -static gboolean ___lambda377_ (Block77Data* _data77_) { +static gboolean ___lambda375_ (Block77Data* _data77_) { XnoiseTagAlbumEditor * self; gboolean result = FALSE; GdkPixbuf* art = NULL; @@ -956,7 +956,7 @@ gtk_spin_button_configure (_tmp31_, _tmp33_, 1.0, (guint) 0); _g_object_unref0 (_tmp33_); _tmp34_ = self->priv->spinbutton_year; - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) ___lambda378__gtk_editable_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) ___lambda376__gtk_editable_changed, self, 0); _tmp35_ = self->priv->spinbutton_year; _tmp36_ = _data77_->td; _tmp37_ = _tmp36_->year; @@ -987,14 +987,14 @@ } -static gboolean ____lambda377__gsource_func (gpointer self) { +static gboolean ____lambda375__gsource_func (gpointer self) { gboolean result; - result = ___lambda377_ (self); + result = ___lambda375_ (self); return result; } -static gboolean ___lambda379_ (XnoiseTagAlbumEditor* self) { +static gboolean ___lambda377_ (XnoiseTagAlbumEditor* self) { gboolean result = FALSE; g_signal_emit_by_name (self, "sign-finish"); result = FALSE; @@ -1002,9 +1002,9 @@ } -static gboolean ____lambda379__gsource_func (gpointer self) { +static gboolean ____lambda377__gsource_func (gpointer self) { gboolean result; - result = ___lambda379_ (self); + result = ___lambda377_ (self); return result; } @@ -1071,12 +1071,12 @@ switch (_tmp17_) { case XNOISE_ITEM_TYPE_COLLECTION_CONTAINER_ALBUM: { - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda377__gsource_func, block77_data_ref (_data77_), block77_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda375__gsource_func, block77_data_ref (_data77_), block77_data_unref); break; } default: { - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda379__gsource_func, g_object_ref (self), g_object_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda377__gsource_func, g_object_ref (self), g_object_unref); break; } } @@ -1348,7 +1348,7 @@ } -static gboolean __lambda373_ (XnoiseTagAlbumEditor* self) { +static gboolean __lambda371_ (XnoiseTagAlbumEditor* self) { gboolean result = FALSE; GtkDialog* _tmp0_ = NULL; _tmp0_ = self->priv->dialog; @@ -1358,9 +1358,9 @@ } -static gboolean ___lambda373__gsource_func (gpointer self) { +static gboolean ___lambda371__gsource_func (gpointer self) { gboolean result; - result = __lambda373_ (self); + result = __lambda371_ (self); return result; } @@ -1416,7 +1416,7 @@ break; } } - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda373__gsource_func, g_object_ref (self), g_object_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda371__gsource_func, g_object_ref (self), g_object_unref); } @@ -1442,7 +1442,7 @@ } -static gboolean ___lambda372_ (XnoiseTagAlbumEditor* self) { +static gboolean ___lambda370_ (XnoiseTagAlbumEditor* self) { gboolean result = FALSE; GtkDialog* _tmp0_ = NULL; _tmp0_ = self->priv->dialog; @@ -1452,9 +1452,9 @@ } -static gboolean ____lambda372__gsource_func (gpointer self) { +static gboolean ____lambda370__gsource_func (gpointer self) { gboolean result; - result = ___lambda372_ (self); + result = ___lambda370_ (self); return result; } @@ -1538,7 +1538,7 @@ _tmp10_ = _tmp1_; if (_tmp10_) { g_print ("Warning: new album name is empty!\n"); - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda372__gsource_func, g_object_ref (self), g_object_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda370__gsource_func, g_object_ref (self), g_object_unref); _xnoise_worker_job_unref0 (job); return; } @@ -1648,7 +1648,7 @@ } -static gboolean __lambda371_ (XnoiseTagAlbumEditor* self) { +static gboolean __lambda369_ (XnoiseTagAlbumEditor* self) { gboolean result = FALSE; XnoiseGlobalAccess* _tmp0_ = NULL; _tmp0_ = xnoise_global; @@ -1659,9 +1659,9 @@ } -static gboolean ___lambda371__gsource_func (gpointer self) { +static gboolean ___lambda369__gsource_func (gpointer self) { gboolean result; - result = __lambda371_ (self); + result = __lambda369_ (self); return result; } @@ -1758,13 +1758,13 @@ } } } - g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ___lambda371__gsource_func, g_object_ref (self), g_object_unref); + g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ___lambda369__gsource_func, g_object_ref (self), g_object_unref); result = FALSE; return result; } -static gboolean __lambda374_ (XnoiseTagAlbumEditor* self) { +static gboolean __lambda372_ (XnoiseTagAlbumEditor* self) { gboolean result = FALSE; GtkDialog* _tmp0_ = NULL; _tmp0_ = self->priv->dialog; @@ -1775,9 +1775,9 @@ } -static gboolean ___lambda374__gsource_func (gpointer self) { +static gboolean ___lambda372__gsource_func (gpointer self) { gboolean result; - result = __lambda374_ (self); + result = __lambda372_ (self); return result; } @@ -1785,7 +1785,7 @@ static void xnoise_tag_album_editor_on_cancel_button_clicked (XnoiseTagAlbumEditor* self, GtkButton* sender) { g_return_if_fail (XNOISE_IS_TAG_ALBUM_EDITOR (self)); g_return_if_fail (GTK_IS_BUTTON (sender)); - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda374__gsource_func, g_object_ref (self), g_object_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda372__gsource_func, g_object_ref (self), g_object_unref); } diff -Nru xnoise-0.2.20/libxnoise/ItemHandlers/EditTags/xnoise-tag-albumartist-editor.c xnoise-0.2.21/libxnoise/ItemHandlers/EditTags/xnoise-tag-albumartist-editor.c --- xnoise-0.2.20/libxnoise/ItemHandlers/EditTags/xnoise-tag-albumartist-editor.c 2013-12-11 11:24:23.000000000 +0000 +++ xnoise-0.2.21/libxnoise/ItemHandlers/EditTags/xnoise-tag-albumartist-editor.c 2014-01-27 09:32:56.000000000 +0000 @@ -494,13 +494,13 @@ GType xnoise_music_browser_get_type (void) G_GNUC_CONST; GType xnoise_media_soure_widget_get_type (void) G_GNUC_CONST; GType xnoise_tree_queryable_get_type (void) G_GNUC_CONST; -static void __lambda360_ (XnoiseTagAlbumArtistEditor* self); +static void __lambda358_ (XnoiseTagAlbumArtistEditor* self); GType xnoise_global_access_get_type (void) G_GNUC_CONST; gboolean xnoise_global_access_get_media_import_in_progress (XnoiseGlobalAccess* self); gboolean xnoise_music_browser_model_get_populating_model (XnoiseMusicBrowserModel* self); -static void ___lambda360__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); -static void __lambda361_ (XnoiseTagAlbumArtistEditor* self); -static void ___lambda361__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); +static void ___lambda358__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); +static void __lambda359_ (XnoiseTagAlbumArtistEditor* self); +static void ___lambda359__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); static void xnoise_tag_album_artist_editor_fill_entries (XnoiseTagAlbumArtistEditor* self); gpointer xnoise_worker_job_ref (gpointer instance); void xnoise_worker_job_unref (gpointer instance); @@ -535,18 +535,18 @@ GType xnoise_item_converter_get_type (void) G_GNUC_CONST; XnoiseTrackData** xnoise_item_converter_to_trackdata (XnoiseItemConverter* self, XnoiseItem* item, const gchar* searchtext, GHashTable* extra_items, int* result_length1); const gchar* xnoise_global_access_get_searchtext (XnoiseGlobalAccess* self); -static gboolean ___lambda362_ (Block78Data* _data78_); -static gboolean ____lambda362__gsource_func (gpointer self); -static gboolean ___lambda363_ (XnoiseTagAlbumArtistEditor* self); -static gboolean ____lambda363__gsource_func (gpointer self); +static gboolean ___lambda360_ (Block78Data* _data78_); +static gboolean ____lambda360__gsource_func (gpointer self); +static gboolean ___lambda361_ (XnoiseTagAlbumArtistEditor* self); +static gboolean ____lambda361__gsource_func (gpointer self); static void xnoise_tag_album_artist_editor_on_ok_button_clicked (XnoiseTagAlbumArtistEditor* self, GtkButton* sender); static void _xnoise_tag_album_artist_editor_on_ok_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self); static void xnoise_tag_album_artist_editor_on_cancel_button_clicked (XnoiseTagAlbumArtistEditor* self, GtkButton* sender); static void _xnoise_tag_album_artist_editor_on_cancel_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self); #define XNOISE_RESOURCES_EMPTYSTRING "" static void xnoise_tag_album_artist_editor_do_artist_rename (XnoiseTagAlbumArtistEditor* self); -static gboolean __lambda358_ (XnoiseTagAlbumArtistEditor* self); -static gboolean ___lambda358__gsource_func (gpointer self); +static gboolean __lambda356_ (XnoiseTagAlbumArtistEditor* self); +static gboolean ___lambda356__gsource_func (gpointer self); static gboolean xnoise_tag_album_artist_editor_update_filetags_job (XnoiseTagAlbumArtistEditor* self, XnoiseWorkerJob* job); static gboolean _xnoise_tag_album_artist_editor_update_filetags_job_xnoise_worker_work_func (XnoiseWorkerJob* jb, gpointer self); static XnoiseTrackData** _vala_array_dup20 (XnoiseTrackData** self, int length); @@ -554,10 +554,10 @@ void xnoise_global_access_set_in_tag_rename (XnoiseGlobalAccess* self, gboolean value); gboolean xnoise_tag_access_tag_writer_write_tag (GFile* file, XnoiseTrackData* td, gboolean read_before_write); static void _vala_array_add81 (gchar*** array, int* length, int* size, gchar* value); +static gboolean __lambda355_ (XnoiseTagAlbumArtistEditor* self); +static gboolean ___lambda355__gsource_func (gpointer self); static gboolean __lambda357_ (XnoiseTagAlbumArtistEditor* self); static gboolean ___lambda357__gsource_func (gpointer self); -static gboolean __lambda359_ (XnoiseTagAlbumArtistEditor* self); -static gboolean ___lambda359__gsource_func (gpointer self); static void xnoise_tag_album_artist_editor_finalize (GObject* obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -573,7 +573,7 @@ } -static void __lambda360_ (XnoiseTagAlbumArtistEditor* self) { +static void __lambda358_ (XnoiseTagAlbumArtistEditor* self) { gboolean _tmp0_ = FALSE; XnoiseGlobalAccess* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; @@ -605,12 +605,12 @@ } -static void ___lambda360__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { - __lambda360_ (self); +static void ___lambda358__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { + __lambda358_ (self); } -static void __lambda361_ (XnoiseTagAlbumArtistEditor* self) { +static void __lambda359_ (XnoiseTagAlbumArtistEditor* self) { gboolean _tmp0_ = FALSE; XnoiseGlobalAccess* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; @@ -642,8 +642,8 @@ } -static void ___lambda361__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { - __lambda361_ (self); +static void ___lambda359__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { + __lambda359_ (self); } @@ -711,9 +711,9 @@ _tmp11_ = _tmp10_->music_browser_model; self->priv->mbm = _tmp11_; _tmp12_ = self->priv->mbm; - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, G_TYPE_OBJECT, GObject), "notify::populating-model", (GCallback) ___lambda360__g_object_notify, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, G_TYPE_OBJECT, GObject), "notify::populating-model", (GCallback) ___lambda358__g_object_notify, self, 0); _tmp13_ = xnoise_global; - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, G_TYPE_OBJECT, GObject), "notify::media-import-in-progress", (GCallback) ___lambda361__g_object_notify, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, G_TYPE_OBJECT, GObject), "notify::media-import-in-progress", (GCallback) ___lambda359__g_object_notify, self, 0); xnoise_tag_album_artist_editor_fill_entries (self); _tmp14_ = self->priv->dialog; gtk_window_set_position (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GTK_TYPE_WINDOW, GtkWindow), GTK_WIN_POS_CENTER_ON_PARENT); @@ -779,7 +779,7 @@ } -static gboolean ___lambda362_ (Block78Data* _data78_) { +static gboolean ___lambda360_ (Block78Data* _data78_) { XnoiseTagAlbumArtistEditor * self; gboolean result = FALSE; GtkEntry* _tmp0_ = NULL; @@ -793,14 +793,14 @@ } -static gboolean ____lambda362__gsource_func (gpointer self) { +static gboolean ____lambda360__gsource_func (gpointer self) { gboolean result; - result = ___lambda362_ (self); + result = ___lambda360_ (self); return result; } -static gboolean ___lambda363_ (XnoiseTagAlbumArtistEditor* self) { +static gboolean ___lambda361_ (XnoiseTagAlbumArtistEditor* self) { gboolean result = FALSE; g_signal_emit_by_name (self, "sign-finish"); result = FALSE; @@ -808,9 +808,9 @@ } -static gboolean ____lambda363__gsource_func (gpointer self) { +static gboolean ____lambda361__gsource_func (gpointer self) { gboolean result; - result = ___lambda363_ (self); + result = ___lambda361_ (self); return result; } @@ -889,12 +889,12 @@ switch (_tmp16_) { case XNOISE_ITEM_TYPE_COLLECTION_CONTAINER_ALBUMARTIST: { - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda362__gsource_func, block78_data_ref (_data78_), block78_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda360__gsource_func, block78_data_ref (_data78_), block78_data_unref); break; } default: { - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda363__gsource_func, g_object_ref (self), g_object_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda361__gsource_func, g_object_ref (self), g_object_unref); break; } } @@ -1113,7 +1113,7 @@ } -static gboolean __lambda358_ (XnoiseTagAlbumArtistEditor* self) { +static gboolean __lambda356_ (XnoiseTagAlbumArtistEditor* self) { gboolean result = FALSE; GtkDialog* _tmp0_ = NULL; _tmp0_ = self->priv->dialog; @@ -1123,9 +1123,9 @@ } -static gboolean ___lambda358__gsource_func (gpointer self) { +static gboolean ___lambda356__gsource_func (gpointer self) { gboolean result; - result = __lambda358_ (self); + result = __lambda356_ (self); return result; } @@ -1218,7 +1218,7 @@ break; } } - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda358__gsource_func, g_object_ref (self), g_object_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda356__gsource_func, g_object_ref (self), g_object_unref); } @@ -1368,7 +1368,7 @@ } -static gboolean __lambda357_ (XnoiseTagAlbumArtistEditor* self) { +static gboolean __lambda355_ (XnoiseTagAlbumArtistEditor* self) { gboolean result = FALSE; XnoiseGlobalAccess* _tmp0_ = NULL; _tmp0_ = xnoise_global; @@ -1379,9 +1379,9 @@ } -static gboolean ___lambda357__gsource_func (gpointer self) { +static gboolean ___lambda355__gsource_func (gpointer self) { gboolean result; - result = __lambda357_ (self); + result = __lambda355_ (self); return result; } @@ -1498,14 +1498,14 @@ } } } - g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ___lambda357__gsource_func, g_object_ref (self), g_object_unref); + g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ___lambda355__gsource_func, g_object_ref (self), g_object_unref); result = FALSE; uris = (_vala_array_free (uris, uris_length1, (GDestroyNotify) g_free), NULL); return result; } -static gboolean __lambda359_ (XnoiseTagAlbumArtistEditor* self) { +static gboolean __lambda357_ (XnoiseTagAlbumArtistEditor* self) { gboolean result = FALSE; GtkDialog* _tmp0_ = NULL; _tmp0_ = self->priv->dialog; @@ -1516,9 +1516,9 @@ } -static gboolean ___lambda359__gsource_func (gpointer self) { +static gboolean ___lambda357__gsource_func (gpointer self) { gboolean result; - result = __lambda359_ (self); + result = __lambda357_ (self); return result; } @@ -1526,7 +1526,7 @@ static void xnoise_tag_album_artist_editor_on_cancel_button_clicked (XnoiseTagAlbumArtistEditor* self, GtkButton* sender) { g_return_if_fail (XNOISE_IS_TAG_ALBUM_ARTIST_EDITOR (self)); g_return_if_fail (GTK_IS_BUTTON (sender)); - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda359__gsource_func, g_object_ref (self), g_object_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda357__gsource_func, g_object_ref (self), g_object_unref); } diff -Nru xnoise-0.2.20/libxnoise/ItemHandlers/EditTags/xnoise-tag-artist-editor.c xnoise-0.2.21/libxnoise/ItemHandlers/EditTags/xnoise-tag-artist-editor.c --- xnoise-0.2.20/libxnoise/ItemHandlers/EditTags/xnoise-tag-artist-editor.c 2013-12-11 11:24:23.000000000 +0000 +++ xnoise-0.2.21/libxnoise/ItemHandlers/EditTags/xnoise-tag-artist-editor.c 2014-01-27 09:32:56.000000000 +0000 @@ -506,13 +506,13 @@ GType xnoise_music_browser_get_type (void) G_GNUC_CONST; GType xnoise_media_soure_widget_get_type (void) G_GNUC_CONST; GType xnoise_tree_queryable_get_type (void) G_GNUC_CONST; -static void __lambda367_ (XnoiseTagArtistEditor* self); +static void __lambda365_ (XnoiseTagArtistEditor* self); GType xnoise_global_access_get_type (void) G_GNUC_CONST; gboolean xnoise_global_access_get_media_import_in_progress (XnoiseGlobalAccess* self); gboolean xnoise_music_browser_model_get_populating_model (XnoiseMusicBrowserModel* self); -static void ___lambda367__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); -static void __lambda368_ (XnoiseTagArtistEditor* self); -static void ___lambda368__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); +static void ___lambda365__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); +static void __lambda366_ (XnoiseTagArtistEditor* self); +static void ___lambda366__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); static void xnoise_tag_artist_editor_fill_entries (XnoiseTagArtistEditor* self); gpointer xnoise_worker_job_ref (gpointer instance); void xnoise_worker_job_unref (gpointer instance); @@ -546,18 +546,18 @@ GType xnoise_item_converter_get_type (void) G_GNUC_CONST; XnoiseTrackData** xnoise_item_converter_to_trackdata (XnoiseItemConverter* self, XnoiseItem* item, const gchar* searchtext, GHashTable* extra_items, int* result_length1); const gchar* xnoise_global_access_get_searchtext (XnoiseGlobalAccess* self); -static gboolean ___lambda369_ (Block79Data* _data79_); -static gboolean ____lambda369__gsource_func (gpointer self); -static gboolean ___lambda370_ (XnoiseTagArtistEditor* self); -static gboolean ____lambda370__gsource_func (gpointer self); +static gboolean ___lambda367_ (Block79Data* _data79_); +static gboolean ____lambda367__gsource_func (gpointer self); +static gboolean ___lambda368_ (XnoiseTagArtistEditor* self); +static gboolean ____lambda368__gsource_func (gpointer self); static void xnoise_tag_artist_editor_on_ok_button_clicked (XnoiseTagArtistEditor* self, GtkButton* sender); static void _xnoise_tag_artist_editor_on_ok_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self); static void xnoise_tag_artist_editor_on_cancel_button_clicked (XnoiseTagArtistEditor* self, GtkButton* sender); static void _xnoise_tag_artist_editor_on_cancel_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self); #define XNOISE_RESOURCES_EMPTYSTRING "" static void xnoise_tag_artist_editor_do_artist_rename (XnoiseTagArtistEditor* self); -static gboolean __lambda365_ (XnoiseTagArtistEditor* self); -static gboolean ___lambda365__gsource_func (gpointer self); +static gboolean __lambda363_ (XnoiseTagArtistEditor* self); +static gboolean ___lambda363__gsource_func (gpointer self); static gboolean xnoise_tag_artist_editor_update_tags_job (XnoiseTagArtistEditor* self, XnoiseWorkerJob* job); static gboolean _xnoise_tag_artist_editor_update_tags_job_xnoise_worker_work_func (XnoiseWorkerJob* jb, gpointer self); void xnoise_worker_job_set_arg (XnoiseWorkerJob* self, const gchar* name, GValue* val); @@ -565,10 +565,10 @@ gboolean xnoise_worker_is_same_thread (XnoiseWorker* self); void xnoise_global_access_set_in_tag_rename (XnoiseGlobalAccess* self, gboolean value); gboolean xnoise_tag_access_tag_writer_write_tag (GFile* file, XnoiseTrackData* td, gboolean read_before_write); +static gboolean __lambda362_ (XnoiseTagArtistEditor* self); +static gboolean ___lambda362__gsource_func (gpointer self); static gboolean __lambda364_ (XnoiseTagArtistEditor* self); static gboolean ___lambda364__gsource_func (gpointer self); -static gboolean __lambda366_ (XnoiseTagArtistEditor* self); -static gboolean ___lambda366__gsource_func (gpointer self); static void xnoise_tag_artist_editor_finalize (GObject* obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -584,7 +584,7 @@ } -static void __lambda367_ (XnoiseTagArtistEditor* self) { +static void __lambda365_ (XnoiseTagArtistEditor* self) { gboolean _tmp0_ = FALSE; XnoiseGlobalAccess* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; @@ -616,12 +616,12 @@ } -static void ___lambda367__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { - __lambda367_ (self); +static void ___lambda365__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { + __lambda365_ (self); } -static void __lambda368_ (XnoiseTagArtistEditor* self) { +static void __lambda366_ (XnoiseTagArtistEditor* self) { gboolean _tmp0_ = FALSE; XnoiseGlobalAccess* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; @@ -653,8 +653,8 @@ } -static void ___lambda368__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { - __lambda368_ (self); +static void ___lambda366__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { + __lambda366_ (self); } @@ -704,9 +704,9 @@ _tmp11_ = _tmp10_->music_browser_model; self->priv->mbm = _tmp11_; _tmp12_ = self->priv->mbm; - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, G_TYPE_OBJECT, GObject), "notify::populating-model", (GCallback) ___lambda367__g_object_notify, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, G_TYPE_OBJECT, GObject), "notify::populating-model", (GCallback) ___lambda365__g_object_notify, self, 0); _tmp13_ = xnoise_global; - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, G_TYPE_OBJECT, GObject), "notify::media-import-in-progress", (GCallback) ___lambda368__g_object_notify, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, G_TYPE_OBJECT, GObject), "notify::media-import-in-progress", (GCallback) ___lambda366__g_object_notify, self, 0); xnoise_tag_artist_editor_fill_entries (self); _tmp14_ = self->priv->dialog; gtk_window_set_position (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GTK_TYPE_WINDOW, GtkWindow), GTK_WIN_POS_CENTER_ON_PARENT); @@ -772,7 +772,7 @@ } -static gboolean ___lambda369_ (Block79Data* _data79_) { +static gboolean ___lambda367_ (Block79Data* _data79_) { XnoiseTagArtistEditor * self; gboolean result = FALSE; GtkEntry* _tmp0_ = NULL; @@ -788,14 +788,14 @@ } -static gboolean ____lambda369__gsource_func (gpointer self) { +static gboolean ____lambda367__gsource_func (gpointer self) { gboolean result; - result = ___lambda369_ (self); + result = ___lambda367_ (self); return result; } -static gboolean ___lambda370_ (XnoiseTagArtistEditor* self) { +static gboolean ___lambda368_ (XnoiseTagArtistEditor* self) { gboolean result = FALSE; g_signal_emit_by_name (self, "sign-finish"); result = FALSE; @@ -803,9 +803,9 @@ } -static gboolean ____lambda370__gsource_func (gpointer self) { +static gboolean ____lambda368__gsource_func (gpointer self) { gboolean result; - result = ___lambda370_ (self); + result = ___lambda368_ (self); return result; } @@ -860,12 +860,12 @@ switch (_tmp14_) { case XNOISE_ITEM_TYPE_COLLECTION_CONTAINER_ARTIST: { - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda369__gsource_func, block79_data_ref (_data79_), block79_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda367__gsource_func, block79_data_ref (_data79_), block79_data_unref); break; } default: { - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda370__gsource_func, g_object_ref (self), g_object_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda368__gsource_func, g_object_ref (self), g_object_unref); break; } } @@ -1070,7 +1070,7 @@ } -static gboolean __lambda365_ (XnoiseTagArtistEditor* self) { +static gboolean __lambda363_ (XnoiseTagArtistEditor* self) { gboolean result = FALSE; GtkDialog* _tmp0_ = NULL; _tmp0_ = self->priv->dialog; @@ -1080,9 +1080,9 @@ } -static gboolean ___lambda365__gsource_func (gpointer self) { +static gboolean ___lambda363__gsource_func (gpointer self) { gboolean result; - result = __lambda365_ (self); + result = __lambda363_ (self); return result; } @@ -1175,7 +1175,7 @@ break; } } - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda365__gsource_func, g_object_ref (self), g_object_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda363__gsource_func, g_object_ref (self), g_object_unref); } @@ -1285,7 +1285,7 @@ } -static gboolean __lambda364_ (XnoiseTagArtistEditor* self) { +static gboolean __lambda362_ (XnoiseTagArtistEditor* self) { gboolean result = FALSE; XnoiseGlobalAccess* _tmp0_ = NULL; _tmp0_ = xnoise_global; @@ -1296,9 +1296,9 @@ } -static gboolean ___lambda364__gsource_func (gpointer self) { +static gboolean ___lambda362__gsource_func (gpointer self) { gboolean result; - result = __lambda364_ (self); + result = __lambda362_ (self); return result; } @@ -1402,13 +1402,13 @@ } } } - g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ___lambda364__gsource_func, g_object_ref (self), g_object_unref); + g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ___lambda362__gsource_func, g_object_ref (self), g_object_unref); result = FALSE; return result; } -static gboolean __lambda366_ (XnoiseTagArtistEditor* self) { +static gboolean __lambda364_ (XnoiseTagArtistEditor* self) { gboolean result = FALSE; GtkDialog* _tmp0_ = NULL; _tmp0_ = self->priv->dialog; @@ -1419,9 +1419,9 @@ } -static gboolean ___lambda366__gsource_func (gpointer self) { +static gboolean ___lambda364__gsource_func (gpointer self) { gboolean result; - result = __lambda366_ (self); + result = __lambda364_ (self); return result; } @@ -1429,7 +1429,7 @@ static void xnoise_tag_artist_editor_on_cancel_button_clicked (XnoiseTagArtistEditor* self, GtkButton* sender) { g_return_if_fail (XNOISE_IS_TAG_ARTIST_EDITOR (self)); g_return_if_fail (GTK_IS_BUTTON (sender)); - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda366__gsource_func, g_object_ref (self), g_object_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda364__gsource_func, g_object_ref (self), g_object_unref); } diff -Nru xnoise-0.2.20/libxnoise/ItemHandlers/EditTags/xnoise-tag-genre-editor.c xnoise-0.2.21/libxnoise/ItemHandlers/EditTags/xnoise-tag-genre-editor.c --- xnoise-0.2.20/libxnoise/ItemHandlers/EditTags/xnoise-tag-genre-editor.c 2013-12-11 11:24:23.000000000 +0000 +++ xnoise-0.2.21/libxnoise/ItemHandlers/EditTags/xnoise-tag-genre-editor.c 2014-01-27 09:32:56.000000000 +0000 @@ -505,13 +505,13 @@ GType xnoise_music_browser_get_type (void) G_GNUC_CONST; GType xnoise_media_soure_widget_get_type (void) G_GNUC_CONST; GType xnoise_tree_queryable_get_type (void) G_GNUC_CONST; -static void __lambda353_ (XnoiseTagGenreEditor* self); +static void __lambda351_ (XnoiseTagGenreEditor* self); GType xnoise_global_access_get_type (void) G_GNUC_CONST; gboolean xnoise_global_access_get_media_import_in_progress (XnoiseGlobalAccess* self); gboolean xnoise_music_browser_model_get_populating_model (XnoiseMusicBrowserModel* self); -static void ___lambda353__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); -static void __lambda354_ (XnoiseTagGenreEditor* self); -static void ___lambda354__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); +static void ___lambda351__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); +static void __lambda352_ (XnoiseTagGenreEditor* self); +static void ___lambda352__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); static void xnoise_tag_genre_editor_fill_entries (XnoiseTagGenreEditor* self); gpointer xnoise_worker_job_ref (gpointer instance); void xnoise_worker_job_unref (gpointer instance); @@ -545,18 +545,18 @@ GType xnoise_item_converter_get_type (void) G_GNUC_CONST; XnoiseTrackData** xnoise_item_converter_to_trackdata (XnoiseItemConverter* self, XnoiseItem* item, const gchar* searchtext, GHashTable* extra_items, int* result_length1); const gchar* xnoise_global_access_get_searchtext (XnoiseGlobalAccess* self); -static gboolean ___lambda355_ (Block80Data* _data80_); -static gboolean ____lambda355__gsource_func (gpointer self); -static gboolean ___lambda356_ (XnoiseTagGenreEditor* self); -static gboolean ____lambda356__gsource_func (gpointer self); +static gboolean ___lambda353_ (Block80Data* _data80_); +static gboolean ____lambda353__gsource_func (gpointer self); +static gboolean ___lambda354_ (XnoiseTagGenreEditor* self); +static gboolean ____lambda354__gsource_func (gpointer self); static void xnoise_tag_genre_editor_on_ok_button_clicked (XnoiseTagGenreEditor* self, GtkButton* sender); static void _xnoise_tag_genre_editor_on_ok_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self); static void xnoise_tag_genre_editor_on_cancel_button_clicked (XnoiseTagGenreEditor* self, GtkButton* sender); static void _xnoise_tag_genre_editor_on_cancel_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self); #define XNOISE_RESOURCES_EMPTYSTRING "" static void xnoise_tag_genre_editor_do_genre_rename (XnoiseTagGenreEditor* self); -static gboolean __lambda351_ (XnoiseTagGenreEditor* self); -static gboolean ___lambda351__gsource_func (gpointer self); +static gboolean __lambda349_ (XnoiseTagGenreEditor* self); +static gboolean ___lambda349__gsource_func (gpointer self); static gboolean xnoise_tag_genre_editor_update_tags_job (XnoiseTagGenreEditor* self, XnoiseWorkerJob* job); static gboolean _xnoise_tag_genre_editor_update_tags_job_xnoise_worker_work_func (XnoiseWorkerJob* jb, gpointer self); void xnoise_worker_job_set_arg (XnoiseWorkerJob* self, const gchar* name, GValue* val); @@ -564,10 +564,10 @@ gboolean xnoise_worker_is_same_thread (XnoiseWorker* self); void xnoise_global_access_set_in_tag_rename (XnoiseGlobalAccess* self, gboolean value); gboolean xnoise_tag_access_tag_writer_write_tag (GFile* file, XnoiseTrackData* td, gboolean read_before_write); +static gboolean __lambda348_ (XnoiseTagGenreEditor* self); +static gboolean ___lambda348__gsource_func (gpointer self); static gboolean __lambda350_ (XnoiseTagGenreEditor* self); static gboolean ___lambda350__gsource_func (gpointer self); -static gboolean __lambda352_ (XnoiseTagGenreEditor* self); -static gboolean ___lambda352__gsource_func (gpointer self); static void xnoise_tag_genre_editor_finalize (GObject* obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -583,7 +583,7 @@ } -static void __lambda353_ (XnoiseTagGenreEditor* self) { +static void __lambda351_ (XnoiseTagGenreEditor* self) { gboolean _tmp0_ = FALSE; XnoiseGlobalAccess* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; @@ -615,12 +615,12 @@ } -static void ___lambda353__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { - __lambda353_ (self); +static void ___lambda351__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { + __lambda351_ (self); } -static void __lambda354_ (XnoiseTagGenreEditor* self) { +static void __lambda352_ (XnoiseTagGenreEditor* self) { gboolean _tmp0_ = FALSE; XnoiseGlobalAccess* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; @@ -652,8 +652,8 @@ } -static void ___lambda354__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { - __lambda354_ (self); +static void ___lambda352__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { + __lambda352_ (self); } @@ -703,9 +703,9 @@ _tmp11_ = _tmp10_->music_browser_model; self->priv->mbm = _tmp11_; _tmp12_ = self->priv->mbm; - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, G_TYPE_OBJECT, GObject), "notify::populating-model", (GCallback) ___lambda353__g_object_notify, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, G_TYPE_OBJECT, GObject), "notify::populating-model", (GCallback) ___lambda351__g_object_notify, self, 0); _tmp13_ = xnoise_global; - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, G_TYPE_OBJECT, GObject), "notify::media-import-in-progress", (GCallback) ___lambda354__g_object_notify, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, G_TYPE_OBJECT, GObject), "notify::media-import-in-progress", (GCallback) ___lambda352__g_object_notify, self, 0); xnoise_tag_genre_editor_fill_entries (self); _tmp14_ = self->priv->dialog; gtk_window_set_position (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GTK_TYPE_WINDOW, GtkWindow), GTK_WIN_POS_CENTER_ON_PARENT); @@ -771,7 +771,7 @@ } -static gboolean ___lambda355_ (Block80Data* _data80_) { +static gboolean ___lambda353_ (Block80Data* _data80_) { XnoiseTagGenreEditor * self; gboolean result = FALSE; GtkEntry* _tmp0_ = NULL; @@ -787,14 +787,14 @@ } -static gboolean ____lambda355__gsource_func (gpointer self) { +static gboolean ____lambda353__gsource_func (gpointer self) { gboolean result; - result = ___lambda355_ (self); + result = ___lambda353_ (self); return result; } -static gboolean ___lambda356_ (XnoiseTagGenreEditor* self) { +static gboolean ___lambda354_ (XnoiseTagGenreEditor* self) { gboolean result = FALSE; g_signal_emit_by_name (self, "sign-finish"); result = FALSE; @@ -802,9 +802,9 @@ } -static gboolean ____lambda356__gsource_func (gpointer self) { +static gboolean ____lambda354__gsource_func (gpointer self) { gboolean result; - result = ___lambda356_ (self); + result = ___lambda354_ (self); return result; } @@ -852,12 +852,12 @@ switch (_tmp12_) { case XNOISE_ITEM_TYPE_COLLECTION_CONTAINER_GENRE: { - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda355__gsource_func, block80_data_ref (_data80_), block80_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda353__gsource_func, block80_data_ref (_data80_), block80_data_unref); break; } default: { - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda356__gsource_func, g_object_ref (self), g_object_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda354__gsource_func, g_object_ref (self), g_object_unref); break; } } @@ -1062,7 +1062,7 @@ } -static gboolean __lambda351_ (XnoiseTagGenreEditor* self) { +static gboolean __lambda349_ (XnoiseTagGenreEditor* self) { gboolean result = FALSE; GtkDialog* _tmp0_ = NULL; _tmp0_ = self->priv->dialog; @@ -1072,9 +1072,9 @@ } -static gboolean ___lambda351__gsource_func (gpointer self) { +static gboolean ___lambda349__gsource_func (gpointer self) { gboolean result; - result = __lambda351_ (self); + result = __lambda349_ (self); return result; } @@ -1167,7 +1167,7 @@ break; } } - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda351__gsource_func, g_object_ref (self), g_object_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda349__gsource_func, g_object_ref (self), g_object_unref); } @@ -1277,7 +1277,7 @@ } -static gboolean __lambda350_ (XnoiseTagGenreEditor* self) { +static gboolean __lambda348_ (XnoiseTagGenreEditor* self) { gboolean result = FALSE; XnoiseGlobalAccess* _tmp0_ = NULL; _tmp0_ = xnoise_global; @@ -1288,9 +1288,9 @@ } -static gboolean ___lambda350__gsource_func (gpointer self) { +static gboolean ___lambda348__gsource_func (gpointer self) { gboolean result; - result = __lambda350_ (self); + result = __lambda348_ (self); return result; } @@ -1460,13 +1460,13 @@ } } } - g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ___lambda350__gsource_func, g_object_ref (self), g_object_unref); + g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ___lambda348__gsource_func, g_object_ref (self), g_object_unref); result = FALSE; return result; } -static gboolean __lambda352_ (XnoiseTagGenreEditor* self) { +static gboolean __lambda350_ (XnoiseTagGenreEditor* self) { gboolean result = FALSE; GtkDialog* _tmp0_ = NULL; _tmp0_ = self->priv->dialog; @@ -1477,9 +1477,9 @@ } -static gboolean ___lambda352__gsource_func (gpointer self) { +static gboolean ___lambda350__gsource_func (gpointer self) { gboolean result; - result = __lambda352_ (self); + result = __lambda350_ (self); return result; } @@ -1487,7 +1487,7 @@ static void xnoise_tag_genre_editor_on_cancel_button_clicked (XnoiseTagGenreEditor* self, GtkButton* sender) { g_return_if_fail (XNOISE_IS_TAG_GENRE_EDITOR (self)); g_return_if_fail (GTK_IS_BUTTON (sender)); - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda352__gsource_func, g_object_ref (self), g_object_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda350__gsource_func, g_object_ref (self), g_object_unref); } diff -Nru xnoise-0.2.20/libxnoise/ItemHandlers/EditTags/xnoise-tag-title-editor.c xnoise-0.2.21/libxnoise/ItemHandlers/EditTags/xnoise-tag-title-editor.c --- xnoise-0.2.20/libxnoise/ItemHandlers/EditTags/xnoise-tag-title-editor.c 2013-12-11 11:24:23.000000000 +0000 +++ xnoise-0.2.21/libxnoise/ItemHandlers/EditTags/xnoise-tag-title-editor.c 2014-01-27 09:32:56.000000000 +0000 @@ -559,23 +559,23 @@ static void block81_data_unref (void * _userdata_); GType xnoise_global_access_get_type (void) G_GNUC_CONST; gboolean xnoise_global_access_get_media_import_in_progress (XnoiseGlobalAccess* self); -static gboolean ___lambda347_ (XnoiseTagTitleEditor* self); -static gboolean ____lambda347__gsource_func (gpointer self); +static gboolean ___lambda345_ (XnoiseTagTitleEditor* self); +static gboolean ____lambda345__gsource_func (gpointer self); GType xnoise_item_converter_get_type (void) G_GNUC_CONST; XnoiseTrackData** xnoise_item_converter_to_trackdata (XnoiseItemConverter* self, XnoiseItem* item, const gchar* searchtext, GHashTable* extra_items, int* result_length1); const gchar* xnoise_global_access_get_searchtext (XnoiseGlobalAccess* self); -static gboolean ___lambda348_ (XnoiseTagTitleEditor* self); -static gboolean ____lambda348__gsource_func (gpointer self); +static gboolean ___lambda346_ (XnoiseTagTitleEditor* self); +static gboolean ____lambda346__gsource_func (gpointer self); XnoiseTrackData* xnoise_copy_trackdata (XnoiseTrackData* td); -static gboolean __lambda349_ (Block81Data* _data81_); +static gboolean __lambda347_ (Block81Data* _data81_); #define XNOISE_RESOURCES_EMPTYSTRING "" -static gboolean ___lambda349__gsource_func (gpointer self); +static gboolean ___lambda347__gsource_func (gpointer self); +static void ___lambda339_ (XnoiseTagTitleEditor* self, GtkEditable* sender); +static void ____lambda339__gtk_editable_changed (GtkEditable* _sender, gpointer self); +static void ___lambda340_ (XnoiseTagTitleEditor* self, GtkEditable* sender); +static void ____lambda340__gtk_editable_changed (GtkEditable* _sender, gpointer self); static void ___lambda341_ (XnoiseTagTitleEditor* self, GtkEditable* sender); static void ____lambda341__gtk_editable_changed (GtkEditable* _sender, gpointer self); -static void ___lambda342_ (XnoiseTagTitleEditor* self, GtkEditable* sender); -static void ____lambda342__gtk_editable_changed (GtkEditable* _sender, gpointer self); -static void ___lambda343_ (XnoiseTagTitleEditor* self, GtkEditable* sender); -static void ____lambda343__gtk_editable_changed (GtkEditable* _sender, gpointer self); static void xnoise_tag_title_editor_on_ok_button_clicked (XnoiseTagTitleEditor* self, GtkButton* sender); static void _xnoise_tag_title_editor_on_ok_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self); static void xnoise_tag_title_editor_on_cancel_button_clicked (XnoiseTagTitleEditor* self, GtkButton* sender); @@ -586,18 +586,18 @@ static void _g_free0_ (gpointer var); GType xnoise_track_list_model_get_type (void) G_GNUC_CONST; void xnoise_track_list_model_update_tracklist_data (XnoiseTrackListModel* self, GHashTable* ntags); -static gboolean __lambda345_ (XnoiseTagTitleEditor* self); -static gboolean ___lambda345__gsource_func (gpointer self); +static gboolean __lambda343_ (XnoiseTagTitleEditor* self); +static gboolean ___lambda343__gsource_func (gpointer self); static gboolean xnoise_tag_title_editor_update_tag_job (XnoiseTagTitleEditor* self, XnoiseWorkerJob* tag_job); static gboolean _xnoise_tag_title_editor_update_tag_job_xnoise_worker_work_func (XnoiseWorkerJob* jb, gpointer self); static XnoiseTrackData** _vala_array_dup23 (XnoiseTrackData** self, int length); gboolean xnoise_worker_is_same_thread (XnoiseWorker* self); void xnoise_global_access_set_in_tag_rename (XnoiseGlobalAccess* self, gboolean value); gboolean xnoise_tag_access_tag_writer_write_tag (GFile* file, XnoiseTrackData* td, gboolean read_before_write); +static gboolean __lambda342_ (XnoiseTagTitleEditor* self); +static gboolean ___lambda342__gsource_func (gpointer self); static gboolean __lambda344_ (XnoiseTagTitleEditor* self); static gboolean ___lambda344__gsource_func (gpointer self); -static gboolean __lambda346_ (XnoiseTagTitleEditor* self); -static gboolean ___lambda346__gsource_func (gpointer self); static void xnoise_tag_title_editor_finalize (GObject* obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -694,7 +694,7 @@ } -static gboolean ___lambda347_ (XnoiseTagTitleEditor* self) { +static gboolean ___lambda345_ (XnoiseTagTitleEditor* self) { gboolean result = FALSE; GtkDialog* _tmp0_ = NULL; _tmp0_ = self->priv->dialog; @@ -704,14 +704,14 @@ } -static gboolean ____lambda347__gsource_func (gpointer self) { +static gboolean ____lambda345__gsource_func (gpointer self) { gboolean result; - result = ___lambda347_ (self); + result = ___lambda345_ (self); return result; } -static gboolean ___lambda348_ (XnoiseTagTitleEditor* self) { +static gboolean ___lambda346_ (XnoiseTagTitleEditor* self) { gboolean result = FALSE; GtkDialog* _tmp0_ = NULL; _tmp0_ = self->priv->dialog; @@ -721,9 +721,9 @@ } -static gboolean ____lambda348__gsource_func (gpointer self) { +static gboolean ____lambda346__gsource_func (gpointer self) { gboolean result; - result = ___lambda348_ (self); + result = ___lambda346_ (self); return result; } @@ -733,7 +733,7 @@ } -static gboolean __lambda349_ (Block81Data* _data81_) { +static gboolean __lambda347_ (Block81Data* _data81_) { XnoiseTagTitleEditor * self; gboolean result = FALSE; GtkEntry* _tmp0_ = NULL; @@ -863,9 +863,9 @@ } -static gboolean ___lambda349__gsource_func (gpointer self) { +static gboolean ___lambda347__gsource_func (gpointer self) { gboolean result; - result = __lambda349_ (self); + result = __lambda347_ (self); return result; } @@ -912,7 +912,7 @@ _tmp2_ = xnoise_global_access_get_media_import_in_progress (_tmp1_); _tmp3_ = _tmp2_; if (_tmp3_) { - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda347__gsource_func, g_object_ref (self), g_object_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda345__gsource_func, g_object_ref (self), g_object_unref); result = FALSE; tmp = (_vala_array_free (tmp, tmp_length1, (GDestroyNotify) xnoise_track_data_unref), NULL); block81_data_unref (_data81_); @@ -954,7 +954,7 @@ } _tmp18_ = _tmp11_; if (_tmp18_) { - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda348__gsource_func, g_object_ref (self), g_object_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda346__gsource_func, g_object_ref (self), g_object_unref); result = FALSE; tmp = (_vala_array_free (tmp, tmp_length1, (GDestroyNotify) xnoise_track_data_unref), NULL); block81_data_unref (_data81_); @@ -970,7 +970,7 @@ _tmp23_ = xnoise_copy_trackdata (_tmp22_); _xnoise_track_data_unref0 (self->priv->td_old); self->priv->td_old = _tmp23_; - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda349__gsource_func, block81_data_ref (_data81_), block81_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda347__gsource_func, block81_data_ref (_data81_), block81_data_unref); result = FALSE; tmp = (_vala_array_free (tmp, tmp_length1, (GDestroyNotify) xnoise_track_data_unref), NULL); block81_data_unref (_data81_); @@ -984,7 +984,7 @@ } -static void ___lambda341_ (XnoiseTagTitleEditor* self, GtkEditable* sender) { +static void ___lambda339_ (XnoiseTagTitleEditor* self, GtkEditable* sender) { GtkEditable* _tmp0_ = NULL; gdouble _tmp1_ = 0.0; gdouble _tmp2_ = 0.0; @@ -1011,12 +1011,12 @@ } -static void ____lambda341__gtk_editable_changed (GtkEditable* _sender, gpointer self) { - ___lambda341_ (self, _sender); +static void ____lambda339__gtk_editable_changed (GtkEditable* _sender, gpointer self) { + ___lambda339_ (self, _sender); } -static void ___lambda342_ (XnoiseTagTitleEditor* self, GtkEditable* sender) { +static void ___lambda340_ (XnoiseTagTitleEditor* self, GtkEditable* sender) { GtkEditable* _tmp0_ = NULL; gdouble _tmp1_ = 0.0; gdouble _tmp2_ = 0.0; @@ -1043,12 +1043,12 @@ } -static void ____lambda342__gtk_editable_changed (GtkEditable* _sender, gpointer self) { - ___lambda342_ (self, _sender); +static void ____lambda340__gtk_editable_changed (GtkEditable* _sender, gpointer self) { + ___lambda340_ (self, _sender); } -static void ___lambda343_ (XnoiseTagTitleEditor* self, GtkEditable* sender) { +static void ___lambda341_ (XnoiseTagTitleEditor* self, GtkEditable* sender) { GtkEditable* _tmp0_ = NULL; gdouble _tmp1_ = 0.0; gdouble _tmp2_ = 0.0; @@ -1075,8 +1075,8 @@ } -static void ____lambda343__gtk_editable_changed (GtkEditable* _sender, gpointer self) { - ___lambda343_ (self, _sender); +static void ____lambda341__gtk_editable_changed (GtkEditable* _sender, gpointer self) { + ___lambda341_ (self, _sender); } @@ -1424,7 +1424,7 @@ gtk_spin_button_configure (_tmp113_, _tmp115_, 1.0, (guint) 0); _g_object_unref0 (_tmp115_); _tmp116_ = self->priv->spinbutton_disk; - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp116_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) ____lambda341__gtk_editable_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp116_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) ____lambda339__gtk_editable_changed, self, 0); _tmp117_ = self->priv->spinbutton_tracknumber; gtk_spin_button_set_numeric (_tmp117_, TRUE); _tmp118_ = self->priv->spinbutton_tracknumber; @@ -1434,7 +1434,7 @@ gtk_spin_button_configure (_tmp118_, _tmp120_, 1.0, (guint) 0); _g_object_unref0 (_tmp120_); _tmp121_ = self->priv->spinbutton_tracknumber; - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) ____lambda342__gtk_editable_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) ____lambda340__gtk_editable_changed, self, 0); _tmp122_ = self->priv->spinbutton_year; gtk_spin_button_set_numeric (_tmp122_, TRUE); _tmp123_ = self->priv->spinbutton_year; @@ -1444,7 +1444,7 @@ gtk_spin_button_configure (_tmp123_, _tmp125_, 1.0, (guint) 0); _g_object_unref0 (_tmp125_); _tmp126_ = self->priv->spinbutton_year; - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp126_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) ____lambda343__gtk_editable_changed, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp126_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) ____lambda341__gtk_editable_changed, self, 0); _tmp127_ = self->priv->dialog; _tmp128_ = (GtkBox*) gtk_dialog_get_content_area (_tmp127_); _tmp129_ = mainvbox; @@ -1520,7 +1520,7 @@ } -static gboolean __lambda345_ (XnoiseTagTitleEditor* self) { +static gboolean __lambda343_ (XnoiseTagTitleEditor* self) { gboolean result = FALSE; GtkDialog* _tmp0_ = NULL; _tmp0_ = self->priv->dialog; @@ -1530,9 +1530,9 @@ } -static gboolean ___lambda345__gsource_func (gpointer self) { +static gboolean ___lambda343__gsource_func (gpointer self) { gboolean result; - result = __lambda345_ (self); + result = __lambda343_ (self); return result; } @@ -1831,7 +1831,7 @@ _tmp113_ = xnoise_tlm; _tmp114_ = ntags; xnoise_track_list_model_update_tracklist_data (_tmp113_, _tmp114_); - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda345__gsource_func, g_object_ref (self), g_object_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda343__gsource_func, g_object_ref (self), g_object_unref); _g_hash_table_unref0 (ntags); _xnoise_track_data_unref0 (td_new); } @@ -1904,7 +1904,7 @@ } -static gboolean __lambda344_ (XnoiseTagTitleEditor* self) { +static gboolean __lambda342_ (XnoiseTagTitleEditor* self) { gboolean result = FALSE; XnoiseGlobalAccess* _tmp0_ = NULL; _tmp0_ = xnoise_global; @@ -1915,9 +1915,9 @@ } -static gboolean ___lambda344__gsource_func (gpointer self) { +static gboolean ___lambda342__gsource_func (gpointer self) { gboolean result; - result = __lambda344_ (self); + result = __lambda342_ (self); return result; } @@ -2005,13 +2005,13 @@ xnoise_tag_access_tag_writer_write_tag (_tmp23_, _tmp26_, FALSE); _g_object_unref0 (f); } - g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 300, ___lambda344__gsource_func, g_object_ref (self), g_object_unref); + g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 300, ___lambda342__gsource_func, g_object_ref (self), g_object_unref); result = FALSE; return result; } -static gboolean __lambda346_ (XnoiseTagTitleEditor* self) { +static gboolean __lambda344_ (XnoiseTagTitleEditor* self) { gboolean result = FALSE; GtkDialog* _tmp0_ = NULL; _tmp0_ = self->priv->dialog; @@ -2022,9 +2022,9 @@ } -static gboolean ___lambda346__gsource_func (gpointer self) { +static gboolean ___lambda344__gsource_func (gpointer self) { gboolean result; - result = __lambda346_ (self); + result = __lambda344_ (self); return result; } @@ -2032,7 +2032,7 @@ static void xnoise_tag_title_editor_on_cancel_button_clicked (XnoiseTagTitleEditor* self, GtkButton* sender) { g_return_if_fail (XNOISE_IS_TAG_TITLE_EDITOR (self)); g_return_if_fail (GTK_IS_BUTTON (sender)); - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda346__gsource_func, g_object_ref (self), g_object_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda344__gsource_func, g_object_ref (self), g_object_unref); } diff -Nru xnoise-0.2.20/libxnoise/ItemHandlers/FilterForArtist/xnoise-handler-filter-for-artist.c xnoise-0.2.21/libxnoise/ItemHandlers/FilterForArtist/xnoise-handler-filter-for-artist.c --- xnoise-0.2.20/libxnoise/ItemHandlers/FilterForArtist/xnoise-handler-filter-for-artist.c 2013-12-10 15:13:32.000000000 +0000 +++ xnoise-0.2.21/libxnoise/ItemHandlers/FilterForArtist/xnoise-handler-filter-for-artist.c 2014-01-17 15:05:35.000000000 +0000 @@ -615,7 +615,7 @@ XnoiseCollectionSortMode xnoise_global_access_get_collection_sort_mode (XnoiseGlobalAccess* self); static Block82Data* block82_data_ref (Block82Data* _data82_); static void block82_data_unref (void * _userdata_); -static gboolean ___lambda393_ (Block82Data* _data82_); +static gboolean ___lambda391_ (Block82Data* _data82_); GType xnoise_main_window_get_type (void) G_GNUC_CONST; GType xnoise_iparams_get_type (void) G_GNUC_CONST; GType xnoise_serial_button_get_type (void) G_GNUC_CONST; @@ -636,11 +636,11 @@ GType xnoise_icons_model_get_type (void) G_GNUC_CONST; void xnoise_icons_model_immediate_search (XnoiseIconsModel* self, const gchar* text); void xnoise_main_window_set_album_art_view_visible (XnoiseMainWindow* self, gboolean value); -static gboolean ____lambda393__gsource_func (gpointer self); +static gboolean ____lambda391__gsource_func (gpointer self); static Block83Data* block83_data_ref (Block83Data* _data83_); static void block83_data_unref (void * _userdata_); -static gboolean ____lambda391_ (Block83Data* _data83_); -static gboolean _____lambda391__gsource_func (gpointer self); +static gboolean ____lambda389_ (Block83Data* _data83_); +static gboolean _____lambda389__gsource_func (gpointer self); gpointer xnoise_worker_job_ref (gpointer instance); void xnoise_worker_job_unref (gpointer instance); GParamSpec* xnoise_worker_param_spec_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -686,8 +686,8 @@ XnoiseTrackData** xnoise_item_converter_to_trackdata (XnoiseItemConverter* self, XnoiseItem* item, const gchar* searchtext, GHashTable* extra_items, int* result_length1); #define XNOISE_RESOURCES_EMPTYSTRING "" #define XNOISE_RESOURCES_VARIOUS_ARTISTS "Various artists" -static gboolean ___lambda392_ (Block84Data* _data84_); -static gboolean ____lambda392__gsource_func (gpointer self); +static gboolean ___lambda390_ (Block84Data* _data84_); +static gboolean ____lambda390__gsource_func (gpointer self); static void xnoise_handler_filter_for_artist_finalize (GObject* obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -892,7 +892,7 @@ } -static gboolean ___lambda393_ (Block82Data* _data82_) { +static gboolean ___lambda391_ (Block82Data* _data82_) { XnoiseHandlerFilterForArtist * self; gboolean result = FALSE; XnoiseMainWindow* _tmp0_ = NULL; @@ -920,9 +920,9 @@ } -static gboolean ____lambda393__gsource_func (gpointer self) { +static gboolean ____lambda391__gsource_func (gpointer self) { gboolean result; - result = ___lambda393_ (self); + result = ___lambda391_ (self); return result; } @@ -944,7 +944,7 @@ _data82_->artist = _tmp2_; _tmp3_ = _data82_->artist; if (_tmp3_ != NULL) { - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda393__gsource_func, block82_data_ref (_data82_), block82_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda391__gsource_func, block82_data_ref (_data82_), block82_data_unref); } block82_data_unref (_data82_); _data82_ = NULL; @@ -970,7 +970,7 @@ } -static gboolean ____lambda391_ (Block83Data* _data83_) { +static gboolean ____lambda389_ (Block83Data* _data83_) { XnoiseHandlerFilterForArtist * self; gboolean result = FALSE; XnoiseMainWindow* _tmp0_ = NULL; @@ -998,9 +998,9 @@ } -static gboolean _____lambda391__gsource_func (gpointer self) { +static gboolean _____lambda389__gsource_func (gpointer self) { gboolean result; - result = ____lambda391_ (self); + result = ____lambda389_ (self); return result; } @@ -1146,7 +1146,7 @@ _data83_->artist = _tmp22_; _tmp23_ = _data83_->artist; if (_tmp23_ != NULL) { - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _____lambda391__gsource_func, block83_data_ref (_data83_), block83_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _____lambda389__gsource_func, block83_data_ref (_data83_), block83_data_unref); } block83_data_unref (_data83_); _data83_ = NULL; @@ -1238,7 +1238,7 @@ } -static gboolean ___lambda392_ (Block84Data* _data84_) { +static gboolean ___lambda390_ (Block84Data* _data84_) { XnoiseHandlerFilterForArtist * self; gboolean result = FALSE; XnoiseMainWindow* _tmp0_ = NULL; @@ -1266,9 +1266,9 @@ } -static gboolean ____lambda392__gsource_func (gpointer self) { +static gboolean ____lambda390__gsource_func (gpointer self) { gboolean result; - result = ___lambda392_ (self); + result = ___lambda390_ (self); return result; } @@ -1466,7 +1466,7 @@ } _tmp58_ = _data84_->artist; if (_tmp58_ != NULL) { - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda392__gsource_func, block84_data_ref (_data84_), block84_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda390__gsource_func, block84_data_ref (_data84_), block84_data_unref); } result = FALSE; tda = (_vala_array_free (tda, tda_length1, (GDestroyNotify) xnoise_track_data_unref), NULL); diff -Nru xnoise-0.2.20/libxnoise/ItemHandlers/MoveToTrash/xnoise-handler-move-to-trash.c xnoise-0.2.21/libxnoise/ItemHandlers/MoveToTrash/xnoise-handler-move-to-trash.c --- xnoise-0.2.20/libxnoise/ItemHandlers/MoveToTrash/xnoise-handler-move-to-trash.c 2013-12-11 11:24:24.000000000 +0000 +++ xnoise-0.2.21/libxnoise/ItemHandlers/MoveToTrash/xnoise-handler-move-to-trash.c 2014-01-27 09:32:56.000000000 +0000 @@ -338,11 +338,11 @@ static Block85Data* block85_data_ref (Block85Data* _data85_); static void block85_data_unref (void * _userdata_); GType xnoise_main_window_get_type (void) G_GNUC_CONST; -static void __lambda389_ (Block85Data* _data85_, GtkDialog* s, gint response_id); +static void __lambda387_ (Block85Data* _data85_, GtkDialog* s, gint response_id); GType xnoise_track_list_get_type (void) G_GNUC_CONST; void xnoise_track_list_remove_uri_rows (XnoiseTrackList* self, const gchar* uri); static void xnoise_handler_move_to_trash_delete_from_database (XnoiseHandlerMoveToTrash* self); -static void ___lambda389__gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self); +static void ___lambda387__gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self); gpointer xnoise_worker_job_ref (gpointer instance); void xnoise_worker_job_unref (gpointer instance); GParamSpec* xnoise_worker_param_spec_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -495,7 +495,7 @@ } -static void __lambda389_ (Block85Data* _data85_, GtkDialog* s, gint response_id) { +static void __lambda387_ (Block85Data* _data85_, GtkDialog* s, gint response_id) { XnoiseHandlerMoveToTrash * self; gint _tmp0_ = 0; GtkDialog* _tmp10_ = NULL; @@ -555,8 +555,8 @@ } -static void ___lambda389__gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) { - __lambda389_ (self, _sender, response_id); +static void ___lambda387__gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) { + __lambda387_ (self, _sender, response_id); } @@ -614,7 +614,7 @@ g_object_ref_sink (_tmp13_); msg = _tmp13_; _tmp14_ = msg; - g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GTK_TYPE_DIALOG, GtkDialog), "response", (GCallback) ___lambda389__gtk_dialog_response, block85_data_ref (_data85_), (GClosureNotify) block85_data_unref, 0); + g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GTK_TYPE_DIALOG, GtkDialog), "response", (GCallback) ___lambda387__gtk_dialog_response, block85_data_ref (_data85_), (GClosureNotify) block85_data_unref, 0); _tmp15_ = msg; gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GTK_TYPE_DIALOG, GtkDialog)); _g_object_unref0 (msg); diff -Nru xnoise-0.2.20/libxnoise/ItemHandlers/RemoveCover/xnoise-handler-remove-cover.c xnoise-0.2.21/libxnoise/ItemHandlers/RemoveCover/xnoise-handler-remove-cover.c --- xnoise-0.2.20/libxnoise/ItemHandlers/RemoveCover/xnoise-handler-remove-cover.c 2013-12-10 15:13:32.000000000 +0000 +++ xnoise-0.2.21/libxnoise/ItemHandlers/RemoveCover/xnoise-handler-remove-cover.c 2014-01-17 15:05:35.000000000 +0000 @@ -474,10 +474,10 @@ void xnoise_worker_job_set_arg (XnoiseWorkerJob* self, const gchar* name, GValue* val); GValue* xnoise_worker_job_get_arg (XnoiseWorkerJob* self, const gchar* name); GType xnoise_global_access_get_type (void) G_GNUC_CONST; -static gboolean __lambda390_ (XnoiseHandlerRemoveCoverImage* self); +static gboolean __lambda388_ (XnoiseHandlerRemoveCoverImage* self); const gchar* xnoise_global_access_get_searchtext (XnoiseGlobalAccess* self); void xnoise_global_access_set_searchtext (XnoiseGlobalAccess* self, const gchar* value); -static gboolean ___lambda390__gsource_func (gpointer self); +static gboolean ___lambda388__gsource_func (gpointer self); static void xnoise_handler_remove_cover_image_finalize (GObject* obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -824,7 +824,7 @@ } -static gboolean __lambda390_ (XnoiseHandlerRemoveCoverImage* self) { +static gboolean __lambda388_ (XnoiseHandlerRemoveCoverImage* self) { gboolean result = FALSE; gchar* buf = NULL; XnoiseGlobalAccess* _tmp0_ = NULL; @@ -855,9 +855,9 @@ } -static gboolean ___lambda390__gsource_func (gpointer self) { +static gboolean ___lambda388__gsource_func (gpointer self) { gboolean result; - result = __lambda390_ (self); + result = __lambda388_ (self); return result; } @@ -1013,7 +1013,7 @@ g_clear_error (&_inner_error_); return FALSE; } - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda390__gsource_func, g_object_ref (self), g_object_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda388__gsource_func, g_object_ref (self), g_object_unref); result = FALSE; _g_free0 (album); _g_free0 (artist); diff -Nru xnoise-0.2.20/libxnoise/Main/xnoise-main.c xnoise-0.2.21/libxnoise/Main/xnoise-main.c --- xnoise-0.2.20/libxnoise/Main/xnoise-main.c 2013-12-11 11:24:24.000000000 +0000 +++ xnoise-0.2.21/libxnoise/Main/xnoise-main.c 2014-01-27 09:32:56.000000000 +0000 @@ -782,21 +782,21 @@ gboolean xnoise_plugin_module_container_get_activated (XnoisePluginModuleContainer* self); static void xnoise_main_connect_signals (XnoiseMain* self); void xnoise_params_set_start_parameters_in_implementors (void); -static gboolean ___lambda394_ (XnoiseMain* self); +static gboolean ___lambda392_ (XnoiseMain* self); XnoiseDbus* xnoise_dbus_new (void); XnoiseDbus* xnoise_dbus_construct (GType object_type); -static gboolean ____lambda394__gsource_func (gpointer self); +static gboolean ____lambda392__gsource_func (gpointer self); void xnoise_main_window_ask_for_initial_media_import (XnoiseMainWindow* self); static void xnoise_main_add_cyclic_save_timeout (XnoiseMain* self); -static gboolean __lambda396_ (XnoiseMain* self); +static gboolean __lambda394_ (XnoiseMain* self); void xnoise_main_window_restore_tracks (XnoiseMainWindow* self); -static gboolean ___lambda396__gsource_func (gpointer self); -static gboolean __lambda397_ (XnoiseMain* self); +static gboolean ___lambda394__gsource_func (gpointer self); +static gboolean __lambda395_ (XnoiseMain* self); XnoiseExtDevDeviceManager* xnoise_ext_dev_device_manager_new (void); XnoiseExtDevDeviceManager* xnoise_ext_dev_device_manager_construct (GType object_type); GType xnoise_ext_dev_device_manager_get_type (void) G_GNUC_CONST; -static gboolean ___lambda397__gsource_func (gpointer self); -static gboolean __lambda395_ (XnoiseMain* self); +static gboolean ___lambda395__gsource_func (gpointer self); +static gboolean __lambda393_ (XnoiseMain* self); GType xnoise_global_access_get_type (void) G_GNUC_CONST; gboolean xnoise_global_access_get_media_import_in_progress (XnoiseGlobalAccess* self); GType xnoise_iparams_get_type (void) G_GNUC_CONST; @@ -820,7 +820,7 @@ static void xnoise_main_save_tracklist (XnoiseMain* self); static void xnoise_main_save_activated_plugins (XnoiseMain* self); void xnoise_params_write_all_parameters_to_file (void); -static gboolean ___lambda395__gsource_func (gpointer self); +static gboolean ___lambda393__gsource_func (gpointer self); static void xnoise_main_on_posix_finish (gint signal_number); static void _xnoise_main_on_posix_finish_sighandler_t (gint signal); void xnoise_main_immediate_play (XnoiseMain* self, const gchar* uri); @@ -928,7 +928,7 @@ } -static gboolean ___lambda394_ (XnoiseMain* self) { +static gboolean ___lambda392_ (XnoiseMain* self) { gboolean result = FALSE; XnoiseDbus* _tmp0_ = NULL; _tmp0_ = xnoise_dbus_new (); @@ -939,14 +939,14 @@ } -static gboolean ____lambda394__gsource_func (gpointer self) { +static gboolean ____lambda392__gsource_func (gpointer self) { gboolean result; - result = ___lambda394_ (self); + result = ___lambda392_ (self); return result; } -static gboolean __lambda396_ (XnoiseMain* self) { +static gboolean __lambda394_ (XnoiseMain* self) { gboolean result = FALSE; XnoiseMainWindow* _tmp0_ = NULL; _tmp0_ = xnoise_main_window; @@ -956,14 +956,14 @@ } -static gboolean ___lambda396__gsource_func (gpointer self) { +static gboolean ___lambda394__gsource_func (gpointer self) { gboolean result; - result = __lambda396_ (self); + result = __lambda394_ (self); return result; } -static gboolean __lambda397_ (XnoiseMain* self) { +static gboolean __lambda395_ (XnoiseMain* self) { gboolean result = FALSE; XnoiseExtDevDeviceManager* _tmp0_ = NULL; _tmp0_ = xnoise_ext_dev_device_manager_new (); @@ -974,9 +974,9 @@ } -static gboolean ___lambda397__gsource_func (gpointer self) { +static gboolean ___lambda395__gsource_func (gpointer self) { gboolean result; - result = __lambda397_ (self); + result = __lambda395_ (self); return result; } @@ -1221,7 +1221,7 @@ xnoise_params_set_start_parameters_in_implementors (); _tmp71_ = xnoise_main_no_dbus; if (!_tmp71_) { - g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 2, ____lambda394__gsource_func, g_object_ref (self), g_object_unref); + g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 2, ____lambda392__gsource_func, g_object_ref (self), g_object_unref); } _tmp72_ = is_first_start; if (_tmp72_) { @@ -1230,8 +1230,8 @@ xnoise_main_window_ask_for_initial_media_import (_tmp73_); } xnoise_main_add_cyclic_save_timeout (self); - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda396__gsource_func, g_object_ref (self), g_object_unref); - g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ___lambda397__gsource_func, g_object_ref (self), g_object_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda394__gsource_func, g_object_ref (self), g_object_unref); + g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ___lambda395__gsource_func, g_object_ref (self), g_object_unref); return self; } @@ -1241,7 +1241,7 @@ } -static gboolean __lambda395_ (XnoiseMain* self) { +static gboolean __lambda393_ (XnoiseMain* self) { gboolean result = FALSE; GSource* _tmp0_ = NULL; gboolean _tmp1_ = FALSE; @@ -1286,9 +1286,9 @@ } -static gboolean ___lambda395__gsource_func (gpointer self) { +static gboolean ___lambda393__gsource_func (gpointer self) { gboolean result; - result = __lambda395_ (self); + result = __lambda393_ (self); return result; } @@ -1296,7 +1296,7 @@ static void xnoise_main_add_cyclic_save_timeout (XnoiseMain* self) { guint _tmp0_ = 0U; g_return_if_fail (XNOISE_IS_MAIN (self)); - _tmp0_ = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 60, ___lambda395__gsource_func, g_object_ref (self), g_object_unref); + _tmp0_ = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 60, ___lambda393__gsource_func, g_object_ref (self), g_object_unref); self->priv->cyclic_save_source = _tmp0_; } diff -Nru xnoise-0.2.20/libxnoise/MainWindow/xnoise-main-window.c xnoise-0.2.21/libxnoise/MainWindow/xnoise-main-window.c --- xnoise-0.2.20/libxnoise/MainWindow/xnoise-main-window.c 2013-12-11 11:24:24.000000000 +0000 +++ xnoise-0.2.21/libxnoise/MainWindow/xnoise-main-window.c 2014-01-27 09:32:57.000000000 +0000 @@ -1277,31 +1277,31 @@ void xnoise_main_window_set_displayed_title (XnoiseMainWindow* self, const gchar* newuri, const gchar* tagname, const gchar* tagvalue); static void _xnoise_main_window_set_displayed_title_xnoise_global_access_tag_changed (XnoiseGlobalAccess* _sender, const gchar* newuri, const gchar* tagname, const gchar* tagvalue, gpointer self); GType xnoise_gst_player_get_type (void) G_GNUC_CONST; -static void __lambda241_ (XnoiseMainWindow* self); -static gboolean ___lambda242_ (XnoiseMainWindow* self); +static void __lambda239_ (XnoiseMainWindow* self); +static gboolean ___lambda240_ (XnoiseMainWindow* self); #define XNOISE_RESOURCES_VIDEOVIEW_NAME "VideoView" void xnoise_params_set_string_value (const gchar* key, const gchar* val); -static gboolean ____lambda242__gsource_func (gpointer self); +static gboolean ____lambda240__gsource_func (gpointer self); void xnoise_serial_button_select (XnoiseSerialButton* self, const gchar* name, gboolean emit_signal); -static void ___lambda241__xnoise_gst_player_sign_video_playing (XnoiseGstPlayer* _sender, gpointer self); -static gboolean __lambda243_ (XnoiseMainWindow* self); +static void ___lambda239__xnoise_gst_player_sign_video_playing (XnoiseGstPlayer* _sender, gpointer self); +static gboolean __lambda241_ (XnoiseMainWindow* self); void xnoise_media_soure_widget_set_focus_on_selector (XnoiseMediaSoureWidget* self); -static gboolean ___lambda243__gsource_func (gpointer self); +static gboolean ___lambda241__gsource_func (gpointer self); static gboolean xnoise_main_window_on_window_state_event (XnoiseMainWindow* self, GdkEventWindowState* e); static gboolean _xnoise_main_window_on_window_state_event_gtk_widget_window_state_event (GtkWidget* _sender, GdkEventWindowState* event, gpointer self); -static void __lambda244_ (XnoiseMainWindow* self); +static void __lambda242_ (XnoiseMainWindow* self); void xnoise_main_window_set_window_in_foreground (XnoiseMainWindow* self, gboolean value); -static void ___lambda244__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); +static void ___lambda242__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); XnoiseLyricsView* xnoise_main_window_get_lyricsView (XnoiseMainWindow* self); static gboolean xnoise_main_window_on_video_da_button_press (XnoiseMainWindow* self, GdkEventButton* e); static gboolean _xnoise_main_window_on_video_da_button_press_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self); -static void __lambda234_ (XnoiseMainWindow* self); -static void ___lambda234__xnoise_main_window_sign_drag_over_content_area (XnoiseMainWindow* _sender, gpointer self); -static gboolean __lambda235_ (XnoiseMainWindow* self, GtkWidget* sender, GdkDragContext* context, gint x, gint y, guint t); -static gboolean ___lambda235__gtk_widget_drag_motion (GtkWidget* _sender, GdkDragContext* context, gint x, gint y, guint time_, gpointer self); -static gboolean __lambda236_ (XnoiseMainWindow* self, GtkWidget* sender, GdkDragContext* context, gint x, gint y, guint t); +static void __lambda232_ (XnoiseMainWindow* self); +static void ___lambda232__xnoise_main_window_sign_drag_over_content_area (XnoiseMainWindow* _sender, gpointer self); +static gboolean __lambda233_ (XnoiseMainWindow* self, GtkWidget* sender, GdkDragContext* context, gint x, gint y, guint t); +static gboolean ___lambda233__gtk_widget_drag_motion (GtkWidget* _sender, GdkDragContext* context, gint x, gint y, guint time_, gpointer self); +static gboolean __lambda234_ (XnoiseMainWindow* self, GtkWidget* sender, GdkDragContext* context, gint x, gint y, guint t); #define XNOISE_RESOURCES_LYRICS_VIEW_NAME "LyricsView" -static gboolean ___lambda236__gtk_widget_drag_motion (GtkWidget* _sender, GdkDragContext* context, gint x, gint y, guint time_, gpointer self); +static gboolean ___lambda234__gtk_widget_drag_motion (GtkWidget* _sender, GdkDragContext* context, gint x, gint y, guint time_, gpointer self); void xnoise_main_window_restore_tab (XnoiseMainWindow* self); XnoiseMainViewNotebook* xnoise_main_window_get_mainview_box (XnoiseMainWindow* self); gboolean xnoise_main_view_notebook_select_main_view (XnoiseMainViewNotebook* self, const gchar* name); @@ -1340,19 +1340,19 @@ GType xnoise_data_source_get_type (void) G_GNUC_CONST; GType xnoise_database_reader_get_type (void) G_GNUC_CONST; guint xnoise_database_reader_count_lastused_items (XnoiseDatabaseReader* self); -static gboolean ___lambda247_ (Block91Data* _data91_); +static gboolean ___lambda245_ (Block91Data* _data91_); static Block92Data* block92_data_ref (Block92Data* _data92_); static void block92_data_unref (void * _userdata_); GType xnoise_user_info_get_type (void) G_GNUC_CONST; GType xnoise_user_info_removal_type_get_type (void) G_GNUC_CONST; GType xnoise_user_info_content_class_get_type (void) G_GNUC_CONST; guint xnoise_user_info_popup (XnoiseUserInfo* self, XnoiseUserInfoRemovalType removal_type, XnoiseUserInfoContentClass content_class, const gchar* info_text, gboolean bold, gint appearance_time_seconds, GtkWidget* extra_widget); -static void __lambda248_ (Block92Data* _data92_); -static gboolean __lambda249_ (Block92Data* _data92_); +static void __lambda246_ (Block92Data* _data92_); +static gboolean __lambda247_ (Block92Data* _data92_); void xnoise_user_info_popdown (XnoiseUserInfo* self, guint id); -static gboolean ___lambda249__gsource_func (gpointer self); -static void ___lambda248__gtk_button_clicked (GtkButton* _sender, gpointer self); -static gboolean ____lambda247__gsource_func (gpointer self); +static gboolean ___lambda247__gsource_func (gpointer self); +static void ___lambda246__gtk_button_clicked (GtkButton* _sender, gpointer self); +static gboolean ____lambda245__gsource_func (gpointer self); GType xnoise_item_get_type (void) G_GNUC_CONST; GType xnoise_item_type_get_type (void) G_GNUC_CONST; XnoiseItem* xnoise_item_dup (const XnoiseItem* self); @@ -1382,32 +1382,32 @@ static void block93_data_unref (void * _userdata_); XnoiseTrackData** xnoise_database_reader_get_some_lastused_items (XnoiseDatabaseReader* self, gint limit, gint offset, int* result_length1); static XnoiseTrackData** _vala_array_dup25 (XnoiseTrackData** self, int length); -static gboolean __lambda245_ (Block93Data* _data93_); +static gboolean __lambda243_ (Block93Data* _data93_); GType xnoise_track_list_model_get_type (void) G_GNUC_CONST; void xnoise_track_list_model_insert_title (XnoiseTrackListModel* self, XnoisePlayerState icon, XnoiseTrackData** td, gboolean bold, GtkTreeIter* result); -static gboolean ___lambda245__gsource_func (gpointer self); -static gboolean ___lambda246_ (Block93Data* _data93_); +static gboolean ___lambda243__gsource_func (gpointer self); +static gboolean ___lambda244_ (Block93Data* _data93_); GValue* xnoise_worker_job_get_arg (XnoiseWorkerJob* self, const gchar* name); -static gboolean ____lambda246__gsource_func (gpointer self); +static gboolean ____lambda244__gsource_func (gpointer self); void xnoise_main_window_ask_for_initial_media_import (XnoiseMainWindow* self); -static gboolean __lambda250_ (XnoiseMainWindow* self); +static gboolean __lambda248_ (XnoiseMainWindow* self); void xnoise_main_window_set_album_art_view_visible (XnoiseMainWindow* self, gboolean value); void xnoise_main_window_set_media_browser_visible (XnoiseMainWindow* self, gboolean value); -static gboolean ___lambda250__gsource_func (gpointer self); +static gboolean ___lambda248__gsource_func (gpointer self); XnoiseFirstStartWidget* xnoise_first_start_widget_new (void); XnoiseFirstStartWidget* xnoise_first_start_widget_construct (GType object_type); -static void __lambda251_ (XnoiseMainWindow* self); -static gboolean __lambda252_ (XnoiseMainWindow* self); +static void __lambda249_ (XnoiseMainWindow* self); +static gboolean __lambda250_ (XnoiseMainWindow* self); void xnoise_main_window_show_content (XnoiseMainWindow* self); gboolean xnoise_global_access_get_media_import_in_progress (XnoiseGlobalAccess* self); +static gboolean ___lambda250__gsource_func (gpointer self); +static void ___lambda249__gtk_button_clicked (GtkButton* _sender, gpointer self); +static void __lambda251_ (XnoiseMainWindow* self); +static gboolean __lambda252_ (XnoiseMainWindow* self); static gboolean ___lambda252__gsource_func (gpointer self); static void ___lambda251__gtk_button_clicked (GtkButton* _sender, gpointer self); -static void __lambda253_ (XnoiseMainWindow* self); -static gboolean __lambda254_ (XnoiseMainWindow* self); -static gboolean ___lambda254__gsource_func (gpointer self); -static void ___lambda253__gtk_button_clicked (GtkButton* _sender, gpointer self); -static gboolean __lambda255_ (XnoiseMainWindow* self); -static gboolean ___lambda255__gsource_func (gpointer self); +static gboolean __lambda253_ (XnoiseMainWindow* self); +static gboolean ___lambda253__gsource_func (gpointer self); void xnoise_main_window_set_fullscreenwindowvisible (XnoiseMainWindow* self, gboolean value); void xnoise_fullscreen_toolbar_show (XnoiseFullscreenToolbar* self); static gboolean ___lambda67_ (XnoiseMainWindow* self); @@ -1418,14 +1418,14 @@ static gboolean ____lambda68__gsource_func (gpointer self); XnoiseMainWindowPlayerRepeatMode xnoise_main_window_get_repeatState (XnoiseMainWindow* self); GtkImage* xnoise_icon_repo_get_themed_image_icon (const gchar* name, GtkIconSize size, gint pixelsize); +static gboolean ____lambda235_ (XnoiseMainWindow* self); +static gboolean _____lambda235__gsource_func (gpointer self); +static gboolean ____lambda236_ (XnoiseMainWindow* self); +static gboolean _____lambda236__gsource_func (gpointer self); static gboolean ____lambda237_ (XnoiseMainWindow* self); static gboolean _____lambda237__gsource_func (gpointer self); static gboolean ____lambda238_ (XnoiseMainWindow* self); static gboolean _____lambda238__gsource_func (gpointer self); -static gboolean ____lambda239_ (XnoiseMainWindow* self); -static gboolean _____lambda239__gsource_func (gpointer self); -static gboolean ____lambda240_ (XnoiseMainWindow* self); -static gboolean _____lambda240__gsource_func (gpointer self); static gboolean xnoise_main_window_on_key_released (XnoiseMainWindow* self, GtkWidget* sender, GdkEventKey* e); static void xnoise_main_window_colorize_search_background (XnoiseMainWindow* self, gboolean colored); void xnoise_main_window_handle_playpause_action (XnoiseMainWindow* self); @@ -1439,12 +1439,12 @@ GType xnoise_main_get_type (void) G_GNUC_CONST; XnoiseMain* xnoise_main_get_instance (void); void xnoise_main_quit (XnoiseMain* self); -static gboolean __lambda218_ (XnoiseMainWindow* self); -static gboolean ___lambda218__gsource_func (gpointer self); +static gboolean __lambda216_ (XnoiseMainWindow* self); +static gboolean ___lambda216__gsource_func (gpointer self); static gboolean __lambda72_ (XnoiseMainWindow* self); static gboolean ___lambda72__gsource_func (gpointer self); -static gboolean __lambda217_ (XnoiseMainWindow* self); -static gboolean ___lambda217__gsource_func (gpointer self); +static gboolean __lambda215_ (XnoiseMainWindow* self); +static gboolean ___lambda215__gsource_func (gpointer self); void xnoise_main_window_toggle_window_visbility (XnoiseMainWindow* self); gboolean xnoise_main_window_get_window_in_foreground (XnoiseMainWindow* self); void xnoise_main_window_show_window (XnoiseMainWindow* self); @@ -1452,15 +1452,15 @@ gint xnoise_params_get_int_value (const gchar* key); void xnoise_main_window_set_repeatState (XnoiseMainWindow* self, XnoiseMainWindowPlayerRepeatMode value); void xnoise_main_window_set_active_lyrics (XnoiseMainWindow* self, gboolean value); -static gboolean __lambda256_ (XnoiseMainWindow* self); +static gboolean __lambda254_ (XnoiseMainWindow* self); gchar* xnoise_params_get_string_value (const gchar* key); -static gboolean ___lambda256__gsource_func (gpointer self); -static gboolean __lambda257_ (XnoiseMainWindow* self); +static gboolean ___lambda254__gsource_func (gpointer self); +static gboolean __lambda255_ (XnoiseMainWindow* self); GType xnoise_tray_icon_get_type (void) G_GNUC_CONST; XnoiseTrayIcon* xnoise_tray_icon_new (void); XnoiseTrayIcon* xnoise_tray_icon_construct (GType object_type); gboolean xnoise_application_get_hidden_window (void); -static gboolean ___lambda257__gsource_func (gpointer self); +static gboolean ___lambda255__gsource_func (gpointer self); void xnoise_main_window_set_not_show_art_on_hover_image (XnoiseMainWindow* self, gboolean value); void xnoise_global_access_set_current_uri (XnoiseGlobalAccess* self, const gchar* value); void xnoise_gst_player_play (XnoiseGstPlayer* self); @@ -1481,10 +1481,10 @@ static void xnoise_main_window_on_repeat_button_clicked (XnoiseMainWindow* self, GtkButton* sender); gboolean xnoise_main_window_get_media_browser_visible (XnoiseMainWindow* self); static gboolean xnoise_main_window_on_close (XnoiseMainWindow* self); -static gboolean ___lambda232_ (XnoiseMainWindow* self); -static gboolean ____lambda232__gsource_func (gpointer self); -static gboolean ___lambda233_ (XnoiseMainWindow* self); -static gboolean ____lambda233__gsource_func (gpointer self); +static gboolean ___lambda230_ (XnoiseMainWindow* self); +static gboolean ____lambda230__gsource_func (gpointer self); +static gboolean ___lambda231_ (XnoiseMainWindow* self); +static gboolean ____lambda231__gsource_func (gpointer self); GType xnoise_about_dialog_get_type (void) G_GNUC_CONST; XnoiseAboutDialog* xnoise_about_dialog_new (void); XnoiseAboutDialog* xnoise_about_dialog_construct (GType object_type); @@ -1494,20 +1494,20 @@ GType xnoise_settings_widget_get_type (void) G_GNUC_CONST; XnoiseSettingsWidget* xnoise_settings_widget_new (void); XnoiseSettingsWidget* xnoise_settings_widget_construct (GType object_type); -static gboolean __lambda206_ (Block94Data* _data94_, GtkWidget* s, GdkEventKey* e); -static gboolean ___lambda206__gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self); -static void __lambda207_ (Block94Data* _data94_); -static void ___lambda207__xnoise_global_access_player_in_shutdown (XnoiseGlobalAccess* _sender, gpointer self); +static gboolean __lambda204_ (Block94Data* _data94_, GtkWidget* s, GdkEventKey* e); +static gboolean ___lambda204__gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self); +static void __lambda205_ (Block94Data* _data94_); +static void ___lambda205__xnoise_global_access_player_in_shutdown (XnoiseGlobalAccess* _sender, gpointer self); void xnoise_settings_widget_select_general_tab (XnoiseSettingsWidget* self); void xnoise_settings_widget_select_media_tab (XnoiseSettingsWidget* self); void xnoise_params_write_all_parameters_to_file (void); static Block95Data* block95_data_ref (Block95Data* _data95_); static void block95_data_unref (void * _userdata_); -static void __lambda186_ (XnoiseMainWindow* self, GtkEntry* s, GtkEntryIconPosition p0, GdkEvent* p1); -static void ___lambda186__gtk_entry_icon_press (GtkEntry* _sender, GtkEntryIconPosition p0, GdkEvent* p1, gpointer self); -static void __lambda187_ (Block95Data* _data95_); -static void ___lambda187__gtk_button_clicked (GtkButton* _sender, gpointer self); -static void __lambda188_ (Block95Data* _data95_); +static void __lambda184_ (XnoiseMainWindow* self, GtkEntry* s, GtkEntryIconPosition p0, GdkEvent* p1); +static void ___lambda184__gtk_entry_icon_press (GtkEntry* _sender, GtkEntryIconPosition p0, GdkEvent* p1, gpointer self); +static void __lambda185_ (Block95Data* _data95_); +static void ___lambda185__gtk_button_clicked (GtkButton* _sender, gpointer self); +static void __lambda186_ (Block95Data* _data95_); XnoiseItem* xnoise_item_handler_manager_create_item (const gchar* uri); GType xnoise_item_handler_get_type (void) G_GNUC_CONST; GType xnoise_item_handler_manager_get_type (void) G_GNUC_CONST; @@ -1523,19 +1523,19 @@ GType xnoise_action_context_get_type (void) G_GNUC_CONST; GType xnoise_item_selection_type_get_type (void) G_GNUC_CONST; XnoiseAction* xnoise_item_handler_get_action (XnoiseItemHandler* self, XnoiseItemType type, XnoiseActionContext context, XnoiseItemSelectionType selection); -static void ___lambda188__gtk_button_clicked (GtkButton* _sender, gpointer self); -static gboolean __lambda189_ (Block95Data* _data95_); -static gboolean ___lambda189__gtk_widget_destroy_event (GtkWidget* _sender, GdkEventAny* event, gpointer self); +static void ___lambda186__gtk_button_clicked (GtkButton* _sender, gpointer self); +static gboolean __lambda187_ (Block95Data* _data95_); +static gboolean ___lambda187__gtk_widget_destroy_event (GtkWidget* _sender, GdkEventAny* event, gpointer self); GType xnoise_equalizer_widget_get_type (void) G_GNUC_CONST; GType xnoise_gst_equalizer_get_type (void) G_GNUC_CONST; XnoiseEqualizerWidget* xnoise_equalizer_widget_new (XnoiseGstEqualizer* equalizer); XnoiseEqualizerWidget* xnoise_equalizer_widget_construct (GType object_type, XnoiseGstEqualizer* equalizer); -static void __lambda214_ (XnoiseMainWindow* self); -static void ___lambda214__gtk_button_clicked (GtkButton* _sender, gpointer self); -static gboolean __lambda215_ (XnoiseMainWindow* self, GtkWidget* s, GdkEventKey* e); -static gboolean ___lambda215__gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self); -static gboolean __lambda216_ (XnoiseMainWindow* self); -static gboolean ___lambda216__gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self); +static void __lambda212_ (XnoiseMainWindow* self); +static void ___lambda212__gtk_button_clicked (GtkButton* _sender, gpointer self); +static gboolean __lambda213_ (XnoiseMainWindow* self, GtkWidget* s, GdkEventKey* e); +static gboolean ___lambda213__gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self); +static gboolean __lambda214_ (XnoiseMainWindow* self); +static gboolean ___lambda214__gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self); static void _vala_array_add93 (XnoiseItem** array, int* length, int* size, const XnoiseItem* value); static void _vala_XnoiseItem_array_free (XnoiseItem* array, gint array_length); static void _g_free0_ (gpointer var); @@ -1581,31 +1581,31 @@ XnoiseVolumeSliderButton* xnoise_volume_slider_button_new (XnoiseGstPlayer* player); XnoiseVolumeSliderButton* xnoise_volume_slider_button_construct (GType object_type, XnoiseGstPlayer* player); static void _xnoise_main_window_on_repeat_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self); -static void ___lambda219_ (XnoiseMainWindow* self); +static void ___lambda217_ (XnoiseMainWindow* self); void xnoise_track_list_remove_selected_rows (XnoiseTrackList* self); -static void ____lambda219__gtk_button_clicked (GtkButton* _sender, gpointer self); -static void ___lambda220_ (XnoiseMainWindow* self); -static void ____lambda220__gtk_button_clicked (GtkButton* _sender, gpointer self); -static void ___lambda221_ (XnoiseMainWindow* self); +static void ____lambda217__gtk_button_clicked (GtkButton* _sender, gpointer self); +static void ___lambda218_ (XnoiseMainWindow* self); +static void ____lambda218__gtk_button_clicked (GtkButton* _sender, gpointer self); +static void ___lambda219_ (XnoiseMainWindow* self); const GtkTreeRowReference* xnoise_global_access_get_position_reference (XnoiseGlobalAccess* self); void xnoise_track_list_set_focus_on_iter (XnoiseTrackList* self, GtkTreeIter* iter); -static void ____lambda221__gtk_button_clicked (GtkButton* _sender, gpointer self); +static void ____lambda219__gtk_button_clicked (GtkButton* _sender, gpointer self); static gboolean xnoise_main_window_on_content_overlay_child_pos (XnoiseMainWindow* self, GtkOverlay* sender, GtkWidget* widget, GdkRectangle* allocation); static gboolean _xnoise_main_window_on_content_overlay_child_pos_gtk_overlay_get_child_position (GtkOverlay* _sender, GtkWidget* widget, GdkRectangle* allocation, gpointer self); -static void ___lambda222_ (XnoiseMainWindow* self); +static void ___lambda220_ (XnoiseMainWindow* self); const gchar* xnoise_main_view_notebook_get_current_name (XnoiseMainViewNotebook* self); -static void ____lambda222__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); +static void ____lambda220__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); XnoiseTrackListViewWidget* xnoise_track_list_view_widget_new (XnoiseMainWindow* win); XnoiseTrackListViewWidget* xnoise_track_list_view_widget_construct (GType object_type, XnoiseMainWindow* win); GType xnoise_imain_view_get_type (void) G_GNUC_CONST; void xnoise_main_view_notebook_add_main_view (XnoiseMainViewNotebook* self, XnoiseIMainView* view); -XnoiseVideoViewWidget* xnoise_video_view_widget_new (XnoiseMainWindow* win); -XnoiseVideoViewWidget* xnoise_video_view_widget_construct (GType object_type, XnoiseMainWindow* win); +XnoiseVideoViewWidget* xnoise_video_view_widget_new (void); +XnoiseVideoViewWidget* xnoise_video_view_widget_construct (GType object_type); XnoiseLyricsViewWidget* xnoise_lyrics_view_widget_new (XnoiseMainWindow* win); XnoiseLyricsViewWidget* xnoise_lyrics_view_widget_construct (GType object_type, XnoiseMainWindow* win); static void xnoise_main_window_set_lyricsView (XnoiseMainWindow* self, XnoiseLyricsView* value); -static void ___lambda223_ (XnoiseMainWindow* self); -static void ____lambda223__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); +static void ___lambda221_ (XnoiseMainWindow* self); +static void ____lambda221__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); XnoiseAlbumImage* xnoise_album_image_new (void); XnoiseAlbumImage* xnoise_album_image_construct (GType object_type); static void xnoise_main_window_ai_button_clicked (XnoiseMainWindow* self); @@ -1629,29 +1629,29 @@ PlayBackControlBar* play_back_control_bar_new (void); PlayBackControlBar* play_back_control_bar_construct (GType object_type); GType play_back_control_bar_get_type (void) G_GNUC_CONST; -static void ___lambda225_ (XnoiseMainWindow* self, GtkEntry* s, GtkEntryIconPosition p0, GdkEvent* p1); -static void ____lambda225__gtk_entry_icon_press (GtkEntry* _sender, GtkEntryIconPosition p0, GdkEvent* p1, gpointer self); +static void ___lambda223_ (XnoiseMainWindow* self, GtkEntry* s, GtkEntryIconPosition p0, GdkEvent* p1); +static void ____lambda223__gtk_entry_icon_press (GtkEntry* _sender, GtkEntryIconPosition p0, GdkEvent* p1, gpointer self); XnoiseAlbumArtCellArea* xnoise_album_art_cell_area_new (void); XnoiseAlbumArtCellArea* xnoise_album_art_cell_area_construct (GType object_type); GType xnoise_album_art_cell_area_get_type (void) G_GNUC_CONST; XnoiseAlbumArtView* xnoise_album_art_view_new (GtkCellArea* area); XnoiseAlbumArtView* xnoise_album_art_view_construct (GType object_type, GtkCellArea* area); -static void ___lambda226_ (XnoiseMainWindow* self); -static void ____lambda226__gtk_button_clicked (GtkButton* _sender, gpointer self); -static void ___lambda227_ (Block96Data* _data96_, GObject* s, GParamSpec* p); +static void ___lambda224_ (XnoiseMainWindow* self); +static void ____lambda224__gtk_button_clicked (GtkButton* _sender, gpointer self); +static void ___lambda225_ (Block96Data* _data96_, GObject* s, GParamSpec* p); gboolean xnoise_album_art_view_get_in_import (XnoiseAlbumArtView* self); -static void ____lambda227__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); -static void ___lambda228_ (Block96Data* _data96_); -static void ____lambda228__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); -static void ___lambda229_ (XnoiseMainWindow* self, GtkEntry* s, GtkEntryIconPosition p0, GdkEvent* p1); -static void ____lambda229__gtk_entry_icon_press (GtkEntry* _sender, GtkEntryIconPosition p0, GdkEvent* p1, gpointer self); +static void ____lambda225__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); +static void ___lambda226_ (Block96Data* _data96_); +static void ____lambda226__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); +static void ___lambda227_ (XnoiseMainWindow* self, GtkEntry* s, GtkEntryIconPosition p0, GdkEvent* p1); +static void ____lambda227__gtk_entry_icon_press (GtkEntry* _sender, GtkEntryIconPosition p0, GdkEvent* p1, gpointer self); XnoiseFullscreenToolbar* xnoise_fullscreen_toolbar_new (GtkWindow* fullscreenwindow); XnoiseFullscreenToolbar* xnoise_fullscreen_toolbar_construct (GType object_type, GtkWindow* fullscreenwindow); -static gboolean ____lambda230_ (XnoiseMainWindow* self); -static gboolean _____lambda230__gsource_func (gpointer self); -static void __lambda231_ (XnoiseMainWindow* self, GtkNotebook* s, GtkWidget* np, guint p); +static gboolean ____lambda228_ (XnoiseMainWindow* self); +static gboolean _____lambda228__gsource_func (gpointer self); +static void __lambda229_ (XnoiseMainWindow* self, GtkNotebook* s, GtkWidget* np, guint p); gchar* xnoise_imain_view_get_view_name (XnoiseIMainView* self); -static void ___lambda231__gtk_notebook_switch_page (GtkNotebook* _sender, GtkWidget* page, guint page_num, gpointer self); +static void ___lambda229__gtk_notebook_switch_page (GtkNotebook* _sender, GtkWidget* page, guint page_num, gpointer self); static gboolean _xnoise_main_window_on_close_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self); static gboolean _xnoise_main_window_on_key_released_gtk_widget_key_release_event (GtkWidget* _sender, GdkEventKey* event, gpointer self); static gboolean _xnoise_main_window_on_key_pressed_gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self); @@ -1662,9 +1662,9 @@ void xnoise_main_window_show_status_info (XnoiseMainWindow* self, XnoiseInfoBar* bar); gboolean xnoise_album_image_get_selected (XnoiseAlbumImage* self); static gboolean xnoise_main_window_ai_ebox_enter (XnoiseMainWindow* self, GtkWidget* sender, GdkEventCrossing* e); -static gboolean __lambda258_ (XnoiseMainWindow* self); +static gboolean __lambda256_ (XnoiseMainWindow* self); gchar* xnoise_main_view_notebook_get_current_main_view_name (XnoiseMainViewNotebook* self); -static gboolean ___lambda258__gsource_func (gpointer self); +static gboolean ___lambda256__gsource_func (gpointer self); const gchar* xnoise_global_access_get_current_uri (XnoiseGlobalAccess* self); gchar* xnoise_track_list_model_get_uri_for_current_position (XnoiseTrackListModel* self); void xnoise_global_access_set_in_preview (XnoiseGlobalAccess* self, gboolean value); @@ -1678,8 +1678,8 @@ gboolean xnoise_plugin_module_container_get_activated (XnoisePluginModuleContainer* self); gboolean xnoise_serial_button_has_item (XnoiseSerialButton* self, const gchar* name); void xnoise_serial_button_del (XnoiseSerialButton* self, const gchar* name); -static gboolean _xnoise_main_window_active_lyrics___lambda196_ (Block97Data* _data97_); -static gboolean __xnoise_main_window_active_lyrics___lambda196__gsource_func (gpointer self); +static gboolean _xnoise_main_window_active_lyrics___lambda194_ (Block97Data* _data97_); +static gboolean __xnoise_main_window_active_lyrics___lambda194__gsource_func (gpointer self); void xnoise_album_image_set_selected (XnoiseAlbumImage* self, gboolean value); static void xnoise_main_window_finalize (GObject* obj); static void _vala_xnoise_main_window_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); @@ -1711,8 +1711,8 @@ static gboolean background_box_real_draw (GtkWidget* base, cairo_t* cr); static Block98Data* block98_data_ref (Block98Data* _data98_); static void block98_data_unref (void * _userdata_); -static void __lambda136_ (Block98Data* _data98_, GtkWidget* w); -static void ___lambda136__gtk_callback (GtkWidget* widget, gpointer self); +static void __lambda134_ (Block98Data* _data98_, GtkWidget* w); +static void ___lambda134__gtk_callback (GtkWidget* widget, gpointer self); enum { PLAY_BACK_CONTROL_BAR_DUMMY_PROPERTY }; @@ -1724,9 +1724,9 @@ GType xnoise_play_pause_button_get_type (void) G_GNUC_CONST; XnoisePlayPauseButton* xnoise_play_pause_button_new (void); XnoisePlayPauseButton* xnoise_play_pause_button_construct (GType object_type); -static gboolean __lambda224_ (Block99Data* _data99_); +static gboolean __lambda222_ (Block99Data* _data99_); static void _xnoise_main_window_handle_control_button_click_xnoise_control_button_sign_clicked (XnoiseControlButton* _sender, XnoiseControlButtonFunction dir, gpointer self); -static gboolean ___lambda224__gsource_func (gpointer self); +static gboolean ___lambda222__gsource_func (gpointer self); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -2163,7 +2163,7 @@ } -static gboolean ___lambda242_ (XnoiseMainWindow* self) { +static gboolean ___lambda240_ (XnoiseMainWindow* self) { gboolean result = FALSE; gchar* _tmp0_ = NULL; guint _tmp1_ = 0U; @@ -2183,31 +2183,31 @@ } -static gboolean ____lambda242__gsource_func (gpointer self) { +static gboolean ____lambda240__gsource_func (gpointer self) { gboolean result; - result = ___lambda242_ (self); + result = ___lambda240_ (self); return result; } -static void __lambda241_ (XnoiseMainWindow* self) { +static void __lambda239_ (XnoiseMainWindow* self) { gboolean _tmp0_ = FALSE; _tmp0_ = self->priv->_fullscreenwindowvisible; if (!_tmp0_) { XnoiseSerialButton* _tmp1_ = NULL; - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda242__gsource_func, g_object_ref (self), g_object_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda240__gsource_func, g_object_ref (self), g_object_unref); _tmp1_ = self->main_view_sbutton; xnoise_serial_button_select (_tmp1_, XNOISE_RESOURCES_VIDEOVIEW_NAME, TRUE); } } -static void ___lambda241__xnoise_gst_player_sign_video_playing (XnoiseGstPlayer* _sender, gpointer self) { - __lambda241_ (self); +static void ___lambda239__xnoise_gst_player_sign_video_playing (XnoiseGstPlayer* _sender, gpointer self) { + __lambda239_ (self); } -static gboolean __lambda243_ (XnoiseMainWindow* self) { +static gboolean __lambda241_ (XnoiseMainWindow* self) { gboolean result = FALSE; XnoiseMediaSoureWidget* _tmp0_ = NULL; _tmp0_ = self->msw; @@ -2217,9 +2217,9 @@ } -static gboolean ___lambda243__gsource_func (gpointer self) { +static gboolean ___lambda241__gsource_func (gpointer self) { gboolean result; - result = __lambda243_ (self); + result = __lambda241_ (self); return result; } @@ -2231,7 +2231,7 @@ } -static void __lambda244_ (XnoiseMainWindow* self) { +static void __lambda242_ (XnoiseMainWindow* self) { gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; g_object_get (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WINDOW, GtkWindow), "has-toplevel-focus", &_tmp0_, NULL); @@ -2244,8 +2244,8 @@ } -static void ___lambda244__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { - __lambda244_ (self); +static void ___lambda242__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { + __lambda242_ (self); } @@ -2329,10 +2329,10 @@ _tmp13_ = xnoise_global; g_signal_connect_object (_tmp13_, "tag-changed", (GCallback) _xnoise_main_window_set_displayed_title_xnoise_global_access_tag_changed, self, 0); _tmp14_ = xnoise_gst_player; - g_signal_connect_object (_tmp14_, "sign-video-playing", (GCallback) ___lambda241__xnoise_gst_player_sign_video_playing, self, 0); - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda243__gsource_func, g_object_ref (self), g_object_unref); + g_signal_connect_object (_tmp14_, "sign-video-playing", (GCallback) ___lambda239__xnoise_gst_player_sign_video_playing, self, 0); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda241__gsource_func, g_object_ref (self), g_object_unref); g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), "window-state-event", (GCallback) _xnoise_main_window_on_window_state_event_gtk_widget_window_state_event, self, 0); - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, G_TYPE_OBJECT, GObject), "notify::has-toplevel-focus", (GCallback) ___lambda244__g_object_notify, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, G_TYPE_OBJECT, GObject), "notify::has-toplevel-focus", (GCallback) ___lambda242__g_object_notify, self, 0); return self; } @@ -2418,7 +2418,7 @@ } -static void __lambda234_ (XnoiseMainWindow* self) { +static void __lambda232_ (XnoiseMainWindow* self) { gboolean _tmp0_ = FALSE; _tmp0_ = self->priv->_fullscreenwindowvisible; if (!_tmp0_) { @@ -2429,12 +2429,12 @@ } -static void ___lambda234__xnoise_main_window_sign_drag_over_content_area (XnoiseMainWindow* _sender, gpointer self) { - __lambda234_ (self); +static void ___lambda232__xnoise_main_window_sign_drag_over_content_area (XnoiseMainWindow* _sender, gpointer self) { + __lambda232_ (self); } -static gboolean __lambda235_ (XnoiseMainWindow* self, GtkWidget* sender, GdkDragContext* context, gint x, gint y, guint t) { +static gboolean __lambda233_ (XnoiseMainWindow* self, GtkWidget* sender, GdkDragContext* context, gint x, gint y, guint t) { gboolean result = FALSE; gchar* _tmp0_ = NULL; g_return_val_if_fail (GTK_IS_WIDGET (sender), FALSE); @@ -2449,14 +2449,14 @@ } -static gboolean ___lambda235__gtk_widget_drag_motion (GtkWidget* _sender, GdkDragContext* context, gint x, gint y, guint time_, gpointer self) { +static gboolean ___lambda233__gtk_widget_drag_motion (GtkWidget* _sender, GdkDragContext* context, gint x, gint y, guint time_, gpointer self) { gboolean result; - result = __lambda235_ (self, _sender, context, x, y, time_); + result = __lambda233_ (self, _sender, context, x, y, time_); return result; } -static gboolean __lambda236_ (XnoiseMainWindow* self, GtkWidget* sender, GdkDragContext* context, gint x, gint y, guint t) { +static gboolean __lambda234_ (XnoiseMainWindow* self, GtkWidget* sender, GdkDragContext* context, gint x, gint y, guint t) { gboolean result = FALSE; gchar* _tmp0_ = NULL; g_return_val_if_fail (GTK_IS_WIDGET (sender), FALSE); @@ -2470,9 +2470,9 @@ } -static gboolean ___lambda236__gtk_widget_drag_motion (GtkWidget* _sender, GdkDragContext* context, gint x, gint y, guint time_, gpointer self) { +static gboolean ___lambda234__gtk_widget_drag_motion (GtkWidget* _sender, GdkDragContext* context, gint x, gint y, guint time_, gpointer self) { gboolean result; - result = __lambda236_ (self, _sender, context, x, y, time_); + result = __lambda234_ (self, _sender, context, x, y, time_); return result; } @@ -2498,11 +2498,11 @@ gtk_drag_dest_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GTK_TYPE_WIDGET, GtkWidget), GTK_DEST_DEFAULT_MOTION, XNOISE_MAIN_WINDOW_target_list, G_N_ELEMENTS (XNOISE_MAIN_WINDOW_target_list), GDK_ACTION_COPY | GDK_ACTION_DEFAULT); _tmp5_ = self->videoscreen; g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GTK_TYPE_WIDGET, GtkWidget), "button-press-event", (GCallback) _xnoise_main_window_on_video_da_button_press_gtk_widget_button_press_event, self, 0); - g_signal_connect_object (self, "sign-drag-over-content-area", (GCallback) ___lambda234__xnoise_main_window_sign_drag_over_content_area, self, 0); + g_signal_connect_object (self, "sign-drag-over-content-area", (GCallback) ___lambda232__xnoise_main_window_sign_drag_over_content_area, self, 0); _tmp6_ = self->videoscreen; - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GTK_TYPE_WIDGET, GtkWidget), "drag-motion", (GCallback) ___lambda235__gtk_widget_drag_motion, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GTK_TYPE_WIDGET, GtkWidget), "drag-motion", (GCallback) ___lambda233__gtk_widget_drag_motion, self, 0); _tmp7_ = self->priv->_lyricsView; - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GTK_TYPE_WIDGET, GtkWidget), "drag-motion", (GCallback) ___lambda236__gtk_widget_drag_motion, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GTK_TYPE_WIDGET, GtkWidget), "drag-motion", (GCallback) ___lambda234__gtk_widget_drag_motion, self, 0); } @@ -2727,7 +2727,7 @@ } -static gboolean __lambda249_ (Block92Data* _data92_) { +static gboolean __lambda247_ (Block92Data* _data92_) { Block91Data* _data91_; XnoiseMainWindow * self; gboolean result = FALSE; @@ -2741,30 +2741,30 @@ } -static gboolean ___lambda249__gsource_func (gpointer self) { +static gboolean ___lambda247__gsource_func (gpointer self) { gboolean result; - result = __lambda249_ (self); + result = __lambda247_ (self); return result; } -static void __lambda248_ (Block92Data* _data92_) { +static void __lambda246_ (Block92Data* _data92_) { Block91Data* _data91_; XnoiseMainWindow * self; _data91_ = _data92_->_data91_; self = _data91_->self; - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda249__gsource_func, block92_data_ref (_data92_), block92_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda247__gsource_func, block92_data_ref (_data92_), block92_data_unref); self->priv->cancel = TRUE; g_print ("cancelled initial track restore\n"); } -static void ___lambda248__gtk_button_clicked (GtkButton* _sender, gpointer self) { - __lambda248_ (self); +static void ___lambda246__gtk_button_clicked (GtkButton* _sender, gpointer self) { + __lambda246_ (self); } -static gboolean ___lambda247_ (Block91Data* _data91_) { +static gboolean ___lambda245_ (Block91Data* _data91_) { XnoiseMainWindow * self; gboolean result = FALSE; Block92Data* _data92_; @@ -2796,7 +2796,7 @@ _tmp7_ = _tmp6_; _g_free0 (_tmp5_); _data92_->msg_id = _tmp7_; - g_signal_connect_data (button, "clicked", (GCallback) ___lambda248__gtk_button_clicked, block92_data_ref (_data92_), (GClosureNotify) block92_data_unref, 0); + g_signal_connect_data (button, "clicked", (GCallback) ___lambda246__gtk_button_clicked, block92_data_ref (_data92_), (GClosureNotify) block92_data_unref, 0); _tmp8_ = _data91_->job; _tmp9_ = g_new0 (GValue, 1); g_value_init (_tmp9_, G_TYPE_UINT); @@ -2810,9 +2810,9 @@ } -static gboolean ____lambda247__gsource_func (gpointer self) { +static gboolean ____lambda245__gsource_func (gpointer self) { gboolean result; - result = ___lambda247_ (self); + result = ___lambda245_ (self); return result; } @@ -2848,7 +2848,7 @@ _data91_->lastused_cnt = _tmp4_; _tmp5_ = _data91_->lastused_cnt; if (_tmp5_ > ((guint) 2000)) { - g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 200, ____lambda247__gsource_func, block91_data_ref (_data91_), block91_data_unref); + g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 200, ____lambda245__gsource_func, block91_data_ref (_data91_), block91_data_unref); } _tmp6_ = _data91_->job; _tmp6_->big_counter[0] = (gint32) 0; @@ -2906,7 +2906,7 @@ } -static gboolean __lambda245_ (Block93Data* _data93_) { +static gboolean __lambda243_ (Block93Data* _data93_) { XnoiseMainWindow * self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; @@ -2968,14 +2968,14 @@ } -static gboolean ___lambda245__gsource_func (gpointer self) { +static gboolean ___lambda243__gsource_func (gpointer self) { gboolean result; - result = __lambda245_ (self); + result = __lambda243_ (self); return result; } -static gboolean ___lambda246_ (Block93Data* _data93_) { +static gboolean ___lambda244_ (Block93Data* _data93_) { XnoiseMainWindow * self; gboolean result = FALSE; XnoiseTrackList* _tmp0_ = NULL; @@ -3000,9 +3000,9 @@ } -static gboolean ____lambda246__gsource_func (gpointer self) { +static gboolean ____lambda244__gsource_func (gpointer self) { gboolean result; - result = ___lambda246_ (self); + result = ___lambda244_ (self); return result; } @@ -3070,7 +3070,7 @@ _data93_->track_dat = _tmp16_; _data93_->track_dat_length1 = _tmp16__length1; _data93_->_track_dat_size_ = _data93_->track_dat_length1; - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda245__gsource_func, block93_data_ref (_data93_), block93_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda243__gsource_func, block93_data_ref (_data93_), block93_data_unref); _tmp18_ = _data93_->job; _tmp19_ = _tmp18_->track_dat; _tmp19__length1 = _tmp18_->track_dat_length1; @@ -3089,7 +3089,7 @@ _tmp23_ = _data93_->job; _tmp24_ = _tmp23_->big_counter[0]; g_print ("got %d tracks for tracklist\n", (gint) _tmp24_); - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda246__gsource_func, block93_data_ref (_data93_), block93_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda244__gsource_func, block93_data_ref (_data93_), block93_data_unref); result = FALSE; block93_data_unref (_data93_); _data93_ = NULL; @@ -3105,7 +3105,7 @@ } -static gboolean __lambda250_ (XnoiseMainWindow* self) { +static gboolean __lambda248_ (XnoiseMainWindow* self) { gboolean result = FALSE; xnoise_main_window_set_album_art_view_visible (self, FALSE); xnoise_main_window_set_media_browser_visible (self, FALSE); @@ -3114,14 +3114,14 @@ } -static gboolean ___lambda250__gsource_func (gpointer self) { +static gboolean ___lambda248__gsource_func (gpointer self) { gboolean result; - result = __lambda250_ (self); + result = __lambda248_ (self); return result; } -static gboolean __lambda252_ (XnoiseMainWindow* self) { +static gboolean __lambda250_ (XnoiseMainWindow* self) { gboolean result = FALSE; XnoiseSerialButton* _tmp0_ = NULL; GtkNotebook* _tmp1_ = NULL; @@ -3267,24 +3267,24 @@ } -static gboolean ___lambda252__gsource_func (gpointer self) { +static gboolean ___lambda250__gsource_func (gpointer self) { gboolean result; - result = __lambda252_ (self); + result = __lambda250_ (self); return result; } -static void __lambda251_ (XnoiseMainWindow* self) { - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda252__gsource_func, g_object_ref (self), g_object_unref); +static void __lambda249_ (XnoiseMainWindow* self) { + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda250__gsource_func, g_object_ref (self), g_object_unref); } -static void ___lambda251__gtk_button_clicked (GtkButton* _sender, gpointer self) { - __lambda251_ (self); +static void ___lambda249__gtk_button_clicked (GtkButton* _sender, gpointer self) { + __lambda249_ (self); } -static gboolean __lambda254_ (XnoiseMainWindow* self) { +static gboolean __lambda252_ (XnoiseMainWindow* self) { gboolean result = FALSE; XnoiseSerialButton* _tmp0_ = NULL; GtkNotebook* _tmp1_ = NULL; @@ -3413,24 +3413,24 @@ } -static gboolean ___lambda254__gsource_func (gpointer self) { +static gboolean ___lambda252__gsource_func (gpointer self) { gboolean result; - result = __lambda254_ (self); + result = __lambda252_ (self); return result; } -static void __lambda253_ (XnoiseMainWindow* self) { - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda254__gsource_func, g_object_ref (self), g_object_unref); +static void __lambda251_ (XnoiseMainWindow* self) { + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda252__gsource_func, g_object_ref (self), g_object_unref); } -static void ___lambda253__gtk_button_clicked (GtkButton* _sender, gpointer self) { - __lambda253_ (self); +static void ___lambda251__gtk_button_clicked (GtkButton* _sender, gpointer self) { + __lambda251_ (self); } -static gboolean __lambda255_ (XnoiseMainWindow* self) { +static gboolean __lambda253_ (XnoiseMainWindow* self) { gboolean result = FALSE; GtkNotebook* _tmp0_ = NULL; GtkNotebook* _tmp1_ = NULL; @@ -3540,9 +3540,9 @@ } -static gboolean ___lambda255__gsource_func (gpointer self) { +static gboolean ___lambda253__gsource_func (gpointer self) { gboolean result; - result = __lambda255_ (self); + result = __lambda253_ (self); return result; } @@ -3558,7 +3558,7 @@ XnoiseFirstStartWidget* _tmp13_ = NULL; GtkButton* _tmp14_ = NULL; g_return_if_fail (XNOISE_IS_MAIN_WINDOW (self)); - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda250__gsource_func, g_object_ref (self), g_object_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda248__gsource_func, g_object_ref (self), g_object_unref); _tmp0_ = xnoise_first_start_widget_new (); g_object_ref_sink (_tmp0_); _g_object_unref0 (self->priv->first_start_widget); @@ -3586,11 +3586,11 @@ } _tmp11_ = self->priv->first_start_widget; _tmp12_ = _tmp11_->finish_button; - g_signal_connect_object (_tmp12_, "clicked", (GCallback) ___lambda251__gtk_button_clicked, self, 0); + g_signal_connect_object (_tmp12_, "clicked", (GCallback) ___lambda249__gtk_button_clicked, self, 0); _tmp13_ = self->priv->first_start_widget; _tmp14_ = _tmp13_->closebutton; - g_signal_connect_object (_tmp14_, "clicked", (GCallback) ___lambda253__gtk_button_clicked, self, 0); - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda255__gsource_func, g_object_ref (self), g_object_unref); + g_signal_connect_object (_tmp14_, "clicked", (GCallback) ___lambda251__gtk_button_clicked, self, 0); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda253__gsource_func, g_object_ref (self), g_object_unref); } @@ -3791,7 +3791,7 @@ } -static gboolean ____lambda237_ (XnoiseMainWindow* self) { +static gboolean ____lambda235_ (XnoiseMainWindow* self) { gboolean result = FALSE; GtkButton* _tmp0_ = NULL; _tmp0_ = self->priv->repeatButton; @@ -3801,14 +3801,14 @@ } -static gboolean _____lambda237__gsource_func (gpointer self) { +static gboolean _____lambda235__gsource_func (gpointer self) { gboolean result; - result = ____lambda237_ (self); + result = ____lambda235_ (self); return result; } -static gboolean ____lambda238_ (XnoiseMainWindow* self) { +static gboolean ____lambda236_ (XnoiseMainWindow* self) { gboolean result = FALSE; GtkButton* _tmp0_ = NULL; _tmp0_ = self->priv->repeatButton; @@ -3818,14 +3818,14 @@ } -static gboolean _____lambda238__gsource_func (gpointer self) { +static gboolean _____lambda236__gsource_func (gpointer self) { gboolean result; - result = ____lambda238_ (self); + result = ____lambda236_ (self); return result; } -static gboolean ____lambda239_ (XnoiseMainWindow* self) { +static gboolean ____lambda237_ (XnoiseMainWindow* self) { gboolean result = FALSE; GtkButton* _tmp0_ = NULL; _tmp0_ = self->priv->repeatButton; @@ -3835,14 +3835,14 @@ } -static gboolean _____lambda239__gsource_func (gpointer self) { +static gboolean _____lambda237__gsource_func (gpointer self) { gboolean result; - result = ____lambda239_ (self); + result = ____lambda237_ (self); return result; } -static gboolean ____lambda240_ (XnoiseMainWindow* self) { +static gboolean ____lambda238_ (XnoiseMainWindow* self) { gboolean result = FALSE; GtkButton* _tmp0_ = NULL; _tmp0_ = self->priv->repeatButton; @@ -3852,9 +3852,9 @@ } -static gboolean _____lambda240__gsource_func (gpointer self) { +static gboolean _____lambda238__gsource_func (gpointer self) { gboolean result; - result = ____lambda240_ (self); + result = ____lambda238_ (self); return result; } @@ -3895,7 +3895,7 @@ _tmp10_ = _tmp9_; gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GTK_TYPE_WIDGET, GtkWidget), _tmp10_); _g_free0 (_tmp10_); - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _____lambda237__gsource_func, g_object_ref (self), g_object_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _____lambda235__gsource_func, g_object_ref (self), g_object_unref); break; } } @@ -3929,7 +3929,7 @@ _tmp20_ = _tmp19_; gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GTK_TYPE_WIDGET, GtkWidget), _tmp20_); _g_free0 (_tmp20_); - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _____lambda238__gsource_func, g_object_ref (self), g_object_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _____lambda236__gsource_func, g_object_ref (self), g_object_unref); break; } } @@ -3963,7 +3963,7 @@ _tmp30_ = _tmp29_; gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GTK_TYPE_WIDGET, GtkWidget), _tmp30_); _g_free0 (_tmp30_); - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _____lambda239__gsource_func, g_object_ref (self), g_object_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _____lambda237__gsource_func, g_object_ref (self), g_object_unref); break; } } @@ -3997,7 +3997,7 @@ _tmp40_ = _tmp39_; gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GTK_TYPE_WIDGET, GtkWidget), _tmp40_); _g_free0 (_tmp40_); - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _____lambda240__gsource_func, g_object_ref (self), g_object_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _____lambda238__gsource_func, g_object_ref (self), g_object_unref); break; } } @@ -4437,7 +4437,7 @@ } -static gboolean __lambda218_ (XnoiseMainWindow* self) { +static gboolean __lambda216_ (XnoiseMainWindow* self) { gboolean result = FALSE; gchar* _tmp0_ = NULL; guint _tmp1_ = 0U; @@ -4457,9 +4457,9 @@ } -static gboolean ___lambda218__gsource_func (gpointer self) { +static gboolean ___lambda216__gsource_func (gpointer self) { gboolean result; - result = __lambda218_ (self); + result = __lambda216_ (self); return result; } @@ -4467,7 +4467,7 @@ static void xnoise_main_window_on_show_video_menu_clicked (XnoiseMainWindow* self) { XnoiseSerialButton* _tmp0_ = NULL; g_return_if_fail (XNOISE_IS_MAIN_WINDOW (self)); - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda218__gsource_func, g_object_ref (self), g_object_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda216__gsource_func, g_object_ref (self), g_object_unref); _tmp0_ = self->main_view_sbutton; xnoise_serial_button_select (_tmp0_, XNOISE_RESOURCES_VIDEOVIEW_NAME, TRUE); } @@ -4509,7 +4509,7 @@ } -static gboolean __lambda217_ (XnoiseMainWindow* self) { +static gboolean __lambda215_ (XnoiseMainWindow* self) { gboolean result = FALSE; gchar* _tmp0_ = NULL; guint _tmp1_ = 0U; @@ -4529,9 +4529,9 @@ } -static gboolean ___lambda217__gsource_func (gpointer self) { +static gboolean ___lambda215__gsource_func (gpointer self) { gboolean result; - result = __lambda217_ (self); + result = __lambda215_ (self); return result; } @@ -4539,7 +4539,7 @@ static void xnoise_main_window_on_show_lyrics_menu_clicked (XnoiseMainWindow* self) { XnoiseSerialButton* _tmp0_ = NULL; g_return_if_fail (XNOISE_IS_MAIN_WINDOW (self)); - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda217__gsource_func, g_object_ref (self), g_object_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda215__gsource_func, g_object_ref (self), g_object_unref); _tmp0_ = self->main_view_sbutton; xnoise_serial_button_select (_tmp0_, XNOISE_RESOURCES_LYRICS_VIEW_NAME, TRUE); } @@ -4649,7 +4649,7 @@ } -static gboolean __lambda256_ (XnoiseMainWindow* self) { +static gboolean __lambda254_ (XnoiseMainWindow* self) { gboolean result = FALSE; gchar* x = NULL; gchar* _tmp0_ = NULL; @@ -4713,14 +4713,14 @@ } -static gboolean ___lambda256__gsource_func (gpointer self) { +static gboolean ___lambda254__gsource_func (gpointer self) { gboolean result; - result = __lambda256_ (self); + result = __lambda254_ (self); return result; } -static gboolean __lambda257_ (XnoiseMainWindow* self) { +static gboolean __lambda255_ (XnoiseMainWindow* self) { gboolean result = FALSE; XnoiseTrayIcon* _tmp0_ = NULL; gboolean _tmp2_ = FALSE; @@ -4750,9 +4750,9 @@ } -static gboolean ___lambda257__gsource_func (gpointer self) { +static gboolean ___lambda255__gsource_func (gpointer self) { gboolean result; - result = __lambda257_ (self); + result = __lambda255_ (self); return result; } @@ -4828,8 +4828,8 @@ } _tmp18_ = xnoise_params_get_bool_value ("use_lyrics"); xnoise_main_window_set_active_lyrics (self, _tmp18_); - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda256__gsource_func, g_object_ref (self), g_object_unref); - g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ___lambda257__gsource_func, g_object_ref (self), g_object_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda254__gsource_func, g_object_ref (self), g_object_unref); + g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ___lambda255__gsource_func, g_object_ref (self), g_object_unref); _tmp19_ = xnoise_params_get_bool_value ("not_show_art_on_hover_image"); xnoise_main_window_set_not_show_art_on_hover_image (self, _tmp19_); _tmp20_ = xnoise_params_get_bool_value ("continue_last_song"); @@ -5316,7 +5316,7 @@ } -static gboolean ___lambda232_ (XnoiseMainWindow* self) { +static gboolean ___lambda230_ (XnoiseMainWindow* self) { gboolean result = FALSE; xnoise_main_window_set_window_in_foreground (self, FALSE); result = FALSE; @@ -5324,14 +5324,14 @@ } -static gboolean ____lambda232__gsource_func (gpointer self) { +static gboolean ____lambda230__gsource_func (gpointer self) { gboolean result; - result = ___lambda232_ (self); + result = ___lambda230_ (self); return result; } -static gboolean ___lambda233_ (XnoiseMainWindow* self) { +static gboolean ___lambda231_ (XnoiseMainWindow* self) { gboolean result = FALSE; xnoise_main_window_quit_now (self); result = FALSE; @@ -5339,9 +5339,9 @@ } -static gboolean ____lambda233__gsource_func (gpointer self) { +static gboolean ____lambda231__gsource_func (gpointer self) { gboolean result; - result = ___lambda233_ (self); + result = ___lambda231_ (self); return result; } @@ -5375,11 +5375,11 @@ self->priv->_posX = _tmp5_; self->priv->_posY = _tmp6_; gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget)); - g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 500, ____lambda232__gsource_func, g_object_ref (self), g_object_unref); + g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 500, ____lambda230__gsource_func, g_object_ref (self), g_object_unref); result = TRUE; return result; } else { - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda233__gsource_func, g_object_ref (self), g_object_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda231__gsource_func, g_object_ref (self), g_object_unref); result = TRUE; return result; } @@ -5418,7 +5418,7 @@ } -static gboolean __lambda206_ (Block94Data* _data94_, GtkWidget* s, GdkEventKey* e) { +static gboolean __lambda204_ (Block94Data* _data94_, GtkWidget* s, GdkEventKey* e) { XnoiseMainWindow * self; gboolean result = FALSE; GdkEventKey _tmp0_ = {0}; @@ -5459,14 +5459,14 @@ } -static gboolean ___lambda206__gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self) { +static gboolean ___lambda204__gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self) { gboolean result; - result = __lambda206_ (self, _sender, event); + result = __lambda204_ (self, _sender, event); return result; } -static void __lambda207_ (Block94Data* _data94_) { +static void __lambda205_ (Block94Data* _data94_) { XnoiseMainWindow * self; GtkDialog* _tmp0_ = NULL; self = _data94_->self; @@ -5475,8 +5475,8 @@ } -static void ___lambda207__xnoise_global_access_player_in_shutdown (XnoiseGlobalAccess* _sender, gpointer self) { - __lambda207_ (self); +static void ___lambda205__xnoise_global_access_player_in_shutdown (XnoiseGlobalAccess* _sender, gpointer self) { + __lambda205_ (self); } @@ -5527,9 +5527,9 @@ _tmp9_ = _data94_->dialog; gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GTK_TYPE_WINDOW, GtkWindow), FALSE); _tmp10_ = _data94_->dialog; - g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GTK_TYPE_WIDGET, GtkWidget), "key-press-event", (GCallback) ___lambda206__gtk_widget_key_press_event, block94_data_ref (_data94_), (GClosureNotify) block94_data_unref, 0); + g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GTK_TYPE_WIDGET, GtkWidget), "key-press-event", (GCallback) ___lambda204__gtk_widget_key_press_event, block94_data_ref (_data94_), (GClosureNotify) block94_data_unref, 0); _tmp11_ = xnoise_global; - g_signal_connect_data (_tmp11_, "player-in-shutdown", (GCallback) ___lambda207__xnoise_global_access_player_in_shutdown, block94_data_ref (_data94_), (GClosureNotify) block94_data_unref, 0); + g_signal_connect_data (_tmp11_, "player-in-shutdown", (GCallback) ___lambda205__xnoise_global_access_player_in_shutdown, block94_data_ref (_data94_), (GClosureNotify) block94_data_unref, 0); _tmp12_ = settings_widget; gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GTK_TYPE_WIDGET, GtkWidget), -1, 450); _tmp13_ = _data94_->dialog; @@ -5602,7 +5602,7 @@ } -static void __lambda186_ (XnoiseMainWindow* self, GtkEntry* s, GtkEntryIconPosition p0, GdkEvent* p1) { +static void __lambda184_ (XnoiseMainWindow* self, GtkEntry* s, GtkEntryIconPosition p0, GdkEvent* p1) { GtkEntryIconPosition _tmp0_ = 0; g_return_if_fail (GTK_IS_ENTRY (s)); g_return_if_fail (p1 != NULL); @@ -5615,12 +5615,12 @@ } -static void ___lambda186__gtk_entry_icon_press (GtkEntry* _sender, GtkEntryIconPosition p0, GdkEvent* p1, gpointer self) { - __lambda186_ (self, _sender, p0, p1); +static void ___lambda184__gtk_entry_icon_press (GtkEntry* _sender, GtkEntryIconPosition p0, GdkEvent* p1, gpointer self) { + __lambda184_ (self, _sender, p0, p1); } -static void __lambda187_ (Block95Data* _data95_) { +static void __lambda185_ (Block95Data* _data95_) { XnoiseMainWindow * self; GtkDialog* _tmp0_ = NULL; self = _data95_->self; @@ -5631,8 +5631,8 @@ } -static void ___lambda187__gtk_button_clicked (GtkButton* _sender, gpointer self) { - __lambda187_ (self); +static void ___lambda185__gtk_button_clicked (GtkButton* _sender, gpointer self) { + __lambda185_ (self); } @@ -5651,7 +5651,7 @@ } -static void __lambda188_ (Block95Data* _data95_) { +static void __lambda186_ (Block95Data* _data95_) { XnoiseMainWindow * self; gboolean _tmp0_ = FALSE; GtkEntry* _tmp1_ = NULL; @@ -5762,12 +5762,12 @@ } -static void ___lambda188__gtk_button_clicked (GtkButton* _sender, gpointer self) { - __lambda188_ (self); +static void ___lambda186__gtk_button_clicked (GtkButton* _sender, gpointer self) { + __lambda186_ (self); } -static gboolean __lambda189_ (Block95Data* _data95_) { +static gboolean __lambda187_ (Block95Data* _data95_) { XnoiseMainWindow * self; gboolean result = FALSE; self = _data95_->self; @@ -5778,9 +5778,9 @@ } -static gboolean ___lambda189__gtk_widget_destroy_event (GtkWidget* _sender, GdkEventAny* event, gpointer self) { +static gboolean ___lambda187__gtk_widget_destroy_event (GtkWidget* _sender, GdkEventAny* event, gpointer self) { gboolean result; - result = __lambda189_ (self); + result = __lambda187_ (self); return result; } @@ -5865,7 +5865,7 @@ _tmp7_ = _data95_->radioentry; gtk_entry_set_icon_activatable (_tmp7_, GTK_ENTRY_ICON_SECONDARY, TRUE); _tmp8_ = _data95_->radioentry; - g_signal_connect_object (_tmp8_, "icon-press", (GCallback) ___lambda186__gtk_entry_icon_press, self, 0); + g_signal_connect_object (_tmp8_, "icon-press", (GCallback) ___lambda184__gtk_entry_icon_press, self, 0); _tmp9_ = _data95_->radiodialog; _tmp10_ = (GtkBox*) gtk_dialog_get_content_area (_tmp9_); _tmp11_ = _data95_->radioentry; @@ -5875,15 +5875,15 @@ _tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GTK_TYPE_BUTTON, GtkButton)); radiocancelbutton = _tmp14_; _tmp15_ = radiocancelbutton; - g_signal_connect_data (_tmp15_, "clicked", (GCallback) ___lambda187__gtk_button_clicked, block95_data_ref (_data95_), (GClosureNotify) block95_data_unref, 0); + g_signal_connect_data (_tmp15_, "clicked", (GCallback) ___lambda185__gtk_button_clicked, block95_data_ref (_data95_), (GClosureNotify) block95_data_unref, 0); _tmp16_ = _data95_->radiodialog; _tmp17_ = gtk_dialog_add_button (_tmp16_, GTK_STOCK_OK, 1); _tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GTK_TYPE_BUTTON, GtkButton)); radiookbutton = _tmp18_; _tmp19_ = radiookbutton; - g_signal_connect_data (_tmp19_, "clicked", (GCallback) ___lambda188__gtk_button_clicked, block95_data_ref (_data95_), (GClosureNotify) block95_data_unref, 0); + g_signal_connect_data (_tmp19_, "clicked", (GCallback) ___lambda186__gtk_button_clicked, block95_data_ref (_data95_), (GClosureNotify) block95_data_unref, 0); _tmp20_ = _data95_->radiodialog; - g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GTK_TYPE_WIDGET, GtkWidget), "destroy-event", (GCallback) ___lambda189__gtk_widget_destroy_event, block95_data_ref (_data95_), (GClosureNotify) block95_data_unref, 0); + g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GTK_TYPE_WIDGET, GtkWidget), "destroy-event", (GCallback) ___lambda187__gtk_widget_destroy_event, block95_data_ref (_data95_), (GClosureNotify) block95_data_unref, 0); _tmp21_ = _data95_->radiodialog; _tmp22_ = _ ("Enter the URL for playing"); gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GTK_TYPE_WINDOW, GtkWindow), _tmp22_); @@ -5937,7 +5937,7 @@ } -static void __lambda214_ (XnoiseMainWindow* self) { +static void __lambda212_ (XnoiseMainWindow* self) { GtkWindow* _tmp0_ = NULL; _tmp0_ = self->priv->eqdialog; gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GTK_TYPE_WIDGET, GtkWidget)); @@ -5946,12 +5946,12 @@ } -static void ___lambda214__gtk_button_clicked (GtkButton* _sender, gpointer self) { - __lambda214_ (self); +static void ___lambda212__gtk_button_clicked (GtkButton* _sender, gpointer self) { + __lambda212_ (self); } -static gboolean __lambda215_ (XnoiseMainWindow* self, GtkWidget* s, GdkEventKey* e) { +static gboolean __lambda213_ (XnoiseMainWindow* self, GtkWidget* s, GdkEventKey* e) { gboolean result = FALSE; GdkEventKey _tmp0_ = {0}; guint _tmp1_ = 0U; @@ -5987,14 +5987,14 @@ } -static gboolean ___lambda215__gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self) { +static gboolean ___lambda213__gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self) { gboolean result; - result = __lambda215_ (self, _sender, event); + result = __lambda213_ (self, _sender, event); return result; } -static gboolean __lambda216_ (XnoiseMainWindow* self) { +static gboolean __lambda214_ (XnoiseMainWindow* self) { gboolean result = FALSE; _g_object_unref0 (self->priv->eqdialog); self->priv->eqdialog = NULL; @@ -6003,9 +6003,9 @@ } -static gboolean ___lambda216__gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self) { +static gboolean ___lambda214__gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self) { gboolean result; - result = __lambda216_ (self); + result = __lambda214_ (self); return result; } @@ -6059,7 +6059,7 @@ g_object_set (_tmp10_, "window-position", GTK_WIN_POS_CENTER_ON_PARENT, NULL); _tmp11_ = eq_widget; _tmp12_ = _tmp11_->closebutton; - g_signal_connect_object (_tmp12_, "clicked", (GCallback) ___lambda214__gtk_button_clicked, self, 0); + g_signal_connect_object (_tmp12_, "clicked", (GCallback) ___lambda212__gtk_button_clicked, self, 0); _tmp13_ = self->priv->eqdialog; _tmp14_ = _ ("Equalizer"); _tmp15_ = g_strconcat ("xnoise - ", _tmp14_, NULL); @@ -6067,11 +6067,11 @@ gtk_window_set_title (_tmp13_, _tmp16_); _g_free0 (_tmp16_); _tmp17_ = self->priv->eqdialog; - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GTK_TYPE_WIDGET, GtkWidget), "key-press-event", (GCallback) ___lambda215__gtk_widget_key_press_event, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GTK_TYPE_WIDGET, GtkWidget), "key-press-event", (GCallback) ___lambda213__gtk_widget_key_press_event, self, 0); _tmp18_ = self->priv->eqdialog; gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GTK_TYPE_WIDGET, GtkWidget)); _tmp19_ = self->priv->eqdialog; - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GTK_TYPE_WIDGET, GtkWidget), "delete-event", (GCallback) ___lambda216__gtk_widget_delete_event, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GTK_TYPE_WIDGET, GtkWidget), "delete-event", (GCallback) ___lambda214__gtk_widget_delete_event, self, 0); _g_object_unref0 (eq_widget); } @@ -7050,19 +7050,19 @@ } -static void ___lambda219_ (XnoiseMainWindow* self) { +static void ___lambda217_ (XnoiseMainWindow* self) { XnoiseTrackList* _tmp0_ = NULL; _tmp0_ = xnoise_tl; xnoise_track_list_remove_selected_rows (_tmp0_); } -static void ____lambda219__gtk_button_clicked (GtkButton* _sender, gpointer self) { - ___lambda219_ (self); +static void ____lambda217__gtk_button_clicked (GtkButton* _sender, gpointer self) { + ___lambda217_ (self); } -static void ___lambda220_ (XnoiseMainWindow* self) { +static void ___lambda218_ (XnoiseMainWindow* self) { XnoiseGlobalAccess* _tmp0_ = NULL; GtkListStore* store = NULL; XnoiseTrackListModel* _tmp1_ = NULL; @@ -7077,12 +7077,12 @@ } -static void ____lambda220__gtk_button_clicked (GtkButton* _sender, gpointer self) { - ___lambda220_ (self); +static void ____lambda218__gtk_button_clicked (GtkButton* _sender, gpointer self) { + ___lambda218_ (self); } -static void ___lambda221_ (XnoiseMainWindow* self) { +static void ___lambda219_ (XnoiseMainWindow* self) { gboolean _tmp0_ = FALSE; XnoiseGlobalAccess* _tmp1_ = NULL; const GtkTreeRowReference* _tmp2_ = NULL; @@ -7140,8 +7140,8 @@ } -static void ____lambda221__gtk_button_clicked (GtkButton* _sender, gpointer self) { - ___lambda221_ (self); +static void ____lambda219__gtk_button_clicked (GtkButton* _sender, gpointer self) { + ___lambda219_ (self); } @@ -7152,7 +7152,7 @@ } -static void ___lambda222_ (XnoiseMainWindow* self) { +static void ___lambda220_ (XnoiseMainWindow* self) { XnoiseMainViewNotebook* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; const gchar* _tmp2_ = NULL; @@ -7177,12 +7177,12 @@ } -static void ____lambda222__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { - ___lambda222_ (self); +static void ____lambda220__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { + ___lambda220_ (self); } -static void ___lambda223_ (XnoiseMainWindow* self) { +static void ___lambda221_ (XnoiseMainWindow* self) { GtkStyleContext* ctxt = NULL; GtkToolbar* _tmp0_ = NULL; GtkStyleContext* _tmp1_ = NULL; @@ -7244,8 +7244,8 @@ } -static void ____lambda223__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { - ___lambda223_ (self); +static void ____lambda221__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { + ___lambda221_ (self); } @@ -7259,7 +7259,7 @@ } -static void ___lambda225_ (XnoiseMainWindow* self, GtkEntry* s, GtkEntryIconPosition p0, GdkEvent* p1) { +static void ___lambda223_ (XnoiseMainWindow* self, GtkEntry* s, GtkEntryIconPosition p0, GdkEvent* p1) { GtkEntryIconPosition _tmp0_ = 0; g_return_if_fail (GTK_IS_ENTRY (s)); g_return_if_fail (p1 != NULL); @@ -7276,22 +7276,22 @@ } -static void ____lambda225__gtk_entry_icon_press (GtkEntry* _sender, GtkEntryIconPosition p0, GdkEvent* p1, gpointer self) { - ___lambda225_ (self, _sender, p0, p1); +static void ____lambda223__gtk_entry_icon_press (GtkEntry* _sender, GtkEntryIconPosition p0, GdkEvent* p1, gpointer self) { + ___lambda223_ (self, _sender, p0, p1); } -static void ___lambda226_ (XnoiseMainWindow* self) { +static void ___lambda224_ (XnoiseMainWindow* self) { xnoise_main_window_set_album_art_view_visible (self, FALSE); } -static void ____lambda226__gtk_button_clicked (GtkButton* _sender, gpointer self) { - ___lambda226_ (self); +static void ____lambda224__gtk_button_clicked (GtkButton* _sender, gpointer self) { + ___lambda224_ (self); } -static void ___lambda227_ (Block96Data* _data96_, GObject* s, GParamSpec* p) { +static void ___lambda225_ (Block96Data* _data96_, GObject* s, GParamSpec* p) { XnoiseMainWindow * self; GParamSpec* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; @@ -7333,12 +7333,12 @@ } -static void ____lambda227__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { - ___lambda227_ (self, _sender, pspec); +static void ____lambda225__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { + ___lambda225_ (self, _sender, pspec); } -static void ___lambda228_ (Block96Data* _data96_) { +static void ___lambda226_ (Block96Data* _data96_) { XnoiseMainWindow * self; XnoiseGlobalAccess* _tmp0_ = NULL; GtkEntryBuffer* _tmp1_ = NULL; @@ -7364,12 +7364,12 @@ } -static void ____lambda228__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { - ___lambda228_ (self); +static void ____lambda226__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { + ___lambda226_ (self); } -static void ___lambda229_ (XnoiseMainWindow* self, GtkEntry* s, GtkEntryIconPosition p0, GdkEvent* p1) { +static void ___lambda227_ (XnoiseMainWindow* self, GtkEntry* s, GtkEntryIconPosition p0, GdkEvent* p1) { GtkEntryIconPosition _tmp0_ = 0; g_return_if_fail (GTK_IS_ENTRY (s)); g_return_if_fail (p1 != NULL); @@ -7385,12 +7385,12 @@ } -static void ____lambda229__gtk_entry_icon_press (GtkEntry* _sender, GtkEntryIconPosition p0, GdkEvent* p1, gpointer self) { - ___lambda229_ (self, _sender, p0, p1); +static void ____lambda227__gtk_entry_icon_press (GtkEntry* _sender, GtkEntryIconPosition p0, GdkEvent* p1, gpointer self) { + ___lambda227_ (self, _sender, p0, p1); } -static gboolean ____lambda230_ (XnoiseMainWindow* self) { +static gboolean ____lambda228_ (XnoiseMainWindow* self) { gboolean result = FALSE; xnoise_main_window_set_media_browser_visible (self, FALSE); result = FALSE; @@ -7398,14 +7398,14 @@ } -static gboolean _____lambda230__gsource_func (gpointer self) { +static gboolean _____lambda228__gsource_func (gpointer self) { gboolean result; - result = ____lambda230_ (self); + result = ____lambda228_ (self); return result; } -static void __lambda231_ (XnoiseMainWindow* self, GtkNotebook* s, GtkWidget* np, guint p) { +static void __lambda229_ (XnoiseMainWindow* self, GtkNotebook* s, GtkWidget* np, guint p) { XnoiseIMainView* mv = NULL; GtkWidget* _tmp0_ = NULL; XnoiseIMainView* _tmp1_ = NULL; @@ -7457,8 +7457,8 @@ } -static void ___lambda231__gtk_notebook_switch_page (GtkNotebook* _sender, GtkWidget* page, guint page_num, gpointer self) { - __lambda231_ (self, _sender, page, page_num); +static void ___lambda229__gtk_notebook_switch_page (GtkNotebook* _sender, GtkWidget* page, guint page_num, gpointer self) { + __lambda229_ (self, _sender, page, page_num); } @@ -7486,7 +7486,7 @@ static void xnoise_main_window_setup_widgets (XnoiseMainWindow* self) { GtkSettings* _tmp0_ = NULL; GtkSettings* _tmp1_ = NULL; - XnoiseMainViewNotebook* _tmp389_ = NULL; + XnoiseMainViewNotebook* _tmp392_ = NULL; GError * _inner_error_ = NULL; g_return_if_fail (XNOISE_IS_MAIN_WINDOW (self)); _tmp0_ = gtk_settings_get_default (); @@ -7655,233 +7655,237 @@ XnoiseVideoViewWidget* _tmp158_ = NULL; XnoiseGstPlayer* _tmp159_ = NULL; XnoiseVideoScreen* _tmp160_ = NULL; - XnoiseVideoViewWidget* _tmp161_ = NULL; - GtkBox* _tmp162_ = NULL; + XnoiseVideoScreen* _tmp161_ = NULL; + XnoiseVideoViewWidget* _tmp162_ = NULL; GtkBox* _tmp163_ = NULL; - XnoiseMainViewNotebook* _tmp164_ = NULL; - XnoiseVideoViewWidget* _tmp165_ = NULL; - XnoiseLyricsViewWidget* _tmp166_ = NULL; + GtkBox* _tmp164_ = NULL; + XnoiseMainViewNotebook* _tmp165_ = NULL; + XnoiseVideoViewWidget* _tmp166_ = NULL; XnoiseLyricsViewWidget* _tmp167_ = NULL; - XnoiseLyricsView* _tmp168_ = NULL; - XnoiseMainViewNotebook* _tmp169_ = NULL; - XnoiseLyricsViewWidget* _tmp170_ = NULL; - XnoiseMainViewNotebook* _tmp171_ = NULL; + XnoiseLyricsViewWidget* _tmp168_ = NULL; + XnoiseLyricsView* _tmp169_ = NULL; + XnoiseMainViewNotebook* _tmp170_ = NULL; + XnoiseLyricsViewWidget* _tmp171_ = NULL; + XnoiseMainViewNotebook* _tmp172_ = NULL; GtkBox* toolbarbox = NULL; - GtkBuilder* _tmp172_ = NULL; - GObject* _tmp173_ = NULL; - GtkBox* _tmp174_ = NULL; - GtkToolbar* _tmp175_ = NULL; + GtkBuilder* _tmp173_ = NULL; + GObject* _tmp174_ = NULL; + GtkBox* _tmp175_ = NULL; GtkToolbar* _tmp176_ = NULL; GtkToolbar* _tmp177_ = NULL; GtkToolbar* _tmp178_ = NULL; - GtkBox* _tmp179_ = NULL; - GtkToolbar* _tmp180_ = NULL; - gboolean _tmp181_ = FALSE; - GtkSettings* _tmp182_ = NULL; - gchar* _tmp183_ = NULL; + GtkToolbar* _tmp179_ = NULL; + GtkBox* _tmp180_ = NULL; + GtkToolbar* _tmp181_ = NULL; + gboolean _tmp182_ = FALSE; + GtkSettings* _tmp183_ = NULL; gchar* _tmp184_ = NULL; gchar* _tmp185_ = NULL; - gboolean _tmp186_ = FALSE; - gboolean _tmp191_ = FALSE; - GtkSettings* _tmp194_ = NULL; + gchar* _tmp186_ = NULL; + gboolean _tmp187_ = FALSE; + gboolean _tmp192_ = FALSE; + GtkSettings* _tmp195_ = NULL; GtkBox* box = NULL; - XnoiseAlbumImage* _tmp195_ = NULL; + XnoiseAlbumImage* _tmp196_ = NULL; GtkToolItem* albumimageTI = NULL; - GtkToolItem* _tmp196_ = NULL; GtkToolItem* _tmp197_ = NULL; - XnoiseAlbumImage* _tmp198_ = NULL; + GtkToolItem* _tmp198_ = NULL; XnoiseAlbumImage* _tmp199_ = NULL; - XnoiseMediaSoureWidget* _tmp200_ = NULL; + XnoiseAlbumImage* _tmp200_ = NULL; XnoiseMediaSoureWidget* _tmp201_ = NULL; XnoiseMediaSoureWidget* _tmp202_ = NULL; - GtkEntry* _tmp203_ = NULL; + XnoiseMediaSoureWidget* _tmp203_ = NULL; GtkEntry* _tmp204_ = NULL; GtkEntry* _tmp205_ = NULL; GtkEntry* _tmp206_ = NULL; - const gchar* _tmp207_ = NULL; - gchar* _tmp208_ = NULL; + GtkEntry* _tmp207_ = NULL; + const gchar* _tmp208_ = NULL; gchar* _tmp209_ = NULL; - const gchar* _tmp210_ = NULL; - gchar* _tmp211_ = NULL; + gchar* _tmp210_ = NULL; + const gchar* _tmp211_ = NULL; gchar* _tmp212_ = NULL; - GtkBox* _tmp213_ = NULL; - XnoiseMediaSoureWidget* _tmp214_ = NULL; - XnoiseSerialButton* _tmp215_ = NULL; + gchar* _tmp213_ = NULL; + GtkBox* _tmp214_ = NULL; + XnoiseMediaSoureWidget* _tmp215_ = NULL; XnoiseSerialButton* _tmp216_ = NULL; - XnoiseIconRepo* _tmp217_ = NULL; - GtkImage* _tmp218_ = NULL; + XnoiseSerialButton* _tmp217_ = NULL; + XnoiseIconRepo* _tmp218_ = NULL; GtkImage* _tmp219_ = NULL; - XnoiseSerialButton* _tmp220_ = NULL; - XnoiseIconRepo* _tmp221_ = NULL; - GtkImage* _tmp222_ = NULL; + GtkImage* _tmp220_ = NULL; + XnoiseSerialButton* _tmp221_ = NULL; + XnoiseIconRepo* _tmp222_ = NULL; GtkImage* _tmp223_ = NULL; - gboolean _tmp224_ = FALSE; - XnoiseSerialButton* _tmp229_ = NULL; + GtkImage* _tmp224_ = NULL; + gboolean _tmp225_ = FALSE; + XnoiseSerialButton* _tmp230_ = NULL; GtkToolItem* serialTI = NULL; - GtkToolItem* _tmp230_ = NULL; + GtkToolItem* _tmp231_ = NULL; GtkBox* mvsb_box = NULL; - GtkBox* _tmp231_ = NULL; GtkBox* _tmp232_ = NULL; - GtkDrawingArea* _tmp233_ = NULL; - GtkDrawingArea* _tmp234_ = NULL; + GtkEventBox* ebs = NULL; + GtkEventBox* _tmp233_ = NULL; + GtkEventBox* _tmp234_ = NULL; GtkBox* _tmp235_ = NULL; - XnoiseSerialButton* _tmp236_ = NULL; + GtkEventBox* _tmp236_ = NULL; GtkBox* _tmp237_ = NULL; - GtkDrawingArea* _tmp238_ = NULL; - GtkDrawingArea* _tmp239_ = NULL; - GtkToolItem* _tmp240_ = NULL; + XnoiseSerialButton* _tmp238_ = NULL; + GtkEventBox* _tmp239_ = NULL; + GtkEventBox* _tmp240_ = NULL; GtkBox* _tmp241_ = NULL; - XnoiseGstPlayer* _tmp242_ = NULL; - XnoiseTrackInfobar* _tmp243_ = NULL; - XnoiseTrackInfobar* _tmp244_ = NULL; - GtkMenu* _tmp245_ = NULL; - const gchar* _tmp246_ = NULL; - XnoiseAppMenuButton* _tmp247_ = NULL; + GtkEventBox* _tmp242_ = NULL; + GtkToolItem* _tmp243_ = NULL; + GtkBox* _tmp244_ = NULL; + XnoiseGstPlayer* _tmp245_ = NULL; + XnoiseTrackInfobar* _tmp246_ = NULL; + XnoiseTrackInfobar* _tmp247_ = NULL; + GtkMenu* _tmp248_ = NULL; + const gchar* _tmp249_ = NULL; + XnoiseAppMenuButton* _tmp250_ = NULL; GtkSeparatorToolItem* separ = NULL; - GtkSeparatorToolItem* _tmp248_ = NULL; - GtkSeparatorToolItem* _tmp249_ = NULL; - GtkToolbar* _tmp250_ = NULL; - PlayBackControlBar* _tmp251_ = NULL; - PlayBackControlBar* _tmp252_ = NULL; + GtkSeparatorToolItem* _tmp251_ = NULL; + GtkSeparatorToolItem* _tmp252_ = NULL; GtkToolbar* _tmp253_ = NULL; - GtkToolItem* _tmp254_ = NULL; - GtkToolbar* _tmp255_ = NULL; - GtkSeparatorToolItem* _tmp256_ = NULL; - GtkToolbar* _tmp257_ = NULL; - XnoiseTrackInfobar* _tmp258_ = NULL; + PlayBackControlBar* _tmp254_ = NULL; + PlayBackControlBar* _tmp255_ = NULL; + GtkToolbar* _tmp256_ = NULL; + GtkToolItem* _tmp257_ = NULL; + GtkToolbar* _tmp258_ = NULL; GtkSeparatorToolItem* _tmp259_ = NULL; - GtkSeparatorToolItem* _tmp260_ = NULL; - GtkToolbar* _tmp261_ = NULL; + GtkToolbar* _tmp260_ = NULL; + XnoiseTrackInfobar* _tmp261_ = NULL; GtkSeparatorToolItem* _tmp262_ = NULL; - GtkToolbar* _tmp263_ = NULL; - GtkToolItem* _tmp264_ = NULL; + GtkSeparatorToolItem* _tmp263_ = NULL; + GtkToolbar* _tmp264_ = NULL; GtkSeparatorToolItem* _tmp265_ = NULL; - GtkSeparatorToolItem* _tmp266_ = NULL; - GtkToolbar* _tmp267_ = NULL; + GtkToolbar* _tmp266_ = NULL; + GtkToolItem* _tmp267_ = NULL; GtkSeparatorToolItem* _tmp268_ = NULL; - GtkToolbar* _tmp269_ = NULL; - XnoiseVolumeSliderButton* _tmp270_ = NULL; - GtkToolbar* _tmp271_ = NULL; - XnoiseAppMenuButton* _tmp272_ = NULL; - GtkToolbar* _tmp273_ = NULL; - GtkEntry* _tmp274_ = NULL; - XnoiseAlbumArtCellArea* _tmp275_ = NULL; - XnoiseAlbumArtCellArea* _tmp276_ = NULL; - XnoiseAlbumArtView* _tmp277_ = NULL; + GtkSeparatorToolItem* _tmp269_ = NULL; + GtkToolbar* _tmp270_ = NULL; + GtkSeparatorToolItem* _tmp271_ = NULL; + GtkToolbar* _tmp272_ = NULL; + XnoiseVolumeSliderButton* _tmp273_ = NULL; + GtkToolbar* _tmp274_ = NULL; + XnoiseAppMenuButton* _tmp275_ = NULL; + GtkToolbar* _tmp276_ = NULL; + GtkEntry* _tmp277_ = NULL; + XnoiseAlbumArtCellArea* _tmp278_ = NULL; + XnoiseAlbumArtCellArea* _tmp279_ = NULL; + XnoiseAlbumArtView* _tmp280_ = NULL; GtkOverlay* album_art_overlay = NULL; - GtkOverlay* _tmp278_ = NULL; - GtkSpinner* _tmp279_ = NULL; - GtkSpinner* _tmp280_ = NULL; - GtkSpinner* _tmp281_ = NULL; - GtkOverlay* _tmp282_ = NULL; + GtkOverlay* _tmp281_ = NULL; + GtkSpinner* _tmp282_ = NULL; GtkSpinner* _tmp283_ = NULL; GtkSpinner* _tmp284_ = NULL; - GtkSpinner* _tmp285_ = NULL; + GtkOverlay* _tmp285_ = NULL; GtkSpinner* _tmp286_ = NULL; + GtkSpinner* _tmp287_ = NULL; + GtkSpinner* _tmp288_ = NULL; + GtkSpinner* _tmp289_ = NULL; GtkButton* album_art_back_button = NULL; - GtkButton* _tmp287_ = NULL; - const gchar* _tmp288_ = NULL; - gboolean _tmp289_ = FALSE; GtkButton* _tmp290_ = NULL; - XnoiseIconRepo* _tmp291_ = NULL; - const gchar* _tmp292_ = NULL; - GtkImage* _tmp293_ = NULL; - GtkImage* _tmp294_ = NULL; - GtkButton* _tmp295_ = NULL; - GtkButton* _tmp296_ = NULL; - const gchar* _tmp297_ = NULL; - GtkOverlay* _tmp298_ = NULL; + const gchar* _tmp291_ = NULL; + gboolean _tmp292_ = FALSE; + GtkButton* _tmp293_ = NULL; + XnoiseIconRepo* _tmp294_ = NULL; + const gchar* _tmp295_ = NULL; + GtkImage* _tmp296_ = NULL; + GtkImage* _tmp297_ = NULL; + GtkButton* _tmp298_ = NULL; GtkButton* _tmp299_ = NULL; - GtkButton* _tmp300_ = NULL; - GtkButton* _tmp301_ = NULL; - XnoiseAlbumArtView* _tmp302_ = NULL; - XnoiseAlbumArtView* _tmp303_ = NULL; + const gchar* _tmp300_ = NULL; + GtkOverlay* _tmp301_ = NULL; + GtkButton* _tmp302_ = NULL; + GtkButton* _tmp303_ = NULL; + GtkButton* _tmp304_ = NULL; + XnoiseAlbumArtView* _tmp305_ = NULL; + XnoiseAlbumArtView* _tmp306_ = NULL; GtkBox* aa_contr_bx = NULL; - GtkBox* _tmp304_ = NULL; - XnoiseMediaSoureWidget* _tmp305_ = NULL; - GtkEntry* _tmp306_ = NULL; - GtkEntry* _tmp307_ = NULL; - GtkEntryBuffer* _tmp308_ = NULL; - GtkEntryBuffer* _tmp309_ = NULL; - XnoiseMediaSoureWidget* _tmp310_ = NULL; - GtkEntry* _tmp311_ = NULL; - GtkEntry* _tmp312_ = NULL; - GtkStyleContext* _tmp313_ = NULL; - XnoiseMediaSoureWidget* _tmp314_ = NULL; + GtkBox* _tmp307_ = NULL; + XnoiseMediaSoureWidget* _tmp308_ = NULL; + GtkEntry* _tmp309_ = NULL; + GtkEntry* _tmp310_ = NULL; + GtkEntryBuffer* _tmp311_ = NULL; + GtkEntryBuffer* _tmp312_ = NULL; + XnoiseMediaSoureWidget* _tmp313_ = NULL; + GtkEntry* _tmp314_ = NULL; GtkEntry* _tmp315_ = NULL; - GtkEntry* _tmp316_ = NULL; - GtkStyleContext* _tmp317_ = NULL; - GtkEntryBuffer* _tmp318_ = NULL; - GtkEntryBuffer* _tmp319_ = NULL; - GtkEntry* _tmp320_ = NULL; - GtkEntry* _tmp321_ = NULL; - GtkEntry* _tmp322_ = NULL; + GtkStyleContext* _tmp316_ = NULL; + XnoiseMediaSoureWidget* _tmp317_ = NULL; + GtkEntry* _tmp318_ = NULL; + GtkEntry* _tmp319_ = NULL; + GtkStyleContext* _tmp320_ = NULL; + GtkEntryBuffer* _tmp321_ = NULL; + GtkEntryBuffer* _tmp322_ = NULL; GtkEntry* _tmp323_ = NULL; GtkEntry* _tmp324_ = NULL; GtkEntry* _tmp325_ = NULL; GtkEntry* _tmp326_ = NULL; - const gchar* _tmp327_ = NULL; - gchar* _tmp328_ = NULL; - gchar* _tmp329_ = NULL; + GtkEntry* _tmp327_ = NULL; + GtkEntry* _tmp328_ = NULL; + GtkEntry* _tmp329_ = NULL; const gchar* _tmp330_ = NULL; gchar* _tmp331_ = NULL; gchar* _tmp332_ = NULL; - GtkEntry* _tmp333_ = NULL; - const gchar* _tmp334_ = NULL; - GtkEntry* _tmp335_ = NULL; - GtkBox* _tmp336_ = NULL; - GtkEntry* _tmp337_ = NULL; - XnoiseSerialButton* _tmp338_ = NULL; - XnoiseSerialButton* _tmp339_ = NULL; - const gchar* _tmp340_ = NULL; + const gchar* _tmp333_ = NULL; + gchar* _tmp334_ = NULL; + gchar* _tmp335_ = NULL; + GtkEntry* _tmp336_ = NULL; + const gchar* _tmp337_ = NULL; + GtkEntry* _tmp338_ = NULL; + GtkBox* _tmp339_ = NULL; + GtkEntry* _tmp340_ = NULL; XnoiseSerialButton* _tmp341_ = NULL; - const gchar* _tmp342_ = NULL; - XnoiseSerialButton* _tmp343_ = NULL; - const gchar* _tmp344_ = NULL; - XnoiseSerialButton* _tmp345_ = NULL; - const gchar* _tmp346_ = NULL; + XnoiseSerialButton* _tmp342_ = NULL; + const gchar* _tmp343_ = NULL; + XnoiseSerialButton* _tmp344_ = NULL; + const gchar* _tmp345_ = NULL; + XnoiseSerialButton* _tmp346_ = NULL; + const gchar* _tmp347_ = NULL; + XnoiseSerialButton* _tmp348_ = NULL; + const gchar* _tmp349_ = NULL; GtkLabel* dummy = NULL; - GtkLabel* _tmp347_ = NULL; - GtkBox* _tmp348_ = NULL; - GtkLabel* _tmp349_ = NULL; - GtkBox* _tmp350_ = NULL; - XnoiseSerialButton* _tmp351_ = NULL; - XnoiseSerialButton* _tmp352_ = NULL; - XnoiseSerialButton* _tmp353_ = NULL; - const gchar* _tmp354_ = NULL; - GtkImage* _tmp355_ = NULL; - GtkImage* _tmp356_ = NULL; - XnoiseSerialButton* _tmp357_ = NULL; - const gchar* _tmp358_ = NULL; + GtkLabel* _tmp350_ = NULL; + GtkBox* _tmp351_ = NULL; + GtkLabel* _tmp352_ = NULL; + GtkBox* _tmp353_ = NULL; + XnoiseSerialButton* _tmp354_ = NULL; + XnoiseSerialButton* _tmp355_ = NULL; + XnoiseSerialButton* _tmp356_ = NULL; + const gchar* _tmp357_ = NULL; + GtkImage* _tmp358_ = NULL; GtkImage* _tmp359_ = NULL; - GtkImage* _tmp360_ = NULL; - GtkBox* _tmp361_ = NULL; - XnoiseSerialButton* _tmp362_ = NULL; - GtkBox* aabx = NULL; - GtkBox* _tmp363_ = NULL; + XnoiseSerialButton* _tmp360_ = NULL; + const gchar* _tmp361_ = NULL; + GtkImage* _tmp362_ = NULL; + GtkImage* _tmp363_ = NULL; GtkBox* _tmp364_ = NULL; - GtkBox* _tmp365_ = NULL; + XnoiseSerialButton* _tmp365_ = NULL; + GtkBox* aabx = NULL; + GtkBox* _tmp366_ = NULL; + GtkBox* _tmp367_ = NULL; + GtkBox* _tmp368_ = NULL; GtkScrolledWindow* aasw = NULL; - GtkScrolledWindow* _tmp366_ = NULL; - GtkScrolledWindow* _tmp367_ = NULL; - GtkScrolledWindow* _tmp368_ = NULL; - XnoiseAlbumArtView* _tmp369_ = NULL; - GtkOverlay* _tmp370_ = NULL; + GtkScrolledWindow* _tmp369_ = NULL; + GtkScrolledWindow* _tmp370_ = NULL; GtkScrolledWindow* _tmp371_ = NULL; - GtkBox* _tmp372_ = NULL; + XnoiseAlbumArtView* _tmp372_ = NULL; GtkOverlay* _tmp373_ = NULL; - GtkNotebook* _tmp374_ = NULL; + GtkScrolledWindow* _tmp374_ = NULL; GtkBox* _tmp375_ = NULL; - GtkWindow* _tmp376_ = NULL; - GtkWindow* _tmp377_ = NULL; - GtkWindow* _tmp378_ = NULL; + GtkOverlay* _tmp376_ = NULL; + GtkNotebook* _tmp377_ = NULL; + GtkBox* _tmp378_ = NULL; GtkWindow* _tmp379_ = NULL; GtkWindow* _tmp380_ = NULL; - XnoiseFullscreenToolbar* _tmp381_ = NULL; - GtkBox* _tmp382_ = NULL; + GtkWindow* _tmp381_ = NULL; + GtkWindow* _tmp382_ = NULL; + GtkWindow* _tmp383_ = NULL; + XnoiseFullscreenToolbar* _tmp384_ = NULL; + GtkBox* _tmp385_ = NULL; gboolean tmp_media_browser_visible = FALSE; - gboolean _tmp383_ = FALSE; - gboolean _tmp384_ = FALSE; + gboolean _tmp386_ = FALSE; + gboolean _tmp387_ = FALSE; _data96_ = g_slice_new0 (Block96Data); _data96_->_ref_count_ = 1; _data96_->self = g_object_ref (self); @@ -8118,7 +8122,7 @@ _tmp100_ = removeSelectedButton; gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp99_, GTK_TYPE_BOX, GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, GTK_TYPE_WIDGET, GtkWidget), FALSE, FALSE, (guint) 0); _tmp101_ = removeSelectedButton; - g_signal_connect_object (_tmp101_, "clicked", (GCallback) ____lambda219__gtk_button_clicked, self, 0); + g_signal_connect_object (_tmp101_, "clicked", (GCallback) ____lambda217__gtk_button_clicked, self, 0); _tmp102_ = (GtkButton*) gtk_button_new (); g_object_ref_sink (_tmp102_); removeAllButton = _tmp102_; @@ -8156,7 +8160,7 @@ _tmp119_ = removeAllButton; gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp118_, GTK_TYPE_BOX, GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp119_, GTK_TYPE_WIDGET, GtkWidget), FALSE, FALSE, (guint) 0); _tmp120_ = removeAllButton; - g_signal_connect_object (_tmp120_, "clicked", (GCallback) ____lambda220__gtk_button_clicked, self, 0); + g_signal_connect_object (_tmp120_, "clicked", (GCallback) ____lambda218__gtk_button_clicked, self, 0); _tmp121_ = (GtkButton*) gtk_button_new (); g_object_ref_sink (_tmp121_); posjumper = _tmp121_; @@ -8194,7 +8198,7 @@ _tmp138_ = posjumper; gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp137_, GTK_TYPE_BOX, GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp138_, GTK_TYPE_WIDGET, GtkWidget), FALSE, FALSE, (guint) 0); _tmp139_ = posjumper; - g_signal_connect_object (_tmp139_, "clicked", (GCallback) ____lambda221__gtk_button_clicked, self, 0); + g_signal_connect_object (_tmp139_, "clicked", (GCallback) ____lambda219__gtk_button_clicked, self, 0); _tmp140_ = self->priv->content_overlay; _tmp141_ = self->priv->tbx; gtk_overlay_add_overlay (_tmp140_, G_TYPE_CHECK_INSTANCE_CAST (_tmp141_, GTK_TYPE_WIDGET, GtkWidget)); @@ -8205,7 +8209,7 @@ _tmp144_ = self->priv->tbx; gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp144_, GTK_TYPE_WIDGET, GtkWidget), GTK_ALIGN_CENTER); _tmp145_ = self->priv->_mainview_box; - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp145_, G_TYPE_OBJECT, GObject), "notify::current-name", (GCallback) ____lambda222__g_object_notify, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp145_, G_TYPE_OBJECT, GObject), "notify::current-name", (GCallback) ____lambda220__g_object_notify, self, 0); _tmp146_ = xnoise_tl; self->priv->trackList = _tmp146_; _tmp147_ = xnoise_track_list_view_widget_new (self); @@ -8228,440 +8232,447 @@ _tmp156_ = self->priv->_mainview_box; _tmp157_ = self->priv->tracklistview_widget; xnoise_main_view_notebook_add_main_view (_tmp156_, G_TYPE_CHECK_INSTANCE_CAST (_tmp157_, XNOISE_TYPE_IMAIN_VIEW, XnoiseIMainView)); - _tmp158_ = xnoise_video_view_widget_new (self); + _tmp158_ = xnoise_video_view_widget_new (); g_object_ref_sink (_tmp158_); _g_object_unref0 (self->priv->videoview_widget); self->priv->videoview_widget = _tmp158_; _tmp159_ = xnoise_gst_player; _tmp160_ = _tmp159_->videoscreen; - self->videoscreen = _tmp160_; - _tmp161_ = self->priv->videoview_widget; - _tmp162_ = _tmp161_->videovbox; - _tmp163_ = _g_object_ref0 (_tmp162_); + _tmp161_ = _g_object_ref0 (_tmp160_); + _g_object_unref0 (self->videoscreen); + self->videoscreen = _tmp161_; + _tmp162_ = self->priv->videoview_widget; + _tmp163_ = _tmp162_->videovbox; + _tmp164_ = _g_object_ref0 (_tmp163_); _g_object_unref0 (self->videovbox); - self->videovbox = _tmp163_; - _tmp164_ = self->priv->_mainview_box; - _tmp165_ = self->priv->videoview_widget; - xnoise_main_view_notebook_add_main_view (_tmp164_, G_TYPE_CHECK_INSTANCE_CAST (_tmp165_, XNOISE_TYPE_IMAIN_VIEW, XnoiseIMainView)); - _tmp166_ = xnoise_lyrics_view_widget_new (self); - g_object_ref_sink (_tmp166_); + self->videovbox = _tmp164_; + _tmp165_ = self->priv->_mainview_box; + _tmp166_ = self->priv->videoview_widget; + xnoise_main_view_notebook_add_main_view (_tmp165_, G_TYPE_CHECK_INSTANCE_CAST (_tmp166_, XNOISE_TYPE_IMAIN_VIEW, XnoiseIMainView)); + _tmp167_ = xnoise_lyrics_view_widget_new (self); + g_object_ref_sink (_tmp167_); _g_object_unref0 (self->priv->lyricsview_widget); - self->priv->lyricsview_widget = _tmp166_; - _tmp167_ = self->priv->lyricsview_widget; - _tmp168_ = _tmp167_->lyricsView; - xnoise_main_window_set_lyricsView (self, _tmp168_); - _tmp169_ = self->priv->_mainview_box; - _tmp170_ = self->priv->lyricsview_widget; - xnoise_main_view_notebook_add_main_view (_tmp169_, G_TYPE_CHECK_INSTANCE_CAST (_tmp170_, XNOISE_TYPE_IMAIN_VIEW, XnoiseIMainView)); - _tmp171_ = self->priv->_mainview_box; - xnoise_main_view_notebook_select_main_view (_tmp171_, XNOISE_RESOURCES_TRACKLIST_VIEW_NAME); - _tmp172_ = gb; - _tmp173_ = gtk_builder_get_object (_tmp172_, "toolbarbox"); - _tmp174_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp173_, GTK_TYPE_BOX) ? ((GtkBox*) _tmp173_) : NULL); - toolbarbox = _tmp174_; - _tmp175_ = (GtkToolbar*) gtk_toolbar_new (); - g_object_ref_sink (_tmp175_); + self->priv->lyricsview_widget = _tmp167_; + _tmp168_ = self->priv->lyricsview_widget; + _tmp169_ = _tmp168_->lyricsView; + xnoise_main_window_set_lyricsView (self, _tmp169_); + _tmp170_ = self->priv->_mainview_box; + _tmp171_ = self->priv->lyricsview_widget; + xnoise_main_view_notebook_add_main_view (_tmp170_, G_TYPE_CHECK_INSTANCE_CAST (_tmp171_, XNOISE_TYPE_IMAIN_VIEW, XnoiseIMainView)); + _tmp172_ = self->priv->_mainview_box; + xnoise_main_view_notebook_select_main_view (_tmp172_, XNOISE_RESOURCES_TRACKLIST_VIEW_NAME); + _tmp173_ = gb; + _tmp174_ = gtk_builder_get_object (_tmp173_, "toolbarbox"); + _tmp175_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp174_, GTK_TYPE_BOX) ? ((GtkBox*) _tmp174_) : NULL); + toolbarbox = _tmp175_; + _tmp176_ = (GtkToolbar*) gtk_toolbar_new (); + g_object_ref_sink (_tmp176_); _g_object_unref0 (self->priv->main_toolbar); - self->priv->main_toolbar = _tmp175_; - _tmp176_ = self->priv->main_toolbar; - gtk_toolbar_set_style (_tmp176_, GTK_TOOLBAR_ICONS); + self->priv->main_toolbar = _tmp176_; _tmp177_ = self->priv->main_toolbar; - gtk_toolbar_set_icon_size (_tmp177_, GTK_ICON_SIZE_LARGE_TOOLBAR); + gtk_toolbar_set_style (_tmp177_, GTK_TOOLBAR_ICONS); _tmp178_ = self->priv->main_toolbar; - gtk_toolbar_set_show_arrow (_tmp178_, FALSE); - _tmp179_ = toolbarbox; - _tmp180_ = self->priv->main_toolbar; - gtk_box_pack_start (_tmp179_, G_TYPE_CHECK_INSTANCE_CAST (_tmp180_, GTK_TYPE_WIDGET, GtkWidget), TRUE, TRUE, (guint) 0); - _tmp182_ = self->priv->settings; - g_object_get (_tmp182_, "gtk-theme-name", &_tmp183_, NULL); - _tmp184_ = _tmp183_; + gtk_toolbar_set_icon_size (_tmp178_, GTK_ICON_SIZE_LARGE_TOOLBAR); + _tmp179_ = self->priv->main_toolbar; + gtk_toolbar_set_show_arrow (_tmp179_, FALSE); + _tmp180_ = toolbarbox; + _tmp181_ = self->priv->main_toolbar; + gtk_box_pack_start (_tmp180_, G_TYPE_CHECK_INSTANCE_CAST (_tmp181_, GTK_TYPE_WIDGET, GtkWidget), TRUE, TRUE, (guint) 0); + _tmp183_ = self->priv->settings; + g_object_get (_tmp183_, "gtk-theme-name", &_tmp184_, NULL); _tmp185_ = _tmp184_; - _tmp186_ = g_strcmp0 (_tmp185_, "Ambiance") == 0; - _g_free0 (_tmp185_); - if (_tmp186_) { - _tmp181_ = TRUE; + _tmp186_ = _tmp185_; + _tmp187_ = g_strcmp0 (_tmp186_, "Ambiance") == 0; + _g_free0 (_tmp186_); + if (_tmp187_) { + _tmp182_ = TRUE; } else { - GtkSettings* _tmp187_ = NULL; - gchar* _tmp188_ = NULL; + GtkSettings* _tmp188_ = NULL; gchar* _tmp189_ = NULL; gchar* _tmp190_ = NULL; - _tmp187_ = self->priv->settings; - g_object_get (_tmp187_, "gtk-theme-name", &_tmp188_, NULL); - _tmp189_ = _tmp188_; + gchar* _tmp191_ = NULL; + _tmp188_ = self->priv->settings; + g_object_get (_tmp188_, "gtk-theme-name", &_tmp189_, NULL); _tmp190_ = _tmp189_; - _tmp181_ = g_strcmp0 (_tmp190_, "Radiance") == 0; - _g_free0 (_tmp190_); - } - _tmp191_ = _tmp181_; - if (_tmp191_) { - GtkToolbar* _tmp192_ = NULL; - GtkStyleContext* _tmp193_ = NULL; - _tmp192_ = self->priv->main_toolbar; - _tmp193_ = gtk_widget_get_style_context (G_TYPE_CHECK_INSTANCE_CAST (_tmp192_, GTK_TYPE_WIDGET, GtkWidget)); - gtk_style_context_add_class (_tmp193_, GTK_STYLE_CLASS_PRIMARY_TOOLBAR); - } - _tmp194_ = self->priv->settings; - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp194_, G_TYPE_OBJECT, GObject), "notify::gtk-theme-name", (GCallback) ____lambda223__g_object_notify, self, 0); - _tmp195_ = xnoise_album_image_new (); - g_object_ref_sink (_tmp195_); - _g_object_unref0 (self->priv->albumimage); - self->priv->albumimage = _tmp195_; - _tmp196_ = gtk_tool_item_new (); + _tmp191_ = _tmp190_; + _tmp182_ = g_strcmp0 (_tmp191_, "Radiance") == 0; + _g_free0 (_tmp191_); + } + _tmp192_ = _tmp182_; + if (_tmp192_) { + GtkToolbar* _tmp193_ = NULL; + GtkStyleContext* _tmp194_ = NULL; + _tmp193_ = self->priv->main_toolbar; + _tmp194_ = gtk_widget_get_style_context (G_TYPE_CHECK_INSTANCE_CAST (_tmp193_, GTK_TYPE_WIDGET, GtkWidget)); + gtk_style_context_add_class (_tmp194_, GTK_STYLE_CLASS_PRIMARY_TOOLBAR); + } + _tmp195_ = self->priv->settings; + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp195_, G_TYPE_OBJECT, GObject), "notify::gtk-theme-name", (GCallback) ____lambda221__g_object_notify, self, 0); + _tmp196_ = xnoise_album_image_new (); g_object_ref_sink (_tmp196_); - albumimageTI = _tmp196_; - _tmp197_ = albumimageTI; - _tmp198_ = self->priv->albumimage; - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp197_, GTK_TYPE_CONTAINER, GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp198_, GTK_TYPE_WIDGET, GtkWidget)); - self->priv->aimage_timeout = (guint) 0; + _g_object_unref0 (self->priv->albumimage); + self->priv->albumimage = _tmp196_; + _tmp197_ = gtk_tool_item_new (); + g_object_ref_sink (_tmp197_); + albumimageTI = _tmp197_; + _tmp198_ = albumimageTI; _tmp199_ = self->priv->albumimage; - g_signal_connect_object (_tmp199_, "sign-selected", (GCallback) _xnoise_main_window_ai_button_clicked_xnoise_album_image_sign_selected, self, 0); - _tmp200_ = xnoise_media_soure_widget_new (self); - g_object_ref_sink (_tmp200_); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp198_, GTK_TYPE_CONTAINER, GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp199_, GTK_TYPE_WIDGET, GtkWidget)); + self->priv->aimage_timeout = (guint) 0; + _tmp200_ = self->priv->albumimage; + g_signal_connect_object (_tmp200_, "sign-selected", (GCallback) _xnoise_main_window_ai_button_clicked_xnoise_album_image_sign_selected, self, 0); + _tmp201_ = xnoise_media_soure_widget_new (self); + g_object_ref_sink (_tmp201_); _g_object_unref0 (self->msw); - self->msw = _tmp200_; - _tmp201_ = self->msw; - _vala_assert (_tmp201_ != NULL, "msw != null"); + self->msw = _tmp201_; _tmp202_ = self->msw; - _tmp203_ = xnoise_media_soure_widget_get_search_entry (_tmp202_); - _tmp204_ = _tmp203_; - _tmp205_ = _g_object_ref0 (_tmp204_); + _vala_assert (_tmp202_ != NULL, "msw != null"); + _tmp203_ = self->msw; + _tmp204_ = xnoise_media_soure_widget_get_search_entry (_tmp203_); + _tmp205_ = _tmp204_; + _tmp206_ = _g_object_ref0 (_tmp205_); _g_object_unref0 (self->search_entry); - self->search_entry = _tmp205_; - _tmp206_ = self->search_entry; - _tmp207_ = _ ("Select search with "); - _tmp208_ = g_strconcat (_tmp207_, "\n", NULL); - _tmp209_ = _tmp208_; - _tmp210_ = _ ("Remove search filter with "); - _tmp211_ = g_strconcat (_tmp209_, _tmp210_, NULL); - _tmp212_ = _tmp211_; - gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp206_, GTK_TYPE_WIDGET, GtkWidget), _tmp212_); - _g_free0 (_tmp212_); - _g_free0 (_tmp209_); - _tmp213_ = self->media_browser_box; - _tmp214_ = self->msw; - gtk_box_pack_start (_tmp213_, G_TYPE_CHECK_INSTANCE_CAST (_tmp214_, GTK_TYPE_WIDGET, GtkWidget), TRUE, TRUE, (guint) 0); - _tmp215_ = xnoise_serial_button_new (XNOISE_SERIAL_BUTTON_PRESENTATION_IMAGE); - g_object_ref_sink (_tmp215_); + self->search_entry = _tmp206_; + _tmp207_ = self->search_entry; + _tmp208_ = _ ("Select search with "); + _tmp209_ = g_strconcat (_tmp208_, "\n", NULL); + _tmp210_ = _tmp209_; + _tmp211_ = _ ("Remove search filter with "); + _tmp212_ = g_strconcat (_tmp210_, _tmp211_, NULL); + _tmp213_ = _tmp212_; + gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp207_, GTK_TYPE_WIDGET, GtkWidget), _tmp213_); + _g_free0 (_tmp213_); + _g_free0 (_tmp210_); + _tmp214_ = self->media_browser_box; + _tmp215_ = self->msw; + gtk_box_pack_start (_tmp214_, G_TYPE_CHECK_INSTANCE_CAST (_tmp215_, GTK_TYPE_WIDGET, GtkWidget), TRUE, TRUE, (guint) 0); + _tmp216_ = xnoise_serial_button_new (XNOISE_SERIAL_BUTTON_PRESENTATION_IMAGE); + g_object_ref_sink (_tmp216_); _g_object_unref0 (self->main_view_sbutton); - self->main_view_sbutton = _tmp215_; - _tmp216_ = self->main_view_sbutton; - _tmp217_ = xnoise_icon_repo; - _tmp218_ = xnoise_icon_repo_get_themed_image_icon ("view-list-symbolic", GTK_ICON_SIZE_SMALL_TOOLBAR, -1); - _tmp219_ = _tmp218_; - xnoise_serial_button_insert (_tmp216_, XNOISE_RESOURCES_TRACKLIST_VIEW_NAME, XNOISE_RESOURCES_SHOWTRACKLIST, _tmp219_); - _g_object_unref0 (_tmp219_); - _tmp220_ = self->main_view_sbutton; - _tmp221_ = xnoise_icon_repo; - _tmp222_ = xnoise_icon_repo_get_themed_image_icon ("video-display-symbolic", GTK_ICON_SIZE_SMALL_TOOLBAR, -1); - _tmp223_ = _tmp222_; - xnoise_serial_button_insert (_tmp220_, XNOISE_RESOURCES_VIDEOVIEW_NAME, XNOISE_RESOURCES_SHOWVIDEO, _tmp223_); - _g_object_unref0 (_tmp223_); - _tmp224_ = xnoise_params_get_bool_value ("use_lyrics"); - if (_tmp224_) { - XnoiseSerialButton* _tmp225_ = NULL; - XnoiseIconRepo* _tmp226_ = NULL; - GtkImage* _tmp227_ = NULL; + self->main_view_sbutton = _tmp216_; + _tmp217_ = self->main_view_sbutton; + _tmp218_ = xnoise_icon_repo; + _tmp219_ = xnoise_icon_repo_get_themed_image_icon ("view-list-symbolic", GTK_ICON_SIZE_SMALL_TOOLBAR, -1); + _tmp220_ = _tmp219_; + xnoise_serial_button_insert (_tmp217_, XNOISE_RESOURCES_TRACKLIST_VIEW_NAME, XNOISE_RESOURCES_SHOWTRACKLIST, _tmp220_); + _g_object_unref0 (_tmp220_); + _tmp221_ = self->main_view_sbutton; + _tmp222_ = xnoise_icon_repo; + _tmp223_ = xnoise_icon_repo_get_themed_image_icon ("video-display-symbolic", GTK_ICON_SIZE_SMALL_TOOLBAR, -1); + _tmp224_ = _tmp223_; + xnoise_serial_button_insert (_tmp221_, XNOISE_RESOURCES_VIDEOVIEW_NAME, XNOISE_RESOURCES_SHOWVIDEO, _tmp224_); + _g_object_unref0 (_tmp224_); + _tmp225_ = xnoise_params_get_bool_value ("use_lyrics"); + if (_tmp225_) { + XnoiseSerialButton* _tmp226_ = NULL; + XnoiseIconRepo* _tmp227_ = NULL; GtkImage* _tmp228_ = NULL; - _tmp225_ = self->main_view_sbutton; - _tmp226_ = xnoise_icon_repo; - _tmp227_ = xnoise_icon_repo_get_themed_image_icon ("insert-text-symbolic", GTK_ICON_SIZE_SMALL_TOOLBAR, -1); - _tmp228_ = _tmp227_; - xnoise_serial_button_insert (_tmp225_, XNOISE_RESOURCES_LYRICS_VIEW_NAME, XNOISE_RESOURCES_SHOWLYRICS, _tmp228_); - _g_object_unref0 (_tmp228_); - } - _tmp229_ = self->main_view_sbutton; - g_signal_connect_object (_tmp229_, "sign-selected", (GCallback) _xnoise_main_window_on_serial_button_clicked_xnoise_serial_button_sign_selected, self, 0); - _tmp230_ = gtk_tool_item_new (); - g_object_ref_sink (_tmp230_); - serialTI = _tmp230_; - _tmp231_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + GtkImage* _tmp229_ = NULL; + _tmp226_ = self->main_view_sbutton; + _tmp227_ = xnoise_icon_repo; + _tmp228_ = xnoise_icon_repo_get_themed_image_icon ("insert-text-symbolic", GTK_ICON_SIZE_SMALL_TOOLBAR, -1); + _tmp229_ = _tmp228_; + xnoise_serial_button_insert (_tmp226_, XNOISE_RESOURCES_LYRICS_VIEW_NAME, XNOISE_RESOURCES_SHOWLYRICS, _tmp229_); + _g_object_unref0 (_tmp229_); + } + _tmp230_ = self->main_view_sbutton; + g_signal_connect_object (_tmp230_, "sign-selected", (GCallback) _xnoise_main_window_on_serial_button_clicked_xnoise_serial_button_sign_selected, self, 0); + _tmp231_ = gtk_tool_item_new (); g_object_ref_sink (_tmp231_); - mvsb_box = _tmp231_; - _tmp232_ = mvsb_box; - _tmp233_ = (GtkDrawingArea*) gtk_drawing_area_new (); + serialTI = _tmp231_; + _tmp232_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + g_object_ref_sink (_tmp232_); + mvsb_box = _tmp232_; + _tmp233_ = (GtkEventBox*) gtk_event_box_new (); g_object_ref_sink (_tmp233_); - _tmp234_ = _tmp233_; - gtk_box_pack_start (_tmp232_, G_TYPE_CHECK_INSTANCE_CAST (_tmp234_, GTK_TYPE_WIDGET, GtkWidget), TRUE, TRUE, (guint) 0); - _g_object_unref0 (_tmp234_); + ebs = _tmp233_; + _tmp234_ = ebs; + gtk_event_box_set_visible_window (_tmp234_, FALSE); _tmp235_ = mvsb_box; - _tmp236_ = self->main_view_sbutton; + _tmp236_ = ebs; gtk_box_pack_start (_tmp235_, G_TYPE_CHECK_INSTANCE_CAST (_tmp236_, GTK_TYPE_WIDGET, GtkWidget), TRUE, TRUE, (guint) 0); _tmp237_ = mvsb_box; - _tmp238_ = (GtkDrawingArea*) gtk_drawing_area_new (); - g_object_ref_sink (_tmp238_); - _tmp239_ = _tmp238_; - gtk_box_pack_start (_tmp237_, G_TYPE_CHECK_INSTANCE_CAST (_tmp239_, GTK_TYPE_WIDGET, GtkWidget), TRUE, TRUE, (guint) 0); - _g_object_unref0 (_tmp239_); - _tmp240_ = serialTI; + _tmp238_ = self->main_view_sbutton; + gtk_box_pack_start (_tmp237_, G_TYPE_CHECK_INSTANCE_CAST (_tmp238_, GTK_TYPE_WIDGET, GtkWidget), TRUE, TRUE, (guint) 0); + _tmp239_ = (GtkEventBox*) gtk_event_box_new (); + g_object_ref_sink (_tmp239_); + _g_object_unref0 (ebs); + ebs = _tmp239_; + _tmp240_ = ebs; + gtk_event_box_set_visible_window (_tmp240_, FALSE); _tmp241_ = mvsb_box; - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp240_, GTK_TYPE_CONTAINER, GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp241_, GTK_TYPE_WIDGET, GtkWidget)); - _tmp242_ = xnoise_gst_player; - _tmp243_ = xnoise_track_infobar_new (_tmp242_); - g_object_ref_sink (_tmp243_); + _tmp242_ = ebs; + gtk_box_pack_start (_tmp241_, G_TYPE_CHECK_INSTANCE_CAST (_tmp242_, GTK_TYPE_WIDGET, GtkWidget), TRUE, TRUE, (guint) 0); + _tmp243_ = serialTI; + _tmp244_ = mvsb_box; + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp243_, GTK_TYPE_CONTAINER, GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp244_, GTK_TYPE_WIDGET, GtkWidget)); + _tmp245_ = xnoise_gst_player; + _tmp246_ = xnoise_track_infobar_new (_tmp245_); + g_object_ref_sink (_tmp246_); _g_object_unref0 (self->track_infobar); - self->track_infobar = _tmp243_; - _tmp244_ = self->track_infobar; - gtk_tool_item_set_expand (G_TYPE_CHECK_INSTANCE_CAST (_tmp244_, GTK_TYPE_TOOL_ITEM, GtkToolItem), TRUE); - _tmp245_ = self->priv->config_button_menu; - _tmp246_ = _ ("Show application main menu"); - _tmp247_ = xnoise_app_menu_button_new (_tmp245_, _tmp246_); - g_object_ref_sink (_tmp247_); + self->track_infobar = _tmp246_; + _tmp247_ = self->track_infobar; + gtk_tool_item_set_expand (G_TYPE_CHECK_INSTANCE_CAST (_tmp247_, GTK_TYPE_TOOL_ITEM, GtkToolItem), TRUE); + _tmp248_ = self->priv->config_button_menu; + _tmp249_ = _ ("Show application main menu"); + _tmp250_ = xnoise_app_menu_button_new (_tmp248_, _tmp249_); + g_object_ref_sink (_tmp250_); _g_object_unref0 (self->priv->app_menu_button); - self->priv->app_menu_button = _tmp247_; - _tmp248_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new (); - g_object_ref_sink (_tmp248_); - separ = _tmp248_; - _tmp249_ = separ; - gtk_separator_tool_item_set_draw (_tmp249_, FALSE); - _tmp250_ = self->priv->main_toolbar; - _tmp251_ = play_back_control_bar_new (); + self->priv->app_menu_button = _tmp250_; + _tmp251_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new (); g_object_ref_sink (_tmp251_); - _tmp252_ = _tmp251_; - gtk_toolbar_insert (_tmp250_, G_TYPE_CHECK_INSTANCE_CAST (_tmp252_, GTK_TYPE_TOOL_ITEM, GtkToolItem), -1); - _g_object_unref0 (_tmp252_); + separ = _tmp251_; + _tmp252_ = separ; + gtk_separator_tool_item_set_draw (_tmp252_, FALSE); _tmp253_ = self->priv->main_toolbar; - _tmp254_ = albumimageTI; - gtk_toolbar_insert (_tmp253_, _tmp254_, -1); - _tmp255_ = self->priv->main_toolbar; - _tmp256_ = separ; - gtk_toolbar_insert (_tmp255_, G_TYPE_CHECK_INSTANCE_CAST (_tmp256_, GTK_TYPE_TOOL_ITEM, GtkToolItem), -1); - _tmp257_ = self->priv->main_toolbar; - _tmp258_ = self->track_infobar; - gtk_toolbar_insert (_tmp257_, G_TYPE_CHECK_INSTANCE_CAST (_tmp258_, GTK_TYPE_TOOL_ITEM, GtkToolItem), -1); - _tmp259_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new (); - g_object_ref_sink (_tmp259_); + _tmp254_ = play_back_control_bar_new (); + g_object_ref_sink (_tmp254_); + _tmp255_ = _tmp254_; + gtk_toolbar_insert (_tmp253_, G_TYPE_CHECK_INSTANCE_CAST (_tmp255_, GTK_TYPE_TOOL_ITEM, GtkToolItem), -1); + _g_object_unref0 (_tmp255_); + _tmp256_ = self->priv->main_toolbar; + _tmp257_ = albumimageTI; + gtk_toolbar_insert (_tmp256_, _tmp257_, -1); + _tmp258_ = self->priv->main_toolbar; + _tmp259_ = separ; + gtk_toolbar_insert (_tmp258_, G_TYPE_CHECK_INSTANCE_CAST (_tmp259_, GTK_TYPE_TOOL_ITEM, GtkToolItem), -1); + _tmp260_ = self->priv->main_toolbar; + _tmp261_ = self->track_infobar; + gtk_toolbar_insert (_tmp260_, G_TYPE_CHECK_INSTANCE_CAST (_tmp261_, GTK_TYPE_TOOL_ITEM, GtkToolItem), -1); + _tmp262_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new (); + g_object_ref_sink (_tmp262_); _g_object_unref0 (separ); - separ = _tmp259_; - _tmp260_ = separ; - gtk_separator_tool_item_set_draw (_tmp260_, FALSE); - _tmp261_ = self->priv->main_toolbar; - _tmp262_ = separ; - gtk_toolbar_insert (_tmp261_, G_TYPE_CHECK_INSTANCE_CAST (_tmp262_, GTK_TYPE_TOOL_ITEM, GtkToolItem), -1); - _tmp263_ = self->priv->main_toolbar; - _tmp264_ = serialTI; - gtk_toolbar_insert (_tmp263_, _tmp264_, -1); - _tmp265_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new (); - g_object_ref_sink (_tmp265_); + separ = _tmp262_; + _tmp263_ = separ; + gtk_separator_tool_item_set_draw (_tmp263_, FALSE); + _tmp264_ = self->priv->main_toolbar; + _tmp265_ = separ; + gtk_toolbar_insert (_tmp264_, G_TYPE_CHECK_INSTANCE_CAST (_tmp265_, GTK_TYPE_TOOL_ITEM, GtkToolItem), -1); + _tmp266_ = self->priv->main_toolbar; + _tmp267_ = serialTI; + gtk_toolbar_insert (_tmp266_, _tmp267_, -1); + _tmp268_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new (); + g_object_ref_sink (_tmp268_); _g_object_unref0 (separ); - separ = _tmp265_; - _tmp266_ = separ; - gtk_separator_tool_item_set_draw (_tmp266_, FALSE); - _tmp267_ = self->priv->main_toolbar; - _tmp268_ = separ; - gtk_toolbar_insert (_tmp267_, G_TYPE_CHECK_INSTANCE_CAST (_tmp268_, GTK_TYPE_TOOL_ITEM, GtkToolItem), -1); - _tmp269_ = self->priv->main_toolbar; - _tmp270_ = self->priv->volume_slider; - gtk_toolbar_insert (_tmp269_, G_TYPE_CHECK_INSTANCE_CAST (_tmp270_, GTK_TYPE_TOOL_ITEM, GtkToolItem), -1); - _tmp271_ = self->priv->main_toolbar; - _tmp272_ = self->priv->app_menu_button; - gtk_toolbar_insert (_tmp271_, G_TYPE_CHECK_INSTANCE_CAST (_tmp272_, GTK_TYPE_TOOL_ITEM, GtkToolItem), -1); - _tmp273_ = self->priv->main_toolbar; - g_object_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp273_, GTK_TYPE_WIDGET, GtkWidget), "can-focus", FALSE, NULL); - _tmp274_ = self->search_entry; - g_signal_connect_object (_tmp274_, "icon-press", (GCallback) ____lambda225__gtk_entry_icon_press, self, 0); - _tmp275_ = xnoise_album_art_cell_area_new (); - g_object_ref_sink (_tmp275_); - _tmp276_ = _tmp275_; - _tmp277_ = xnoise_album_art_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp276_, GTK_TYPE_CELL_AREA, GtkCellArea)); - g_object_ref_sink (_tmp277_); - _g_object_unref0 (self->album_art_view); - self->album_art_view = _tmp277_; - _g_object_unref0 (_tmp276_); - _tmp278_ = (GtkOverlay*) gtk_overlay_new (); + separ = _tmp268_; + _tmp269_ = separ; + gtk_separator_tool_item_set_draw (_tmp269_, FALSE); + _tmp270_ = self->priv->main_toolbar; + _tmp271_ = separ; + gtk_toolbar_insert (_tmp270_, G_TYPE_CHECK_INSTANCE_CAST (_tmp271_, GTK_TYPE_TOOL_ITEM, GtkToolItem), -1); + _tmp272_ = self->priv->main_toolbar; + _tmp273_ = self->priv->volume_slider; + gtk_toolbar_insert (_tmp272_, G_TYPE_CHECK_INSTANCE_CAST (_tmp273_, GTK_TYPE_TOOL_ITEM, GtkToolItem), -1); + _tmp274_ = self->priv->main_toolbar; + _tmp275_ = self->priv->app_menu_button; + gtk_toolbar_insert (_tmp274_, G_TYPE_CHECK_INSTANCE_CAST (_tmp275_, GTK_TYPE_TOOL_ITEM, GtkToolItem), -1); + _tmp276_ = self->priv->main_toolbar; + g_object_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp276_, GTK_TYPE_WIDGET, GtkWidget), "can-focus", FALSE, NULL); + _tmp277_ = self->search_entry; + g_signal_connect_object (_tmp277_, "icon-press", (GCallback) ____lambda223__gtk_entry_icon_press, self, 0); + _tmp278_ = xnoise_album_art_cell_area_new (); g_object_ref_sink (_tmp278_); - album_art_overlay = _tmp278_; - _tmp279_ = (GtkSpinner*) gtk_spinner_new (); - g_object_ref_sink (_tmp279_); - _data96_->spinner = _tmp279_; - _tmp280_ = _data96_->spinner; - gtk_spinner_start (_tmp280_); - _tmp281_ = _data96_->spinner; - gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp281_, GTK_TYPE_WIDGET, GtkWidget), 160, 160); - _tmp282_ = album_art_overlay; + _tmp279_ = _tmp278_; + _tmp280_ = xnoise_album_art_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp279_, GTK_TYPE_CELL_AREA, GtkCellArea)); + g_object_ref_sink (_tmp280_); + _g_object_unref0 (self->album_art_view); + self->album_art_view = _tmp280_; + _g_object_unref0 (_tmp279_); + _tmp281_ = (GtkOverlay*) gtk_overlay_new (); + g_object_ref_sink (_tmp281_); + album_art_overlay = _tmp281_; + _tmp282_ = (GtkSpinner*) gtk_spinner_new (); + g_object_ref_sink (_tmp282_); + _data96_->spinner = _tmp282_; _tmp283_ = _data96_->spinner; - gtk_overlay_add_overlay (_tmp282_, G_TYPE_CHECK_INSTANCE_CAST (_tmp283_, GTK_TYPE_WIDGET, GtkWidget)); + gtk_spinner_start (_tmp283_); _tmp284_ = _data96_->spinner; - gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp284_, GTK_TYPE_WIDGET, GtkWidget), GTK_ALIGN_CENTER); - _tmp285_ = _data96_->spinner; - gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp285_, GTK_TYPE_WIDGET, GtkWidget), GTK_ALIGN_CENTER); + gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp284_, GTK_TYPE_WIDGET, GtkWidget), 160, 160); + _tmp285_ = album_art_overlay; _tmp286_ = _data96_->spinner; - gtk_widget_set_no_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp286_, GTK_TYPE_WIDGET, GtkWidget), TRUE); - _tmp287_ = (GtkButton*) gtk_button_new (); - g_object_ref_sink (_tmp287_); - album_art_back_button = _tmp287_; - _tmp289_ = xnoise_main_window_is_rtl (); - if (_tmp289_) { - _tmp288_ = "edit-undo-rtl-symbolic"; + gtk_overlay_add_overlay (_tmp285_, G_TYPE_CHECK_INSTANCE_CAST (_tmp286_, GTK_TYPE_WIDGET, GtkWidget)); + _tmp287_ = _data96_->spinner; + gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp287_, GTK_TYPE_WIDGET, GtkWidget), GTK_ALIGN_CENTER); + _tmp288_ = _data96_->spinner; + gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp288_, GTK_TYPE_WIDGET, GtkWidget), GTK_ALIGN_CENTER); + _tmp289_ = _data96_->spinner; + gtk_widget_set_no_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp289_, GTK_TYPE_WIDGET, GtkWidget), TRUE); + _tmp290_ = (GtkButton*) gtk_button_new (); + g_object_ref_sink (_tmp290_); + album_art_back_button = _tmp290_; + _tmp292_ = xnoise_main_window_is_rtl (); + if (_tmp292_) { + _tmp291_ = "edit-undo-rtl-symbolic"; } else { - _tmp288_ = "edit-undo-symbolic"; + _tmp291_ = "edit-undo-symbolic"; } - _tmp290_ = album_art_back_button; - _tmp291_ = xnoise_icon_repo; - _tmp292_ = _tmp288_; - _tmp293_ = xnoise_icon_repo_get_themed_image_icon (_tmp292_, GTK_ICON_SIZE_LARGE_TOOLBAR, -1); - _tmp294_ = _tmp293_; - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp290_, GTK_TYPE_CONTAINER, GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp294_, GTK_TYPE_WIDGET, GtkWidget)); - _g_object_unref0 (_tmp294_); - _tmp295_ = album_art_back_button; - g_signal_connect_object (_tmp295_, "clicked", (GCallback) ____lambda226__gtk_button_clicked, self, 0); - _tmp296_ = album_art_back_button; - _tmp297_ = _ ("Return to normal view"); - gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp296_, GTK_TYPE_WIDGET, GtkWidget), _tmp297_); - _tmp298_ = album_art_overlay; + _tmp293_ = album_art_back_button; + _tmp294_ = xnoise_icon_repo; + _tmp295_ = _tmp291_; + _tmp296_ = xnoise_icon_repo_get_themed_image_icon (_tmp295_, GTK_ICON_SIZE_LARGE_TOOLBAR, -1); + _tmp297_ = _tmp296_; + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp293_, GTK_TYPE_CONTAINER, GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp297_, GTK_TYPE_WIDGET, GtkWidget)); + _g_object_unref0 (_tmp297_); + _tmp298_ = album_art_back_button; + g_signal_connect_object (_tmp298_, "clicked", (GCallback) ____lambda224__gtk_button_clicked, self, 0); _tmp299_ = album_art_back_button; - gtk_overlay_add_overlay (_tmp298_, G_TYPE_CHECK_INSTANCE_CAST (_tmp299_, GTK_TYPE_WIDGET, GtkWidget)); - _tmp300_ = album_art_back_button; - gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp300_, GTK_TYPE_WIDGET, GtkWidget), GTK_ALIGN_END); - _tmp301_ = album_art_back_button; - gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp301_, GTK_TYPE_WIDGET, GtkWidget), GTK_ALIGN_END); - _tmp302_ = self->album_art_view; - gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp302_, GTK_TYPE_WIDGET, GtkWidget)); - _tmp303_ = self->album_art_view; - g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp303_, G_TYPE_OBJECT, GObject), "notify", (GCallback) ____lambda227__g_object_notify, block96_data_ref (_data96_), (GClosureNotify) block96_data_unref, 0); - _tmp304_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); - g_object_ref_sink (_tmp304_); - aa_contr_bx = _tmp304_; - _tmp305_ = self->msw; - _tmp306_ = xnoise_media_soure_widget_get_search_entry (_tmp305_); - _tmp307_ = _tmp306_; - _tmp308_ = gtk_entry_get_buffer (_tmp307_); - _tmp309_ = _g_object_ref0 (_tmp308_); - _data96_->entry_buffer = _tmp309_; - _tmp310_ = self->msw; - _tmp311_ = xnoise_media_soure_widget_get_search_entry (_tmp310_); - _tmp312_ = _tmp311_; - _tmp313_ = gtk_widget_get_style_context (G_TYPE_CHECK_INSTANCE_CAST (_tmp312_, GTK_TYPE_WIDGET, GtkWidget)); - gtk_style_context_remove_class (_tmp313_, GTK_STYLE_CLASS_SIDEBAR); - _tmp314_ = self->msw; - _tmp315_ = xnoise_media_soure_widget_get_search_entry (_tmp314_); - _tmp316_ = _tmp315_; - _tmp317_ = gtk_widget_get_style_context (G_TYPE_CHECK_INSTANCE_CAST (_tmp316_, GTK_TYPE_WIDGET, GtkWidget)); - gtk_style_context_add_class (_tmp317_, GTK_STYLE_CLASS_ENTRY); - _tmp318_ = _data96_->entry_buffer; - g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp318_, G_TYPE_OBJECT, GObject), "notify::text", (GCallback) ____lambda228__g_object_notify, block96_data_ref (_data96_), (GClosureNotify) block96_data_unref, 0); - _tmp319_ = _data96_->entry_buffer; - _tmp320_ = (GtkEntry*) gtk_entry_new_with_buffer (_tmp319_); - g_object_ref_sink (_tmp320_); + _tmp300_ = _ ("Return to normal view"); + gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp299_, GTK_TYPE_WIDGET, GtkWidget), _tmp300_); + _tmp301_ = album_art_overlay; + _tmp302_ = album_art_back_button; + gtk_overlay_add_overlay (_tmp301_, G_TYPE_CHECK_INSTANCE_CAST (_tmp302_, GTK_TYPE_WIDGET, GtkWidget)); + _tmp303_ = album_art_back_button; + gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp303_, GTK_TYPE_WIDGET, GtkWidget), GTK_ALIGN_END); + _tmp304_ = album_art_back_button; + gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp304_, GTK_TYPE_WIDGET, GtkWidget), GTK_ALIGN_END); + _tmp305_ = self->album_art_view; + gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp305_, GTK_TYPE_WIDGET, GtkWidget)); + _tmp306_ = self->album_art_view; + g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp306_, G_TYPE_OBJECT, GObject), "notify", (GCallback) ____lambda225__g_object_notify, block96_data_ref (_data96_), (GClosureNotify) block96_data_unref, 0); + _tmp307_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); + g_object_ref_sink (_tmp307_); + aa_contr_bx = _tmp307_; + _tmp308_ = self->msw; + _tmp309_ = xnoise_media_soure_widget_get_search_entry (_tmp308_); + _tmp310_ = _tmp309_; + _tmp311_ = gtk_entry_get_buffer (_tmp310_); + _tmp312_ = _g_object_ref0 (_tmp311_); + _data96_->entry_buffer = _tmp312_; + _tmp313_ = self->msw; + _tmp314_ = xnoise_media_soure_widget_get_search_entry (_tmp313_); + _tmp315_ = _tmp314_; + _tmp316_ = gtk_widget_get_style_context (G_TYPE_CHECK_INSTANCE_CAST (_tmp315_, GTK_TYPE_WIDGET, GtkWidget)); + gtk_style_context_remove_class (_tmp316_, GTK_STYLE_CLASS_SIDEBAR); + _tmp317_ = self->msw; + _tmp318_ = xnoise_media_soure_widget_get_search_entry (_tmp317_); + _tmp319_ = _tmp318_; + _tmp320_ = gtk_widget_get_style_context (G_TYPE_CHECK_INSTANCE_CAST (_tmp319_, GTK_TYPE_WIDGET, GtkWidget)); + gtk_style_context_add_class (_tmp320_, GTK_STYLE_CLASS_ENTRY); + _tmp321_ = _data96_->entry_buffer; + g_signal_connect_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp321_, G_TYPE_OBJECT, GObject), "notify::text", (GCallback) ____lambda226__g_object_notify, block96_data_ref (_data96_), (GClosureNotify) block96_data_unref, 0); + _tmp322_ = _data96_->entry_buffer; + _tmp323_ = (GtkEntry*) gtk_entry_new_with_buffer (_tmp322_); + g_object_ref_sink (_tmp323_); _g_object_unref0 (self->priv->album_search_entry); - self->priv->album_search_entry = _tmp320_; - _tmp321_ = self->priv->album_search_entry; - gtk_entry_set_width_chars (_tmp321_, 24); - _tmp322_ = self->priv->album_search_entry; - g_object_set (_tmp322_, "secondary-icon-stock", GTK_STOCK_CLEAR, NULL); - _tmp323_ = self->priv->album_search_entry; - gtk_entry_set_icon_activatable (_tmp323_, GTK_ENTRY_ICON_PRIMARY, FALSE); + self->priv->album_search_entry = _tmp323_; _tmp324_ = self->priv->album_search_entry; - gtk_entry_set_icon_activatable (_tmp324_, GTK_ENTRY_ICON_SECONDARY, TRUE); + gtk_entry_set_width_chars (_tmp324_, 24); _tmp325_ = self->priv->album_search_entry; - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp325_, GTK_TYPE_WIDGET, GtkWidget), TRUE); + g_object_set (_tmp325_, "secondary-icon-stock", GTK_STOCK_CLEAR, NULL); _tmp326_ = self->priv->album_search_entry; - _tmp327_ = _ ("Select search with "); - _tmp328_ = g_strconcat (_tmp327_, "\n", NULL); - _tmp329_ = _tmp328_; - _tmp330_ = _ ("Remove search filter with "); - _tmp331_ = g_strconcat (_tmp329_, _tmp330_, NULL); + gtk_entry_set_icon_activatable (_tmp326_, GTK_ENTRY_ICON_PRIMARY, FALSE); + _tmp327_ = self->priv->album_search_entry; + gtk_entry_set_icon_activatable (_tmp327_, GTK_ENTRY_ICON_SECONDARY, TRUE); + _tmp328_ = self->priv->album_search_entry; + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp328_, GTK_TYPE_WIDGET, GtkWidget), TRUE); + _tmp329_ = self->priv->album_search_entry; + _tmp330_ = _ ("Select search with "); + _tmp331_ = g_strconcat (_tmp330_, "\n", NULL); _tmp332_ = _tmp331_; - gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp326_, GTK_TYPE_WIDGET, GtkWidget), _tmp332_); + _tmp333_ = _ ("Remove search filter with "); + _tmp334_ = g_strconcat (_tmp332_, _tmp333_, NULL); + _tmp335_ = _tmp334_; + gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp329_, GTK_TYPE_WIDGET, GtkWidget), _tmp335_); + _g_free0 (_tmp335_); _g_free0 (_tmp332_); - _g_free0 (_tmp329_); - _tmp333_ = self->priv->album_search_entry; - _tmp334_ = _ ("Search..."); - gtk_entry_set_placeholder_text (_tmp333_, _tmp334_); - _tmp335_ = self->priv->album_search_entry; - g_signal_connect_object (_tmp335_, "icon-press", (GCallback) ____lambda229__gtk_entry_icon_press, self, 0); - _tmp336_ = aa_contr_bx; - _tmp337_ = self->priv->album_search_entry; - gtk_box_pack_start (_tmp336_, G_TYPE_CHECK_INSTANCE_CAST (_tmp337_, GTK_TYPE_WIDGET, GtkWidget), FALSE, FALSE, (guint) 0); - _tmp338_ = xnoise_serial_button_new (XNOISE_SERIAL_BUTTON_PRESENTATION_TEXT); - g_object_ref_sink (_tmp338_); + _tmp336_ = self->priv->album_search_entry; + _tmp337_ = _ ("Search..."); + gtk_entry_set_placeholder_text (_tmp336_, _tmp337_); + _tmp338_ = self->priv->album_search_entry; + g_signal_connect_object (_tmp338_, "icon-press", (GCallback) ____lambda227__gtk_entry_icon_press, self, 0); + _tmp339_ = aa_contr_bx; + _tmp340_ = self->priv->album_search_entry; + gtk_box_pack_start (_tmp339_, G_TYPE_CHECK_INSTANCE_CAST (_tmp340_, GTK_TYPE_WIDGET, GtkWidget), FALSE, FALSE, (guint) 0); + _tmp341_ = xnoise_serial_button_new (XNOISE_SERIAL_BUTTON_PRESENTATION_TEXT); + g_object_ref_sink (_tmp341_); _g_object_unref0 (self->album_view_sorting); - self->album_view_sorting = _tmp338_; - _tmp339_ = self->album_view_sorting; - _tmp340_ = _ ("Artist"); - xnoise_serial_button_insert (_tmp339_, "ARTIST", _tmp340_, NULL); - _tmp341_ = self->album_view_sorting; - _tmp342_ = _ ("Album"); - xnoise_serial_button_insert (_tmp341_, "ALBUM", _tmp342_, NULL); - _tmp343_ = self->album_view_sorting; - _tmp344_ = _ ("Genre"); - xnoise_serial_button_insert (_tmp343_, "GENRE", _tmp344_, NULL); - _tmp345_ = self->album_view_sorting; - _tmp346_ = _ ("Year"); - xnoise_serial_button_insert (_tmp345_, "YEAR", _tmp346_, NULL); - _tmp347_ = (GtkLabel*) gtk_label_new (""); - g_object_ref_sink (_tmp347_); - dummy = _tmp347_; - _tmp348_ = aa_contr_bx; - _tmp349_ = dummy; - gtk_box_pack_start (_tmp348_, G_TYPE_CHECK_INSTANCE_CAST (_tmp349_, GTK_TYPE_WIDGET, GtkWidget), TRUE, TRUE, (guint) 0); - _tmp350_ = aa_contr_bx; - _tmp351_ = self->album_view_sorting; - gtk_box_pack_start (_tmp350_, G_TYPE_CHECK_INSTANCE_CAST (_tmp351_, GTK_TYPE_WIDGET, GtkWidget), FALSE, FALSE, (guint) 1); - _tmp352_ = xnoise_serial_button_new (XNOISE_SERIAL_BUTTON_PRESENTATION_IMAGE); - g_object_ref_sink (_tmp352_); - _g_object_unref0 (self->album_view_direction); - self->album_view_direction = _tmp352_; - _tmp353_ = self->album_view_direction; - _tmp354_ = _ ("Ascending"); - _tmp355_ = (GtkImage*) gtk_image_new_from_icon_name ("go-up-symbolic", GTK_ICON_SIZE_MENU); + self->album_view_sorting = _tmp341_; + _tmp342_ = self->album_view_sorting; + _tmp343_ = _ ("Artist"); + xnoise_serial_button_insert (_tmp342_, "ARTIST", _tmp343_, NULL); + _tmp344_ = self->album_view_sorting; + _tmp345_ = _ ("Album"); + xnoise_serial_button_insert (_tmp344_, "ALBUM", _tmp345_, NULL); + _tmp346_ = self->album_view_sorting; + _tmp347_ = _ ("Genre"); + xnoise_serial_button_insert (_tmp346_, "GENRE", _tmp347_, NULL); + _tmp348_ = self->album_view_sorting; + _tmp349_ = _ ("Year"); + xnoise_serial_button_insert (_tmp348_, "YEAR", _tmp349_, NULL); + _tmp350_ = (GtkLabel*) gtk_label_new (""); + g_object_ref_sink (_tmp350_); + dummy = _tmp350_; + _tmp351_ = aa_contr_bx; + _tmp352_ = dummy; + gtk_box_pack_start (_tmp351_, G_TYPE_CHECK_INSTANCE_CAST (_tmp352_, GTK_TYPE_WIDGET, GtkWidget), TRUE, TRUE, (guint) 0); + _tmp353_ = aa_contr_bx; + _tmp354_ = self->album_view_sorting; + gtk_box_pack_start (_tmp353_, G_TYPE_CHECK_INSTANCE_CAST (_tmp354_, GTK_TYPE_WIDGET, GtkWidget), FALSE, FALSE, (guint) 1); + _tmp355_ = xnoise_serial_button_new (XNOISE_SERIAL_BUTTON_PRESENTATION_IMAGE); g_object_ref_sink (_tmp355_); - _tmp356_ = _tmp355_; - xnoise_serial_button_insert (_tmp353_, "ASC", _tmp354_, _tmp356_); - _g_object_unref0 (_tmp356_); - _tmp357_ = self->album_view_direction; - _tmp358_ = _ ("Descending"); - _tmp359_ = (GtkImage*) gtk_image_new_from_icon_name ("go-down-symbolic", GTK_ICON_SIZE_MENU); - g_object_ref_sink (_tmp359_); - _tmp360_ = _tmp359_; - xnoise_serial_button_insert (_tmp357_, "DESC", _tmp358_, _tmp360_); - _g_object_unref0 (_tmp360_); - _tmp361_ = aa_contr_bx; - _tmp362_ = self->album_view_direction; - gtk_box_pack_start (_tmp361_, G_TYPE_CHECK_INSTANCE_CAST (_tmp362_, GTK_TYPE_WIDGET, GtkWidget), FALSE, FALSE, (guint) 1); - _tmp363_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); - g_object_ref_sink (_tmp363_); - aabx = _tmp363_; - _tmp364_ = aabx; - _tmp365_ = aa_contr_bx; - gtk_box_pack_start (_tmp364_, G_TYPE_CHECK_INSTANCE_CAST (_tmp365_, GTK_TYPE_WIDGET, GtkWidget), FALSE, FALSE, (guint) 0); - _tmp366_ = (GtkScrolledWindow*) gtk_scrolled_window_new (NULL, NULL); + _g_object_unref0 (self->album_view_direction); + self->album_view_direction = _tmp355_; + _tmp356_ = self->album_view_direction; + _tmp357_ = _ ("Ascending"); + _tmp358_ = (GtkImage*) gtk_image_new_from_icon_name ("go-up-symbolic", GTK_ICON_SIZE_MENU); + g_object_ref_sink (_tmp358_); + _tmp359_ = _tmp358_; + xnoise_serial_button_insert (_tmp356_, "ASC", _tmp357_, _tmp359_); + _g_object_unref0 (_tmp359_); + _tmp360_ = self->album_view_direction; + _tmp361_ = _ ("Descending"); + _tmp362_ = (GtkImage*) gtk_image_new_from_icon_name ("go-down-symbolic", GTK_ICON_SIZE_MENU); + g_object_ref_sink (_tmp362_); + _tmp363_ = _tmp362_; + xnoise_serial_button_insert (_tmp360_, "DESC", _tmp361_, _tmp363_); + _g_object_unref0 (_tmp363_); + _tmp364_ = aa_contr_bx; + _tmp365_ = self->album_view_direction; + gtk_box_pack_start (_tmp364_, G_TYPE_CHECK_INSTANCE_CAST (_tmp365_, GTK_TYPE_WIDGET, GtkWidget), FALSE, FALSE, (guint) 1); + _tmp366_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); g_object_ref_sink (_tmp366_); - aasw = _tmp366_; - _tmp367_ = aasw; - gtk_scrolled_window_set_shadow_type (_tmp367_, GTK_SHADOW_IN); - _tmp368_ = aasw; - _tmp369_ = self->album_art_view; - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp368_, GTK_TYPE_CONTAINER, GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp369_, GTK_TYPE_WIDGET, GtkWidget)); - _tmp370_ = album_art_overlay; + aabx = _tmp366_; + _tmp367_ = aabx; + _tmp368_ = aa_contr_bx; + gtk_box_pack_start (_tmp367_, G_TYPE_CHECK_INSTANCE_CAST (_tmp368_, GTK_TYPE_WIDGET, GtkWidget), FALSE, FALSE, (guint) 0); + _tmp369_ = (GtkScrolledWindow*) gtk_scrolled_window_new (NULL, NULL); + g_object_ref_sink (_tmp369_); + aasw = _tmp369_; + _tmp370_ = aasw; + gtk_scrolled_window_set_shadow_type (_tmp370_, GTK_SHADOW_IN); _tmp371_ = aasw; - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp370_, GTK_TYPE_CONTAINER, GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp371_, GTK_TYPE_WIDGET, GtkWidget)); - _tmp372_ = aabx; + _tmp372_ = self->album_art_view; + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp371_, GTK_TYPE_CONTAINER, GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp372_, GTK_TYPE_WIDGET, GtkWidget)); _tmp373_ = album_art_overlay; - gtk_box_pack_start (_tmp372_, G_TYPE_CHECK_INSTANCE_CAST (_tmp373_, GTK_TYPE_WIDGET, GtkWidget), TRUE, TRUE, (guint) 0); - _tmp374_ = self->priv->bottom_notebook; + _tmp374_ = aasw; + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp373_, GTK_TYPE_CONTAINER, GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp374_, GTK_TYPE_WIDGET, GtkWidget)); _tmp375_ = aabx; - gtk_notebook_append_page (_tmp374_, G_TYPE_CHECK_INSTANCE_CAST (_tmp375_, GTK_TYPE_WIDGET, GtkWidget), NULL); - _tmp376_ = (GtkWindow*) gtk_window_new (GTK_WINDOW_TOPLEVEL); - g_object_ref_sink (_tmp376_); + _tmp376_ = album_art_overlay; + gtk_box_pack_start (_tmp375_, G_TYPE_CHECK_INSTANCE_CAST (_tmp376_, GTK_TYPE_WIDGET, GtkWidget), TRUE, TRUE, (guint) 0); + _tmp377_ = self->priv->bottom_notebook; + _tmp378_ = aabx; + gtk_notebook_append_page (_tmp377_, G_TYPE_CHECK_INSTANCE_CAST (_tmp378_, GTK_TYPE_WIDGET, GtkWidget), NULL); + _tmp379_ = (GtkWindow*) gtk_window_new (GTK_WINDOW_TOPLEVEL); + g_object_ref_sink (_tmp379_); _g_object_unref0 (self->fullscreenwindow); - self->fullscreenwindow = _tmp376_; - _tmp377_ = self->fullscreenwindow; - gtk_window_set_title (_tmp377_, "Xnoise media player - Fullscreen"); - _tmp378_ = self->fullscreenwindow; - gtk_widget_set_events (G_TYPE_CHECK_INSTANCE_CAST (_tmp378_, GTK_TYPE_WIDGET, GtkWidget), (gint) (GDK_POINTER_MOTION_MASK | GDK_ENTER_NOTIFY_MASK)); - _tmp379_ = self->fullscreenwindow; - gtk_widget_realize (G_TYPE_CHECK_INSTANCE_CAST (_tmp379_, GTK_TYPE_WIDGET, GtkWidget)); + self->fullscreenwindow = _tmp379_; _tmp380_ = self->fullscreenwindow; - _tmp381_ = xnoise_fullscreen_toolbar_new (_tmp380_); + gtk_window_set_title (_tmp380_, "Xnoise media player - Fullscreen"); + _tmp381_ = self->fullscreenwindow; + gtk_widget_set_events (G_TYPE_CHECK_INSTANCE_CAST (_tmp381_, GTK_TYPE_WIDGET, GtkWidget), (gint) (GDK_POINTER_MOTION_MASK | GDK_ENTER_NOTIFY_MASK)); + _tmp382_ = self->fullscreenwindow; + gtk_widget_realize (G_TYPE_CHECK_INSTANCE_CAST (_tmp382_, GTK_TYPE_WIDGET, GtkWidget)); + _tmp383_ = self->fullscreenwindow; + _tmp384_ = xnoise_fullscreen_toolbar_new (_tmp383_); _xnoise_fullscreen_toolbar_unref0 (self->fullscreentoolbar); - self->fullscreentoolbar = _tmp381_; - _tmp382_ = self->priv->mainvbox; - gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_CONTAINER, GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp382_, GTK_TYPE_WIDGET, GtkWidget)); - _tmp383_ = xnoise_params_get_bool_value ("media_browser_hidden"); - tmp_media_browser_visible = !_tmp383_; - _tmp384_ = tmp_media_browser_visible; - if (!_tmp384_) { - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _____lambda230__gsource_func, g_object_ref (self), g_object_unref); + self->fullscreentoolbar = _tmp384_; + _tmp385_ = self->priv->mainvbox; + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_CONTAINER, GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp385_, GTK_TYPE_WIDGET, GtkWidget)); + _tmp386_ = xnoise_params_get_bool_value ("media_browser_hidden"); + tmp_media_browser_visible = !_tmp386_; + _tmp387_ = tmp_media_browser_visible; + if (!_tmp387_) { + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _____lambda228__gsource_func, g_object_ref (self), g_object_unref); } else { xnoise_main_window_set_media_browser_visible (self, TRUE); } @@ -8673,6 +8684,7 @@ _g_object_unref0 (album_art_back_button); _g_object_unref0 (album_art_overlay); _g_object_unref0 (separ); + _g_object_unref0 (ebs); _g_object_unref0 (mvsb_box); _g_object_unref0 (serialTI); _g_object_unref0 (albumimageTI); @@ -8694,19 +8706,19 @@ { GError* e = NULL; GtkMessageDialog* msg = NULL; - GError* _tmp385_ = NULL; - const gchar* _tmp386_ = NULL; - GtkMessageDialog* _tmp387_ = NULL; - GtkMessageDialog* _tmp388_ = NULL; + GError* _tmp388_ = NULL; + const gchar* _tmp389_ = NULL; + GtkMessageDialog* _tmp390_ = NULL; + GtkMessageDialog* _tmp391_ = NULL; e = _inner_error_; _inner_error_ = NULL; - _tmp385_ = e; - _tmp386_ = _tmp385_->message; - _tmp387_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "Failed to build main window! \n%s", _tmp386_); - g_object_ref_sink (_tmp387_); - msg = _tmp387_; - _tmp388_ = msg; - gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp388_, GTK_TYPE_DIALOG, GtkDialog)); + _tmp388_ = e; + _tmp389_ = _tmp388_->message; + _tmp390_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "Failed to build main window! \n%s", _tmp389_); + g_object_ref_sink (_tmp390_); + msg = _tmp390_; + _tmp391_ = msg; + gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp391_, GTK_TYPE_DIALOG, GtkDialog)); _g_object_unref0 (msg); _g_error_free0 (e); return; @@ -8717,8 +8729,8 @@ g_clear_error (&_inner_error_); return; } - _tmp389_ = self->priv->_mainview_box; - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp389_, GTK_TYPE_NOTEBOOK, GtkNotebook), "switch-page", (GCallback) ___lambda231__gtk_notebook_switch_page, self, 0); + _tmp392_ = self->priv->_mainview_box; + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp392_, GTK_TYPE_NOTEBOOK, GtkNotebook), "switch-page", (GCallback) ___lambda229__gtk_notebook_switch_page, self, 0); g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), "delete-event", (GCallback) _xnoise_main_window_on_close_gtk_widget_delete_event, self, 0); g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), "key-release-event", (GCallback) _xnoise_main_window_on_key_released_gtk_widget_key_release_event, self, 0); g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), "key-press-event", (GCallback) _xnoise_main_window_on_key_pressed_gtk_widget_key_press_event, self, 0); @@ -8917,7 +8929,7 @@ } -static gboolean __lambda258_ (XnoiseMainWindow* self) { +static gboolean __lambda256_ (XnoiseMainWindow* self) { gboolean result = FALSE; XnoiseMainViewNotebook* _tmp0_ = NULL; gchar* _tmp1_ = NULL; @@ -8934,9 +8946,9 @@ } -static gboolean ___lambda258__gsource_func (gpointer self) { +static gboolean ___lambda256__gsource_func (gpointer self) { gboolean result; - result = __lambda258_ (self); + result = __lambda256_ (self); return result; } @@ -8961,7 +8973,7 @@ result = FALSE; return result; } - _tmp3_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 300, ___lambda258__gsource_func, g_object_ref (self), g_object_unref); + _tmp3_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 300, ___lambda256__gsource_func, g_object_ref (self), g_object_unref); self->priv->aimage_timeout = _tmp3_; result = FALSE; return result; @@ -9167,7 +9179,7 @@ } -static gboolean _xnoise_main_window_active_lyrics___lambda196_ (Block97Data* _data97_) { +static gboolean _xnoise_main_window_active_lyrics___lambda194_ (Block97Data* _data97_) { XnoiseMainWindow * self; gboolean result = FALSE; GtkActionGroup* _tmp0_ = NULL; @@ -9208,9 +9220,9 @@ } -static gboolean __xnoise_main_window_active_lyrics___lambda196__gsource_func (gpointer self) { +static gboolean __xnoise_main_window_active_lyrics___lambda194__gsource_func (gpointer self) { gboolean result; - result = _xnoise_main_window_active_lyrics___lambda196_ (self); + result = _xnoise_main_window_active_lyrics___lambda194_ (self); return result; } @@ -9299,7 +9311,7 @@ _tmp21_ = self->main_view_sbutton; xnoise_serial_button_del (_tmp21_, XNOISE_RESOURCES_LYRICS_VIEW_NAME); } - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, __xnoise_main_window_active_lyrics___lambda196__gsource_func, block97_data_ref (_data97_), block97_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, __xnoise_main_window_active_lyrics___lambda194__gsource_func, block97_data_ref (_data97_), block97_data_unref); _tmp22_ = _data97_->value; self->priv->_active_lyrics = _tmp22_; block97_data_unref (_data97_); @@ -9552,6 +9564,7 @@ _g_object_unref0 (self->action_group); _xnoise_fullscreen_toolbar_unref0 (self->fullscreentoolbar); _g_object_unref0 (self->videovbox); + _g_object_unref0 (self->videoscreen); _g_object_unref0 (self->hpaned); _g_object_unref0 (self->search_entry); _g_object_unref0 (self->track_infobar); @@ -10107,7 +10120,7 @@ } -static void __lambda136_ (Block98Data* _data98_, GtkWidget* w) { +static void __lambda134_ (Block98Data* _data98_, GtkWidget* w) { BackgroundBox * self; GtkWidget* _tmp0_ = NULL; cairo_t* _tmp1_ = NULL; @@ -10119,8 +10132,8 @@ } -static void ___lambda136__gtk_callback (GtkWidget* widget, gpointer self) { - __lambda136_ (self, widget); +static void ___lambda134__gtk_callback (GtkWidget* widget, gpointer self) { + __lambda134_ (self, widget); } @@ -10161,7 +10174,7 @@ cairo_rectangle (_tmp6_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp7_, (gdouble) _tmp8_); _tmp9_ = _data98_->cr; cairo_stroke (_tmp9_); - gtk_container_forall (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_CONTAINER, GtkContainer), ___lambda136__gtk_callback, _data98_); + gtk_container_forall (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_CONTAINER, GtkContainer), ___lambda134__gtk_callback, _data98_); result = FALSE; _g_object_unref0 (context); block98_data_unref (_data98_); @@ -10217,7 +10230,7 @@ } -static gboolean __lambda224_ (Block99Data* _data99_) { +static gboolean __lambda222_ (Block99Data* _data99_) { PlayBackControlBar * self; gboolean result = FALSE; XnoiseMainWindow* _tmp0_ = NULL; @@ -10232,9 +10245,9 @@ } -static gboolean ___lambda224__gsource_func (gpointer self) { +static gboolean ___lambda222__gsource_func (gpointer self) { gboolean result; - result = __lambda224_ (self); + result = __lambda222_ (self); return result; } @@ -10273,7 +10286,7 @@ gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_CONTAINER, GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (box, GTK_TYPE_WIDGET, GtkWidget)); gtk_widget_set_margin_left (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), 15); gtk_widget_set_margin_right (G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WIDGET, GtkWidget), 15); - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda224__gsource_func, block99_data_ref (_data99_), block99_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda222__gsource_func, block99_data_ref (_data99_), block99_data_unref); _g_object_unref0 (playPauseButton); _g_object_unref0 (box); block99_data_unref (_data99_); diff -Nru xnoise-0.2.20/libxnoise/MainWindow/xnoise-main-window.vala xnoise-0.2.21/libxnoise/MainWindow/xnoise-main-window.vala --- xnoise-0.2.20/libxnoise/MainWindow/xnoise-main-window.vala 2013-12-11 07:33:03.000000000 +0000 +++ xnoise-0.2.21/libxnoise/MainWindow/xnoise-main-window.vala 2014-01-17 13:29:42.000000000 +0000 @@ -85,7 +85,7 @@ internal Gtk.ActionGroup action_group; internal FullscreenToolbar fullscreentoolbar; internal Box videovbox; - internal unowned VideoScreen videoscreen; + internal VideoScreen videoscreen; internal ThinPaned hpaned; internal Entry search_entry; internal TrackInfobar track_infobar; @@ -1879,7 +1879,7 @@ tracklist_scrollbar = (Gtk.Scrollbar)trackListScrollWin.get_vscrollbar(); mainview_box.add_main_view(tracklistview_widget); - videoview_widget = new VideoViewWidget(this); + videoview_widget = new VideoViewWidget(); videoscreen = gst_player.videoscreen; videovbox = videoview_widget.videovbox; mainview_box.add_main_view(videoview_widget); @@ -1963,9 +1963,13 @@ var serialTI = new ToolItem(); var mvsb_box = new Gtk.Box(Orientation.VERTICAL, 0); - mvsb_box.pack_start(new DrawingArea(), true, true, 0); + var ebs = new EventBox(); + ebs.visible_window = false; + mvsb_box.pack_start(ebs, true, true, 0); mvsb_box.pack_start(main_view_sbutton, true, true, 0); - mvsb_box.pack_start(new DrawingArea(), true, true, 0); + ebs = new EventBox(); + ebs.visible_window = false; + mvsb_box.pack_start(ebs, true, true, 0); serialTI.add(mvsb_box); //PROGRESS BAR diff -Nru xnoise-0.2.20/libxnoise/MediaChangeDetector/xnoise-media-change-detector.c xnoise-0.2.21/libxnoise/MediaChangeDetector/xnoise-media-change-detector.c --- xnoise-0.2.20/libxnoise/MediaChangeDetector/xnoise-media-change-detector.c 2013-12-11 11:24:24.000000000 +0000 +++ xnoise-0.2.21/libxnoise/MediaChangeDetector/xnoise-media-change-detector.c 2014-01-27 09:32:57.000000000 +0000 @@ -337,22 +337,22 @@ GType xnoise_media_importer_get_type (void) G_GNUC_CONST; XnoiseWorker* xnoise_worker_new (GMainContext* mc); XnoiseWorker* xnoise_worker_construct (GType object_type, GMainContext* mc); -static gboolean __lambda276_ (XnoiseMediaChangeDetector* self); +static gboolean __lambda274_ (XnoiseMediaChangeDetector* self); GType xnoise_global_access_get_type (void) G_GNUC_CONST; -static void __lambda277_ (XnoiseMediaChangeDetector* self); -static gboolean ___lambda278_ (XnoiseMediaChangeDetector* self); +static void __lambda275_ (XnoiseMediaChangeDetector* self); +static gboolean ___lambda276_ (XnoiseMediaChangeDetector* self); static void xnoise_media_change_detector_check_start_conditions (XnoiseMediaChangeDetector* self); -static gboolean ____lambda278__gsource_func (gpointer self); -static void ___lambda277__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); -static gboolean ___lambda276__gsource_func (gpointer self); +static gboolean ____lambda276__gsource_func (gpointer self); +static void ___lambda275__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); +static gboolean ___lambda274__gsource_func (gpointer self); gboolean xnoise_global_access_get_media_import_in_progress (XnoiseGlobalAccess* self); -static gboolean ___lambda279_ (XnoiseMediaChangeDetector* self); +static gboolean ___lambda277_ (XnoiseMediaChangeDetector* self); static void xnoise_media_change_detector_do_check (XnoiseMediaChangeDetector* self); -static gboolean ____lambda279__gsource_func (gpointer self); +static gboolean ____lambda277__gsource_func (gpointer self); static void xnoise_media_change_detector_process_existing_library_content (XnoiseMediaChangeDetector* self); -static gboolean ___lambda283_ (XnoiseMediaChangeDetector* self); +static gboolean ___lambda281_ (XnoiseMediaChangeDetector* self); static void xnoise_media_change_detector_process_media_folder_content (XnoiseMediaChangeDetector* self); -static gboolean ____lambda283__gsource_func (gpointer self); +static gboolean ____lambda281__gsource_func (gpointer self); GType xnoise_item_get_type (void) G_GNUC_CONST; GType xnoise_item_type_get_type (void) G_GNUC_CONST; XnoiseItem* xnoise_item_dup (const XnoiseItem* self); @@ -400,22 +400,22 @@ static gboolean _xnoise_media_change_detector_finish_mfc_xnoise_worker_work_func (XnoiseWorkerJob* jb, gpointer self); static Block100Data* block100_data_ref (Block100Data* _data100_); static void block100_data_unref (void * _userdata_); -static gboolean ___lambda285_ (Block100Data* _data100_); -static gboolean ____lambda285__gsource_func (gpointer self); -static gboolean ___lambda286_ (XnoiseMediaChangeDetector* self, XnoiseWorkerJob* j); -static gboolean __lambda287_ (XnoiseMediaChangeDetector* self, XnoiseWorkerJob* jj); -static gboolean __lambda288_ (XnoiseMediaChangeDetector* self); -static gboolean ___lambda288__gsource_func (gpointer self); -static gboolean ___lambda287__xnoise_worker_work_func (XnoiseWorkerJob* jb, gpointer self); -static gboolean ____lambda286__xnoise_worker_work_func (XnoiseWorkerJob* jb, gpointer self); +static gboolean ___lambda283_ (Block100Data* _data100_); +static gboolean ____lambda283__gsource_func (gpointer self); +static gboolean ___lambda284_ (XnoiseMediaChangeDetector* self, XnoiseWorkerJob* j); +static gboolean __lambda285_ (XnoiseMediaChangeDetector* self, XnoiseWorkerJob* jj); +static gboolean __lambda286_ (XnoiseMediaChangeDetector* self); +static gboolean ___lambda286__gsource_func (gpointer self); +static gboolean ___lambda285__xnoise_worker_work_func (XnoiseWorkerJob* jb, gpointer self); +static gboolean ____lambda284__xnoise_worker_work_func (XnoiseWorkerJob* jb, gpointer self); static Block101Data* block101_data_ref (Block101Data* _data101_); static void block101_data_unref (void * _userdata_); gboolean xnoise_worker_is_same_thread (XnoiseWorker* self); static void xnoise_media_change_detector_read_recoursive (XnoiseMediaChangeDetector* self, GFile* dir, XnoiseWorkerJob* job); -static gboolean ___lambda284_ (Block101Data* _data101_); +static gboolean ___lambda282_ (Block101Data* _data101_); static gboolean xnoise_media_change_detector_uri_in_media_folders (const gchar* u); GValue* xnoise_worker_job_get_arg (XnoiseWorkerJob* self, const gchar* name); -static gboolean ____lambda284__gsource_func (gpointer self); +static gboolean ____lambda282__gsource_func (gpointer self); gchar* xnoise_utilities_get_suffix_from_filename (const gchar* val); gboolean xnoise_playlist_is_playlist_extension (const gchar* ext); static void _vala_array_add97 (gchar*** array, int* length, int* size, gchar* value); @@ -436,16 +436,16 @@ static gboolean xnoise_media_change_detector_check_change_times_job (XnoiseMediaChangeDetector* self, XnoiseWorkerJob* job); static gboolean _xnoise_media_change_detector_check_change_times_job_xnoise_worker_work_func (XnoiseWorkerJob* jb, gpointer self); XnoiseFileData** xnoise_database_reader_get_uris (XnoiseDatabaseReader* self, gint32 offset, gint32 limit, int* result_length1); -static gboolean ___lambda280_ (XnoiseMediaChangeDetector* self, XnoiseWorkerJob* xxjob); +static gboolean ___lambda278_ (XnoiseMediaChangeDetector* self, XnoiseWorkerJob* xxjob); static gchar** _vala_array_dup27 (gchar** self, int length); void xnoise_media_importer_reimport_media_files (XnoiseMediaImporter* self, gchar** file_uris, int file_uris_length1); static gchar** _vala_array_dup28 (gchar** self, int length); void xnoise_media_importer_remove_uris (XnoiseMediaImporter* self, gchar** file_uris, int file_uris_length1); -static gboolean __lambda281_ (XnoiseMediaChangeDetector* self); -static gboolean ___lambda281__gsource_func (gpointer self); -static gboolean ____lambda280__xnoise_worker_work_func (XnoiseWorkerJob* jb, gpointer self); -static gboolean __lambda282_ (Block102Data* _data102_); -static gboolean ___lambda282__gsource_func (gpointer self); +static gboolean __lambda279_ (XnoiseMediaChangeDetector* self); +static gboolean ___lambda279__gsource_func (gpointer self); +static gboolean ____lambda278__xnoise_worker_work_func (XnoiseWorkerJob* jb, gpointer self); +static gboolean __lambda280_ (Block102Data* _data102_); +static gboolean ___lambda280__gsource_func (gpointer self); static void _vala_array_add100 (gchar*** array, int* length, int* size, gchar* value); static void _vala_array_add101 (gchar*** array, int* length, int* size, gchar* value); static gchar** _vala_array_dup29 (gchar** self, int length); @@ -455,7 +455,7 @@ static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); -static gboolean ___lambda278_ (XnoiseMediaChangeDetector* self) { +static gboolean ___lambda276_ (XnoiseMediaChangeDetector* self) { gboolean result = FALSE; xnoise_media_change_detector_check_start_conditions (self); result = FALSE; @@ -463,41 +463,41 @@ } -static gboolean ____lambda278__gsource_func (gpointer self) { +static gboolean ____lambda276__gsource_func (gpointer self) { gboolean result; - result = ___lambda278_ (self); + result = ___lambda276_ (self); return result; } -static void __lambda277_ (XnoiseMediaChangeDetector* self) { +static void __lambda275_ (XnoiseMediaChangeDetector* self) { gboolean _tmp0_ = FALSE; _tmp0_ = self->priv->finished_database_read; if (!_tmp0_) { - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda278__gsource_func, g_object_ref (self), g_object_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda276__gsource_func, g_object_ref (self), g_object_unref); } } -static void ___lambda277__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { - __lambda277_ (self); +static void ___lambda275__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { + __lambda275_ (self); } -static gboolean __lambda276_ (XnoiseMediaChangeDetector* self) { +static gboolean __lambda274_ (XnoiseMediaChangeDetector* self) { gboolean result = FALSE; XnoiseGlobalAccess* _tmp0_ = NULL; _tmp0_ = xnoise_global; - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), "notify::media-import-in-progress", (GCallback) ___lambda277__g_object_notify, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), "notify::media-import-in-progress", (GCallback) ___lambda275__g_object_notify, self, 0); xnoise_media_change_detector_check_start_conditions (self); result = FALSE; return result; } -static gboolean ___lambda276__gsource_func (gpointer self) { +static gboolean ___lambda274__gsource_func (gpointer self) { gboolean result; - result = __lambda276_ (self); + result = __lambda274_ (self); return result; } @@ -515,7 +515,7 @@ _g_object_unref0 (self->priv->worker); self->priv->worker = _tmp2_; self->priv->permission = FALSE; - g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ___lambda276__gsource_func, g_object_ref (self), g_object_unref); + g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ___lambda274__gsource_func, g_object_ref (self), g_object_unref); return self; } @@ -525,7 +525,7 @@ } -static gboolean ___lambda279_ (XnoiseMediaChangeDetector* self) { +static gboolean ___lambda277_ (XnoiseMediaChangeDetector* self) { gboolean result = FALSE; self->priv->permission = TRUE; self->priv->start_source = (guint) 0; @@ -535,9 +535,9 @@ } -static gboolean ____lambda279__gsource_func (gpointer self) { +static gboolean ____lambda277__gsource_func (gpointer self) { gboolean result; - result = ___lambda279_ (self); + result = ___lambda277_ (self); return result; } @@ -560,7 +560,7 @@ g_source_remove (_tmp4_); self->priv->start_source = (guint) 0; } - _tmp5_ = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ____lambda279__gsource_func, g_object_ref (self), g_object_unref); + _tmp5_ = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ____lambda277__gsource_func, g_object_ref (self), g_object_unref); self->priv->start_source = _tmp5_; } else { guint _tmp6_ = 0U; @@ -576,7 +576,7 @@ } -static gboolean ___lambda283_ (XnoiseMediaChangeDetector* self) { +static gboolean ___lambda281_ (XnoiseMediaChangeDetector* self) { gboolean result = FALSE; xnoise_media_change_detector_process_media_folder_content (self); result = FALSE; @@ -584,9 +584,9 @@ } -static gboolean ____lambda283__gsource_func (gpointer self) { +static gboolean ____lambda281__gsource_func (gpointer self) { gboolean result; - result = ___lambda283_ (self); + result = ___lambda281_ (self); return result; } @@ -648,7 +648,7 @@ } _tmp15_ = _tmp9_; if (_tmp15_) { - g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ____lambda283__gsource_func, g_object_ref (self), g_object_unref); + g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ____lambda281__gsource_func, g_object_ref (self), g_object_unref); } } @@ -819,7 +819,7 @@ } -static gboolean ___lambda285_ (Block100Data* _data100_) { +static gboolean ___lambda283_ (Block100Data* _data100_) { XnoiseMediaChangeDetector * self; gboolean result = FALSE; XnoiseGlobalAccess* _tmp0_ = NULL; @@ -845,14 +845,14 @@ } -static gboolean ____lambda285__gsource_func (gpointer self) { +static gboolean ____lambda283__gsource_func (gpointer self) { gboolean result; - result = ___lambda285_ (self); + result = ___lambda283_ (self); return result; } -static gboolean __lambda288_ (XnoiseMediaChangeDetector* self) { +static gboolean __lambda286_ (XnoiseMediaChangeDetector* self) { gboolean result = FALSE; g_signal_emit_by_name (self, "finished"); result = FALSE; @@ -860,37 +860,37 @@ } -static gboolean ___lambda288__gsource_func (gpointer self) { +static gboolean ___lambda286__gsource_func (gpointer self) { gboolean result; - result = __lambda288_ (self); + result = __lambda286_ (self); return result; } -static gboolean __lambda287_ (XnoiseMediaChangeDetector* self, XnoiseWorkerJob* jj) { +static gboolean __lambda285_ (XnoiseMediaChangeDetector* self, XnoiseWorkerJob* jj) { gboolean result = FALSE; g_return_val_if_fail (XNOISE_WORKER_IS_JOB (jj), FALSE); g_print ("done offline check!\n"); - g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ___lambda288__gsource_func, g_object_ref (self), g_object_unref); + g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ___lambda286__gsource_func, g_object_ref (self), g_object_unref); result = FALSE; return result; } -static gboolean ___lambda287__xnoise_worker_work_func (XnoiseWorkerJob* jb, gpointer self) { +static gboolean ___lambda285__xnoise_worker_work_func (XnoiseWorkerJob* jb, gpointer self) { gboolean result; - result = __lambda287_ (self, jb); + result = __lambda285_ (self, jb); return result; } -static gboolean ___lambda286_ (XnoiseMediaChangeDetector* self, XnoiseWorkerJob* j) { +static gboolean ___lambda284_ (XnoiseMediaChangeDetector* self, XnoiseWorkerJob* j) { gboolean result = FALSE; XnoiseWorkerJob* dbjob = NULL; XnoiseWorkerJob* _tmp0_ = NULL; XnoiseWorker* _tmp1_ = NULL; g_return_val_if_fail (XNOISE_WORKER_IS_JOB (j), FALSE); - _tmp0_ = xnoise_worker_job_new (XNOISE_WORKER_EXECUTION_TYPE_ONCE, ___lambda287__xnoise_worker_work_func, self, XNOISE_WORKER_PRIORITY_NORMAL, NULL, NULL); + _tmp0_ = xnoise_worker_job_new (XNOISE_WORKER_EXECUTION_TYPE_ONCE, ___lambda285__xnoise_worker_work_func, self, XNOISE_WORKER_PRIORITY_NORMAL, NULL, NULL); dbjob = _tmp0_; _tmp1_ = xnoise_db_worker; xnoise_worker_push_job (_tmp1_, dbjob); @@ -900,9 +900,9 @@ } -static gboolean ____lambda286__xnoise_worker_work_func (XnoiseWorkerJob* jb, gpointer self) { +static gboolean ____lambda284__xnoise_worker_work_func (XnoiseWorkerJob* jb, gpointer self) { gboolean result; - result = ___lambda286_ (self, jb); + result = ___lambda284_ (self, jb); return result; } @@ -928,13 +928,13 @@ _tmp3_ = xnoise_global_access_get_media_import_in_progress (_tmp2_); _tmp4_ = _tmp3_; if (_tmp4_) { - g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ____lambda285__gsource_func, block100_data_ref (_data100_), block100_data_unref); + g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ____lambda283__gsource_func, block100_data_ref (_data100_), block100_data_unref); } else { XnoiseWorkerJob* iojob = NULL; XnoiseWorkerJob* _tmp5_ = NULL; XnoiseWorker* _tmp6_ = NULL; XnoiseWorkerJob* _tmp7_ = NULL; - _tmp5_ = xnoise_worker_job_new (XNOISE_WORKER_EXECUTION_TYPE_ONCE, ____lambda286__xnoise_worker_work_func, self, XNOISE_WORKER_PRIORITY_NORMAL, NULL, NULL); + _tmp5_ = xnoise_worker_job_new (XNOISE_WORKER_EXECUTION_TYPE_ONCE, ____lambda284__xnoise_worker_work_func, self, XNOISE_WORKER_PRIORITY_NORMAL, NULL, NULL); iojob = _tmp5_; _tmp6_ = xnoise_io_worker; _tmp7_ = iojob; @@ -967,7 +967,7 @@ } -static gboolean ___lambda284_ (Block101Data* _data101_) { +static gboolean ___lambda282_ (Block101Data* _data101_) { XnoiseMediaChangeDetector * self; gboolean result = FALSE; XnoiseWorkerJob* _tmp0_ = NULL; @@ -1003,9 +1003,9 @@ } -static gboolean ____lambda284__gsource_func (gpointer self) { +static gboolean ____lambda282__gsource_func (gpointer self) { gboolean result; - result = ___lambda284_ (self); + result = ___lambda282_ (self); return result; } @@ -1081,7 +1081,7 @@ _tmp21_ = xnoise_global_access_get_media_import_in_progress (_tmp20_); _tmp22_ = _tmp21_; if (_tmp22_) { - g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ____lambda284__gsource_func, block101_data_ref (_data101_), block101_data_unref); + g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 1, ____lambda282__gsource_func, block101_data_ref (_data101_), block101_data_unref); } else { self->priv->finished_new_file_check = TRUE; } @@ -1853,7 +1853,7 @@ } -static gboolean __lambda281_ (XnoiseMediaChangeDetector* self) { +static gboolean __lambda279_ (XnoiseMediaChangeDetector* self) { gboolean result = FALSE; self->priv->finished_old_file_check = TRUE; xnoise_media_change_detector_do_check (self); @@ -1862,14 +1862,14 @@ } -static gboolean ___lambda281__gsource_func (gpointer self) { +static gboolean ___lambda279__gsource_func (gpointer self) { gboolean result; - result = __lambda281_ (self); + result = __lambda279_ (self); return result; } -static gboolean ___lambda280_ (XnoiseMediaChangeDetector* self, XnoiseWorkerJob* xxjob) { +static gboolean ___lambda278_ (XnoiseMediaChangeDetector* self, XnoiseWorkerJob* xxjob) { gboolean result = FALSE; gchar** _tmp0_ = NULL; gint _tmp0__length1 = 0; @@ -1947,20 +1947,20 @@ xnoise_media_importer_remove_uris (_tmp12_, _tmp13_, _tmp13__length1); removed_uris_loc = (_vala_array_free (removed_uris_loc, removed_uris_loc_length1, (GDestroyNotify) g_free), NULL); } - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda281__gsource_func, g_object_ref (self), g_object_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda279__gsource_func, g_object_ref (self), g_object_unref); result = FALSE; return result; } -static gboolean ____lambda280__xnoise_worker_work_func (XnoiseWorkerJob* jb, gpointer self) { +static gboolean ____lambda278__xnoise_worker_work_func (XnoiseWorkerJob* jb, gpointer self) { gboolean result; - result = ___lambda280_ (self, jb); + result = ___lambda278_ (self, jb); return result; } -static gboolean __lambda282_ (Block102Data* _data102_) { +static gboolean __lambda280_ (Block102Data* _data102_) { XnoiseMediaChangeDetector * self; gboolean result = FALSE; XnoiseWorker* _tmp0_ = NULL; @@ -1974,9 +1974,9 @@ } -static gboolean ___lambda282__gsource_func (gpointer self) { +static gboolean ___lambda280__gsource_func (gpointer self) { gboolean result; - result = __lambda282_ (self); + result = __lambda280_ (self); return result; } @@ -2120,7 +2120,7 @@ XnoiseWorker* _tmp34_ = NULL; XnoiseWorkerJob* _tmp35_ = NULL; self->priv->finished_database_read = TRUE; - _tmp33_ = xnoise_worker_job_new (XNOISE_WORKER_EXECUTION_TYPE_ONCE, ____lambda280__xnoise_worker_work_func, self, XNOISE_WORKER_PRIORITY_NORMAL, NULL, NULL); + _tmp33_ = xnoise_worker_job_new (XNOISE_WORKER_EXECUTION_TYPE_ONCE, ____lambda278__xnoise_worker_work_func, self, XNOISE_WORKER_PRIORITY_NORMAL, NULL, NULL); finish_job = _tmp33_; _tmp34_ = self->priv->worker; _tmp35_ = finish_job; @@ -2132,7 +2132,7 @@ _data102_ = NULL; return result; } - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda282__gsource_func, block102_data_ref (_data102_), block102_data_unref); + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda280__gsource_func, block102_data_ref (_data102_), block102_data_unref); result = FALSE; _xnoise_worker_job_unref0 (io_job); block102_data_unref (_data102_); diff -Nru xnoise-0.2.20/libxnoise/MediaMonitor/xnoise-media-monitor.c xnoise-0.2.21/libxnoise/MediaMonitor/xnoise-media-monitor.c --- xnoise-0.2.20/libxnoise/MediaMonitor/xnoise-media-monitor.c 2013-12-11 11:24:24.000000000 +0000 +++ xnoise-0.2.21/libxnoise/MediaMonitor/xnoise-media-monitor.c 2014-01-27 09:32:57.000000000 +0000 @@ -181,9 +181,9 @@ XnoiseMediaMonitor* xnoise_media_monitor_construct (GType object_type); static gint xnoise_media_monitor_thread_func (XnoiseMediaMonitor* self); static gpointer _xnoise_media_monitor_thread_func_gthread_func (gpointer self); -static gboolean __lambda273_ (XnoiseMediaMonitor* self); +static gboolean __lambda271_ (XnoiseMediaMonitor* self); static void xnoise_media_monitor_setup_monitors (XnoiseMediaMonitor* self); -static gboolean ___lambda273__gsource_func (gpointer self); +static gboolean ___lambda271__gsource_func (gpointer self); gpointer xnoise_media_importer_ref (gpointer instance); void xnoise_media_importer_unref (gpointer instance); GParamSpec* xnoise_param_spec_media_importer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -191,8 +191,8 @@ void xnoise_value_take_media_importer (GValue* value, gpointer v_object); gpointer xnoise_value_get_media_importer (const GValue* value); GType xnoise_media_importer_get_type (void) G_GNUC_CONST; -static void __lambda275_ (XnoiseMediaMonitor* self); -static void ___lambda275__xnoise_media_importer_folder_list_changed (XnoiseMediaImporter* _sender, gpointer self); +static void __lambda273_ (XnoiseMediaMonitor* self); +static void ___lambda273__xnoise_media_importer_folder_list_changed (XnoiseMediaImporter* _sender, gpointer self); static void xnoise_media_monitor_on_changed (XnoiseMediaMonitor* self, GFileMonitor* sender, GFile* file, GFile* other_file, GFileMonitorEvent event_type); GType xnoise_global_access_get_type (void) G_GNUC_CONST; gboolean xnoise_global_access_get_media_import_in_progress (XnoiseGlobalAccess* self); @@ -201,7 +201,7 @@ static XnoiseMediaMonitorEvent* xnoise_media_monitor_event_construct (GType object_type, XnoiseMediaMonitorEventChangeType type, const gchar* path); static void xnoise_media_monitor_event_table_changed (XnoiseMediaMonitor* self); static void xnoise_media_monitor_add_monitor_for_directory (XnoiseMediaMonitor* self, GFile* dir); -static gboolean __lambda274_ (XnoiseMediaMonitor* self); +static gboolean __lambda272_ (XnoiseMediaMonitor* self); GType xnoise_item_get_type (void) G_GNUC_CONST; GType xnoise_item_type_get_type (void) G_GNUC_CONST; XnoiseItem* xnoise_item_dup (const XnoiseItem* self); @@ -217,7 +217,7 @@ void xnoise_media_importer_remove_uris (XnoiseMediaImporter* self, gchar** file_uris, int file_uris_length1); void xnoise_media_importer_import_uris (XnoiseMediaImporter* self, gchar** uris, int uris_length1); void xnoise_media_importer_reimport_media_files (XnoiseMediaImporter* self, gchar** file_uris, int file_uris_length1); -static gboolean ___lambda274__gsource_func (gpointer self); +static gboolean ___lambda272__gsource_func (gpointer self); static void _xnoise_media_monitor_on_changed_g_file_monitor_changed (GFileMonitor* _sender, GFile* file, GFile* other_file, GFileMonitorEvent event_type, gpointer self); GList* xnoise_media_importer_get_media_folder_list (XnoiseMediaImporter* self); static void xnoise_media_monitor_setup_monitor_recoursive (XnoiseMediaMonitor* self, GFile* dir); @@ -250,7 +250,7 @@ } -static gboolean __lambda273_ (XnoiseMediaMonitor* self) { +static gboolean __lambda271_ (XnoiseMediaMonitor* self) { gboolean result = FALSE; xnoise_media_monitor_setup_monitors (self); result = FALSE; @@ -258,20 +258,20 @@ } -static gboolean ___lambda273__gsource_func (gpointer self) { +static gboolean ___lambda271__gsource_func (gpointer self) { gboolean result; - result = __lambda273_ (self); + result = __lambda271_ (self); return result; } -static void __lambda275_ (XnoiseMediaMonitor* self) { +static void __lambda273_ (XnoiseMediaMonitor* self) { xnoise_media_monitor_setup_monitors (self); } -static void ___lambda275__xnoise_media_importer_folder_list_changed (XnoiseMediaImporter* _sender, gpointer self) { - __lambda275_ (self); +static void ___lambda273__xnoise_media_importer_folder_list_changed (XnoiseMediaImporter* _sender, gpointer self) { + __lambda273_ (self); } @@ -325,9 +325,9 @@ } _tmp5_ = g_timeout_source_new ((guint) 2000); source = _tmp5_; - g_source_set_callback (source, ___lambda273__gsource_func, g_object_ref (self), g_object_unref); + g_source_set_callback (source, ___lambda271__gsource_func, g_object_ref (self), g_object_unref); _tmp6_ = xnoise_media_importer; - g_signal_connect_object (_tmp6_, "folder-list-changed", (GCallback) ___lambda275__xnoise_media_importer_folder_list_changed, self, 0); + g_signal_connect_object (_tmp6_, "folder-list-changed", (GCallback) ___lambda273__xnoise_media_importer_folder_list_changed, self, 0); _tmp7_ = self->priv->local_context; g_source_attach (source, _tmp7_); _g_source_unref0 (source); @@ -965,7 +965,7 @@ } -static gboolean __lambda274_ (XnoiseMediaMonitor* self) { +static gboolean __lambda272_ (XnoiseMediaMonitor* self) { gboolean result = FALSE; GSource* _tmp0_ = NULL; gboolean _tmp1_ = FALSE; @@ -1243,9 +1243,9 @@ } -static gboolean ___lambda274__gsource_func (gpointer self) { +static gboolean ___lambda272__gsource_func (gpointer self) { gboolean result; - result = __lambda274_ (self); + result = __lambda272_ (self); return result; } @@ -1276,7 +1276,7 @@ } _tmp6_ = g_timeout_source_new ((guint) 1000); source = _tmp6_; - g_source_set_callback (source, ___lambda274__gsource_func, g_object_ref (self), g_object_unref); + g_source_set_callback (source, ___lambda272__gsource_func, g_object_ref (self), g_object_unref); _tmp7_ = self->priv->local_context; _tmp8_ = g_source_attach (source, _tmp7_); self->priv->handler_id = _tmp8_; diff -Nru xnoise-0.2.20/libxnoise/PluginModule/xnoise-plugin-switch-widget.c xnoise-0.2.21/libxnoise/PluginModule/xnoise-plugin-switch-widget.c --- xnoise-0.2.20/libxnoise/PluginModule/xnoise-plugin-switch-widget.c 2013-12-11 11:24:24.000000000 +0000 +++ xnoise-0.2.21/libxnoise/PluginModule/xnoise-plugin-switch-widget.c 2014-01-27 09:32:57.000000000 +0000 @@ -142,18 +142,18 @@ static void xnoise_plugin_switch_init_value (XnoisePluginSwitch* self); static void xnoise_plugin_switch_connect_signals (XnoisePluginSwitch* self); gboolean xnoise_plugin_module_container_get_activated (XnoisePluginModuleContainer* self); -static void __lambda194_ (XnoisePluginSwitch* self); -static void ___lambda194__xnoise_plugin_module_container_sign_activated (XnoisePluginModuleContainer* _sender, gpointer self); -static void __lambda195_ (XnoisePluginSwitch* self); -static void ___lambda195__xnoise_plugin_module_container_sign_deactivated (XnoisePluginModuleContainer* _sender, gpointer self); +static void __lambda192_ (XnoisePluginSwitch* self); +static void ___lambda192__xnoise_plugin_module_container_sign_activated (XnoisePluginModuleContainer* _sender, gpointer self); +static void __lambda193_ (XnoisePluginSwitch* self); +static void ___lambda193__xnoise_plugin_module_container_sign_deactivated (XnoisePluginModuleContainer* _sender, gpointer self); GType xnoise_plugin_module_loader_get_type (void) G_GNUC_CONST; GType xnoise_plugin_module_information_get_type (void) G_GNUC_CONST; XnoisePluginModuleInformation* xnoise_plugin_module_container_get_info (XnoisePluginModuleContainer* self); const gchar* xnoise_plugin_module_information_get_pretty_name (XnoisePluginModuleInformation* self); -static void __lambda193_ (XnoisePluginSwitch* self); +static void __lambda191_ (XnoisePluginSwitch* self); gboolean xnoise_plugin_module_loader_activate_single_plugin (XnoisePluginModuleLoader* self, const gchar* module); void xnoise_plugin_module_loader_deactivate_single_plugin (XnoisePluginModuleLoader* self, const gchar* module); -static void ___lambda193__gtk_button_clicked (GtkButton* _sender, gpointer self); +static void ___lambda191__gtk_button_clicked (GtkButton* _sender, gpointer self); const gchar* xnoise_plugin_module_information_get_description (XnoisePluginModuleInformation* self); GType plugin_category_get_type (void) G_GNUC_CONST; PluginCategory xnoise_plugin_switch_get_plugin_category (XnoisePluginSwitch* self); @@ -214,7 +214,7 @@ } -static void __lambda194_ (XnoisePluginSwitch* self) { +static void __lambda192_ (XnoisePluginSwitch* self) { gboolean _tmp0_ = FALSE; GtkCheckButton* _tmp1_ = NULL; _tmp0_ = self->priv->frozen; @@ -229,12 +229,12 @@ } -static void ___lambda194__xnoise_plugin_module_container_sign_activated (XnoisePluginModuleContainer* _sender, gpointer self) { - __lambda194_ (self); +static void ___lambda192__xnoise_plugin_module_container_sign_activated (XnoisePluginModuleContainer* _sender, gpointer self) { + __lambda192_ (self); } -static void __lambda195_ (XnoisePluginSwitch* self) { +static void __lambda193_ (XnoisePluginSwitch* self) { gboolean _tmp0_ = FALSE; GtkCheckButton* _tmp1_ = NULL; _tmp0_ = self->priv->frozen; @@ -249,8 +249,8 @@ } -static void ___lambda195__xnoise_plugin_module_container_sign_deactivated (XnoisePluginModuleContainer* _sender, gpointer self) { - __lambda195_ (self); +static void ___lambda193__xnoise_plugin_module_container_sign_deactivated (XnoisePluginModuleContainer* _sender, gpointer self) { + __lambda193_ (self); } @@ -264,9 +264,9 @@ return; } _tmp1_ = self->priv->pc; - g_signal_connect_object (_tmp1_, "sign-activated", (GCallback) ___lambda194__xnoise_plugin_module_container_sign_activated, self, 0); + g_signal_connect_object (_tmp1_, "sign-activated", (GCallback) ___lambda192__xnoise_plugin_module_container_sign_activated, self, 0); _tmp2_ = self->priv->pc; - g_signal_connect_object (_tmp2_, "sign-deactivated", (GCallback) ___lambda195__xnoise_plugin_module_container_sign_deactivated, self, 0); + g_signal_connect_object (_tmp2_, "sign-deactivated", (GCallback) ___lambda193__xnoise_plugin_module_container_sign_deactivated, self, 0); } @@ -293,7 +293,7 @@ } -static void __lambda193_ (XnoisePluginSwitch* self) { +static void __lambda191_ (XnoisePluginSwitch* self) { GtkCheckButton* _tmp0_ = NULL; gboolean _tmp1_ = FALSE; _tmp0_ = self->priv->cb; @@ -320,8 +320,8 @@ } -static void ___lambda193__gtk_button_clicked (GtkButton* _sender, gpointer self) { - __lambda193_ (self); +static void ___lambda191__gtk_button_clicked (GtkButton* _sender, gpointer self) { + __lambda191_ (self); } @@ -359,7 +359,7 @@ _tmp8_ = self->priv->cb; gtk_size_group_add_widget (_tmp7_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GTK_TYPE_WIDGET, GtkWidget)); _tmp9_ = self->priv->cb; - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GTK_TYPE_BUTTON, GtkButton), "clicked", (GCallback) ___lambda193__gtk_button_clicked, self, 0); + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GTK_TYPE_BUTTON, GtkButton), "clicked", (GCallback) ___lambda191__gtk_button_clicked, self, 0); _tmp10_ = self->priv->pc; _tmp11_ = xnoise_plugin_module_container_get_info (_tmp10_); _tmp12_ = _tmp11_; diff -Nru xnoise-0.2.20/libxnoise/Resources/xnoise-resources.c xnoise-0.2.21/libxnoise/Resources/xnoise-resources.c --- xnoise-0.2.20/libxnoise/Resources/xnoise-resources.c 2013-12-11 11:24:24.000000000 +0000 +++ xnoise-0.2.21/libxnoise/Resources/xnoise-resources.c 2014-01-27 09:32:57.000000000 +0000 @@ -79,5 +79,6 @@ #define XNOISE_RESOURCES_WEB_FAQ "https://bitbucket.org/shuerhaaken/xnoise/wiki/FAQ" #define XNOISE_RESOURCES_WEB_KEYBOARD_SC "https://bitbucket.org/shuerhaaken/xnoise/wiki/KeyBindings" +const gchar* XNOISE_RESOURCES_AUTHORS[6] = {"Jörn Magens", "Andi", "Francisco Pérez Cuadrado", "Tal", "Dominique Lasserre", NULL}; diff -Nru xnoise-0.2.20/libxnoise/Resources/xnoise-resources.vala xnoise-0.2.21/libxnoise/Resources/xnoise-resources.vala --- xnoise-0.2.20/libxnoise/Resources/xnoise-resources.vala 2013-11-27 18:57:13.000000000 +0000 +++ xnoise-0.2.21/libxnoise/Resources/xnoise-resources.vala 2013-12-13 13:47:00.000000000 +0000 @@ -74,6 +74,14 @@ internal static const string HIDE_LIBRARY = _("Hide Media Library"); internal static const string SHOW_LIBRARY = _("Show Media Library"); + internal static const string AUTHORS[] = { + "Jörn Magens", + "Andi", + "Francisco Pérez Cuadrado", + "Tal", + "Dominique Lasserre", + null + }; internal static const string COPYRIGHT = "Copyright \xc2\xa9 2008-2013 Jörn Magens"; internal static const string PROGRAM_NAME = "xnoise"; internal static const string WEBSITE = "http://www.xnoise-media-player.com/"; diff -Nru xnoise-0.2.20/libxnoise/ScreensaverManager/xnoise-screensaver-manager.c xnoise-0.2.21/libxnoise/ScreensaverManager/xnoise-screensaver-manager.c --- xnoise-0.2.20/libxnoise/ScreensaverManager/xnoise-screensaver-manager.c 2013-12-11 11:24:24.000000000 +0000 +++ xnoise-0.2.21/libxnoise/ScreensaverManager/xnoise-screensaver-manager.c 2014-01-27 09:32:57.000000000 +0000 @@ -4,7 +4,7 @@ /* xnoise-screensaver-manager.vala * * Copyright (C) 2010 Andreas Obergrusberger - * Copyright (C) 2011 Jörn Magens + * Copyright (C) 2011, 2013, 2014 Jörn Magens * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -34,10 +34,11 @@ #include #include +#include +#include +#include #include #include -#include -#include #include #include #include @@ -64,7 +65,6 @@ typedef struct _XnoiseSSMBackend XnoiseSSMBackend; typedef struct _XnoiseSSMBackendIface XnoiseSSMBackendIface; -#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define XNOISE_TYPE_XDG_SSM (xnoise_xdg_ssm_get_type ()) #define XNOISE_XDG_SSM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), XNOISE_TYPE_XDG_SSM, XnoiseXdgSSM)) @@ -75,7 +75,35 @@ typedef struct _XnoiseXdgSSM XnoiseXdgSSM; typedef struct _XnoiseXdgSSMClass XnoiseXdgSSMClass; -#define _g_list_free0(var) ((var == NULL) ? NULL : (var = (g_list_free (var), NULL))) + +#define XNOISE_TYPE_DBUS_SSM (xnoise_dbus_ssm_get_type ()) +#define XNOISE_DBUS_SSM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), XNOISE_TYPE_DBUS_SSM, XnoiseDBusSSM)) +#define XNOISE_DBUS_SSM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), XNOISE_TYPE_DBUS_SSM, XnoiseDBusSSMClass)) +#define XNOISE_IS_DBUS_SSM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), XNOISE_TYPE_DBUS_SSM)) +#define XNOISE_IS_DBUS_SSM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), XNOISE_TYPE_DBUS_SSM)) +#define XNOISE_DBUS_SSM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), XNOISE_TYPE_DBUS_SSM, XnoiseDBusSSMClass)) + +typedef struct _XnoiseDBusSSM XnoiseDBusSSM; +typedef struct _XnoiseDBusSSMClass XnoiseDBusSSMClass; +#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) +typedef struct _XnoiseParamSpecScreenSaverManager XnoiseParamSpecScreenSaverManager; + +#define XNOISE_TYPE_ID_BUS_SCREENSAVER (xnoise_id_bus_screensaver_get_type ()) +#define XNOISE_ID_BUS_SCREENSAVER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), XNOISE_TYPE_ID_BUS_SCREENSAVER, XnoiseIDBusScreensaver)) +#define XNOISE_IS_ID_BUS_SCREENSAVER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), XNOISE_TYPE_ID_BUS_SCREENSAVER)) +#define XNOISE_ID_BUS_SCREENSAVER_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), XNOISE_TYPE_ID_BUS_SCREENSAVER, XnoiseIDBusScreensaverIface)) + +typedef struct _XnoiseIDBusScreensaver XnoiseIDBusScreensaver; +typedef struct _XnoiseIDBusScreensaverIface XnoiseIDBusScreensaverIface; + +#define XNOISE_TYPE_ID_BUS_SCREENSAVER_PROXY (xnoise_id_bus_screensaver_proxy_get_type ()) +typedef GDBusProxy XnoiseIDBusScreensaverProxy; +typedef GDBusProxyClass XnoiseIDBusScreensaverProxyClass; +typedef struct _XnoiseDBusSSMPrivate XnoiseDBusSSMPrivate; +#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) +typedef struct _XnoiseDbusSsmGetDbusProxyData XnoiseDbusSsmGetDbusProxyData; +typedef struct _XnoiseXdgSSMPrivate XnoiseXdgSSMPrivate; +#define _g_free0(var) (var = (g_free (var), NULL)) #define XNOISE_TYPE_MAIN_WINDOW (xnoise_main_window_get_type ()) #define XNOISE_MAIN_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), XNOISE_TYPE_MAIN_WINDOW, XnoiseMainWindow)) @@ -86,11 +114,6 @@ typedef struct _XnoiseMainWindow XnoiseMainWindow; typedef struct _XnoiseMainWindowClass XnoiseMainWindowClass; -#define __vala_GdkEvent_free0(var) ((var == NULL) ? NULL : (var = (_vala_GdkEvent_free (var), NULL))) -typedef struct _XnoiseParamSpecScreenSaverManager XnoiseParamSpecScreenSaverManager; -typedef struct _XnoiseXdgSSMPrivate XnoiseXdgSSMPrivate; -#define _g_free0(var) (var = (g_free (var), NULL)) -#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) struct _XnoiseScreenSaverManager { GTypeInstance parent_instance; @@ -112,14 +135,51 @@ }; struct _XnoiseScreenSaverManagerPrivate { - XnoiseSSMBackend* backend; - gboolean backlight_dim_prevent; + XnoiseSSMBackend** backends; + gint backends_length1; + gint _backends_size_; }; struct _XnoiseParamSpecScreenSaverManager { GParamSpec parent_instance; }; +struct _XnoiseIDBusScreensaverIface { + GTypeInterface parent_iface; + void (*simulate_user_activity) (XnoiseIDBusScreensaver* self, GError** error); +}; + +struct _XnoiseDBusSSM { + GObject parent_instance; + XnoiseDBusSSMPrivate * priv; +}; + +struct _XnoiseDBusSSMClass { + GObjectClass parent_class; +}; + +struct _XnoiseDBusSSMPrivate { + guint watch; + XnoiseIDBusScreensaver* screensaver_proxy; + gboolean setup_success; + guint activity_src; +}; + +struct _XnoiseDbusSsmGetDbusProxyData { + int _state_; + GObject* _source_object_; + GAsyncResult* _res_; + GSimpleAsyncResult* _async_result; + XnoiseDBusSSM* self; + XnoiseIDBusScreensaver* _tmp0_; + XnoiseIDBusScreensaver* _tmp1_; + GError* er; + GError* _tmp2_; + const gchar* _tmp3_; + guint _tmp4_; + GError * _inner_error_; +}; + struct _XnoiseXdgSSM { GObject parent_instance; XnoiseXdgSSMPrivate * priv; @@ -136,8 +196,10 @@ static gpointer xnoise_screen_saver_manager_parent_class = NULL; -extern XnoiseMainWindow* xnoise_main_window; +static gpointer xnoise_dbus_ssm_parent_class = NULL; +static XnoiseSSMBackendIface* xnoise_dbus_ssm_xnoise_ssm_backend_parent_iface = NULL; static gpointer xnoise_xdg_ssm_parent_class = NULL; +extern XnoiseMainWindow* xnoise_main_window; static XnoiseSSMBackendIface* xnoise_xdg_ssm_xnoise_ssm_backend_parent_iface = NULL; gpointer xnoise_screen_saver_manager_ref (gpointer instance); @@ -159,19 +221,49 @@ XnoiseXdgSSM* xnoise_xdg_ssm_construct (GType object_type); gboolean xnoise_ssm_backend_is_available (XnoiseSSMBackend* self); gboolean xnoise_ssm_backend_init (XnoiseSSMBackend* self); +static void _vala_array_add119 (XnoiseSSMBackend*** array, int* length, int* size, XnoiseSSMBackend* value); +GType xnoise_dbus_ssm_get_type (void) G_GNUC_CONST; +XnoiseDBusSSM* xnoise_dbus_ssm_new (void); +XnoiseDBusSSM* xnoise_dbus_ssm_construct (GType object_type); +static void _vala_array_add120 (XnoiseSSMBackend*** array, int* length, int* size, XnoiseSSMBackend* value); gboolean xnoise_screen_saver_manager_inhibit (XnoiseScreenSaverManager* self); -static gboolean __lambda130_ (XnoiseScreenSaverManager* self); -static gboolean __lambda131_ (XnoiseScreenSaverManager* self); -GType xnoise_main_window_get_type (void) G_GNUC_CONST; -static void _vala_GdkEvent_free (GdkEvent* self); -static gboolean ___lambda131__gsource_func (gpointer self); -static gboolean __lambda132_ (XnoiseScreenSaverManager* self); -static gboolean ___lambda132__gsource_func (gpointer self); -static gboolean ___lambda130__gsource_func (gpointer self); gboolean xnoise_ssm_backend_inhibit (XnoiseSSMBackend* self); gboolean xnoise_screen_saver_manager_uninhibit (XnoiseScreenSaverManager* self); gboolean xnoise_ssm_backend_uninhibit (XnoiseSSMBackend* self); static void xnoise_screen_saver_manager_finalize (XnoiseScreenSaverManager* obj); +GType xnoise_id_bus_screensaver_proxy_get_type (void) G_GNUC_CONST; +guint xnoise_id_bus_screensaver_register_object (void* object, GDBusConnection* connection, const gchar* path, GError** error); +GType xnoise_id_bus_screensaver_get_type (void) G_GNUC_CONST; +void xnoise_id_bus_screensaver_simulate_user_activity (XnoiseIDBusScreensaver* self, GError** error); +static void xnoise_id_bus_screensaver_proxy_g_signal (GDBusProxy* proxy, const gchar* sender_name, const gchar* signal_name, GVariant* parameters); +static void xnoise_id_bus_screensaver_proxy_simulate_user_activity (XnoiseIDBusScreensaver* self, GError** error); +static void xnoise_id_bus_screensaver_proxy_xnoise_id_bus_screensaver_interface_init (XnoiseIDBusScreensaverIface* iface); +static void _dbus_xnoise_id_bus_screensaver_simulate_user_activity (XnoiseIDBusScreensaver* self, GVariant* parameters, GDBusMethodInvocation* invocation); +static void xnoise_id_bus_screensaver_dbus_interface_method_call (GDBusConnection* connection, const gchar* sender, const gchar* object_path, const gchar* interface_name, const gchar* method_name, GVariant* parameters, GDBusMethodInvocation* invocation, gpointer user_data); +static GVariant* xnoise_id_bus_screensaver_dbus_interface_get_property (GDBusConnection* connection, const gchar* sender, const gchar* object_path, const gchar* interface_name, const gchar* property_name, GError** error, gpointer user_data); +static gboolean xnoise_id_bus_screensaver_dbus_interface_set_property (GDBusConnection* connection, const gchar* sender, const gchar* object_path, const gchar* interface_name, const gchar* property_name, GVariant* value, GError** error, gpointer user_data); +static void _xnoise_id_bus_screensaver_unregister_object (gpointer user_data); +#define XNOISE_DBUS_SSM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), XNOISE_TYPE_DBUS_SSM, XnoiseDBusSSMPrivate)) +enum { + XNOISE_DBUS_SSM_DUMMY_PROPERTY +}; +static gboolean xnoise_dbus_ssm_real_is_available (XnoiseSSMBackend* base); +static gboolean xnoise_dbus_ssm_real_init (XnoiseSSMBackend* base); +static void xnoise_dbus_ssm_get_dbus_proxy (XnoiseDBusSSM* self, GAsyncReadyCallback _callback_, gpointer _user_data_); +static void xnoise_dbus_ssm_get_dbus_proxy_finish (XnoiseDBusSSM* self, GAsyncResult* _res_); +static gboolean xnoise_dbus_ssm_real_inhibit (XnoiseSSMBackend* base); +static gboolean __lambda130_ (XnoiseDBusSSM* self); +void xnoise_dbus_ssm_send_activity (XnoiseDBusSSM* self); +static gboolean ___lambda130__gsource_func (gpointer self); +static gboolean xnoise_dbus_ssm_real_uninhibit (XnoiseSSMBackend* base); +static void xnoise_dbus_ssm_on_name_appeared (XnoiseDBusSSM* self, GDBusConnection* conn, const gchar* name); +static void xnoise_dbus_ssm_on_name_vanished (XnoiseDBusSSM* self, GDBusConnection* conn, const gchar* name); +static void xnoise_dbus_ssm_get_dbus_proxy_data_free (gpointer _data); +static gboolean xnoise_dbus_ssm_get_dbus_proxy_co (XnoiseDbusSsmGetDbusProxyData* _data_); +static void xnoise_dbus_ssm_get_dbus_proxy_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_); +static void _xnoise_dbus_ssm_on_name_appeared_gbus_name_appeared_callback (GDBusConnection* connection, const gchar* name, const gchar* name_owner, gpointer self); +static void _xnoise_dbus_ssm_on_name_vanished_gbus_name_vanished_callback (GDBusConnection* connection, const gchar* name, gpointer self); +static void xnoise_dbus_ssm_finalize (GObject* obj); #define XNOISE_XDG_SSM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), XNOISE_TYPE_XDG_SSM, XnoiseXdgSSMPrivate)) enum { XNOISE_XDG_SSM_DUMMY_PROPERTY @@ -180,6 +272,7 @@ #define XNOISE_XDG_SSM_inhibit_param "suspend" #define XNOISE_XDG_SSM_uninhibit_param "resume" static gint xnoise_xdg_ssm_get_window_id (XnoiseXdgSSM* self); +GType xnoise_main_window_get_type (void) G_GNUC_CONST; static gboolean xnoise_xdg_ssm_get_path (XnoiseXdgSSM* self); static gboolean xnoise_xdg_ssm_real_is_available (XnoiseSSMBackend* base); static gboolean xnoise_xdg_ssm_real_init (XnoiseSSMBackend* base); @@ -189,377 +282,203 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static const GDBusArgInfo * const _xnoise_id_bus_screensaver_dbus_arg_info_simulate_user_activity_in[] = {NULL}; +static const GDBusArgInfo * const _xnoise_id_bus_screensaver_dbus_arg_info_simulate_user_activity_out[] = {NULL}; +static const GDBusMethodInfo _xnoise_id_bus_screensaver_dbus_method_info_simulate_user_activity = {-1, "SimulateUserActivity", (GDBusArgInfo **) (&_xnoise_id_bus_screensaver_dbus_arg_info_simulate_user_activity_in), (GDBusArgInfo **) (&_xnoise_id_bus_screensaver_dbus_arg_info_simulate_user_activity_out)}; +static const GDBusMethodInfo * const _xnoise_id_bus_screensaver_dbus_method_info[] = {&_xnoise_id_bus_screensaver_dbus_method_info_simulate_user_activity, NULL}; +static const GDBusSignalInfo * const _xnoise_id_bus_screensaver_dbus_signal_info[] = {NULL}; +static const GDBusPropertyInfo * const _xnoise_id_bus_screensaver_dbus_property_info[] = {NULL}; +static const GDBusInterfaceInfo _xnoise_id_bus_screensaver_dbus_interface_info = {-1, "org.gnome.ScreenSaver", (GDBusMethodInfo **) (&_xnoise_id_bus_screensaver_dbus_method_info), (GDBusSignalInfo **) (&_xnoise_id_bus_screensaver_dbus_signal_info), (GDBusPropertyInfo **) (&_xnoise_id_bus_screensaver_dbus_property_info)}; +static const GDBusInterfaceVTable _xnoise_id_bus_screensaver_dbus_interface_vtable = {xnoise_id_bus_screensaver_dbus_interface_method_call, xnoise_id_bus_screensaver_dbus_interface_get_property, xnoise_id_bus_screensaver_dbus_interface_set_property}; static gpointer _g_object_ref0 (gpointer self) { return self ? g_object_ref (self) : NULL; } +static void _vala_array_add119 (XnoiseSSMBackend*** array, int* length, int* size, XnoiseSSMBackend* value) { + if ((*length) == (*size)) { + *size = (*size) ? (2 * (*size)) : 4; + *array = g_renew (XnoiseSSMBackend*, *array, (*size) + 1); + } + (*array)[(*length)++] = value; + (*array)[*length] = NULL; +} + + +static void _vala_array_add120 (XnoiseSSMBackend*** array, int* length, int* size, XnoiseSSMBackend* value) { + if ((*length) == (*size)) { + *size = (*size) ? (2 * (*size)) : 4; + *array = g_renew (XnoiseSSMBackend*, *array, (*size) + 1); + } + (*array)[(*length)++] = value; + (*array)[*length] = NULL; +} + + XnoiseScreenSaverManager* xnoise_screen_saver_manager_construct (GType object_type) { XnoiseScreenSaverManager* self = NULL; XnoiseXdgSSM* xdgssm = NULL; XnoiseXdgSSM* _tmp0_ = NULL; - XnoiseXdgSSM* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - XnoiseSSMBackend* _tmp5_ = NULL; - XnoiseSSMBackend* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; + gboolean _tmp1_ = FALSE; + XnoiseXdgSSM* _tmp2_ = NULL; + gboolean _tmp5_ = FALSE; + XnoiseDBusSSM* dbus_ssm = NULL; + XnoiseDBusSSM* _tmp11_ = NULL; + gboolean _tmp12_ = FALSE; + XnoiseDBusSSM* _tmp13_ = NULL; + gboolean _tmp16_ = FALSE; self = (XnoiseScreenSaverManager*) g_type_create_instance (object_type); - self->priv->backlight_dim_prevent = TRUE; _tmp0_ = xnoise_xdg_ssm_new (); xdgssm = _tmp0_; - _tmp1_ = xdgssm; - _tmp2_ = xnoise_ssm_backend_is_available (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, XNOISE_TYPE_SSM_BACKEND, XnoiseSSMBackend)); - if (_tmp2_) { + _tmp2_ = xdgssm; + if (_tmp2_ != NULL) { XnoiseXdgSSM* _tmp3_ = NULL; - XnoiseSSMBackend* _tmp4_ = NULL; + gboolean _tmp4_ = FALSE; _tmp3_ = xdgssm; - _tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, XNOISE_TYPE_SSM_BACKEND, XnoiseSSMBackend)); - _g_object_unref0 (self->priv->backend); - self->priv->backend = _tmp4_; - } - _tmp5_ = self->priv->backend; - if (_tmp5_ == NULL) { - _g_object_unref0 (xdgssm); - return self; - } - _tmp6_ = self->priv->backend; - _tmp7_ = xnoise_ssm_backend_init (_tmp6_); - if (!_tmp7_) { - _g_object_unref0 (self->priv->backend); - self->priv->backend = NULL; + _tmp4_ = xnoise_ssm_backend_is_available (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, XNOISE_TYPE_SSM_BACKEND, XnoiseSSMBackend)); + _tmp1_ = _tmp4_; + } else { + _tmp1_ = FALSE; } - _g_object_unref0 (xdgssm); - return self; -} - - -XnoiseScreenSaverManager* xnoise_screen_saver_manager_new (void) { - return xnoise_screen_saver_manager_construct (XNOISE_TYPE_SCREEN_SAVER_MANAGER); -} - - -static void _vala_GdkEvent_free (GdkEvent* self) { - g_boxed_free (gdk_event_get_type (), self); -} - - -static gboolean __lambda131_ (XnoiseScreenSaverManager* self) { - gboolean result = FALSE; - GdkKeymapKey* keys = NULL; - gint keys_length1 = 0; - gint _keys_size_ = 0; - GdkKeymap* keymap = NULL; - GdkKeymap* _tmp0_ = NULL; - GdkKeymap* _tmp1_ = NULL; - GdkKeymap* _tmp2_ = NULL; - GdkKeymapKey* _tmp3_ = NULL; - gint _tmp4_ = 0; - GdkDisplayManager* display_manager = NULL; - GdkDisplayManager* _tmp5_ = NULL; - GdkDisplay* display = NULL; - GdkDeviceManager* dev_manager = NULL; - GdkDisplayManager* _tmp6_ = NULL; - GdkEvent* e = NULL; - GdkEvent* _tmp12_ = NULL; - GdkDeviceManager* _tmp13_ = NULL; - GdkEvent* _tmp19_ = NULL; - GdkEvent* _tmp20_ = NULL; - XnoiseMainWindow* _tmp21_ = NULL; - GdkWindow* _tmp22_ = NULL; - GdkEvent* _tmp23_ = NULL; - GdkEvent* _tmp24_ = NULL; - GdkEvent* _tmp25_ = NULL; - GdkEvent* _tmp26_ = NULL; - GdkEvent* _tmp27_ = NULL; - GdkKeymapKey* _tmp28_ = NULL; - gint _tmp28__length1 = 0; - GdkKeymapKey _tmp29_ = {0}; - guint _tmp30_ = 0U; - GdkEvent* _tmp31_ = NULL; - GdkKeymapKey* _tmp32_ = NULL; - gint _tmp32__length1 = 0; - GdkKeymapKey _tmp33_ = {0}; - gint _tmp34_ = 0; - GdkDisplay* _tmp35_ = NULL; - GdkEvent* _tmp36_ = NULL; - _tmp0_ = gdk_keymap_get_default (); - _tmp1_ = _g_object_ref0 (_tmp0_); - keymap = _tmp1_; - _tmp2_ = keymap; - gdk_keymap_get_entries_for_keyval (_tmp2_, (guint) GDK_KEY_Shift_L, &_tmp3_, &_tmp4_); - keys = (g_free (keys), NULL); - keys = _tmp3_; - keys_length1 = _tmp4_; - _keys_size_ = keys_length1; - _tmp5_ = gdk_display_manager_get (); - display_manager = _tmp5_; - display = NULL; - dev_manager = NULL; - _tmp6_ = display_manager; - if (_tmp6_ != NULL) { - GdkDisplayManager* _tmp7_ = NULL; - GdkDisplay* _tmp8_ = NULL; - GdkDisplay* _tmp9_ = NULL; - _tmp7_ = display_manager; - _tmp8_ = gdk_display_manager_get_default_display (_tmp7_); - display = _tmp8_; - _tmp9_ = display; - if (_tmp9_ != NULL) { - GdkDisplay* _tmp10_ = NULL; - GdkDeviceManager* _tmp11_ = NULL; - _tmp10_ = display; - _tmp11_ = gdk_display_get_device_manager (_tmp10_); - dev_manager = _tmp11_; + _tmp5_ = _tmp1_; + if (_tmp5_) { + XnoiseXdgSSM* _tmp6_ = NULL; + gboolean _tmp7_ = FALSE; + _tmp6_ = xdgssm; + _tmp7_ = xnoise_ssm_backend_init (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, XNOISE_TYPE_SSM_BACKEND, XnoiseSSMBackend)); + if (_tmp7_) { + XnoiseSSMBackend** _tmp8_ = NULL; + gint _tmp8__length1 = 0; + XnoiseXdgSSM* _tmp9_ = NULL; + XnoiseSSMBackend* _tmp10_ = NULL; + _tmp8_ = self->priv->backends; + _tmp8__length1 = self->priv->backends_length1; + _tmp9_ = xdgssm; + _tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, XNOISE_TYPE_SSM_BACKEND, XnoiseSSMBackend)); + _vala_array_add119 (&self->priv->backends, &self->priv->backends_length1, &self->priv->_backends_size_, _tmp10_); } } - _tmp12_ = gdk_event_new (GDK_KEY_PRESS); - e = _tmp12_; - _tmp13_ = dev_manager; + _tmp11_ = xnoise_dbus_ssm_new (); + dbus_ssm = _tmp11_; + _tmp13_ = dbus_ssm; if (_tmp13_ != NULL) { - GdkEvent* _tmp14_ = NULL; - GdkDeviceManager* _tmp15_ = NULL; - GList* _tmp16_ = NULL; - GList* _tmp17_ = NULL; - gconstpointer _tmp18_ = NULL; - _tmp14_ = e; - _tmp15_ = dev_manager; - _tmp16_ = gdk_device_manager_list_devices (_tmp15_, GDK_DEVICE_TYPE_MASTER); - _tmp17_ = _tmp16_; - _tmp18_ = g_list_nth_data (_tmp17_, (guint) 0); - gdk_event_set_device (_tmp14_, (GdkDevice*) _tmp18_); - _g_list_free0 (_tmp17_); - } - _tmp19_ = e; - _tmp19_->key.keyval = (guint) GDK_KEY_Shift_L; - _tmp20_ = e; - _tmp21_ = xnoise_main_window; - _tmp22_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GTK_TYPE_WIDGET, GtkWidget)); - _tmp20_->key.window = _tmp22_; - _tmp23_ = e; - _tmp23_->key.send_event = (gint8) 1; - _tmp24_ = e; - _tmp24_->key.time = (guint32) GDK_CURRENT_TIME; - _tmp25_ = e; - _tmp25_->key.state = GDK_SHIFT_MASK; - _tmp26_ = e; - _tmp26_->key.keyval = (guint) GDK_KEY_Shift_L; - _tmp27_ = e; - _tmp28_ = keys; - _tmp28__length1 = keys_length1; - _tmp29_ = _tmp28_[0]; - _tmp30_ = _tmp29_.keycode; - _tmp27_->key.hardware_keycode = (guint16) _tmp30_; - _tmp31_ = e; - _tmp32_ = keys; - _tmp32__length1 = keys_length1; - _tmp33_ = _tmp32_[0]; - _tmp34_ = _tmp33_.group; - _tmp31_->key.group = (guint8) _tmp34_; - _tmp35_ = display; - _tmp36_ = e; - gdk_display_put_event (_tmp35_, _tmp36_); - result = FALSE; - __vala_GdkEvent_free0 (e); - _g_object_unref0 (keymap); - keys = (g_free (keys), NULL); - return result; -} - - -static gboolean ___lambda131__gsource_func (gpointer self) { - gboolean result; - result = __lambda131_ (self); - return result; -} - - -static gboolean __lambda132_ (XnoiseScreenSaverManager* self) { - gboolean result = FALSE; - GdkKeymapKey* keys = NULL; - gint keys_length1 = 0; - gint _keys_size_ = 0; - GdkKeymap* keymap = NULL; - GdkKeymap* _tmp0_ = NULL; - GdkKeymap* _tmp1_ = NULL; - GdkKeymap* _tmp2_ = NULL; - GdkKeymapKey* _tmp3_ = NULL; - gint _tmp4_ = 0; - GdkDisplayManager* display_manager = NULL; - GdkDisplayManager* _tmp5_ = NULL; - GdkDisplay* display = NULL; - GdkDeviceManager* dev_manager = NULL; - GdkDisplayManager* _tmp6_ = NULL; - GdkEvent* e = NULL; - GdkEvent* _tmp12_ = NULL; - GdkDeviceManager* _tmp13_ = NULL; - GdkEvent* _tmp19_ = NULL; - GdkEvent* _tmp20_ = NULL; - XnoiseMainWindow* _tmp21_ = NULL; - GdkWindow* _tmp22_ = NULL; - GdkEvent* _tmp23_ = NULL; - GdkEvent* _tmp24_ = NULL; - GdkEvent* _tmp25_ = NULL; - GdkEvent* _tmp26_ = NULL; - GdkEvent* _tmp27_ = NULL; - GdkKeymapKey* _tmp28_ = NULL; - gint _tmp28__length1 = 0; - GdkKeymapKey _tmp29_ = {0}; - guint _tmp30_ = 0U; - GdkEvent* _tmp31_ = NULL; - GdkKeymapKey* _tmp32_ = NULL; - gint _tmp32__length1 = 0; - GdkKeymapKey _tmp33_ = {0}; - gint _tmp34_ = 0; - GdkDisplay* _tmp35_ = NULL; - GdkEvent* _tmp36_ = NULL; - _tmp0_ = gdk_keymap_get_default (); - _tmp1_ = _g_object_ref0 (_tmp0_); - keymap = _tmp1_; - _tmp2_ = keymap; - gdk_keymap_get_entries_for_keyval (_tmp2_, (guint) GDK_KEY_Shift_L, &_tmp3_, &_tmp4_); - keys = (g_free (keys), NULL); - keys = _tmp3_; - keys_length1 = _tmp4_; - _keys_size_ = keys_length1; - _tmp5_ = gdk_display_manager_get (); - display_manager = _tmp5_; - display = NULL; - dev_manager = NULL; - _tmp6_ = display_manager; - if (_tmp6_ != NULL) { - GdkDisplayManager* _tmp7_ = NULL; - GdkDisplay* _tmp8_ = NULL; - GdkDisplay* _tmp9_ = NULL; - _tmp7_ = display_manager; - _tmp8_ = gdk_display_manager_get_default_display (_tmp7_); - display = _tmp8_; - _tmp9_ = display; - if (_tmp9_ != NULL) { - GdkDisplay* _tmp10_ = NULL; - GdkDeviceManager* _tmp11_ = NULL; - _tmp10_ = display; - _tmp11_ = gdk_display_get_device_manager (_tmp10_); - dev_manager = _tmp11_; + XnoiseDBusSSM* _tmp14_ = NULL; + gboolean _tmp15_ = FALSE; + _tmp14_ = dbus_ssm; + _tmp15_ = xnoise_ssm_backend_is_available (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, XNOISE_TYPE_SSM_BACKEND, XnoiseSSMBackend)); + _tmp12_ = _tmp15_; + } else { + _tmp12_ = FALSE; + } + _tmp16_ = _tmp12_; + if (_tmp16_) { + XnoiseDBusSSM* _tmp17_ = NULL; + gboolean _tmp18_ = FALSE; + _tmp17_ = dbus_ssm; + _tmp18_ = xnoise_ssm_backend_init (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, XNOISE_TYPE_SSM_BACKEND, XnoiseSSMBackend)); + if (_tmp18_) { + XnoiseSSMBackend** _tmp19_ = NULL; + gint _tmp19__length1 = 0; + XnoiseDBusSSM* _tmp20_ = NULL; + XnoiseSSMBackend* _tmp21_ = NULL; + _tmp19_ = self->priv->backends; + _tmp19__length1 = self->priv->backends_length1; + _tmp20_ = dbus_ssm; + _tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, XNOISE_TYPE_SSM_BACKEND, XnoiseSSMBackend)); + _vala_array_add120 (&self->priv->backends, &self->priv->backends_length1, &self->priv->_backends_size_, _tmp21_); } } - _tmp12_ = gdk_event_new (GDK_KEY_RELEASE); - e = _tmp12_; - _tmp13_ = dev_manager; - if (_tmp13_ != NULL) { - GdkEvent* _tmp14_ = NULL; - GdkDeviceManager* _tmp15_ = NULL; - GList* _tmp16_ = NULL; - GList* _tmp17_ = NULL; - gconstpointer _tmp18_ = NULL; - _tmp14_ = e; - _tmp15_ = dev_manager; - _tmp16_ = gdk_device_manager_list_devices (_tmp15_, GDK_DEVICE_TYPE_MASTER); - _tmp17_ = _tmp16_; - _tmp18_ = g_list_nth_data (_tmp17_, (guint) 0); - gdk_event_set_device (_tmp14_, (GdkDevice*) _tmp18_); - _g_list_free0 (_tmp17_); - } - _tmp19_ = e; - _tmp19_->key.keyval = (guint) GDK_KEY_Shift_L; - _tmp20_ = e; - _tmp21_ = xnoise_main_window; - _tmp22_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GTK_TYPE_WIDGET, GtkWidget)); - _tmp20_->key.window = _tmp22_; - _tmp23_ = e; - _tmp23_->key.send_event = (gint8) 1; - _tmp24_ = e; - _tmp24_->key.time = (guint32) GDK_CURRENT_TIME; - _tmp25_ = e; - _tmp25_->key.state = 0; - _tmp26_ = e; - _tmp26_->key.keyval = (guint) GDK_KEY_Shift_L; - _tmp27_ = e; - _tmp28_ = keys; - _tmp28__length1 = keys_length1; - _tmp29_ = _tmp28_[0]; - _tmp30_ = _tmp29_.keycode; - _tmp27_->key.hardware_keycode = (guint16) _tmp30_; - _tmp31_ = e; - _tmp32_ = keys; - _tmp32__length1 = keys_length1; - _tmp33_ = _tmp32_[0]; - _tmp34_ = _tmp33_.group; - _tmp31_->key.group = (guint8) _tmp34_; - _tmp35_ = display; - _tmp36_ = e; - gdk_display_put_event (_tmp35_, _tmp36_); - result = FALSE; - __vala_GdkEvent_free0 (e); - _g_object_unref0 (keymap); - keys = (g_free (keys), NULL); - return result; -} - - -static gboolean ___lambda132__gsource_func (gpointer self) { - gboolean result; - result = __lambda132_ (self); - return result; -} - - -static gboolean __lambda130_ (XnoiseScreenSaverManager* self) { - gboolean result = FALSE; - gboolean _tmp0_ = FALSE; - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda131__gsource_func, xnoise_screen_saver_manager_ref (self), xnoise_screen_saver_manager_unref); - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda132__gsource_func, xnoise_screen_saver_manager_ref (self), xnoise_screen_saver_manager_unref); - _tmp0_ = self->priv->backlight_dim_prevent; - result = _tmp0_; - return result; + _g_object_unref0 (dbus_ssm); + _g_object_unref0 (xdgssm); + return self; } -static gboolean ___lambda130__gsource_func (gpointer self) { - gboolean result; - result = __lambda130_ (self); - return result; +XnoiseScreenSaverManager* xnoise_screen_saver_manager_new (void) { + return xnoise_screen_saver_manager_construct (XNOISE_TYPE_SCREEN_SAVER_MANAGER); } gboolean xnoise_screen_saver_manager_inhibit (XnoiseScreenSaverManager* self) { gboolean result = FALSE; - XnoiseSSMBackend* _tmp0_ = NULL; - XnoiseSSMBackend* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + XnoiseSSMBackend** _tmp0_ = NULL; + gint _tmp0__length1 = 0; + XnoiseSSMBackend** _tmp1_ = NULL; + gint _tmp1__length1 = 0; g_return_val_if_fail (XNOISE_IS_SCREEN_SAVER_MANAGER (self), FALSE); - g_message ("xnoise-screensaver-manager.vala:50: calling Inhibit"); - self->priv->backlight_dim_prevent = TRUE; - _tmp0_ = self->priv->backend; - if (_tmp0_ == NULL) { - g_print ("cannot suspend screensaver, install xdg-utils"); + g_message ("xnoise-screensaver-manager.vala:58: calling Inhibit"); + _tmp0_ = self->priv->backends; + _tmp0__length1 = self->priv->backends_length1; + if (_tmp0__length1 == 0) { + g_print ("cannot suspend screensaver, install xdg-utils or gnome screensaver "); result = FALSE; return result; } - g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 10, ___lambda130__gsource_func, xnoise_screen_saver_manager_ref (self), xnoise_screen_saver_manager_unref); - _tmp1_ = self->priv->backend; - _tmp2_ = xnoise_ssm_backend_inhibit (_tmp1_); - result = _tmp2_; + _tmp1_ = self->priv->backends; + _tmp1__length1 = self->priv->backends_length1; + { + XnoiseSSMBackend** be_collection = NULL; + gint be_collection_length1 = 0; + gint _be_collection_size_ = 0; + gint be_it = 0; + be_collection = _tmp1_; + be_collection_length1 = _tmp1__length1; + for (be_it = 0; be_it < _tmp1__length1; be_it = be_it + 1) { + XnoiseSSMBackend* _tmp2_ = NULL; + XnoiseSSMBackend* be = NULL; + _tmp2_ = _g_object_ref0 (be_collection[be_it]); + be = _tmp2_; + { + XnoiseSSMBackend* _tmp3_ = NULL; + _tmp3_ = be; + xnoise_ssm_backend_inhibit (_tmp3_); + _g_object_unref0 (be); + } + } + } + result = TRUE; return result; } gboolean xnoise_screen_saver_manager_uninhibit (XnoiseScreenSaverManager* self) { gboolean result = FALSE; - XnoiseSSMBackend* _tmp0_ = NULL; - XnoiseSSMBackend* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + XnoiseSSMBackend** _tmp0_ = NULL; + gint _tmp0__length1 = 0; + XnoiseSSMBackend** _tmp1_ = NULL; + gint _tmp1__length1 = 0; g_return_val_if_fail (XNOISE_IS_SCREEN_SAVER_MANAGER (self), FALSE); - g_message ("xnoise-screensaver-manager.vala:120: calling UnInhibit"); - self->priv->backlight_dim_prevent = FALSE; - _tmp0_ = self->priv->backend; - if (_tmp0_ == NULL) { + g_message ("xnoise-screensaver-manager.vala:69: calling UnInhibit"); + _tmp0_ = self->priv->backends; + _tmp0__length1 = self->priv->backends_length1; + if (_tmp0__length1 == 0) { result = FALSE; return result; } - _tmp1_ = self->priv->backend; - _tmp2_ = xnoise_ssm_backend_uninhibit (_tmp1_); - result = _tmp2_; + _tmp1_ = self->priv->backends; + _tmp1__length1 = self->priv->backends_length1; + { + XnoiseSSMBackend** be_collection = NULL; + gint be_collection_length1 = 0; + gint _be_collection_size_ = 0; + gint be_it = 0; + be_collection = _tmp1_; + be_collection_length1 = _tmp1__length1; + for (be_it = 0; be_it < _tmp1__length1; be_it = be_it + 1) { + XnoiseSSMBackend* _tmp2_ = NULL; + XnoiseSSMBackend* be = NULL; + _tmp2_ = _g_object_ref0 (be_collection[be_it]); + be = _tmp2_; + { + XnoiseSSMBackend* _tmp3_ = NULL; + _tmp3_ = be; + xnoise_ssm_backend_uninhibit (_tmp3_); + _g_object_unref0 (be); + } + } + } + result = TRUE; return result; } @@ -682,8 +601,12 @@ static void xnoise_screen_saver_manager_instance_init (XnoiseScreenSaverManager * self) { + XnoiseSSMBackend** _tmp0_ = NULL; self->priv = XNOISE_SCREEN_SAVER_MANAGER_GET_PRIVATE (self); - self->priv->backend = NULL; + _tmp0_ = g_new0 (XnoiseSSMBackend*, 0 + 1); + self->priv->backends = _tmp0_; + self->priv->backends_length1 = 0; + self->priv->_backends_size_ = self->priv->backends_length1; self->ref_count = 1; } @@ -691,7 +614,7 @@ static void xnoise_screen_saver_manager_finalize (XnoiseScreenSaverManager* obj) { XnoiseScreenSaverManager * self; self = G_TYPE_CHECK_INSTANCE_CAST (obj, XNOISE_TYPE_SCREEN_SAVER_MANAGER, XnoiseScreenSaverManager); - _g_object_unref0 (self->priv->backend); + self->priv->backends = (_vala_array_free (self->priv->backends, self->priv->backends_length1, (GDestroyNotify) g_object_unref), NULL); } @@ -727,6 +650,472 @@ } +void xnoise_id_bus_screensaver_simulate_user_activity (XnoiseIDBusScreensaver* self, GError** error) { + g_return_if_fail (XNOISE_IS_ID_BUS_SCREENSAVER (self)); + XNOISE_ID_BUS_SCREENSAVER_GET_INTERFACE (self)->simulate_user_activity (self, error); +} + + +static void xnoise_id_bus_screensaver_base_init (XnoiseIDBusScreensaverIface * iface) { + static gboolean initialized = FALSE; + if (!initialized) { + initialized = TRUE; + } +} + + +GType xnoise_id_bus_screensaver_get_type (void) { + static volatile gsize xnoise_id_bus_screensaver_type_id__volatile = 0; + if (g_once_init_enter (&xnoise_id_bus_screensaver_type_id__volatile)) { + static const GTypeInfo g_define_type_info = { sizeof (XnoiseIDBusScreensaverIface), (GBaseInitFunc) xnoise_id_bus_screensaver_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL }; + GType xnoise_id_bus_screensaver_type_id; + xnoise_id_bus_screensaver_type_id = g_type_register_static (G_TYPE_INTERFACE, "XnoiseIDBusScreensaver", &g_define_type_info, 0); + g_type_interface_add_prerequisite (xnoise_id_bus_screensaver_type_id, G_TYPE_OBJECT); + g_type_set_qdata (xnoise_id_bus_screensaver_type_id, g_quark_from_static_string ("vala-dbus-proxy-type"), (void*) xnoise_id_bus_screensaver_proxy_get_type); + g_type_set_qdata (xnoise_id_bus_screensaver_type_id, g_quark_from_static_string ("vala-dbus-interface-name"), "org.gnome.ScreenSaver"); + g_type_set_qdata (xnoise_id_bus_screensaver_type_id, g_quark_from_static_string ("vala-dbus-register-object"), (void*) xnoise_id_bus_screensaver_register_object); + g_once_init_leave (&xnoise_id_bus_screensaver_type_id__volatile, xnoise_id_bus_screensaver_type_id); + } + return xnoise_id_bus_screensaver_type_id__volatile; +} + + +G_DEFINE_TYPE_EXTENDED (XnoiseIDBusScreensaverProxy, xnoise_id_bus_screensaver_proxy, G_TYPE_DBUS_PROXY, 0, G_IMPLEMENT_INTERFACE (XNOISE_TYPE_ID_BUS_SCREENSAVER, xnoise_id_bus_screensaver_proxy_xnoise_id_bus_screensaver_interface_init) ) +static void xnoise_id_bus_screensaver_proxy_class_init (XnoiseIDBusScreensaverProxyClass* klass) { + G_DBUS_PROXY_CLASS (klass)->g_signal = xnoise_id_bus_screensaver_proxy_g_signal; +} + + +static void xnoise_id_bus_screensaver_proxy_g_signal (GDBusProxy* proxy, const gchar* sender_name, const gchar* signal_name, GVariant* parameters) { +} + + +static void xnoise_id_bus_screensaver_proxy_init (XnoiseIDBusScreensaverProxy* self) { +} + + +static void xnoise_id_bus_screensaver_proxy_simulate_user_activity (XnoiseIDBusScreensaver* self, GError** error) { + GDBusMessage *_message; + GVariant *_arguments; + GVariantBuilder _arguments_builder; + GDBusMessage *_reply_message; + G_IO_ERROR; + _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.gnome.ScreenSaver", "SimulateUserActivity"); + g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE); + _arguments = g_variant_builder_end (&_arguments_builder); + g_dbus_message_set_body (_message, _arguments); + _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error); + g_object_unref (_message); + if (!_reply_message) { + return; + } + if (g_dbus_message_to_gerror (_reply_message, error)) { + g_object_unref (_reply_message); + return; + } + g_object_unref (_reply_message); +} + + +static void xnoise_id_bus_screensaver_proxy_xnoise_id_bus_screensaver_interface_init (XnoiseIDBusScreensaverIface* iface) { + iface->simulate_user_activity = xnoise_id_bus_screensaver_proxy_simulate_user_activity; +} + + +static void _dbus_xnoise_id_bus_screensaver_simulate_user_activity (XnoiseIDBusScreensaver* self, GVariant* parameters, GDBusMethodInvocation* invocation) { + GError* error = NULL; + GVariantIter _arguments_iter; + GDBusMessage* _reply_message; + GVariant* _reply; + GVariantBuilder _reply_builder; + g_variant_iter_init (&_arguments_iter, parameters); + xnoise_id_bus_screensaver_simulate_user_activity (self, &error); + if (error) { + g_dbus_method_invocation_return_gerror (invocation, error); + return; + } + _reply_message = g_dbus_message_new_method_reply (g_dbus_method_invocation_get_message (invocation)); + g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE); + _reply = g_variant_builder_end (&_reply_builder); + g_dbus_message_set_body (_reply_message, _reply); + g_dbus_connection_send_message (g_dbus_method_invocation_get_connection (invocation), _reply_message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL); + g_object_unref (invocation); + g_object_unref (_reply_message); +} + + +static void xnoise_id_bus_screensaver_dbus_interface_method_call (GDBusConnection* connection, const gchar* sender, const gchar* object_path, const gchar* interface_name, const gchar* method_name, GVariant* parameters, GDBusMethodInvocation* invocation, gpointer user_data) { + gpointer* data; + gpointer object; + data = user_data; + object = data[0]; + if (strcmp (method_name, "SimulateUserActivity") == 0) { + _dbus_xnoise_id_bus_screensaver_simulate_user_activity (object, parameters, invocation); + } else { + g_object_unref (invocation); + } +} + + +static GVariant* xnoise_id_bus_screensaver_dbus_interface_get_property (GDBusConnection* connection, const gchar* sender, const gchar* object_path, const gchar* interface_name, const gchar* property_name, GError** error, gpointer user_data) { + gpointer* data; + gpointer object; + data = user_data; + object = data[0]; + return NULL; +} + + +static gboolean xnoise_id_bus_screensaver_dbus_interface_set_property (GDBusConnection* connection, const gchar* sender, const gchar* object_path, const gchar* interface_name, const gchar* property_name, GVariant* value, GError** error, gpointer user_data) { + gpointer* data; + gpointer object; + data = user_data; + object = data[0]; + return FALSE; +} + + +guint xnoise_id_bus_screensaver_register_object (gpointer object, GDBusConnection* connection, const gchar* path, GError** error) { + guint result; + gpointer *data; + data = g_new (gpointer, 3); + data[0] = g_object_ref (object); + data[1] = g_object_ref (connection); + data[2] = g_strdup (path); + result = g_dbus_connection_register_object (connection, path, (GDBusInterfaceInfo *) (&_xnoise_id_bus_screensaver_dbus_interface_info), &_xnoise_id_bus_screensaver_dbus_interface_vtable, data, _xnoise_id_bus_screensaver_unregister_object, error); + if (!result) { + return 0; + } + return result; +} + + +static void _xnoise_id_bus_screensaver_unregister_object (gpointer user_data) { + gpointer* data; + data = user_data; + g_object_unref (data[0]); + g_object_unref (data[1]); + g_free (data[2]); + g_free (data); +} + + +XnoiseDBusSSM* xnoise_dbus_ssm_construct (GType object_type) { + XnoiseDBusSSM * self = NULL; + self = (XnoiseDBusSSM*) g_object_new (object_type, NULL); + return self; +} + + +XnoiseDBusSSM* xnoise_dbus_ssm_new (void) { + return xnoise_dbus_ssm_construct (XNOISE_TYPE_DBUS_SSM); +} + + +static gboolean xnoise_dbus_ssm_real_is_available (XnoiseSSMBackend* base) { + XnoiseDBusSSM * self; + gboolean result = FALSE; + self = G_TYPE_CHECK_INSTANCE_CAST (base, XNOISE_TYPE_DBUS_SSM, XnoiseDBusSSM); + result = TRUE; + return result; +} + + +static gboolean xnoise_dbus_ssm_real_init (XnoiseSSMBackend* base) { + XnoiseDBusSSM * self; + gboolean result = FALSE; + self = G_TYPE_CHECK_INSTANCE_CAST (base, XNOISE_TYPE_DBUS_SSM, XnoiseDBusSSM); + xnoise_dbus_ssm_get_dbus_proxy (self, NULL, NULL); + result = TRUE; + return result; +} + + +static gboolean __lambda130_ (XnoiseDBusSSM* self) { + gboolean result = FALSE; + gboolean _tmp0_ = FALSE; + _tmp0_ = self->priv->setup_success; + if (!_tmp0_) { + self->priv->activity_src = (guint) 0; + result = FALSE; + return result; + } + xnoise_dbus_ssm_send_activity (self); + result = TRUE; + return result; +} + + +static gboolean ___lambda130__gsource_func (gpointer self) { + gboolean result; + result = __lambda130_ (self); + return result; +} + + +static gboolean xnoise_dbus_ssm_real_inhibit (XnoiseSSMBackend* base) { + XnoiseDBusSSM * self; + gboolean result = FALSE; + guint _tmp0_ = 0U; + guint _tmp2_ = 0U; + self = G_TYPE_CHECK_INSTANCE_CAST (base, XNOISE_TYPE_DBUS_SSM, XnoiseDBusSSM); + _tmp0_ = self->priv->activity_src; + if (_tmp0_ != ((guint) 0)) { + guint _tmp1_ = 0U; + _tmp1_ = self->priv->activity_src; + g_source_remove (_tmp1_); + } + _tmp2_ = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 10, ___lambda130__gsource_func, g_object_ref (self), g_object_unref); + self->priv->activity_src = _tmp2_; + result = TRUE; + return result; +} + + +static gboolean xnoise_dbus_ssm_real_uninhibit (XnoiseSSMBackend* base) { + XnoiseDBusSSM * self; + gboolean result = FALSE; + guint _tmp0_ = 0U; + self = G_TYPE_CHECK_INSTANCE_CAST (base, XNOISE_TYPE_DBUS_SSM, XnoiseDBusSSM); + _tmp0_ = self->priv->activity_src; + if (_tmp0_ != ((guint) 0)) { + guint _tmp1_ = 0U; + _tmp1_ = self->priv->activity_src; + g_source_remove (_tmp1_); + self->priv->activity_src = (guint) 0; + } + result = TRUE; + return result; +} + + +void xnoise_dbus_ssm_send_activity (XnoiseDBusSSM* self) { + gboolean _tmp0_ = FALSE; + XnoiseIDBusScreensaver* _tmp1_ = NULL; + gboolean _tmp3_ = FALSE; + GError * _inner_error_ = NULL; + g_return_if_fail (XNOISE_IS_DBUS_SSM (self)); + _tmp1_ = self->priv->screensaver_proxy; + if (_tmp1_ == NULL) { + _tmp0_ = TRUE; + } else { + gboolean _tmp2_ = FALSE; + _tmp2_ = self->priv->setup_success; + _tmp0_ = !_tmp2_; + } + _tmp3_ = _tmp0_; + if (_tmp3_) { + return; + } + { + XnoiseIDBusScreensaver* _tmp4_ = NULL; + _tmp4_ = self->priv->screensaver_proxy; + xnoise_id_bus_screensaver_simulate_user_activity (_tmp4_, &_inner_error_); + if (_inner_error_ != NULL) { + if (_inner_error_->domain == G_IO_ERROR) { + goto __catch153_g_io_error; + } + g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); + g_clear_error (&_inner_error_); + return; + } + } + goto __finally153; + __catch153_g_io_error: + { + GError* e = NULL; + GError* _tmp5_ = NULL; + const gchar* _tmp6_ = NULL; + e = _inner_error_; + _inner_error_ = NULL; + _tmp5_ = e; + _tmp6_ = _tmp5_->message; + g_print ("%s\n", _tmp6_); + _g_error_free0 (e); + } + __finally153: + if (_inner_error_ != NULL) { + g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); + g_clear_error (&_inner_error_); + return; + } +} + + +static void xnoise_dbus_ssm_on_name_appeared (XnoiseDBusSSM* self, GDBusConnection* conn, const gchar* name) { + XnoiseIDBusScreensaver* _tmp0_ = NULL; + g_return_if_fail (XNOISE_IS_DBUS_SSM (self)); + g_return_if_fail (G_IS_DBUS_CONNECTION (conn)); + g_return_if_fail (name != NULL); + _tmp0_ = self->priv->screensaver_proxy; + if (_tmp0_ == NULL) { + g_print ("Dbus: screensaver's name appeared but proxy is not available\n"); + return; + } + self->priv->setup_success = TRUE; +} + + +static void xnoise_dbus_ssm_on_name_vanished (XnoiseDBusSSM* self, GDBusConnection* conn, const gchar* name) { + g_return_if_fail (XNOISE_IS_DBUS_SSM (self)); + g_return_if_fail (G_IS_DBUS_CONNECTION (conn)); + g_return_if_fail (name != NULL); + g_print ("DBus: screensaver dbus name disappeared\n"); +} + + +static void xnoise_dbus_ssm_get_dbus_proxy_data_free (gpointer _data) { + XnoiseDbusSsmGetDbusProxyData* _data_; + _data_ = _data; + _g_object_unref0 (_data_->self); + g_slice_free (XnoiseDbusSsmGetDbusProxyData, _data_); +} + + +static void xnoise_dbus_ssm_get_dbus_proxy (XnoiseDBusSSM* self, GAsyncReadyCallback _callback_, gpointer _user_data_) { + XnoiseDbusSsmGetDbusProxyData* _data_; + XnoiseDBusSSM* _tmp0_ = NULL; + _data_ = g_slice_new0 (XnoiseDbusSsmGetDbusProxyData); + _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, xnoise_dbus_ssm_get_dbus_proxy); + g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, xnoise_dbus_ssm_get_dbus_proxy_data_free); + _tmp0_ = _g_object_ref0 (self); + _data_->self = _tmp0_; + xnoise_dbus_ssm_get_dbus_proxy_co (_data_); +} + + +static void xnoise_dbus_ssm_get_dbus_proxy_finish (XnoiseDBusSSM* self, GAsyncResult* _res_) { + XnoiseDbusSsmGetDbusProxyData* _data_; + _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); +} + + +static void xnoise_dbus_ssm_get_dbus_proxy_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_) { + XnoiseDbusSsmGetDbusProxyData* _data_; + _data_ = _user_data_; + _data_->_source_object_ = source_object; + _data_->_res_ = _res_; + xnoise_dbus_ssm_get_dbus_proxy_co (_data_); +} + + +static void _xnoise_dbus_ssm_on_name_appeared_gbus_name_appeared_callback (GDBusConnection* connection, const gchar* name, const gchar* name_owner, gpointer self) { + xnoise_dbus_ssm_on_name_appeared (self, connection, name); +} + + +static void _xnoise_dbus_ssm_on_name_vanished_gbus_name_vanished_callback (GDBusConnection* connection, const gchar* name, gpointer self) { + xnoise_dbus_ssm_on_name_vanished (self, connection, name); +} + + +static gboolean xnoise_dbus_ssm_get_dbus_proxy_co (XnoiseDbusSsmGetDbusProxyData* _data_) { + switch (_data_->_state_) { + case 0: + goto _state_0; + case 1: + goto _state_1; + default: + g_assert_not_reached (); + } + _state_0: + { + _data_->_state_ = 1; + g_async_initable_new_async (XNOISE_TYPE_ID_BUS_SCREENSAVER_PROXY, 0, NULL, xnoise_dbus_ssm_get_dbus_proxy_ready, _data_, "g-flags", 0, "g-name", "org.gnome.ScreenSaver", "g-bus-type", G_BUS_TYPE_SESSION, "g-object-path", "/", "g-interface-name", "org.gnome.ScreenSaver", NULL); + return FALSE; + _state_1: + _data_->_tmp1_ = NULL; + _data_->_tmp1_ = g_async_initable_new_finish (_data_->_source_object_, _data_->_res_, &_data_->_inner_error_); + _data_->_tmp0_ = (XnoiseIDBusScreensaver*) _data_->_tmp1_; + if (_data_->_inner_error_ != NULL) { + if (_data_->_inner_error_->domain == G_IO_ERROR) { + goto __catch154_g_io_error; + } + g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _data_->_inner_error_->message, g_quark_to_string (_data_->_inner_error_->domain), _data_->_inner_error_->code); + g_clear_error (&_data_->_inner_error_); + return FALSE; + } + _g_object_unref0 (_data_->self->priv->screensaver_proxy); + _data_->self->priv->screensaver_proxy = _data_->_tmp0_; + } + goto __finally154; + __catch154_g_io_error: + { + _data_->er = _data_->_inner_error_; + _data_->_inner_error_ = NULL; + _data_->_tmp2_ = NULL; + _data_->_tmp2_ = _data_->er; + _data_->_tmp3_ = NULL; + _data_->_tmp3_ = _data_->_tmp2_->message; + g_print ("%s\n", _data_->_tmp3_); + _g_error_free0 (_data_->er); + } + __finally154: + if (_data_->_inner_error_ != NULL) { + g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _data_->_inner_error_->message, g_quark_to_string (_data_->_inner_error_->domain), _data_->_inner_error_->code); + g_clear_error (&_data_->_inner_error_); + return FALSE; + } + _data_->_tmp4_ = 0U; + _data_->_tmp4_ = g_bus_watch_name_with_closures (G_BUS_TYPE_SESSION, "org.gnome.ScreenSaver", G_BUS_NAME_WATCHER_FLAGS_NONE, (GClosure*) ((_xnoise_dbus_ssm_on_name_appeared_gbus_name_appeared_callback == NULL) ? NULL : g_cclosure_new ((GCallback) _xnoise_dbus_ssm_on_name_appeared_gbus_name_appeared_callback, g_object_ref (_data_->self), g_object_unref)), (GClosure*) ((_xnoise_dbus_ssm_on_name_vanished_gbus_name_vanished_callback == NULL) ? NULL : g_cclosure_new ((GCallback) _xnoise_dbus_ssm_on_name_vanished_gbus_name_vanished_callback, g_object_ref (_data_->self), g_object_unref))); + _data_->self->priv->watch = _data_->_tmp4_; + if (_data_->_state_ == 0) { + g_simple_async_result_complete_in_idle (_data_->_async_result); + } else { + g_simple_async_result_complete (_data_->_async_result); + } + g_object_unref (_data_->_async_result); + return FALSE; +} + + +static void xnoise_dbus_ssm_class_init (XnoiseDBusSSMClass * klass) { + xnoise_dbus_ssm_parent_class = g_type_class_peek_parent (klass); + g_type_class_add_private (klass, sizeof (XnoiseDBusSSMPrivate)); + G_OBJECT_CLASS (klass)->finalize = xnoise_dbus_ssm_finalize; +} + + +static void xnoise_dbus_ssm_xnoise_ssm_backend_interface_init (XnoiseSSMBackendIface * iface) { + xnoise_dbus_ssm_xnoise_ssm_backend_parent_iface = g_type_interface_peek_parent (iface); + iface->is_available = (gboolean (*)(XnoiseSSMBackend*)) xnoise_dbus_ssm_real_is_available; + iface->init = (gboolean (*)(XnoiseSSMBackend*)) xnoise_dbus_ssm_real_init; + iface->inhibit = (gboolean (*)(XnoiseSSMBackend*)) xnoise_dbus_ssm_real_inhibit; + iface->uninhibit = (gboolean (*)(XnoiseSSMBackend*)) xnoise_dbus_ssm_real_uninhibit; +} + + +static void xnoise_dbus_ssm_instance_init (XnoiseDBusSSM * self) { + self->priv = XNOISE_DBUS_SSM_GET_PRIVATE (self); + self->priv->watch = (guint) 0; + self->priv->screensaver_proxy = NULL; + self->priv->setup_success = FALSE; + self->priv->activity_src = (guint) 0; +} + + +static void xnoise_dbus_ssm_finalize (GObject* obj) { + XnoiseDBusSSM * self; + self = G_TYPE_CHECK_INSTANCE_CAST (obj, XNOISE_TYPE_DBUS_SSM, XnoiseDBusSSM); + _g_object_unref0 (self->priv->screensaver_proxy); + G_OBJECT_CLASS (xnoise_dbus_ssm_parent_class)->finalize (obj); +} + + +GType xnoise_dbus_ssm_get_type (void) { + static volatile gsize xnoise_dbus_ssm_type_id__volatile = 0; + if (g_once_init_enter (&xnoise_dbus_ssm_type_id__volatile)) { + static const GTypeInfo g_define_type_info = { sizeof (XnoiseDBusSSMClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) xnoise_dbus_ssm_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (XnoiseDBusSSM), 0, (GInstanceInitFunc) xnoise_dbus_ssm_instance_init, NULL }; + static const GInterfaceInfo xnoise_ssm_backend_info = { (GInterfaceInitFunc) xnoise_dbus_ssm_xnoise_ssm_backend_interface_init, (GInterfaceFinalizeFunc) NULL, NULL}; + GType xnoise_dbus_ssm_type_id; + xnoise_dbus_ssm_type_id = g_type_register_static (G_TYPE_OBJECT, "XnoiseDBusSSM", &g_define_type_info, 0); + g_type_add_interface_static (xnoise_dbus_ssm_type_id, XNOISE_TYPE_SSM_BACKEND, &xnoise_ssm_backend_info); + g_once_init_leave (&xnoise_dbus_ssm_type_id__volatile, xnoise_dbus_ssm_type_id); + } + return xnoise_dbus_ssm_type_id__volatile; +} + + gboolean xnoise_ssm_backend_is_available (XnoiseSSMBackend* self) { g_return_val_if_fail (XNOISE_IS_SSM_BACKEND (self), FALSE); return XNOISE_SSM_BACKEND_GET_INTERFACE (self)->is_available (self); @@ -891,11 +1280,11 @@ self->priv->exit_status = _tmp7_; _tmp6_ = (_vala_array_free (_tmp6_, _tmp6__length1, (GDestroyNotify) g_free), NULL); if (_inner_error_ != NULL) { - goto __catch153_g_error; + goto __catch155_g_error; } } - goto __finally153; - __catch153_g_error: + goto __finally155; + __catch155_g_error: { GError* e = NULL; GError* _tmp8_ = NULL; @@ -909,7 +1298,7 @@ _g_error_free0 (e); return result; } - __finally153: + __finally155: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -956,11 +1345,11 @@ self->priv->exit_status = _tmp7_; _tmp6_ = (_vala_array_free (_tmp6_, _tmp6__length1, (GDestroyNotify) g_free), NULL); if (_inner_error_ != NULL) { - goto __catch154_g_error; + goto __catch156_g_error; } } - goto __finally154; - __catch154_g_error: + goto __finally156; + __catch156_g_error: { GError* e = NULL; GError* _tmp8_ = NULL; @@ -974,7 +1363,7 @@ _g_error_free0 (e); return result; } - __finally154: + __finally156: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); diff -Nru xnoise-0.2.20/libxnoise/ScreensaverManager/xnoise-screensaver-manager.vala xnoise-0.2.21/libxnoise/ScreensaverManager/xnoise-screensaver-manager.vala --- xnoise-0.2.20/libxnoise/ScreensaverManager/xnoise-screensaver-manager.vala 2013-11-20 13:30:52.000000000 +0000 +++ xnoise-0.2.21/libxnoise/ScreensaverManager/xnoise-screensaver-manager.vala 2014-01-17 15:16:42.000000000 +0000 @@ -1,7 +1,7 @@ /* xnoise-screensaver-manager.vala * * Copyright (C) 2010 Andreas Obergrusberger - * Copyright (C) 2011 Jörn Magens + * Copyright (C) 2011, 2013, 2014 Jörn Magens * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -30,100 +30,149 @@ */ -using GLib; namespace Xnoise { - class ScreenSaverManager { - private SSMBackend backend = null; - private bool backlight_dim_prevent; + + private class ScreenSaverManager { + + private SSMBackend[] backends = {}; public ScreenSaverManager() { - backlight_dim_prevent = true; var xdgssm = new XdgSSM(); - if(xdgssm.is_available()) backend = xdgssm; - if(backend == null) return; - if (!backend.init()) backend = null; - } + if(xdgssm != null && xdgssm.is_available()) { + if(xdgssm.init()) + backends += xdgssm; + } + var dbus_ssm = new DBusSSM(); + if(dbus_ssm != null && dbus_ssm.is_available()) { + if(dbus_ssm.init()) + backends += dbus_ssm; + } + //print("%d screensaver manager backends running\n", backends.length); + } + + public bool inhibit() { message("calling Inhibit"); - backlight_dim_prevent = true; - if (backend == null) { - print("cannot suspend screensaver, install xdg-utils"); + if (backends.length == 0) { + print("cannot suspend screensaver, install xdg-utils or gnome screensaver "); return false; } - Timeout.add_seconds(10, () => { - //print("event\n"); - Idle.add(() => { - Gdk.KeymapKey[] keys; - Gdk.Keymap keymap = Gdk.Keymap.get_default(); - keymap.get_entries_for_keyval(Gdk.Key.Shift_L, out keys); - unowned Gdk.DisplayManager display_manager = Gdk.DisplayManager.@get(); - unowned Gdk.Display display = null; - unowned Gdk.DeviceManager dev_manager = null; - if(display_manager != null) { - display = display_manager.get_default_display(); - if(display != null) - dev_manager = display.get_device_manager(); - } - - Gdk.Event e = new Gdk.Event(Gdk.EventType.KEY_PRESS); - if(dev_manager != null) - e.set_device(dev_manager.list_devices(Gdk.DeviceType.MASTER).nth_data(0)); - e.key.keyval = Gdk.Key.Shift_L; - e.key.window = main_window.get_window(); - e.key.send_event = 1; - e.key.time = Gdk.CURRENT_TIME; - e.key.state = Gdk.ModifierType.SHIFT_MASK; - e.key.keyval = Gdk.Key.Shift_L; - e.key.hardware_keycode = (uint16)keys[0].keycode; - e.key.group = (uint8)keys[0].group; - - display.put_event(e); - return false; - }); - Idle.add(() => { - Gdk.KeymapKey[] keys; - Gdk.Keymap keymap = Gdk.Keymap.get_default(); - keymap.get_entries_for_keyval(Gdk.Key.Shift_L, out keys); - unowned Gdk.DisplayManager display_manager = Gdk.DisplayManager.@get(); - unowned Gdk.Display display = null; - unowned Gdk.DeviceManager dev_manager = null; - if(display_manager != null) { - display = display_manager.get_default_display(); - if(display != null) - dev_manager = display.get_device_manager(); - } - - Gdk.Event e = new Gdk.Event(Gdk.EventType.KEY_RELEASE); - if(dev_manager != null) - e.set_device(dev_manager.list_devices(Gdk.DeviceType.MASTER).nth_data(0)); - e.key.keyval = Gdk.Key.Shift_L; - e.key.window = main_window.get_window(); - e.key.send_event = 1; - e.key.time = Gdk.CURRENT_TIME; - e.key.state = 0; - e.key.keyval = Gdk.Key.Shift_L; - e.key.hardware_keycode = (uint16)keys[0].keycode; - e.key.group = (uint8)keys[0].group; - - display.put_event(e); - return false; - }); - return backlight_dim_prevent; - }); - return backend.inhibit(); + foreach(SSMBackend be in backends) + be.inhibit(); + return true; } public bool uninhibit() { message("calling UnInhibit"); - backlight_dim_prevent = false; - if (backend == null) return false; - return backend.uninhibit(); + if (backends.length == 0) + return false; + foreach(SSMBackend be in backends) + be.uninhibit(); + return true; } } + + [DBus(name = "org.gnome.ScreenSaver")] + private interface IDBusScreensaver : GLib.Object { + public abstract void simulate_user_activity() throws IOError; + } + + + private class DBusSSM : GLib.Object, SSMBackend { + private uint watch = 0; + + private IDBusScreensaver screensaver_proxy = null; + private bool setup_success = false; + + public DBusSSM() { + } + + + public bool is_available() { + return true; + } + + public bool init() { + get_dbus_proxy.begin(); + return true; + } + + private uint activity_src = 0; + + public bool inhibit() { + if(activity_src != 0) + Source.remove(activity_src); + activity_src = Timeout.add_seconds(10, () => { + if(!setup_success) { + activity_src = 0; + return false; + } + send_activity(); + return true; + }); + return true; + } + + public bool uninhibit() { + if(activity_src != 0) { + Source.remove(activity_src); + activity_src = 0; + } + return true; + } + + public void send_activity() { + if(screensaver_proxy == null || !setup_success) + return; + //print("send dbus activity\n"); + try { + screensaver_proxy.simulate_user_activity(); + } + catch(IOError e) { + print("%s\n", e.message); + } + } + + private void on_name_appeared(DBusConnection conn, string name) { + if(screensaver_proxy == null) { + print("Dbus: screensaver's name appeared but proxy is not available\n"); + return; + } + //print("Dbus screensaver setup success\n"); + setup_success = true; + } + + private void on_name_vanished(DBusConnection conn, string name) { + print("DBus: screensaver dbus name disappeared\n"); + } + + private async void get_dbus_proxy() { + try { + screensaver_proxy = yield Bus.get_proxy(BusType.SESSION, + "org.gnome.ScreenSaver", + "/", + 0, + null + ); + } + catch(IOError er) { + print("%s\n", er.message); + } + + watch = Bus.watch_name(BusType.SESSION, + "org.gnome.ScreenSaver", + BusNameWatcherFlags.NONE, + on_name_appeared, + on_name_vanished); + } + } + + + private interface SSMBackend : GLib.Object { public abstract bool is_available(); public abstract bool init(); @@ -132,7 +181,6 @@ } - private class XdgSSM : GLib.Object, SSMBackend { private string path = null; @@ -158,51 +206,51 @@ } return false; } - + public bool is_available() { return get_path(); } - + public bool init() { if (path == null) return get_path(); return true; } - + public bool inhibit() { //int id = get_window_id(); //print ("%i", id); try { - Process.spawn_sync (null, {path, inhibit_param, get_window_id().to_string()}, null, - SpawnFlags.STDOUT_TO_DEV_NULL, - null, - null, - null, - out exit_status); + Process.spawn_sync(null, {path, inhibit_param, get_window_id().to_string()}, null, + SpawnFlags.STDOUT_TO_DEV_NULL, + null, + null, + null, + out exit_status); } catch(GLib.Error e) { print("Failed to inhibit screensaver using xdg-screensaver: %s\n", e.message); return false; } - - if(exit_status == 0) return true; + if(exit_status == 0) + return true; return true; } public bool uninhibit() { try { - Process.spawn_sync (null, {path, uninhibit_param, get_window_id().to_string()}, null, - SpawnFlags.STDOUT_TO_DEV_NULL, - null, - null, - null, - out exit_status); + Process.spawn_sync(null, {path, uninhibit_param, get_window_id().to_string()}, null, + SpawnFlags.STDOUT_TO_DEV_NULL, + null, + null, + null, + out exit_status); } catch(GLib.Error e) { print("Failed to uninhibit screensaver using xdg-screensaver: %s", e.message); return false; } - - if(exit_status == 0) return true; + if(exit_status == 0) + return true; return false; } } diff -Nru xnoise-0.2.20/libxnoise/SimpleMarkup/xnoise-markup-node.c xnoise-0.2.21/libxnoise/SimpleMarkup/xnoise-markup-node.c --- xnoise-0.2.20/libxnoise/SimpleMarkup/xnoise-markup-node.c 2013-12-11 11:24:24.000000000 +0000 +++ xnoise-0.2.21/libxnoise/SimpleMarkup/xnoise-markup-node.c 2014-01-27 09:32:57.000000000 +0000 @@ -268,7 +268,7 @@ XnoiseSimpleMarkupNode* xnoise_simple_markup_node_iterator_get (XnoiseSimpleMarkupNodeIterator* self); const gchar* xnoise_simple_markup_node_get_name (XnoiseSimpleMarkupNode* self); XnoiseSimpleMarkupNode** xnoise_simple_markup_node_get_children_by_name (XnoiseSimpleMarkupNode* self, const gchar* childname, int* result_length1); -static void _vala_array_add119 (XnoiseSimpleMarkupNode*** array, int* length, int* size, XnoiseSimpleMarkupNode* value); +static void _vala_array_add121 (XnoiseSimpleMarkupNode*** array, int* length, int* size, XnoiseSimpleMarkupNode* value); gint xnoise_simple_markup_node_get_idx_of_child (XnoiseSimpleMarkupNode* self, XnoiseSimpleMarkupNode* node); XnoiseSimpleMarkupNode* xnoise_simple_markup_node_get (XnoiseSimpleMarkupNode* self, gint idx); XnoiseSimpleMarkupNode* xnoise_simple_markup_node_get_previous (XnoiseSimpleMarkupNode* self); @@ -690,7 +690,7 @@ } -static void _vala_array_add119 (XnoiseSimpleMarkupNode*** array, int* length, int* size, XnoiseSimpleMarkupNode* value) { +static void _vala_array_add121 (XnoiseSimpleMarkupNode*** array, int* length, int* size, XnoiseSimpleMarkupNode* value) { if ((*length) == (*size)) { *size = (*size) ? (2 * (*size)) : 4; *array = g_renew (XnoiseSimpleMarkupNode*, *array, (*size) + 1); @@ -750,7 +750,7 @@ _tmp10__length1 = nds_length1; _tmp11_ = n; _tmp12_ = _xnoise_simple_markup_node_ref0 (_tmp11_); - _vala_array_add119 (&nds, &nds_length1, &_nds_size_, _tmp12_); + _vala_array_add121 (&nds, &nds_length1, &_nds_size_, _tmp12_); } } _xnoise_simple_markup_node_iterator_unref0 (_n_it); diff -Nru xnoise-0.2.20/libxnoise/SimpleMarkup/xnoise-markup-reader.c xnoise-0.2.21/libxnoise/SimpleMarkup/xnoise-markup-reader.c --- xnoise-0.2.20/libxnoise/SimpleMarkup/xnoise-markup-reader.c 2013-12-11 11:24:24.000000000 +0000 +++ xnoise-0.2.21/libxnoise/SimpleMarkup/xnoise-markup-reader.c 2014-01-27 09:32:57.000000000 +0000 @@ -457,7 +457,7 @@ _g_object_unref0 (_tmp23_); if (_inner_error_ != NULL) { _g_free0 (tmp_dir); - goto __catch155_g_error; + goto __catch157_g_error; } } _tmp25_ = self->priv->file; @@ -466,13 +466,13 @@ _tmp24_ = _tmp27_; if (_inner_error_ != NULL) { _g_free0 (tmp_dir); - goto __catch155_g_error; + goto __catch157_g_error; } buf = _tmp24_; _g_free0 (tmp_dir); } - goto __finally155; - __catch155_g_error: + goto __finally157; + __catch157_g_error: { GError* e = NULL; GError* _tmp28_ = NULL; @@ -488,7 +488,7 @@ _g_object_unref0 (dest); return result; } - __finally155: + __finally157: if (_inner_error_ != NULL) { _g_rand_free0 (rnd); _g_object_unref0 (dest); @@ -617,7 +617,7 @@ _g_object_unref0 (_data_->_tmp23_); if (_data_->_inner_error_ != NULL) { _g_free0 (_data_->tmp_dir); - goto __catch156_g_error; + goto __catch158_g_error; } } _data_->_tmp25_ = NULL; @@ -633,13 +633,13 @@ _data_->_tmp24_ = _data_->_tmp27_; if (_data_->_inner_error_ != NULL) { _g_free0 (_data_->tmp_dir); - goto __catch156_g_error; + goto __catch158_g_error; } _data_->buf = _data_->_tmp24_; _g_free0 (_data_->tmp_dir); } - goto __finally156; - __catch156_g_error: + goto __finally158; + __catch158_g_error: { _data_->e = _data_->_inner_error_; _data_->_inner_error_ = NULL; @@ -660,7 +660,7 @@ g_object_unref (_data_->_async_result); return FALSE; } - __finally156: + __finally158: if (_data_->_inner_error_ != NULL) { _g_rand_free0 (_data_->rnd); _g_object_unref0 (_data_->dest); @@ -716,15 +716,15 @@ _g_free0 (_tmp5_); if (_inner_error_ != NULL) { if (_inner_error_->domain == G_FILE_ERROR) { - goto __catch157_g_file_error; + goto __catch159_g_file_error; } g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); return; } } - goto __finally157; - __catch157_g_file_error: + goto __finally159; + __catch159_g_file_error: { GError* e = NULL; GError* _tmp7_ = NULL; @@ -736,7 +736,7 @@ g_print ("Unable to get file content: %s", _tmp8_); _g_error_free0 (e); } - __finally157: + __finally159: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -838,7 +838,7 @@ _data_->_tmp11_ = g_file_read (_data_->_tmp10_, NULL, &_data_->_inner_error_); _data_->_tmp9_ = _data_->_tmp11_; if (_data_->_inner_error_ != NULL) { - goto __catch158_g_error; + goto __catch160_g_error; } _data_->_tmp12_ = NULL; _data_->_tmp12_ = _data_->_tmp9_; @@ -861,7 +861,7 @@ if (_data_->_inner_error_ != NULL) { _g_free0 (_data_->line); _g_object_unref0 (_data_->dis); - goto __catch158_g_error; + goto __catch160_g_error; } _g_free0 (_data_->line); _data_->line = _data_->_tmp15_; @@ -882,8 +882,8 @@ _g_free0 (_data_->line); _g_object_unref0 (_data_->dis); } - goto __finally158; - __catch158_g_error: + goto __finally160; + __catch160_g_error: { _data_->e = _data_->_inner_error_; _data_->_inner_error_ = NULL; @@ -894,7 +894,7 @@ g_print ("%s", _data_->_tmp23_); _g_error_free0 (_data_->e); } - __finally158: + __finally160: if (_data_->_inner_error_ != NULL) { _g_string_free0 (_data_->content_builder); g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _data_->_inner_error_->message, g_quark_to_string (_data_->_inner_error_->domain), _data_->_inner_error_->code); @@ -950,15 +950,15 @@ g_markup_parse_context_parse (_tmp4_, _tmp5_, (gssize) (-1), &_inner_error_); if (_inner_error_ != NULL) { if (_inner_error_->domain == G_MARKUP_ERROR) { - goto __catch159_g_markup_error; + goto __catch161_g_markup_error; } g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); return; } } - goto __finally159; - __catch159_g_markup_error: + goto __finally161; + __catch161_g_markup_error: { GError* e = NULL; GError* _tmp6_ = NULL; @@ -970,7 +970,7 @@ g_print ("%s\n", _tmp7_); _g_error_free0 (e); } - __finally159: + __finally161: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -1126,15 +1126,15 @@ g_markup_parse_context_parse (_tmp5_, _tmp6_, (gssize) (-1), &_inner_error_); if (_inner_error_ != NULL) { if (_inner_error_->domain == G_MARKUP_ERROR) { - goto __catch160_g_markup_error; + goto __catch162_g_markup_error; } g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); return FALSE; } } - goto __finally160; - __catch160_g_markup_error: + goto __finally162; + __catch162_g_markup_error: { GError* e = NULL; GError* _tmp7_ = NULL; @@ -1148,7 +1148,7 @@ _g_error_free0 (e); return result; } - __finally160: + __finally162: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -1235,11 +1235,11 @@ _tmp1_ = self->priv->file; g_file_delete (_tmp1_, NULL, &_inner_error_); if (_inner_error_ != NULL) { - goto __catch161_g_error; + goto __catch163_g_error; } } - goto __finally161; - __catch161_g_error: + goto __finally163; + __catch163_g_error: { GError* e = NULL; GError* _tmp2_ = NULL; @@ -1251,7 +1251,7 @@ g_print ("Error cleaning up: %s\n", _tmp3_); _g_error_free0 (e); } - __finally161: + __finally163: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); diff -Nru xnoise-0.2.20/libxnoise/SimpleMarkup/xnoise-markup-writer.c xnoise-0.2.21/libxnoise/SimpleMarkup/xnoise-markup-writer.c --- xnoise-0.2.20/libxnoise/SimpleMarkup/xnoise-markup-writer.c 2013-12-11 11:24:24.000000000 +0000 +++ xnoise-0.2.21/libxnoise/SimpleMarkup/xnoise-markup-writer.c 2014-01-27 09:32:57.000000000 +0000 @@ -278,20 +278,20 @@ _tmp4_ = f; g_file_delete (_tmp4_, NULL, &_inner_error_); if (_inner_error_ != NULL) { - goto __catch162_g_error; + goto __catch164_g_error; } } _tmp6_ = f; _tmp7_ = g_file_create (_tmp6_, G_FILE_CREATE_REPLACE_DESTINATION, NULL, &_inner_error_); _tmp5_ = _tmp7_; if (_inner_error_ != NULL) { - goto __catch162_g_error; + goto __catch164_g_error; } _g_object_unref0 (stream); stream = _tmp5_; } - goto __finally162; - __catch162_g_error: + goto __finally164; + __catch164_g_error: { GError* e = NULL; GError* _tmp8_ = NULL; @@ -306,7 +306,7 @@ _g_object_unref0 (f); return; } - __finally162: + __finally164: if (_inner_error_ != NULL) { _g_object_unref0 (stream); _g_object_unref0 (f); @@ -459,7 +459,7 @@ _tmp5_ = _tmp10_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_IO_ERROR) { - goto __catch163_g_io_error; + goto __catch165_g_io_error; } g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -474,8 +474,8 @@ text_pointer = _tmp13_ + _tmp14_; } } - goto __finally163; - __catch163_g_io_error: + goto __finally165; + __catch165_g_io_error: { GError* e = NULL; GError* _tmp15_ = NULL; @@ -487,7 +487,7 @@ g_print ("%s\n", _tmp16_); _g_error_free0 (e); } - __finally163: + __finally165: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -636,7 +636,7 @@ regex = _tmp4_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_REGEX_ERROR) { - goto __catch164_g_regex_error; + goto __catch166_g_regex_error; } g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -649,7 +649,7 @@ if (_inner_error_ != NULL) { _g_regex_unref0 (regex); if (_inner_error_->domain == G_REGEX_ERROR) { - goto __catch164_g_regex_error; + goto __catch166_g_regex_error; } _g_regex_unref0 (regex); g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -660,8 +660,8 @@ _g_regex_unref0 (regex); return result; } - goto __finally164; - __catch164_g_regex_error: + goto __finally166; + __catch166_g_regex_error: { GError* e = NULL; e = _inner_error_; @@ -669,7 +669,7 @@ g_assert_not_reached (); _g_error_free0 (e); } - __finally164: + __finally166: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); diff -Nru xnoise-0.2.20/libxnoise/Statistics/xnoise-statistics.c xnoise-0.2.21/libxnoise/Statistics/xnoise-statistics.c --- xnoise-0.2.20/libxnoise/Statistics/xnoise-statistics.c 2013-12-11 11:24:24.000000000 +0000 +++ xnoise-0.2.21/libxnoise/Statistics/xnoise-statistics.c 2014-01-27 09:32:57.000000000 +0000 @@ -147,9 +147,9 @@ static void _xnoise_statistics_on_track_played_xnoise_global_access_uri_repeated (XnoiseGlobalAccess* _sender, const gchar* uri, gpointer self); static Block108Data* block108_data_ref (Block108Data* _data108_); static void block108_data_unref (void * _userdata_); -static gboolean __lambda291_ (Block108Data* _data108_); +static gboolean __lambda289_ (Block108Data* _data108_); static void xnoise_statistics_update_play (XnoiseStatistics* self, const gchar* uri); -static gboolean ___lambda291__gsource_func (gpointer self); +static gboolean ___lambda289__gsource_func (gpointer self); gpointer xnoise_worker_job_ref (gpointer instance); void xnoise_worker_job_unref (gpointer instance); GParamSpec* xnoise_worker_param_spec_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -220,7 +220,7 @@ } -static gboolean __lambda291_ (Block108Data* _data108_) { +static gboolean __lambda289_ (Block108Data* _data108_) { XnoiseStatistics * self; gboolean result = FALSE; const gchar* _tmp0_ = NULL; @@ -233,9 +233,9 @@ } -static gboolean ___lambda291__gsource_func (gpointer self) { +static gboolean ___lambda289__gsource_func (gpointer self) { gboolean result; - result = __lambda291_ (self); + result = __lambda289_ (self); return result; } @@ -267,7 +267,7 @@ _tmp4_ = self->priv->update_play_src; g_source_remove (_tmp4_); } - _tmp5_ = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 3, ___lambda291__gsource_func, block108_data_ref (_data108_), block108_data_unref); + _tmp5_ = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 3, ___lambda289__gsource_func, block108_data_ref (_data108_), block108_data_unref); self->priv->update_play_src = _tmp5_; block108_data_unref (_data108_); _data108_ = NULL; diff -Nru xnoise-0.2.20/libxnoise/TagAccess/xnoise-tag-reader.c xnoise-0.2.21/libxnoise/TagAccess/xnoise-tag-reader.c --- xnoise-0.2.20/libxnoise/TagAccess/xnoise-tag-reader.c 2013-12-11 11:24:24.000000000 +0000 +++ xnoise-0.2.21/libxnoise/TagAccess/xnoise-tag-reader.c 2014-01-27 09:32:57.000000000 +0000 @@ -699,11 +699,11 @@ gdk_pixbuf_loader_write (_tmp161_, _tmp166_, (gsize) _tmp164_, &_inner_error_); _tmp166_ = (g_free (_tmp166_), NULL); if (_inner_error_ != NULL) { - goto __catch165_g_error; + goto __catch167_g_error; } } - goto __finally165; - __catch165_g_error: + goto __finally167; + __catch167_g_error: { GError* e = NULL; GError* _tmp167_ = NULL; @@ -718,11 +718,11 @@ _tmp169_ = pbloader; gdk_pixbuf_loader_close (_tmp169_, &_inner_error_); if (_inner_error_ != NULL) { - goto __catch166_g_error; + goto __catch168_g_error; } } - goto __finally166; - __catch166_g_error: + goto __finally168; + __catch168_g_error: { GError* e = NULL; e = _inner_error_; @@ -730,7 +730,7 @@ g_print ("Error 2\n"); _g_error_free0 (e); } - __finally166: + __finally168: if (_inner_error_ != NULL) { _g_error_free0 (e); _g_error_free0 (e); @@ -750,7 +750,7 @@ } _g_error_free0 (e); } - __finally165: + __finally167: if (_inner_error_ != NULL) { _g_object_unref0 (pbloader); images = (_vala_array_free (images, images_length1, (GDestroyNotify) taginfo_image_free), NULL); @@ -775,7 +775,7 @@ _tmp170_ = pbloader; gdk_pixbuf_loader_close (_tmp170_, &_inner_error_); if (_inner_error_ != NULL) { - goto __catch167_g_error; + goto __catch169_g_error; } _tmp171_ = td; _tmp172_ = pbloader; @@ -784,8 +784,8 @@ _g_object_unref0 (_tmp171_->pixbuf); _tmp171_->pixbuf = _tmp174_; } - goto __finally167; - __catch167_g_error: + goto __finally169; + __catch169_g_error: { GError* e = NULL; GFile* _tmp175_ = NULL; @@ -804,7 +804,7 @@ _g_free0 (_tmp177_); _g_error_free0 (e); } - __finally167: + __finally169: if (_inner_error_ != NULL) { _g_object_unref0 (pbloader); images = (_vala_array_free (images, images_length1, (GDestroyNotify) taginfo_image_free), NULL); diff -Nru xnoise-0.2.20/libxnoise/TrackList/xnoise-tracklist-model.c xnoise-0.2.21/libxnoise/TrackList/xnoise-tracklist-model.c --- xnoise-0.2.20/libxnoise/TrackList/xnoise-tracklist-model.c 2013-12-11 11:24:25.000000000 +0000 +++ xnoise-0.2.21/libxnoise/TrackList/xnoise-tracklist-model.c 2014-01-27 09:32:57.000000000 +0000 @@ -447,7 +447,7 @@ XnoiseTrackData* xnoise_track_data_new (void); XnoiseTrackData* xnoise_track_data_construct (GType object_type); gint32 xnoise_utilities_length_string_to_int (const gchar* s); -static void _vala_array_add122 (XnoiseTrackData*** array, int* length, int* size, XnoiseTrackData* value); +static void _vala_array_add124 (XnoiseTrackData*** array, int* length, int* size, XnoiseTrackData* value); static gboolean ___lambda29__gtk_tree_model_foreach_func (GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer self); gchar* xnoise_track_list_model_get_uri_for_current_position (XnoiseTrackListModel* self); void xnoise_item_init (XnoiseItem *self, XnoiseItemType _type, const gchar* _uri, gint32 _db_id); @@ -1823,7 +1823,7 @@ } -static void _vala_array_add122 (XnoiseTrackData*** array, int* length, int* size, XnoiseTrackData* value) { +static void _vala_array_add124 (XnoiseTrackData*** array, int* length, int* size, XnoiseTrackData* value) { if ((*length) == (*size)) { *size = (*size) ? (2 * (*size)) : 4; *array = g_renew (XnoiseTrackData*, *array, (*size) + 1); @@ -1973,7 +1973,7 @@ _tmp42__length1 = self->priv->tda_length1; _tmp43_ = td; _tmp44_ = _xnoise_track_data_ref0 (_tmp43_); - _vala_array_add122 (&self->priv->tda, &self->priv->tda_length1, &self->priv->_tda_size_, _tmp44_); + _vala_array_add124 (&self->priv->tda, &self->priv->tda_length1, &self->priv->_tda_size_, _tmp44_); result = FALSE; _xnoise_track_data_unref0 (td); _g_free0 (yearString); @@ -2657,7 +2657,7 @@ _tmp22_ = g_file_query_info (_tmp20_, _tmp21_, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_); info = _tmp22_; if (_inner_error_ != NULL) { - goto __catch174_g_error; + goto __catch176_g_error; } _tmp23_ = info; _tmp24_ = g_file_info_get_file_type (_tmp23_); @@ -2673,8 +2673,8 @@ _g_free0 (content); _g_object_unref0 (info); } - goto __finally174; - __catch174_g_error: + goto __finally176; + __catch176_g_error: { GError* e = NULL; GError* _tmp30_ = NULL; @@ -2693,7 +2693,7 @@ _xnoise_item_free0 (item); return; } - __finally174: + __finally176: if (_inner_error_ != NULL) { _g_free0 (fileuri); _g_free0 (attr); @@ -2787,12 +2787,12 @@ _tmp63_ = xnoise_playlist_reader_read (_tmp61_, _tmp62_, NULL, &_inner_error_); _tmp60_ = _tmp63_; if (_inner_error_ != NULL) { - goto __catch175_g_error; + goto __catch177_g_error; } _result_ = _tmp60_; } - goto __finally175; - __catch175_g_error: + goto __finally177; + __catch177_g_error: { GError* e = NULL; GError* _tmp64_ = NULL; @@ -2805,7 +2805,7 @@ _result_ = XNOISE_PLAYLIST_RESULT_UNHANDLED; _g_error_free0 (e); } - __finally175: + __finally177: if (_inner_error_ != NULL) { _g_object_unref0 (reader); _g_free0 (fileuri); diff -Nru xnoise-0.2.20/libxnoise/TrackList/xnoise-tracklist.c xnoise-0.2.21/libxnoise/TrackList/xnoise-tracklist.c --- xnoise-0.2.20/libxnoise/TrackList/xnoise-tracklist.c 2013-12-12 10:00:05.000000000 +0000 +++ xnoise-0.2.21/libxnoise/TrackList/xnoise-tracklist.c 2014-01-27 09:32:57.000000000 +0000 @@ -752,7 +752,7 @@ static gboolean _xnoise_track_list_autoscroll_timeout_gsource_func (gpointer self); static void xnoise_track_list_stop_autoscroll (XnoiseTrackList* self); void xnoise_main_window_restore_tab (XnoiseMainWindow* self); -static void _vala_array_add120 (GtkTreeRowReference*** array, int* length, int* size, GtkTreeRowReference* value); +static void _vala_array_add122 (GtkTreeRowReference*** array, int* length, int* size, GtkTreeRowReference* value); GType xnoise_dnd_data_get_type (void) G_GNUC_CONST; XnoiseDndData* xnoise_dnd_data_dup (const XnoiseDndData* self); void xnoise_dnd_data_free (XnoiseDndData* self); @@ -814,7 +814,7 @@ XnoiseTrackData** xnoise_item_converter_to_trackdata (XnoiseItemConverter* self, XnoiseItem* item, const gchar* searchtext, GHashTable* extra_items, int* result_length1); GType xnoise_global_access_get_type (void) G_GNUC_CONST; const gchar* xnoise_global_access_get_searchtext (XnoiseGlobalAccess* self); -static void _vala_array_add121 (XnoiseTrackData*** array, int* length, int* size, XnoiseTrackData* value); +static void _vala_array_add123 (XnoiseTrackData*** array, int* length, int* size, XnoiseTrackData* value); static XnoiseTrackData** _vala_array_dup34 (XnoiseTrackData** self, int length); static gboolean ___lambda40_ (Block111Data* _data111_); GValue* xnoise_worker_job_get_arg (XnoiseWorkerJob* self, const gchar* name); @@ -2124,7 +2124,7 @@ if (_inner_error_ != NULL) { _g_object_unref0 (title_pixb); _g_object_unref0 (w); - goto __catch168_g_error; + goto __catch170_g_error; } _g_object_unref0 (title_pixb); title_pixb = _tmp9_; @@ -2143,7 +2143,7 @@ if (_inner_error_ != NULL) { _g_object_unref0 (title_pixb); _g_object_unref0 (w); - goto __catch168_g_error; + goto __catch170_g_error; } _g_object_unref0 (title_pixb); title_pixb = _tmp14_; @@ -2161,8 +2161,8 @@ _g_object_unref0 (title_pixb); _g_object_unref0 (w); } - goto __finally168; - __catch168_g_error: + goto __finally170; + __catch170_g_error: { GError* e = NULL; GError* _tmp20_ = NULL; @@ -2183,7 +2183,7 @@ } _g_error_free0 (e); } - __finally168: + __finally170: if (_inner_error_ != NULL) { _g_object_unref0 (selection); g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -2254,7 +2254,7 @@ } -static void _vala_array_add120 (GtkTreeRowReference*** array, int* length, int* size, GtkTreeRowReference* value) { +static void _vala_array_add122 (GtkTreeRowReference*** array, int* length, int* size, GtkTreeRowReference* value) { if ((*length) == (*size)) { *size = (*size) ? (2 * (*size)) : 4; *array = g_renew (GtkTreeRowReference*, *array, (*size) + 1); @@ -2367,7 +2367,7 @@ _tmp25__length1 = self->priv->rowref_list_length1; _tmp26_ = treerowref; treerowref = NULL; - _vala_array_add120 (&self->priv->rowref_list, &self->priv->rowref_list_length1, &self->priv->_rowref_list_size_, _tmp26_); + _vala_array_add122 (&self->priv->rowref_list, &self->priv->rowref_list_length1, &self->priv->_rowref_list_size_, _tmp26_); } _gtk_tree_row_reference_free0 (treerowref); _xnoise_item_free0 (item); @@ -2625,15 +2625,15 @@ _tmp47_ = g_file_query_info (_tmp45_, _tmp46_, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_); info = _tmp47_; if (_inner_error_ != NULL) { - goto __catch169_g_error; + goto __catch171_g_error; } _tmp48_ = info; _tmp49_ = g_file_info_get_file_type (_tmp48_); filetype = _tmp49_; _g_object_unref0 (info); } - goto __finally169; - __catch169_g_error: + goto __finally171; + __catch171_g_error: { GError* e = NULL; GError* _tmp50_ = NULL; @@ -2652,7 +2652,7 @@ _gtk_tree_path_free0 (path); return; } - __finally169: + __finally171: if (_inner_error_ != NULL) { _g_free0 (uri); _g_free0 (attr); @@ -3049,7 +3049,7 @@ } -static void _vala_array_add121 (XnoiseTrackData*** array, int* length, int* size, XnoiseTrackData* value) { +static void _vala_array_add123 (XnoiseTrackData*** array, int* length, int* size, XnoiseTrackData* value) { if ((*length) == (*size)) { *size = (*size) ? (2 * (*size)) : 4; *array = g_renew (XnoiseTrackData*, *array, (*size) + 1); @@ -3556,7 +3556,7 @@ _tmp48__length1 = localarray_length1; _tmp49_ = tmpdata; _tmp50_ = _xnoise_track_data_ref0 (_tmp49_); - _vala_array_add121 (&localarray, &localarray_length1, &_localarray_size_, _tmp50_); + _vala_array_add123 (&localarray, &localarray_length1, &_localarray_size_, _tmp50_); _xnoise_track_data_unref0 (tmpdata); } } @@ -3613,14 +3613,14 @@ _tmp1_ = _tmp4_; if (_inner_error_ != NULL) { _g_free0 (attr); - goto __catch170_g_error; + goto __catch172_g_error; } _g_object_unref0 (enumerator); enumerator = _tmp1_; _g_free0 (attr); } - goto __finally170; - __catch170_g_error: + goto __finally172; + __catch172_g_error: { GError* e = NULL; GFile* _tmp5_ = NULL; @@ -3641,7 +3641,7 @@ _g_object_unref0 (enumerator); return; } - __finally170: + __finally172: if (_inner_error_ != NULL) { _g_object_unref0 (enumerator); g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -3676,7 +3676,7 @@ _tmp12_ = g_file_enumerator_next_file (_tmp11_, NULL, &_inner_error_); _tmp10_ = _tmp12_; if (_inner_error_ != NULL) { - goto __catch171_g_error; + goto __catch173_g_error; } _g_object_unref0 (info); info = _tmp10_; @@ -3722,8 +3722,8 @@ _g_free0 (filename); } } - goto __finally171; - __catch171_g_error: + goto __finally173; + __catch173_g_error: { GError* e = NULL; GError* _tmp31_ = NULL; @@ -3738,7 +3738,7 @@ _g_object_unref0 (enumerator); return; } - __finally171: + __finally173: if (_inner_error_ != NULL) { _g_object_unref0 (info); _g_object_unref0 (enumerator); @@ -4383,7 +4383,7 @@ _tmp5_ = g_file_query_info (_tmp3_, _tmp4_, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_); info = _tmp5_; if (_inner_error_ != NULL) { - goto __catch172_g_error; + goto __catch174_g_error; } _tmp6_ = info; _tmp7_ = g_file_info_get_file_type (_tmp6_); @@ -4399,8 +4399,8 @@ _g_free0 (content); _g_object_unref0 (info); } - goto __finally172; - __catch172_g_error: + goto __finally174; + __catch174_g_error: { GError* e = NULL; GError* _tmp13_ = NULL; @@ -4416,7 +4416,7 @@ _g_object_unref0 (file); return; } - __finally172: + __finally174: if (_inner_error_ != NULL) { _g_free0 (attr); _g_free0 (mime); @@ -4509,12 +4509,12 @@ _tmp47_ = xnoise_playlist_reader_read (_tmp45_, _tmp46_, NULL, &_inner_error_); _tmp44_ = _tmp47_; if (_inner_error_ != NULL) { - goto __catch173_g_error; + goto __catch175_g_error; } _result_ = _tmp44_; } - goto __finally173; - __catch173_g_error: + goto __finally175; + __catch175_g_error: { GError* e = NULL; GError* _tmp48_ = NULL; @@ -4527,7 +4527,7 @@ _result_ = XNOISE_PLAYLIST_RESULT_UNHANDLED; _g_error_free0 (e); } - __finally173: + __finally175: if (_inner_error_ != NULL) { _g_object_unref0 (reader); _g_free0 (attr); diff -Nru xnoise-0.2.20/libxnoise/TrayIcon/xnoise-tray-icon.c xnoise-0.2.21/libxnoise/TrayIcon/xnoise-tray-icon.c --- xnoise-0.2.20/libxnoise/TrayIcon/xnoise-tray-icon.c 2013-12-11 11:24:25.000000000 +0000 +++ xnoise-0.2.21/libxnoise/TrayIcon/xnoise-tray-icon.c 2014-01-27 09:32:57.000000000 +0000 @@ -156,34 +156,34 @@ static gboolean xnoise_tray_icon_on_clicked (XnoiseTrayIcon* self, GdkEventButton* e); static gboolean _xnoise_tray_icon_on_clicked_gtk_status_icon_button_press_event (GtkStatusIcon* _sender, GdkEventButton* event, gpointer self); GType xnoise_gst_player_get_type (void) G_GNUC_CONST; +static void __lambda195_ (XnoiseTrayIcon* self); +static void ___lambda195__xnoise_gst_player_sign_playing (XnoiseGstPlayer* _sender, gpointer self); +static void __lambda196_ (XnoiseTrayIcon* self); +static void ___lambda196__xnoise_gst_player_sign_stopped (XnoiseGstPlayer* _sender, gpointer self); static void __lambda197_ (XnoiseTrayIcon* self); -static void ___lambda197__xnoise_gst_player_sign_playing (XnoiseGstPlayer* _sender, gpointer self); -static void __lambda198_ (XnoiseTrayIcon* self); -static void ___lambda198__xnoise_gst_player_sign_stopped (XnoiseGstPlayer* _sender, gpointer self); -static void __lambda199_ (XnoiseTrayIcon* self); -static void ___lambda199__xnoise_gst_player_sign_paused (XnoiseGstPlayer* _sender, gpointer self); +static void ___lambda197__xnoise_gst_player_sign_paused (XnoiseGstPlayer* _sender, gpointer self); void xnoise_main_window_handle_playpause_action (XnoiseMainWindow* self); static void _xnoise_main_window_handle_playpause_action_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self); -static void __lambda200_ (XnoiseTrayIcon* self); +static void __lambda198_ (XnoiseTrayIcon* self); GType xnoise_control_button_function_get_type (void) G_GNUC_CONST; void xnoise_main_window_handle_control_button_click (XnoiseMainWindow* self, XnoiseControlButtonFunction dir); -static void ___lambda200__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self); -static void __lambda201_ (XnoiseTrayIcon* self); -static void ___lambda201__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self); +static void ___lambda198__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self); +static void __lambda199_ (XnoiseTrayIcon* self); +static void ___lambda199__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self); void xnoise_main_quit (XnoiseMain* self); static void _xnoise_main_quit_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self); GType xnoise_global_access_get_type (void) G_GNUC_CONST; GType xnoise_player_state_get_type (void) G_GNUC_CONST; XnoisePlayerState xnoise_global_access_get_player_state (XnoiseGlobalAccess* self); -static gboolean ____lambda202_ (XnoiseTrayIcon* self); +static gboolean ____lambda200_ (XnoiseTrayIcon* self); void xnoise_main_window_change_track (XnoiseMainWindow* self, XnoiseControlButtonFunction direction, gboolean handle_repeat_state); +static gboolean __lambda201_ (XnoiseTrayIcon* self); +static gboolean ___lambda201__gsource_func (gpointer self); +static gboolean _____lambda200__gsource_func (gpointer self); +static gboolean _____lambda202_ (XnoiseTrayIcon* self); static gboolean __lambda203_ (XnoiseTrayIcon* self); static gboolean ___lambda203__gsource_func (gpointer self); -static gboolean _____lambda202__gsource_func (gpointer self); -static gboolean _____lambda204_ (XnoiseTrayIcon* self); -static gboolean __lambda205_ (XnoiseTrayIcon* self); -static gboolean ___lambda205__gsource_func (gpointer self); -static gboolean ______lambda204__gsource_func (gpointer self); +static gboolean ______lambda202__gsource_func (gpointer self); static void _gtk_status_icon_position_menu_gtk_menu_position_func (GtkMenu* menu, gint* x, gint* y, gboolean* push_in, gpointer self); #define XNOISE_RESOURCES_EMPTYSTRING "" const gchar* xnoise_global_access_get_current_uri (XnoiseGlobalAccess* self); @@ -259,19 +259,19 @@ } -static void __lambda197_ (XnoiseTrayIcon* self) { +static void __lambda195_ (XnoiseTrayIcon* self) { GtkImage* _tmp0_ = NULL; _tmp0_ = self->priv->playpause_popup_image; gtk_image_set_from_stock (_tmp0_, GTK_STOCK_MEDIA_PAUSE, GTK_ICON_SIZE_MENU); } -static void ___lambda197__xnoise_gst_player_sign_playing (XnoiseGstPlayer* _sender, gpointer self) { - __lambda197_ (self); +static void ___lambda195__xnoise_gst_player_sign_playing (XnoiseGstPlayer* _sender, gpointer self) { + __lambda195_ (self); } -static void __lambda198_ (XnoiseTrayIcon* self) { +static void __lambda196_ (XnoiseTrayIcon* self) { GtkImage* _tmp0_ = NULL; GtkImage* _tmp1_ = NULL; _tmp0_ = self->priv->playpause_popup_image; @@ -283,20 +283,20 @@ } -static void ___lambda198__xnoise_gst_player_sign_stopped (XnoiseGstPlayer* _sender, gpointer self) { - __lambda198_ (self); +static void ___lambda196__xnoise_gst_player_sign_stopped (XnoiseGstPlayer* _sender, gpointer self) { + __lambda196_ (self); } -static void __lambda199_ (XnoiseTrayIcon* self) { +static void __lambda197_ (XnoiseTrayIcon* self) { GtkImage* _tmp0_ = NULL; _tmp0_ = self->priv->playpause_popup_image; gtk_image_set_from_stock (_tmp0_, GTK_STOCK_MEDIA_PLAY, GTK_ICON_SIZE_MENU); } -static void ___lambda199__xnoise_gst_player_sign_paused (XnoiseGstPlayer* _sender, gpointer self) { - __lambda199_ (self); +static void ___lambda197__xnoise_gst_player_sign_paused (XnoiseGstPlayer* _sender, gpointer self) { + __lambda197_ (self); } @@ -305,27 +305,27 @@ } -static void __lambda200_ (XnoiseTrayIcon* self) { +static void __lambda198_ (XnoiseTrayIcon* self) { XnoiseMainWindow* _tmp0_ = NULL; _tmp0_ = xnoise_main_window; xnoise_main_window_handle_control_button_click (_tmp0_, XNOISE_CONTROL_BUTTON_FUNCTION_PREVIOUS); } -static void ___lambda200__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { - __lambda200_ (self); +static void ___lambda198__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { + __lambda198_ (self); } -static void __lambda201_ (XnoiseTrayIcon* self) { +static void __lambda199_ (XnoiseTrayIcon* self) { XnoiseMainWindow* _tmp0_ = NULL; _tmp0_ = xnoise_main_window; xnoise_main_window_handle_control_button_click (_tmp0_, XNOISE_CONTROL_BUTTON_FUNCTION_NEXT); } -static void ___lambda201__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { - __lambda201_ (self); +static void ___lambda199__gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) { + __lambda199_ (self); } @@ -398,11 +398,11 @@ _tmp2_ = self->priv->playpause_popup_image; gtk_image_set_from_stock (_tmp2_, GTK_STOCK_MEDIA_PLAY, GTK_ICON_SIZE_MENU); _tmp3_ = xnoise_gst_player; - g_signal_connect_object (_tmp3_, "sign-playing", (GCallback) ___lambda197__xnoise_gst_player_sign_playing, self, 0); + g_signal_connect_object (_tmp3_, "sign-playing", (GCallback) ___lambda195__xnoise_gst_player_sign_playing, self, 0); _tmp4_ = xnoise_gst_player; - g_signal_connect_object (_tmp4_, "sign-stopped", (GCallback) ___lambda198__xnoise_gst_player_sign_stopped, self, 0); + g_signal_connect_object (_tmp4_, "sign-stopped", (GCallback) ___lambda196__xnoise_gst_player_sign_stopped, self, 0); _tmp5_ = xnoise_gst_player; - g_signal_connect_object (_tmp5_, "sign-paused", (GCallback) ___lambda199__xnoise_gst_player_sign_paused, self, 0); + g_signal_connect_object (_tmp5_, "sign-paused", (GCallback) ___lambda197__xnoise_gst_player_sign_paused, self, 0); _tmp6_ = _ ("Play/Pause"); _tmp7_ = (GtkLabel*) gtk_label_new (_tmp6_); g_object_ref_sink (_tmp7_); @@ -443,7 +443,7 @@ gtk_box_pack_start (previousHbox, G_TYPE_CHECK_INSTANCE_CAST (previousImage, GTK_TYPE_WIDGET, GtkWidget), FALSE, TRUE, (guint) 0); gtk_box_pack_start (previousHbox, G_TYPE_CHECK_INSTANCE_CAST (previousLabel, GTK_TYPE_WIDGET, GtkWidget), TRUE, TRUE, (guint) 0); gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (previousItem, GTK_TYPE_CONTAINER, GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (previousHbox, GTK_TYPE_WIDGET, GtkWidget)); - g_signal_connect_object (previousItem, "activate", (GCallback) ___lambda200__gtk_menu_item_activate, self, 0); + g_signal_connect_object (previousItem, "activate", (GCallback) ___lambda198__gtk_menu_item_activate, self, 0); _tmp18_ = self->priv->traymenu; gtk_menu_shell_append (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GTK_TYPE_MENU_SHELL, GtkMenuShell), (GtkWidget*) previousItem); _tmp19_ = (GtkImage*) gtk_image_new (); @@ -465,7 +465,7 @@ gtk_box_pack_start (nextHbox, G_TYPE_CHECK_INSTANCE_CAST (nextImage, GTK_TYPE_WIDGET, GtkWidget), FALSE, TRUE, (guint) 0); gtk_box_pack_start (nextHbox, G_TYPE_CHECK_INSTANCE_CAST (nextLabel, GTK_TYPE_WIDGET, GtkWidget), TRUE, TRUE, (guint) 0); gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (nextItem, GTK_TYPE_CONTAINER, GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (nextHbox, GTK_TYPE_WIDGET, GtkWidget)); - g_signal_connect_object (nextItem, "activate", (GCallback) ___lambda201__gtk_menu_item_activate, self, 0); + g_signal_connect_object (nextItem, "activate", (GCallback) ___lambda199__gtk_menu_item_activate, self, 0); _tmp24_ = self->priv->traymenu; gtk_menu_shell_append (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GTK_TYPE_MENU_SHELL, GtkMenuShell), (GtkWidget*) nextItem); _tmp25_ = (GtkSeparatorMenuItem*) gtk_separator_menu_item_new (); @@ -543,7 +543,7 @@ } -static gboolean __lambda203_ (XnoiseTrayIcon* self) { +static gboolean __lambda201_ (XnoiseTrayIcon* self) { gboolean result = FALSE; self->priv->scroll_source = (guint) 0; result = FALSE; @@ -551,32 +551,32 @@ } -static gboolean ___lambda203__gsource_func (gpointer self) { +static gboolean ___lambda201__gsource_func (gpointer self) { gboolean result; - result = __lambda203_ (self); + result = __lambda201_ (self); return result; } -static gboolean ____lambda202_ (XnoiseTrayIcon* self) { +static gboolean ____lambda200_ (XnoiseTrayIcon* self) { gboolean result = FALSE; XnoiseMainWindow* _tmp0_ = NULL; _tmp0_ = xnoise_main_window; xnoise_main_window_change_track (_tmp0_, XNOISE_CONTROL_BUTTON_FUNCTION_PREVIOUS, TRUE); - g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 400, ___lambda203__gsource_func, g_object_ref (self), g_object_unref); + g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 400, ___lambda201__gsource_func, g_object_ref (self), g_object_unref); result = FALSE; return result; } -static gboolean _____lambda202__gsource_func (gpointer self) { +static gboolean _____lambda200__gsource_func (gpointer self) { gboolean result; - result = ____lambda202_ (self); + result = ____lambda200_ (self); return result; } -static gboolean __lambda205_ (XnoiseTrayIcon* self) { +static gboolean __lambda203_ (XnoiseTrayIcon* self) { gboolean result = FALSE; self->priv->scroll_source = (guint) 0; result = FALSE; @@ -584,27 +584,27 @@ } -static gboolean ___lambda205__gsource_func (gpointer self) { +static gboolean ___lambda203__gsource_func (gpointer self) { gboolean result; - result = __lambda205_ (self); + result = __lambda203_ (self); return result; } -static gboolean _____lambda204_ (XnoiseTrayIcon* self) { +static gboolean _____lambda202_ (XnoiseTrayIcon* self) { gboolean result = FALSE; XnoiseMainWindow* _tmp0_ = NULL; _tmp0_ = xnoise_main_window; xnoise_main_window_change_track (_tmp0_, XNOISE_CONTROL_BUTTON_FUNCTION_NEXT, TRUE); - g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 400, ___lambda205__gsource_func, g_object_ref (self), g_object_unref); + g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 400, ___lambda203__gsource_func, g_object_ref (self), g_object_unref); result = FALSE; return result; } -static gboolean ______lambda204__gsource_func (gpointer self) { +static gboolean ______lambda202__gsource_func (gpointer self) { gboolean result; - result = _____lambda204_ (self); + result = _____lambda202_ (self); return result; } @@ -633,7 +633,7 @@ _tmp5_ = _tmp4_.direction; if (_tmp5_ == GDK_SCROLL_DOWN) { guint _tmp6_ = 0U; - _tmp6_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 100, _____lambda202__gsource_func, g_object_ref (self), g_object_unref); + _tmp6_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 100, _____lambda200__gsource_func, g_object_ref (self), g_object_unref); self->priv->scroll_source = _tmp6_; } else { GdkEventScroll _tmp7_ = {0}; @@ -642,7 +642,7 @@ _tmp8_ = _tmp7_.direction; if (_tmp8_ == GDK_SCROLL_UP) { guint _tmp9_ = 0U; - _tmp9_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 100, ______lambda204__gsource_func, g_object_ref (self), g_object_unref); + _tmp9_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 100, ______lambda202__gsource_func, g_object_ref (self), g_object_unref); self->priv->scroll_source = _tmp9_; } } diff -Nru xnoise-0.2.20/libxnoise/Utils/xnoise-media-importer.c xnoise-0.2.21/libxnoise/Utils/xnoise-media-importer.c --- xnoise-0.2.20/libxnoise/Utils/xnoise-media-importer.c 2013-12-11 11:24:25.000000000 +0000 +++ xnoise-0.2.21/libxnoise/Utils/xnoise-media-importer.c 2014-01-27 09:32:57.000000000 +0000 @@ -422,8 +422,8 @@ void xnoise_media_importer_import_uris (XnoiseMediaImporter* self, gchar** uris, int uris_length1); static gchar** _vala_array_dup39 (gchar** self, int length); XnoiseTrackData* xnoise_tag_access_tag_reader_read_tag (const gchar* filename, gboolean try_read_image_data); -static void _vala_array_add123 (XnoiseTrackData*** array, int* length, int* size, XnoiseTrackData* value); -static void _vala_array_add124 (gchar*** array, int* length, int* size, gchar* value); +static void _vala_array_add125 (XnoiseTrackData*** array, int* length, int* size, XnoiseTrackData* value); +static void _vala_array_add126 (gchar*** array, int* length, int* size, gchar* value); static gboolean xnoise_media_importer_insert_trackdata_job (XnoiseMediaImporter* self, XnoiseWorkerJob* job); static gboolean _xnoise_media_importer_insert_trackdata_job_xnoise_worker_work_func (XnoiseWorkerJob* jb, gpointer self); void xnoise_worker_job_set_arg (XnoiseWorkerJob* self, const gchar* name, GValue* val); @@ -478,8 +478,8 @@ static void xnoise_media_importer_read_recoursive (XnoiseMediaImporter* self, GFile* dir, XnoiseWorkerJob* job); gchar* xnoise_utilities_get_suffix_from_filename (const gchar* val); gboolean xnoise_playlist_is_playlist_extension (const gchar* ext); -static void _vala_array_add125 (gchar*** array, int* length, int* size, gchar* value); -static void _vala_array_add126 (XnoiseTrackData*** array, int* length, int* size, XnoiseTrackData* value); +static void _vala_array_add127 (gchar*** array, int* length, int* size, gchar* value); +static void _vala_array_add128 (XnoiseTrackData*** array, int* length, int* size, XnoiseTrackData* value); gboolean xnoise_database_writer_insert_title (XnoiseDatabaseWriter* self, XnoiseTrackData** td); gint xnoise_worker_get_queue_length (XnoiseWorker* self); static void xnoise_media_importer_finalize (XnoiseMediaImporter* obj); @@ -744,7 +744,7 @@ } } } - __finally176: + __finally178: { GHashTable* _tmp38_ = NULL; _tmp38_ = self->priv->removal_targets; @@ -824,7 +824,7 @@ } } } - __finally177: + __finally179: { GHashTable* _tmp56_ = NULL; _tmp56_ = self->priv->import_targets; @@ -967,7 +967,7 @@ } } } - __finally178: + __finally180: { GHashTable* _tmp20_ = NULL; _tmp20_ = self->priv->import_targets; @@ -1102,7 +1102,7 @@ } } } - __finally179: + __finally181: { GHashTable* _tmp21_ = NULL; _tmp21_ = self->priv->removal_targets; @@ -1174,7 +1174,7 @@ _tmp10_ = u; g_hash_table_remove (_tmp9_, _tmp10_); } - __finally180: + __finally182: { GHashTable* _tmp11_ = NULL; _tmp11_ = self->priv->removal_targets; @@ -1288,7 +1288,7 @@ } } } - __finally181: + __finally183: { GHashTable* _tmp16_ = NULL; _tmp16_ = self->priv->import_targets; @@ -1320,7 +1320,7 @@ } -static void _vala_array_add123 (XnoiseTrackData*** array, int* length, int* size, XnoiseTrackData* value) { +static void _vala_array_add125 (XnoiseTrackData*** array, int* length, int* size, XnoiseTrackData* value) { if ((*length) == (*size)) { *size = (*size) ? (2 * (*size)) : 4; *array = g_renew (XnoiseTrackData*, *array, (*size) + 1); @@ -1330,7 +1330,7 @@ } -static void _vala_array_add124 (gchar*** array, int* length, int* size, gchar* value) { +static void _vala_array_add126 (gchar*** array, int* length, int* size, gchar* value) { if ((*length) == (*size)) { *size = (*size) ? (2 * (*size)) : 4; *array = g_renew (gchar*, *array, (*size) + 1); @@ -1529,12 +1529,12 @@ _tmp35__length1 = tda_length1; _tmp36_ = td; _tmp37_ = _xnoise_track_data_ref0 (_tmp36_); - _vala_array_add123 (&tda, &tda_length1, &_tda_size_, _tmp37_); + _vala_array_add125 (&tda, &tda_length1, &_tda_size_, _tmp37_); _tmp38_ = uris; _tmp38__length1 = uris_length1; _tmp39_ = f; _tmp40_ = g_file_get_uri (_tmp39_); - _vala_array_add124 (&uris, &uris_length1, &_uris_size_, _tmp40_); + _vala_array_add126 (&uris, &uris_length1, &_uris_size_, _tmp40_); _g_object_unref0 (info); } _xnoise_track_data_unref0 (td); @@ -1629,7 +1629,7 @@ } } } - __finally182: + __finally184: { GHashTable* _tmp61_ = NULL; _tmp61_ = self->priv->import_targets; @@ -1745,7 +1745,7 @@ i_collection = (_vala_XnoiseItem_array_free (i_collection, i_collection_length1), NULL); } } - __finally183: + __finally185: { GList* _tmp10_ = NULL; _tmp10_ = self->priv->media_folders; @@ -1806,7 +1806,7 @@ } } } - __finally184: + __finally186: { GList* _tmp8_ = NULL; _tmp8_ = self->priv->media_folders; @@ -1943,7 +1943,7 @@ _tmp28_ = xnoise_global; xnoise_global_access_set_media_import_in_progress (_tmp28_, TRUE); } - __finally185: + __finally187: { GHashTable* _tmp29_ = NULL; _tmp29_ = self->priv->import_targets; @@ -2051,7 +2051,7 @@ _xnoise_item_free0 (i); } } - __finally186: + __finally188: { GHashTable* _tmp18_ = NULL; _tmp18_ = self->priv->import_targets; @@ -2307,7 +2307,7 @@ g_hash_table_insert (_tmp13_, _tmp16_, _tmp18_); } } - __finally187: + __finally189: { GHashTable* _tmp19_ = NULL; _tmp19_ = self->priv->removal_targets; @@ -2385,7 +2385,7 @@ no_remove_left = TRUE; } } - __finally188: + __finally190: { GHashTable* _tmp6_ = NULL; _tmp6_ = self->priv->removal_targets; @@ -2434,7 +2434,7 @@ xnoise_global_access_set_media_import_in_progress (_tmp17_, FALSE); } } - __finally189: + __finally191: { GHashTable* _tmp18_ = NULL; _tmp18_ = self->priv->import_targets; @@ -2564,7 +2564,7 @@ _tmp36_ = (*_tmp35_).uri; g_hash_table_remove (_tmp33_, _tmp36_); } - __finally190: + __finally192: { GHashTable* _tmp37_ = NULL; _tmp37_ = self->priv->removal_targets; @@ -2715,7 +2715,7 @@ xnoise_database_writer_write_lastused (_tmp3_, &_tmp4_->track_dat, &_tmp4_->track_dat_length1, &_inner_error_); if (_inner_error_ != NULL) { if (_inner_error_->domain == XNOISE_DATABASE_DB_ERROR) { - goto __catch191_xnoise_database_db_error; + goto __catch193_xnoise_database_db_error; } g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -2724,8 +2724,8 @@ _tmp5_ = xnoise_db_writer; xnoise_database_writer_commit_transaction (_tmp5_); } - goto __finally191; - __catch191_xnoise_database_db_error: + goto __finally193; + __catch193_xnoise_database_db_error: { GError* e = NULL; GError* _tmp6_ = NULL; @@ -2737,7 +2737,7 @@ g_print ("%s\n", _tmp7_); _g_error_free0 (e); } - __finally191: + __finally193: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -2857,7 +2857,7 @@ } -static void _vala_array_add125 (gchar*** array, int* length, int* size, gchar* value) { +static void _vala_array_add127 (gchar*** array, int* length, int* size, gchar* value) { if ((*length) == (*size)) { *size = (*size) ? (2 * (*size)) : 4; *array = g_renew (gchar*, *array, (*size) + 1); @@ -2867,7 +2867,7 @@ } -static void _vala_array_add126 (XnoiseTrackData*** array, int* length, int* size, XnoiseTrackData* value) { +static void _vala_array_add128 (XnoiseTrackData*** array, int* length, int* size, XnoiseTrackData* value) { if ((*length) == (*size)) { *size = (*size) ? (2 * (*size)) : 4; *array = g_renew (XnoiseTrackData*, *array, (*size) + 1); @@ -2906,13 +2906,13 @@ _tmp6_ = g_file_enumerate_children (_tmp5_, XNOISE_MEDIA_IMPORTER_attr, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_); _tmp4_ = _tmp6_; if (_inner_error_ != NULL) { - goto __catch192_g_error; + goto __catch194_g_error; } _g_object_unref0 (enumerator); enumerator = _tmp4_; } - goto __finally192; - __catch192_g_error: + goto __finally194; + __catch194_g_error: { GError* e = NULL; GFile* _tmp7_ = NULL; @@ -2938,7 +2938,7 @@ _g_object_unref0 (enumerator); return; } - __finally192: + __finally194: if (_inner_error_ != NULL) { _g_object_unref0 (enumerator); g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -2976,7 +2976,7 @@ _tmp16_ = g_file_enumerator_next_file (_tmp15_, NULL, &_inner_error_); _tmp14_ = _tmp16_; if (_inner_error_ != NULL) { - goto __catch193_g_error; + goto __catch195_g_error; } _g_object_unref0 (info); info = _tmp14_; @@ -3144,12 +3144,12 @@ _tmp71__length1 = self->priv->uris_for_image_extraction_length1; _tmp72_ = file; _tmp73_ = g_file_get_uri (_tmp72_); - _vala_array_add125 (&self->priv->uris_for_image_extraction, &self->priv->uris_for_image_extraction_length1, &self->priv->_uris_for_image_extraction_size_, _tmp73_); + _vala_array_add127 (&self->priv->uris_for_image_extraction, &self->priv->uris_for_image_extraction_length1, &self->priv->_uris_for_image_extraction_size_, _tmp73_); _tmp74_ = self->priv->tda; _tmp74__length1 = self->priv->tda_length1; _tmp75_ = td; _tmp76_ = _xnoise_track_data_ref0 (_tmp75_); - _vala_array_add126 (&self->priv->tda, &self->priv->tda_length1, &self->priv->_tda_size_, _tmp76_); + _vala_array_add128 (&self->priv->tda, &self->priv->tda_length1, &self->priv->_tda_size_, _tmp76_); } _tmp77_ = self->priv->tda; _tmp77__length1 = self->priv->tda_length1; @@ -3211,8 +3211,8 @@ _xnoise_track_data_unref0 (td); } } - goto __finally193; - __catch193_g_error: + goto __finally195; + __catch195_g_error: { GError* e = NULL; GError* _tmp89_ = NULL; @@ -3224,7 +3224,7 @@ g_print ("%s\n", _tmp90_); _g_error_free0 (e); } - __finally193: + __finally195: if (_inner_error_ != NULL) { _g_object_unref0 (info); _g_object_unref0 (enumerator); @@ -3391,7 +3391,7 @@ } } } - __finally194: + __finally196: { GHashTable* _tmp18_ = NULL; _tmp18_ = self->priv->import_targets; diff -Nru xnoise-0.2.20/libxnoise/Utils/xnoise-misc.c xnoise-0.2.21/libxnoise/Utils/xnoise-misc.c --- xnoise-0.2.20/libxnoise/Utils/xnoise-misc.c 2013-12-11 11:24:25.000000000 +0000 +++ xnoise-0.2.21/libxnoise/Utils/xnoise-misc.c 2014-01-27 09:32:57.000000000 +0000 @@ -729,10 +729,10 @@ XnoiseMediaMonitor* xnoise_media_monitor_construct (GType object_type); XnoiseMediaChangeDetector* xnoise_media_change_detector_new (void); XnoiseMediaChangeDetector* xnoise_media_change_detector_construct (GType object_type); -static void __lambda289_ (void); -static gboolean __lambda290_ (void); -static gboolean ___lambda290__gsource_func (gpointer self); -static void ___lambda289__xnoise_media_change_detector_finished (XnoiseMediaChangeDetector* _sender, gpointer self); +static void __lambda287_ (void); +static gboolean __lambda288_ (void); +static gboolean ___lambda288__gsource_func (gpointer self); +static void ___lambda287__xnoise_media_change_detector_finished (XnoiseMediaChangeDetector* _sender, gpointer self); XnoiseStatistics* xnoise_statistics_new (void); XnoiseStatistics* xnoise_statistics_construct (GType object_type); XnoiseGstPlayer* xnoise_gst_player_new (void); @@ -842,7 +842,7 @@ } -static gboolean __lambda290_ (void) { +static gboolean __lambda288_ (void) { gboolean result = FALSE; _g_object_unref0 (xnoise_media_change_detector); xnoise_media_change_detector = NULL; @@ -851,20 +851,20 @@ } -static gboolean ___lambda290__gsource_func (gpointer self) { +static gboolean ___lambda288__gsource_func (gpointer self) { gboolean result; - result = __lambda290_ (); + result = __lambda288_ (); return result; } -static void __lambda289_ (void) { - g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 5, ___lambda290__gsource_func, NULL, NULL); +static void __lambda287_ (void) { + g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 5, ___lambda288__gsource_func, NULL, NULL); } -static void ___lambda289__xnoise_media_change_detector_finished (XnoiseMediaChangeDetector* _sender, gpointer self) { - __lambda289_ (); +static void ___lambda287__xnoise_media_change_detector_finished (XnoiseMediaChangeDetector* _sender, gpointer self) { + __lambda287_ (); } @@ -1051,7 +1051,7 @@ _tmp41_ = _tmp42_; if (_inner_error_ != NULL) { if (_inner_error_->domain == XNOISE_DATABASE_DB_ERROR) { - goto __catch195_xnoise_database_db_error; + goto __catch197_xnoise_database_db_error; } _g_object_unref0 (xnoiseini); _g_object_unref0 (xnoise_data_home); @@ -1065,7 +1065,7 @@ _tmp43_ = _tmp44_; if (_inner_error_ != NULL) { if (_inner_error_->domain == XNOISE_DATABASE_DB_ERROR) { - goto __catch195_xnoise_database_db_error; + goto __catch197_xnoise_database_db_error; } _g_object_unref0 (xnoiseini); _g_object_unref0 (xnoise_data_home); @@ -1076,8 +1076,8 @@ _g_object_unref0 (xnoise_db_writer); xnoise_db_writer = _tmp43_; } - goto __finally195; - __catch195_xnoise_database_db_error: + goto __finally197; + __catch197_xnoise_database_db_error: { GError* e = NULL; GError* _tmp45_ = NULL; @@ -1095,7 +1095,7 @@ } return; } - __finally195: + __finally197: if (_inner_error_ != NULL) { _g_object_unref0 (xnoiseini); _g_object_unref0 (xnoise_data_home); @@ -1115,7 +1115,7 @@ _g_object_unref0 (xnoise_media_change_detector); xnoise_media_change_detector = _tmp50_; _tmp51_ = xnoise_media_change_detector; - g_signal_connect (_tmp51_, "finished", (GCallback) ___lambda289__xnoise_media_change_detector_finished, NULL); + g_signal_connect (_tmp51_, "finished", (GCallback) ___lambda287__xnoise_media_change_detector_finished, NULL); _tmp52_ = xnoise_statistics_new (); _g_object_unref0 (xnoise_statistics); xnoise_statistics = _tmp52_; diff -Nru xnoise-0.2.20/libxnoise/Utils/xnoise-utilities.c xnoise-0.2.21/libxnoise/Utils/xnoise-utilities.c --- xnoise-0.2.20/libxnoise/Utils/xnoise-utilities.c 2013-12-11 11:24:25.000000000 +0000 +++ xnoise-0.2.21/libxnoise/Utils/xnoise-utilities.c 2014-01-27 09:32:57.000000000 +0000 @@ -140,7 +140,7 @@ gboolean xnoise_utilities_verify_xnoise_directories (void); gchar* xnoise_utilities_prepare_for_comparison (const gchar* value); #define XNOISE_RESOURCES_EMPTYSTRING "" -static void _vala_array_add127 (gchar*** array, int* length, int* size, gchar* value); +static void _vala_array_add129 (gchar*** array, int* length, int* size, gchar* value); gchar* xnoise_utilities_prepare_for_search (const gchar* val); gchar* xnoise_utilities_remove_linebreaks (const gchar* val); gchar* xnoise_utilities_remove_suffix_from_filename (const gchar* val); @@ -280,11 +280,11 @@ _tmp4_ = f; g_file_make_directory (_tmp4_, NULL, &_inner_error_); if (_inner_error_ != NULL) { - goto __catch196_g_error; + goto __catch198_g_error; } } - goto __finally196; - __catch196_g_error: + goto __finally198; + __catch198_g_error: { GError* e = NULL; GError* _tmp5_ = NULL; @@ -301,7 +301,7 @@ _g_object_unref0 (f); return result; } - __finally196: + __finally198: if (_inner_error_ != NULL) { _g_object_unref0 (f); g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -382,11 +382,11 @@ _tmp12_ = f; g_file_make_directory_with_parents (_tmp12_, NULL, &_inner_error_); if (_inner_error_ != NULL) { - goto __catch197_g_error; + goto __catch199_g_error; } } - goto __finally197; - __catch197_g_error: + goto __finally199; + __catch199_g_error: { GError* e = NULL; GError* _tmp13_ = NULL; @@ -414,7 +414,7 @@ _g_object_unref0 (f); return result; } - __finally197: + __finally199: if (_inner_error_ != NULL) { _g_object_unref0 (f); g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -468,11 +468,11 @@ _tmp30_ = f; g_file_make_directory_with_parents (_tmp30_, NULL, &_inner_error_); if (_inner_error_ != NULL) { - goto __catch198_g_error; + goto __catch200_g_error; } } - goto __finally198; - __catch198_g_error: + goto __finally200; + __catch200_g_error: { GError* e = NULL; GError* _tmp31_ = NULL; @@ -500,7 +500,7 @@ _g_object_unref0 (f); return result; } - __finally198: + __finally200: if (_inner_error_ != NULL) { _g_object_unref0 (f); g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -514,7 +514,7 @@ } -static void _vala_array_add127 (gchar*** array, int* length, int* size, gchar* value) { +static void _vala_array_add129 (gchar*** array, int* length, int* size, gchar* value) { if ((*length) == (*size)) { *size = (*size) ? (2 * (*size)) : 4; *array = g_renew (gchar*, *array, (*size) + 1); @@ -709,7 +709,7 @@ _tmp43__length1 = xnoise_utilities_characters_not_used_in_comparison__escaped_length1; _tmp44_ = s; _tmp45_ = g_regex_escape_string (_tmp44_, -1); - _vala_array_add127 (&xnoise_utilities_characters_not_used_in_comparison__escaped, &xnoise_utilities_characters_not_used_in_comparison__escaped_length1, &_xnoise_utilities_characters_not_used_in_comparison__escaped_size_, _tmp45_); + _vala_array_add129 (&xnoise_utilities_characters_not_used_in_comparison__escaped, &xnoise_utilities_characters_not_used_in_comparison__escaped_length1, &_xnoise_utilities_characters_not_used_in_comparison__escaped_size_, _tmp45_); } } } @@ -765,7 +765,7 @@ regex = _tmp57_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_REGEX_ERROR) { - goto __catch199_g_regex_error; + goto __catch201_g_regex_error; } _g_free0 (_result_); _g_free0 (_tmp46_); @@ -780,7 +780,7 @@ if (_inner_error_ != NULL) { _g_regex_unref0 (regex); if (_inner_error_->domain == G_REGEX_ERROR) { - goto __catch199_g_regex_error; + goto __catch201_g_regex_error; } _g_regex_unref0 (regex); _g_free0 (_result_); @@ -796,8 +796,8 @@ } } } - goto __finally199; - __catch199_g_regex_error: + goto __finally201; + __catch201_g_regex_error: { GError* e = NULL; e = _inner_error_; @@ -805,7 +805,7 @@ g_assert_not_reached (); _g_error_free0 (e); } - __finally199: + __finally201: if (_inner_error_ != NULL) { _g_free0 (_result_); _g_free0 (_tmp46_); @@ -848,7 +848,7 @@ regex = _tmp4_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_REGEX_ERROR) { - goto __catch200_g_regex_error; + goto __catch202_g_regex_error; } g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -861,7 +861,7 @@ if (_inner_error_ != NULL) { _g_regex_unref0 (regex); if (_inner_error_->domain == G_REGEX_ERROR) { - goto __catch200_g_regex_error; + goto __catch202_g_regex_error; } _g_regex_unref0 (regex); g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -872,8 +872,8 @@ _g_regex_unref0 (regex); return result; } - goto __finally200; - __catch200_g_regex_error: + goto __finally202; + __catch202_g_regex_error: { GError* e = NULL; e = _inner_error_; @@ -881,7 +881,7 @@ g_assert_not_reached (); _g_error_free0 (e); } - __finally200: + __finally202: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -990,7 +990,7 @@ r = _tmp2_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_REGEX_ERROR) { - goto __catch201_g_regex_error; + goto __catch203_g_regex_error; } g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -1003,7 +1003,7 @@ if (_inner_error_ != NULL) { _g_regex_unref0 (r); if (_inner_error_->domain == G_REGEX_ERROR) { - goto __catch201_g_regex_error; + goto __catch203_g_regex_error; } _g_regex_unref0 (r); g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -1019,8 +1019,8 @@ _g_regex_unref0 (r); return result; } - goto __finally201; - __catch201_g_regex_error: + goto __finally203; + __catch203_g_regex_error: { GError* e = NULL; GError* _tmp10_ = NULL; @@ -1032,7 +1032,7 @@ g_print ("%s\n", _tmp11_); _g_error_free0 (e); } - __finally201: + __finally203: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -1398,7 +1398,7 @@ r = _tmp0_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_REGEX_ERROR) { - goto __catch202_g_regex_error; + goto __catch204_g_regex_error; } g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -1411,7 +1411,7 @@ if (_inner_error_ != NULL) { _g_regex_unref0 (r); if (_inner_error_->domain == G_REGEX_ERROR) { - goto __catch202_g_regex_error; + goto __catch204_g_regex_error; } _g_regex_unref0 (r); g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -1427,8 +1427,8 @@ _g_regex_unref0 (r); return result; } - goto __finally202; - __catch202_g_regex_error: + goto __finally204; + __catch204_g_regex_error: { GError* e = NULL; GError* _tmp8_ = NULL; @@ -1440,7 +1440,7 @@ g_print ("%s\n", _tmp9_); _g_error_free0 (e); } - __finally202: + __finally204: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); diff -Nru xnoise-0.2.20/packaging/Makefile.am xnoise-0.2.21/packaging/Makefile.am --- xnoise-0.2.20/packaging/Makefile.am 2013-11-20 13:30:52.000000000 +0000 +++ xnoise-0.2.21/packaging/Makefile.am 2014-01-17 13:49:04.000000000 +0000 @@ -54,6 +54,19 @@ ubuntu/saucy/debian/xnoise.manpages \ ubuntu/saucy/debian/source/format \ ubuntu/saucy/debian/source/include-binaries \ + ubuntu/trusty/debian/changelog \ + ubuntu/trusty/debian/compat \ + ubuntu/trusty/debian/control \ + ubuntu/trusty/debian/copyright \ + ubuntu/trusty/debian/docs \ + ubuntu/trusty/debian/rules \ + ubuntu/trusty/debian/watch \ + ubuntu/trusty/debian/xnoise.1 \ + ubuntu/trusty/debian/xnoise-dev.install \ + ubuntu/trusty/debian/xnoise.install \ + ubuntu/trusty/debian/xnoise.manpages \ + ubuntu/trusty/debian/source/format \ + ubuntu/trusty/debian/source/include-binaries \ $(NULL) diff -Nru xnoise-0.2.20/packaging/Makefile.in xnoise-0.2.21/packaging/Makefile.in --- xnoise-0.2.20/packaging/Makefile.in 2013-12-12 11:25:06.000000000 +0000 +++ xnoise-0.2.21/packaging/Makefile.in 2014-01-27 09:26:21.000000000 +0000 @@ -344,6 +344,19 @@ ubuntu/saucy/debian/xnoise.manpages \ ubuntu/saucy/debian/source/format \ ubuntu/saucy/debian/source/include-binaries \ + ubuntu/trusty/debian/changelog \ + ubuntu/trusty/debian/compat \ + ubuntu/trusty/debian/control \ + ubuntu/trusty/debian/copyright \ + ubuntu/trusty/debian/docs \ + ubuntu/trusty/debian/rules \ + ubuntu/trusty/debian/watch \ + ubuntu/trusty/debian/xnoise.1 \ + ubuntu/trusty/debian/xnoise-dev.install \ + ubuntu/trusty/debian/xnoise.install \ + ubuntu/trusty/debian/xnoise.manpages \ + ubuntu/trusty/debian/source/format \ + ubuntu/trusty/debian/source/include-binaries \ $(NULL) EXTRA_DIST = \ diff -Nru xnoise-0.2.20/packaging/debian/debian/changelog xnoise-0.2.21/packaging/debian/debian/changelog --- xnoise-0.2.20/packaging/debian/debian/changelog 2013-12-12 17:24:00.000000000 +0000 +++ xnoise-0.2.21/packaging/debian/debian/changelog 2014-01-27 10:04:57.000000000 +0000 @@ -1,19 +1,8 @@ -xnoise (0.2.20-1) unstable; urgency=medium - * Redo the import dialog - * Real-Time Monitor media folders for changes - * Check media folders for changes that happened - during the time xnoise wasn't running - * GUI improvements/changes - * Change drawing of album art - * Trim Settings dialog - * Use application menu, only - * Remove title-to-decoration plugin - * Automatically activate some of the plugins - * Use new libtaginfo API for tag reading/writing - * Udate tag editing mechanism - * Many Bug fixes - * update translations +xnoise (0.2.21-1) unstable; urgency=medium + * Fix crasher bug with screen saver management + * Add new screen saver manager + * Update some translations - -- Jörn Magens Thu, 12 Dec 2013 18:03:41 +0100 + -- Jörn Magens Mon, 27 Jan 2014 10:54:45 +0100 diff -Nru xnoise-0.2.20/packaging/debian/debian/xnoise-plugins.install xnoise-0.2.21/packaging/debian/debian/xnoise-plugins.install --- xnoise-0.2.20/packaging/debian/debian/xnoise-plugins.install 2013-12-11 10:30:21.000000000 +0000 +++ xnoise-0.2.21/packaging/debian/debian/xnoise-plugins.install 2013-12-22 10:46:49.000000000 +0000 @@ -6,6 +6,5 @@ usr/lib/xnoise/libmediakeys.so usr/lib/xnoise/libmpris.so usr/lib/xnoise/libmprisone.so -usr/lib/xnoise/libxnoisetest.so usr/lib/xnoise/libMagnatune.so usr/lib/xnoise/*.xnplugin diff -Nru xnoise-0.2.20/packaging/ubuntu/quantal/debian/changelog xnoise-0.2.21/packaging/ubuntu/quantal/debian/changelog --- xnoise-0.2.20/packaging/ubuntu/quantal/debian/changelog 2013-12-12 17:23:06.000000000 +0000 +++ xnoise-0.2.21/packaging/ubuntu/quantal/debian/changelog 2014-01-27 09:54:55.000000000 +0000 @@ -1,4 +1,13 @@ -xnoise (0.2.20-1ppa1~quantal) quantal; urgency=medium +xnoise (0.2.21-1ppa1~quantal) quantal; urgency=medium + * Fix crasher bug with screen saver management + * Add new screen saver manager + * Update some translations + + -- Jörn Magens Mon, 27 Jan 2014 10:54:45 +0100 + + + +xnoise (0.2.20-2ppa1~quantal) quantal; urgency=medium * Redo the import dialog * Real-Time Monitor media folders for changes * Check media folders for changes that happened diff -Nru xnoise-0.2.20/packaging/ubuntu/raring/debian/changelog xnoise-0.2.21/packaging/ubuntu/raring/debian/changelog --- xnoise-0.2.20/packaging/ubuntu/raring/debian/changelog 2013-12-12 17:23:10.000000000 +0000 +++ xnoise-0.2.21/packaging/ubuntu/raring/debian/changelog 2014-01-27 09:55:31.000000000 +0000 @@ -1,4 +1,13 @@ -xnoise (0.2.20-1ppa1~raring) raring; urgency=medium +xnoise (0.2.21-1ppa1~raring) raring; urgency=medium + * Fix crasher bug with screen saver management + * Add new screen saver manager + * Update some translations + + -- Jörn Magens Mon, 27 Jan 2014 10:54:45 +0100 + + + +xnoise (0.2.20-2ppa1~raring) raring; urgency=medium * Redo the import dialog * Real-Time Monitor media folders for changes * Check media folders for changes that happened diff -Nru xnoise-0.2.20/packaging/ubuntu/saucy/debian/changelog xnoise-0.2.21/packaging/ubuntu/saucy/debian/changelog --- xnoise-0.2.20/packaging/ubuntu/saucy/debian/changelog 2013-12-12 17:23:15.000000000 +0000 +++ xnoise-0.2.21/packaging/ubuntu/saucy/debian/changelog 2014-01-27 09:55:55.000000000 +0000 @@ -1,4 +1,14 @@ -xnoise (0.2.20-1ppa1~saucy) saucy; urgency=medium +xnoise (0.2.21-1ppa1~saucy) saucy; urgency=medium + * Fix crasher bug with screen saver management + * Add new screen saver manager + * Update some translations + + -- Jörn Magens Mon, 27 Jan 2014 10:54:45 +0100 + + + + +xnoise (0.2.20-2ppa1~saucy) saucy; urgency=medium * Redo the import dialog * Real-Time Monitor media folders for changes * Check media folders for changes that happened diff -Nru xnoise-0.2.20/packaging/ubuntu/trusty/debian/changelog xnoise-0.2.21/packaging/ubuntu/trusty/debian/changelog --- xnoise-0.2.20/packaging/ubuntu/trusty/debian/changelog 1970-01-01 00:00:00.000000000 +0000 +++ xnoise-0.2.21/packaging/ubuntu/trusty/debian/changelog 2014-01-27 09:56:19.000000000 +0000 @@ -0,0 +1,28 @@ +xnoise (0.2.21-1ppa1~trusty) trusty; urgency=medium + * Fix crasher bug with screen saver management + * Add new screen saver manager + * Update some translations + + -- Jörn Magens Mon, 27 Jan 2014 10:54:45 +0100 + + + +xnoise (0.2.20-2ppa1~trusty) trusty; urgency=medium + * Redo the import dialog + * Real-Time Monitor media folders for changes + * Check media folders for changes that happened + during the time xnoise wasn't running + * GUI improvements/changes + * Change drawing of album art + * Trim Settings dialog + * Use application menu, only + * Remove title-to-decoration plugin + * Automatically activate some of the plugins + * Use new libtaginfo API for tag reading/writing + * Udate tag editing mechanism + * Many Bug fixes + * update translations + + -- Jörn Magens Thu, 12 Dec 2013 18:03:41 +0100 + + diff -Nru xnoise-0.2.20/packaging/ubuntu/trusty/debian/compat xnoise-0.2.21/packaging/ubuntu/trusty/debian/compat --- xnoise-0.2.20/packaging/ubuntu/trusty/debian/compat 1970-01-01 00:00:00.000000000 +0000 +++ xnoise-0.2.21/packaging/ubuntu/trusty/debian/compat 2012-02-01 23:10:18.000000000 +0000 @@ -0,0 +1 @@ +8 diff -Nru xnoise-0.2.20/packaging/ubuntu/trusty/debian/control xnoise-0.2.21/packaging/ubuntu/trusty/debian/control --- xnoise-0.2.20/packaging/ubuntu/trusty/debian/control 1970-01-01 00:00:00.000000000 +0000 +++ xnoise-0.2.21/packaging/ubuntu/trusty/debian/control 2013-12-11 11:20:12.000000000 +0000 @@ -0,0 +1,54 @@ +Source: xnoise +Section: sound +Priority: optional +Maintainer: Jörn Magens +Build-Depends: debhelper (>= 8), intltool, pkg-config, libsqlite3-dev (>= 3.6), libgtk-3-dev (>=3.4), libgstreamer1.0-dev (>=1.0.1), libgstreamer-plugins-base1.0-dev (>=1.0.1), libcairo2-dev, libxml2-dev (>= 2.7.0), libsoup2.4-dev, libx11-dev, libappindicator3-dev (>=0.26), libtaginfo-c0-dev (>=0.2.0), libtaginfo-vala (>=0.2.0) +Standards-Version: 3.9.3 +Homepage: http://www.xnoise-media-player.com/ + + +Package: xnoise +Architecture: any +Depends: gstreamer1.0-plugins-base, gstreamer1.0-plugins-good, ${misc:Depends}, ${shlibs:Depends} +Recommends: tumbler, gnome-icon-theme-symbolic +Description: Pretty and fast media player for Gtk+ + Xnoise allows listening to music and playing video in an intuitive way: You + can easily search the library and drag each artist, album or title to the + tracklist (to any position in any order). In the tracklist all queued tracks + (music or video) are played one by one without being removed. There, you can + reorder, insert or remove any track as it comes to your mind. + . + The media library contains all available media as a hierarchical tree + structure of media tag metadata. It is easy to find any single track, artist, + album or genre by using this tree structure or by entering a search term. + Here you find all you music, streams or videos in a nicely presented, + searchable way. + . + Xnoise can play every kind of audio/video data that GStreamer can handle. + There are plugins available. + . + This package contains the xnoise player itself, and the core plugins. + + +Package: xnoise-dev +Architecture: any +Depends: ${misc:Depends}, xnoise (= ${binary:Version}) +Description: Pretty and fast media player for Gtk+ (development) + Xnoise allows listening to music and playing video in an intuitive way: You + can easily search the library and drag each artist, album or title to the + tracklist (to any position in any order). In the tracklist all queued tracks + (music or video) are played one by one without being removed. There, you can + reorder, insert or remove any track as it comes to your mind. + . + The media library contains all available media as a hierarchical tree + structure of media tag metadata. It is easy to find any single track, artist, + album or genre by using this tree structure or by entering a search term. + Here you find all you music, streams or videos in a nicely presented, + searchable way. + . + Xnoise can play every kind of audio/video data that GStreamer can handle. + There are plugins available. + . + This package contains the vapis and header files which are needed for + developing Xnoise plugins. + diff -Nru xnoise-0.2.20/packaging/ubuntu/trusty/debian/copyright xnoise-0.2.21/packaging/ubuntu/trusty/debian/copyright --- xnoise-0.2.20/packaging/ubuntu/trusty/debian/copyright 1970-01-01 00:00:00.000000000 +0000 +++ xnoise-0.2.21/packaging/ubuntu/trusty/debian/copyright 2013-11-20 13:30:52.000000000 +0000 @@ -0,0 +1,24 @@ +Format: http://dep.debian.net/deps/dep5 +Upstream-Name: xnoise +Source: https://bitbucket.org/shuerhaaken/xnoise + +Files: * +Copyright: 2012 Jörn Magens +License: GPL-2.0+ + +License: GPL-2.0+ + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". diff -Nru xnoise-0.2.20/packaging/ubuntu/trusty/debian/docs xnoise-0.2.21/packaging/ubuntu/trusty/debian/docs --- xnoise-0.2.20/packaging/ubuntu/trusty/debian/docs 1970-01-01 00:00:00.000000000 +0000 +++ xnoise-0.2.21/packaging/ubuntu/trusty/debian/docs 2012-02-01 23:10:18.000000000 +0000 @@ -0,0 +1 @@ +README diff -Nru xnoise-0.2.20/packaging/ubuntu/trusty/debian/rules xnoise-0.2.21/packaging/ubuntu/trusty/debian/rules --- xnoise-0.2.20/packaging/ubuntu/trusty/debian/rules 1970-01-01 00:00:00.000000000 +0000 +++ xnoise-0.2.21/packaging/ubuntu/trusty/debian/rules 2012-08-13 12:40:40.000000000 +0000 @@ -0,0 +1,9 @@ +#!/usr/bin/make -f + +%: + dh $@ + + +override_dh_makeshlibs: + dh_makeshlibs -X/usr/lib/xnoise/* + diff -Nru xnoise-0.2.20/packaging/ubuntu/trusty/debian/source/format xnoise-0.2.21/packaging/ubuntu/trusty/debian/source/format --- xnoise-0.2.20/packaging/ubuntu/trusty/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ xnoise-0.2.21/packaging/ubuntu/trusty/debian/source/format 2012-02-01 23:10:18.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru xnoise-0.2.20/packaging/ubuntu/trusty/debian/source/include-binaries xnoise-0.2.21/packaging/ubuntu/trusty/debian/source/include-binaries --- xnoise-0.2.20/packaging/ubuntu/trusty/debian/source/include-binaries 1970-01-01 00:00:00.000000000 +0000 +++ xnoise-0.2.21/packaging/ubuntu/trusty/debian/source/include-binaries 2012-02-01 23:10:18.000000000 +0000 @@ -0,0 +1,3 @@ +data/icons/32x32/xnoise.png +data/icons/48x48/xnoise.png +data/icons/256x256/xnoise.png diff -Nru xnoise-0.2.20/packaging/ubuntu/trusty/debian/watch xnoise-0.2.21/packaging/ubuntu/trusty/debian/watch --- xnoise-0.2.20/packaging/ubuntu/trusty/debian/watch 1970-01-01 00:00:00.000000000 +0000 +++ xnoise-0.2.21/packaging/ubuntu/trusty/debian/watch 2013-11-20 13:30:52.000000000 +0000 @@ -0,0 +1,2 @@ +version=3 +http://bitbucket.org/shuerhaaken/xnoise/downloads ^.*xnoise-(.+)\.tar\.gz diff -Nru xnoise-0.2.20/packaging/ubuntu/trusty/debian/xnoise-dev.install xnoise-0.2.21/packaging/ubuntu/trusty/debian/xnoise-dev.install --- xnoise-0.2.20/packaging/ubuntu/trusty/debian/xnoise-dev.install 1970-01-01 00:00:00.000000000 +0000 +++ xnoise-0.2.21/packaging/ubuntu/trusty/debian/xnoise-dev.install 2013-11-20 13:30:52.000000000 +0000 @@ -0,0 +1,4 @@ +usr/include +usr/include/xnoise +usr/lib/pkgconfig +usr/share/vala diff -Nru xnoise-0.2.20/packaging/ubuntu/trusty/debian/xnoise.1 xnoise-0.2.21/packaging/ubuntu/trusty/debian/xnoise.1 --- xnoise-0.2.20/packaging/ubuntu/trusty/debian/xnoise.1 1970-01-01 00:00:00.000000000 +0000 +++ xnoise-0.2.21/packaging/ubuntu/trusty/debian/xnoise.1 2012-02-01 23:10:18.000000000 +0000 @@ -0,0 +1,27 @@ +.TH "xnoise" 1 +.SH NAME +xnoise \- Media player for Gtk+ +.SH SYNOPSIS +.B xnoise +[OPTIONS] +[FILES] + +.SH DESCRIPTION +Xnoise is a media player for Gtk+. It uses the gstreamer framework and stores +media files in a database. + + +.SH OPTIONS +.IP -V +Show version info. +.IP -p +Show loaded and activated plugins on app start. +.IP -N +Start without loding any plugins. +.IP -R +Reset all settings. + +.SH AUTHORS +Jörn Magens + +Man page written to conform with Debian by Jörn Magens. diff -Nru xnoise-0.2.20/packaging/ubuntu/trusty/debian/xnoise.install xnoise-0.2.21/packaging/ubuntu/trusty/debian/xnoise.install --- xnoise-0.2.20/packaging/ubuntu/trusty/debian/xnoise.install 1970-01-01 00:00:00.000000000 +0000 +++ xnoise-0.2.21/packaging/ubuntu/trusty/debian/xnoise.install 2013-11-20 13:30:52.000000000 +0000 @@ -0,0 +1,9 @@ +usr/bin +usr/lib/libxnoise.s* +usr/lib/xnoise/lib*.so +usr/lib/xnoise/*.xnplugin +usr/share/applications +usr/share/dbus-1/services +usr/share/icons +usr/share/locale +usr/share/xnoise diff -Nru xnoise-0.2.20/packaging/ubuntu/trusty/debian/xnoise.manpages xnoise-0.2.21/packaging/ubuntu/trusty/debian/xnoise.manpages --- xnoise-0.2.20/packaging/ubuntu/trusty/debian/xnoise.manpages 1970-01-01 00:00:00.000000000 +0000 +++ xnoise-0.2.21/packaging/ubuntu/trusty/debian/xnoise.manpages 2012-02-01 23:10:18.000000000 +0000 @@ -0,0 +1 @@ +debian/xnoise.1 diff -Nru xnoise-0.2.20/po/POTFILES.skip xnoise-0.2.21/po/POTFILES.skip --- xnoise-0.2.20/po/POTFILES.skip 2013-12-06 14:40:37.000000000 +0000 +++ xnoise-0.2.21/po/POTFILES.skip 2014-01-27 09:41:57.000000000 +0000 @@ -28,6 +28,7 @@ libxnoise/ExtDev/AudioPlayer/xnoise-audio-player-main-view.c libxnoise/ExtDev/AudioPlayer/xnoise-audio-player-tree-view.c libxnoise/ExtDev/GenericPlayer/xnoise-generic-player-device.c +libxnoise/ExtraWidgets/AboutDialog/xnoise-about.c libxnoise/ExtraWidgets/AddMedia/xnoise-add-media-widget.c libxnoise/ExtraWidgets/Fullscreen/xnoise-fullscreen-toolbar.c libxnoise/ExtraWidgets/Settings/xnoise-settings-widget.c diff -Nru xnoise-0.2.20/po/eu.po xnoise-0.2.21/po/eu.po --- xnoise-0.2.20/po/eu.po 2013-12-11 09:32:49.000000000 +0000 +++ xnoise-0.2.21/po/eu.po 2013-12-20 15:47:07.000000000 +0000 @@ -3,7 +3,7 @@ "Project-Id-Version: xnoise\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-12-11 10:26+0100\n" -"PO-Revision-Date: 2013-09-15 21:59+0100\n" +"PO-Revision-Date: 2013-12-16 22:36+0100\n" "Last-Translator: Ibai Oihanguren Sala \n" "Language-Team: Basque\n" "Language: eu\n" @@ -213,9 +213,8 @@ msgstr "Kanpoko erreprodukzio-gailua" #: ../libxnoise/ExtraWidgets/AddMedia/xnoise-add-media-widget.vala:70 -#, fuzzy msgid "Manage media folders" -msgstr "Hautatu multimedia karpeta" +msgstr "Kudeatu multimedia-karpetak" #: ../libxnoise/ExtraWidgets/AddMedia/xnoise-add-media-widget.vala:80 msgid "Add local folder" @@ -227,12 +226,11 @@ msgstr "Kendu" #: ../libxnoise/ExtraWidgets/AddMedia/xnoise-add-media-widget.vala:87 -#, fuzzy msgid "" "Select local media folders. \n" "All found media files will be available via xnoise's library." msgstr "" -"Hautatu multimedia-karpeta lokalak edo Interneteko korronteak. \n" +"Hautatu multimedia-karpeta lokalak. \n" "Multimedia-jatorri guztiak eskuragarri egongo dira xnoise-ren liburutegian." #: ../libxnoise/ExtraWidgets/AddMedia/xnoise-add-media-widget.vala:130 @@ -258,14 +256,12 @@ msgstr "Multimedia" #: ../libxnoise/ExtraWidgets/Settings/xnoise-settings-widget.vala:209 -#, fuzzy msgid "Download lyrics" -msgstr "Albuma deskargatzen" +msgstr "Deskargatu hitzak" #: ../libxnoise/ExtraWidgets/Settings/xnoise-settings-widget.vala:210 -#, fuzzy msgid "Automatic lyrics fetching from the internet" -msgstr "Hitzak Internetetik deskargatzen" +msgstr "Hitzak Internetetik automatikoki deskargatzen" #: ../libxnoise/ExtraWidgets/Settings/xnoise-settings-widget.vala:214 msgid "Use systray icon" @@ -326,9 +322,8 @@ msgstr "Pantaila osoan" #: ../libxnoise/ExtraWidgets/VideoScreen/xnoise-videoscreen.vala:226 -#, fuzzy msgid "Show Tracklist" -msgstr "Pista-zerrenda" +msgstr "Erakutsi pista-zerrenda" #: ../libxnoise/ExtraWidgets/xnoise-media-source-widget.vala:134 #: ../libxnoise/MainWindow/xnoise-main-window.vala:2069 @@ -825,9 +820,8 @@ msgstr "Erakutsi aplikazioaren menu nagusia" #: ../libxnoise/MainWindow/xnoise-main-window.vala:2021 -#, fuzzy msgid "Return to normal view" -msgstr "Itzuli pista-zerrendara" +msgstr "Itzuli ikuspegi arruntera" #. ARTIST #: ../libxnoise/MainWindow/xnoise-main-window.vala:2079 @@ -1035,7 +1029,7 @@ #: ../plugins/databaseLyrics/DatabaseLyrics.xnplugin.desktop.in.h:2 msgid "Download lyrics from the internet and save them locally" -msgstr "" +msgstr "Deskargatu hitzak Internetetik eta gorde ordenagailuan" #: ../plugins/lastfm/xnoise-lastfm.vala:410 #: ../plugins/lastfm/xnoise-lastfm.vala:532 diff -Nru xnoise-0.2.20/po/it.po xnoise-0.2.21/po/it.po --- xnoise-0.2.20/po/it.po 2013-12-11 09:32:49.000000000 +0000 +++ xnoise-0.2.21/po/it.po 2014-01-25 10:32:29.000000000 +0000 @@ -1,11 +1,17 @@ +# Italian translation for xnoise +# Copyright (C) 2013-2014 xnoise's copyright holder +# This file is distributed under the same license as the xnoise package. +# +# Claudio Arseni , 2013, 2014. +# msgid "" msgstr "" "Project-Id-Version: xnoise\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-12-11 10:26+0100\n" -"PO-Revision-Date: 2011-10-03 11:00+0100\n" -"Last-Translator: Andrea Ranaldi \n" -"Language-Team: shkn \n" +"PO-Revision-Date: 2014-01-22 20:43+0100\n" +"Last-Translator: Claudio Arseni \n" +"Language-Team: Italian \n" "Language: Italian\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -13,6 +19,8 @@ "X-Poedit-Language: Italian\n" "X-Poedit-Country: ITALY\n" "X-Poedit-SourceCharset: utf-8\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Gtranslator 2.91.6\n" #: ../data/misc/xnoise.desktop.in.in.h:1 msgid "Xnoise" @@ -20,72 +28,70 @@ #: ../data/misc/xnoise.desktop.in.in.h:2 msgid "Media Player" -msgstr "Media Player" +msgstr "Lettore multimediale" #: ../data/misc/xnoise.desktop.in.in.h:3 msgid "Organize and play your music and video collections" -msgstr "Organizza ed esegui collezioni video e musicali" +msgstr "Organizza e riproduce collezioni video e musicali" #: ../data/misc/xnoise.desktop.in.in.h:4 msgid "Media;Audio;Video;Player;Mediaplayer;Movie;MP3;" -msgstr "" +msgstr "Media;Audio;Video;Player;Mediaplayer;Filmati;MP3;Musica;" #: ../data/misc/xnoise.desktop.in.in.h:5 #: ../libxnoise/TrayIcon/xnoise-tray-icon.vala:73 #: ../plugins/app_indicator/xnoise-app-indicator.vala:105 msgid "Play/Pause" -msgstr "Esegui/Pausa" +msgstr "Riproduci/Pausa" #: ../data/misc/xnoise.desktop.in.in.h:6 msgid "Stop" -msgstr "" +msgstr "Ferma" #: ../data/misc/xnoise.desktop.in.in.h:7 -#, fuzzy msgid "Goto next track" -msgstr "Vai alla lista brani" +msgstr "Va al brano successivo" #: ../data/misc/xnoise.desktop.in.in.h:8 -#, fuzzy msgid "Goto previous track" -msgstr "Vai alla lista brani" +msgstr "Va al brano precedente" #: ../data/misc/xnoise.desktop.in.in.h:9 msgid "Quit application" -msgstr "" +msgstr "Esce dall'applicazione" #: ../libxnoise/AlbumImage/xnoise-album-image.vala:80 msgid "Toggle visibility of album art view" -msgstr "" +msgstr "Attiva/Disattiva la visualizzazione della copertine degli album" #: ../libxnoise/AlbumImage/xnoise-album-image.vala:82 msgid "" -msgstr "" +msgstr "" #: ../libxnoise/Application/xnoise-application.vala:244 ../src/xnoise.vala:158 #, c-format msgid "Xnoise is a media player for Gtk+." -msgstr "Xnoise é un lettore multimediale in GTK+" +msgstr "Xnoise è un riproduttore multimediale scritto in GTK+" #: ../libxnoise/Application/xnoise-application.vala:245 ../src/xnoise.vala:159 msgid "It uses the gstreamer framework." -msgstr "Viene usato framework il gstreamer." +msgstr "Utilizza il framework gstreamer." #: ../libxnoise/Application/xnoise-application.vala:246 ../src/xnoise.vala:160 msgid "More information on the project website:" -msgstr "Altre informazioni nel sito del progetto:" +msgstr "Ulteriori informazioni nel sito web del progetto:" #. the 'no lyrics found...' also appears in the db provider !! #: ../libxnoise/Database/xnoise-db-reader.vala:224 #: ../libxnoise/Lyrics/xnoise-lyrics-loader.vala:164 #: ../plugins/databaseLyrics/xnoise-database-lyrics.vala:135 msgid "no lyrics found..." -msgstr "Testo non trovato" +msgstr "Testo non trovato..." #: ../libxnoise/Database/xnoise-db-writer.vala:633 -#, fuzzy, c-format +#, c-format msgid "unknown" -msgstr "titolo sconosciuto" +msgstr "Sconosciuto" #: ../libxnoise/DBus/xnoise-desktop-notifications.vala:140 #: ../libxnoise/ExtraWidgets/VideoScreen/xnoise-videoscreen.vala:453 @@ -96,7 +102,7 @@ #: ../libxnoise/TrayIcon/xnoise-tray-icon.vala:251 #, c-format msgid "by" -msgstr "by" +msgstr "di" #: ../libxnoise/DBus/xnoise-desktop-notifications.vala:143 #: ../libxnoise/ExtraWidgets/VideoScreen/xnoise-videoscreen.vala:455 @@ -107,123 +113,116 @@ #: ../libxnoise/TrayIcon/xnoise-tray-icon.vala:253 #, c-format msgid "on" -msgstr "on" +msgstr "da" #: ../libxnoise/DockableMedia/History/xnoise-dockable-playlist-lastplayed.vala:41 -#, fuzzy msgid "Last Played" -msgstr "Media Player" +msgstr "Ultimo riprodotto" #: ../libxnoise/DockableMedia/MusicBrowser/xnoise-music-browser-dockable.vala:47 msgid "Music" -msgstr "" +msgstr "Musica" #: ../libxnoise/DockableMedia/MusicBrowser/xnoise-music-browser.vala:357 #: ../libxnoise/ExtDev/AudioPlayer/xnoise-audio-player-tree-view.vala:519 #: ../plugins/magnatune/magnatune-treeview.vala:238 msgid "Collapse all" -msgstr "Chiudi tutto" +msgstr "Contrai tutto" #: ../libxnoise/DockableMedia/MusicBrowser/xnoise-music-browser.vala:362 msgid "Sort Mode" -msgstr "" +msgstr "Ordinamento" #: ../libxnoise/DockableMedia/MusicBrowser/xnoise-music-browser.vala:372 msgid "ARTIST-ALBUM-TITLE" -msgstr "" +msgstr "ARTISSTA-ALBUM-TITOLO" #: ../libxnoise/DockableMedia/MusicBrowser/xnoise-music-browser.vala:379 msgid "GENRE-ARTIST-ALBUM" -msgstr "" +msgstr "GENERE-ARTISTA-ALBUM" #: ../libxnoise/DockableMedia/MusicBrowser/xnoise-music-browser.vala:386 msgid "ALBUM-ARTIST-TITLE" -msgstr "" +msgstr "ALBUM-ARTISTA-TITOLO" #: ../libxnoise/DockableMedia/MusicBrowser/xnoise-music-browser-model.vala:735 #: ../libxnoise/ExtDev/AudioPlayer/xnoise-audio-player-tree-store.vala:410 #: ../plugins/magnatune/magnatune-treestore.vala:43 msgid "Loading ..." -msgstr "Sto caricando ..." +msgstr "Caricamento..." #: ../libxnoise/DockableMedia/MostPlayed/xnoise-dockable-playlist-mostplayed.vala:41 -#, fuzzy msgid "Most Played" -msgstr "Media Player" +msgstr "Più riprodotti" #: ../libxnoise/DockableMedia/StreamListing/xnoise-dockable-streams.vala:41 msgid "Streams" -msgstr "" +msgstr "Stream" #: ../libxnoise/DockableMedia/VideoListing/xnoise-dockable-videos.vala:41 -#, fuzzy msgid "Videos" msgstr "Video" #: ../libxnoise/ExtDev/AndroidPlayer/xnoise-android-item-handler.vala:37 msgid "Add to Android Device" -msgstr "" +msgstr "Aggiungi a dispositivo Android" #: ../libxnoise/ExtDev/AndroidPlayer/xnoise-android-item-handler.vala:39 #: ../libxnoise/ExtDev/GenericPlayer/xnoise-generic-player-item-handler.vala:40 msgid "Delete from device" -msgstr "" +msgstr "Elimina dal dispositivo" #: ../libxnoise/ExtDev/AndroidPlayer/xnoise-android-player-main-view.vala:45 msgid "Android Player Device" -msgstr "" +msgstr "Dispositivo di riproduzione Android" #: ../libxnoise/ExtDev/AudioPlayer/xnoise-audio-item-handler.vala:102 msgid "Do you want to delete the selected file from the device?" -msgstr "" +msgstr "Rimuovere il file selezionato dal dispositivo?" #: ../libxnoise/ExtDev/AudioPlayer/xnoise-audio-item-handler.vala:125 msgid "Do you want to delete the selected album from the device?" -msgstr "" +msgstr "Rimuovere l'album selezionato dal dispositivo?" #: ../libxnoise/ExtDev/AudioPlayer/xnoise-audio-item-handler.vala:156 msgid "Do you want to delete the selected artist from the device?" -msgstr "" +msgstr "Rimuovere l'artista selezionato dal dispositivo?" #: ../libxnoise/ExtDev/AudioPlayer/xnoise-audio-item-handler.vala:237 #: ../libxnoise/ExtDev/AudioPlayer/xnoise-audio-player-tree-view.vala:110 #: ../libxnoise/ExtDev/AudioPlayer/xnoise-audio-player-tree-view.vala:338 -#, fuzzy msgid "Please wait while moving media to the device." -msgstr "" -"Attendi l'importazione dei media. Oppure annulla se non vuoi attendere." +msgstr "Attendere l'importazione dei file multimediali nel dispositivo." #: ../libxnoise/ExtDev/AudioPlayer/xnoise-audio-item-handler.vala:328 #: ../libxnoise/ExtDev/AudioPlayer/xnoise-audio-player-tree-view.vala:257 #: ../libxnoise/ExtDev/AudioPlayer/xnoise-audio-player-tree-view.vala:380 msgid "Not enough space on device! Aborting..." -msgstr "" +msgstr "Non c'è abbastanza spazio nel dispositivo. Annullamento..." #: ../libxnoise/ExtDev/AudioPlayer/xnoise-audio-player-main-view.vala:117 msgid "Free space: " -msgstr "" +msgstr "Spazio disponibile: " #: ../libxnoise/ExtDev/AudioPlayer/xnoise-audio-player-main-view.vala:120 msgid "Total space: " -msgstr "" +msgstr "Spazio totale: " #: ../libxnoise/ExtDev/GenericPlayer/xnoise-generic-player-device.vala:97 -#, fuzzy msgid "Player" -msgstr "Esegui" +msgstr "Riproduttore" #: ../libxnoise/ExtDev/GenericPlayer/xnoise-generic-player-item-handler.vala:38 msgid "Add to Player Device" -msgstr "" +msgstr "Aggiungi al dispositivo Android" #: ../libxnoise/ExtDev/GenericPlayer/xnoise-generic-player-main-view.vala:45 msgid "External Player Device" -msgstr "" +msgstr "Dispositivo di riproduzione esterno" #: ../libxnoise/ExtraWidgets/AddMedia/xnoise-add-media-widget.vala:70 -#, fuzzy msgid "Manage media folders" -msgstr "Seleziona la cartella multimediale" +msgstr "Gestione cartelle multimediali" #: ../libxnoise/ExtraWidgets/AddMedia/xnoise-add-media-widget.vala:80 msgid "Add local folder" @@ -235,176 +234,163 @@ msgstr "Rimuovi" #: ../libxnoise/ExtraWidgets/AddMedia/xnoise-add-media-widget.vala:87 -#, fuzzy msgid "" "Select local media folders. \n" "All found media files will be available via xnoise's library." msgstr "" -"Seleziona il file, la cartella o il media stream da aggiungere alla " -"libreria. \n" -"Tutta la libreria multimediale sarà raggiungibile dal media browser." +"Selezionare le cartelle multimediali locali. \n" +"Tutti i file multimediali saranno disponibili nella libreria di Xnoise." #: ../libxnoise/ExtraWidgets/AddMedia/xnoise-add-media-widget.vala:130 #: ../libxnoise/ExtraWidgets/xnoise-first-start-widget.vala:192 -#, fuzzy msgid "Location" -msgstr "Apri _indirizzo" +msgstr "Posizione" #: ../libxnoise/ExtraWidgets/AddMedia/xnoise-add-media-widget.vala:232 #: ../libxnoise/ExtraWidgets/xnoise-first-start-widget.vala:70 msgid "Select media folder" -msgstr "Seleziona la cartella multimediale" +msgstr "Seleziona cartella multimediale" #: ../libxnoise/ExtraWidgets/Fullscreen/xnoise-fullscreen-toolbar.vala:259 msgid "Leave fullscreen" -msgstr "Abbandona \"schermo intero\"" +msgstr "Abbandona schermo intero" #: ../libxnoise/ExtraWidgets/Settings/xnoise-settings-widget.vala:200 msgid "General" msgstr "Generale" #: ../libxnoise/ExtraWidgets/Settings/xnoise-settings-widget.vala:202 -#, fuzzy msgid "Media" -msgstr "Mostra media" +msgstr "Contenuti multimediali" #: ../libxnoise/ExtraWidgets/Settings/xnoise-settings-widget.vala:209 msgid "Download lyrics" -msgstr "" +msgstr "Scaricare testi" #: ../libxnoise/ExtraWidgets/Settings/xnoise-settings-widget.vala:210 msgid "Automatic lyrics fetching from the internet" -msgstr "" +msgstr "Scarica automaticamente i testi da internet" #: ../libxnoise/ExtraWidgets/Settings/xnoise-settings-widget.vala:214 msgid "Use systray icon" -msgstr "" +msgstr "Mostrare icona nel vassoio di sistema" #: ../libxnoise/ExtraWidgets/Settings/xnoise-settings-widget.vala:215 msgid "" "Use a status icon on your panel for showing, hiding and controlling xnoise" msgstr "" +"Usa un'icona di stato nel pannello per mostrare, nascondere e controllare " +"Xnoise" #: ../libxnoise/ExtraWidgets/Settings/xnoise-settings-widget.vala:219 -#, fuzzy msgid "Quit on window close" -msgstr "Esci dall'applicazione se la finestra è chiusa" +msgstr "Uscire alla chiusura della finestra" #: ../libxnoise/ExtraWidgets/Settings/xnoise-settings-widget.vala:220 -#, fuzzy msgid "Quit xnoise if the main window is closed" -msgstr "Esci dall'applicazione se la finestra è chiusa" +msgstr "Esce da Xnoise quando la finestra principale viene chiusa" #: ../libxnoise/ExtraWidgets/Settings/xnoise-settings-widget.vala:224 msgid "Continue with last played song" -msgstr "" +msgstr "Continuare dall'ultimo brano riprodotto" #: ../libxnoise/ExtraWidgets/Settings/xnoise-settings-widget.vala:225 msgid "After restart continue with last played song" -msgstr "" +msgstr "Al riavvio riprende la riproduzione dall'ultimo brano ascoltato" #: ../libxnoise/ExtraWidgets/Settings/xnoise-settings-widget.vala:247 msgid "User Interface:" -msgstr "" +msgstr "Interfaccia utente:" #: ../libxnoise/ExtraWidgets/Settings/xnoise-settings-widget.vala:251 -#, fuzzy msgid "Lyrics:" -msgstr "_Testi" +msgstr "Testi:" #: ../libxnoise/ExtraWidgets/Settings/xnoise-settings-widget.vala:255 msgid "Additional:" -msgstr "" +msgstr "Impostazioni aggiuntive:" #: ../libxnoise/ExtraWidgets/Settings/xnoise-settings-widget.vala:259 msgid "Web Services:" -msgstr "" +msgstr "Servizi web:" #: ../libxnoise/ExtraWidgets/VideoScreen/xnoise-videoscreen.vala:65 msgid "Select external subtitle file" -msgstr "Seleziona file sottotitoli" +msgstr "Seleziona file esterno per i sottotitoli" #: ../libxnoise/ExtraWidgets/VideoScreen/xnoise-videoscreen.vala:156 msgid "No Subtitle" -msgstr "No Subtitle" +msgstr "Nessun sottotitolo" #: ../libxnoise/ExtraWidgets/VideoScreen/xnoise-videoscreen.vala:214 msgid "Leave Fullscreen" -msgstr "Abbandona \"schermo intero\"" +msgstr "Abbandona schermo intero" #: ../libxnoise/ExtraWidgets/VideoScreen/xnoise-videoscreen.vala:214 msgid "Fullscreen" msgstr "Schermo intero" #: ../libxnoise/ExtraWidgets/VideoScreen/xnoise-videoscreen.vala:226 -#, fuzzy msgid "Show Tracklist" -msgstr "Listra brani" +msgstr "Mostra elenco brani" #: ../libxnoise/ExtraWidgets/xnoise-media-source-widget.vala:134 #: ../libxnoise/MainWindow/xnoise-main-window.vala:2069 msgid "Search..." -msgstr "" +msgstr "Cerca..." #: ../libxnoise/ExtraWidgets/xnoise-equalizer-widget.vala:214 msgid "Preset:" -msgstr "" +msgstr "Preselezione:" #: ../libxnoise/ExtraWidgets/xnoise-equalizer-widget.vala:233 msgid "Volume" -msgstr "" +msgstr "Volume" #: ../libxnoise/ExtraWidgets/xnoise-first-start-widget.vala:118 -#, fuzzy msgid "Add Media" -msgstr "Aggiungi media" +msgstr "Aggiungi contenuto" #: ../libxnoise/ExtraWidgets/xnoise-first-start-widget.vala:120 msgid "Skip" -msgstr "" +msgstr "Salta" #: ../libxnoise/ExtraWidgets/xnoise-first-start-widget.vala:125 msgid "Done" -msgstr "" +msgstr "Fatto" #: ../libxnoise/ExtraWidgets/xnoise-first-start-widget.vala:134 msgid "Please wait while media is added to your library!" -msgstr "" +msgstr "Attendere mentre i contenuti vengono aggiunti alla libreria." #: ../libxnoise/ExtraWidgets/xnoise-first-start-widget.vala:135 #, c-format msgid "You can start listening to your music by selecting '%s'" -msgstr "" +msgstr "È possibile iniziare ad ascoltare la propria musica selezionando «%s»" #: ../libxnoise/ExtraWidgets/xnoise-first-start-widget.vala:141 -#, fuzzy msgid "Add more media folders" -msgstr "Aggiungi cartella locale" +msgstr "Aggiungi altre cartelle multimediali" #: ../libxnoise/ExtraWidgets/xnoise-first-start-widget.vala:164 -#, fuzzy msgid "Media Folders:" -msgstr "Media Player" +msgstr "Cartelle multimediali:" #: ../libxnoise/ExtraWidgets/xnoise-first-start-widget.vala:202 msgid "Welcome to Xnoise!\n" -msgstr "" +msgstr "Benvenuti in Xnoise!\n" #: ../libxnoise/ExtraWidgets/xnoise-first-start-widget.vala:204 msgid "This is the first time you start xnoise." -msgstr "" +msgstr "Questo è il primo avvio dell'applicazione." #: ../libxnoise/ExtraWidgets/xnoise-first-start-widget.vala:206 -#, fuzzy msgid "Do you want to import media into your library?" -msgstr "" -"Questa é la prima esecuzione di xnoise. Vuoi importare dei media nella " -"libreria multimediale?" +msgstr "Importare contenuti multimediali nella libreria?" #: ../libxnoise/ItemHandlers/AddAllToTracklist/xnoise-handler-add-all-to-tracklist.vala:41 -#, fuzzy msgid "Add all tracks to tracklist" -msgstr "Aggiungi tutti i brani visibili alla lista brani" +msgstr "Aggiungi tutti i brani all'elenco di riproduzione" #: ../libxnoise/ItemHandlers/EditTags/xnoise-tag-artist-editor.vala:62 #: ../libxnoise/ItemHandlers/EditTags/xnoise-tag-artist-editor.vala:66 @@ -420,17 +406,19 @@ "With this dialog you can change the metatags in the according files. \n" "Handle with care!" msgstr "" +"In questo dialogo è possibile modificare i meta-dati dei file. \n" +"Modificare con attenzione." #: ../libxnoise/ItemHandlers/EditTags/xnoise-tag-artist-editor.vala:130 #: ../libxnoise/ItemHandlers/EditTags/xnoise-tag-albumartist-editor.vala:130 #: ../libxnoise/ItemHandlers/EditTags/xnoise-tag-title-editor.vala:194 msgid "xnoise - Edit metadata" -msgstr "xnoise - Modifica metadati" +msgstr "Xnoise - modifica meta-dati" #: ../libxnoise/ItemHandlers/EditTags/xnoise-tag-artist-editor.vala:133 #: ../libxnoise/ItemHandlers/EditTags/xnoise-tag-albumartist-editor.vala:133 msgid "Type new artist name." -msgstr "Modifica nome artista." +msgstr "Digitare il nuovo nome dell'artista." #: ../libxnoise/ItemHandlers/EditTags/xnoise-tag-artist-editor.vala:134 #: ../libxnoise/ItemHandlers/EditTags/xnoise-tag-albumartist-editor.vala:134 @@ -445,8 +433,8 @@ "Please wait while filling media browser. Or cancel, if you do not want to " "wait." msgstr "" -"Attendi il popolamento del media browser. Oppure annulla se non vuoi " -"attendere." +"Attendere che il browser multimediale venga riempito, oppure annullare se " +"non si vuole attendere." #: ../libxnoise/ItemHandlers/EditTags/xnoise-tag-artist-editor.vala:162 #: ../libxnoise/ItemHandlers/EditTags/xnoise-tag-albumartist-editor.vala:162 @@ -455,11 +443,12 @@ msgid "" "Please wait while importing media. Or cancel, if you do not want to wait." msgstr "" -"Attendi l'importazione dei media. Oppure annulla se non vuoi attendere." +"Attendere l'importazione dei contenuti multimediali, oppure annullare se non " +"si vuole attendere." #: ../libxnoise/ItemHandlers/EditTags/xnoise-tag-albumartist-editor.vala:137 msgid "Type new album name." -msgstr "Modifica nome album" +msgstr "Digitare il nuovo nome dell'album." #: ../libxnoise/ItemHandlers/EditTags/xnoise-tag-albumartist-editor.vala:138 #: ../libxnoise/ItemHandlers/EditTags/xnoise-tag-album-editor.vala:185 @@ -467,39 +456,32 @@ msgstr "Album:" #: ../libxnoise/ItemHandlers/EditTags/xnoise-tag-album-editor.vala:180 -#, fuzzy msgid "Album data" -msgstr "Modifica nome album" +msgstr "Dati album" #: ../libxnoise/ItemHandlers/EditTags/xnoise-tag-album-editor.vala:183 -#, fuzzy msgid "Please enter new album data." -msgstr "Modifica nome album" +msgstr "Inserire i nuovi dati dell'album." #: ../libxnoise/ItemHandlers/EditTags/xnoise-tag-album-editor.vala:184 -#, fuzzy msgid "Album Artist:" -msgstr "Artista" +msgstr "Artista album:" #: ../libxnoise/ItemHandlers/EditTags/xnoise-tag-album-editor.vala:186 -#, fuzzy msgid "Year:" -msgstr "Anno" +msgstr "Anno:" #: ../libxnoise/ItemHandlers/EditTags/xnoise-tag-album-editor.vala:187 -#, fuzzy msgid "Genre:" -msgstr "Genere" +msgstr "Genere:" #: ../libxnoise/ItemHandlers/EditTags/xnoise-tag-title-editor.vala:146 -#, fuzzy msgid "Title Artist" -msgstr "Artista" +msgstr "Autore" #: ../libxnoise/ItemHandlers/EditTags/xnoise-tag-title-editor.vala:149 -#, fuzzy msgid "Album Artist" -msgstr "Artista" +msgstr "Artista album" #. ALBUM #: ../libxnoise/ItemHandlers/EditTags/xnoise-tag-title-editor.vala:152 @@ -536,75 +518,74 @@ #: ../libxnoise/ItemHandlers/EditTags/xnoise-tag-title-editor.vala:167 msgid "Track No." -msgstr "" +msgstr "Numero brano" #: ../libxnoise/ItemHandlers/EditTags/xnoise-tag-title-editor.vala:170 msgid "Disk No." -msgstr "" +msgstr "Numero disco" #: ../libxnoise/ItemHandlers/EditTags/xnoise-handler-edit-tags.vala:35 #: ../libxnoise/ItemHandlers/EditTags/xnoise-handler-edit-tags.vala:39 -#, fuzzy msgid "Edit data for track" -msgstr "Modifica i metadati del brano" +msgstr "Modifica meta-dati del brano" #: ../libxnoise/ItemHandlers/EditTags/xnoise-handler-edit-tags.vala:43 -#, fuzzy msgid "Change album data" -msgstr "Modifica nome album" +msgstr "Modifica dati album" #: ../libxnoise/ItemHandlers/EditTags/xnoise-handler-edit-tags.vala:47 -#, fuzzy msgid "Change artist data" -msgstr "Modifica nome artista" +msgstr "Modifica dati artista" #: ../libxnoise/ItemHandlers/EditTags/xnoise-handler-edit-tags.vala:53 msgid "Change genre name" -msgstr "" +msgstr "Modifica genere" #: ../libxnoise/ItemHandlers/AddToTracklist/xnoise-handler-add-to-tracklist.vala:50 #: ../libxnoise/ItemHandlers/AddToTracklist/xnoise-handler-add-to-tracklist.vala:55 msgid "Add to tracklist" -msgstr "Vai alla lista brani" +msgstr "Aggiungi a elenco di riproduzione" #: ../libxnoise/ItemHandlers/MoveToTrash/xnoise-handler-move-to-trash.vala:41 msgid "Move to trash" -msgstr "" +msgstr "Sposta nel cestino" #: ../libxnoise/ItemHandlers/MoveToTrash/xnoise-handler-move-to-trash.vala:87 msgid "Do you want to move the selected file to trash?" -msgstr "" +msgstr "Spostare il file selezionato nel cestino?" #: ../libxnoise/ItemHandlers/RemoveCover/xnoise-handler-remove-cover.vala:40 msgid "Remove Cover Image" -msgstr "" +msgstr "Rimuovi copertina album" #: ../libxnoise/ItemHandlers/PlayItem/xnoise-handler-play-item.vala:35 msgid "Play" -msgstr "Esegui" +msgstr "Riproduci" #: ../libxnoise/ItemHandlers/RemoveTrack/xnoise-handler-remove-track.vala:35 msgid "Remove selected track" -msgstr "Rimuovi i brani selezionati" +msgstr "Rimuovi il brano selezionato" #: ../libxnoise/ItemHandlers/ShowInFilemanager/xnoise-handler-show-in-file-manager.vala:35 #: ../libxnoise/ItemHandlers/ShowInFilemanager/xnoise-handler-show-in-file-manager.vala:39 msgid "Show in parent folder" -msgstr "" +msgstr "Mostra nella cartella genitore" #: ../libxnoise/ItemHandlers/FilterForArtist/xnoise-handler-filter-for-artist.vala:41 msgid "Filter for artist" -msgstr "" +msgstr "Filtra per artista" #: ../libxnoise/Lyrics/xnoise-lyrics-view.vala:99 #: ../libxnoise/Lyrics/xnoise-lyrics-view.vala:154 msgid "Insufficient track information. Not searching for lyrics." -msgstr "Informazzioni traccia insufficienti. Non ricerco testi." +msgstr "" +"Informazioni sul brano non sufficienti. La ricerca dei testi non verrà " +"eseguita." #: ../libxnoise/Lyrics/xnoise-lyrics-view.vala:127 #: ../libxnoise/Lyrics/xnoise-lyrics-view.vala:143 msgid "Player stopped. Not searching for lyrics." -msgstr "Lettore fermo. Nessuna ricerca testi." +msgstr "Riproduttore fermato. La ricerca dei testi non verrà eseguita." #. Gtk.TextIter start_iter; #. Gtk.TextIter end_iter; @@ -621,9 +602,9 @@ "Using %s ..." msgstr "" "\n" -"Cerco i testi per \"%s\" di \"%s\"\n" +"Ricerca del testo per \"%s\" di \"%s\"\n" "\n" -"Tramite %s ..." +"usando %s ..." #: ../libxnoise/MainWindow/xnoise-main-window.vala:223 msgid "_File" @@ -631,100 +612,97 @@ #: ../libxnoise/MainWindow/xnoise-main-window.vala:224 msgid "open file" -msgstr "apri file" +msgstr "Apre un file" #: ../libxnoise/MainWindow/xnoise-main-window.vala:225 msgid "Open _Stream" -msgstr "" +msgstr "Apri _stream" #: ../libxnoise/MainWindow/xnoise-main-window.vala:225 msgid "open remote location" -msgstr "apri indirizzo remoto" +msgstr "Apre una posizione remota" #: ../libxnoise/MainWindow/xnoise-main-window.vala:226 msgid "_Add or Remove media" -msgstr "_Aggiungi o rimuovi media" +msgstr "_Aggiungi o rimuovi contenuti" #: ../libxnoise/MainWindow/xnoise-main-window.vala:226 msgid "manage the content of the xnoise media library" -msgstr "Gestisci il contenuto della libreria multimediale xnoise" +msgstr "Gestisce il contenuto della libreria multimediale di Xnoise" #: ../libxnoise/MainWindow/xnoise-main-window.vala:228 msgid "_Edit" -msgstr "_Edit" +msgstr "_Modifica" #: ../libxnoise/MainWindow/xnoise-main-window.vala:229 msgid "C_lear tracklist" -msgstr "_Pulisci la lista brani" +msgstr "Pu_lisci elenco brani" #: ../libxnoise/MainWindow/xnoise-main-window.vala:229 #: ../libxnoise/MainWindow/xnoise-main-window.vala:1815 msgid "Clear the tracklist" -msgstr "Pulisci la lista brani" +msgstr "Pulisce l'elenco dei brani" #: ../libxnoise/MainWindow/xnoise-main-window.vala:230 msgid "_Increase volume" -msgstr "" +msgstr "A_umenta volume" #: ../libxnoise/MainWindow/xnoise-main-window.vala:230 msgid "Increase playback volume" -msgstr "" +msgstr "Aumenta il volume di riproduzione" #: ../libxnoise/MainWindow/xnoise-main-window.vala:231 msgid "_Decrease volume" -msgstr "" +msgstr "_Diminuisci volume" #: ../libxnoise/MainWindow/xnoise-main-window.vala:231 msgid "Decrease playback volume" -msgstr "" +msgstr "Diminuisce il volume di riproduzione" #: ../libxnoise/MainWindow/xnoise-main-window.vala:232 -#, fuzzy msgid "_Previous track" -msgstr "Precedente" +msgstr "Brano _precedente" #: ../libxnoise/MainWindow/xnoise-main-window.vala:232 -#, fuzzy msgid "Go to previous track" -msgstr "Vai alla lista brani" +msgstr "Va al brano precedente" #: ../libxnoise/MainWindow/xnoise-main-window.vala:233 msgid "_Toggle play" -msgstr "" +msgstr "A_ttiva/Disattiva riproduzione" #: ../libxnoise/MainWindow/xnoise-main-window.vala:233 msgid "Toggle playback status" -msgstr "" +msgstr "Cambia lo stato della riproduzione" #: ../libxnoise/MainWindow/xnoise-main-window.vala:234 msgid "_Next track" -msgstr "" +msgstr "Bra_no successivo" #: ../libxnoise/MainWindow/xnoise-main-window.vala:234 -#, fuzzy msgid "Go to next track" -msgstr "Vai alla lista brani" +msgstr "Va al brano successivo" #. icon #: ../libxnoise/MainWindow/xnoise-main-window.vala:235 msgid "E_qualizer" -msgstr "" +msgstr "E_qualizzatore" #: ../libxnoise/MainWindow/xnoise-main-window.vala:235 msgid "Open equalizer window" -msgstr "" +msgstr "Apre l'equalizzatore" #: ../libxnoise/MainWindow/xnoise-main-window.vala:237 msgid "_View" -msgstr "_View" +msgstr "_Visualizza" #: ../libxnoise/MainWindow/xnoise-main-window.vala:238 msgid "_Tracklist" -msgstr "_Tracklist" +msgstr "_Elenco brani" #: ../libxnoise/MainWindow/xnoise-main-window.vala:238 msgid "Go to the tracklist." -msgstr "Vai alla lista brani" +msgstr "Va all'elenco dei brani" #: ../libxnoise/MainWindow/xnoise-main-window.vala:239 msgid "_Lyrics" @@ -732,129 +710,121 @@ #: ../libxnoise/MainWindow/xnoise-main-window.vala:239 msgid "Go to the lyrics view." -msgstr "Vai alla lista testi" +msgstr "Va alla visualizzazione dei test" #: ../libxnoise/MainWindow/xnoise-main-window.vala:240 msgid "_Now Playing" -msgstr "_Esegui" +msgstr "Ora in riproduzio_ne" #: ../libxnoise/MainWindow/xnoise-main-window.vala:241 -#, fuzzy msgid "Go to the 'Now Playing' screen in the main window." -msgstr "Esegui nella finestra principale." +msgstr "Va alla schermata \"Ora in riproduzione\" nella finestra principale" #: ../libxnoise/MainWindow/xnoise-main-window.vala:242 msgid "_Help" -msgstr "_Aiuto" +msgstr "A_iuto" #: ../libxnoise/MainWindow/xnoise-main-window.vala:244 msgid "_Frequently Asked Questions" -msgstr "" +msgstr "Domande _frequenti" #: ../libxnoise/MainWindow/xnoise-main-window.vala:244 msgid "_Open Frequently Asked Questions in web browser" -msgstr "" +msgstr "_Apri le domande frequenti nel browser" #: ../libxnoise/MainWindow/xnoise-main-window.vala:245 msgid "_Keyboard Shortcuts" -msgstr "" +msgstr "Sc_orciatoie da tastiera" #: ../libxnoise/MainWindow/xnoise-main-window.vala:245 msgid "_Open Keyboard Shortcuts in web browser" -msgstr "" +msgstr "_Apri le scorciatoie da tastiera nel browser" #: ../libxnoise/MainWindow/xnoise-main-window.vala:246 msgid "_Config" -msgstr "_Config" +msgstr "_Configura" #: ../libxnoise/MainWindow/xnoise-main-window.vala:304 -#, fuzzy msgid "_Show Media Browser" -msgstr "Dimensione carattere media browser:" +msgstr "Mo_stra il browser multimediale" #: ../libxnoise/MainWindow/xnoise-main-window.vala:313 -#, fuzzy msgid "Show _Video Fullscreen" -msgstr "_Video screen" +msgstr "Mostra il _video a schermo intero" #: ../libxnoise/MainWindow/xnoise-main-window.vala:322 msgid "Show _Album Art view" -msgstr "" +msgstr "Mostra la copertina dell'_album" #: ../libxnoise/MainWindow/xnoise-main-window.vala:517 -#, fuzzy, c-format +#, c-format msgid "" "Restoring %u tracks in the tracklist. This is quite a lot and can slow down " "the startup of xnoise." msgstr "" -"Ripristina %u brani nella lista brani. Si tratta di un gran numero e può " -"rallentare l'avvio di xnoise." +"Ripristino di %u brani nell'elenco di riproduzione. È un'operazione lunga " +"che può rallentare l'avvio di Xnoise." #: ../libxnoise/MainWindow/xnoise-main-window.vala:722 #: ../libxnoise/MainWindow/xnoise-main-window.vala:734 #: ../libxnoise/MainWindow/xnoise-main-window.vala:746 #: ../libxnoise/MainWindow/xnoise-main-window.vala:758 msgid "Playback mode: " -msgstr "" +msgstr "Modalità di riproduzione:" #: ../libxnoise/MainWindow/xnoise-main-window.vala:722 msgid "No repeat, one after another" -msgstr "" +msgstr "Nessuna ripetizione, una dopo l'altra" #: ../libxnoise/MainWindow/xnoise-main-window.vala:734 -#, fuzzy msgid "Repeat single track" -msgstr "ripeti singolo" +msgstr "Ripeti singolo brano" #: ../libxnoise/MainWindow/xnoise-main-window.vala:746 -#, fuzzy msgid "Repeat all" -msgstr "ripeti tutto" +msgstr "Ripeti tutto" #: ../libxnoise/MainWindow/xnoise-main-window.vala:758 msgid "Random playlist track playing" -msgstr "" +msgstr "Riproduzione casuale delle tracce" #: ../libxnoise/MainWindow/xnoise-main-window.vala:1303 msgid "Settings" -msgstr "" +msgstr "Impostazioni" #: ../libxnoise/MainWindow/xnoise-main-window.vala:1411 -#, fuzzy msgid "Enter the URL for playing" -msgstr "Inserisci l'indirizzo del file da aprire" +msgstr "Inserire l'URL per la riproduzione" #: ../libxnoise/MainWindow/xnoise-main-window.vala:1436 msgid "Equalizer" -msgstr "" +msgstr "Equalizzatore" #: ../libxnoise/MainWindow/xnoise-main-window.vala:1460 msgid "Select media file" msgstr "Seleziona un file multimediale" #: ../libxnoise/MainWindow/xnoise-main-window.vala:1767 -#, fuzzy msgid "Repeat Mode" -msgstr "ripeti tutto" +msgstr "Modalità di ripetizione" #: ../libxnoise/MainWindow/xnoise-main-window.vala:1789 -#, fuzzy msgid "Remove selected tracks" -msgstr "Rimuovi i brani selezionati" +msgstr "Rimuove i brani selezionati" #: ../libxnoise/MainWindow/xnoise-main-window.vala:1840 msgid "Jump to current position" -msgstr "" +msgstr "Salta alla posizione attuale" #: ../libxnoise/MainWindow/xnoise-main-window.vala:1935 #: ../libxnoise/MainWindow/xnoise-main-window.vala:2065 msgid "Select search with " -msgstr "" +msgstr "Avviare la ricerca usando " #: ../libxnoise/MainWindow/xnoise-main-window.vala:1937 #: ../libxnoise/MainWindow/xnoise-main-window.vala:2067 msgid "Remove search filter with " -msgstr "" +msgstr "Rimuovere i filtri di ricerca usando " #. AppMenuButton for compact layout #: ../libxnoise/MainWindow/xnoise-main-window.vala:1976 @@ -862,9 +832,8 @@ msgstr "Mostra il menu principale" #: ../libxnoise/MainWindow/xnoise-main-window.vala:2021 -#, fuzzy msgid "Return to normal view" -msgstr "Vai alla lista brani" +msgstr "Ritorna alla vista normale" #. ARTIST #: ../libxnoise/MainWindow/xnoise-main-window.vala:2079 @@ -875,62 +844,62 @@ #: ../libxnoise/MainWindow/xnoise-main-window.vala:2088 msgid "Ascending" -msgstr "" +msgstr "Crescente" #: ../libxnoise/MainWindow/xnoise-main-window.vala:2090 msgid "Descending" -msgstr "" +msgstr "Decrescente" #: ../libxnoise/Player/xnoise-gst-equalizer.vala:165 msgid "Dance" -msgstr "" +msgstr "Dance" #: ../libxnoise/Player/xnoise-gst-equalizer.vala:170 msgid "Pop" -msgstr "" +msgstr "Pop" #: ../libxnoise/Player/xnoise-gst-equalizer.vala:175 msgid "Techno" -msgstr "" +msgstr "Techno" #: ../libxnoise/Player/xnoise-gst-equalizer.vala:180 msgid "Club" -msgstr "" +msgstr "Club" #: ../libxnoise/Player/xnoise-gst-equalizer.vala:185 msgid "Jazz" -msgstr "" +msgstr "Jazz" #: ../libxnoise/Player/xnoise-gst-equalizer.vala:190 msgid "Rock" -msgstr "" +msgstr "Rock" #: ../libxnoise/Player/xnoise-gst-equalizer.vala:195 msgid "Maximum Treble" -msgstr "" +msgstr "Valore massimo per gli \"alti\"" #: ../libxnoise/Player/xnoise-gst-equalizer.vala:200 msgid "Maximum Bass" -msgstr "" +msgstr "Valore massimo per i \"bassi\"" #: ../libxnoise/Player/xnoise-gst-equalizer.vala:205 msgid "Classic" -msgstr "" +msgstr "Classica" #: ../libxnoise/Player/xnoise-gst-equalizer.vala:211 msgid "Custom" -msgstr "" +msgstr "Personalizzato" #: ../libxnoise/Player/xnoise-gst-equalizer.vala:217 msgid "Default" -msgstr "" +msgstr "Predefinito" #: ../libxnoise/Player/xnoise-gst-player.vala:229 msgid "" "The subtitle name is not matching the video name! Not using subtitle file." msgstr "" -"Il nome dei sottotitoli non corrisponde al nome del video! Non verrà " -"utilizzato il file sottotitoli." +"Il nome dei sottotitoli non corrisponde al nome del video. I sottotitoli non " +"verrnanno usati." #: ../libxnoise/Player/xnoise-gst-player.vala:690 #, c-format @@ -945,7 +914,7 @@ #: ../libxnoise/Player/xnoise-gst-player.vala:698 #, c-format msgid "Gstreamer plugin not found in repositories" -msgstr "Plugin gstreamer non trovato nei repositories" +msgstr "Plugin gstreamer non trovato nei repository" #: ../libxnoise/Player/xnoise-gst-player.vala:704 #, c-format @@ -965,11 +934,11 @@ #: ../libxnoise/Player/xnoise-gst-player.vala:762 msgid "Failed to start automatic gstreamer plugin installation." -msgstr "Tentativo di installazione automatica dei plugin mancanti fallita" +msgstr "Tentativo di installazione automatica dei plugin mancanti non riuscita" #: ../libxnoise/Player/xnoise-gst-player.vala:775 msgid "Trying to install missing gstreamer plugin" -msgstr "Provo a installare automaticamente il plugin gstreamer mancante" +msgstr "Tentativo di installazione automatica del plugin gstreamer mancante" #: ../libxnoise/Player/xnoise-gst-player.vala:875 msgid "Subtitle #" @@ -977,64 +946,59 @@ #: ../libxnoise/Player/xnoise-gst-player.vala:887 msgid "Audio Track #" -msgstr "Traccia audio #" +msgstr "Brano #" #: ../libxnoise/Resources/xnoise-resources.vala:67 msgid "unknown artist" -msgstr "artista sconosciuto" +msgstr "Artista sconosciuto" #: ../libxnoise/Resources/xnoise-resources.vala:68 msgid "unknown title" -msgstr "titolo sconosciuto" +msgstr "Titolo sconosciuto" #: ../libxnoise/Resources/xnoise-resources.vala:69 msgid "unknown album" -msgstr "album sconosciuto" +msgstr "Album sconosciuto" #: ../libxnoise/Resources/xnoise-resources.vala:71 msgid "Now Playing" -msgstr "Esegui" +msgstr "Ora in riproduzione" #: ../libxnoise/Resources/xnoise-resources.vala:72 msgid "Tracklist" -msgstr "Listra brani" +msgstr "Elenco brani" #: ../libxnoise/Resources/xnoise-resources.vala:73 -#, fuzzy msgid "Lyrics" -msgstr "_Testi" +msgstr "Testi" #: ../libxnoise/Resources/xnoise-resources.vala:74 -#, fuzzy msgid "Hide Media Library" -msgstr "Nascondi media" +msgstr "Nascondi libreria multimediale" #: ../libxnoise/Resources/xnoise-resources.vala:75 -#, fuzzy msgid "Show Media Library" -msgstr "Mostra media" +msgstr "Mostra libreria multimediale" #: ../libxnoise/TrackList/xnoise-tracklist.vala:1211 msgid "Disk" -msgstr "" +msgstr "Disco" #. LENGTH #: ../libxnoise/TrackList/xnoise-tracklist.vala:1306 #: ../libxnoise/TrackList/xnoise-tracklist.vala:1459 msgid "Length" -msgstr "Lunghezza" +msgstr "Durata" #. TRACKNUMBER #: ../libxnoise/TrackList/xnoise-tracklist.vala:1405 -#, fuzzy msgid "Track number" -msgstr "Numero traccia" +msgstr "Numero brano" #. DISK_NUMBER #: ../libxnoise/TrackList/xnoise-tracklist.vala:1414 -#, fuzzy msgid "Disk number" -msgstr "Numero traccia" +msgstr "Numero disco" #: ../libxnoise/TrayIcon/xnoise-tray-icon.vala:88 #: ../plugins/app_indicator/xnoise-app-indicator.vala:121 @@ -1049,41 +1013,41 @@ #: ../libxnoise/TrayIcon/xnoise-tray-icon.vala:121 #: ../plugins/app_indicator/xnoise-app-indicator.vala:172 msgid "Exit" -msgstr "Uscita" +msgstr "Esci" #: ../libxnoise/TrayIcon/xnoise-tray-icon.vala:190 #: ../libxnoise/TrayIcon/xnoise-tray-icon.vala:202 msgid "stopped" -msgstr "fermato" +msgstr "Fermato" #: ../libxnoise/TrayIcon/xnoise-tray-icon.vala:194 msgid "playing" -msgstr "eseguo" +msgstr "In riproduzione" #: ../libxnoise/TrayIcon/xnoise-tray-icon.vala:198 msgid "paused" -msgstr "in pausa" +msgstr "In pausa" #: ../src/xnoise.vala:169 msgid "" "Run 'xnoise --help' to see a full list of available command line options.\n" msgstr "" -"Esegui 'xnoise --help' per vedere la lista completa delle opzioni da linea " -"di comando.\n" +"Eseguire \"xnoise --help\" per vedere l'elenco completo delle opzioni " +"disponibili per la riga di comando.\n" #: ../plugins/databaseLyrics/DatabaseLyrics.xnplugin.desktop.in.h:1 msgid "Lyrics downloading from internet" -msgstr "" +msgstr "Scaricamento dei testi da internet" #: ../plugins/databaseLyrics/DatabaseLyrics.xnplugin.desktop.in.h:2 msgid "Download lyrics from the internet and save them locally" -msgstr "" +msgstr "Scarica i testi da internet e li salva localmente" #: ../plugins/lastfm/xnoise-lastfm.vala:410 #: ../plugins/lastfm/xnoise-lastfm.vala:532 #, c-format msgid "User logged in!" -msgstr "" +msgstr "Accesso utente eseguito." #. feedback #: ../plugins/lastfm/xnoise-lastfm.vala:414 @@ -1091,32 +1055,32 @@ #: ../plugins/lastfm/xnoise-lastfm.vala:535 #, c-format msgid "User not logged in!" -msgstr "" +msgstr "Accesso utente non eseguito." #: ../plugins/lastfm/xnoise-lastfm.vala:475 msgid "Visit LastFm for an account." -msgstr "" +msgstr "Visitare LastFm per creare un account." #: ../plugins/lastfm/xnoise-lastfm.vala:484 #, c-format msgid "Please enter your lastfm username and password." -msgstr "" +msgstr "Inserire il nome utente e la password per LastFm." #: ../plugins/lastfm/xnoise-lastfm.vala:493 #: ../plugins/magnatune/magnatune.vala:263 #, c-format msgid "Username:" -msgstr "" +msgstr "Nome utente:" #: ../plugins/lastfm/xnoise-lastfm.vala:502 #: ../plugins/magnatune/magnatune.vala:272 #, c-format msgid "Password:" -msgstr "" +msgstr "Password:" #: ../plugins/lastfm/xnoise-lastfm.vala:519 msgid "'Scrobble' played tracks on lastfm" -msgstr "" +msgstr "\"Scrobble\" dei brani riprodotti su LastFm" #: ../plugins/chartlyrics/chartlyrics.xnplugin.desktop.in.h:1 msgid "Chartlyrics" @@ -1124,102 +1088,100 @@ #: ../plugins/chartlyrics/chartlyrics.xnplugin.desktop.in.h:2 msgid "Load lyrics from chartlyrics.com" -msgstr "Carico il testo da chartlyrics.com" +msgstr "Carica ii testi da chartlyrics.com" #: ../plugins/lastfm/lastfm.xnplugin.desktop.in.h:1 msgid "LastFm web service integration" -msgstr "" +msgstr "Intgrazione servizio web LastFm" #: ../plugins/lastfm/lastfm.xnplugin.desktop.in.h:2 msgid "Use lastfm's web services" -msgstr "" +msgstr "Usa il servizio web LastFm" #: ../plugins/lyricwiki/Lyricwiki.xnplugin.desktop.in.h:1 msgid "Lyricwiki" -msgstr "_Testi" +msgstr "Lyricwiki" #: ../plugins/lyricwiki/Lyricwiki.xnplugin.desktop.in.h:2 msgid "Load lyrics from http://www.lyricwiki.com" -msgstr "Carico il testo da http://www.lyricwiki.com" +msgstr "Carica il testo da http://www.lyricwiki.com" #: ../plugins/azlyrics/azlyrics.xnplugin.desktop.in.h:1 -#, fuzzy msgid "Azlyrics" -msgstr "Testi" +msgstr "Azlyrics" #: ../plugins/azlyrics/azlyrics.xnplugin.desktop.in.h:2 -#, fuzzy msgid "Load lyrics from azlyrics.com" -msgstr "Carico il testo da chartlyrics.com" +msgstr "Carica il testo da chartlyrics.com" #: ../plugins/app_indicator/xnoise-app-indicator.xnplugin.desktop.in.h:1 msgid "AppIndicator plugin" -msgstr "" +msgstr "Plugin «AppIndicator»" #: ../plugins/app_indicator/xnoise-app-indicator.xnplugin.desktop.in.h:2 msgid "Ubuntu Application Indicator plugin for xnoise" -msgstr "" +msgstr "Plugin di Xnoise per gli indicatori delle applicazioni di Ubuntu" #: ../plugins/app_indicator/xnoise-app-indicator.vala:154 msgid "Show xnoise" -msgstr "" +msgstr "Mostra Xnoise" #: ../plugins/mediakeys/mediakeys.xnplugin.desktop.in.h:1 -#, fuzzy msgid "Media Control Keys" -msgstr "_Ricontrolla collezione" +msgstr "Tasti multimediali" #: ../plugins/mediakeys/mediakeys.xnplugin.desktop.in.h:2 msgid "Control xnoise using mediakeys" -msgstr "Controlla xnoise utilizzando i tasti multimediali" +msgstr "Controlla Xnoise usando i tasti multimediali" #: ../plugins/magnatune/Magnatune.xnplugin.desktop.in.h:1 msgid "Magnatune Music Subscription" -msgstr "" +msgstr "Magnatune Music Subscription" #: ../plugins/magnatune/Magnatune.xnplugin.desktop.in.h:2 msgid "Magnatune Music Store" -msgstr "" +msgstr "Magnatune Music Store" #: ../plugins/magnatune/magnatune-dockable.vala:57 #: ../plugins/magnatune/magnatune.vala:222 msgid "Magnatune" -msgstr "" +msgstr "Magnatune" #: ../plugins/magnatune/magnatune-treeview.vala:247 msgid "Download whole album to disk" -msgstr "" +msgstr "Scarica intero album su disco" #: ../plugins/magnatune/magnatune-treeview.vala:297 msgid "Downloading album " -msgstr "" +msgstr "Scaricamento dell'album " #: ../plugins/magnatune/magnatune-treeview.vala:299 -#, fuzzy msgid "This may take some time..." -msgstr "Importo dati multimediali. Può richiadere qualche tempo." +msgstr "Potrebbe volrci un po' di tempo..." #: ../plugins/magnatune/magnatune-treeview.vala:413 msgid "Download finished for \"" -msgstr "" +msgstr "Scaricamento completato per \"" #: ../plugins/magnatune/magnatune-widget.vala:234 msgid "download finished..." -msgstr "" +msgstr "Scaricamento completato..." #: ../plugins/magnatune/magnatune-widget.vala:238 msgid "decompressing..." -msgstr "" +msgstr "Estrazione in corso..." #: ../plugins/magnatune/magnatune-widget.vala:292 msgid "decompressing finished..." -msgstr "" +msgstr "Estrazione completata..." #: ../plugins/magnatune/magnatune-widget.vala:313 msgid "" "Please wait while\n" "converting database." msgstr "" +"Attendere durante la\n" +"conversione del database." #: ../plugins/magnatune/magnatune-widget.vala:360 #, c-format @@ -1228,248 +1190,51 @@ "converting database.\n" "Done for %d tracks." msgstr "" +"Attendere durante la\n" +"conversione del database.\n" +"Brani completati %d." #: ../plugins/magnatune/magnatune-widget.vala:380 -#, fuzzy msgid "loading..." -msgstr "Sto caricando ..." +msgstr "Caricamento..." #: ../plugins/magnatune/magnatune.vala:179 msgid "Username and Password available" -msgstr "" +msgstr "Nome utente e password disponibili" #: ../plugins/magnatune/magnatune.vala:180 msgid "Username or Password not available" -msgstr "" +msgstr "Nome utente e password non disponibili" #: ../plugins/magnatune/magnatune.vala:242 msgid "Visit Magnatune for an account." -msgstr "" +msgstr "Visitare Magnatune per creare un account." #: ../plugins/magnatune/magnatune.vala:253 #, c-format msgid "Please enter your Magnatune username and password." -msgstr "" +msgstr "Inserire nome utente e password per Magnatune." #: ../plugins/mpris/mpris.xnplugin.desktop.in.h:1 msgid "Mpris v2 Dbus Service" -msgstr "" +msgstr "Servizio DBus Mpris v2" #: ../plugins/mpris/mpris.xnplugin.desktop.in.h:2 msgid "Control xnoise with a MPRIS v2 dbus interface" -msgstr "Controlla xnoise con una interfaccia dbus MPRIS v2" +msgstr "Controlla Xnoise con una interfaccia dbus MPRIS v2" #: ../plugins/mpris_one/mpris_one.xnplugin.desktop.in.h:1 msgid "Mpris v1 Dbus Service" -msgstr "" +msgstr "Servizio DBus Mpris v1" #: ../plugins/mpris_one/mpris_one.xnplugin.desktop.in.h:2 msgid "Control xnoise with a MPRIS v1 dbus interface" -msgstr "Controlla xnoise con una interfaccia dbus MPRIS v1" +msgstr "Controlla Xnoise con una interfaccia dbus MPRIS v1" #: ../plugins/soundmenu2/soundmenu2.xnplugin.desktop.in.h:1 -#, fuzzy msgid "Ubuntu Soundmenu Integration" -msgstr "Utilizza ayatana soundmenu" +msgstr "Integrazione per il menù audio di Ubuntu" #: ../plugins/soundmenu2/soundmenu2.xnplugin.desktop.in.h:2 -#, fuzzy msgid "Use ubuntu/ayatana soundmenu integration" -msgstr "Utilizza ayatana soundmenu" - -#~ msgid "ready to rock" -#~ msgstr "ready to rock" - -#, fuzzy -#~ msgid "Add or Remove media" -#~ msgstr "_Aggiungi o rimuovi media" - -#~ msgid "Add media stream" -#~ msgstr "Aggiungi media stream" - -#~ msgid "Add internet radio link" -#~ msgstr "Aggiungi indirizzo internet radio" - -#, fuzzy -#~ msgid "Grid lines in media browser" -#~ msgstr "Utilizza guide nel media browser" - -#, fuzzy -#~ msgid "Show Stop button" -#~ msgstr "Usa il bottone stop" - -#, fuzzy -#~ msgid "Use desktop notifications" -#~ msgstr "notifiche" - -#, fuzzy -#~ msgid "Media Collections" -#~ msgstr "_Ricontrolla collezione" - -#, fuzzy -#~ msgid "_Rescan collection" -#~ msgstr "_Ricontrolla collezione" - -#, fuzzy -#~ msgid "Rescan collection" -#~ msgstr "_Ricontrolla collezione" - -#~ msgid "Importing media data. This may take some time..." -#~ msgstr "Importo dati multimediali. Può richiadere qualche tempo." - -#~ msgid "Buffer lyrics in database" -#~ msgstr "Buffer lyrics in database" - -#~ msgid "Set the window name to the current title" -#~ msgstr "Modifica il nome finestra con il titolo corrente" - -#, fuzzy -#~ msgid "Do full rescan" -#~ msgstr "esegui in controllo completo della libreria" - -#, fuzzy -#~ msgid "(Plugin)" -#~ msgstr "Plugins" - -#~ msgid "Found %u tracks. Updating library ..." -#~ msgstr "Trovati %u brani. Aggiorno la libreria...." - -#, fuzzy -#~ msgid "%u new tracks found" -#~ msgstr "%u Brani trovati" - -#, fuzzy -#~ msgid "Media browser fontsize" -#~ msgstr "Dimensione carattere media browser:" - -#, fuzzy -#~ msgid "Basic Demo Plugin for Developers" -#~ msgstr "Plugin demo per xnoise" - -#~ msgid "Demo plugin for xnoise" -#~ msgstr "Plugin demo per xnoise" - -#, fuzzy -#~ msgid "Media Source" -#~ msgstr "Media Player" - -#, fuzzy -#~ msgid "Show picture on hover album image" -#~ msgstr "" -#~ "Non mostrare il video durante la visualizzazione delle immagini album" - -#~ msgid "Remove selected titles" -#~ msgstr "Rimuovi i titoli selezionati" - -#~ msgid "Remove all" -#~ msgstr "Rimuovi tutto" - -#, fuzzy -#~ msgid "Playcount" -#~ msgstr "Esegui" - -#, fuzzy -#~ msgid "Use Compact Menu" -#~ msgstr "Mostra il menu principale" - -#, fuzzy -#~ msgid "Playlists" -#~ msgstr "Esegui" - -#~ msgid "no repeat" -#~ msgstr "non ripetere" - -#~ msgid "random play" -#~ msgstr "esecuzione casuale" - -#~ msgid "Open _Location" -#~ msgstr "Apri _indirizzo" - -#~ msgid "Show notifications one track change" -#~ msgstr "Mostra notifiche al cambio traccia" - -#~ msgid "Compact layout" -#~ msgstr "Visualizzazione compatta" - -#~ msgid "Hide Media" -#~ msgstr "Nascondi media" - -#, fuzzy -#~ msgid "xnoise - Add media sources to the library" -#~ msgstr "xnoise - Aggiungi media alla libreria" - -#, fuzzy -#~ msgid "Local Collection" -#~ msgstr "_Ricontrolla collezione" - -#~ msgid "Always keep the current state of xnoise" -#~ msgstr "Conserva lo stato attuale di xnoise" - -#~ msgid "unknown organization" -#~ msgstr "organizzazzione sconosciuta" - -#~ msgid "unknown location" -#~ msgstr "destinazione sconosciuta" - -#~ msgid "Use linebreaks in media browser" -#~ msgstr "Utilizza linee di interruzione nel media browser" - -#~ msgid "Using the running instance of xnoise!\n" -#~ msgstr "Utilizzo l'istanza di xnoise già in esecuzione!\n" - -#~ msgid "Showing the running instance of xnoise.\n" -#~ msgstr "Mostro l'istanza di xnoise già in esecuzione.\n" - -#~ msgid "Load album covers from lastfm" -#~ msgstr "Carico la copertina dell'album da lastfm" - -#~ msgid "Add local file" -#~ msgstr "Aggiungi file locale" - -#~ msgid "Test" -#~ msgstr "Test" - -#~ msgid "CyclicSaveState" -#~ msgstr "CyclicSaveState" - -#~ msgid "LastfmCovers" -#~ msgstr "LastfmCovers" - -#~ msgid "mediakeys" -#~ msgstr "Tasti multimadiali" - -#~ msgid "mpris" -#~ msgstr "mpris" - -#~ msgid "soundmenu" -#~ msgstr "soundmenu" - -#~ msgid "soundmenu2" -#~ msgstr "soundmenu2" - -#~ msgid "TitleToDecoration" -#~ msgstr "Titolo finestra" - -#~ msgid "Finished import. " -#~ msgstr "Finished import. " - -#~ msgid "Found %d media files" -#~ msgstr "Found %d media files" - -#~ msgid "Updated library for new media folders. " -#~ msgstr "Updated library for new media folders. " - -#~ msgid "Found %d new media files" -#~ msgstr "Found %d new media files" - -#~ msgid "Enable a lyrics provider plugin for lyrics fetching to work" -#~ msgstr "Enable a lyrics provider plugin for lyrics fetching to work" - -#~ msgid "" -#~ "\n" -#~ "Lyrics provider %s cannot find lyrics for \n" -#~ "\"%s\" by \"%s\".\n" -#~ msgstr "" -#~ "\n" -#~ "Lyrics provider %s cannot find lyrics for \n" -#~ "\"%s\" by \"%s\".\n" +msgstr "Utilizza l'integrazione con il menù audio di Ubuntu" diff -Nru xnoise-0.2.20/po/zh_TW.po xnoise-0.2.21/po/zh_TW.po --- xnoise-0.2.20/po/zh_TW.po 2013-12-11 09:32:50.000000000 +0000 +++ xnoise-0.2.21/po/zh_TW.po 2013-12-20 19:34:56.000000000 +0000 @@ -28,7 +28,7 @@ #: ../data/misc/xnoise.desktop.in.in.h:4 msgid "Media;Audio;Video;Player;Mediaplayer;Movie;MP3;" -msgstr "媒體；音訊；影片；播放器；媒體播放器；電影；MP3；" +msgstr "媒體;音訊;影片;播放器;媒體播放器;電影;MP3;" #: ../data/misc/xnoise.desktop.in.in.h:5 #: ../libxnoise/TrayIcon/xnoise-tray-icon.vala:73