[Xfce4-commits] <xfce4-settings:master> Use xkl_config_item_new instead of g_new0 (Lionel Le Folgoc).

Jérôme Guelfucci noreply at xfce.org
Thu Sep 23 20:42:02 CEST 2010


Updating branch refs/heads/master
         to 7c1aaf99d0dd2bdc527b795f989628abd2ad1e0c (commit)
       from 12332425c5fb61abbd52ee3449dde7794ca36367 (commit)

commit 7c1aaf99d0dd2bdc527b795f989628abd2ad1e0c
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Thu Sep 23 20:40:02 2010 +0200

    Use xkl_config_item_new instead of g_new0 (Lionel Le Folgoc).
    
    This fixes the ugly glib critical warnings.

 dialogs/keyboard-settings/xfce-keyboard-settings.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dialogs/keyboard-settings/xfce-keyboard-settings.c b/dialogs/keyboard-settings/xfce-keyboard-settings.c
index 4a5a94f..8d1a711 100644
--- a/dialogs/keyboard-settings/xfce-keyboard-settings.c
+++ b/dialogs/keyboard-settings/xfce-keyboard-settings.c
@@ -1159,8 +1159,8 @@ xfce_keyboard_settings_init_layout (XfceKeyboardSettings *settings)
       gchar         *layout_desc;
       gchar         *variant_desc;
 
-      litem = g_new0 (XklConfigItem, 1);
-      vitem = g_new0 (XklConfigItem, 1);
+      litem = xkl_config_item_new ();
+      vitem = xkl_config_item_new ();
 
       g_snprintf (litem->name, sizeof litem->name, "%s", *layout);
       g_snprintf (vitem->name, sizeof vitem->name, "%s", *variant);
@@ -1187,8 +1187,8 @@ xfce_keyboard_settings_init_layout (XfceKeyboardSettings *settings)
       if (*variant)
         variant++;
 
-      g_free (litem);
-      g_free (vitem);
+      g_object_unref (litem);
+      g_object_unref (vitem);
     }
 
   g_strfreev (layouts);



More information about the Xfce4-commits mailing list