r20600 - gnucash/trunk/src/gnome-utils - Revert "Bug #436479 - Gnucash doesn't display the data file name in the title"
Geert Janssens
gjanssens at code.gnucash.org
Fri Apr 29 12:35:42 EDT 2011
Author: gjanssens
Date: 2011-04-29 12:35:42 -0400 (Fri, 29 Apr 2011)
New Revision: 20600
Trac: http://svn.gnucash.org/trac/changeset/20600
Modified:
gnucash/trunk/src/gnome-utils/gnc-main-window.c
Log:
Revert "Bug #436479 - Gnucash doesn't display the data file name in the title"
This commit will cause a segfault when selecting File->New.
This reverts commit f27c9a8ca95391acafed58d3933f6e9661755d24.
Modified: gnucash/trunk/src/gnome-utils/gnc-main-window.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-main-window.c 2011-04-29 14:31:59 UTC (rev 20599)
+++ gnucash/trunk/src/gnome-utils/gnc-main-window.c 2011-04-29 16:35:42 UTC (rev 20600)
@@ -646,7 +646,7 @@
}
if (page_count == 0)
{
- /* Should never happen, but has during alpha testing. Having this
+ /* Shound never happen, but has during alpha testing. Having this
* check doesn't hurt anything. */
goto cleanup;
}
@@ -2293,6 +2293,8 @@
window = GNC_MAIN_WINDOW (object);
+ active_windows = g_list_remove (active_windows, window);
+
/* Do these things once */
priv = GNC_MAIN_WINDOW_GET_PRIVATE(window);
if (priv->merged_actions_table)
@@ -2325,7 +2327,6 @@
g_list_foreach (plugins, gnc_main_window_remove_plugin, window);
g_list_free (plugins);
}
- active_windows = g_list_remove (active_windows, window);
GTK_OBJECT_CLASS (parent_class)->destroy (object);
}
@@ -2729,11 +2730,7 @@
gnc_plugin_page_destroy_widget (page);
g_object_unref(page);
- /* If this is the last page on this window and this isn't the last window,
- * go ahead and destroy the window.
- * If it is the last window and the user just closed the last page,
- * automatically reopen an account page. Leaving an empty window
- * is pretty confusing. */
+ /* If this isn't the last window, go ahead and destroy the window. */
priv = GNC_MAIN_WINDOW_GET_PRIVATE(window);
if (priv->installed_pages == NULL)
{
@@ -2741,10 +2738,6 @@
{
gtk_widget_destroy(GTK_WIDGET(window));
}
- else
- {
- gnc_main_window_restore_default_state();
- }
}
}
More information about the gnucash-changes
mailing list