# HG changeset patch
# User Christian Hammond <chipx86@chipx86.com>
# Date 1064878742 0
# Node ID feb3d21a7794c149cf1d1337f9ef603e12e1bf50
# Parent  f7ff0dfa6b9f52c7f46bf5bae4a375771c3f08ae
[gaim-migrate @ 7598]
Standardized the UI op accessor functions in every file. They're now
properly namespaced.

committer: Tailor Script <tailor@pidgin.im>

diff -r f7ff0dfa6b9f -r feb3d21a7794 src/blist.c
--- a/src/blist.c	Mon Sep 29 22:56:15 2003 +0000
+++ b/src/blist.c	Mon Sep 29 23:39:02 2003 +0000
@@ -151,7 +151,7 @@
 {
 	struct gaim_buddy_list *gbl = g_new0(struct gaim_buddy_list, 1);
 
-	gbl->ui_ops = gaim_get_blist_ui_ops();
+	gbl->ui_ops = gaim_blist_get_ui_ops();
 
 	gbl->buddies = g_hash_table_new_full((GHashFunc)_gaim_blist_hbuddy_hash,
 					 (GEqualFunc)_gaim_blist_hbuddy_equal,
@@ -450,7 +450,7 @@
 
 	((GaimBlistNode*)chat)->type = GAIM_BLIST_CHAT_NODE;
 
-	ops = gaim_get_blist_ui_ops();
+	ops = gaim_blist_get_ui_ops();
 
 	if (ops != NULL && ops->new_node != NULL)
 		ops->new_node((GaimBlistNode *)chat);
@@ -497,7 +497,7 @@
 	b->settings = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
 	((GaimBlistNode*)b)->type = GAIM_BLIST_BUDDY_NODE;
 
-	ops = gaim_get_blist_ui_ops();
+	ops = gaim_blist_get_ui_ops();
 
 	if (ops != NULL && ops->new_node != NULL)
 		ops->new_node((GaimBlistNode *)b);
@@ -746,7 +746,7 @@
 
 	c->totalsize = c->currentsize = c->online = 0;
 
-	ops = gaim_get_blist_ui_ops();
+	ops = gaim_blist_get_ui_ops();
 	if (ops != NULL && ops->new_node != NULL)
 		ops->new_node((GaimBlistNode *)c);
 
@@ -783,7 +783,7 @@
 				g_free, g_free);
 		((GaimBlistNode*)g)->type = GAIM_BLIST_GROUP_NODE;
 
-		ops = gaim_get_blist_ui_ops();
+		ops = gaim_blist_get_ui_ops();
 
 		if (ops != NULL && ops->new_node != NULL)
 			ops->new_node((GaimBlistNode *)g);
@@ -2548,17 +2548,6 @@
 	return g_strdup(g_hash_table_lookup(b->settings, key));
 }
 
-void gaim_set_blist_ui_ops(struct gaim_blist_ui_ops *ops)
-{
-	blist_ui_ops = ops;
-}
-
-struct gaim_blist_ui_ops *
-gaim_get_blist_ui_ops(void)
-{
-	return blist_ui_ops;
-}
-
 int gaim_blist_get_group_size(GaimGroup *group, gboolean offline) {
 	if(!group)
 		return 0;
@@ -2573,6 +2562,19 @@
 	return group->online;
 }
 
+void
+gaim_blist_set_ui_ops(struct gaim_blist_ui_ops *ops)
+{
+	blist_ui_ops = ops;
+}
+
+struct gaim_blist_ui_ops *
+gaim_blist_get_ui_ops(void)
+{
+	return blist_ui_ops;
+}
+
+
 void *
 gaim_blist_get_handle(void)
 {
diff -r f7ff0dfa6b9f -r feb3d21a7794 src/blist.h
--- a/src/blist.h	Mon Sep 29 22:56:15 2003 +0000
+++ b/src/blist.h	Mon Sep 29 23:39:02 2003 +0000
@@ -735,14 +735,14 @@
  *
  * @param ops The ops struct.
  */
-void gaim_set_blist_ui_ops(struct gaim_blist_ui_ops *ops);
+void gaim_blist_set_ui_ops(struct gaim_blist_ui_ops *ops);
 
 /**
  * Returns the UI operations structure to be used for the buddy list.
  *
  * @return The UI operations structure.
  */
-struct gaim_blist_ui_ops *gaim_get_blist_ui_ops(void);
+struct gaim_blist_ui_ops *gaim_blist_get_ui_ops(void);
 
 /*@}*/
 
diff -r f7ff0dfa6b9f -r feb3d21a7794 src/connection.c
--- a/src/connection.c	Mon Sep 29 22:56:15 2003 +0000
+++ b/src/connection.c	Mon Sep 29 23:39:02 2003 +0000
@@ -109,7 +109,7 @@
 	gaim_debug(GAIM_DEBUG_INFO, "connection",
 			"Registering.  gc = %p\n", gc);
 
-	ops = gaim_get_connection_ui_ops();
+	ops = gaim_connections_get_ui_ops();
 
 	if (gc->prpl != NULL)
 	        prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl);
@@ -157,7 +157,7 @@
 	gaim_debug(GAIM_DEBUG_INFO, "connection",
 			   "Connecting. gc = %p\n", gc);
 
-	ops = gaim_get_connection_ui_ops();
+	ops = gaim_connections_get_ui_ops();
 
 	if (gc->prpl != NULL)
 	        prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl);
@@ -295,7 +295,7 @@
 
 	gc->state = state;
 
