SF.net SVN: geany: [961] trunk

[eht16 at users.sourceforge.net]

Revision: 961
          http://svn.sourceforge.net/geany/?rev=961&view=rev
Author:   eht16
Date:     2006-11-02 15:22:34 -0800 (Thu, 02 Nov 2006)

Log Message:
-----------
Run set includes build dialogs for LaTeX files modally, too.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/callbacks.c
    trunk/src/dialogs.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-11-02 15:32:27 UTC (rev 960)
+++ trunk/ChangeLog	2006-11-02 23:22:34 UTC (rev 961)
@@ -1,3 +1,9 @@
+2006-11-02  Enrico Tröger  <enrico.troeger at uvena.de>
+
+ * src/callbacks.c, src/dialogs:
+   Run set includes build dialogs for LaTeX files modally, too.
+
+
 2006-11-02  Nick Treleaven  <nick.treleaven at btinternet.com>
 
  * src/highlighting.c, data/filetypes.perl, data/filetypes.pascal,

Modified: trunk/src/callbacks.c
===================================================================
--- trunk/src/callbacks.c	2006-11-02 15:32:27 UTC (rev 960)
+++ trunk/src/callbacks.c	2006-11-02 23:22:34 UTC (rev 961)
@@ -1881,7 +1881,6 @@
 			programs->modified = TRUE;
 		}
 	}
-	gtk_widget_destroy(GTK_WIDGET(dialog));
 }
 
 

Modified: trunk/src/dialogs.c
===================================================================
--- trunk/src/dialogs.c	2006-11-02 15:32:27 UTC (rev 960)
+++ trunk/src/dialogs.c	2006-11-02 23:22:34 UTC (rev 961)
@@ -582,6 +582,7 @@
 {
 	GtkWidget *dialog, *label, *entries[4], *vbox, *table;
 	gint idx = document_get_cur_idx();
+	gint response;
 	filetype *ft = NULL;
 
 	if (DOC_IDX_VALID(idx)) ft = doc_list[idx].file_type;
@@ -682,11 +683,13 @@
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
 	gtk_container_add(GTK_CONTAINER(vbox), label);
 
-	g_signal_connect((gpointer) dialog, "response",
-					G_CALLBACK(on_includes_arguments_tex_dialog_response), ft);
+	gtk_widget_show_all(dialog);
+	// run modally to prevent user changing idx filetype
+	response = gtk_dialog_run(GTK_DIALOG(dialog));
+	// call the callback manually
+	on_includes_arguments_tex_dialog_response(GTK_DIALOG(dialog), response, ft);
 
-	gtk_widget_show_all(dialog);
-	gtk_dialog_run(GTK_DIALOG(dialog));	// run modally to prevent user changing idx filetype
+	gtk_widget_destroy(dialog);
 }
 
 


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