Mercurial > pidgin
comparison src/multi.c @ 4635:42d53c416bb9
[gaim-migrate @ 4942]
remove deprecated gtk calls, gtk2-ify log viewer, gtk2-ify jabber vcard
dialog, and probably a cleanup or two I forgot about.
committer: Tailor Script <tailor@pidgin.im>
| author | Nathan Walp <nwalp@pidgin.im> |
|---|---|
| date | Sun, 02 Mar 2003 19:21:36 +0000 |
| parents | d19872836812 |
| children | 2c9f1ac20b36 |
comparison
equal
deleted
inserted
replaced
| 4634:d19872836812 | 4635:42d53c416bb9 |
|---|---|
| 243 } | 243 } |
| 244 | 244 |
| 245 static void add_columns(GtkWidget *treeview) | 245 static void add_columns(GtkWidget *treeview) |
| 246 { | 246 { |
| 247 GtkCellRenderer *renderer; | 247 GtkCellRenderer *renderer; |
| 248 GtkTreeViewColumn *column; | 248 /* GtkTreeViewColumn *column; */ |
| 249 | 249 |
| 250 /* Screennames */ | 250 /* Screennames */ |
| 251 renderer = gtk_cell_renderer_text_new(); | 251 renderer = gtk_cell_renderer_text_new(); |
| 252 gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), | 252 gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview), |
| 253 -1, _("Screenname"), | 253 -1, _("Screenname"), |
| 342 static GtkWidget *acct_button(const char *text, struct mod_account *ma, int option, GtkWidget *box) | 342 static GtkWidget *acct_button(const char *text, struct mod_account *ma, int option, GtkWidget *box) |
| 343 { | 343 { |
| 344 GtkWidget *button; | 344 GtkWidget *button; |
| 345 struct mod_account_opt *mao = g_new0(struct mod_account_opt, 1); | 345 struct mod_account_opt *mao = g_new0(struct mod_account_opt, 1); |
| 346 button = gtk_check_button_new_with_label(text); | 346 button = gtk_check_button_new_with_label(text); |
| 347 gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(button), (ma->options & option)); | 347 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), (ma->options & option)); |
| 348 gtk_box_pack_start(GTK_BOX(box), button, FALSE, FALSE, 0); | 348 gtk_box_pack_start(GTK_BOX(box), button, FALSE, FALSE, 0); |
| 349 mao->ma = ma; | 349 mao->ma = ma; |
| 350 mao->opt = option; | 350 mao->opt = option; |
| 351 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(mod_opt), mao); | 351 g_signal_connect(GTK_OBJECT(button), "clicked", G_CALLBACK(mod_opt), mao); |
| 352 g_signal_connect(GTK_OBJECT(button), "destroy", G_CALLBACK(free_mao), mao); | 352 g_signal_connect(GTK_OBJECT(button), "destroy", G_CALLBACK(free_mao), mao); |
| 398 #endif | 398 #endif |
| 399 | 399 |
| 400 tmp = ma->opt_entries; | 400 tmp = ma->opt_entries; |
| 401 while (tmp) { | 401 while (tmp) { |
| 402 GtkEntry *entry = tmp->data; | 402 GtkEntry *entry = tmp->data; |
| 403 int pos = (int)gtk_object_get_user_data(GTK_OBJECT(entry)); | 403 int pos = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(entry), "position")); |
| 404 g_snprintf(a->proto_opt[pos], sizeof(a->proto_opt[pos]), "%s", | 404 g_snprintf(a->proto_opt[pos], sizeof(a->proto_opt[pos]), "%s", |
| 405 gtk_entry_get_text(entry)); | 405 gtk_entry_get_text(entry)); |
| 406 tmp = tmp->next; | 406 tmp = tmp->next; |
| 407 } | 407 } |
| 408 if (ma->opt_entries) | 408 if (ma->opt_entries) |
| 416 | 416 |
| 417 if(ma->account->gpi) | 417 if(ma->account->gpi) |
| 418 g_free(ma->account->gpi); | 418 g_free(ma->account->gpi); |
| 419 ma->account->gpi = NULL; | 419 ma->account->gpi = NULL; |
| 420 | 420 |
| 421 proxytype = (int)gtk_object_get_user_data(GTK_OBJECT(gtk_menu_get_active(GTK_MENU(ma->proxytype_menu)))); | 421 proxytype = GPOINTER_TO_INT(g_object_get_data( |
| 422 G_OBJECT(gtk_menu_get_active(GTK_MENU(ma->proxytype_menu))), | |
| 423 "proxytype")); | |
| 422 | 424 |
| 423 if(proxytype != PROXY_USE_GLOBAL) { | 425 if(proxytype != PROXY_USE_GLOBAL) { |
| 424 struct gaim_proxy_info *gpi = g_new0(struct gaim_proxy_info, 1); | 426 struct gaim_proxy_info *gpi = g_new0(struct gaim_proxy_info, 1); |
| 425 gpi->proxytype = proxytype; | 427 gpi->proxytype = proxytype; |
| 426 g_snprintf(gpi->proxyhost, sizeof(gpi->proxyhost), "%s", gtk_entry_get_text(GTK_ENTRY(ma->proxyhost_entry))); | 428 g_snprintf(gpi->proxyhost, sizeof(gpi->proxyhost), "%s", gtk_entry_get_text(GTK_ENTRY(ma->proxyhost_entry))); |
| 465 gtk_widget_destroy(ma->mod); | 467 gtk_widget_destroy(ma->mod); |
| 466 } | 468 } |
| 467 | 469 |
| 468 static void set_prot(GtkWidget *opt, int proto) | 470 static void set_prot(GtkWidget *opt, int proto) |
| 469 { | 471 { |
| 470 struct mod_account *ma = gtk_object_get_user_data(GTK_OBJECT(opt)); | 472 struct mod_account *ma = g_object_get_data(G_OBJECT(opt), "mod_account"); |
| 471 struct prpl *p, *q; | 473 struct prpl *p, *q; |
| 472 q = find_prpl(proto); | 474 q = find_prpl(proto); |
| 473 if (ma->protocol != proto) { | 475 if (ma->protocol != proto) { |
| 474 int i; | 476 int i; |
| 475 for (i = 0; i < 7; i++) | 477 for (i = 0; i < 7; i++) |
| 529 count++; | 531 count++; |
| 530 if (e->name) | 532 if (e->name) |
| 531 opt = gtk_menu_item_new_with_label(e->name); | 533 opt = gtk_menu_item_new_with_label(e->name); |
| 532 else | 534 else |
| 533 opt = gtk_menu_item_new_with_label("Unknown"); | 535 opt = gtk_menu_item_new_with_label("Unknown"); |
| 534 gtk_object_set_user_data(GTK_OBJECT(opt), ma); | 536 g_object_set_data(G_OBJECT(opt), "mod_account", ma); |
| 535 g_signal_connect(GTK_OBJECT(opt), "activate", | 537 g_signal_connect(GTK_OBJECT(opt), "activate", |
| 536 G_CALLBACK(set_prot), (void *)e->protocol); | 538 G_CALLBACK(set_prot), (void *)e->protocol); |
| 537 gtk_menu_append(GTK_MENU(menu), opt); | 539 gtk_menu_shell_append(GTK_MENU_SHELL(menu), opt); |
| 538 gtk_widget_show(opt); | 540 gtk_widget_show(opt); |
| 539 p = p->next; | 541 p = p->next; |
| 540 } | 542 } |
| 541 | 543 |
| 542 gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), menu); | 544 gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), menu); |
| 628 gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); | 630 gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); |
| 629 gtk_widget_show(label); | 631 gtk_widget_show(label); |
| 630 | 632 |
| 631 name = gtk_entry_new(); | 633 name = gtk_entry_new(); |
| 632 gtk_entry_set_text(GTK_ENTRY(name), ma->iconfile); | 634 gtk_entry_set_text(GTK_ENTRY(name), ma->iconfile); |
| 633 gtk_entry_set_editable(GTK_ENTRY(name), FALSE); | 635 gtk_editable_set_editable(GTK_EDITABLE(name), FALSE); |
| 634 gtk_box_pack_start(GTK_BOX(hbox), name, TRUE, TRUE, 5); | 636 gtk_box_pack_start(GTK_BOX(hbox), name, TRUE, TRUE, 5); |
| 635 gtk_widget_show(name); | 637 gtk_widget_show(name); |
| 636 ma->iconentry = name; | 638 ma->iconentry = name; |
| 637 | 639 |
| 638 browse = gtk_button_new_with_label(_("Browse")); | 640 browse = gtk_button_new_with_label(_("Browse")); |
| 829 gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); | 831 gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); |
| 830 gtk_widget_show(label); | 832 gtk_widget_show(label); |
| 831 | 833 |
| 832 entry = gtk_entry_new(); | 834 entry = gtk_entry_new(); |
| 833 gtk_box_pack_end(GTK_BOX(hbox), entry, FALSE, FALSE, 0); | 835 gtk_box_pack_end(GTK_BOX(hbox), entry, FALSE, FALSE, 0); |
| 834 gtk_object_set_user_data(GTK_OBJECT(entry), (void *)puo->pos); | 836 g_object_set_data(G_OBJECT(entry), "position", GINT_TO_POINTER(puo->pos)); |
| 835 if (ma->proto_opt[puo->pos][0]) { | 837 if (ma->proto_opt[puo->pos][0]) { |
| 836 debug_printf("setting text %s\n", ma->proto_opt[puo->pos]); | 838 debug_printf("setting text %s\n", ma->proto_opt[puo->pos]); |
| 837 gtk_entry_set_text(GTK_ENTRY(entry), ma->proto_opt[puo->pos]); | 839 gtk_entry_set_text(GTK_ENTRY(entry), ma->proto_opt[puo->pos]); |
| 838 } else { | 840 } else { |
| 839 gtk_entry_set_text(GTK_ENTRY(entry), puo->def); | 841 gtk_entry_set_text(GTK_ENTRY(entry), puo->def); |
| 845 op = op->next; | 847 op = op->next; |
| 846 } | 848 } |
| 847 | 849 |
| 848 if(p->register_user != NULL) { | 850 if(p->register_user != NULL) { |
| 849 ma->register_user = gtk_check_button_new_with_label(_("Register with server")); | 851 ma->register_user = gtk_check_button_new_with_label(_("Register with server")); |
| 850 gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(ma->register_user), FALSE); | 852 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ma->register_user), FALSE); |
| 851 gtk_box_pack_start(GTK_BOX(vbox), ma->register_user, FALSE, FALSE, 0); | 853 gtk_box_pack_start(GTK_BOX(vbox), ma->register_user, FALSE, FALSE, 0); |
| 852 gtk_widget_show(ma->register_user); | 854 gtk_widget_show(ma->register_user); |
| 853 } | 855 } |
| 854 | 856 |
| 855 } | 857 } |
| 856 | 858 |
| 857 static void proxy_dropdown_set(GtkObject *w, struct mod_account *ma) { | 859 static void proxy_dropdown_set(GObject *w, struct mod_account *ma) { |
| 858 int opt = (int)gtk_object_get_user_data(w); | 860 int opt = GPOINTER_TO_INT(g_object_get_data(w, "proxytype")); |
| 859 gtk_widget_set_sensitive(ma->proxy_host_box, (opt != PROXY_NONE && opt != PROXY_USE_GLOBAL)); | 861 gtk_widget_set_sensitive(ma->proxy_host_box, (opt != PROXY_NONE && opt != PROXY_USE_GLOBAL)); |
| 860 } | 862 } |
| 861 | 863 |
| 862 static void generate_proxy_options(struct mod_account *ma, GtkWidget *box) { | 864 static void generate_proxy_options(struct mod_account *ma, GtkWidget *box) { |
| 863 GtkWidget *frame; | 865 GtkWidget *frame; |
| 897 | 899 |
| 898 dropdown = gtk_option_menu_new(); | 900 dropdown = gtk_option_menu_new(); |
| 899 menu = gtk_menu_new(); | 901 menu = gtk_menu_new(); |
| 900 | 902 |
| 901 opt = gtk_menu_item_new_with_label("Use Global Proxy Settings"); | 903 opt = gtk_menu_item_new_with_label("Use Global Proxy Settings"); |
| 902 gtk_object_set_user_data(GTK_OBJECT(opt), (gpointer)PROXY_USE_GLOBAL); | 904 g_object_set_data(G_OBJECT(opt), "proxytype", GINT_TO_POINTER(PROXY_USE_GLOBAL)); |
| 903 g_signal_connect(G_OBJECT(opt), "activate", | 905 g_signal_connect(G_OBJECT(opt), "activate", |
| 904 G_CALLBACK(proxy_dropdown_set), ma); | 906 G_CALLBACK(proxy_dropdown_set), ma); |
| 905 gtk_widget_show(opt); | 907 gtk_widget_show(opt); |
| 906 gtk_menu_shell_append(GTK_MENU_SHELL(menu), opt); | 908 gtk_menu_shell_append(GTK_MENU_SHELL(menu), opt); |
| 907 if(!gpi) | 909 if(!gpi) |
| 908 gtk_menu_set_active(GTK_MENU(menu), 0); | 910 gtk_menu_set_active(GTK_MENU(menu), 0); |
| 909 | 911 |
| 910 opt = gtk_menu_item_new_with_label("No Proxy"); | 912 opt = gtk_menu_item_new_with_label("No Proxy"); |
| 911 gtk_object_set_user_data(GTK_OBJECT(opt), (gpointer)PROXY_NONE); | 913 g_object_set_data(G_OBJECT(opt), "proxytype", GINT_TO_POINTER(PROXY_NONE)); |
| 912 g_signal_connect(G_OBJECT(opt), "activate", | 914 g_signal_connect(G_OBJECT(opt), "activate", |
| 913 G_CALLBACK(proxy_dropdown_set), ma); | 915 G_CALLBACK(proxy_dropdown_set), ma); |
| 914 gtk_widget_show(opt); | 916 gtk_widget_show(opt); |
| 915 gtk_menu_shell_append(GTK_MENU_SHELL(menu), opt); | 917 gtk_menu_shell_append(GTK_MENU_SHELL(menu), opt); |
| 916 if(gpi && gpi->proxytype == PROXY_NONE) | 918 if(gpi && gpi->proxytype == PROXY_NONE) |
| 917 gtk_menu_set_active(GTK_MENU(menu), 1); | 919 gtk_menu_set_active(GTK_MENU(menu), 1); |
| 918 | 920 |
| 919 opt = gtk_menu_item_new_with_label("SOCKS 4"); | 921 opt = gtk_menu_item_new_with_label("SOCKS 4"); |
| 920 gtk_object_set_user_data(GTK_OBJECT(opt), (gpointer)PROXY_SOCKS4); | 922 g_object_set_data(G_OBJECT(opt), "proxytype", GINT_TO_POINTER(PROXY_SOCKS4)); |
| 921 g_signal_connect(G_OBJECT(opt), "activate", | 923 g_signal_connect(G_OBJECT(opt), "activate", |
| 922 G_CALLBACK(proxy_dropdown_set), ma); | 924 G_CALLBACK(proxy_dropdown_set), ma); |
| 923 gtk_widget_show(opt); | 925 gtk_widget_show(opt); |
| 924 gtk_menu_shell_append(GTK_MENU_SHELL(menu), opt); | 926 gtk_menu_shell_append(GTK_MENU_SHELL(menu), opt); |
| 925 if(gpi && gpi->proxytype == PROXY_SOCKS4) | 927 if(gpi && gpi->proxytype == PROXY_SOCKS4) |
| 926 gtk_menu_set_active(GTK_MENU(menu), 2); | 928 gtk_menu_set_active(GTK_MENU(menu), 2); |
| 927 | 929 |
| 928 opt = gtk_menu_item_new_with_label("SOCKS 5"); | 930 opt = gtk_menu_item_new_with_label("SOCKS 5"); |
| 929 gtk_object_set_user_data(GTK_OBJECT(opt), (gpointer)PROXY_SOCKS5); | 931 g_object_set_data(G_OBJECT(opt), "proxytype", GINT_TO_POINTER(PROXY_SOCKS5)); |
| 930 g_signal_connect(G_OBJECT(opt), "activate", | 932 g_signal_connect(G_OBJECT(opt), "activate", |
| 931 G_CALLBACK(proxy_dropdown_set), ma); | 933 G_CALLBACK(proxy_dropdown_set), ma); |
| 932 gtk_widget_show(opt); | 934 gtk_widget_show(opt); |
| 933 gtk_menu_shell_append(GTK_MENU_SHELL(menu), opt); | 935 gtk_menu_shell_append(GTK_MENU_SHELL(menu), opt); |
| 934 if(gpi && gpi->proxytype == PROXY_SOCKS5) | 936 if(gpi && gpi->proxytype == PROXY_SOCKS5) |
| 935 gtk_menu_set_active(GTK_MENU(menu), 3); | 937 gtk_menu_set_active(GTK_MENU(menu), 3); |
| 936 | 938 |
| 937 opt = gtk_menu_item_new_with_label("HTTP"); | 939 opt = gtk_menu_item_new_with_label("HTTP"); |
| 938 gtk_object_set_user_data(GTK_OBJECT(opt), (gpointer)PROXY_HTTP); | 940 g_object_set_data(G_OBJECT(opt), "proxytype", GINT_TO_POINTER(PROXY_HTTP)); |
| 939 g_signal_connect(G_OBJECT(opt), "activate", | 941 g_signal_connect(G_OBJECT(opt), "activate", |
| 940 G_CALLBACK(proxy_dropdown_set), ma); | 942 G_CALLBACK(proxy_dropdown_set), ma); |
| 941 gtk_widget_show(opt); | 943 gtk_widget_show(opt); |
| 942 gtk_menu_shell_append(GTK_MENU_SHELL(menu), opt); | 944 gtk_menu_shell_append(GTK_MENU_SHELL(menu), opt); |
| 943 if(gpi && gpi->proxytype == PROXY_HTTP) | 945 if(gpi && gpi->proxytype == PROXY_HTTP) |
| 1076 | 1078 |
| 1077 ma->mod = gtk_window_new(GTK_WINDOW_TOPLEVEL); | 1079 ma->mod = gtk_window_new(GTK_WINDOW_TOPLEVEL); |
| 1078 gtk_window_set_role(GTK_WINDOW(ma->mod), "account"); | 1080 gtk_window_set_role(GTK_WINDOW(ma->mod), "account"); |
| 1079 gtk_widget_realize(ma->mod); | 1081 gtk_widget_realize(ma->mod); |
| 1080 gtk_window_set_title(GTK_WINDOW(ma->mod), _("Gaim - Modify Account")); | 1082 gtk_window_set_title(GTK_WINDOW(ma->mod), _("Gaim - Modify Account")); |
| 1081 gtk_window_set_policy(GTK_WINDOW(ma->mod), FALSE, FALSE, TRUE); /* nothing odd here :) */ | 1083 gtk_window_set_resizable(GTK_WINDOW(ma->mod), FALSE); /* nothing odd here :) */ |
| 1082 g_signal_connect(GTK_OBJECT(ma->mod), "destroy", G_CALLBACK(delmod), ma); | 1084 g_signal_connect(GTK_OBJECT(ma->mod), "destroy", G_CALLBACK(delmod), ma); |
| 1083 | 1085 |
| 1084 vbox = gtk_vbox_new(FALSE, 6); | 1086 vbox = gtk_vbox_new(FALSE, 6); |
| 1085 gtk_container_border_width(GTK_CONTAINER(vbox), 6); | 1087 gtk_container_set_border_width(GTK_CONTAINER(vbox), 6); |
| 1086 gtk_container_add(GTK_CONTAINER(ma->mod), vbox); | 1088 gtk_container_add(GTK_CONTAINER(ma->mod), vbox); |
| 1087 gtk_widget_show(vbox); | 1089 gtk_widget_show(vbox); |
| 1088 | 1090 |
| 1089 ma->main = gtk_vbox_new(FALSE, 12); | 1091 ma->main = gtk_vbox_new(FALSE, 12); |
| 1090 gtk_container_border_width(GTK_CONTAINER(ma->main), 6); | 1092 gtk_container_set_border_width(GTK_CONTAINER(ma->main), 6); |
| 1091 gtk_box_pack_start(GTK_BOX(vbox), ma->main, FALSE, FALSE, 0); | 1093 gtk_box_pack_start(GTK_BOX(vbox), ma->main, FALSE, FALSE, 0); |
| 1092 gtk_widget_show(ma->main); | 1094 gtk_widget_show(ma->main); |
| 1093 | 1095 |
| 1094 ma->sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); | 1096 ma->sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); |
| 1095 | 1097 |
| 1387 | 1389 |
| 1388 acctedit = gtk_window_new(GTK_WINDOW_TOPLEVEL); | 1390 acctedit = gtk_window_new(GTK_WINDOW_TOPLEVEL); |
| 1389 gtk_window_set_title(GTK_WINDOW(acctedit), _("Gaim - Account Editor")); | 1391 gtk_window_set_title(GTK_WINDOW(acctedit), _("Gaim - Account Editor")); |
| 1390 gtk_window_set_role(GTK_WINDOW(acctedit), "accounteditor"); | 1392 gtk_window_set_role(GTK_WINDOW(acctedit), "accounteditor"); |
| 1391 gtk_widget_realize(acctedit); | 1393 gtk_widget_realize(acctedit); |
| 1392 gtk_widget_set_usize(acctedit, -1, 250); | 1394 gtk_widget_set_size_request(acctedit, -1, 250); |
| 1393 gtk_window_set_default_size(GTK_WINDOW(acctedit), 550, 250); | 1395 gtk_window_set_default_size(GTK_WINDOW(acctedit), 550, 250); |
| 1394 g_signal_connect(GTK_OBJECT(acctedit), "delete_event", G_CALLBACK(on_delete_acctedit), W); | 1396 g_signal_connect(GTK_OBJECT(acctedit), "delete_event", G_CALLBACK(on_delete_acctedit), W); |
| 1395 | 1397 |
| 1396 vbox = gtk_vbox_new(FALSE, 6); | 1398 vbox = gtk_vbox_new(FALSE, 6); |
| 1397 gtk_container_set_border_width(GTK_CONTAINER(vbox), 6); | 1399 gtk_container_set_border_width(GTK_CONTAINER(vbox), 6); |
| 1478 GdkPixmap *gdkpixmap; | 1480 GdkPixmap *gdkpixmap; |
| 1479 GdkBitmap *mask; | 1481 GdkBitmap *mask; |
| 1480 GtkWidget *pixmap; | 1482 GtkWidget *pixmap; |
| 1481 | 1483 |
| 1482 create_prpl_icon (widget, gc, &gdkpixmap, &mask); | 1484 create_prpl_icon (widget, gc, &gdkpixmap, &mask); |
| 1483 | 1485 |
| 1484 pixmap = gtk_pixmap_new (gdkpixmap, mask); | 1486 pixmap = gtk_image_new_from_pixmap(gdkpixmap, mask); |
| 1485 gdk_pixmap_unref (gdkpixmap); | 1487 gdk_pixmap_unref (gdkpixmap); |
| 1486 gdk_bitmap_unref (mask); | 1488 gdk_bitmap_unref (mask); |
| 1487 return pixmap; | 1489 return pixmap; |
| 1488 } | 1490 } |
| 1489 | 1491 |
| 1706 label = gtk_label_new (name_to_print->str); | 1708 label = gtk_label_new (name_to_print->str); |
| 1707 g_string_free(name_to_print, TRUE); | 1709 g_string_free(name_to_print, TRUE); |
| 1708 gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); | 1710 gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); |
| 1709 | 1711 |
| 1710 meter->status = gtk_statusbar_new(); | 1712 meter->status = gtk_statusbar_new(); |
| 1711 gtk_widget_set_usize(meter->status, 250, 0); | 1713 gtk_widget_set_size_request(meter->status, 250, 0); |
| 1712 | 1714 |
| 1713 meter->progress = gtk_progress_bar_new (); | 1715 meter->progress = gtk_progress_bar_new (); |
| 1714 | 1716 |
| 1715 meter->button = gtk_button_new_with_label (_("Cancel")); | 1717 meter->button = gtk_button_new_with_label (_("Cancel")); |
| 1716 g_signal_connect (GTK_OBJECT (meter->button), "clicked", G_CALLBACK (cancel_signon), meter); | 1718 g_signal_connect (GTK_OBJECT (meter->button), "clicked", G_CALLBACK (cancel_signon), meter); |
| 1749 gtk_widget_hide(mainwindow); | 1751 gtk_widget_hide(mainwindow); |
| 1750 | 1752 |
| 1751 if (!meter_win) { | 1753 if (!meter_win) { |
| 1752 GtkWidget *cancel_button; | 1754 GtkWidget *cancel_button; |
| 1753 GtkWidget *vbox; | 1755 GtkWidget *vbox; |
| 1754 | 1756 |
| 1755 meter_win = g_new0(struct meter_window, 1); | 1757 meter_win = g_new0(struct meter_window, 1); |
| 1756 meter_win->rows=0; | 1758 meter_win->rows=0; |
| 1757 | 1759 |
| 1758 meter_win->window = gtk_window_new (GTK_WINDOW_TOPLEVEL); | 1760 meter_win->window = gtk_window_new (GTK_WINDOW_TOPLEVEL); |
| 1759 GAIM_DIALOG(meter_win->window); | 1761 GAIM_DIALOG(meter_win->window); |
| 1760 gtk_window_set_policy(GTK_WINDOW(meter_win->window), 0, 0, 1); | 1762 gtk_window_set_resizable(GTK_WINDOW(meter_win->window), FALSE); |
| 1761 gtk_window_set_role(GTK_WINDOW(meter_win->window), "signon"); | 1763 gtk_window_set_role(GTK_WINDOW(meter_win->window), "signon"); |
| 1762 gtk_container_set_border_width(GTK_CONTAINER(meter_win->window), 5); | 1764 gtk_container_set_border_width(GTK_CONTAINER(meter_win->window), 5); |
| 1763 gtk_window_set_title (GTK_WINDOW (meter_win->window), _("Gaim Account Signon")); | 1765 gtk_window_set_title (GTK_WINDOW (meter_win->window), _("Gaim Account Signon")); |
| 1764 gtk_widget_realize(meter_win->window); | 1766 gtk_widget_realize(meter_win->window); |
| 1765 | 1767 |
| 1766 vbox = gtk_vbox_new (FALSE, 0); | 1768 vbox = gtk_vbox_new (FALSE, 0); |
| 1767 gtk_container_add (GTK_CONTAINER (meter_win->window), GTK_WIDGET (vbox)); | 1769 gtk_container_add (GTK_CONTAINER (meter_win->window), GTK_WIDGET (vbox)); |
| 1768 | 1770 |
| 1769 meter_win->table = (GtkTable *) gtk_table_new (1 , 4, FALSE); | 1771 meter_win->table = (GtkTable *) gtk_table_new (1 , 4, FALSE); |
| 1770 gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (meter_win->table), FALSE, FALSE, 0); | 1772 gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (meter_win->table), FALSE, FALSE, 0); |
