Mercurial > pidgin
diff src/gtkconv.c @ 4630:5cdfd20daa07
[gaim-migrate @ 4921]
Faceprint found these leaks. Anyone else want to find any?
committer: Tailor Script <tailor@pidgin.im>
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Sat, 01 Mar 2003 18:37:48 +0000 |
| parents | 69f028a6f357 |
| children | 1b4d18a6bcf5 |
line wrap: on
line diff
--- a/src/gtkconv.c Sat Mar 01 02:30:24 2003 +0000 +++ b/src/gtkconv.c Sat Mar 01 18:37:48 2003 +0000 @@ -2444,32 +2444,33 @@ { struct gaim_gtk_window *gtkwin; GtkWidget *hb; - GtkItemFactory *item_factory; gtkwin = GAIM_GTK_WINDOW(win); /* Create the handle box. */ hb = gtk_handle_box_new(); - item_factory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "<main>", NULL); - - gtk_item_factory_set_translate_func (item_factory, + gtkwin->menu.item_factory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, + "<main>", NULL); + + gtk_item_factory_set_translate_func (gtkwin->menu.item_factory, item_factory_translate_func, NULL, NULL); - - gtk_item_factory_create_items(item_factory, menu_item_count, + + gtk_item_factory_create_items(gtkwin->menu.item_factory, menu_item_count, menu_items, win); - gtkwin->menu.menubar = gtk_item_factory_get_widget(item_factory, "<main>"); - gtkwin->menu.view_history = gtk_item_factory_get_widget(item_factory, + gtkwin->menu.menubar = gtk_item_factory_get_widget(gtkwin->menu.item_factory, + "<main>"); + gtkwin->menu.view_history = gtk_item_factory_get_widget(gtkwin->menu.item_factory, "/Conversation/View History..."); - gtkwin->menu.insert_link = gtk_item_factory_get_widget(item_factory, + gtkwin->menu.insert_link = gtk_item_factory_get_widget(gtkwin->menu.item_factory, "/Conversation/Insert URL..."); - gtkwin->menu.insert_image = gtk_item_factory_get_widget(item_factory, + gtkwin->menu.insert_image = gtk_item_factory_get_widget(gtkwin->menu.item_factory, "/Conversation/Insert Image..."); - gtkwin->menu.logging = gtk_item_factory_get_widget(item_factory, + gtkwin->menu.logging = gtk_item_factory_get_widget(gtkwin->menu.item_factory, "/Options/Enable Logging"); - gtkwin->menu.sounds = gtk_item_factory_get_widget(item_factory, + gtkwin->menu.sounds = gtk_item_factory_get_widget(gtkwin->menu.item_factory, "/Options/Enable Sounds"); generate_send_as_items(win, NULL); @@ -3251,6 +3252,8 @@ gaim_gtk_set_state_lock(FALSE); + g_object_unref(G_OBJECT(gtkwin->menu.item_factory)); + g_free(gtkwin); win->ui_data = NULL; } @@ -3622,6 +3625,8 @@ g_free(gtkconv->u.chat); } + g_object_unref(G_OBJECT(gtkconv->tooltips)); + g_free(gtkconv); }