[Gaim-commits] CVS: gaim/src blist.c,1.87,1.88 blist.h,1.30,1.31 connection.c,1.49,1.50 connection.h,1.21,1.22 conversation.c,1.559,1.560 conversation.h,1.32,1.33 core.c,1.58,1.59 core.h,1.63,1.64 debug.c,1.3,1.4 debug.h,1.4,1.5 ft.c,1.46,1.47 ft.h,1.22,1.23 gtkblist.c,1.97,1.98 gtkblist.h,1.12,1.13 gtkconn.c,1.17,1.18 gtkconn.h,1.1,1.2 gtkconv.c,1.196,1.197 gtkconv.h,1.21,1.22 gtkdebug.c,1.26,1.27 gtkdebug.h,1.4,1.5 gtkft.c,1.36,1.37 gtkft.h,1.9,1.10 gtknotify.c,1.20,1.21 gtknotify.h,1.2,1.3 gtkpounce.c,1.36,1.37 gtkprivacy.h,1.1,1.2 gtkrequest.c,1.30,1.31 gtkrequest.h,1.1,1.2 gtksound.c,1.7,1.8 gtksound.h,1.1,1.2 main.c,1.87,1.88 notify.c,1.7,1.8 notify.h,1.10,1.11 privacy.c,1.4,1.5 privacy.h,1.8,1.9 request.c,1.9,1.10 request.h,1.10,1.11 sound.c,1.89,1.90 sound.h,1.7,1.8