-	ops = gaim_get_connection_ui_ops();
+	ops = gaim_connections_get_ui_ops();
 
 	if (gc->state == GAIM_CONNECTING) {
 		connections_connecting = g_list_append(connections_connecting, gc);
@@ -436,7 +436,7 @@
 	g_return_if_fail(step < count);
 	g_return_if_fail(count > 1);
 
-	ops = gaim_get_connection_ui_ops();
+	ops = gaim_connections_get_ui_ops();
 
 	if (ops != NULL && ops->connect_progress != NULL)
 		ops->connect_progress(gc, text, step, count);
@@ -450,7 +450,7 @@
 	g_return_if_fail(gc   != NULL);
 	g_return_if_fail(text != NULL);
 
-	ops = gaim_get_connection_ui_ops();
+	ops = gaim_connections_get_ui_ops();
 
 	if (ops != NULL && ops->notice != NULL)
 		ops->notice(gc, text);
@@ -468,7 +468,7 @@
 	if (gc->disconnect_timeout)
 		return;
 
-	ops = gaim_get_connection_ui_ops();
+	ops = gaim_connections_get_ui_ops();
 
 	if (ops != NULL) {
 		if (ops->report_disconnect != NULL)
@@ -508,6 +508,18 @@
 }
 
 void
+gaim_connections_set_ui_ops(GaimConnectionUiOps *ops)
+{
+	connection_ui_ops = ops;
+}
+
+GaimConnectionUiOps *
+gaim_connections_get_ui_ops(void)
+{
+	return connection_ui_ops;
+}
+
+void
 gaim_connections_init(void)
 {
 	void *handle = gaim_connections_get_handle();
@@ -544,15 +556,3 @@
 {
 	return &connections_handle;
 }
-
-void
-gaim_set_connection_ui_ops(GaimConnectionUiOps *ops)
-{
-	connection_ui_ops = ops;
-}
-
-GaimConnectionUiOps *
-gaim_get_connection_ui_ops(void)
-{
-	return connection_ui_ops;
-}
diff -r f7ff0dfa6b9f -r feb3d21a7794 src/connection.h
--- a/src/connection.h	Mon Sep 29 22:56:15 2003 +0000
+++ b/src/connection.h	Mon Sep 29 23:39:02 2003 +0000
@@ -262,14 +262,14 @@
  *
  * @param ops The UI operations structure.
  */
-void gaim_set_connection_ui_ops(GaimConnectionUiOps *ops);
+void gaim_connections_set_ui_ops(GaimConnectionUiOps *ops);
 
 /**
  * Returns the UI operations structure used for connections.
  *
  * @return The UI operations structure in use.
  */
-GaimConnectionUiOps *gaim_get_connection_ui_ops(void);
+GaimConnectionUiOps *gaim_connections_get_ui_ops(void);
 
 /*@}*/
 
diff -r f7ff0dfa6b9f -r feb3d21a7794 src/conversation.c
--- a/src/conversation.c	Mon Sep 29 22:56:15 2003 +0000
+++ b/src/conversation.c	Mon Sep 29 23:39:02 2003 +0000
@@ -371,7 +371,7 @@
 
 	windows = g_list_append(windows, win);
 
-	win->ui_ops = gaim_get_win_ui_ops();
+	win->ui_ops = gaim_conversations_get_win_ui_ops();
 
 	if (win->ui_ops != NULL && win->ui_ops->new_window != NULL)
 		win->ui_ops->new_window(win);
@@ -2495,13 +2495,13 @@
 }
 
 void
-gaim_set_win_ui_ops(GaimWindowUiOps *ops)
+gaim_conversations_set_win_ui_ops(GaimWindowUiOps *ops)
 {
 	win_ui_ops = ops;
 }
 
 GaimWindowUiOps *
-gaim_get_win_ui_ops(void)
+gaim_conversations_get_win_ui_ops(void)
 {
 	return win_ui_ops;
 }
diff -r f7ff0dfa6b9f -r feb3d21a7794 src/conversation.h
--- a/src/conversation.h	Mon Sep 29 22:56:15 2003 +0000
+++ b/src/conversation.h	Mon Sep 29 23:39:02 2003 +0000
@@ -1241,7 +1241,7 @@
  *
  * @param ops The UI operations structure.
  */
-void gaim_set_win_ui_ops(GaimWindowUiOps *ops);
+void gaim_conversations_set_win_ui_ops(GaimWindowUiOps *ops);
 
 /**
  * Returns the gaim window UI operations structure to be used in
@@ -1249,7 +1249,7 @@
  *
  * @return A filled-out GaimWindowUiOps structure.
  */
-GaimWindowUiOps *gaim_get_win_ui_ops(void);
+GaimWindowUiOps *gaim_conversations_get_win_ui_ops(void);
 
 /*@}*/
 
diff -r f7ff0dfa6b9f -r feb3d21a7794 src/core.c
--- a/src/core.c	Mon Sep 29 22:56:15 2003 +0000
+++ b/src/core.c	Mon Sep 29 23:39:02 2003 +0000
@@ -60,7 +60,7 @@
 	core->ui = g_strdup(ui);
 	core->reserved = NULL;
 
-	ops = gaim_get_core_ui_ops();
+	ops = gaim_core_get_ui_ops();
 
 	/* The signals subsystem is important and should be first. */
 	gaim_signals_init();
@@ -106,7 +106,7 @@
 
 	g_return_if_fail(core != NULL);
 
-	ops = gaim_get_core_ui_ops();
+	ops = gaim_core_get_ui_ops();
 
 	if (ops != NULL && ops->quit != NULL)
 		ops->quit();
@@ -173,13 +173,13 @@
 }
 
 void
-gaim_set_core_ui_ops(GaimCoreUiOps *ops)
+gaim_core_set_ui_ops(GaimCoreUiOps *ops)
 {
 	_ops = ops;
 }
 
 GaimCoreUiOps *
-gaim_get_core_ui_ops(void)
+gaim_core_get_ui_ops(void)
 {
 	return _ops;
 }
diff -r f7ff0dfa6b9f -r feb3d21a7794 src/core.h
--- a/src/core.h	Mon Sep 29 22:56:15 2003 +0000
+++ b/src/core.h	Mon Sep 29 23:39:02 2003 +0000
@@ -92,14 +92,14 @@
  *
  * @param A UI ops structure for the core.
  */
