Revision: 3167 http://geany.svn.sourceforge.net/geany/?rev=3167&view=rev Author: ntrel Date: 2008-11-03 17:38:50 +0000 (Mon, 03 Nov 2008)
Log Message: ----------- Fix GLib warning when pressing Close File keybinding and no documents are open.
Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-11-03 17:25:35 UTC (rev 3166) +++ trunk/ChangeLog 2008-11-03 17:38:50 UTC (rev 3167) @@ -1,3 +1,10 @@ +2008-11-03 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/callbacks.c: + Fix GLib warning when pressing Close File keybinding and no + documents are open. + + 2008-10-30 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* plugins/splitwindow.c:
Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2008-11-03 17:25:35 UTC (rev 3166) +++ trunk/src/callbacks.c 2008-11-03 17:38:50 UTC (rev 3167) @@ -236,8 +236,10 @@ on_close1_activate (GtkMenuItem *menuitem, gpointer user_data) { - guint cur_page = gtk_notebook_get_current_page(GTK_NOTEBOOK(main_widgets.notebook)); - document_remove_page(cur_page); + GeanyDocument *doc = document_get_current(); + + if (doc) + document_close(doc); }
@@ -690,8 +692,7 @@ on_toolbutton_close_clicked (GtkToolButton *toolbutton, gpointer user_data) { - gint cur_page = gtk_notebook_get_current_page(GTK_NOTEBOOK(main_widgets.notebook)); - document_remove_page(cur_page); + on_close1_activate(NULL, NULL); }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.