Mercurial > pidgin

comparison libpurple/protocols/jabber/jabber.c @ 21244:a20ef7180680

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Re-namespace the #defines to all be PURPLE_REQUEST_UI_HINT_*. I see no reason that the common UI ones need to be in a different namespace from the ones used by libpurple.
author Richard Laager <rlaager@wiktel.com>
date Sun, 14 Oct 2007 20:53:40 +0000
parents fba1f6c3df0b
children 6de09629f091 d4f95419be45 e747ac0c42d6
comparison
equal deleted inserted replaced
21243:6402252be3c8 21244:a20ef7180680
1005 purple_request_fields_with_hint(js->gc, _("Register New XMPP Account"), 1005 purple_request_fields_with_hint(js->gc, _("Register New XMPP Account"),
1006 _("Register New XMPP Account"), instructions, fields, 1006 _("Register New XMPP Account"), instructions, fields,
1007 _("Register"), G_CALLBACK(jabber_register_cb), 1007 _("Register"), G_CALLBACK(jabber_register_cb),
1008 _("Cancel"), G_CALLBACK(jabber_register_cancel_cb), 1008 _("Cancel"), G_CALLBACK(jabber_register_cancel_cb),
1009 purple_connection_get_account(js->gc), NULL, NULL, 1009 purple_connection_get_account(js->gc), NULL, NULL,
1010 PURPLE_REQUEST_HINT_REGISTER, cbdata); 1010 PURPLE_REQUEST_UI_HINT_REGISTER, cbdata);
1011 else { 1011 else {
1012 char *title = registered?g_strdup_printf(_("Change Account Registration at %s"), from) 1012 char *title = registered?g_strdup_printf(_("Change Account Registration at %s"), from)
1013 :g_strdup_printf(_("Register New Account at %s"), from); 1013 :g_strdup_printf(_("Register New Account at %s"), from);
1014 purple_request_fields_with_hint(js->gc, title, 1014 purple_request_fields_with_hint(js->gc, title,
1015 title, instructions, fields, 1015 title, instructions, fields,
1016 registered?_("Change Registration"):_("Register"), G_CALLBACK(jabber_register_cb), 1016 registered?_("Change Registration"):_("Register"), G_CALLBACK(jabber_register_cb),
1017 _("Cancel"), G_CALLBACK(jabber_register_cancel_cb), 1017 _("Cancel"), G_CALLBACK(jabber_register_cancel_cb),
1018 purple_connection_get_account(js->gc), NULL, NULL, 1018 purple_connection_get_account(js->gc), NULL, NULL,
1019 PURPLE_REQUEST_HINT_REGISTER, cbdata); 1019 PURPLE_REQUEST_UI_HINT_REGISTER, cbdata);
1020 g_free(title); 1020 g_free(title);
1021 } 1021 }
1022 1022
1023 g_free(instructions); 1023 g_free(instructions);
1024 } 1024 }
1710 purple_request_fields_with_hint(js->gc, _("Change XMPP Password"), 1710 purple_request_fields_with_hint(js->gc, _("Change XMPP Password"),
1711 _("Change XMPP Password"), _("Please enter your new password"), 1711 _("Change XMPP Password"), _("Please enter your new password"),
1712 fields, _("OK"), G_CALLBACK(jabber_password_change_cb), 1712 fields, _("OK"), G_CALLBACK(jabber_password_change_cb),
1713 _("Cancel"), NULL, 1713 _("Cancel"), NULL,
1714 purple_connection_get_account(gc), NULL, NULL, 1714 purple_connection_get_account(gc), NULL, NULL,
1715 PURPLE_REQUEST_HINT_ACCOUNT, js); 1715 PURPLE_REQUEST_UI_HINT_ACCOUNT, js);
1716 } 1716 }
1717 1717
1718 GList *jabber_actions(PurplePlugin *plugin, gpointer context) 1718 GList *jabber_actions(PurplePlugin *plugin, gpointer context)
1719 { 1719 {
1720 PurpleConnection *gc = (PurpleConnection *) context; 1720 PurpleConnection *gc = (PurpleConnection *) context;