AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

gtkquartz-menu: fix some leaks

Browse Source
This commit is contained in:
William Hua 2011-12-11 18:46:55 -05:00 committed by Ryan Lortie
parent 460ac291b2
commit ec72f8fd81
1 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gtk/gtkquartz-menu.c
View File

@ -288,8 +288,8 @@ gtk_quartz_action_observer_new (GNSMenuItem *item)
return observer; return observer;
} }
NSMenu * static NSMenu *
gtk_menu_quartz_create_menu (const gchar *title, gtk_quartz_menu_create_menu (const gchar *title,
GMenuModel *model, GMenuModel *model,
GActionObservable *observable) GActionObservable *observable)
{ {
@ -326,8 +326,17 @@ gtk_menu_quartz_create_menu (const gchar *title,
NSString *text = [NSString stringWithUTF8String:label ? : ""]; NSString *text = [NSString stringWithUTF8String:label ? : ""];
NSMenu *section = gtk_menu_quartz_create_menu (label, g_menu_model_get_item_link (model, i, G_MENU_LINK_SECTION), observable); GMenuModel *section_model = g_menu_model_get_item_link (model, i, G_MENU_LINK_SECTION);
NSMenu *submenu = gtk_menu_quartz_create_menu (label, g_menu_model_get_item_link (model, i, G_MENU_LINK_SUBMENU), observable); GMenuModel *submenu_model = g_menu_model_get_item_link (model, i, G_MENU_LINK_SUBMENU);
NSMenu *section = gtk_quartz_menu_create_menu (label, section_model, observable);
NSMenu *submenu = gtk_quartz_menu_create_menu (label, submenu_model, observable);
if (section_model != NULL)
g_object_unref (section_model);
if (submenu_model != NULL)
g_object_unref (submenu_model);
if (section != nil) if (section != nil)
{ {
@ -370,7 +379,7 @@ void
gtk_quartz_set_main_menu (GMenuModel *model, gtk_quartz_set_main_menu (GMenuModel *model,
GActionObservable *observable) GActionObservable *observable)
{ {
[NSApp setMainMenu:gtk_menu_quartz_create_menu ("Main Menu", model, observable)]; [NSApp setMainMenu:gtk_quartz_menu_create_menu ("Main Menu", model, observable)];
} }
@ -459,6 +468,22 @@ gtk_quartz_set_main_menu (GMenuModel *model,
return self; return self;
} }
- (void)dealloc
{
if (observer != NULL)
g_object_unref (observer);
if (actions != NULL)
g_object_unref (actions);
if (target != NULL)
g_variant_unref (target);
g_free (action);
[super dealloc];
}
- (void)observableActionAddedWithParameterType:(const GVariantType *)parameterType enabled:(BOOL)enabled state:(GVariant *)state - (void)observableActionAddedWithParameterType:(const GVariantType *)parameterType enabled:(BOOL)enabled state:(GVariant *)state
{ {
canActivate = (target == NULL && parameterType == NULL) || canActivate = (target == NULL && parameterType == NULL) ||