Revision: 822 http://svn.sourceforge.net/geany/?rev=822&view=rev Author: eht16 Date: 2006-09-18 01:19:40 -0700 (Mon, 18 Sep 2006)
Log Message: ----------- Fixed compiler warnings and removed unnecessary signal handler.
Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c trunk/src/dialogs.c
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-09-17 21:53:47 UTC (rev 821) +++ trunk/ChangeLog 2006-09-18 08:19:40 UTC (rev 822) @@ -1,3 +1,9 @@ +2006-09-18 Enrico Tröger enrico.troeger@uvena.de + + * src/dialogs.c, src/callbacks.c: + Fixed compiler warnings and removed unnecessary signal handler. + + 2006-09-17 Nick Treleaven nick.treleaven@btinternet.com
* src/templates.h, src/templates.c:
Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-09-17 21:53:47 UTC (rev 821) +++ trunk/src/callbacks.c 2006-09-18 08:19:40 UTC (rev 822) @@ -2253,8 +2253,9 @@ gpointer user_data) { filetype *ft = user_data; + g_return_if_fail(ft != NULL); - + if (response == GTK_RESPONSE_ACCEPT) { if (ft->menu_items->can_compile) @@ -2276,7 +2277,6 @@ GTK_ENTRY(lookup_widget(GTK_WIDGET(dialog), "includes_entry3")))); } } - gtk_widget_destroy(GTK_WIDGET(dialog)); }
Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2006-09-17 21:53:47 UTC (rev 821) +++ trunk/src/dialogs.c 2006-09-18 08:19:40 UTC (rev 822) @@ -696,9 +696,10 @@ void dialogs_show_includes_arguments_gen() { GtkWidget *dialog, *label, *entries[3]; - GtkWidget *ft_table; - gint row; + GtkWidget *ft_table = NULL; + gint row = 0; gint idx = document_get_cur_idx(); + gint response; filetype *ft = NULL;
if (DOC_IDX_VALID(idx)) ft = doc_list[idx].file_type; @@ -796,10 +797,13 @@ gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), label);
- g_signal_connect((gpointer) dialog, "response", - G_CALLBACK(on_includes_arguments_dialog_response), ft); gtk_widget_show_all(dialog); - gtk_dialog_run(GTK_DIALOG(dialog)); // run modally to prevent user changing idx filetype + // run modally to prevent user changing idx filetype + response = gtk_dialog_run(GTK_DIALOG(dialog)); + // call the callback manually + on_includes_arguments_dialog_response(GTK_DIALOG(dialog), response, ft); + + gtk_widget_destroy(dialog); }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.