-void gaim_set_core_ui_ops(GaimCoreUiOps *ops);
+void gaim_core_set_ui_ops(GaimCoreUiOps *ops);
 
 /**
  * Returns the UI ops for the core.
  *
  * @return The core's UI ops structure.
  */
-GaimCoreUiOps *gaim_get_core_ui_ops(void);
+GaimCoreUiOps *gaim_core_get_ui_ops(void);
 
 #ifdef __cplusplus
 }
diff -r f7ff0dfa6b9f -r feb3d21a7794 src/debug.c
--- a/src/debug.c	Mon Sep 29 22:56:15 2003 +0000
+++ b/src/debug.c	Mon Sep 29 23:39:02 2003 +0000
@@ -35,7 +35,7 @@
 	g_return_if_fail(level != GAIM_DEBUG_ALL);
 	g_return_if_fail(format != NULL);
 
-	ops = gaim_get_debug_ui_ops();
+	ops = gaim_debug_get_ui_ops();
 
 	if (ops != NULL && ops->print != NULL)
 		ops->print(level, category, format, args);
@@ -116,13 +116,13 @@
 }
 
 void
-gaim_set_debug_ui_ops(GaimDebugUiOps *ops)
+gaim_debug_set_ui_ops(GaimDebugUiOps *ops)
 {
 	debug_ui_ops = ops;
 }
 
 GaimDebugUiOps *
-gaim_get_debug_ui_ops(void)
+gaim_debug_get_ui_ops(void)
 {
 	return debug_ui_ops;
 }
diff -r f7ff0dfa6b9f -r feb3d21a7794 src/debug.h
--- a/src/debug.h	Mon Sep 29 22:56:15 2003 +0000
+++ b/src/debug.h	Mon Sep 29 23:39:02 2003 +0000
@@ -159,7 +159,7 @@
  *
  * @param ops The UI operations structure.
  */
-void gaim_set_debug_ui_ops(GaimDebugUiOps *ops);
+void gaim_debug_set_ui_ops(GaimDebugUiOps *ops);
 
 /**
  * Returns the UI operations structure used when outputting debug
@@ -167,7 +167,7 @@
  *
  * @return The UI operations structure in use.
  */
-GaimDebugUiOps *gaim_get_debug_ui_ops(void);
+GaimDebugUiOps *gaim_debug_get_ui_ops(void);
 
 /*@}*/
 
diff -r f7ff0dfa6b9f -r feb3d21a7794 src/ft.c
--- a/src/ft.c	Mon Sep 29 22:56:15 2003 +0000
+++ b/src/ft.c	Mon Sep 29 23:39:02 2003 +0000
@@ -43,7 +43,7 @@
 	xfer->type    = type;
 	xfer->account = account;
 	xfer->who     = g_strdup(who);
-	xfer->ui_ops  = gaim_get_xfer_ui_ops();
+	xfer->ui_ops  = gaim_xfers_get_ui_ops();
 
 	xfer->local_ip = g_strdup(gaim_xfers_get_ip_for_account(account));
 
@@ -90,7 +90,7 @@
 	g_return_if_fail(xfer != NULL);
 	g_return_if_fail(xfer->ops.init != NULL);
 
-	ui_ops = gaim_get_xfer_ui_ops();
+	ui_ops = gaim_xfers_get_ui_ops();
 
 	if (ui_ops == NULL || ui_ops->request_file == NULL)
 		return;
@@ -766,15 +766,13 @@
 }
 
 void
-gaim_set_xfer_ui_ops(GaimXferUiOps *ops)
+gaim_xfers_set_ui_ops(GaimXferUiOps *ops)
 {
-	g_return_if_fail(ops != NULL);
-
 	xfer_ui_ops = ops;
 }
 
 GaimXferUiOps *
-gaim_get_xfer_ui_ops(void)
+gaim_xfers_get_ui_ops(void)
 {
 	return xfer_ui_ops;
 }
diff -r f7ff0dfa6b9f -r feb3d21a7794 src/ft.h
--- a/src/ft.h	Mon Sep 29 22:56:15 2003 +0000
+++ b/src/ft.h	Mon Sep 29 23:39:02 2003 +0000
@@ -533,14 +533,14 @@
  *
  * @param ops The UI operations structure.
  */
-void gaim_set_xfer_ui_ops(GaimXferUiOps *ops);
+void gaim_xfers_set_ui_ops(GaimXferUiOps *ops);
 
 /**
  * Returns the UI operations structure to be used in all gaim file transfers.
  *
  * @return The UI operations structure.
  */
-GaimXferUiOps *gaim_get_xfer_ui_ops(void);
+GaimXferUiOps *gaim_xfers_get_ui_ops(void);
 
 /*@}*/
 
diff -r f7ff0dfa6b9f -r feb3d21a7794 src/gtkblist.h
--- a/src/gtkblist.h	Mon Sep 29 22:56:15 2003 +0000
+++ b/src/gtkblist.h	Mon Sep 29 23:39:02 2003 +0000
@@ -77,7 +77,7 @@
 
 #define GAIM_GTK_BLIST(list) ((struct gaim_gtk_buddy_list *)(list)->ui_data)
 #define GAIM_IS_GTK_BLIST(list) \
-	((list)->ui_ops == gaim_get_gtk_blist_ui_ops())
+	((list)->ui_ops == gaim_gtk_blist_get_ui_ops())
 
 /**************************************************************************
  * @name GTK+ Buddy List API
@@ -93,7 +93,7 @@
  *
  * @return The GTK list operations structure.
  */
