Mercurial > pidgin.yaz
comparison src/dialogs.c @ 4695:4bdd9a5fd026
[gaim-migrate @ 5006]
This may very well have issues, but it's a slightly better core/ui split,
removing global variables and fixing some GTK+ runtime errors and a couple
segfaults. It's some progress.
committer: Tailor Script <tailor@pidgin.im>
author | Christian Hammond <chipx86@chipx86.com> |
---|---|
date | Mon, 10 Mar 2003 18:16:29 +0000 |
parents | 283fb289c510 |
children | e4dda06a3143 |
comparison
equal
deleted
inserted
replaced
4694:8f523dbb970e | 4695:4bdd9a5fd026 |
---|---|
583 void show_ee_dialog(int ee) | 583 void show_ee_dialog(int ee) |
584 { | 584 { |
585 GtkWidget *window; | 585 GtkWidget *window; |
586 GtkWidget *hbox; | 586 GtkWidget *hbox; |
587 GtkWidget *label; | 587 GtkWidget *label; |
588 | 588 struct gaim_gtk_buddy_list *gtkblist; |
589 char *filename = g_build_filename(DATADIR, "pixmaps", "gaim", "dialogs", "gaim_cool.png", NULL); | 589 char *filename = g_build_filename(DATADIR, "pixmaps", "gaim", "dialogs", "gaim_cool.png", NULL); |
590 GtkWidget *img = gtk_image_new_from_file(filename); | 590 GtkWidget *img = gtk_image_new_from_file(filename); |
591 | 591 |
592 gtkblist = GAIM_GTK_BLIST(gaim_get_blist()); | |
593 | |
592 label = gtk_label_new(NULL); | 594 label = gtk_label_new(NULL); |
593 if (ee == 0) | 595 if (ee == 0) |
594 gtk_label_set_markup(GTK_LABEL(label), | 596 gtk_label_set_markup(GTK_LABEL(label), |
595 "<span weight=\"bold\" size=\"large\" foreground=\"purple\">Amazing! Simply Amazing!</span>"); | 597 "<span weight=\"bold\" size=\"large\" foreground=\"purple\">Amazing! Simply Amazing!</span>"); |
596 else if (ee == 1) | 598 else if (ee == 1) |
656 GtkWidget *hbox, *vbox; | 658 GtkWidget *hbox, *vbox; |
657 GtkWidget *label; | 659 GtkWidget *label; |
658 GtkWidget *table, *menu, *opt; | 660 GtkWidget *table, *menu, *opt; |
659 GSList *g = connections; | 661 GSList *g = connections; |
660 struct gaim_connection *c; | 662 struct gaim_connection *c; |
663 struct gaim_gtk_buddy_list *gtkblist; | |
661 char buf[256]; | 664 char buf[256]; |
662 char *filename = g_build_filename(DATADIR, "pixmaps", "gaim", "dialogs", "gaim_question.png", NULL); | 665 char *filename = g_build_filename(DATADIR, "pixmaps", "gaim", "dialogs", "gaim_question.png", NULL); |
663 GtkWidget *img = gtk_image_new_from_file(filename); | 666 GtkWidget *img = gtk_image_new_from_file(filename); |
664 struct getuserinfo *info = NULL; | 667 struct getuserinfo *info = NULL; |
668 | |
669 gtkblist = GAIM_GTK_BLIST(gaim_get_blist()); | |
665 | 670 |
666 g_free(filename); | 671 g_free(filename); |
667 | 672 |
668 if (!imdialog) { | 673 if (!imdialog) { |
669 info = g_new0(struct getuserinfo, 1); | 674 info = g_new0(struct getuserinfo, 1); |
762 GtkWidget *img = gtk_image_new_from_file(filename); | 767 GtkWidget *img = gtk_image_new_from_file(filename); |
763 GtkWidget *table, *menu, *opt; | 768 GtkWidget *table, *menu, *opt; |
764 GSList *g = connections; | 769 GSList *g = connections; |
765 struct gaim_connection *c; | 770 struct gaim_connection *c; |
766 struct getuserinfo *info = g_new0(struct getuserinfo, 1); | 771 struct getuserinfo *info = g_new0(struct getuserinfo, 1); |
772 struct gaim_gtk_buddy_list *gtkblist; | |
767 char buf[256]; | 773 char buf[256]; |
774 | |
775 gtkblist = GAIM_GTK_BLIST(gaim_get_blist()); | |
768 | 776 |
769 g_free(filename); | 777 g_free(filename); |
770 info->gc = connections->data; | 778 info->gc = connections->data; |
771 | 779 |
772 window = gtk_dialog_new_with_buttons(_("Gaim - Get User Info"), gtkblist->window ? GTK_WINDOW(gtkblist->window) : NULL, GTK_DIALOG_MODAL, | 780 window = gtk_dialog_new_with_buttons(_("Gaim - Get User Info"), gtkblist->window ? GTK_WINDOW(gtkblist->window) : NULL, GTK_DIALOG_MODAL, |
939 void show_add_group(struct gaim_connection *gc) | 947 void show_add_group(struct gaim_connection *gc) |
940 { | 948 { |
941 | 949 |
942 GtkWidget *hbox, *vbox; | 950 GtkWidget *hbox, *vbox; |
943 GtkWidget *label; | 951 GtkWidget *label; |
952 struct gaim_gtk_buddy_list *gtkblist; | |
944 char *filename = g_build_filename(DATADIR, "pixmaps", "gaim", "dialogs", "gaim_question.png", NULL); | 953 char *filename = g_build_filename(DATADIR, "pixmaps", "gaim", "dialogs", "gaim_question.png", NULL); |
945 GtkWidget *img = gtk_image_new_from_file(filename); | 954 GtkWidget *img = gtk_image_new_from_file(filename); |
946 struct addbuddy *a = g_new0(struct addbuddy, 1); | 955 struct addbuddy *a = g_new0(struct addbuddy, 1); |
956 | |
957 gtkblist = GAIM_GTK_BLIST(gaim_get_blist()); | |
947 | 958 |
948 g_free(filename); | 959 g_free(filename); |
949 a->gc = gc; | 960 a->gc = gc; |
950 | 961 |
951 a->window = gtk_dialog_new_with_buttons(_("Gaim - Add Group"), GTK_WINDOW(gtkblist->window), GTK_DIALOG_MODAL, | 962 a->window = gtk_dialog_new_with_buttons(_("Gaim - Add Group"), GTK_WINDOW(gtkblist->window), GTK_DIALOG_MODAL, |
1049 { | 1060 { |
1050 GtkWidget *table; | 1061 GtkWidget *table; |
1051 GtkWidget *label; | 1062 GtkWidget *label; |
1052 GtkWidget *hbox; | 1063 GtkWidget *hbox; |
1053 GtkWidget *vbox; | 1064 GtkWidget *vbox; |
1054 | 1065 struct gaim_gtk_buddy_list *gtkblist; |
1055 char *filename = g_build_filename(DATADIR, "pixmaps", "gaim", "dialogs", "gaim_question.png", NULL); | 1066 char *filename = g_build_filename(DATADIR, "pixmaps", "gaim", "dialogs", "gaim_question.png", NULL); |
1056 GtkWidget *img = gtk_image_new_from_file(filename); | 1067 GtkWidget *img = gtk_image_new_from_file(filename); |
1057 | |
1058 struct addbuddy *a = g_new0(struct addbuddy, 1); | 1068 struct addbuddy *a = g_new0(struct addbuddy, 1); |
1059 a->gc = gc ? gc : connections->data; | 1069 a->gc = gc ? gc : connections->data; |
1070 | |
1071 gtkblist = GAIM_GTK_BLIST(gaim_get_blist()); | |
1060 | 1072 |
1061 g_free(filename); | 1073 g_free(filename); |
1062 | 1074 |
1063 GAIM_DIALOG(a->window); | 1075 GAIM_DIALOG(a->window); |
1064 a->window = gtk_dialog_new_with_buttons(_("Gaim - Add Buddy"), gtkblist->window ? GTK_WINDOW(gtkblist->window) : NULL, GTK_DIALOG_MODAL, | 1076 a->window = gtk_dialog_new_with_buttons(_("Gaim - Add Buddy"), gtkblist->window ? GTK_WINDOW(gtkblist->window) : NULL, GTK_DIALOG_MODAL, |
3909 void show_rename_group(GtkWidget *unused, struct group *g) | 3921 void show_rename_group(GtkWidget *unused, struct group *g) |
3910 { | 3922 { |
3911 | 3923 |
3912 GtkWidget *hbox, *vbox; | 3924 GtkWidget *hbox, *vbox; |
3913 GtkWidget *label; | 3925 GtkWidget *label; |
3926 struct gaim_gtk_buddy_list *gtkblist; | |
3914 char *filename = g_build_filename(DATADIR, "pixmaps", "gaim", "dialogs", "gaim_question.png", NULL); | 3927 char *filename = g_build_filename(DATADIR, "pixmaps", "gaim", "dialogs", "gaim_question.png", NULL); |
3915 GtkWidget *img = gtk_image_new_from_file(filename); | 3928 GtkWidget *img = gtk_image_new_from_file(filename); |
3916 GtkWidget *name_entry = NULL; | 3929 GtkWidget *name_entry = NULL; |
3917 | 3930 |
3918 g_free(filename); | 3931 g_free(filename); |
3932 | |
3933 gtkblist = GAIM_GTK_BLIST(gaim_get_blist()); | |
3919 | 3934 |
3920 if (!rename_dialog) { | 3935 if (!rename_dialog) { |
3921 rename_dialog = gtk_dialog_new_with_buttons(_("Rename Group"), GTK_WINDOW(gtkblist->window), GTK_DIALOG_MODAL, | 3936 rename_dialog = gtk_dialog_new_with_buttons(_("Rename Group"), GTK_WINDOW(gtkblist->window), GTK_DIALOG_MODAL, |
3922 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); | 3937 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); |
3923 gtk_dialog_set_default_response (GTK_DIALOG(rename_dialog), GTK_RESPONSE_OK); | 3938 gtk_dialog_set_default_response (GTK_DIALOG(rename_dialog), GTK_RESPONSE_OK); |