comparison 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
comparison
equal deleted inserted replaced
4161:c79961f48063 4162:d3c8d2b40494
282 gtk_window_set_policy(GTK_WINDOW(mainwindow), FALSE, FALSE, TRUE); 282 gtk_window_set_policy(GTK_WINDOW(mainwindow), FALSE, FALSE, TRUE);
283 gtk_window_set_title(GTK_WINDOW(mainwindow), _("Gaim - Login")); 283 gtk_window_set_title(GTK_WINDOW(mainwindow), _("Gaim - Login"));
284 gtk_widget_realize(mainwindow); 284 gtk_widget_realize(mainwindow);
285 gdk_window_set_group(mainwindow->window, mainwindow->window); 285 gdk_window_set_group(mainwindow->window, mainwindow->window);
286 gtk_container_set_border_width(GTK_CONTAINER(mainwindow), 5); 286 gtk_container_set_border_width(GTK_CONTAINER(mainwindow), 5);
287 gtk_signal_connect(GTK_OBJECT(mainwindow), "delete_event", 287 g_signal_connect(G_OBJECT(mainwindow), "delete_event",
288 GTK_SIGNAL_FUNC(do_quit), mainwindow); 288 G_CALLBACK(do_quit), mainwindow);
289 289
290 290
291 icon = gaim_pixbuf(NULL, "gaim.png"); 291 icon = gaim_pixbuf(NULL, "gaim.png");
292 if (icon) { 292 if (icon) {
293 gtk_window_set_icon(GTK_WINDOW(mainwindow), icon); 293 gtk_window_set_icon(GTK_WINDOW(mainwindow), icon);
309 309
310 name = gtk_combo_new(); 310 name = gtk_combo_new();
311 tmp = combo_user_names(); 311 tmp = combo_user_names();
312 gtk_combo_set_popdown_strings(GTK_COMBO(name), tmp); 312 gtk_combo_set_popdown_strings(GTK_COMBO(name), tmp);
313 g_list_free(tmp); 313 g_list_free(tmp);
314 gtk_signal_connect(GTK_OBJECT(GTK_COMBO(name)->entry), "activate", 314 g_signal_connect(G_OBJECT(GTK_COMBO(name)->entry), "activate",
315 GTK_SIGNAL_FUNC(doenter), mainwindow); 315 G_CALLBACK(doenter), mainwindow);
316 gtk_signal_connect(GTK_OBJECT(GTK_COMBO(name)->entry), "changed", 316 g_signal_connect(G_OBJECT(GTK_COMBO(name)->entry), "changed",
317 GTK_SIGNAL_FUNC(combo_changed), name); 317 G_CALLBACK(combo_changed), name);
318 gtk_box_pack_start(GTK_BOX(vbox2), name, FALSE, TRUE, 0); 318 gtk_box_pack_start(GTK_BOX(vbox2), name, FALSE, TRUE, 0);
319 gtk_box_pack_start(GTK_BOX(vbox), vbox2, FALSE, TRUE, 0); 319 gtk_box_pack_start(GTK_BOX(vbox), vbox2, FALSE, TRUE, 0);
320 320
321 vbox2 = gtk_vbox_new(FALSE, 0); 321 vbox2 = gtk_vbox_new(FALSE, 0);
322 gtk_container_set_border_width(GTK_CONTAINER(vbox2), 5); 322 gtk_container_set_border_width(GTK_CONTAINER(vbox2), 5);
325 gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); 325 gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
326 gtk_box_pack_start(GTK_BOX(vbox2), label, FALSE, FALSE, 0); 326 gtk_box_pack_start(GTK_BOX(vbox2), label, FALSE, FALSE, 0);
327 327
328 pass = gtk_entry_new(); 328 pass = gtk_entry_new();
329 gtk_entry_set_visibility(GTK_ENTRY(pass), FALSE); 329 gtk_entry_set_visibility(GTK_ENTRY(pass), FALSE);
330 gtk_signal_connect(GTK_OBJECT(pass), "activate", GTK_SIGNAL_FUNC(doenter), mainwindow); 330 g_signal_connect(G_OBJECT(pass), "activate",
331 G_CALLBACK(doenter), mainwindow);
331 gtk_box_pack_start(GTK_BOX(vbox2), pass, FALSE, TRUE, 0); 332 gtk_box_pack_start(GTK_BOX(vbox2), pass, FALSE, TRUE, 0);
332 gtk_box_pack_start(GTK_BOX(vbox), vbox2, FALSE, TRUE, 0); 333 gtk_box_pack_start(GTK_BOX(vbox), vbox2, FALSE, TRUE, 0);
333 334
334 /* Now for the button box */ 335 /* Now for the button box */
335 hbox = gtk_hbox_new(TRUE, 0); 336 hbox = gtk_hbox_new(TRUE, 0);
336 gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 5); 337 gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 5);
337 338
338 /* And now for the buttons */ 339 /* And now for the buttons */
339 button = gaim_pixbuf_button("Accounts", "accounts.png", GAIM_BUTTON_VERTICAL); 340 button = gaim_pixbuf_button("Accounts", "accounts.png", GAIM_BUTTON_VERTICAL);
340 gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE); 341 gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
341 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(account_editor), mainwindow); 342 g_signal_connect(G_OBJECT(button), "clicked",
343 G_CALLBACK(account_editor), mainwindow);
342 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); 344 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
343 345
344 #ifdef NO_MULTI 346 #ifdef NO_MULTI
345 gtk_widget_set_sensitive(GTK_WIDGET(button), FALSE); 347 gtk_widget_set_sensitive(GTK_WIDGET(button), FALSE);
346 #endif 348 #endif
347 349
348 button = gaim_pixbuf_button("Settings", "preferences.png", GAIM_BUTTON_VERTICAL); 350 button = gaim_pixbuf_button("Settings", "preferences.png", GAIM_BUTTON_VERTICAL);
349 gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE); 351 gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
350 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(show_prefs), mainwindow); 352 g_signal_connect(G_OBJECT(button), "clicked",
353 G_CALLBACK(show_prefs), mainwindow);
351 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); 354 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
352 355
353 button = gaim_pixbuf_button("Sign On", "signon.png", GAIM_BUTTON_VERTICAL); 356 button = gaim_pixbuf_button("Sign On", "signon.png", GAIM_BUTTON_VERTICAL);
354 gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE); 357 gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
355 gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(dologin), mainwindow); 358 g_signal_connect(G_OBJECT(button), "clicked",
359 G_CALLBACK(dologin), mainwindow);
356 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); 360 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
357 361
358 #ifdef _WIN32 362 #ifdef _WIN32
359 /* Register newly created window with systray module */ 363 /* Register newly created window with systray module */
360 wgaim_created_loginwin(GTK_WIDGET(mainwindow)); 364 wgaim_created_loginwin(GTK_WIDGET(mainwindow));