-struct gaim_blist_ui_ops *gaim_get_gtk_blist_ui_ops(void);
+struct gaim_blist_ui_ops *gaim_gtk_blist_get_ui_ops(void);
 
 /**
  * Returns the base image to represent the account, based on the currently selected theme
diff -r f7ff0dfa6b9f -r feb3d21a7794 src/gtkconn.c
--- a/src/gtkconn.c	Mon Sep 29 22:56:15 2003 +0000
+++ b/src/gtkconn.c	Mon Sep 29 23:39:02 2003 +0000
@@ -289,12 +289,12 @@
 	gaim_gtk_connection_report_disconnect
 };
 
-GaimConnectionUiOps *gaim_get_gtk_connection_ui_ops(void)
+GaimConnectionUiOps *
+gaim_gtk_connections_get_ui_ops(void)
 {
 	return &conn_ui_ops;
 }
 
-
 void away_on_login(const char *mesg)
 {
 	GSList *awy = away_messages;
diff -r f7ff0dfa6b9f -r feb3d21a7794 src/gtkconn.h
--- a/src/gtkconn.h	Mon Sep 29 22:56:15 2003 +0000
+++ b/src/gtkconn.h	Mon Sep 29 23:39:02 2003 +0000
@@ -33,7 +33,7 @@
  *
  * @return UI operations struct
  */
-GaimConnectionUiOps *gaim_get_gtk_connection_ui_ops(void);
+GaimConnectionUiOps *gaim_gtk_connections_get_ui_ops(void);
 
 /*@}*/
 
diff -r f7ff0dfa6b9f -r feb3d21a7794 src/gtkconv.c
--- a/src/gtkconv.c	Mon Sep 29 22:56:15 2003 +0000
+++ b/src/gtkconv.c	Mon Sep 29 23:39:02 2003 +0000
@@ -3686,12 +3686,6 @@
 /**************************************************************************
  * GTK+ window ops
  **************************************************************************/
-static GaimConversationUiOps *
-gaim_gtk_get_conversation_ui_ops(void)
-{
-	return gaim_get_gtk_conversation_ui_ops();
-}
-
 static void
 gaim_gtk_new_window(GaimWindow *win)
 {
@@ -4108,7 +4102,7 @@
 
 static GaimWindowUiOps window_ui_ops =
 {
-	gaim_gtk_get_conversation_ui_ops,
+	gaim_gtk_conversations_get_conv_ui_ops,
 	gaim_gtk_new_window,
 	gaim_gtk_destroy_window,
 	gaim_gtk_show,
@@ -4184,7 +4178,7 @@
 }
 
 GaimWindowUiOps *
-gaim_get_gtk_window_ui_ops(void)
+gaim_gtk_conversations_get_win_ui_ops(void)
 {
 	return &window_ui_ops;
 }
@@ -5122,7 +5116,7 @@
 };
 
 GaimConversationUiOps *
-gaim_get_gtk_conversation_ui_ops(void)
+gaim_gtk_conversations_get_conv_ui_ops(void)
 {
 	return &conversation_ui_ops;
 }
@@ -6020,7 +6014,7 @@
 }
 
 void
-gaim_gtk_conversation_init(void)
+gaim_gtk_conversations_init(void)
 {
 	/* Conversations */
 	gaim_prefs_add_none("/gaim/gtk/conversations");
diff -r f7ff0dfa6b9f -r feb3d21a7794 src/gtkconv.h
--- a/src/gtkconv.h	Mon Sep 29 22:56:15 2003 +0000
+++ b/src/gtkconv.h	Mon Sep 29 23:39:02 2003 +0000
@@ -203,10 +203,11 @@
 	((GaimGtkConversation *)(conv)->ui_data)
 
 #define GAIM_IS_GTK_WINDOW(win) \
-	(gaim_window_get_ui_ops(win) == gaim_get_gtk_window_ui_ops())
+	(gaim_window_get_ui_ops(win) == gaim_gtk_conversations_get_win_ui_ops())
 
 #define GAIM_IS_GTK_CONVERSATION(conv) \
-	(gaim_conversation_get_ui_ops(conv) == gaim_get_gtk_conversation_ui_ops())
+	(gaim_conversation_get_ui_ops(conv) == \
+	 gaim_gtk_conversations_get_conv_ui_ops())
 
 /*@}*/
 
@@ -218,21 +219,21 @@
 /**
  * Initializes the GTK+ conversation system.
  */
-void gaim_gtk_conversation_init(void);
+void gaim_gtk_conversations_init(void);
 
 /**
  * Returns the UI operations structure for GTK windows.
  *
  * @return The GTK window operations structure.
  */
-GaimWindowUiOps *gaim_get_gtk_window_ui_ops(void);
+GaimWindowUiOps *gaim_gtk_conversations_get_win_ui_ops(void);
 
 /**
  * Returns the UI operations structure for GTK conversations.
  *
  * @return The GTK conversation operations structure.
  */
-GaimConversationUiOps *gaim_get_gtk_conversation_ui_ops(void);
+GaimConversationUiOps *gaim_gtk_conversations_get_conv_ui_ops(void);
 
 /**
  * Updates the buddy icon on a conversation.
diff -r f7ff0dfa6b9f -r feb3d21a7794 src/gtkdebug.c
--- a/src/gtkdebug.c	Mon Sep 29 22:56:15 2003 +0000
+++ b/src/gtkdebug.c	Mon Sep 29 23:39:02 2003 +0000
@@ -341,7 +341,7 @@
 };
 
 GaimDebugUiOps *
-gaim_get_gtk_debug_ui_ops(void)
+gaim_gtk_debug_get_ui_ops(void)
 {
 	return &ops;
 }
diff -r f7ff0dfa6b9f -r feb3d21a7794 src/gtkdebug.h
--- a/src/gtkdebug.h	Mon Sep 29 22:56:15 2003 +0000
+++ b/src/gtkdebug.h	Mon Sep 29 23:39:02 2003 +0000
@@ -5,7 +5,7 @@
  * gaim
  *
  * Copyright (C) 2003 Christian Hammond <chipx86@gnupdate.org>
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -45,6 +45,6 @@
  *
  * @return The GTK UI debug operations structure.
  */
-GaimDebugUiOps *gaim_get_gtk_debug_ui_ops(void);
+GaimDebugUiOps *gaim_gtk_debug_get_ui_ops(void);
 
 #endif /* _GAIM_GTK_DEBUG_H_ */
diff -r f7ff0dfa6b9f -r feb3d21a7794 src/gtkft.c
--- a/src/gtkft.c	Mon Sep 29 22:56:15 2003 +0000
+++ b/src/gtkft.c	Mon Sep 29 23:39:02 2003 +0000
@@ -5,7 +5,7 @@
  * gaim
  *
  * Copyright (C) 2003 Christian Hammond <chipx86@gnupdate.org>
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -1200,7 +1200,7 @@
 }
 
 GaimXferUiOps *
