comparison 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
comparison
equal deleted inserted replaced
4629:86fd0f6eaa1a 4630:5cdfd20daa07
2442 static GtkWidget * 2442 static GtkWidget *
2443 setup_menubar(struct gaim_window *win) 2443 setup_menubar(struct gaim_window *win)
2444 { 2444 {
2445 struct gaim_gtk_window *gtkwin; 2445 struct gaim_gtk_window *gtkwin;
2446 GtkWidget *hb; 2446 GtkWidget *hb;
2447 GtkItemFactory *item_factory;
2448 2447
2449 gtkwin = GAIM_GTK_WINDOW(win); 2448 gtkwin = GAIM_GTK_WINDOW(win);
2450 2449
2451 /* Create the handle box. */ 2450 /* Create the handle box. */
2452 hb = gtk_handle_box_new(); 2451 hb = gtk_handle_box_new();
2453 2452
2454 item_factory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "<main>", NULL); 2453 gtkwin->menu.item_factory = gtk_item_factory_new(GTK_TYPE_MENU_BAR,
2455 2454 "<main>", NULL);
2456 gtk_item_factory_set_translate_func (item_factory, 2455
2456 gtk_item_factory_set_translate_func (gtkwin->menu.item_factory,
2457 item_factory_translate_func, 2457 item_factory_translate_func,
2458 NULL, NULL); 2458 NULL, NULL);
2459 2459
2460 gtk_item_factory_create_items(item_factory, menu_item_count, 2460 gtk_item_factory_create_items(gtkwin->menu.item_factory, menu_item_count,
2461 menu_items, win); 2461 menu_items, win);
2462 2462
2463 gtkwin->menu.menubar = gtk_item_factory_get_widget(item_factory, "<main>"); 2463 gtkwin->menu.menubar = gtk_item_factory_get_widget(gtkwin->menu.item_factory,
2464 gtkwin->menu.view_history = gtk_item_factory_get_widget(item_factory, 2464 "<main>");
2465 gtkwin->menu.view_history = gtk_item_factory_get_widget(gtkwin->menu.item_factory,
2465 "/Conversation/View History..."); 2466 "/Conversation/View History...");
2466 gtkwin->menu.insert_link = gtk_item_factory_get_widget(item_factory, 2467 gtkwin->menu.insert_link = gtk_item_factory_get_widget(gtkwin->menu.item_factory,
2467 "/Conversation/Insert URL..."); 2468 "/Conversation/Insert URL...");
2468 gtkwin->menu.insert_image = gtk_item_factory_get_widget(item_factory, 2469 gtkwin->menu.insert_image = gtk_item_factory_get_widget(gtkwin->menu.item_factory,
2469 "/Conversation/Insert Image..."); 2470 "/Conversation/Insert Image...");
2470 gtkwin->menu.logging = gtk_item_factory_get_widget(item_factory, 2471 gtkwin->menu.logging = gtk_item_factory_get_widget(gtkwin->menu.item_factory,
2471 "/Options/Enable Logging"); 2472 "/Options/Enable Logging");
2472 gtkwin->menu.sounds = gtk_item_factory_get_widget(item_factory, 2473 gtkwin->menu.sounds = gtk_item_factory_get_widget(gtkwin->menu.item_factory,
2473 "/Options/Enable Sounds"); 2474 "/Options/Enable Sounds");
2474 2475
2475 generate_send_as_items(win, NULL); 2476 generate_send_as_items(win, NULL);
2476 2477
2477 gtk_container_add(GTK_CONTAINER(hb), gtkwin->menu.menubar); 2478 gtk_container_add(GTK_CONTAINER(hb), gtkwin->menu.menubar);
3249 3250
3250 gtk_widget_destroy(gtkwin->window); 3251 gtk_widget_destroy(gtkwin->window);
3251 3252
3252 gaim_gtk_set_state_lock(FALSE); 3253 gaim_gtk_set_state_lock(FALSE);
3253 3254
3255 g_object_unref(G_OBJECT(gtkwin->menu.item_factory));
3256
3254 g_free(gtkwin); 3257 g_free(gtkwin);
3255 win->ui_data = NULL; 3258 win->ui_data = NULL;
3256 } 3259 }
3257 3260
3258 static void 3261 static void
3619 g_free(gtkconv->u.im); 3622 g_free(gtkconv->u.im);
3620 } 3623 }
3621 else if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT) { 3624 else if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT) {
3622 g_free(gtkconv->u.chat); 3625 g_free(gtkconv->u.chat);
3623 } 3626 }
3627
3628 g_object_unref(G_OBJECT(gtkconv->tooltips));
3624 3629
3625 g_free(gtkconv); 3630 g_free(gtkconv);
3626 } 3631 }
3627 3632
3628 static void 3633 static void