[Xfce4-commits] <xfce4-settings:master> Use xfconf_channel_get in keyboards helper.

Jérôme Guelfucci noreply at xfce.org
Sun Nov 14 17:50:01 CET 2010


Updating branch refs/heads/master
         to 022bc7908523d36b4976668abf3c0f94e3e73a62 (commit)
       from fe1a4ffa0b090d8c052240489bd5c5e54053b74f (commit)

commit 022bc7908523d36b4976668abf3c0f94e3e73a62
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Sun Nov 14 17:46:31 2010 +0100

    Use xfconf_channel_get in keyboards helper.

 NEWS                              |    4 ++++
 xfce4-settings-helper/keyboards.c |    6 +-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index 2e35de9..41c7866 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+4.7.5
+=====
+- Use xfconf_channel_get instead of xfconf_channel_new.
+
 4.7.4
 =====
 - Add X11/keysym.h include to keyboards.c (Bug #6778).
diff --git a/xfce4-settings-helper/keyboards.c b/xfce4-settings-helper/keyboards.c
index 9c6c291..00f6040 100644
--- a/xfce4-settings-helper/keyboards.c
+++ b/xfce4-settings-helper/keyboards.c
@@ -99,7 +99,7 @@ xfce_keyboards_helper_init (XfceKeyboardsHelper *helper)
     if (XkbQueryExtension (GDK_DISPLAY (), &dummy, &dummy, &dummy, &dummy, &dummy))
     {
         /* open the channel */
-        helper->channel = xfconf_channel_new ("keyboards");
+        helper->channel = xfconf_channel_get ("keyboards");
 
         /* monitor channel changes */
         g_signal_connect (G_OBJECT (helper->channel), "property-changed", G_CALLBACK (xfce_keyboards_helper_channel_property_changed), helper);
@@ -126,10 +126,6 @@ xfce_keyboards_helper_finalize (GObject *object)
     /* Save the numlock state */
     xfce_keyboards_helper_save_numlock_state (helper->channel);
 
-    /* release the channel */
-    if (G_LIKELY (helper->channel))
-        g_object_unref (G_OBJECT (helper->channel));
-
     (*G_OBJECT_CLASS (xfce_keyboards_helper_parent_class)->finalize) (object);
 }
 



More information about the Xfce4-commits mailing list