-gaim_get_gtk_xfer_ui_ops(void)
+gaim_gtk_xfers_get_ui_ops(void)
 {
 	return &ops;
 }
diff -r f7ff0dfa6b9f -r feb3d21a7794 src/gtkft.h
--- a/src/gtkft.h	Mon Sep 29 22:56:15 2003 +0000
+++ b/src/gtkft.h	Mon Sep 29 23:39:02 2003 +0000
@@ -5,7 +5,7 @@
  * gaim
  *
  * Copyright (C) 2003 Christian Hammond <chipx86@gnupdate.org>
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -27,7 +27,7 @@
 
 /**
  * A file transfer dialog.
- * 
+ *
  * The structure is opaque, as nobody should be touching anything inside of
  * it.
  */
@@ -137,7 +137,7 @@
  *
  * @return The GTK+ file transfer UI operations structure.
  */
-GaimXferUiOps *gaim_get_gtk_xfer_ui_ops(void);
+GaimXferUiOps *gaim_gtk_xfers_get_ui_ops(void);
 
 /*@}*/
 
diff -r f7ff0dfa6b9f -r feb3d21a7794 src/gtknotify.c
--- a/src/gtknotify.c	Mon Sep 29 22:56:15 2003 +0000
+++ b/src/gtknotify.c	Mon Sep 29 23:39:02 2003 +0000
@@ -372,7 +372,7 @@
 };
 
 GaimNotifyUiOps *
-gaim_get_gtk_notify_ui_ops(void)
+gaim_gtk_notify_get_ui_ops(void)
 {
 	return &ops;
 }
diff -r f7ff0dfa6b9f -r feb3d21a7794 src/gtknotify.h
--- a/src/gtknotify.h	Mon Sep 29 22:56:15 2003 +0000
+++ b/src/gtknotify.h	Mon Sep 29 23:39:02 2003 +0000
@@ -30,6 +30,6 @@
  *
  * @return The GTK+ UI notify operations structure.
  */
-GaimNotifyUiOps *gaim_get_gtk_notify_ui_ops(void);
+GaimNotifyUiOps *gaim_gtk_notify_get_ui_ops(void);
 
 #endif /* _GAIM_GTK_NOTIFY_H_ */
diff -r f7ff0dfa6b9f -r feb3d21a7794 src/gtkpounce.c
--- a/src/gtkpounce.c	Mon Sep 29 22:56:15 2003 +0000
+++ b/src/gtkpounce.c	Mon Sep 29 23:39:02 2003 +0000
@@ -5,7 +5,7 @@
  * gaim
  *
  * Copyright (C) 2003 Christian Hammond <chipx86@gnupdate.org>
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -71,7 +71,7 @@
 	GtkWidget *play_sound_entry;
 	GtkWidget *play_sound_browse;
 	GtkWidget *play_sound_test;
-	
+
 	GtkWidget *save_pounce;
 
 	/* Buttons */
@@ -134,8 +134,8 @@
 	GtkWidget *filesel;
 	GtkWidget *entry;
 	GHashTable *args;
-	
-	entry = (GtkWidget *)data;	
+
+	entry = (GtkWidget *)data;
 
 	filesel = gtk_file_selection_new(_("Select a file"));
 	gtk_file_selection_set_filename(GTK_FILE_SELECTION(filesel),
@@ -509,14 +509,14 @@
 	dialog->send_msg = gtk_check_button_new_with_label(_("Send a message"));
 	dialog->exec_cmd = gtk_check_button_new_with_label(_("Execute a command"));
 	dialog->play_sound = gtk_check_button_new_with_label(_("Play a sound"));
-	
+
 	dialog->send_msg_entry   = gtk_entry_new();
 	dialog->exec_cmd_entry   = gtk_entry_new();
 	dialog->exec_cmd_browse = gtk_button_new_with_label(_("Browse"));
 	dialog->play_sound_entry = gtk_entry_new();
 	dialog->play_sound_browse = gtk_button_new_with_label(_("Browse"));
 	dialog->play_sound_test = gtk_button_new_with_label(_("Test"));
-	
+
 	gtk_widget_set_sensitive(dialog->send_msg_entry,   FALSE);
 	gtk_widget_set_sensitive(dialog->exec_cmd_entry,   FALSE);
 	gtk_widget_set_sensitive(dialog->exec_cmd_browse, FALSE);
@@ -566,7 +566,7 @@
 	exec_widgets = g_ptr_array_new();
 	g_ptr_array_add(exec_widgets,dialog->exec_cmd_entry);
 	g_ptr_array_add(exec_widgets,dialog->exec_cmd_browse);
-	
+
 	g_signal_connect(G_OBJECT(dialog->exec_cmd), "clicked",
 					 G_CALLBACK(gtk_toggle_sensitive_array),
 					 exec_widgets);
@@ -588,14 +588,14 @@
 	g_signal_connect(G_OBJECT(dialog->play_sound_test), "clicked",
 					 G_CALLBACK(pounce_test_sound),
 					 dialog->play_sound_entry);
-	
+
 	g_signal_connect(G_OBJECT(dialog->send_msg_entry), "activate",
 					 G_CALLBACK(save_pounce_cb), dialog);
 	g_signal_connect(G_OBJECT(dialog->exec_cmd_entry), "activate",
 					 G_CALLBACK(save_pounce_cb), dialog);
 	g_signal_connect(G_OBJECT(dialog->play_sound_entry), "activate",
 					 G_CALLBACK(save_pounce_cb), dialog);
-	
+
 	/* Now the last part, where we have the Save checkbox */
 	dialog->save_pounce = gtk_check_button_new_with_mnemonic(
 		_("_Save this pounce after activation"));
@@ -634,7 +634,7 @@
 	dialog->save_button = button = gtk_button_new_from_stock(GTK_STOCK_SAVE);
 	gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
 	gtk_widget_show(button);
-	
+
 	g_signal_connect(G_OBJECT(button), "clicked",
 					 G_CALLBACK(save_pounce_cb), dialog);
 
diff -r f7ff0dfa6b9f -r feb3d21a7794 src/gtkprivacy.h
--- a/src/gtkprivacy.h	Mon Sep 29 22:56:15 2003 +0000
+++ b/src/gtkprivacy.h	Mon Sep 29 23:39:02 2003 +0000
@@ -5,7 +5,7 @@
  * gaim
  *
  * Copyright (C) 2003 Christian Hammond <chipx86@gnupdate.org>
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff -r f7ff0dfa6b9f -r feb3d21a7794 src/gtkrequest.c
--- a/src/gtkrequest.c	Mon Sep 29 22:56:15 2003 +0000
+++ b/src/gtkrequest.c	Mon Sep 29 23:39:02 2003 +0000
@@ -5,7 +5,7 @@
  * gaim
  *
  * Copyright (C) 2003 Christian Hammond <chipx86@gnupdate.org>
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -829,7 +829,7 @@
 };
 
 GaimRequestUiOps *
