comparison libpurple/request.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

				   PurpleAccount *account, const char *who, PurpleConversation *conv,
				   void *user_data)
{
	return purple_request_input_with_hint(
		handle, title, primary, secondary, default_value, multiline, masked, hint, ok_text, ok_cb,
		cancel_text, cancel_cb, account, who, conv, PURPLE_REQUEST_HINT_BLIST, user_data);
}

void *
purple_request_input_with_hint(void *handle, const char *title, const char *primary,
				   const char *secondary, const char *default_value,

	va_start(args, user_data);
	ui_handle = purple_request_choice_varg_with_hint(handle, title, primary, secondary,
					     default_value, ok_text, ok_cb,
					     cancel_text, cancel_cb,
					     account, who, conv, PURPLE_REQUEST_HINT_BLIST, user_data, args);
	va_end(args);

	return ui_handle;
}

			 PurpleAccount *account, const char *who, PurpleConversation *conv,
			 void *user_data, va_list choices)
{
	return purple_request_choice_varg_with_hint(
		handle, title, primary, secondary, default_value, ok_text, ok_cb,
		cancel_text, cancel_cb, account, who, conv, PURPLE_REQUEST_HINT_BLIST, user_data, choices);
}

void *
purple_request_choice_varg_with_hint(void *handle, const char *title,
			 const char *primary, const char *secondary,

	g_return_val_if_fail(action_count > 0, NULL);

	va_start(args, action_count);
	ui_handle = purple_request_action_varg_with_hint(handle, title, primary, secondary,
										 default_action, account, who, conv,
										 PURPLE_REQUEST_HINT_BLIST, user_data, action_count, args);
	va_end(args);

	return ui_handle;
}

						 PurpleAccount *account, const char *who, PurpleConversation *conv,
						 void *user_data, size_t action_count, va_list actions)
{
	return purple_request_action_varg_with_hint(
		handle, title, primary, secondary, default_action, account, who, conv,
		PURPLE_REQUEST_HINT_BLIST, user_data, action_count, actions);
}

void *
purple_request_action_varg_with_hint(void *handle, const char *title,
						 const char *primary, const char *secondary,

					PurpleAccount *account, const char *who, PurpleConversation *conv,
					void *user_data)
{
	return purple_request_fields_with_hint(
		handle, title, primary, secondary, fields, ok_text, ok_cb,
		cancel_text, cancel_cb, account, who, conv, PURPLE_REQUEST_HINT_BLIST, user_data);
}

void *
purple_request_fields_with_hint(void *handle, const char *title, const char *primary,
					const char *secondary, PurpleRequestFields *fields,

				  GCallback ok_cb, GCallback cancel_cb,
				  PurpleAccount *account, const char *who, PurpleConversation *conv,
				  void *user_data)
{
	return purple_request_file_with_hint(
		handle, title, filename, savedialog, ok_cb, cancel_cb, account, who, conv, PURPLE_REQUEST_HINT_BLIST, user_data);
}

void *
purple_request_file_with_hint(void *handle, const char *title, const char *filename,
				  gboolean savedialog,

				  GCallback ok_cb, GCallback cancel_cb,
				  PurpleAccount *account, const char *who, PurpleConversation *conv,
				  void *user_data)
{
	return purple_request_folder_with_hint(
		handle, title, dirname, ok_cb, cancel_cb, account, who, conv, PURPLE_REQUEST_HINT_BLIST, user_data);
}

void *
purple_request_folder_with_hint(void *handle, const char *title, const char *dirname,
				  GCallback ok_cb, GCallback cancel_cb,

21244:a20ef7180680

				   PurpleAccount *account, const char *who, PurpleConversation *conv,
				   void *user_data)
{
	return purple_request_input_with_hint(
		handle, title, primary, secondary, default_value, multiline, masked, hint, ok_text, ok_cb,
		cancel_text, cancel_cb, account, who, conv, PURPLE_REQUEST_UI_HINT_BLIST, user_data);
}

void *
purple_request_input_with_hint(void *handle, const char *title, const char *primary,
				   const char *secondary, const char *default_value,

	va_start(args, user_data);
	ui_handle = purple_request_choice_varg_with_hint(handle, title, primary, secondary,
					     default_value, ok_text, ok_cb,
					     cancel_text, cancel_cb,
					     account, who, conv, PURPLE_REQUEST_UI_HINT_BLIST, user_data, args);
	va_end(args);

	return ui_handle;
}

			 PurpleAccount *account, const char *who, PurpleConversation *conv,
			 void *user_data, va_list choices)
{
	return purple_request_choice_varg_with_hint(
		handle, title, primary, secondary, default_value, ok_text, ok_cb,
		cancel_text, cancel_cb, account, who, conv, PURPLE_REQUEST_UI_HINT_BLIST, user_data, choices);
}

void *
purple_request_choice_varg_with_hint(void *handle, const char *title,
			 const char *primary, const char *secondary,

	g_return_val_if_fail(action_count > 0, NULL);

	va_start(args, action_count);
	ui_handle = purple_request_action_varg_with_hint(handle, title, primary, secondary,
										 default_action, account, who, conv,
										 PURPLE_REQUEST_UI_HINT_BLIST, user_data, action_count, args);
	va_end(args);

	return ui_handle;
}

						 PurpleAccount *account, const char *who, PurpleConversation *conv,
						 void *user_data, size_t action_count, va_list actions)
{
	return purple_request_action_varg_with_hint(
		handle, title, primary, secondary, default_action, account, who, conv,
		PURPLE_REQUEST_UI_HINT_BLIST, user_data, action_count, actions);
}

void *
purple_request_action_varg_with_hint(void *handle, const char *title,
						 const char *primary, const char *secondary,

					PurpleAccount *account, const char *who, PurpleConversation *conv,
					void *user_data)
{
	return purple_request_fields_with_hint(
		handle, title, primary, secondary, fields, ok_text, ok_cb,
		cancel_text, cancel_cb, account, who, conv, PURPLE_REQUEST_UI_HINT_BLIST, user_data);
}

void *
purple_request_fields_with_hint(void *handle, const char *title, const char *primary,
					const char *secondary, PurpleRequestFields *fields,

				  GCallback ok_cb, GCallback cancel_cb,
				  PurpleAccount *account, const char *who, PurpleConversation *conv,
				  void *user_data)
{
	return purple_request_file_with_hint(
		handle, title, filename, savedialog, ok_cb, cancel_cb, account, who, conv, PURPLE_REQUEST_UI_HINT_BLIST, user_data);
}

void *
purple_request_file_with_hint(void *handle, const char *title, const char *filename,
				  gboolean savedialog,

				  GCallback ok_cb, GCallback cancel_cb,
				  PurpleAccount *account, const char *who, PurpleConversation *conv,
				  void *user_data)
{
	return purple_request_folder_with_hint(
		handle, title, dirname, ok_cb, cancel_cb, account, who, conv, PURPLE_REQUEST_UI_HINT_BLIST, user_data);
}

void *
purple_request_folder_with_hint(void *handle, const char *title, const char *dirname,
				  GCallback ok_cb, GCallback cancel_cb,