/pidgin/main: e730d1a5f058: Rename pidgin_setup_screenname_autoc...

[Elliott Sales de Andrade]

Changeset: e730d1a5f0587432adab669e81b3b533ddb84a9b
Author:	 Elliott Sales de Andrade <qulogic at pidgin.im>
Date:	 2013-01-27 03:07 -0500
Branch:	 default
URL: http://hg.pidgin.im/pidgin/main/rev/e730d1a5f058

Description:

Rename pidgin_setup_screenname_autocomplete_with_filter to pidgin_setup_screenname_autocomplete.

Mark already removed the deprecated pidgin_setup_screenname_autocomplete
without the filter function parameter. Now we don't need the _with_filter
suffix.

Fixes #2943.

diffstat:

 ChangeLog.API       |  4 +++-
 pidgin/gtkconv.c    |  2 +-
 pidgin/gtkpounce.c  |  2 +-
 pidgin/gtkrequest.c |  2 +-
 pidgin/gtkutils.c   |  2 +-
 pidgin/gtkutils.h   |  2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)

diffs (81 lines):

diff --git a/ChangeLog.API b/ChangeLog.API
--- a/ChangeLog.API
+++ b/ChangeLog.API
@@ -107,6 +107,8 @@ version 3.0.0 (??/??/????):
 		  a GList
 		* purple_notify_user_info_prepend_pair renamed to
 		  purple_notify_user_info_prepend_pair_html
+		* pidgin_setup_screenname_autocomplete now takes a filter function and
+		  its data as final two arguments
 		* purple_srv_resolve now takes a PurpleAccount as the first parameter
 		* purple_str_size_to_units now takes a goffset as the size parameter
 		* purple_txt_resolve now takes a PurpleAccount as the first parameter
@@ -164,7 +166,7 @@ version 3.0.0 (??/??/????):
 		* PIDGIN_DIALOG
 		* pidgin_dialogs_alias_contact
 		* pidgin_set_custom_buddy_icon
-		* pidgin_setup_screenname_autocomplete
+		* pidgin_setup_screenname_autocomplete_with_filter
 		* PidginBuddyList.connection_errors
 		* PidginConversation.sg
 		* purple_account_add_buddies_with_invite
diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c
--- a/pidgin/gtkconv.c
+++ b/pidgin/gtkconv.c
@@ -1005,7 +1005,7 @@ invite_cb(GtkWidget *widget, PidginConve
 
 		/* Now the Buddy drop-down entry field. */
 		info->entry = gtk_entry_new();
-		pidgin_setup_screenname_autocomplete_with_filter(info->entry, NULL, chat_invite_filter,
+		pidgin_setup_screenname_autocomplete(info->entry, NULL, chat_invite_filter,
 				purple_conversation_get_account(conv));
 		gtk_table_attach_defaults(GTK_TABLE(table), info->entry, 1, 2, 0, 1);
 		gtk_label_set_mnemonic_widget(GTK_LABEL(label), info->entry);
diff --git a/pidgin/gtkpounce.c b/pidgin/gtkpounce.c
--- a/pidgin/gtkpounce.c
+++ b/pidgin/gtkpounce.c
@@ -601,7 +601,7 @@ pidgin_pounce_editor_show(PurpleAccount 
 
 	dialog->buddy_entry = gtk_entry_new();
 
-	pidgin_setup_screenname_autocomplete_with_filter(dialog->buddy_entry, dialog->account_menu, pidgin_screenname_autocomplete_default_filter, GINT_TO_POINTER(FALSE));
+	pidgin_setup_screenname_autocomplete(dialog->buddy_entry, dialog->account_menu, pidgin_screenname_autocomplete_default_filter, GINT_TO_POINTER(FALSE));
 
 	gtk_box_pack_start(GTK_BOX(hbox), dialog->buddy_entry, TRUE, TRUE, 0);
 	gtk_widget_show(dialog->buddy_entry);
diff --git a/pidgin/gtkrequest.c b/pidgin/gtkrequest.c
--- a/pidgin/gtkrequest.c
+++ b/pidgin/gtkrequest.c
@@ -844,7 +844,7 @@ setup_entry_field(GtkWidget *entry, Purp
 					}
 				}
 			}
-			pidgin_setup_screenname_autocomplete_with_filter(entry, optmenu, pidgin_screenname_autocomplete_default_filter, GINT_TO_POINTER(!strcmp(type_hint, "screenname-all")));
+			pidgin_setup_screenname_autocomplete(entry, optmenu, pidgin_screenname_autocomplete_default_filter, GINT_TO_POINTER(!strcmp(type_hint, "screenname-all")));
 		}
 	}
 }
diff --git a/pidgin/gtkutils.c b/pidgin/gtkutils.c
--- a/pidgin/gtkutils.c
+++ b/pidgin/gtkutils.c
@@ -2019,7 +2019,7 @@ repopulate_autocomplete(gpointer somethi
 }
 
 void
-pidgin_setup_screenname_autocomplete_with_filter(GtkWidget *entry, GtkWidget *accountopt, PidginFilterBuddyCompletionEntryFunc filter_func, gpointer user_data)
+pidgin_setup_screenname_autocomplete(GtkWidget *entry, GtkWidget *accountopt, PidginFilterBuddyCompletionEntryFunc filter_func, gpointer user_data)
 {
 	PidginCompletionData *data;
 
diff --git a/pidgin/gtkutils.h b/pidgin/gtkutils.h
--- a/pidgin/gtkutils.h
+++ b/pidgin/gtkutils.h
@@ -359,7 +359,7 @@ void pidgin_account_option_menu_set_sele
  *                    should be shown. This can be @c NULL.
  * @param user_data  The data to be passed to the filter_func function.
  */
-void pidgin_setup_screenname_autocomplete_with_filter(GtkWidget *entry, GtkWidget *optmenu, PidginFilterBuddyCompletionEntryFunc filter_func, gpointer user_data);
+void pidgin_setup_screenname_autocomplete(GtkWidget *entry, GtkWidget *optmenu, PidginFilterBuddyCompletionEntryFunc filter_func, gpointer user_data);
 
 /**
  * The default filter function for username autocomplete.