[Xfce4-commits] [xfce/xfce4-settings] 01/01: Fix numlock state restoration (Bug #15642)

[noreply at xfce.org]

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

b   l   u   e   s   a   b   r   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/xfce4-settings.

commit 5bfabccb9a13e4612b6017bdc9a407f606718580
Author: Theo Linkspfeifer <lastonestanding at tutanota.com>
Date:   Thu Jun 27 14:56:03 2019 +0200

    Fix numlock state restoration (Bug #15642)
    
    Signed-off-by: Sean Davis <smd.seandavis at gmail.com>
---
 dialogs/keyboard-settings/xfce-keyboard-settings.c |  1 -
 xfsettingsd/main.c                                 | 14 +++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/dialogs/keyboard-settings/xfce-keyboard-settings.c b/dialogs/keyboard-settings/xfce-keyboard-settings.c
index 08eba7a..3b2f430 100644
--- a/dialogs/keyboard-settings/xfce-keyboard-settings.c
+++ b/dialogs/keyboard-settings/xfce-keyboard-settings.c
@@ -369,7 +369,6 @@ xfce_keyboard_settings_constructed (GObject *object)
   xfconf_g_property_bind (settings->priv->keyboards_channel, "/Default/KeyRepeat/Delay", G_TYPE_INT, xkb_key_repeat_delay, "value");
 
   xkb_numlock = gtk_builder_get_object (GTK_BUILDER (settings), "restore_numlock");
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (xkb_numlock), TRUE);
   xfconf_g_property_bind (settings->priv->keyboards_channel, "/Default/RestoreNumlock", G_TYPE_BOOLEAN, xkb_numlock, "active");
 
   /* XSETTINGS */
diff --git a/xfsettingsd/main.c b/xfsettingsd/main.c
index 6ed6ba8..692f18d 100644
--- a/xfsettingsd/main.c
+++ b/xfsettingsd/main.c
@@ -353,13 +353,6 @@ main (gint argc, gchar **argv)
 
     gtk_main();
 
-    /* release the dbus name */
-    if (dbus_connection != NULL)
-    {
-        g_bus_unown_name (owner_id);
-        g_dbus_connection_close_sync (dbus_connection, NULL, NULL);
-    }
-
     /* release the sub daemons */
     UNREF_GOBJECT(s_data.xsettings_helper);
 
@@ -384,5 +377,12 @@ main (gint argc, gchar **argv)
 
     UNREF_GOBJECT (s_data.sm_client);
 
+    /* release the dbus name */
+    if (dbus_connection != NULL)
+    {
+        g_bus_unown_name (owner_id);
+        g_dbus_connection_close_sync (dbus_connection, NULL, NULL);
+    }
+
     return EXIT_SUCCESS;
 }

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