[Xfce4-commits] r29467 - in xfwm4/trunk: . settings-dialogs

[Olivier Fourdan]

Author: olivier
Date: 2009-02-07 20:10:39 +0000 (Sat, 07 Feb 2009)
New Revision: 29467

Modified:
   xfwm4/trunk/ChangeLog
   xfwm4/trunk/configure.ac.in
   xfwm4/trunk/settings-dialogs/xfwm4-settings.c
Log:
	* settings-dialogs/xfwm4-settings.c : Add the new parameter required
	  for the API change for xfce_shortcut_dialog_run(), 
	  Add dependecy on libxfce4kbd_private revision.
	* src/events.c : Fix user time not being taken from the user time 
 

Modified: xfwm4/trunk/ChangeLog
===================================================================
--- xfwm4/trunk/ChangeLog	2009-02-07 20:02:49 UTC (rev 29466)
+++ xfwm4/trunk/ChangeLog	2009-02-07 20:10:39 UTC (rev 29467)
@@ -1,6 +1,12 @@
+2009-02-07	jannis
+
+	* settings-dialogs/xfwm4-settings.c : Add the new parameter required
+	  for the API change for xfce_shortcut_dialog_run(), 
+	  Add dependecy on libxfce4kbd_private revision.
+
 2009-02-06	olivier
 
-	* src/events.c, : Fix user time not being taken from the user time
+	* src/events.c : Fix user time not being taken from the user time
 	  window for apps which support that protocol, that was breaking
 	  focus stealing prevention for all gtk,
 	  src/focus.c: Do not automatically give focus to windows placed on 

Modified: xfwm4/trunk/configure.ac.in
===================================================================
--- xfwm4/trunk/configure.ac.in	2009-02-07 20:02:49 UTC (rev 29466)
+++ xfwm4/trunk/configure.ac.in	2009-02-07 20:10:39 UTC (rev 29467)
@@ -13,7 +13,7 @@
 m4_define([gtk_minimum_version], [2.10.0])
 m4_define([xfce_minimum_version], [4.5.93])
 m4_define([libxfcegui4_minimum_version], [4.5.93])
-m4_define([libxfce4kbd_private_minimum_version], [4.5.93])
+m4_define([libxfce4kbd_private_minimum_version], [4.5.99.1svn-r29462])
 m4_define([xfconf_minimum_version], [4.5.93])
 m4_define([xcomposite_minimum_version], [0.2])
 m4_define([wnck_minimum_version], [2.12])

Modified: xfwm4/trunk/settings-dialogs/xfwm4-settings.c
===================================================================
--- xfwm4/trunk/settings-dialogs/xfwm4-settings.c	2009-02-07 20:02:49 UTC (rev 29466)
+++ xfwm4/trunk/settings-dialogs/xfwm4-settings.c	2009-02-07 20:10:39 UTC (rev 29467)
@@ -1971,7 +1971,7 @@
       dialog = xfce_shortcut_dialog_new ("xfwm4", name, feature);
       g_signal_connect (dialog, "validate-shortcut",
                         G_CALLBACK (xfwm_settings_validate_shortcut), settings);
-      response = xfce_shortcut_dialog_run (XFCE_SHORTCUT_DIALOG (dialog));
+      response = xfce_shortcut_dialog_run (XFCE_SHORTCUT_DIALOG (dialog), gtk_widget_get_toplevel (GTK_WIDGET (tree_view)));
 
       if (G_LIKELY (response == GTK_RESPONSE_OK))
         {