Author: jannis
Date: 2008-10-16 19:24:09 +0000 (Thu, 16 Oct 2008)
New Revision: 28268
Modified:
xfce4-settings/trunk/NEWS
xfce4-settings/trunk/dialogs/keyboard-settings/xfce-keyboard-settings.c
Log:
Fix GLib 2.14 version check in the keyboard settings. Update NEWS.
Modified: xfce4-settings/trunk/NEWS
===================================================================
--- xfce4-settings/trunk/NEWS 2008-10-16 10:00:57 UTC (rev 28267)
+++ xfce4-settings/trunk/NEWS 2008-10-16 19:24:09 UTC (rev 28268)
@@ -1,3 +1,8 @@
+4.5.92 (Xfce 4.6 beta2)
+
+ * Fix GLib 2.14 version check in the keyboard settings.
+
+
4.5.91 (Xfce 4.6 beta1)
* Add workspace name handling to xfce4-settings-helper.
Modified:
xfce4-settings/trunk/dialogs/keyboard-settings/xfce-keyboard-settings.c
===================================================================
--- xfce4-settings/trunk/dialogs/keyboard-settings/xfce-keyboard-settings.c
2008-10-16 10:00:57 UTC (rev 28267)
+++ xfce4-settings/trunk/dialogs/keyboard-settings/xfce-keyboard-settings.c
2008-10-16 19:24:09 UTC (rev 28268)
@@ -245,7 +245,7 @@
xfce_keyboard_settings_parent_class = g_type_class_peek_parent (klass);
gobject_class = G_OBJECT_CLASS (klass);
-#if GLIB_CHECK_VERSION (2,12,0)
+#if GLIB_CHECK_VERSION (2,14,0)
gobject_class->constructed = xfce_keyboard_settings_constructed;
#endif
gobject_class->finalize = xfce_keyboard_settings_finalize;
@@ -494,7 +494,7 @@
if (G_LIKELY (glade_xml != NULL))
settings = g_object_new (XFCE_TYPE_KEYBOARD_SETTINGS, "glade-xml",
glade_xml, NULL);
-#if !GLIB_CHECK_VERSION (2,12,0)
+#if !GLIB_CHECK_VERSION (2,14,0)
xfce_keyboard_settings_constructed (G_OBJECT (settings));
#endif
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
