Mercurial > pidgin
comparison src/prpl.c @ 4162:d3c8d2b40494
[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 | 7edd02612086 |
children | cba92ec56248 |
comparison
equal
deleted
inserted
replaced
4161:c79961f48063 | 4162:d3c8d2b40494 |
---|---|
248 GAIM_DIALOG(window); | 248 GAIM_DIALOG(window); |
249 p->window = window; | 249 p->window = window; |
250 gtk_window_set_role(GTK_WINDOW(window), "prompt"); | 250 gtk_window_set_role(GTK_WINDOW(window), "prompt"); |
251 gtk_window_set_policy(GTK_WINDOW(window), FALSE, TRUE, TRUE); | 251 gtk_window_set_policy(GTK_WINDOW(window), FALSE, TRUE, TRUE); |
252 gtk_window_set_title(GTK_WINDOW(window), _("Gaim - Prompt")); | 252 gtk_window_set_title(GTK_WINDOW(window), _("Gaim - Prompt")); |
253 gtk_signal_connect(GTK_OBJECT(window), "destroy", GTK_SIGNAL_FUNC(des_prompt), p); | 253 g_signal_connect(GTK_OBJECT(window), "destroy", G_CALLBACK(des_prompt), p); |
254 gtk_widget_realize(window); | 254 gtk_widget_realize(window); |
255 | 255 |
256 vbox = gtk_vbox_new(FALSE, 5); | 256 vbox = gtk_vbox_new(FALSE, 5); |
257 gtk_container_set_border_width(GTK_CONTAINER(vbox), 5); | 257 gtk_container_set_border_width(GTK_CONTAINER(vbox), 5); |
258 gtk_container_add(GTK_CONTAINER(window), vbox); | 258 gtk_container_add(GTK_CONTAINER(window), vbox); |
265 | 265 |
266 entry = gtk_entry_new(); | 266 entry = gtk_entry_new(); |
267 gtk_box_pack_start(GTK_BOX(vbox), entry, FALSE, FALSE, 0); | 267 gtk_box_pack_start(GTK_BOX(vbox), entry, FALSE, FALSE, 0); |
268 if (def) | 268 if (def) |
269 gtk_entry_set_text(GTK_ENTRY(entry), def); | 269 gtk_entry_set_text(GTK_ENTRY(entry), def); |
270 gtk_signal_connect(GTK_OBJECT(entry), "activate", GTK_SIGNAL_FUNC(act_prompt), p); | 270 g_signal_connect(GTK_OBJECT(entry), "activate", G_CALLBACK(act_prompt), p); |
271 p->entry = entry; | 271 p->entry = entry; |
272 | 272 |
273 hbox = gtk_hbox_new(FALSE, 5); | 273 hbox = gtk_hbox_new(FALSE, 5); |
274 gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); | 274 gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); |
275 | 275 |
276 button = picture_button(window, _("Accept"), ok_xpm); | 276 button = picture_button(window, _("Accept"), ok_xpm); |
277 gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); | 277 gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); |
278 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(act_prompt), p); | 278 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(act_prompt), p); |
279 | 279 |
280 button = picture_button(window, _("Cancel"), cancel_xpm); | 280 button = picture_button(window, _("Cancel"), cancel_xpm); |
281 gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); | 281 gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); |
282 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(des_win), window); | 282 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(des_win), window); |
283 | 283 |
284 gtk_widget_show_all(window); | 284 gtk_widget_show_all(window); |
285 } | 285 } |
286 | 286 |
287 static void proto_act(GtkObject *obj, struct gaim_connection *gc) | 287 static void proto_act(GtkObject *obj, struct gaim_connection *gc) |
344 } | 344 } |
345 | 345 |
346 menuitem = gtk_menu_item_new_with_label(act->data); | 346 menuitem = gtk_menu_item_new_with_label(act->data); |
347 gtk_object_set_user_data(GTK_OBJECT(menuitem), act->data); | 347 gtk_object_set_user_data(GTK_OBJECT(menuitem), act->data); |
348 gtk_menu_append(GTK_MENU(protomenu), menuitem); | 348 gtk_menu_append(GTK_MENU(protomenu), menuitem); |
349 gtk_signal_connect(GTK_OBJECT(menuitem), "activate", | 349 g_signal_connect(GTK_OBJECT(menuitem), "activate", |
350 GTK_SIGNAL_FUNC(proto_act), gc); | 350 G_CALLBACK(proto_act), gc); |
351 gtk_widget_show(menuitem); | 351 gtk_widget_show(menuitem); |
352 | 352 |
353 act = g_list_next(act); | 353 act = g_list_next(act); |
354 } | 354 } |
355 | 355 |
382 } | 382 } |
383 | 383 |
384 menuitem = gtk_menu_item_new_with_label(act->data); | 384 menuitem = gtk_menu_item_new_with_label(act->data); |
385 gtk_object_set_user_data(GTK_OBJECT(menuitem), act->data); | 385 gtk_object_set_user_data(GTK_OBJECT(menuitem), act->data); |
386 gtk_menu_append(GTK_MENU(submenu), menuitem); | 386 gtk_menu_append(GTK_MENU(submenu), menuitem); |
387 gtk_signal_connect(GTK_OBJECT(menuitem), "activate", | 387 g_signal_connect(GTK_OBJECT(menuitem), "activate", |
388 GTK_SIGNAL_FUNC(proto_act), gc); | 388 G_CALLBACK(proto_act), gc); |
389 gtk_widget_show(menuitem); | 389 gtk_widget_show(menuitem); |
390 | 390 |
391 act = g_list_next(act); | 391 act = g_list_next(act); |
392 } | 392 } |
393 | 393 |
470 | 470 |
471 GAIM_DIALOG(mn->email_win); | 471 GAIM_DIALOG(mn->email_win); |
472 gtk_window_set_role(GTK_WINDOW(mn->email_win), "mail"); | 472 gtk_window_set_role(GTK_WINDOW(mn->email_win), "mail"); |
473 gtk_window_set_policy(GTK_WINDOW(mn->email_win), FALSE, TRUE, TRUE); | 473 gtk_window_set_policy(GTK_WINDOW(mn->email_win), FALSE, TRUE, TRUE); |
474 gtk_window_set_title(GTK_WINDOW(mn->email_win), _("Gaim - New Mail")); | 474 gtk_window_set_title(GTK_WINDOW(mn->email_win), _("Gaim - New Mail")); |
475 gtk_signal_connect(GTK_OBJECT(mn->email_win), "destroy", GTK_SIGNAL_FUNC(des_email_win), mn); | 475 g_signal_connect(GTK_OBJECT(mn->email_win), "destroy", G_CALLBACK(des_email_win), mn); |
476 gtk_widget_realize(mn->email_win); | 476 gtk_widget_realize(mn->email_win); |
477 | 477 |
478 vbox = gtk_vbox_new(FALSE, 5); | 478 vbox = gtk_vbox_new(FALSE, 5); |
479 gtk_container_set_border_width(GTK_CONTAINER(vbox), 5); | 479 gtk_container_set_border_width(GTK_CONTAINER(vbox), 5); |
480 gtk_container_add(GTK_CONTAINER(mn->email_win), vbox); | 480 gtk_container_add(GTK_CONTAINER(mn->email_win), vbox); |
491 gtk_widget_show(hbox); | 491 gtk_widget_show(hbox); |
492 | 492 |
493 close = picture_button(mn->email_win, _("Close"), cancel_xpm); | 493 close = picture_button(mn->email_win, _("Close"), cancel_xpm); |
494 gtk_window_set_focus(GTK_WINDOW(mn->email_win), close); | 494 gtk_window_set_focus(GTK_WINDOW(mn->email_win), close); |
495 gtk_box_pack_end(GTK_BOX(hbox), close, 0, 0, 5); | 495 gtk_box_pack_end(GTK_BOX(hbox), close, 0, 0, 5); |
496 gtk_signal_connect(GTK_OBJECT(close), "clicked", GTK_SIGNAL_FUNC(des_email_win), mn); | 496 g_signal_connect(GTK_OBJECT(close), "clicked", G_CALLBACK(des_email_win), mn); |
497 | 497 |
498 if (url) { | 498 if (url) { |
499 mn->url = g_strdup(url); | 499 mn->url = g_strdup(url); |
500 urlbut = picture_button(mn->email_win, _("Open Mail"), tb_forward_xpm); | 500 urlbut = picture_button(mn->email_win, _("Open Mail"), tb_forward_xpm); |
501 gtk_box_pack_end(GTK_BOX(hbox), urlbut, 0, 0, 5); | 501 gtk_box_pack_end(GTK_BOX(hbox), urlbut, 0, 0, 5); |
502 gtk_signal_connect(GTK_OBJECT(urlbut), "clicked", GTK_SIGNAL_FUNC(open_url), mn->url); | 502 g_signal_connect(GTK_OBJECT(urlbut), "clicked", G_CALLBACK(open_url), mn->url); |
503 gtk_signal_connect(GTK_OBJECT(urlbut), "clicked", GTK_SIGNAL_FUNC(des_email_win), mn); | 503 g_signal_connect(GTK_OBJECT(urlbut), "clicked", G_CALLBACK(des_email_win), mn); |
504 } | 504 } |
505 | 505 |
506 gtk_widget_show(mn->email_win); | 506 gtk_widget_show(mn->email_win); |
507 } | 507 } |
508 | 508 |
712 | 712 |
713 regdlg = gtk_window_new(GTK_WINDOW_TOPLEVEL); | 713 regdlg = gtk_window_new(GTK_WINDOW_TOPLEVEL); |
714 gtk_window_set_title(GTK_WINDOW(regdlg), _("Gaim - Registration")); | 714 gtk_window_set_title(GTK_WINDOW(regdlg), _("Gaim - Registration")); |
715 gtk_window_set_role(GTK_WINDOW(regdlg), "register"); | 715 gtk_window_set_role(GTK_WINDOW(regdlg), "register"); |
716 gtk_widget_realize(regdlg); | 716 gtk_widget_realize(regdlg); |
717 gtk_signal_connect(GTK_OBJECT(regdlg), "destroy", GTK_SIGNAL_FUNC(delete_regdlg), NULL); | 717 g_signal_connect(GTK_OBJECT(regdlg), "destroy", G_CALLBACK(delete_regdlg), NULL); |
718 | 718 |
719 vbox = gtk_vbox_new(FALSE, 5); | 719 vbox = gtk_vbox_new(FALSE, 5); |
720 gtk_container_set_border_width(GTK_CONTAINER(vbox), 5); | 720 gtk_container_set_border_width(GTK_CONTAINER(vbox), 5); |
721 gtk_container_add(GTK_CONTAINER(regdlg), vbox); | 721 gtk_container_add(GTK_CONTAINER(regdlg), vbox); |
722 gtk_widget_show(vbox); | 722 gtk_widget_show(vbox); |
737 gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 5); | 737 gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 5); |
738 gtk_widget_show(hbox); | 738 gtk_widget_show(hbox); |
739 | 739 |
740 close = picture_button(regdlg, _("Close"), cancel_xpm); | 740 close = picture_button(regdlg, _("Close"), cancel_xpm); |
741 gtk_box_pack_end(GTK_BOX(hbox), close, FALSE, FALSE, 5); | 741 gtk_box_pack_end(GTK_BOX(hbox), close, FALSE, FALSE, 5); |
742 gtk_signal_connect(GTK_OBJECT(close), "clicked", GTK_SIGNAL_FUNC(delete_regdlg), NULL); | 742 g_signal_connect(GTK_OBJECT(close), "clicked", G_CALLBACK(delete_regdlg), NULL); |
743 gtk_widget_show(close); | 743 gtk_widget_show(close); |
744 | 744 |
745 reg_reg = picture_button(regdlg, _("Register"), ok_xpm); | 745 reg_reg = picture_button(regdlg, _("Register"), ok_xpm); |
746 gtk_box_pack_end(GTK_BOX(hbox), reg_reg, FALSE, FALSE, 5); | 746 gtk_box_pack_end(GTK_BOX(hbox), reg_reg, FALSE, FALSE, 5); |
747 gtk_widget_show(reg_reg); | 747 gtk_widget_show(reg_reg); |