[Xfce4-commits] [xfce/xfdesktop] 12/13: Fix invalid g_source_remove() call

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository xfce/xfdesktop.

commit 731f6c95dd36cfb505c030c91e0fe6044be17735
Author: Thaddaeus Tintenfisch <thad.fisch at gmail.com>
Date:   Tue Mar 3 16:01:26 2015 +0100

    Fix invalid g_source_remove() call
    
    If the timeout already expired, then the following error would occur:
      GLib-CRITICAL **: Source ID 123 was not found when attempting to
      remove it
    
    Signed-off-by: Eric Koegel <eric.koegel at gmail.com>
---
 settings/main.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/settings/main.c b/settings/main.c
index 546f8e2..1f106ba 100644
--- a/settings/main.c
+++ b/settings/main.c
@@ -1033,6 +1033,8 @@ xfdesktop_spin_icon_size_timer(GtkSpinButton *button)
                             DESKTOP_ICONS_ICON_SIZE_PROP,
                             gtk_spin_button_get_value(button));
 
+    g_object_set_data(G_OBJECT(button), "timer-id", NULL);
+
     return FALSE;
 }
 
@@ -2055,7 +2057,7 @@ main(int argc, char **argv)
 
     if(G_UNLIKELY(opt_version)) {
         g_print("%s %s (Xfce %s)\n\n", G_LOG_DOMAIN, VERSION, xfce_version_string());
-        g_print("%s\n", "Copyright (c) 2004-2013");
+        g_print("%s\n", "Copyright (c) 2004-2015");
         g_print("\t%s\n\n", _("The Xfce development team. All rights reserved."));
         g_print(_("Please report bugs to <%s>."), PACKAGE_BUGREPORT);
         g_print("\n");

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.