SF.net SVN: geany:[4730] trunk

[eht16 at users.sourceforge.net]

Revision: 4730
          http://geany.svn.sourceforge.net/geany/?rev=4730&view=rev
Author:   eht16
Date:     2010-03-07 17:13:54 +0000 (Sun, 07 Mar 2010)

Log Message:
-----------
Correctly set the parent widget for the keybinding overwrite confirmation dialog.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/prefs.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-03-07 16:50:20 UTC (rev 4729)
+++ trunk/ChangeLog	2010-03-07 17:13:54 UTC (rev 4730)
@@ -17,6 +17,9 @@
  * tagmanager/php.c:
    Improve PHP parser to parse also the argument lists of PHP
    functions (patch by Can Koy, thanks).
+ * src/prefs.c:
+   Correctly set the parent widget for the keybinding overwrite
+   confirmation dialog.
 
 
 2010-03-05  Frank Lanitz  <frank(at)frank(dot)uvena(dot)de>

Modified: trunk/src/prefs.c
===================================================================
--- trunk/src/prefs.c	2010-03-07 16:50:20 UTC (rev 4729)
+++ trunk/src/prefs.c	2010-03-07 17:13:54 UTC (rev 4730)
@@ -81,7 +81,7 @@
 static void kb_cell_edited_cb(GtkCellRendererText *cellrenderertext, gchar *path, gchar *new_text, gpointer user_data);
 static gboolean kb_keytype_dialog_response_cb(GtkWidget *dialog, GdkEventKey *event, gpointer user_data);
 static void kb_dialog_response_cb(GtkWidget *dialog, gint response, gpointer user_data);
-static gboolean kb_find_duplicate(GeanyKeyBinding *search_kb,
+static gboolean kb_find_duplicate(GtkWidget *parent, GeanyKeyBinding *search_kb,
 		guint key, GdkModifierType mods, const gchar *action);
 static void on_toolbar_show_toggled(GtkToggleButton *togglebutton, gpointer user_data);
 static void on_show_notebook_tabs_toggled(GtkToggleButton *togglebutton, gpointer user_data);
@@ -1243,7 +1243,7 @@
 
 		kb = kb_lookup_kb_from_iter(GTK_TREE_MODEL(store), &iter);
 
-		if (kb_find_duplicate(kb, lkey, lmods, new_text))
+		if (kb_find_duplicate(ui_widgets.prefs_dialog, kb, lkey, lmods, new_text))
 			return;
 
 		/* set the values here, because of the above check, setting it in
@@ -1288,7 +1288,7 @@
 
 		gtk_accelerator_parse(gtk_label_get_text(GTK_LABEL(dialog_label)), &lkey, &lmods);
 
-		if (kb_find_duplicate(kb, lkey, lmods, gtk_label_get_text(GTK_LABEL(dialog_label))))
+		if (kb_find_duplicate(dialog, kb, lkey, lmods, gtk_label_get_text(GTK_LABEL(dialog_label))))
 			return;
 
 		/* set the values here, because of the above check, setting it in
@@ -1349,7 +1349,7 @@
 
 /* test if the entered key combination is already used
  * returns true if cancelling duplicate */
-static gboolean kb_find_duplicate(GeanyKeyBinding *search_kb,
+static gboolean kb_find_duplicate(GtkWidget *parent, GeanyKeyBinding *search_kb,
 		guint key, GdkModifierType mods, const gchar *action)
 {
 	gsize g, i;
@@ -1373,7 +1373,7 @@
 				&& ! (kb->key == search_kb->key && kb->mods == search_kb->mods))
 			{
 				gchar *label = keybindings_get_label(kb);
-				gint ret = dialogs_show_prompt(main_widgets.window,
+				gint ret = dialogs_show_prompt(parent,
 					_("_Allow"), GTK_RESPONSE_APPLY,
 					GTK_STOCK_CANCEL, GTK_RESPONSE_NO,
 					_("_Override"), GTK_RESPONSE_YES,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.