Mercurial > pidgin
diff src/aim.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 | 9c31ddae80a1 |
children | ebfb80bbe1ed |
line wrap: on
line diff
--- a/src/aim.c Tue Dec 31 18:21:32 2002 +0000 +++ b/src/aim.c Tue Dec 31 19:32:38 2002 +0000 @@ -284,8 +284,8 @@ gtk_widget_realize(mainwindow); gdk_window_set_group(mainwindow->window, mainwindow->window); gtk_container_set_border_width(GTK_CONTAINER(mainwindow), 5); - gtk_signal_connect(GTK_OBJECT(mainwindow), "delete_event", - GTK_SIGNAL_FUNC(do_quit), mainwindow); + g_signal_connect(G_OBJECT(mainwindow), "delete_event", + G_CALLBACK(do_quit), mainwindow); icon = gaim_pixbuf(NULL, "gaim.png"); @@ -311,10 +311,10 @@ tmp = combo_user_names(); gtk_combo_set_popdown_strings(GTK_COMBO(name), tmp); g_list_free(tmp); - gtk_signal_connect(GTK_OBJECT(GTK_COMBO(name)->entry), "activate", - GTK_SIGNAL_FUNC(doenter), mainwindow); - gtk_signal_connect(GTK_OBJECT(GTK_COMBO(name)->entry), "changed", - GTK_SIGNAL_FUNC(combo_changed), name); + g_signal_connect(G_OBJECT(GTK_COMBO(name)->entry), "activate", + G_CALLBACK(doenter), mainwindow); + g_signal_connect(G_OBJECT(GTK_COMBO(name)->entry), "changed", + G_CALLBACK(combo_changed), name); gtk_box_pack_start(GTK_BOX(vbox2), name, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), vbox2, FALSE, TRUE, 0); @@ -327,7 +327,8 @@ pass = gtk_entry_new(); gtk_entry_set_visibility(GTK_ENTRY(pass), FALSE); - gtk_signal_connect(GTK_OBJECT(pass), "activate", GTK_SIGNAL_FUNC(doenter), mainwindow); + g_signal_connect(G_OBJECT(pass), "activate", + G_CALLBACK(doenter), mainwindow); gtk_box_pack_start(GTK_BOX(vbox2), pass, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), vbox2, FALSE, TRUE, 0); @@ -338,7 +339,8 @@ /* And now for the buttons */ button = gaim_pixbuf_button("Accounts", "accounts.png", GAIM_BUTTON_VERTICAL); gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE); - gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(account_editor), mainwindow); + g_signal_connect(G_OBJECT(button), "clicked", + G_CALLBACK(account_editor), mainwindow); gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); #ifdef NO_MULTI @@ -347,12 +349,14 @@ button = gaim_pixbuf_button("Settings", "preferences.png", GAIM_BUTTON_VERTICAL); gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE); - gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(show_prefs), mainwindow); + g_signal_connect(G_OBJECT(button), "clicked", + G_CALLBACK(show_prefs), mainwindow); gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); button = gaim_pixbuf_button("Sign On", "signon.png", GAIM_BUTTON_VERTICAL); gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE); - gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(dologin), mainwindow); + g_signal_connect(G_OBJECT(button), "clicked", + G_CALLBACK(dologin), mainwindow); gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); #ifdef _WIN32