IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Walk through the list of plugins installed in a window and uninstall

Browse Source 
them before the window is destroyed. Fixes 333973.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@13592 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
David Hampton 2006-03-10 23:11:54 +00:00
parent cd7457cf8e
commit fc8d20214b
2 changed files with 51 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2006-03-10 David Hampton <hampton@employees.org>
* src/gnome-utils/gnc-main-window.c: Walk through the list of
plugins installed in a window and uninstall them before the window
is destroyed. Fixes 333973.
* src/core-utils/gnc-gobject-utils.c: Change the output from this
file to use g_message instead of g_warning so the
--g-fatal-warnings argument doesn't trip over it.
2006-03-10 Derek Atkins <derek@ihtfp.com> 2006-03-10 Derek Atkins <derek@ihtfp.com>
* src/import-export/qif-import/qif-dialog-utils.scm: * src/import-export/qif-import/qif-dialog-utils.scm:

55
src/gnome-utils/gnc-main-window.c
View File

@ -928,6 +928,35 @@ gnc_main_window_prompt_for_save (GtkWidget *window)
} }
static void
gnc_main_window_add_plugin (gpointer plugin,
gpointer window)
{
g_return_if_fail (GNC_IS_MAIN_WINDOW (window));
g_return_if_fail (GNC_IS_PLUGIN (plugin));
ENTER(" ");
gnc_plugin_add_to_window (GNC_PLUGIN (plugin),
GNC_MAIN_WINDOW (window),
window_type);
LEAVE(" ");
}
static void
gnc_main_window_remove_plugin (gpointer plugin,
gpointer window)
{
g_return_if_fail (GNC_IS_MAIN_WINDOW (window));
g_return_if_fail (GNC_IS_PLUGIN (plugin));
ENTER(" ");
gnc_plugin_remove_from_window (GNC_PLUGIN (plugin),
GNC_MAIN_WINDOW (window),
window_type);
LEAVE(" ");
}
static gboolean static gboolean
gnc_main_window_delete_event (GtkWidget *window, gnc_main_window_delete_event (GtkWidget *window,
GdkEvent *event, GdkEvent *event,
@ -1668,6 +1697,8 @@ gnc_main_window_destroy (GtkObject *object)
{ {
GncMainWindow *window; GncMainWindow *window;
GncMainWindowPrivate *priv; GncMainWindowPrivate *priv;
GncPluginManager *manager;
GList *plugins;
g_return_if_fail (object != NULL); g_return_if_fail (object != NULL);
g_return_if_fail (GNC_IS_MAIN_WINDOW (object)); g_return_if_fail (GNC_IS_MAIN_WINDOW (object));
@ -1698,6 +1729,12 @@ gnc_main_window_destroy (GtkObject *object)
g_hash_table_destroy (priv->merged_actions_table); g_hash_table_destroy (priv->merged_actions_table);
priv->merged_actions_table = NULL; priv->merged_actions_table = NULL;
/* GncPluginManager stuff */
manager = gnc_plugin_manager_get ();
plugins = gnc_plugin_manager_get_plugins (manager);
g_list_foreach (plugins, gnc_main_window_remove_plugin, window);
g_list_free (plugins);
} }
GTK_OBJECT_CLASS (parent_class)->destroy (object); GTK_OBJECT_CLASS (parent_class)->destroy (object);
} }
@ -2125,6 +2162,8 @@ gnc_main_window_unmerge_actions (GncMainWindow *window,
g_return_if_fail (group_name != NULL); g_return_if_fail (group_name != NULL);
priv = GNC_MAIN_WINDOW_GET_PRIVATE(window); priv = GNC_MAIN_WINDOW_GET_PRIVATE(window);
if (priv->merged_actions_table == NULL)
return;
entry = g_hash_table_lookup (priv->merged_actions_table, group_name); entry = g_hash_table_lookup (priv->merged_actions_table, group_name);
if (entry == NULL) if (entry == NULL)
@ -2193,6 +2232,8 @@ gnc_main_window_get_action_group (GncMainWindow *window,
g_return_val_if_fail (group_name != NULL, NULL); g_return_val_if_fail (group_name != NULL, NULL);
priv = GNC_MAIN_WINDOW_GET_PRIVATE(window); priv = GNC_MAIN_WINDOW_GET_PRIVATE(window);
if (priv->merged_actions_table == NULL)
return NULL;
entry = g_hash_table_lookup (priv->merged_actions_table, group_name); entry = g_hash_table_lookup (priv->merged_actions_table, group_name);
if (entry == NULL) if (entry == NULL)
@ -2202,20 +2243,6 @@ gnc_main_window_get_action_group (GncMainWindow *window,
} }
static void
gnc_main_window_add_plugin (gpointer plugin,
gpointer window)
{
g_return_if_fail (GNC_IS_MAIN_WINDOW (window));
g_return_if_fail (GNC_IS_PLUGIN (plugin));
ENTER(" ");
gnc_plugin_add_to_window (GNC_PLUGIN (plugin),
GNC_MAIN_WINDOW (window),
window_type);
LEAVE(" ");
}
static void static void
gnc_main_window_update_toolbar (GncMainWindow *window) gnc_main_window_update_toolbar (GncMainWindow *window)
{ {