From dbfdd320437795bb3294b044a4dd9e6f19f28acb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Wed, 6 May 2015 13:50:14 +0200 Subject: [PATCH] Fix some memory leaks --- gtk/main.c | 1 - gtk/status_icon.c | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gtk/main.c b/gtk/main.c index 43bd5ee16..242e9b67e 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -1569,7 +1569,6 @@ static void linphone_gtk_init_status_icon(void) { linphone_status_icon_params_set_title(params, _("Linphone")); linphone_status_icon_params_set_description(params, _("A video internet phone")); linphone_status_icon_params_set_on_click_cb(params, handle_icon_click, NULL); - g_object_unref(G_OBJECT(menu)); if(linphone_status_icon_init( (LinphoneStatusIconReadyCb)linphone_gtk_status_icon_initialised_cb, diff --git a/gtk/status_icon.c b/gtk/status_icon.c index dc61ec403..aba9c5d1d 100644 --- a/gtk/status_icon.c +++ b/gtk/status_icon.c @@ -60,6 +60,7 @@ void linphone_status_icon_params_unref(LinphoneStatusIconParams *obj) { if(obj->ref < 0) { if(obj->title) g_free(obj->title); if(obj->menu) g_object_unref(obj->menu); + if(obj->desc) g_free(obj->desc); g_free(obj); } } @@ -78,7 +79,7 @@ void linphone_status_icon_params_set_description(LinphoneStatusIconParams *obj, void linphone_status_icon_params_set_menu(LinphoneStatusIconParams *obj, GtkWidget *menu) { if(obj->menu) g_object_unref(obj->menu); - if(menu) obj->menu = g_object_ref(menu); + if(menu) obj->menu = g_object_ref_sink(menu); else obj->menu = NULL; }