-gaim_get_gtk_request_ui_ops(void)
+gaim_gtk_request_get_ui_ops(void)
 {
 	return &ops;
 }
diff -r f7ff0dfa6b9f -r feb3d21a7794 src/gtkrequest.h
--- a/src/gtkrequest.h	Mon Sep 29 22:56:15 2003 +0000
+++ b/src/gtkrequest.h	Mon Sep 29 23:39:02 2003 +0000
@@ -5,7 +5,7 @@
  * gaim
  *
  * Copyright (C) 2003 Christian Hammond <chipx86@gnupdate.org>
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -30,6 +30,6 @@
  *
  * @return The GTK+ UI request operations structure.
  */
-GaimRequestUiOps *gaim_get_gtk_request_ui_ops(void);
+GaimRequestUiOps *gaim_gtk_request_get_ui_ops(void);
 
 #endif /* _GAIM_GTK_REQUEST_H_ */
diff -r f7ff0dfa6b9f -r feb3d21a7794 src/gtksound.c
--- a/src/gtksound.c	Mon Sep 29 22:56:15 2003 +0000
+++ b/src/gtksound.c	Mon Sep 29 23:39:02 2003 +0000
@@ -303,7 +303,8 @@
 	gaim_gtk_sound_play_event
 };
 
-GaimSoundUiOps *gaim_get_gtk_sound_ui_ops(void)
+GaimSoundUiOps *
+gaim_gtk_sound_get_ui_ops(void)
 {
 	return &sound_ui_ops;
 }
diff -r f7ff0dfa6b9f -r feb3d21a7794 src/gtksound.h
--- a/src/gtksound.h	Mon Sep 29 22:56:15 2003 +0000
+++ b/src/gtksound.h	Mon Sep 29 23:39:02 2003 +0000
@@ -33,7 +33,8 @@
  *
  * @return UI operations struct
  */
-GaimSoundUiOps *gaim_get_gtk_sound_ui_ops(void);
+GaimSoundUiOps *gaim_gtk_sound_get_ui_ops(void);
+
 /**
  * Mutes or un-mutes sounds.
  *
diff -r f7ff0dfa6b9f -r feb3d21a7794 src/main.c
--- a/src/main.c	Mon Sep 29 22:56:15 2003 +0000
+++ b/src/main.c	Mon Sep 29 23:39:02 2003 +0000
@@ -482,7 +482,7 @@
 static void
 debug_init(void)
 {
-	gaim_set_debug_ui_ops(gaim_get_gtk_debug_ui_ops());
+	gaim_debug_set_ui_ops(gaim_gtk_debug_get_ui_ops());
 	gaim_gtk_debug_init();
 }
 
@@ -491,18 +491,18 @@
 {
 	/* Set the UI operation structures. */
 	gaim_accounts_set_ui_ops(gaim_gtk_accounts_get_ui_ops());
-	gaim_set_win_ui_ops(gaim_get_gtk_window_ui_ops());
-	gaim_set_xfer_ui_ops(gaim_get_gtk_xfer_ui_ops());
-	gaim_set_blist_ui_ops(gaim_get_gtk_blist_ui_ops());
-	gaim_set_notify_ui_ops(gaim_get_gtk_notify_ui_ops());
-	gaim_set_privacy_ui_ops(gaim_gtk_privacy_get_ui_ops());
-	gaim_set_request_ui_ops(gaim_get_gtk_request_ui_ops());
-	gaim_set_sound_ui_ops(gaim_get_gtk_sound_ui_ops());
-	gaim_set_connection_ui_ops(gaim_get_gtk_connection_ui_ops());
+	gaim_conversations_set_win_ui_ops(gaim_gtk_conversations_get_win_ui_ops());
+	gaim_xfers_set_ui_ops(gaim_gtk_xfers_get_ui_ops());
+	gaim_blist_set_ui_ops(gaim_gtk_blist_get_ui_ops());
+	gaim_notify_set_ui_ops(gaim_gtk_notify_get_ui_ops());
+	gaim_privacy_set_ui_ops(gaim_gtk_privacy_get_ui_ops());
+	gaim_request_set_ui_ops(gaim_gtk_request_get_ui_ops());
+	gaim_sound_set_ui_ops(gaim_gtk_sound_get_ui_ops());
+	gaim_connections_set_ui_ops(gaim_gtk_connections_get_ui_ops());
 
 	gaim_gtk_prefs_init();
 	gaim_gtk_blist_init();
