comparison pidgin/gtkblist.c @ 21244:a20ef7180680

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.

21243:6402252be3c8

	if (i > 1)
	{
		char *msg = g_strdup_printf(ngettext("You have %d contact named %s. Would you like to merge them?", "You currently have %d contacts named %s. Would you like to merge them?", i), i, alias);
		purple_request_action_with_hint(NULL, NULL, msg, _("Merging these contacts will cause them to share a single entry on the buddy list and use a single conversation window. "
							 "You can separate them again by choosing 'Expand' from the contact's context menu"), 0, NULL, NULL, NULL,
				      PURPLE_REQUEST_HINT_BLIST, merges, 2, _("_Merge"), PURPLE_CALLBACK(gtk_blist_do_personize), _("_Cancel"), PURPLE_CALLBACK(g_list_free));
		g_free(msg);
	} else
		g_list_free(merges);
}

	text = g_hash_table_lookup(gtkblist->connection_errors, account);

	enabled = purple_account_get_enabled(account, purple_core_get_ui());
	purple_request_action_with_hint(account, _("Connection Error"), primary, text, 2,
						account, NULL, NULL,
						PURPLE_REQUEST_HINT_ACCOUNT, account, 3,
						_("OK"), NULL,
						_("Modify Account"), PURPLE_CALLBACK(ce_modify_account_cb),
						enabled ? _("Connect") : _("Re-enable Account"),
						enabled ? PURPLE_CALLBACK(purple_account_connect) :
									PURPLE_CALLBACK(ce_enable_account_cb));

					   _("Please enter the name of the group to be added."),
					   NULL, FALSE, FALSE, NULL,
					   _("Add"), G_CALLBACK(add_group_cb),
					   _("Cancel"), NULL,
					   NULL, NULL, NULL,
					   PURPLE_REQUEST_HINT_BLIST, NULL);
}

void
pidgin_blist_toggle_visibility()
{

21244:a20ef7180680

	if (i > 1)
	{
		char *msg = g_strdup_printf(ngettext("You have %d contact named %s. Would you like to merge them?", "You currently have %d contacts named %s. Would you like to merge them?", i), i, alias);
		purple_request_action_with_hint(NULL, NULL, msg, _("Merging these contacts will cause them to share a single entry on the buddy list and use a single conversation window. "
							 "You can separate them again by choosing 'Expand' from the contact's context menu"), 0, NULL, NULL, NULL,
				      PURPLE_REQUEST_UI_HINT_BLIST, merges, 2, _("_Merge"), PURPLE_CALLBACK(gtk_blist_do_personize), _("_Cancel"), PURPLE_CALLBACK(g_list_free));
		g_free(msg);
	} else
		g_list_free(merges);
}

	text = g_hash_table_lookup(gtkblist->connection_errors, account);

	enabled = purple_account_get_enabled(account, purple_core_get_ui());
	purple_request_action_with_hint(account, _("Connection Error"), primary, text, 2,
						account, NULL, NULL,
						PURPLE_REQUEST_UI_HINT_ACCOUNT, account, 3,
						_("OK"), NULL,
						_("Modify Account"), PURPLE_CALLBACK(ce_modify_account_cb),
						enabled ? _("Connect") : _("Re-enable Account"),
						enabled ? PURPLE_CALLBACK(purple_account_connect) :
									PURPLE_CALLBACK(ce_enable_account_cb));

					   _("Please enter the name of the group to be added."),
					   NULL, FALSE, FALSE, NULL,
					   _("Add"), G_CALLBACK(add_group_cb),
					   _("Cancel"), NULL,
					   NULL, NULL, NULL,
					   PURPLE_REQUEST_UI_HINT_BLIST, NULL);
}

void
pidgin_blist_toggle_visibility()
{