gnome-settings-daemon r294 - in trunk: . plugins/keyboard

[jensg svn gnome org]

Author: jensg
Date: Fri Apr 11 18:18:52 2008
New Revision: 294
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=294&view=rev

Log:
2008-04-11  Jens Granseuer  <jensgr gmx net>

	* plugins/keyboard/gsd-keyboard-xkb.c: (gsd_keyboard_xkb_shutdown):
	clear the user callback data even if initialiation failed
	* plugins/keyboard/gsd-xmodmap.c: (gsd_load_modmap_files):
	properly NULL-terminate g_build_filename


Modified:
   trunk/ChangeLog
   trunk/plugins/keyboard/gsd-keyboard-xkb.c
   trunk/plugins/keyboard/gsd-xmodmap.c

Modified: trunk/plugins/keyboard/gsd-keyboard-xkb.c
==============================================================================
--- trunk/plugins/keyboard/gsd-keyboard-xkb.c	(original)
+++ trunk/plugins/keyboard/gsd-keyboard-xkb.c	Fri Apr 11 18:18:52 2008
@@ -344,6 +344,9 @@
 {
         GConfClient *client;
 
+        pa_callback = NULL;
+        pa_callback_user_data = NULL;
+
         if (!inited_ok)
                 return;
 
@@ -370,8 +373,6 @@
         g_object_unref (client);
         g_object_unref (xkl_engine);
 
-        pa_callback = NULL;
-        pa_callback_user_data = NULL;
         xkl_engine = NULL;
         inited_ok = FALSE;
 }

Modified: trunk/plugins/keyboard/gsd-xmodmap.c
==============================================================================
--- trunk/plugins/keyboard/gsd-xmodmap.c	(original)
+++ trunk/plugins/keyboard/gsd-xmodmap.c	Fri Apr 11 18:18:52 2008
@@ -69,7 +69,7 @@
                 gchar *file;
                 gchar *command;
 
-                file = g_build_filename (g_get_home_dir (), (gchar *) tmp->data);
+                file = g_build_filename (g_get_home_dir (), (gchar *) tmp->data, NULL);
                 command = g_strconcat ("xmodmap ", file, NULL);
                 g_free (file);