Mercurial > pidgin

comparison src/conversation.c @ 4162:d3c8d2b40494

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 4391] gtk_signal_connect() to g_signal_connect() Everything seems fine, and nothing should be broken. However, please let me know if anything strange happens. committer: Tailor Script <tailor@pidgin.im>
author Christian Hammond <chipx86@chipx86.com>
date Tue, 31 Dec 2002 19:32:38 +0000
parents fcc6db86f5c7
children ebfb80bbe1ed
comparison
equal deleted inserted replaced
4161:c79961f48063 4162:d3c8d2b40494
199 g_return_if_fail(imhtml != NULL); 199 g_return_if_fail(imhtml != NULL);
200 g_return_if_fail(GTK_IS_IMHTML(imhtml)); 200 g_return_if_fail(GTK_IS_IMHTML(imhtml));
201 if (!(convo_options & OPT_CONVO_SHOW_SMILEY)) 201 if (!(convo_options & OPT_CONVO_SHOW_SMILEY))
202 gtk_imhtml_show_smileys(GTK_IMHTML(imhtml), FALSE); 202 gtk_imhtml_show_smileys(GTK_IMHTML(imhtml), FALSE);
203 203
204 gtk_signal_connect(GTK_OBJECT(imhtml), "url_clicked", GTK_SIGNAL_FUNC(open_url), NULL); 204 g_signal_connect(GTK_OBJECT(imhtml), "url_clicked", G_CALLBACK(open_url), NULL);
205 gaim_setup_imhtml_smileys(imhtml); 205 gaim_setup_imhtml_smileys(imhtml);
206 } 206 }
207 207
208 void quiet_set(GtkWidget *tb, int state) 208 void quiet_set(GtkWidget *tb, int state)
209 { 209 {
510 char buf[BUF_LONG]; 510 char buf[BUF_LONG];
511 GtkWidget *window = gtk_file_selection_new(_("Gaim - Save Conversation")); 511 GtkWidget *window = gtk_file_selection_new(_("Gaim - Save Conversation"));
512 g_snprintf(buf, sizeof(buf), "%s" G_DIR_SEPARATOR_S "%s.log", gaim_home_dir(), normalize(c->name)); 512 g_snprintf(buf, sizeof(buf), "%s" G_DIR_SEPARATOR_S "%s.log", gaim_home_dir(), normalize(c->name));
513 gtk_file_selection_set_filename(GTK_FILE_SELECTION(window), buf); 513 gtk_file_selection_set_filename(GTK_FILE_SELECTION(window), buf);
514 gtk_object_set_user_data(GTK_OBJECT(GTK_FILE_SELECTION(window)->ok_button), c); 514 gtk_object_set_user_data(GTK_OBJECT(GTK_FILE_SELECTION(window)->ok_button), c);
515 gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(window)->ok_button), 515 g_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(window)->ok_button),
516 "clicked", GTK_SIGNAL_FUNC(do_save_convo), window); 516 "clicked", G_CALLBACK(do_save_convo), window);
517 gtk_signal_connect_object(GTK_OBJECT(GTK_FILE_SELECTION(window)->cancel_button), 517 g_signal_connect_swapped(GTK_OBJECT(GTK_FILE_SELECTION(window)->cancel_button),
518 "clicked", GTK_SIGNAL_FUNC(gtk_widget_destroy), (gpointer)window); 518 "clicked", G_CALLBACK(gtk_widget_destroy), (gpointer)window);
519 gtk_widget_show(window); 519 gtk_widget_show(window);
520 } 520 }
521 521
522 static void do_insert_image(GtkObject *obj, GtkWidget *wid) 522 static void do_insert_image(GtkObject *obj, GtkWidget *wid)
523 { 523 {
558 char buf[BUF_LONG]; 558 char buf[BUF_LONG];
559 GtkWidget *window = gtk_file_selection_new(_("Gaim - Insert Image")); 559 GtkWidget *window = gtk_file_selection_new(_("Gaim - Insert Image"));
560 g_snprintf(buf, sizeof(buf), "%s" G_DIR_SEPARATOR_S, gaim_home_dir()); 560 g_snprintf(buf, sizeof(buf), "%s" G_DIR_SEPARATOR_S, gaim_home_dir());
561 gtk_file_selection_set_filename(GTK_FILE_SELECTION(window), buf); 561 gtk_file_selection_set_filename(GTK_FILE_SELECTION(window), buf);
562 gtk_object_set_user_data(GTK_OBJECT(GTK_FILE_SELECTION(window)->ok_button), c); 562 gtk_object_set_user_data(GTK_OBJECT(GTK_FILE_SELECTION(window)->ok_button), c);
563 gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(window)->ok_button), 563 g_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(window)->ok_button),
564 "clicked", GTK_SIGNAL_FUNC(do_insert_image), window); 564 "clicked", G_CALLBACK(do_insert_image), window);
565 gtk_signal_connect_object(GTK_OBJECT(GTK_FILE_SELECTION(window)->cancel_button), 565 g_signal_connect_swapped(GTK_OBJECT(GTK_FILE_SELECTION(window)->cancel_button),
566 "clicked", GTK_SIGNAL_FUNC(gtk_widget_destroy), (gpointer)window); 566 "clicked", G_CALLBACK(gtk_widget_destroy), (gpointer)window);
567 gtk_widget_show(window); 567 gtk_widget_show(window);
568 } 568 }
569 569
570 570
571 void insert_smiley(GtkWidget *smiley, struct conversation *c) 571 void insert_smiley(GtkWidget *smiley, struct conversation *c)
2193 /* The file menu */ 2193 /* The file menu */
2194 menuitem = gaim_new_item(NULL, _("File")); 2194 menuitem = gaim_new_item(NULL, _("File"));
2195 gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), menu); 2195 gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), menu);
2196 gtk_menu_shell_append(GTK_MENU_SHELL(menubar), menuitem); 2196 gtk_menu_shell_append(GTK_MENU_SHELL(menubar), menuitem);
2197 2197
2198 gaim_new_item_from_stock(menu, _("_Save Conversation"), "gtk-save-as", GTK_SIGNAL_FUNC(save_convo), c, 0, 0, NULL); 2198 gaim_new_item_from_stock(menu, _("_Save Conversation"), "gtk-save-as", G_CALLBACK(save_convo), c, 0, 0, NULL);
2199 2199
2200 gaim_new_item_from_stock(menu, _("View _History"), NULL, GTK_SIGNAL_FUNC(conv_show_log), GINT_TO_POINTER(c->name), 0, 0, NULL); 2200 gaim_new_item_from_stock(menu, _("View _History"), NULL, G_CALLBACK(conv_show_log), GINT_TO_POINTER(c->name), 0, 0, NULL);
2201 2201
2202 menuitem = gtk_menu_item_new(); 2202 menuitem = gtk_menu_item_new();
2203 gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); 2203 gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
2204 /* 2204 /*
2205 c->sendfile_btn = gaim_new_item_from_pixbuf(menu, _("Send File"), "send-file-small.png", NULL, NULL, 0, 0, NULL); */ 2205 c->sendfile_btn = gaim_new_item_from_pixbuf(menu, _("Send File"), "send-file-small.png", NULL, NULL, 0, 0, NULL); */
2206 2206
2207 gaim_new_item_from_pixbuf(menu, _("Insert _URL"), "insert-link-small.png", GTK_SIGNAL_FUNC(insert_link_cb), c, 0, 0, NULL); 2207 gaim_new_item_from_pixbuf(menu, _("Insert _URL"), "insert-link-small.png", G_CALLBACK(insert_link_cb), c, 0, 0, NULL);
2208 c->image_menubtn = gaim_new_item_from_pixbuf(menu, _("Insert _Image"), "insert-image-small.png", GTK_SIGNAL_FUNC(insert_image), c, 0, 0, NULL); 2208 c->image_menubtn = gaim_new_item_from_pixbuf(menu, _("Insert _Image"), "insert-image-small.png", G_CALLBACK(insert_image), c, 0, 0, NULL);
2209 2209
2210 menuitem = gtk_menu_item_new(); 2210 menuitem = gtk_menu_item_new();
2211 gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); 2211 gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
2212 2212
2213 gaim_new_item_from_stock(menu, _("_Close"), "gtk-close", GTK_SIGNAL_FUNC(close_callback), c, 0, 0, NULL); 2213 gaim_new_item_from_stock(menu, _("_Close"), "gtk-close", G_CALLBACK(close_callback), c, 0, 0, NULL);
2214 2214
2215 /* The Options menu */ 2215 /* The Options menu */
2216 menu = gtk_menu_new(); 2216 menu = gtk_menu_new();
2217 2217
2218 menuitem = gaim_new_item(NULL, _("Options")); 2218 menuitem = gaim_new_item(NULL, _("Options"));
2230 else 2230 else
2231 gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), FALSE); 2231 gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), FALSE);
2232 2232
2233 state_lock = 0; 2233 state_lock = 0;
2234 2234
2235 gtk_signal_connect(GTK_OBJECT(menuitem), "toggled", GTK_SIGNAL_FUNC(toggle_loggle), c); 2235 g_signal_connect(GTK_OBJECT(menuitem), "toggled", G_CALLBACK(toggle_loggle), c);
2236 2236
2237 /* Sounds */ 2237 /* Sounds */
2238 2238
2239 gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); 2239 gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
2240 2240
2241 menuitem = gtk_check_menu_item_new_with_mnemonic(_("Enable _Sounds")); 2241 menuitem = gtk_check_menu_item_new_with_mnemonic(_("Enable _Sounds"));
2242 c->makesound = 1; 2242 c->makesound = 1;
2243 gtk_signal_connect(GTK_OBJECT(menuitem), "toggled", GTK_SIGNAL_FUNC(toggle_sound), c); 2243 g_signal_connect(GTK_OBJECT(menuitem), "toggled", G_CALLBACK(toggle_sound), c);
2244 state_lock = 1; 2244 state_lock = 1;
2245 gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE); 2245 gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
2246 state_lock = 0; 2246 state_lock = 0;
2247 gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); 2247 gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
2248 2248
2292 2292
2293 /* Bold */ 2293 /* Bold */
2294 button = gaim_pixbuf_toolbar_button_from_stock("gtk-bold"); 2294 button = gaim_pixbuf_toolbar_button_from_stock("gtk-bold");
2295 gtk_size_group_add_widget(sg, button); 2295 gtk_size_group_add_widget(sg, button);
2296 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); 2296 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
2297 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(do_bold), c); 2297 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(do_bold), c);
2298 c->bold = button; /* We should remember this */ 2298 c->bold = button; /* We should remember this */
2299 2299
2300 /* Italic */ 2300 /* Italic */
2301 button = gaim_pixbuf_toolbar_button_from_stock("gtk-italic"); 2301 button = gaim_pixbuf_toolbar_button_from_stock("gtk-italic");
2302 gtk_size_group_add_widget(sg, button); 2302 gtk_size_group_add_widget(sg, button);
2303 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); 2303 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
2304 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(do_italic), c); 2304 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(do_italic), c);
2305 c->italic = button; /* We should remember this */ 2305 c->italic = button; /* We should remember this */
2306 2306
2307 /* Underline */ 2307 /* Underline */
2308 button = gaim_pixbuf_toolbar_button_from_stock("gtk-underline"); 2308 button = gaim_pixbuf_toolbar_button_from_stock("gtk-underline");
2309 gtk_size_group_add_widget(sg, button); 2309 gtk_size_group_add_widget(sg, button);
2310 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); 2310 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
2311 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(do_underline), c); 2311 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(do_underline), c);
2312 c->underline = button; /* We should remember this */ 2312 c->underline = button; /* We should remember this */
2313 2313
2314 /* Sep */ 2314 /* Sep */
2315 sep = gtk_vseparator_new(); 2315 sep = gtk_vseparator_new();
2316 gtk_box_pack_start(GTK_BOX(hbox), sep, FALSE, FALSE, 0); 2316 gtk_box_pack_start(GTK_BOX(hbox), sep, FALSE, FALSE, 0);
2317 2317
2318 /* Increase font size */ 2318 /* Increase font size */
2319 button = gaim_pixbuf_toolbar_button_from_file("text_bigger.png"); 2319 button = gaim_pixbuf_toolbar_button_from_file("text_bigger.png");
2320 gtk_size_group_add_widget(sg, button); 2320 gtk_size_group_add_widget(sg, button);
2321 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); 2321 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
2322 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(do_big), c); 2322 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(do_big), c);
2323 2323
2324 /* Normal Font Size */ 2324 /* Normal Font Size */
2325 button = gaim_pixbuf_toolbar_button_from_file("text_normal.png"); 2325 button = gaim_pixbuf_toolbar_button_from_file("text_normal.png");
2326 gtk_size_group_add_widget(sg, button); 2326 gtk_size_group_add_widget(sg, button);
2327 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); 2327 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
2328 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(do_normal), c); 2328 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(do_normal), c);
2329 c->font = button; /* We should remember this */ 2329 c->font = button; /* We should remember this */
2330 2330
2331 /* Decrease font size */ 2331 /* Decrease font size */
2332 button = gaim_pixbuf_toolbar_button_from_file("text_smaller.png"); 2332 button = gaim_pixbuf_toolbar_button_from_file("text_smaller.png");
2333 gtk_size_group_add_widget(sg, button); 2333 gtk_size_group_add_widget(sg, button);
2334 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); 2334 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
2335 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(do_small), c); 2335 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(do_small), c);
2336 2336
2337 /* Sep */ 2337 /* Sep */
2338 sep = gtk_vseparator_new(); 2338 sep = gtk_vseparator_new();
2339 gtk_box_pack_start(GTK_BOX(hbox), sep, FALSE, FALSE, 0); 2339 gtk_box_pack_start(GTK_BOX(hbox), sep, FALSE, FALSE, 0);
2340 2340
2341 /* Font Color */ 2341 /* Font Color */
2342 button = gaim_pixbuf_toolbar_button_from_file("change-fgcolor-small.png"); 2342 button = gaim_pixbuf_toolbar_button_from_file("change-fgcolor-small.png");
2343 gtk_size_group_add_widget(sg, button); 2343 gtk_size_group_add_widget(sg, button);
2344 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); 2344 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
2345 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(toggle_fg_color), c); 2345 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(toggle_fg_color), c);
2346 c->fgcolorbtn = button; /* We should remember this */ 2346 c->fgcolorbtn = button; /* We should remember this */
2347 2347
2348 /* Font Color */ 2348 /* Font Color */
2349 button = gaim_pixbuf_toolbar_button_from_file("change-bgcolor-small.png"); 2349 button = gaim_pixbuf_toolbar_button_from_file("change-bgcolor-small.png");
2350 gtk_size_group_add_widget(sg, button); 2350 gtk_size_group_add_widget(sg, button);
2351 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); 2351 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
2352 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(toggle_bg_color), c); 2352 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(toggle_bg_color), c);
2353 c->bgcolorbtn = button; /* We should remember this */ 2353 c->bgcolorbtn = button; /* We should remember this */
2354 2354
2355 2355
2356 /* Sep */ 2356 /* Sep */
2357 sep = gtk_vseparator_new(); 2357 sep = gtk_vseparator_new();
2358 gtk_box_pack_start(GTK_BOX(hbox), sep, FALSE, FALSE, 0); 2358 gtk_box_pack_start(GTK_BOX(hbox), sep, FALSE, FALSE, 0);
2359 2359
2360 /* Insert IM Image */ 2360 /* Insert IM Image */
2361 button = gaim_pixbuf_toolbar_button_from_file("insert-image-small.png"); 2361 button = gaim_pixbuf_toolbar_button_from_file("insert-image-small.png");
2362 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(insert_image), c); 2362 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(insert_image), c);
2363 gtk_size_group_add_widget(sg, button); 2363 gtk_size_group_add_widget(sg, button);
2364 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); 2364 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
2365 c->imagebtn = button; 2365 c->imagebtn = button;
2366 2366
2367 /* Insert Link */ 2367 /* Insert Link */
2368 button = gaim_pixbuf_toolbar_button_from_file("insert-link-small.png"); 2368 button = gaim_pixbuf_toolbar_button_from_file("insert-link-small.png");
2369 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(toggle_link), c); 2369 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(toggle_link), c);
2370 gtk_size_group_add_widget(sg, button); 2370 gtk_size_group_add_widget(sg, button);
2371 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); 2371 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
2372 c->link = button; 2372 c->link = button;
2373 2373
2374 /* Insert Smiley */ 2374 /* Insert Smiley */
2375 button = gaim_pixbuf_toolbar_button_from_file("insert-smiley-small.png"); 2375 button = gaim_pixbuf_toolbar_button_from_file("insert-smiley-small.png");
2376 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(insert_smiley), c); 2376 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(insert_smiley), c);
2377 gtk_size_group_add_widget(sg, button); 2377 gtk_size_group_add_widget(sg, button);
2378 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); 2378 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
2379 c->smiley = button; 2379 c->smiley = button;
2380 2380
2381 sep = gtk_hseparator_new(); 2381 sep = gtk_hseparator_new();
2474 } else 2474 } else
2475 gtk_widget_set_sensitive(c->add, FALSE); 2475 gtk_widget_set_sensitive(c->add, FALSE);
2476 } 2476 }
2477 2477
2478 if (rebuild) { 2478 if (rebuild) {
2479 gtk_signal_connect(GTK_OBJECT(c->add), "clicked", GTK_SIGNAL_FUNC(add_callback), c); 2479 g_signal_connect(GTK_OBJECT(c->add), "clicked", G_CALLBACK(add_callback), c);
2480 gtk_box_pack_start(GTK_BOX(parent), c->add, FALSE, FALSE, 0); 2480 gtk_box_pack_start(GTK_BOX(parent), c->add, FALSE, FALSE, 0);
2481 gtk_box_reorder_child(GTK_BOX(parent), c->add, 3); 2481 gtk_box_reorder_child(GTK_BOX(parent), c->add, 3);
2482 gtk_button_set_relief(GTK_BUTTON(c->add), GTK_RELIEF_NONE); 2482 gtk_button_set_relief(GTK_BUTTON(c->add), GTK_RELIEF_NONE);
2483 gtk_size_group_add_widget(c->sg, c->add); 2483 gtk_size_group_add_widget(c->sg, c->add);
2484 gtk_widget_show(c->add); 2484 gtk_widget_show(c->add);
2500 while (g) { 2500 while (g) {
2501 c = (struct gaim_connection *)g->data; 2501 c = (struct gaim_connection *)g->data;
2502 g_snprintf(buf, sizeof buf, "%s (%s)", c->username, c->prpl->name); 2502 g_snprintf(buf, sizeof buf, "%s (%s)", c->username, c->prpl->name);
2503 opt = gtk_menu_item_new_with_label(buf); 2503 opt = gtk_menu_item_new_with_label(buf);
2504 gtk_object_set_user_data(GTK_OBJECT(opt), cnv); 2504 gtk_object_set_user_data(GTK_OBJECT(opt), cnv);
2505 gtk_signal_connect(GTK_OBJECT(opt), "activate", 2505 g_signal_connect(GTK_OBJECT(opt), "activate",
2506 GTK_SIGNAL_FUNC(convo_sel_send), c); 2506 G_CALLBACK(convo_sel_send), c);
2507 gtk_widget_show(opt); 2507 gtk_widget_show(opt);
2508 gtk_menu_shell_append(GTK_MENU_SHELL(menu), opt); 2508 gtk_menu_shell_append(GTK_MENU_SHELL(menu), opt);
2509 g = g->next; 2509 g = g->next;
2510 } 2510 }
2511 2511
2842 gtk_window_set_role(GTK_WINDOW(win), "conversation"); 2842 gtk_window_set_role(GTK_WINDOW(win), "conversation");
2843 gtk_window_set_policy(GTK_WINDOW(win), TRUE, TRUE, FALSE); 2843 gtk_window_set_policy(GTK_WINDOW(win), TRUE, TRUE, FALSE);
2844 gtk_container_border_width(GTK_CONTAINER(win), 0); 2844 gtk_container_border_width(GTK_CONTAINER(win), 0);
2845 gtk_widget_realize(win); 2845 gtk_widget_realize(win);
2846 gtk_window_set_title(GTK_WINDOW(win), _("Gaim - Conversations")); 2846 gtk_window_set_title(GTK_WINDOW(win), _("Gaim - Conversations"));
2847 gtk_signal_connect(GTK_OBJECT(win), "delete_event", 2847 g_signal_connect(GTK_OBJECT(win), "delete_event",
2848 GTK_SIGNAL_FUNC(delete_all_convo), NULL); 2848 G_CALLBACK(delete_all_convo), NULL);
2849 2849
2850 convo_notebook = gtk_notebook_new(); 2850 convo_notebook = gtk_notebook_new();
2851 if ((convo_options & OPT_CONVO_COMBINE) && (chat_options & OPT_CHAT_ONE_WINDOW)) 2851 if ((convo_options & OPT_CONVO_COMBINE) && (chat_options & OPT_CHAT_ONE_WINDOW))
2852 chat_notebook = convo_notebook; 2852 chat_notebook = convo_notebook;
2853 if (im_options & OPT_IM_SIDE_TAB) { 2853 if (im_options & OPT_IM_SIDE_TAB) {
2878 gtk_widget_show(testidea); 2878 gtk_widget_show(testidea);
2879 gtk_widget_show(convo_notebook); 2879 gtk_widget_show(convo_notebook);
2880 convo_menubar = menubar; 2880 convo_menubar = menubar;
2881 2881
2882 gtk_container_add(GTK_CONTAINER(win), testidea); 2882 gtk_container_add(GTK_CONTAINER(win), testidea);
2883 gtk_signal_connect(GTK_OBJECT(convo_notebook), "switch-page", 2883 g_signal_connect(GTK_OBJECT(convo_notebook), "switch-page",
2884 GTK_SIGNAL_FUNC(convo_switch), NULL); 2884 G_CALLBACK(convo_switch), NULL);
2885 } else 2885 } else
2886 win = c->window = all_convos; 2886 win = c->window = all_convos;
2887 2887
2888 cont = gtk_vbox_new(FALSE, 5); 2888 cont = gtk_vbox_new(FALSE, 5);
2889 gtk_container_set_border_width(GTK_CONTAINER(cont), 5); 2889 gtk_container_set_border_width(GTK_CONTAINER(cont), 5);
2894 gtk_widget_set_size_request(GTK_WIDGET(c->close), 16, 16); 2894 gtk_widget_set_size_request(GTK_WIDGET(c->close), 16, 16);
2895 gtk_container_add(GTK_CONTAINER(c->close), gtk_image_new_from_stock(GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU)); 2895 gtk_container_add(GTK_CONTAINER(c->close), gtk_image_new_from_stock(GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU));
2896 gtk_button_set_relief(GTK_BUTTON(c->close), GTK_RELIEF_NONE); 2896 gtk_button_set_relief(GTK_BUTTON(c->close), GTK_RELIEF_NONE);
2897 c->tab_label = gtk_label_new(c->name); 2897 c->tab_label = gtk_label_new(c->name);
2898 2898
2899 gtk_signal_connect(GTK_OBJECT(c->close), "clicked", GTK_SIGNAL_FUNC(close_callback), c); 2899 g_signal_connect(GTK_OBJECT(c->close), "clicked", G_CALLBACK(close_callback), c);
2900 2900
2901 gtk_box_pack_start(GTK_BOX(tabby), c->tab_label, FALSE, FALSE, 0); 2901 gtk_box_pack_start(GTK_BOX(tabby), c->tab_label, FALSE, FALSE, 0);
2902 gtk_box_pack_start(GTK_BOX(tabby), c->close, FALSE, FALSE, 0); 2902 gtk_box_pack_start(GTK_BOX(tabby), c->close, FALSE, FALSE, 0);
2903 gtk_widget_show_all(tabby); 2903 gtk_widget_show_all(tabby);
2904 gtk_notebook_insert_page(GTK_NOTEBOOK(convo_notebook), cont, tabby, 2904 gtk_notebook_insert_page(GTK_NOTEBOOK(convo_notebook), cont, tabby,
2911 gtk_object_set_user_data(GTK_OBJECT(win), c); 2911 gtk_object_set_user_data(GTK_OBJECT(win), c);
2912 gtk_window_set_role(GTK_WINDOW(win), "conversation"); 2912 gtk_window_set_role(GTK_WINDOW(win), "conversation");
2913 gtk_window_set_policy(GTK_WINDOW(win), TRUE, TRUE, TRUE); 2913 gtk_window_set_policy(GTK_WINDOW(win), TRUE, TRUE, TRUE);
2914 gtk_container_border_width(GTK_CONTAINER(win), 0); 2914 gtk_container_border_width(GTK_CONTAINER(win), 0);
2915 gtk_widget_realize(win); 2915 gtk_widget_realize(win);
2916 gtk_signal_connect(GTK_OBJECT(win), "delete_event", 2916 g_signal_connect(GTK_OBJECT(win), "delete_event",
2917 GTK_SIGNAL_FUNC(delete_event_convo), c); 2917 G_CALLBACK(delete_event_convo), c);
2918 } 2918 }
2919 set_convo_title(c); 2919 set_convo_title(c);
2920 2920
2921 paned = gtk_vpaned_new(); 2921 paned = gtk_vpaned_new();
2922 gtk_paned_set_gutter_size(GTK_PANED(paned), 15); 2922 gtk_paned_set_gutter_size(GTK_PANED(paned), 15);
3015 3015
3016 /* 3016 /*
3017 close = picture_button2(win, _("Close"), cancel_xpm, dispstyle); 3017 close = picture_button2(win, _("Close"), cancel_xpm, dispstyle);
3018 c->close = close; 3018 c->close = close;
3019 gtk_object_set_user_data(GTK_OBJECT(close), c); 3019 gtk_object_set_user_data(GTK_OBJECT(close), c);
3020 gtk_signal_connect(GTK_OBJECT(close), "clicked", GTK_SIGNAL_FUNC(close_callback), c); 3020 g_signal_connect(GTK_OBJECT(close), "clicked", G_CALLBACK(close_callback), c);
3021 gtk_box_pack_end(GTK_BOX(bbox), close, dispstyle, dispstyle, 0); 3021 gtk_box_pack_end(GTK_BOX(bbox), close, dispstyle, dispstyle, 0);
3022 gtk_widget_show(close); 3022 gtk_widget_show(close);
3023 3023
3024 c->sep1 = gtk_vseparator_new(); 3024 c->sep1 = gtk_vseparator_new();
3025 gtk_box_pack_end(GTK_BOX(bbox), c->sep1, dispstyle, dispstyle, 0); 3025 gtk_box_pack_end(GTK_BOX(bbox), c->sep1, dispstyle, dispstyle, 0);
3030 send = gaim_pixbuf_button_from_stock( 3030 send = gaim_pixbuf_button_from_stock(
3031 (dispstyle == 0 ? NULL : _("Send")), 3031 (dispstyle == 0 ? NULL : _("Send")),
3032 (dispstyle == 1 ? NULL : "gtk-convert"), 3032 (dispstyle == 1 ? NULL : "gtk-convert"),
3033 GAIM_BUTTON_VERTICAL); 3033 GAIM_BUTTON_VERTICAL);
3034 c->send = send; 3034 c->send = send;
3035 gtk_signal_connect(GTK_OBJECT(send), "clicked", GTK_SIGNAL_FUNC(send_callback), c); 3035 g_signal_connect(GTK_OBJECT(send), "clicked", G_CALLBACK(send_callback), c);
3036 gtk_box_pack_end(GTK_BOX(bbox), send, FALSE, FALSE, 0); 3036 gtk_box_pack_end(GTK_BOX(bbox), send, FALSE, FALSE, 0);
3037 gtk_widget_show(send); 3037 gtk_widget_show(send);
3038 3038
3039 c->sep2 = gtk_vseparator_new(); 3039 c->sep2 = gtk_vseparator_new();
3040 gtk_box_pack_end(GTK_BOX(bbox), c->sep2, FALSE, TRUE, 0); 3040 gtk_box_pack_end(GTK_BOX(bbox), c->sep2, FALSE, TRUE, 0);
3053 (dispstyle == 0 ? NULL : _("Add")), 3053 (dispstyle == 0 ? NULL : _("Add")),
3054 (dispstyle == 1 ? NULL : "gtk-add"), 3054 (dispstyle == 1 ? NULL : "gtk-add"),
3055 GAIM_BUTTON_VERTICAL); 3055 GAIM_BUTTON_VERTICAL);
3056 3056
3057 c->add = add; 3057 c->add = add;
3058 gtk_signal_connect(GTK_OBJECT(add), "clicked", GTK_SIGNAL_FUNC(add_callback), c); 3058 g_signal_connect(GTK_OBJECT(add), "clicked", G_CALLBACK(add_callback), c);
3059 gtk_box_pack_start(GTK_BOX(bbox), add, FALSE, FALSE, 0); 3059 gtk_box_pack_start(GTK_BOX(bbox), add, FALSE, FALSE, 0);
3060 gtk_widget_show(add); 3060 gtk_widget_show(add);
3061 3061
3062 warn = gaim_pixbuf_button_from_stock( 3062 warn = gaim_pixbuf_button_from_stock(
3063 (dispstyle == 0 ? NULL : _("Warn")), 3063 (dispstyle == 0 ? NULL : _("Warn")),
3064 (dispstyle == 1 ? NULL : "gtk-dialog-warning"), 3064 (dispstyle == 1 ? NULL : "gtk-dialog-warning"),
3065 GAIM_BUTTON_VERTICAL); 3065 GAIM_BUTTON_VERTICAL);
3066 c->warn = warn; 3066 c->warn = warn;
3067 gtk_signal_connect(GTK_OBJECT(warn), "clicked", GTK_SIGNAL_FUNC(warn_callback), c); 3067 g_signal_connect(GTK_OBJECT(warn), "clicked", G_CALLBACK(warn_callback), c);
3068 gtk_box_pack_start(GTK_BOX(bbox), warn, FALSE, FALSE, 0); 3068 gtk_box_pack_start(GTK_BOX(bbox), warn, FALSE, FALSE, 0);
3069 gtk_widget_show(warn); 3069 gtk_widget_show(warn);
3070 3070
3071 info = gaim_pixbuf_button_from_stock( 3071 info = gaim_pixbuf_button_from_stock(
3072 (dispstyle == 0 ? NULL : _("Info")), 3072 (dispstyle == 0 ? NULL : _("Info")),
3073 (dispstyle == 1 ? NULL : "gtk-find"), 3073 (dispstyle == 1 ? NULL : "gtk-find"),
3074 GAIM_BUTTON_VERTICAL); 3074 GAIM_BUTTON_VERTICAL);
3075 c->info = info; 3075 c->info = info;
3076 gtk_signal_connect(GTK_OBJECT(info), "clicked", GTK_SIGNAL_FUNC(info_callback), c); 3076 g_signal_connect(GTK_OBJECT(info), "clicked", G_CALLBACK(info_callback), c);
3077 gtk_box_pack_start(GTK_BOX(bbox), info, FALSE, FALSE, 0); 3077 gtk_box_pack_start(GTK_BOX(bbox), info, FALSE, FALSE, 0);
3078 gtk_widget_show(info); 3078 gtk_widget_show(info);
3079 3079
3080 3080
3081 block = gaim_pixbuf_button_from_stock( 3081 block = gaim_pixbuf_button_from_stock(
3082 (dispstyle == 0 ? NULL : _("Block")), 3082 (dispstyle == 0 ? NULL : _("Block")),
3083 (dispstyle == 1 ? NULL : "gtk-stop"), 3083 (dispstyle == 1 ? NULL : "gtk-stop"),
3084 GAIM_BUTTON_VERTICAL); 3084 GAIM_BUTTON_VERTICAL);
3085 c->block = block; 3085 c->block = block;
3086 gtk_signal_connect(GTK_OBJECT(block), "clicked", GTK_SIGNAL_FUNC(block_callback), c); 3086 g_signal_connect(GTK_OBJECT(block), "clicked", G_CALLBACK(block_callback), c);
3087 gtk_box_pack_start(GTK_BOX(bbox), block, FALSE, FALSE, 0); 3087 gtk_box_pack_start(GTK_BOX(bbox), block, FALSE, FALSE, 0);
3088 gtk_widget_show(block); 3088 gtk_widget_show(block);
3089 3089
3090 /* I don't know if these should have borders. They look kind of dumb 3090 /* I don't know if these should have borders. They look kind of dumb
3091 * with borders. */ 3091 * with borders. */
3582 3582
3583 c->save_icon = gtk_file_selection_new(_("Gaim - Save Icon")); 3583 c->save_icon = gtk_file_selection_new(_("Gaim - Save Icon"));
3584 gtk_file_selection_hide_fileop_buttons(GTK_FILE_SELECTION(c->save_icon)); 3584 gtk_file_selection_hide_fileop_buttons(GTK_FILE_SELECTION(c->save_icon));
3585 g_snprintf(buf, BUF_LEN - 1, "%s" G_DIR_SEPARATOR_S "%s.icon", gaim_home_dir(), c->name); 3585 g_snprintf(buf, BUF_LEN - 1, "%s" G_DIR_SEPARATOR_S "%s.icon", gaim_home_dir(), c->name);
3586 gtk_file_selection_set_filename(GTK_FILE_SELECTION(c->save_icon), buf); 3586 gtk_file_selection_set_filename(GTK_FILE_SELECTION(c->save_icon), buf);
3587 gtk_signal_connect(GTK_OBJECT(c->save_icon), "delete_event", 3587 g_signal_connect(GTK_OBJECT(c->save_icon), "delete_event",
3588 GTK_SIGNAL_FUNC(des_save_icon), c); 3588 G_CALLBACK(des_save_icon), c);
3589 gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(c->save_icon)->ok_button), "clicked", 3589 g_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(c->save_icon)->ok_button), "clicked",
3590 GTK_SIGNAL_FUNC(do_save_icon), c); 3590 G_CALLBACK(do_save_icon), c);
3591 gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(c->save_icon)->cancel_button), "clicked", 3591 g_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(c->save_icon)->cancel_button), "clicked",
3592 GTK_SIGNAL_FUNC(cancel_save_icon), c); 3592 G_CALLBACK(cancel_save_icon), c);
3593 3593
3594 gtk_widget_show(c->save_icon); 3594 gtk_widget_show(c->save_icon);
3595 } 3595 }
3596 3596
3597 static gboolean icon_menu(GtkObject *obj, GdkEventButton *e, struct conversation *c) 3597 static gboolean icon_menu(GtkObject *obj, GdkEventButton *e, struct conversation *c)
3613 3613
3614 menu = gtk_menu_new(); 3614 menu = gtk_menu_new();
3615 3615
3616 if (c->icon_timer) { 3616 if (c->icon_timer) {
3617 button = gtk_menu_item_new_with_label(_("Disable Animation")); 3617 button = gtk_menu_item_new_with_label(_("Disable Animation"));
3618 gtk_signal_connect(GTK_OBJECT(button), "activate", GTK_SIGNAL_FUNC(stop_anim), c); 3618 g_signal_connect(GTK_OBJECT(button), "activate", G_CALLBACK(stop_anim), c);
3619 gtk_menu_shell_append(GTK_MENU_SHELL(menu), button); 3619 gtk_menu_shell_append(GTK_MENU_SHELL(menu), button);
3620 gtk_widget_show(button); 3620 gtk_widget_show(button);
3621 } 3621 }
3622 else if (c->anim && !(gdk_pixbuf_animation_is_static_image(c->anim))) 3622 else if (c->anim && !(gdk_pixbuf_animation_is_static_image(c->anim)))
3623 { 3623 {
3624 button = gtk_menu_item_new_with_label(_("Enable Animation")); 3624 button = gtk_menu_item_new_with_label(_("Enable Animation"));
3625 gtk_signal_connect(GTK_OBJECT(button), "activate", GTK_SIGNAL_FUNC(start_anim), c); 3625 g_signal_connect(GTK_OBJECT(button), "activate", G_CALLBACK(start_anim), c);
3626 gtk_menu_shell_append(GTK_MENU_SHELL(menu), button); 3626 gtk_menu_shell_append(GTK_MENU_SHELL(menu), button);
3627 gtk_widget_show(button); 3627 gtk_widget_show(button);
3628 } 3628 }
3629 3629
3630 button = gtk_menu_item_new_with_label(_("Hide Icon")); 3630 button = gtk_menu_item_new_with_label(_("Hide Icon"));
3631 gtk_signal_connect_object(GTK_OBJECT(button), "activate", 3631 g_signal_connect_swapped(GTK_OBJECT(button), "activate",
3632 GTK_SIGNAL_FUNC(remove_icon), (void *)c); 3632 G_CALLBACK(remove_icon), (void *)c);
3633 gtk_menu_shell_append(GTK_MENU_SHELL(menu), button); 3633 gtk_menu_shell_append(GTK_MENU_SHELL(menu), button);
3634 gtk_widget_show(button); 3634 gtk_widget_show(button);
3635 3635
3636 button = gtk_menu_item_new_with_label(_("Save Icon As...")); 3636 button = gtk_menu_item_new_with_label(_("Save Icon As..."));
3637 gtk_signal_connect(GTK_OBJECT(button), "activate", GTK_SIGNAL_FUNC(save_icon), c); 3637 g_signal_connect(GTK_OBJECT(button), "activate", G_CALLBACK(save_icon), c);
3638 gtk_menu_shell_append(GTK_MENU_SHELL(menu), button); 3638 gtk_menu_shell_append(GTK_MENU_SHELL(menu), button);
3639 gtk_widget_show(button); 3639 gtk_widget_show(button);
3640 3640
3641 gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, e->button, e->time); 3641 gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, e->button, e->time);
3642 3642
3742 gtk_box_reorder_child(GTK_BOX(c->bbox), frame, 0); 3742 gtk_box_reorder_child(GTK_BOX(c->bbox), frame, 0);
3743 gtk_widget_show(frame); 3743 gtk_widget_show(frame);
3744 3744
3745 event = gtk_event_box_new(); 3745 event = gtk_event_box_new();
3746 gtk_container_add(GTK_CONTAINER(frame), event); 3746 gtk_container_add(GTK_CONTAINER(frame), event);
3747 gtk_signal_connect(GTK_OBJECT(event), "button-press-event", GTK_SIGNAL_FUNC(icon_menu), c); 3747 g_signal_connect(GTK_OBJECT(event), "button-press-event", G_CALLBACK(icon_menu), c);
3748 gtk_widget_show(event); 3748 gtk_widget_show(event);
3749 3749
3750 c->icon = gtk_pixmap_new(pm, bm); 3750 c->icon = gtk_pixmap_new(pm, bm);
3751 gtk_widget_set_size_request(c->icon, sf, sf); 3751 gtk_widget_set_size_request(c->icon, sf, sf);
3752 gtk_container_add(GTK_CONTAINER(event), c->icon); 3752 gtk_container_add(GTK_CONTAINER(event), c->icon);