comparison: src/dialogs.c
src/dialogs.c
- changeset 6646
- b9a0b5eb74e6
- parent 6640
- 007eb21016b4
- child 6695
- 2a63688f0d6d
equal
deleted
inserted
replaced
| 6645:184feafdaa43 | 6646:b9a0b5eb74e6 |
|---|---|
| 14 * GNU General Public License for more details. | 14 * GNU General Public License for more details. |
| 15 * | 15 * |
| 16 * You should have received a copy of the GNU General Public License | 16 * You should have received a copy of the GNU General Public License |
| 17 * along with this program; if not, write to the Free Software | 17 * along with this program; if not, write to the Free Software |
| 18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 19 * | |
| 20 */ | 19 */ |
| 21 #include "gtkinternal.h" | 20 #include "gtkinternal.h" |
| 22 | 21 |
| 23 #include "debug.h" | 22 #include "debug.h" |
| 24 #include "log.h" | 23 #include "log.h" |
| 37 #include "gtkutils.h" | 36 #include "gtkutils.h" |
| 38 #include "stock.h" | 37 #include "stock.h" |
| 39 | 38 |
| 40 #include "ui.h" | 39 #include "ui.h" |
| 41 | 40 |
| 42 /* XXX For the soon-to-be-deprecated MultiEntryDlg stuff */ | 41 /* XXX */ |
| 43 #include "gaim.h" | 42 #include "gaim.h" |
| 44 | 43 |
| 45 static GtkWidget *imdialog = NULL; /*I only want ONE of these :) */ | 44 static GtkWidget *imdialog = NULL; /*I only want ONE of these :) */ |
| 46 static GList *dialogwindows = NULL; | 45 static GList *dialogwindows = NULL; |
| 47 static GtkWidget *importdialog; | 46 static GtkWidget *importdialog; |
| 673 gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 1, 2); | 672 gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 1, 2); |
| 674 gtk_label_set_markup_with_mnemonic(GTK_LABEL(label), _("_Account:")); | 673 gtk_label_set_markup_with_mnemonic(GTK_LABEL(label), _("_Account:")); |
| 675 gtk_misc_set_alignment(GTK_MISC(label), 0, 0); | 674 gtk_misc_set_alignment(GTK_MISC(label), 0, 0); |
| 676 | 675 |
| 677 info->account = gaim_gtk_account_option_menu_new(NULL, FALSE, | 676 info->account = gaim_gtk_account_option_menu_new(NULL, FALSE, |
| 678 G_CALLBACK(show_info_select_account), info); | 677 G_CALLBACK(show_info_select_account), NULL, info); |
| 679 | 678 |
| 680 gtk_table_attach_defaults(GTK_TABLE(table), info->account, 1, 2, 1, 2); | 679 gtk_table_attach_defaults(GTK_TABLE(table), info->account, 1, 2, 1, 2); |
| 681 gtk_label_set_mnemonic_widget(GTK_LABEL(label), GTK_WIDGET(info->account)); | 680 gtk_label_set_mnemonic_widget(GTK_LABEL(label), GTK_WIDGET(info->account)); |
| 682 } | 681 } |
| 683 | 682 |
| 751 gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 1, 2); | 750 gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 1, 2); |
| 752 gtk_label_set_markup_with_mnemonic(GTK_LABEL(label), _("_Account:")); | 751 gtk_label_set_markup_with_mnemonic(GTK_LABEL(label), _("_Account:")); |
| 753 gtk_misc_set_alignment(GTK_MISC(label), 0, 0); | 752 gtk_misc_set_alignment(GTK_MISC(label), 0, 0); |
| 754 | 753 |
| 755 info->account = gaim_gtk_account_option_menu_new(NULL, FALSE, | 754 info->account = gaim_gtk_account_option_menu_new(NULL, FALSE, |
| 756 G_CALLBACK(show_info_select_account), info); | 755 G_CALLBACK(show_info_select_account), NULL, info); |
| 757 | 756 |
| 758 gtk_table_attach_defaults(GTK_TABLE(table), info->account, 1, 2, 1, 2); | 757 gtk_table_attach_defaults(GTK_TABLE(table), info->account, 1, 2, 1, 2); |
| 759 gtk_label_set_mnemonic_widget(GTK_LABEL(label), GTK_WIDGET(info->account)); | 758 gtk_label_set_mnemonic_widget(GTK_LABEL(label), GTK_WIDGET(info->account)); |
| 760 } | 759 } |
| 761 | 760 |
| 962 gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); | 961 gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); |
| 963 gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 3, 4); | 962 gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 3, 4); |
| 964 | 963 |
| 965 a->account = gaim_gtk_account_option_menu_new( | 964 a->account = gaim_gtk_account_option_menu_new( |
| 966 gaim_connection_get_account(gc), FALSE, | 965 gaim_connection_get_account(gc), FALSE, |
| 967 G_CALLBACK(addbuddy_select_account), a); | 966 G_CALLBACK(addbuddy_select_account), NULL, a); |
| 968 | 967 |
| 969 gtk_table_attach_defaults(GTK_TABLE(table), a->account, 1, 2, 3, 4); | 968 gtk_table_attach_defaults(GTK_TABLE(table), a->account, 1, 2, 3, 4); |
| 970 | 969 |
| 971 /* End of account box */ | 970 /* End of account box */ |
| 972 | 971 |
