[Xfce4-commits] r29468 - in xfce4-settings/trunk: . dialogs/keyboard-settings

[Olivier Fourdan]

Author: olivier
Date: 2009-02-07 20:13:22 +0000 (Sat, 07 Feb 2009)
New Revision: 29468

Modified:
   xfce4-settings/trunk/ChangeLog
   xfce4-settings/trunk/configure.ac.in
   xfce4-settings/trunk/dialogs/keyboard-settings/xfce-keyboard-settings.c
Log:
	* dialogs/keyboard-settings/xfce-keyboard-settings.c: Add the new 
	  parameter required for the API change for xfce_shortcut_dialog_run(), 
	  configure.ac.in: Add dependecy on libxfce4kbd_private revision. 
 

Modified: xfce4-settings/trunk/ChangeLog
===================================================================
--- xfce4-settings/trunk/ChangeLog	2009-02-07 20:10:39 UTC (rev 29467)
+++ xfce4-settings/trunk/ChangeLog	2009-02-07 20:13:22 UTC (rev 29468)
@@ -1,3 +1,9 @@
+2009-02-07	jannis
+
+	* dialogs/keyboard-settings/xfce-keyboard-settings.c: Add the new 
+	  parameter required for the API change for xfce_shortcut_dialog_run(), 
+	  configure.ac.in: Add dependecy on libxfce4kbd_private revision.
+
 2009-01-25 23:42  jannis
 
 	* NEWS, configure.ac.in, po/ChangeLog, po/fi.po:

Modified: xfce4-settings/trunk/configure.ac.in
===================================================================
--- xfce4-settings/trunk/configure.ac.in	2009-02-07 20:10:39 UTC (rev 29467)
+++ xfce4-settings/trunk/configure.ac.in	2009-02-07 20:13:22 UTC (rev 29468)
@@ -78,7 +78,7 @@
 XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.12.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.5.99.1])
 XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.5.99.1])
-XDT_CHECK_PACKAGE([LIBXFCE4KBD_PRIVATE], [libxfce4kbd-private-1.0], [4.5.99.1])
+XDT_CHECK_PACKAGE([LIBXFCE4KBD_PRIVATE], [libxfce4kbd-private-1.0], [4.5.99.1svn-r29463])
 XDT_CHECK_PACKAGE([GLADE], [libglade-2.0], [2.0.0])
 XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.5.99.1])
 XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.34])

Modified: xfce4-settings/trunk/dialogs/keyboard-settings/xfce-keyboard-settings.c
===================================================================
--- xfce4-settings/trunk/dialogs/keyboard-settings/xfce-keyboard-settings.c	2009-02-07 20:10:39 UTC (rev 29467)
+++ xfce4-settings/trunk/dialogs/keyboard-settings/xfce-keyboard-settings.c	2009-02-07 20:13:22 UTC (rev 29468)
@@ -653,7 +653,7 @@
       /* Request a new shortcut from the user */
       dialog = xfce_shortcut_dialog_new ("commands", command, command);
       g_signal_connect (dialog, "validate-shortcut", G_CALLBACK (xfce_keyboard_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))
         {
@@ -908,6 +908,7 @@
 {
   GtkWidget   *command_dialog;
   GtkWidget   *shortcut_dialog;
+  GtkWidget   *parent;
   const gchar *shortcut;
   const gchar *command;
   gboolean     finished = FALSE;
@@ -945,7 +946,8 @@
       g_signal_connect (shortcut_dialog, "validate-shortcut", G_CALLBACK (xfce_keyboard_settings_validate_shortcut), settings);
 
       /* Run shortcut dialog until a valid shortcut is entered or the dialog is cancelled */
-      response = xfce_shortcut_dialog_run (XFCE_SHORTCUT_DIALOG (shortcut_dialog));
+      parent = glade_xml_get_widget (settings->priv->glade_xml, "keyboard-shortcuts-dialog");
+      response = xfce_shortcut_dialog_run (XFCE_SHORTCUT_DIALOG (shortcut_dialog), parent);
 
       /* Only continue if the shortcut dialog succeeded */
       if (G_LIKELY (response == GTK_RESPONSE_OK))