callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

application: don't unconditionally unref the GMenuModel in getters

Browse Source 
Both the app-menu and menubar models can be NULL, so we shouldn't
blindly unref them, since g_object_unref() doesn't cope with NULL
pointers.
This commit is contained in:
Cosimo Cecchi 2011-12-21 12:20:15 +01:00
parent 72c04c064a
commit 157d9271fa
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/gtkapplication.c
View File

@ -792,10 +792,12 @@ gtk_application_set_app_menu (GtkApplication *application,
GMenuModel * GMenuModel *
gtk_application_get_app_menu (GtkApplication *application) gtk_application_get_app_menu (GtkApplication *application)
{ {
GMenuModel *app_menu; GMenuModel *app_menu = NULL;
g_object_get (application, "app-menu", &app_menu, NULL); g_object_get (application, "app-menu", &app_menu, NULL);
g_object_unref (app_menu);
if (app_menu)
g_object_unref (app_menu);
return app_menu; return app_menu;
} }
@ -840,10 +842,12 @@ gtk_application_set_menubar (GtkApplication *application,
GMenuModel * GMenuModel *
gtk_application_get_menubar (GtkApplication *application) gtk_application_get_menubar (GtkApplication *application)
{ {
GMenuModel *menubar; GMenuModel *menubar = NULL;
g_object_get (application, "menubar", &menubar, NULL); g_object_get (application, "menubar", &menubar, NULL);
g_object_unref (menubar);
if (menubar)
g_object_unref (menubar);
return menubar; return menubar;
} }