Mercurial > pidgin.yaz

comparison pidgin/gtkaccount.c @ 25711:a1acca6ff789

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '77e249bc561fc09bc5fe8f9c6f8b573701b5d63d' and 'fca38a4d41e1b8322fa295cbfaa98418b980b2a4'
author Mike Ruprecht <maiku@soc.pidgin.im>
date Sat, 19 Jul 2008 03:10:38 +0000
parents 33418ea6d801
children 7cb7bc8865af
comparison
equal deleted inserted replaced
25709:eb8c8a926589 25711:a1acca6ff789
1184 const char *value; 1184 const char *value;
1185 char *username; 1185 char *username;
1186 char *tmp; 1186 char *tmp;
1187 gboolean new_acct = FALSE, icon_change = FALSE; 1187 gboolean new_acct = FALSE, icon_change = FALSE;
1188 PurpleAccount *account; 1188 PurpleAccount *account;
1189 PurplePluginProtocolInfo *prpl_info;
1190 1189
1191 /* Build the username string. */ 1190 /* Build the username string. */
1192 username = g_strdup(gtk_entry_get_text(GTK_ENTRY(dialog->screenname_entry))); 1191 username = g_strdup(gtk_entry_get_text(GTK_ENTRY(dialog->screenname_entry)));
1193 1192
1194 if (dialog->prpl_info != NULL) 1193 if (dialog->prpl_info != NULL)
1252 purple_account_set_alias(account, value); 1251 purple_account_set_alias(account, value);
1253 else 1252 else
1254 purple_account_set_alias(account, NULL); 1253 purple_account_set_alias(account, NULL);
1255 1254
1256 /* Buddy Icon */ 1255 /* Buddy Icon */
1257 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(dialog->plugin); 1256 if (dialog->prpl_info != NULL && dialog->prpl_info->icon_spec.format != NULL)
1258 if (prpl_info != NULL && prpl_info->icon_spec.format != NULL)
1259 { 1257 {
1260 const char *filename; 1258 const char *filename;
1261 1259
1262 if (new_acct || purple_account_get_bool(account, "use-global-buddyicon", TRUE) == 1260 if (new_acct || purple_account_get_bool(account, "use-global-buddyicon", TRUE) ==
1263 gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->icon_check))) 1261 gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->icon_check)))