Skip to content

Commit fbd4a86

Browse files
g_object_unref to plug some leaks
1 parent 7c73e2a commit fbd4a86

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

gnucash/gnome/reconcile-view.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -784,7 +784,7 @@ gnc_reconcile_view_finalize (GObject *object)
784784
{
785785
GNCReconcileView *view = GNC_RECONCILE_VIEW(object);
786786

787-
g_list_free (view->column_list);
787+
g_list_free_full (view->column_list, g_object_unref);
788788
if (view->reconciled != NULL)
789789
{
790790
g_hash_table_destroy (view->reconciled);

gnucash/gnome/window-reconcile.cpp

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ struct _RecnWindow
8383

8484
GtkBuilder *builder; /* The builder object */
8585
GSimpleActionGroup *simple_action_group; /* The action group for the window */
86+
GtkAccelGroup *accel_group;
8687

8788
GncPluginPage *page;
8889

@@ -1899,10 +1900,10 @@ recnWindowWithBalance (GtkWidget *parent, Account *account, gnc_numeric new_endi
18991900
GtkToolbar *tool_bar;
19001901
GMenuModel *menu_model;
19011902
GtkWidget *menu_bar;
1902-
GtkAccelGroup *accel_group = gtk_accel_group_new ();
19031903
const gchar *ui = GNUCASH_RESOURCE_PREFIX "/gnc-reconcile-window.ui";
19041904
GError *error = NULL;
19051905

1906+
recnData->accel_group = gtk_accel_group_new ();
19061907
recnData->builder = gtk_builder_new ();
19071908

19081909
gtk_builder_add_from_resource (recnData->builder, ui, &error);
@@ -1938,10 +1939,10 @@ recnWindowWithBalance (GtkWidget *parent, Account *account, gnc_numeric new_endi
19381939

19391940
gtk_container_add (GTK_CONTAINER(vbox), GTK_WIDGET(tool_bar));
19401941

1941-
gtk_window_add_accel_group (GTK_WINDOW(recnData->window), accel_group);
1942+
gtk_window_add_accel_group (GTK_WINDOW(recnData->window), recnData->accel_group);
19421943

19431944
// need to add the accelerator keys
1944-
gnc_add_accelerator_keys_for_menu (menu_bar, menu_model, accel_group);
1945+
gnc_add_accelerator_keys_for_menu (menu_bar, menu_model, recnData->accel_group);
19451946

19461947
#ifdef MAC_INTEGRATION
19471948
gtkosx_application_sync_menubar (theApp);
@@ -2229,6 +2230,12 @@ recn_destroy_cb (GtkWidget *w, gpointer data)
22292230
if (recnData->delete_refresh)
22302231
gnc_resume_gui_refresh ();
22312232

2233+
if (recnData->builder)
2234+
g_object_unref(recnData->builder);
2235+
2236+
if (recnData->accel_group)
2237+
g_object_unref(recnData->accel_group);
2238+
22322239
//Disable the actions, the handlers try to access recnData
22332240
for (gint i = 0; i < num_actions; i++)
22342241
{

0 commit comments

Comments
 (0)