[Christian H. <ch...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv13875

Modified Files:
	blist.c blist.h connection.c connection.h conversation.c 
	conversation.h core.c core.h debug.c debug.h ft.c ft.h 
	gtkblist.c gtkblist.h gtkconn.c gtkconn.h gtkconv.c gtkconv.h 
	gtkdebug.c gtkdebug.h gtkft.c gtkft.h gtknotify.c gtknotify.h 
	gtkpounce.c gtkprivacy.h gtkrequest.c gtkrequest.h gtksound.c 
	gtksound.h main.c notify.c notify.h privacy.c privacy.h 
	request.c request.h sound.c sound.h 
Log Message:
Standardized the UI op accessor functions in every file. They're now
properly namespaced.


Index: blist.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/blist.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -p -r1.87 -r1.88
--- blist.c	29 Sep 2003 00:46:28 -0000	1.87
+++ blist.c	29 Sep 2003 23:39:00 -0000	1.88
@@ -151,7 +151,7 @@ struct gaim_buddy_list *gaim_blist_new()
 {
 	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 @@ GaimBlistChat *gaim_blist_chat_new(GaimA
 
 	((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 @@ GaimBuddy *gaim_buddy_new(GaimAccount *a
 	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 @@ GaimContact *gaim_contact_new()
 
 	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 @@ GaimGroup *gaim_group_new(const char *na
 				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 @@ char *gaim_buddy_get_setting(GaimBuddy *
 	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;
@@ -2572,6 +2561,19 @@ int gaim_blist_get_group_online_count(Ga
 
 	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)

Index: blist.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/blist.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -p -r1.30 -r1.31
--- blist.h	25 Sep 2003 03:30:07 -0000	1.30
+++ blist.h	29 Sep 2003 23:39:00 -0000	1.31
@@ -735,14 +735,14 @@ char *gaim_buddy_get_setting(GaimBuddy *
  *
  * @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);
 
 /*@}*/
 

Index: connection.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/connection.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -p -r1.49 -r1.50
--- connection.c	2 Sep 2003 03:41:08 -0000	1.49
+++ connection.c	29 Sep 2003 23:39:00 -0000	1.50
@@ -109,7 +109,7 @@ gaim_connection_register(GaimConnection 
 	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_connection_connect(GaimConnection *
 	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 @@ gaim_connection_set_state(GaimConnection
 
 	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 @@ gaim_connection_update_progress(GaimConn
 	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 @@ gaim_connection_notice(GaimConnection *g
 	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 @@ gaim_connection_error(GaimConnection *gc
 	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 @@ gaim_connections_get_connecting(void)
 }
 
 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();
@@ -543,16 +555,4 @@ void *
 gaim_connections_get_handle(void)
 {
 	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;
 }

Index: connection.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/connection.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -p -r1.21 -r1.22
--- connection.h	27 Sep 2003 19:17:17 -0000	1.21
+++ connection.h	29 Sep 2003 23:39:00 -0000	1.22
@@ -262,14 +262,14 @@ GList *gaim_connections_get_connecting(v
  *
  * @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);
 
 /*@}*/
 

Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.559
retrieving revision 1.560
diff -u -d -p -r1.559 -r1.560
--- conversation.c	27 Sep 2003 19:17:18 -0000	1.559
+++ conversation.c	29 Sep 2003 23:39:01 -0000	1.560
@@ -371,7 +371,7 @@ gaim_window_new(void)
 
 	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 @@ update_titles_pref_cb(const char *name, 
 }
 
 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;
 }

Index: conversation.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -p -r1.32 -r1.33
--- conversation.h	27 Sep 2003 19:17:18 -0000	1.32
+++ conversation.h	29 Sep 2003 23:39:01 -0000	1.33
@@ -1241,7 +1241,7 @@ const char *gaim_conv_placement_get_fnc_
  *
  * @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 @@ void gaim_set_win_ui_ops(GaimWindowUiOps
  *
  * @return A filled-out GaimWindowUiOps structure.
  */
-GaimWindowUiOps *gaim_get_win_ui_ops(void);
+GaimWindowUiOps *gaim_conversations_get_win_ui_ops(void);
 
 /*@}*/
 

Index: core.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/core.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -p -r1.58 -r1.59
--- core.c	15 Sep 2003 07:35:48 -0000	1.58
+++ core.c	29 Sep 2003 23:39:01 -0000	1.59
@@ -60,7 +60,7 @@ gaim_core_init(const char *ui)
 	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 @@ gaim_core_quit(void)
 
 	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 @@ gaim_get_core(void)
 }
 
 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;
 }

Index: core.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/core.h,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -p -r1.63 -r1.64
--- core.h	24 Aug 2003 07:40:13 -0000	1.63
+++ core.h	29 Sep 2003 23:39:01 -0000	1.64
@@ -92,14 +92,14 @@ GaimCore *gaim_get_core(void);
  *
  * @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
 }

Index: debug.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/debug.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -p -r1.3 -r1.4
--- debug.c	3 Sep 2003 06:06:54 -0000	1.3
+++ debug.c	29 Sep 2003 23:39:01 -0000	1.4
@@ -35,7 +35,7 @@ gaim_debug_vargs(GaimDebugLevel level, c
 	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 @@ gaim_debug_fatal(const char *category, c
 }
 
 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;
 }

Index: debug.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/debug.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -p -r1.4 -r1.5
--- debug.h	3 Sep 2003 06:06:54 -0000	1.4
+++ debug.h	29 Sep 2003 23:39:01 -0000	1.5
@@ -159,7 +159,7 @@ void gaim_debug_fatal(const char *catego
  *
  * @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 @@ void gaim_set_debug_ui_ops(GaimDebugUiOp
  *
  * @return The UI operations structure in use.
  */
-GaimDebugUiOps *gaim_get_debug_ui_ops(void);
+GaimDebugUiOps *gaim_debug_get_ui_ops(void);
 
 /*@}*/
 

Index: ft.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/ft.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -p -r1.46 -r1.47
--- ft.c	17 Aug 2003 03:30:00 -0000	1.46
+++ ft.c	29 Sep 2003 23:39:02 -0000	1.47
@@ -43,7 +43,7 @@ gaim_xfer_new(GaimAccount *account, Gaim
 	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 @@ gaim_xfer_request(GaimXfer *xfer)
 	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 @@ gaim_xfers_init(void)
 }
 
 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;
 }

Index: ft.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/ft.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -p -r1.22 -r1.23
--- ft.h	3 Sep 2003 05:21:04 -0000	1.22
+++ ft.h	29 Sep 2003 23:39:02 -0000	1.23
@@ -533,14 +533,14 @@ void gaim_xfers_init(void);
  *
  * @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);
 
 /*@}*/
 

Index: gtkblist.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkblist.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -p -r1.97 -r1.98
--- gtkblist.c	29 Sep 2003 03:23:36 -0000	1.97
+++ gtkblist.c	29 Sep 2003 23:39:02 -0000	1.98
@@ -2546,7 +2546,8 @@ static struct gaim_blist_ui_ops blist_ui
 };
 
 
-struct gaim_blist_ui_ops *gaim_get_gtk_blist_ui_ops()
+struct gaim_blist_ui_ops *
+gaim_gtk_blist_get_ui_ops(void)
 {
 	return &blist_ui_ops;
 }

Index: gtkblist.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkblist.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -p -r1.12 -r1.13
--- gtkblist.h	2 Sep 2003 03:41:08 -0000	1.12
+++ gtkblist.h	29 Sep 2003 23:39:02 -0000	1.13
@@ -77,7 +77,7 @@ struct gaim_gtk_buddy_list {
 
 #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 @@ void gaim_gtk_blist_init(void);
  *
  * @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

Index: gtkconn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkconn.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -p -r1.17 -r1.18
--- gtkconn.c	13 Aug 2003 22:40:41 -0000	1.17
+++ gtkconn.c	29 Sep 2003 23:39:02 -0000	1.18
@@ -289,11 +289,11 @@ static GaimConnectionUiOps conn_ui_ops =
 	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)
 {

Index: gtkconn.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkconn.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -p -r1.1 -r1.2
--- gtkconn.h	3 Jun 2003 19:55:44 -0000	1.1
+++ gtkconn.h	29 Sep 2003 23:39:02 -0000	1.2
@@ -33,7 +33,7 @@
  *
  * @return UI operations struct
  */
-GaimConnectionUiOps *gaim_get_gtk_connection_ui_ops(void);
+GaimConnectionUiOps *gaim_gtk_connections_get_ui_ops(void);
 
 /*@}*/
 

Index: gtkconv.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkconv.c,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -d -p -r1.196 -r1.197
--- gtkconv.c	29 Sep 2003 04:30:35 -0000	1.196
+++ gtkconv.c	29 Sep 2003 23:39:02 -0000	1.197
@@ -3686,12 +3686,6 @@ conv_dnd_recv(GtkWidget *widget, GdkDrag
 /**************************************************************************
  * 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 @@ gaim_gtk_get_active_index(const GaimWind
 
 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 @@ update_convo_add_button(GaimConversation
 }
 
 GaimWindowUiOps *
-gaim_get_gtk_window_ui_ops(void)
+gaim_gtk_conversations_get_win_ui_ops(void)
 {
 	return &window_ui_ops;
 }
@@ -5122,7 +5116,7 @@ static GaimConversationUiOps conversatio
 };
 
 GaimConversationUiOps *
-gaim_get_gtk_conversation_ui_ops(void)
+gaim_gtk_conversations_get_conv_ui_ops(void)
 {
 	return &conversation_ui_ops;
 }
@@ -6020,7 +6014,7 @@ chat_button_type_pref_cb(const char *nam
 }
 
 void
-gaim_gtk_conversation_init(void)
+gaim_gtk_conversations_init(void)
 {
 	/* Conversations */
 	gaim_prefs_add_none("/gaim/gtk/conversations");

Index: gtkconv.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkconv.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -p -r1.21 -r1.22
--- gtkconv.h	7 Sep 2003 03:08:50 -0000	1.21
+++ gtkconv.h	29 Sep 2003 23:39:02 -0000	1.22
@@ -203,10 +203,11 @@ struct _GaimGtkConversation
 	((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 @@ struct _GaimGtkConversation
 /**
  * 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.

Index: gtkdebug.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkdebug.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -p -r1.26 -r1.27
--- gtkdebug.c	27 Sep 2003 19:17:18 -0000	1.26
+++ gtkdebug.c	29 Sep 2003 23:39:02 -0000	1.27
@@ -341,7 +341,7 @@ static GaimDebugUiOps ops =
 };
 
 GaimDebugUiOps *
-gaim_get_gtk_debug_ui_ops(void)
+gaim_gtk_debug_get_ui_ops(void)
 {
 	return &ops;
 }

Index: gtkdebug.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkdebug.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -p -r1.4 -r1.5
--- gtkdebug.h	14 Jun 2003 23:21:00 -0000	1.4
+++ gtkdebug.h	29 Sep 2003 23:39:02 -0000	1.5
@@ -5,7 +5,7 @@
  * gaim
  *
  * Copyright (C) 2003 Christian Hammond <ch...@gn...>
- * 
+ *
  * 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 @@ void gaim_gtk_debug_window_hide(void);
  *
  * @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_ */

Index: gtkft.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkft.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -p -r1.36 -r1.37
--- gtkft.c	5 Aug 2003 10:55:01 -0000	1.36
+++ gtkft.c	29 Sep 2003 23:39:02 -0000	1.37
@@ -5,7 +5,7 @@
  * gaim
  *
  * Copyright (C) 2003 Christian Hammond <ch...@gn...>
- * 
+ *
  * 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 @@ gaim_get_gtkxfer_dialog(void)
 }
 
 GaimXferUiOps *
-gaim_get_gtk_xfer_ui_ops(void)
+gaim_gtk_xfers_get_ui_ops(void)
 {
 	return &ops;
 }

Index: gtkft.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkft.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -p -r1.9 -r1.10
--- gtkft.h	22 Jul 2003 08:11:44 -0000	1.9
+++ gtkft.h	29 Sep 2003 23:39:02 -0000	1.10
@@ -5,7 +5,7 @@
  * gaim
  *
  * Copyright (C) 2003 Christian Hammond <ch...@gn...>
- * 
+ *
  * 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 @@ GaimGtkXferDialog *gaim_get_gtkxfer_dial
  *
  * @return The GTK+ file transfer UI operations structure.
  */
-GaimXferUiOps *gaim_get_gtk_xfer_ui_ops(void);
+GaimXferUiOps *gaim_gtk_xfers_get_ui_ops(void);
 
 /*@}*/
 

Index: gtknotify.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtknotify.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -p -r1.20 -r1.21
--- gtknotify.c	29 Sep 2003 03:54:08 -0000	1.20
+++ gtknotify.c	29 Sep 2003 23:39:02 -0000	1.21
@@ -372,7 +372,7 @@ static GaimNotifyUiOps ops =
 };
 
 GaimNotifyUiOps *
-gaim_get_gtk_notify_ui_ops(void)
+gaim_gtk_notify_get_ui_ops(void)
 {
 	return &ops;
 }

Index: gtknotify.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtknotify.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- gtknotify.h	14 Aug 2003 03:55:12 -0000	1.2
+++ gtknotify.h	29 Sep 2003 23:39:02 -0000	1.3
@@ -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_ */

Index: gtkpounce.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkpounce.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -p -r1.36 -r1.37
--- gtkpounce.c	27 Sep 2003 19:17:18 -0000	1.36
+++ gtkpounce.c	29 Sep 2003 23:39:02 -0000	1.37
@@ -5,7 +5,7 @@
  * gaim
  *
  * Copyright (C) 2003 Christian Hammond <ch...@gn...>
- * 
+ *
  * 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 @@ typedef struct
 	GtkWidget *play_sound_entry;
 	GtkWidget *play_sound_browse;
 	GtkWidget *play_sound_test;
-	
+
 	GtkWidget *save_pounce;
 
 	/* Buttons */
@@ -134,8 +134,8 @@ filesel(GtkWidget *w, gpointer data)
 	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 @@ gaim_gtkpounce_dialog_show(GaimAccount *
 	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 @@ gaim_gtkpounce_dialog_show(GaimAccount *
 	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 @@ gaim_gtkpounce_dialog_show(GaimAccount *
 	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 @@ gaim_gtkpounce_dialog_show(GaimAccount *
 	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);
 

Index: gtkprivacy.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkprivacy.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -p -r1.1 -r1.2
--- gtkprivacy.h	5 Aug 2003 10:55:01 -0000	1.1
+++ gtkprivacy.h	29 Sep 2003 23:39:02 -0000	1.2
@@ -5,7 +5,7 @@
  * gaim
  *
  * Copyright (C) 2003 Christian Hammond <ch...@gn...>
- * 
+ *
  * 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

Index: gtkrequest.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkrequest.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -p -r1.30 -r1.31
--- gtkrequest.c	5 Aug 2003 10:55:01 -0000	1.30
+++ gtkrequest.c	29 Sep 2003 23:39:02 -0000	1.31
@@ -5,7 +5,7 @@
  * gaim
  *
  * Copyright (C) 2003 Christian Hammond <ch...@gn...>
- * 
+ *
  * 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 @@ static GaimRequestUiOps ops =
 };
 
 GaimRequestUiOps *
-gaim_get_gtk_request_ui_ops(void)
+gaim_gtk_request_get_ui_ops(void)
 {
 	return &ops;
 }

Index: gtkrequest.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkrequest.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -p -r1.1 -r1.2
--- gtkrequest.h	22 May 2003 10:21:43 -0000	1.1
+++ gtkrequest.h	29 Sep 2003 23:39:02 -0000	1.2
@@ -5,7 +5,7 @@
  * gaim
  *
  * Copyright (C) 2003 Christian Hammond <ch...@gn...>
- * 
+ *
  * 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_ */

Index: gtksound.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtksound.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -p -r1.7 -r1.8
--- gtksound.c	7 Sep 2003 15:55:28 -0000	1.7
+++ gtksound.c	29 Sep 2003 23:39:02 -0000	1.8
@@ -303,7 +303,8 @@ static GaimSoundUiOps sound_ui_ops =
 	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;
 }

Index: gtksound.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtksound.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -p -r1.1 -r1.2
--- gtksound.h	3 Jun 2003 03:33:20 -0000	1.1
+++ gtksound.h	29 Sep 2003 23:39:02 -0000	1.2
@@ -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.
  *

Index: main.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/main.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -p -r1.87 -r1.88
--- main.c	29 Sep 2003 15:28:16 -0000	1.87
+++ main.c	29 Sep 2003 23:39:02 -0000	1.88
@@ -482,7 +482,7 @@ static void gaim_log_handler (const gcha
 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 @@ gaim_gtk_ui_init(void)
 {
 	/* 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 core_ops =
 };
 
 static GaimCoreUiOps *
-gaim_get_gtk_core_ui_ops(void)
+gaim_gtk_core_get_ui_ops(void)
 {
 	return &core_ops;
 }
@@ -797,7 +797,7 @@ int main(int argc, char *argv[])
 
 	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,

Index: notify.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/notify.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -p -r1.7 -r1.8
--- notify.c	14 Aug 2003 03:55:12 -0000	1.7
+++ notify.c	29 Sep 2003 23:39:02 -0000	1.8
@@ -42,7 +42,7 @@ gaim_notify_message(void *handle, GaimNo
 
 	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 @@ gaim_notify_email(void *handle, const ch
 {
 	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 @@ gaim_notify_emails(void *handle, size_t 
 								 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 @@ gaim_notify_formatted(void *handle, cons
 
 	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 @@ gaim_notify_uri(void *handle, const char
 
 	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 @@ gaim_notify_close(GaimNotifyType type, v
 
 	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 @@ gaim_notify_close_with_handle(void *hand
 
 	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 @@ gaim_notify_close_with_handle(void *hand
 }
 
 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;
 }

Index: notify.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/notify.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -p -r1.10 -r1.11
--- notify.h	3 Sep 2003 05:21:04 -0000	1.10
+++ notify.h	29 Sep 2003 23:39:02 -0000	1.11
@@ -230,7 +230,7 @@ void gaim_notify_close_with_handle(void 
  *
  * @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 @@ void gaim_set_notify_ui_ops(GaimNotifyUi
  *
  * @return The UI operations structure.
  */
-GaimNotifyUiOps *gaim_get_notify_ui_ops(void);
+GaimNotifyUiOps *gaim_notify_get_ui_ops(void);
 
 /*@}*/
 

Index: privacy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/privacy.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -p -r1.4 -r1.5
--- privacy.c	5 Aug 2003 18:59:57 -0000	1.4
+++ privacy.c	29 Sep 2003 23:39:02 -0000	1.5
@@ -173,13 +173,13 @@ gaim_privacy_deny_remove(GaimAccount *ac
 }
 
 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;
 }

Index: privacy.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/privacy.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -p -r1.8 -r1.9
--- privacy.h	3 Sep 2003 05:21:04 -0000	1.8
+++ privacy.h	29 Sep 2003 23:39:02 -0000	1.9
@@ -98,14 +98,14 @@ gboolean gaim_privacy_deny_remove(GaimAc
  *
  * @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.

Index: request.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/request.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -p -r1.9 -r1.10
--- request.c	29 Jul 2003 05:35:36 -0000	1.9
+++ request.c	29 Sep 2003 23:39:02 -0000	1.10
@@ -5,7 +5,7 @@
  * gaim
  *
  * Copyright (C) 2003 Christian Hammond <ch...@gn...>
- * 
+ *
  * 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 @@ gaim_request_input(void *handle, const c
 	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 @@ gaim_request_choice_varg(void *handle, c
 	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 @@ gaim_request_action_varg(void *handle, c
 	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 @@ gaim_request_fields(void *handle, const 
 	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 @@ gaim_request_close(GaimRequestType type,
 
 	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 @@ gaim_request_close_with_handle(void *han
 
 	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 @@ gaim_request_close_with_handle(void *han
 }
 
 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;
 }

Index: request.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/request.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -p -r1.10 -r1.11
--- request.h	3 Sep 2003 05:21:04 -0000	1.10
+++ request.h	29 Sep 2003 23:39:02 -0000	1.11
@@ -5,7 +5,7 @@
  * gaim
  *
  * Copyright (C) 2003 Christian Hammond <ch...@gn...>
- * 
+ *
  * 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 @@ void gaim_request_close_with_handle(void
  *
  * @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 @@ void gaim_set_request_ui_ops(GaimRequest
  *
  * @return The UI operations structure.
  */
-GaimRequestUiOps *gaim_get_request_ui_ops(void);
+GaimRequestUiOps *gaim_request_get_ui_ops(void);
 
 /*@}*/
 

Index: sound.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/sound.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -p -r1.89 -r1.90
--- sound.c	5 Aug 2003 10:55:01 -0000	1.89
+++ sound.c	29 Sep 2003 23:39:02 -0000	1.90
@@ -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 @@ void gaim_set_sound_ui_ops(GaimSoundUiOp
 		sound_ui_ops->init();
 }
 
-GaimSoundUiOps *gaim_get_sound_ui_ops(void)
+GaimSoundUiOps *gaim_sound_get_ui_ops(void)
 {
 	return sound_ui_ops;
 }

Index: sound.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/sound.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -p -r1.7 -r1.8
--- sound.h	23 Jun 2003 06:40:13 -0000	1.7
+++ sound.h	29 Sep 2003 23:39:02 -0000	1.8
@@ -72,14 +72,14 @@ extern "C" {
  *
  * @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