Revision: 4896 http://geany.svn.sourceforge.net/geany/?rev=4896&view=rev Author: eht16 Date: 2010-05-10 17:36:19 +0000 (Mon, 10 May 2010)
Log Message: ----------- Fix Cancel on Goto Line dialog (patch by Dimitar Zhekov, thanks).
Modified Paths: -------------- trunk/ChangeLog trunk/src/dialogs.c
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-05-10 17:21:13 UTC (rev 4895) +++ trunk/ChangeLog 2010-05-10 17:36:19 UTC (rev 4896) @@ -1,3 +1,9 @@ +2010-05-10 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/dialogs.c: + Fix Cancel on Goto Line dialog (patch by Dimitar Zhekov, thanks). + + 2010-05-09 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* THANKS, src/about.c, plugins/classbuilder.c:
Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2010-05-10 17:21:13 UTC (rev 4895) +++ trunk/src/dialogs.c 2010-05-10 17:36:19 UTC (rev 4896) @@ -930,7 +930,7 @@
/* ugly hack - user_data not supported for callback */ -gchar *dialog_input = NULL; +static gchar *dialog_input = NULL;
static void on_dialog_input(const gchar *str) { @@ -948,7 +948,7 @@ }
-/* Returns: newly allocated string - a copy of either the entry text or default_text. +/* Returns: newly allocated copy of the entry text or NULL on cancel. * Specialised variant for Goto Line dialog. */ gchar *dialogs_show_input_goto_line(const gchar *title, const gchar *label_text, const gchar *default_text) @@ -957,7 +957,7 @@ dialogs_show_input_full( title, label_text, default_text, FALSE, on_dialog_input, G_CALLBACK(ui_editable_insert_text_callback)); - return NVL(dialog_input, g_strdup(default_text)); + return dialog_input; }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.