-	gaim_gtk_conversation_init();
+	gaim_gtk_conversations_init();
 	gaim_gtk_pounces_init();
 	gaim_gtk_privacy_init();
 	gaim_gtk_xfers_init();
@@ -534,7 +534,7 @@
 };
 
 static GaimCoreUiOps *
-gaim_get_gtk_core_ui_ops(void)
+gaim_gtk_core_get_ui_ops(void)
 {
 	return &core_ops;
 }
@@ -797,7 +797,7 @@
 
 	gaim_gtk_stock_init();
 
-	gaim_set_core_ui_ops(gaim_get_gtk_core_ui_ops());
+	gaim_core_set_ui_ops(gaim_gtk_core_get_ui_ops());
 
 	if (!gaim_core_init(GAIM_GTK_UI)) {
 		fprintf(stderr,
diff -r f7ff0dfa6b9f -r feb3d21a7794 src/notify.c
--- a/src/notify.c	Mon Sep 29 22:56:15 2003 +0000
+++ b/src/notify.c	Mon Sep 29 23:39:02 2003 +0000
@@ -42,7 +42,7 @@
 
 	g_return_val_if_fail(primary != NULL, NULL);
 
-	ops = gaim_get_notify_ui_ops();
+	ops = gaim_notify_get_ui_ops();
 
 	if (ops != NULL && ops->notify_message != NULL) {
 		GaimNotifyInfo *info;
@@ -68,7 +68,7 @@
 {
 	GaimNotifyUiOps *ops;
 
-	ops = gaim_get_notify_ui_ops();
+	ops = gaim_notify_get_ui_ops();
 
 	if (ops != NULL && ops->notify_email != NULL) {
 		GaimNotifyInfo *info;
@@ -106,7 +106,7 @@
 								 cb, user_data);
 	}
 
-	ops = gaim_get_notify_ui_ops();
+	ops = gaim_notify_get_ui_ops();
 
 	if (ops != NULL && ops->notify_emails != NULL) {
 		GaimNotifyInfo *info;
@@ -134,7 +134,7 @@
 
 	g_return_val_if_fail(primary != NULL, NULL);
 
-	ops = gaim_get_notify_ui_ops();
+	ops = gaim_notify_get_ui_ops();
 
 	if (ops != NULL && ops->notify_formatted != NULL) {
 		GaimNotifyInfo *info;
@@ -160,7 +160,7 @@
 
 	g_return_val_if_fail(uri != NULL, NULL);
 
-	ops = gaim_get_notify_ui_ops();
+	ops = gaim_notify_get_ui_ops();
 
 	if (ops != NULL && ops->notify_uri != NULL) {
 		GaimNotifyInfo *info;
@@ -186,7 +186,7 @@
 
 	g_return_if_fail(ui_handle != NULL);
 
-	ops = gaim_get_notify_ui_ops();
+	ops = gaim_notify_get_ui_ops();
 
 	for (l = handles; l != NULL; l = l->next) {
 		GaimNotifyInfo *info = l->data;
@@ -212,7 +212,7 @@
 
 	g_return_if_fail(handle != NULL);
 
-	ops = gaim_get_notify_ui_ops();
+	ops = gaim_notify_get_ui_ops();
 
 	for (l = handles; l != NULL; l = l_next) {
 		GaimNotifyInfo *info = l->data;
@@ -231,13 +231,13 @@
 }
 
 void
-gaim_set_notify_ui_ops(GaimNotifyUiOps *ops)
+gaim_notify_set_ui_ops(GaimNotifyUiOps *ops)
 {
 	notify_ui_ops = ops;
 }
 
 GaimNotifyUiOps *
-gaim_get_notify_ui_ops(void)
+gaim_notify_get_ui_ops(void)
 {
 	return notify_ui_ops;
 }
diff -r f7ff0dfa6b9f -r feb3d21a7794 src/notify.h
--- a/src/notify.h	Mon Sep 29 22:56:15 2003 +0000
+++ b/src/notify.h	Mon Sep 29 23:39:02 2003 +0000
@@ -230,7 +230,7 @@
  *
  * @param ops The UI operations structure.
  */
-void gaim_set_notify_ui_ops(GaimNotifyUiOps *ops);
+void gaim_notify_set_ui_ops(GaimNotifyUiOps *ops);
 
 /**
  * Returns the UI operations structure to be used when displaying a
@@ -238,7 +238,7 @@
  *
  * @return The UI operations structure.
  */
-GaimNotifyUiOps *gaim_get_notify_ui_ops(void);
+GaimNotifyUiOps *gaim_notify_get_ui_ops(void);
 
 /*@}*/
 
diff -r f7ff0dfa6b9f -r feb3d21a7794 src/privacy.c
--- a/src/privacy.c	Mon Sep 29 22:56:15 2003 +0000
+++ b/src/privacy.c	Mon Sep 29 23:39:02 2003 +0000
@@ -173,13 +173,13 @@
 }
 
 void
-gaim_set_privacy_ui_ops(GaimPrivacyUiOps *ops)
+gaim_privacy_set_ui_ops(GaimPrivacyUiOps *ops)
 {
 	privacy_ops = ops;
 }
 
 GaimPrivacyUiOps *
-gaim_get_privacy_ui_ops(void)
+gaim_privacy_get_ui_ops(void)
 {
 	return privacy_ops;
 }
diff -r f7ff0dfa6b9f -r feb3d21a7794 src/privacy.h
--- a/src/privacy.h	Mon Sep 29 22:56:15 2003 +0000
+++ b/src/privacy.h	Mon Sep 29 23:39:02 2003 +0000
@@ -98,14 +98,14 @@
  *
  * @param ops The UI operations structure.
  */
-void gaim_set_privacy_ui_ops(GaimPrivacyUiOps *ops);
+void gaim_privacy_set_ui_ops(GaimPrivacyUiOps *ops);
 
 /**
  * Returns the UI operations structure for the privacy subsystem.
  *
  * @return The UI operations structure.
  */
-GaimPrivacyUiOps *gaim_get_privacy_ui_ops(void);
+GaimPrivacyUiOps *gaim_privacy_get_ui_ops(void);
 
 /**
  * Initializes the privacy subsystem.
diff -r f7ff0dfa6b9f -r feb3d21a7794 src/request.c
--- a/src/request.c	Mon Sep 29 22:56:15 2003 +0000
+++ b/src/request.c	Mon Sep 29 23:39:02 2003 +0000
@@ -5,7 +5,7 @@
  * gaim
  *
  * Copyright (C) 2003 Christian Hammond <chipx86@gnupdate.org>
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -592,7 +592,7 @@
 	g_return_val_if_fail(ok_text != NULL, NULL);
 	g_return_val_if_fail(ok_cb   != NULL, NULL);
 
-	ops = gaim_get_request_ui_ops();
+	ops = gaim_request_get_ui_ops();
 
 	if (ops != NULL && ops->request_input != NULL) {
 		GaimRequestInfo *info;
@@ -656,7 +656,7 @@
 	g_return_val_if_fail(ok_cb   != NULL,  NULL);
 	g_return_val_if_fail(choice_count > 0, NULL);
 
-	ops = gaim_get_request_ui_ops();
+	ops = gaim_request_get_ui_ops();
 
 	if (ops != NULL && ops->request_choice != NULL) {
 		GaimRequestInfo *info;
@@ -710,7 +710,7 @@
 	g_return_val_if_fail(primary != NULL,  NULL);
 	g_return_val_if_fail(action_count > 0, NULL);
 
-	ops = gaim_get_request_ui_ops();
+	ops = gaim_request_get_ui_ops();
 
 	if (ops != NULL && ops->request_action != NULL) {
 		GaimRequestInfo *info;
@@ -743,7 +743,7 @@
 	g_return_val_if_fail(ok_text != NULL, NULL);
 	g_return_val_if_fail(ok_cb   != NULL, NULL);
 
-	ops = gaim_get_request_ui_ops();
+	ops = gaim_request_get_ui_ops();
 
 	if (ops != NULL && ops->request_fields != NULL) {
 		GaimRequestInfo *info;
@@ -772,7 +772,7 @@
 
 	g_return_if_fail(ui_handle != NULL);
 
-	ops = gaim_get_request_ui_ops();
+	ops = gaim_request_get_ui_ops();
 
 	for (l = handles; l != NULL; l = l->next) {
 		GaimRequestInfo *info = l->data;
@@ -798,7 +798,7 @@
 
 	g_return_if_fail(handle != NULL);
 
-	ops = gaim_get_request_ui_ops();
+	ops = gaim_request_get_ui_ops();
 
 	for (l = handles; l != NULL; l = l_next) {
 		GaimRequestInfo *info = l->data;
@@ -817,13 +817,13 @@
 }
 
 void
-gaim_set_request_ui_ops(GaimRequestUiOps *ops)
+gaim_request_set_ui_ops(GaimRequestUiOps *ops)
 {
 	request_ui_ops = ops;
 }
 
 GaimRequestUiOps *
-gaim_get_request_ui_ops(void)
+gaim_request_get_ui_ops(void)
 {
 	return request_ui_ops;
 }
diff -r f7ff0dfa6b9f -r feb3d21a7794 src/request.h
--- a/src/request.h	Mon Sep 29 22:56:15 2003 +0000
+++ b/src/request.h	Mon Sep 29 23:39:02 2003 +0000
@@ -5,7 +5,7 @@
  * gaim
  *
  * Copyright (C) 2003 Christian Hammond <chipx86@gnupdate.org>
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -835,7 +835,7 @@
  *
  * @param ops The UI operations structure.
  */
-void gaim_set_request_ui_ops(GaimRequestUiOps *ops);
+void gaim_request_set_ui_ops(GaimRequestUiOps *ops);
 
 /**
  * Returns the UI operations structure to be used when displaying a
@@ -843,7 +843,7 @@
  *
  * @return The UI operations structure.
  */
-GaimRequestUiOps *gaim_get_request_ui_ops(void);
+GaimRequestUiOps *gaim_request_get_ui_ops(void);
 
 /*@}*/
 
diff -r f7ff0dfa6b9f -r feb3d21a7794 src/sound.c
--- a/src/sound.c	Mon Sep 29 22:56:15 2003 +0000
+++ b/src/sound.c	Mon Sep 29 23:39:02 2003 +0000
@@ -30,7 +30,7 @@
 
 static GaimSoundUiOps *sound_ui_ops = NULL;
 
-void gaim_set_sound_ui_ops(GaimSoundUiOps *ops)
+void gaim_sound_set_ui_ops(GaimSoundUiOps *ops)
 {
 	if(sound_ui_ops && sound_ui_ops->shutdown)
 		sound_ui_ops->shutdown();
@@ -39,7 +39,7 @@
 		sound_ui_ops->init();
 }
 
-GaimSoundUiOps *gaim_get_sound_ui_ops(void)
+GaimSoundUiOps *gaim_sound_get_ui_ops(void)
 {
 	return sound_ui_ops;
 }
diff -r f7ff0dfa6b9f -r feb3d21a7794 src/sound.h
--- a/src/sound.h	Mon Sep 29 22:56:15 2003 +0000
+++ b/src/sound.h	Mon Sep 29 23:39:02 2003 +0000
@@ -72,14 +72,14 @@
  *
  * @param ops The UI sound operations structure.
  */
-void gaim_set_sound_ui_ops(GaimSoundUiOps *ops);
+void gaim_sound_set_ui_ops(GaimSoundUiOps *ops);
 
 /**
  * Gets the UI sound operations
  *
  * @return The UI sound operations structure.
  */
-GaimSoundUiOps *gaim_get_sound_ui_ops(void);
+GaimSoundUiOps *gaim_sound_get_ui_ops(void);
 
 /**
  * Initializes the sound subsystem