SF.net SVN: geany: [1409] trunk

[ntrel at users.sourceforge.net]

Revision: 1409
          http://svn.sourceforge.net/geany/?rev=1409&view=rev
Author:   ntrel
Date:     2007-03-21 04:54:35 -0700 (Wed, 21 Mar 2007)

Log Message:
-----------
Made all project dialogs modal.

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-03-20 18:15:07 UTC (rev 1408)
+++ trunk/ChangeLog	2007-03-21 11:54:35 UTC (rev 1409)
@@ -1,3 +1,9 @@
+2007-03-21  Nick Treleaven  <nick.treleaven at btinternet.com>
+
+ * src/project.c:
+   Made all project dialogs modal.
+
+
 2007-03-20  Enrico Tröger  <enrico.troeger at uvena.de>
 
  * data/filetypes.common, doc/geany.docbook, src/highlighting.c:

Modified: trunk/src/project.c
===================================================================
--- trunk/src/project.c	2007-03-20 18:15:07 UTC (rev 1408)
+++ trunk/src/project.c	2007-03-21 11:54:35 UTC (rev 1409)
@@ -89,6 +89,7 @@
 	GtkWidget *label;
 	GtkTooltips *tooltips = GTK_TOOLTIPS(lookup_widget(app->window, "tooltips"));
 	PropertyDialogElements *e;
+	gint response;
 
 	if (! close_open_project()) return;
 
@@ -179,10 +180,10 @@
 
 	g_signal_connect((gpointer) e->file_name, "changed", G_CALLBACK(on_entries_changed), e);
 	g_signal_connect((gpointer) e->base_path, "changed", G_CALLBACK(on_entries_changed), e);
-	g_signal_connect((gpointer) e->dialog, "response",
-				G_CALLBACK(on_properties_dialog_response), e);
 
 	gtk_widget_show_all(e->dialog);
+	response = gtk_dialog_run(GTK_DIALOG(e->dialog));
+	on_properties_dialog_response(GTK_DIALOG(e->dialog), response, e);
 }
 
 
@@ -194,6 +195,7 @@
 #else
 	GtkWidget *dialog;
 	GtkFileFilter *filter;
+	gint response;
 #endif
 	if (! close_open_project()) return;
 
@@ -232,9 +234,9 @@
 
 	gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), dir);
 
-	g_signal_connect ((gpointer) dialog, "response", G_CALLBACK(on_open_dialog_response), NULL);
-
 	gtk_widget_show_all(dialog);
+	response = gtk_dialog_run(GTK_DIALOG(dialog));
+	on_open_dialog_response(GTK_DIALOG(dialog), response, NULL);
 #endif
 
 	g_free(dir);
@@ -273,6 +275,7 @@
 	GtkTooltips *tooltips = GTK_TOOLTIPS(lookup_widget(app->window, "tooltips"));
 	PropertyDialogElements *e = g_new(PropertyDialogElements, 1);
 	GeanyProject *p = app->project;
+	gint response;
 
 	g_return_if_fail(app->project != NULL);
 
@@ -391,9 +394,6 @@
 
 	gtk_container_add(GTK_CONTAINER(vbox), table);
 
-	g_signal_connect((gpointer) e->dialog, "response",
-				G_CALLBACK(on_properties_dialog_response), e);
-
 	// fill the elements with the appropriate data
 	gtk_entry_set_text(GTK_ENTRY(e->name), p->name);
 
@@ -428,6 +428,8 @@
 		gtk_entry_set_text(GTK_ENTRY(e->run_cmd), p->run_cmd);
 
 	gtk_widget_show_all(e->dialog);
+	response = gtk_dialog_run(GTK_DIALOG(e->dialog));
+	on_properties_dialog_response(GTK_DIALOG(e->dialog), response, e);
 }
 
 


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