Mercurial > pidgin

comparison src/gtkaccount.c @ 5978:041b657227c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 6425] Fixed a warning about the protocol_id being NULL. Also removed some debug statements and such. committer: Tailor Script <tailor@pidgin.im>
author Christian Hammond <chipx86@chipx86.com>
date Mon, 30 Jun 2003 03:12:40 +0000
parents 5fb6bd688a5b
children 49ae70ffcea5
comparison
equal deleted inserted replaced
5977:2d34c02d2031 5978:041b657227c4
81 81
82 AccountsDialog *accounts_dialog; 82 AccountsDialog *accounts_dialog;
83 83
84 GaimAccount *account; 84 GaimAccount *account;
85 GaimProtocol protocol; 85 GaimProtocol protocol;
86 const char *protocol_id; 86 char *protocol_id;
87 GaimPlugin *plugin; 87 GaimPlugin *plugin;
88 GaimPluginProtocolInfo *prpl_info; 88 GaimPluginProtocolInfo *prpl_info;
89 89
90 GaimProxyType new_proxy_type; 90 GaimProxyType new_proxy_type;
91 91
184 set_account_protocol_cb(GtkWidget *item, GaimProtocol protocol, 184 set_account_protocol_cb(GtkWidget *item, GaimProtocol protocol,
185 AccountPrefsDialog *dialog) 185 AccountPrefsDialog *dialog)
186 { 186 {
187 if ((dialog->plugin = gaim_find_prpl(protocol)) != NULL) { 187 if ((dialog->plugin = gaim_find_prpl(protocol)) != NULL) {
188 dialog->prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(dialog->plugin); 188 dialog->prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(dialog->plugin);
189 dialog->protocol = dialog->prpl_info->protocol; 189 dialog->protocol = dialog->prpl_info->protocol;
190 } 190
191 191 if (dialog->protocol_id != NULL)
192 dialog->protocol_id = dialog->plugin->info->id; 192 g_free(dialog->protocol_id);
193
194 dialog->protocol_id = g_strdup(dialog->plugin->info->id);
195 }
193 196
194 add_login_options(dialog, dialog->top_vbox); 197 add_login_options(dialog, dialog->top_vbox);
195 add_user_options(dialog, dialog->top_vbox); 198 add_user_options(dialog, dialog->top_vbox);
196 add_protocol_options(dialog, dialog->bottom_vbox); 199 add_protocol_options(dialog, dialog->bottom_vbox);
197 } 200 }
900 g_list_free(dialog->user_split_entries); 903 g_list_free(dialog->user_split_entries);
901 904
902 if (dialog->protocol_opt_entries != NULL) 905 if (dialog->protocol_opt_entries != NULL)
903 g_list_free(dialog->protocol_opt_entries); 906 g_list_free(dialog->protocol_opt_entries);
904 907
908 if (dialog->protocol_id != NULL)
909 g_free(dialog->protocol_id);
910
905 if (dialog->buddy_icon_filesel) 911 if (dialog->buddy_icon_filesel)
906 gtk_widget_destroy(dialog->buddy_icon_filesel); 912 gtk_widget_destroy(dialog->buddy_icon_filesel);
907 913
908 g_free(dialog); 914 g_free(dialog);
909 } 915 }
1136 dialog->accounts_dialog = accounts_dialog; 1142 dialog->accounts_dialog = accounts_dialog;
1137 dialog->account = account; 1143 dialog->account = account;
1138 dialog->type = type; 1144 dialog->type = type;
1139 dialog->sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); 1145 dialog->sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
1140 1146
1141 if (dialog->account == NULL) 1147 if (dialog->account == NULL) {
1148 dialog->protocol_id = g_strdup("prpl-oscar");
1142 dialog->protocol = GAIM_PROTO_OSCAR; 1149 dialog->protocol = GAIM_PROTO_OSCAR;
1143 else 1150 }
1151 else {
1152 dialog->protocol_id =
1153 g_strdup(gaim_account_get_protocol_id(dialog->account));
1144 dialog->protocol = gaim_account_get_protocol(dialog->account); 1154 dialog->protocol = gaim_account_get_protocol(dialog->account);
1155 }
1145 1156
1146 if ((dialog->plugin = gaim_find_prpl(dialog->protocol)) != NULL) 1157 if ((dialog->plugin = gaim_find_prpl(dialog->protocol)) != NULL)
1147 dialog->prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(dialog->plugin); 1158 dialog->prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(dialog->plugin);
1148 1159
1149 1160
1636 pixbuf = create_prpl_icon(account); 1647 pixbuf = create_prpl_icon(account);
1637 1648
1638 if (pixbuf != NULL) 1649 if (pixbuf != NULL)
1639 scale = gdk_pixbuf_scale_simple(pixbuf, 16, 16, GDK_INTERP_BILINEAR); 1650 scale = gdk_pixbuf_scale_simple(pixbuf, 16, 16, GDK_INTERP_BILINEAR);
1640 1651
1641 gaim_debug(GAIM_DEBUG_MISC, "gtkaccount", "auto-login for %s: %d\n",
1642 gaim_account_get_username(account),
1643 gaim_account_get_auto_login(account, GAIM_GTK_UI));
1644
1645 gtk_list_store_set(store, iter, 1652 gtk_list_store_set(store, iter,
1646 COLUMN_ICON, scale, 1653 COLUMN_ICON, scale,
1647 COLUMN_SCREENNAME, gaim_account_get_username(account), 1654 COLUMN_SCREENNAME, gaim_account_get_username(account),
1648 COLUMN_ONLINE, gaim_account_is_connected(account), 1655 COLUMN_ONLINE, gaim_account_is_connected(account),
1649 COLUMN_AUTOLOGIN, gaim_account_get_auto_login(account, GAIM_GTK_UI), 1656 COLUMN_AUTOLOGIN, gaim_account_get_auto_login(account, GAIM_GTK_UI),