comparison: pidgin/gtkaccount.c
pidgin/gtkaccount.c
- branch
- soc.2013.gobjectification.plugins
- changeset 36361
- 9e68a23150cf
- parent 34827
- 1615d90aa584
- child 36367
- 891eea799578
equal
deleted
inserted
replaced
| 36360:694532725ec3 | 36361:9e68a23150cf |
|---|---|
| 235 set_account_protocol_cb(GtkWidget *widget, const char *id, | 235 set_account_protocol_cb(GtkWidget *widget, const char *id, |
| 236 AccountPrefsDialog *dialog) | 236 AccountPrefsDialog *dialog) |
| 237 { | 237 { |
| 238 PurplePlugin *new_plugin; | 238 PurplePlugin *new_plugin; |
| 239 | 239 |
| 240 new_plugin = purple_find_prpl(id); | 240 new_plugin = purple_find_protocol_info(id); |
| 241 | 241 |
| 242 dialog->plugin = new_plugin; | 242 dialog->plugin = new_plugin; |
| 243 | 243 |
| 244 if (dialog->plugin != NULL) | 244 if (dialog->plugin != NULL) |
| 245 { | 245 { |
| 1741 { | 1741 { |
| 1742 dialog->protocol_id = | 1742 dialog->protocol_id = |
| 1743 g_strdup(purple_account_get_protocol_id(dialog->account)); | 1743 g_strdup(purple_account_get_protocol_id(dialog->account)); |
| 1744 } | 1744 } |
| 1745 | 1745 |
| 1746 if ((dialog->plugin = purple_find_prpl(dialog->protocol_id)) != NULL) | 1746 if ((dialog->plugin = purple_find_protocol_info(dialog->protocol_id)) != NULL) |
| 1747 dialog->prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(dialog->plugin); | 1747 dialog->prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(dialog->plugin); |
| 1748 | 1748 |
| 1749 dialog->window = win = pidgin_create_dialog((type == PIDGIN_ADD_ACCOUNT_DIALOG) ? _("Add Account") : _("Modify Account"), | 1749 dialog->window = win = pidgin_create_dialog((type == PIDGIN_ADD_ACCOUNT_DIALOG) ? _("Add Account") : _("Modify Account"), |
| 1750 PIDGIN_HIG_BOX_SPACE, "account", FALSE); | 1750 PIDGIN_HIG_BOX_SPACE, "account", FALSE); |
| 1751 | 1751 |
| 2248 | 2248 |
| 2249 pixbuf = pidgin_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM); | 2249 pixbuf = pidgin_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM); |
| 2250 if ((pixbuf != NULL) && purple_account_is_disconnected(account)) | 2250 if ((pixbuf != NULL) && purple_account_is_disconnected(account)) |
| 2251 gdk_pixbuf_saturate_and_pixelate(pixbuf, pixbuf, 0.0, FALSE); | 2251 gdk_pixbuf_saturate_and_pixelate(pixbuf, pixbuf, 0.0, FALSE); |
| 2252 | 2252 |
| 2253 prpl = purple_find_prpl(purple_account_get_protocol_id(account)); | 2253 prpl = purple_find_protocol_info(purple_account_get_protocol_id(account)); |
| 2254 if (prpl != NULL) | 2254 if (prpl != NULL) |
| 2255 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl); | 2255 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl); |
| 2256 if (prpl_info != NULL && prpl_info->icon_spec.format != NULL) { | 2256 if (prpl_info != NULL && prpl_info->icon_spec.format != NULL) { |
| 2257 if (purple_account_get_bool(account, "use-global-buddyicon", TRUE)) { | 2257 if (purple_account_get_bool(account, "use-global-buddyicon", TRUE)) { |
| 2258 if (global_buddyicon != NULL) | 2258 if (global_buddyicon != NULL) |
| 2714 const char *protocol_id; | 2714 const char *protocol_id; |
| 2715 PurplePlugin *plugin; | 2715 PurplePlugin *plugin; |
| 2716 PurplePluginProtocolInfo *prpl_info = NULL; | 2716 PurplePluginProtocolInfo *prpl_info = NULL; |
| 2717 | 2717 |
| 2718 protocol_id = purple_account_get_protocol_id(ar->account); | 2718 protocol_id = purple_account_get_protocol_id(ar->account); |
| 2719 if ((plugin = purple_find_prpl(protocol_id)) != NULL) | 2719 if ((plugin = purple_find_protocol_info(protocol_id)) != NULL) |
| 2720 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(plugin); | 2720 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(plugin); |
| 2721 | 2721 |
| 2722 if (prpl_info && (prpl_info->options & OPT_PROTO_AUTHORIZATION_GRANTED_MESSAGE)) { | 2722 if (prpl_info && (prpl_info->options & OPT_PROTO_AUTHORIZATION_GRANTED_MESSAGE)) { |
| 2723 /* Duplicate information because ar is freed by closing minidialog */ | 2723 /* Duplicate information because ar is freed by closing minidialog */ |
| 2724 struct auth_request *aa = g_new0(struct auth_request, 1); | 2724 struct auth_request *aa = g_new0(struct auth_request, 1); |
| 2759 const char *protocol_id; | 2759 const char *protocol_id; |
| 2760 PurplePlugin *plugin; | 2760 PurplePlugin *plugin; |
| 2761 PurplePluginProtocolInfo *prpl_info = NULL; | 2761 PurplePluginProtocolInfo *prpl_info = NULL; |
| 2762 | 2762 |
| 2763 protocol_id = purple_account_get_protocol_id(ar->account); | 2763 protocol_id = purple_account_get_protocol_id(ar->account); |
| 2764 if ((plugin = purple_find_prpl(protocol_id)) != NULL) | 2764 if ((plugin = purple_find_protocol_info(protocol_id)) != NULL) |
| 2765 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(plugin); | 2765 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(plugin); |
| 2766 | 2766 |
| 2767 if (prpl_info && (prpl_info->options & OPT_PROTO_AUTHORIZATION_DENIED_MESSAGE)) { | 2767 if (prpl_info && (prpl_info->options & OPT_PROTO_AUTHORIZATION_DENIED_MESSAGE)) { |
| 2768 /* Duplicate information because ar is freed by closing minidialog */ | 2768 /* Duplicate information because ar is freed by closing minidialog */ |
| 2769 struct auth_request *aa = g_new0(struct auth_request, 1); | 2769 struct auth_request *aa = g_new0(struct auth_request, 1); |
