Group public API for account chooser together.

Tue, 13 Aug 2019 01:30:09 -0400

author
Elliott Sales de Andrade <qulogic@pidgin.im>
date
Tue, 13 Aug 2019 01:30:09 -0400
changeset 39789
7d58eccb27de
parent 39788
6e86cff44a34
child 39790
dd3fd44f3abb

Group public API for account chooser together.

pidgin/pidginaccountchooser.c file | annotate | diff | comparison | revisions
--- a/pidgin/pidginaccountchooser.c	Tue Aug 13 01:23:29 2019 -0400
+++ b/pidgin/pidginaccountchooser.c	Tue Aug 13 01:30:09 2019 -0400
@@ -88,12 +88,6 @@
 	}
 }
 
-PurpleAccount *
-pidgin_account_chooser_get_selected(GtkWidget *optmenu)
-{
-	return (PurpleAccount *)aop_option_menu_get_selected(optmenu);
-}
-
 static void
 set_account_menu(PidginAccountChooser *chooser, PurpleAccount *default_account,
                  PurpleFilterAccountFunc filter_func, gboolean show_all)
@@ -203,31 +197,6 @@
 	return FALSE;
 }
 
-void
-pidgin_account_chooser_set_selected(GtkWidget *optmenu, PurpleAccount *account)
-{
-	aop_option_menu_select_by_data(optmenu, account);
-}
-
-GtkWidget *
-pidgin_account_chooser_new(PurpleAccount *default_account, gboolean show_all,
-                           PurpleFilterAccountFunc filter_func)
-{
-	GtkWidget *chooser = NULL;
-
-	/* Create the option menu */
-	chooser = g_object_new(PIDGIN_TYPE_ACCOUNT_CHOOSER, NULL);
-	set_account_menu(PIDGIN_ACCOUNT_CHOOSER(chooser), default_account,
-	                 filter_func, show_all);
-
-	/* Set some data. */
-	g_object_set_data(G_OBJECT(chooser), "show_all",
-	                  GINT_TO_POINTER(show_all));
-	g_object_set_data(G_OBJECT(chooser), "filter_func", filter_func);
-
-	return chooser;
-}
-
 /******************************************************************************
  * GObject implementation
  *****************************************************************************/
@@ -265,3 +234,37 @@
 	        purple_accounts_get_handle(), "account-removed", chooser,
 	        PURPLE_CALLBACK(account_menu_added_removed_cb), chooser);
 }
+
+/******************************************************************************
+ * Public API
+ *****************************************************************************/
+GtkWidget *
+pidgin_account_chooser_new(PurpleAccount *default_account, gboolean show_all,
+                           PurpleFilterAccountFunc filter_func)
+{
+	GtkWidget *chooser = NULL;
+
+	/* Create the option menu */
+	chooser = g_object_new(PIDGIN_TYPE_ACCOUNT_CHOOSER, NULL);
+	set_account_menu(PIDGIN_ACCOUNT_CHOOSER(chooser), default_account,
+	                 filter_func, show_all);
+
+	/* Set some data. */
+	g_object_set_data(G_OBJECT(chooser), "show_all",
+	                  GINT_TO_POINTER(show_all));
+	g_object_set_data(G_OBJECT(chooser), "filter_func", filter_func);
+
+	return chooser;
+}
+
+PurpleAccount *
+pidgin_account_chooser_get_selected(GtkWidget *optmenu)
+{
+	return (PurpleAccount *)aop_option_menu_get_selected(optmenu);
+}
+
+void
+pidgin_account_chooser_set_selected(GtkWidget *optmenu, PurpleAccount *account)
+{
+	aop_option_menu_select_by_data(optmenu, account);
+}

mercurial