Mercurial > pidgin.yaz

comparison pidgin/gtkaccount.c @ 26817:3912f55a1633

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
propagate from branch 'im.pidgin.pidgin' (head fbb4fe5da444943eecc76bdcd6c8ba967790b6c8) to branch 'im.pidgin.cpw.darkrain42.xmpp.bosh' (head 601bc627c9430320848361f0ed81c6c4c6ee53e0)
author Paul Aurich <paul@darkrain42.org>
date Tue, 28 Apr 2009 18:43:57 +0000
parents a3f7ade9e45b
children 4dfffaf9ceac 01f1929d0936
comparison
equal deleted inserted replaced
26743:de9816c970fe 26817:3912f55a1633
411 GList *l, *l2; 411 GList *l, *l2;
412 char *username = NULL; 412 char *username = NULL;
413 413
414 if (dialog->protocol_menu != NULL) 414 if (dialog->protocol_menu != NULL)
415 { 415 {
416 #if GTK_CHECK_VERSION(2,12,0)
417 g_object_ref(G_OBJECT(dialog->protocol_menu));
418 #else
416 gtk_widget_ref(dialog->protocol_menu); 419 gtk_widget_ref(dialog->protocol_menu);
420 #endif
417 hbox = g_object_get_data(G_OBJECT(dialog->protocol_menu), "container"); 421 hbox = g_object_get_data(G_OBJECT(dialog->protocol_menu), "container");
418 gtk_container_remove(GTK_CONTAINER(hbox), dialog->protocol_menu); 422 gtk_container_remove(GTK_CONTAINER(hbox), dialog->protocol_menu);
419 } 423 }
420 424
421 if (dialog->login_frame != NULL) 425 if (dialog->login_frame != NULL)
438 /* Protocol */ 442 /* Protocol */
439 if (dialog->protocol_menu == NULL) 443 if (dialog->protocol_menu == NULL)
440 { 444 {
441 dialog->protocol_menu = pidgin_protocol_option_menu_new( 445 dialog->protocol_menu = pidgin_protocol_option_menu_new(
442 dialog->protocol_id, G_CALLBACK(set_account_protocol_cb), dialog); 446 dialog->protocol_id, G_CALLBACK(set_account_protocol_cb), dialog);
447 #if GTK_CHECK_VERSION(2,12,0)
448 g_object_ref(G_OBJECT(dialog->protocol_menu));
449 #else
443 gtk_widget_ref(dialog->protocol_menu); 450 gtk_widget_ref(dialog->protocol_menu);
451 #endif
444 } 452 }
445 453
446 hbox = add_pref_box(dialog, vbox, _("Pro_tocol:"), dialog->protocol_menu); 454 hbox = add_pref_box(dialog, vbox, _("Pro_tocol:"), dialog->protocol_menu);
447 g_object_set_data(G_OBJECT(dialog->protocol_menu), "container", hbox); 455 g_object_set_data(G_OBJECT(dialog->protocol_menu), "container", hbox);
448 456
457 #if GTK_CHECK_VERSION(2,12,0)
458 g_object_unref(G_OBJECT(dialog->protocol_menu));
459 #else
449 gtk_widget_unref(dialog->protocol_menu); 460 gtk_widget_unref(dialog->protocol_menu);
461 #endif
450 462
451 /* Username */ 463 /* Username */
452 dialog->username_entry = gtk_entry_new(); 464 dialog->username_entry = gtk_entry_new();
453 #if GTK_CHECK_VERSION(2,10,0) 465 #if GTK_CHECK_VERSION(2,10,0)
454 g_object_set(G_OBJECT(dialog->username_entry), "truncate-multiline", TRUE, NULL); 466 g_object_set(G_OBJECT(dialog->username_entry), "truncate-multiline", TRUE, NULL);