Pidgin

Revision: 16330
Author:   roast
Date:     2006-06-24 11:11:59 -0700 (Sat, 24 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16330&view=rev

Log Message:
-----------
merged with svn trunk, r16329

Modified Paths:
--------------
    branches/soc-2006-file-loggers/COPYRIGHT
    branches/soc-2006-file-loggers/configure.ac
    branches/soc-2006-file-loggers/doc/plugin-ids.dox
    branches/soc-2006-file-loggers/plugins/ChangeLog.API
    branches/soc-2006-file-loggers/plugins/idle.c
    branches/soc-2006-file-loggers/plugins/perl/common/Account.xs
    branches/soc-2006-file-loggers/plugins/perl/common/Conversation.xs
    branches/soc-2006-file-loggers/plugins/perl/common/Server.xs
    branches/soc-2006-file-loggers/plugins/tcl/Makefile.am
    branches/soc-2006-file-loggers/plugins/tcl/Makefile.mingw
    branches/soc-2006-file-loggers/plugins/tcl/tcl.c
    branches/soc-2006-file-loggers/plugins/tcl/tcl_cmds.c
    branches/soc-2006-file-loggers/plugins/tcl/tcl_gaim.h
    branches/soc-2006-file-loggers/plugins/tcl/tcl_signals.c
    branches/soc-2006-file-loggers/src/cmds.h
    branches/soc-2006-file-loggers/src/conversation.c
    branches/soc-2006-file-loggers/src/conversation.h
    branches/soc-2006-file-loggers/src/ft.c
    branches/soc-2006-file-loggers/src/gtkblist.c
    branches/soc-2006-file-loggers/src/gtkconv.c
    branches/soc-2006-file-loggers/src/gtkconv.h
    branches/soc-2006-file-loggers/src/gtkmain.c
    branches/soc-2006-file-loggers/src/gtkpounce.c
    branches/soc-2006-file-loggers/src/gtksavedstatuses.c
    branches/soc-2006-file-loggers/src/gtkstatusbox.c
    branches/soc-2006-file-loggers/src/pounce.c
    branches/soc-2006-file-loggers/src/pounce.h
    branches/soc-2006-file-loggers/src/protocols/irc/cmds.c
    branches/soc-2006-file-loggers/src/protocols/jabber/message.c
    branches/soc-2006-file-loggers/src/protocols/jabber/message.h
    branches/soc-2006-file-loggers/src/protocols/msn/msn.c
    branches/soc-2006-file-loggers/src/protocols/novell/novell.c
    branches/soc-2006-file-loggers/src/protocols/oscar/oscar.c
    branches/soc-2006-file-loggers/src/protocols/sametime/sametime.c
    branches/soc-2006-file-loggers/src/protocols/simple/simple.c
    branches/soc-2006-file-loggers/src/protocols/yahoo/yahoo.c
    branches/soc-2006-file-loggers/src/protocols/yahoo/yahoo.h
    branches/soc-2006-file-loggers/src/protocols/yahoo/yahoo_filexfer.c
    branches/soc-2006-file-loggers/src/protocols/zephyr/zephyr.c
    branches/soc-2006-file-loggers/src/prpl.h
    branches/soc-2006-file-loggers/src/server.c
    branches/soc-2006-file-loggers/src/server.h
    branches/soc-2006-file-loggers/src/xmlnode.c
Modified: branches/soc-2006-file-loggers/COPYRIGHT
===================================================================
--- branches/soc-2006-file-loggers/COPYRIGHT	2006-06-24 12:04:32 UTC (rev 16329)
+++ branches/soc-2006-file-loggers/COPYRIGHT	2006-06-24 18:11:59 UTC (rev 16330)
@@ -51,6 +51,7 @@
 Christophe Chapuis
 Ka-Hing Cheung
 Sadrul Habib Chowdhury
+Brian Chu
 Arturo Cisneros, Jr.
 Vincas Ciziunas
 Jonathan Clark

Modified: branches/soc-2006-file-loggers/configure.ac
===================================================================
--- branches/soc-2006-file-loggers/configure.ac	2006-06-24 12:04:32 UTC (rev 16329)
+++ branches/soc-2006-file-loggers/configure.ac	2006-06-24 18:11:59 UTC (rev 16330)
@@ -163,7 +163,11 @@
 dnl # GStreamer
 dnl #######################################################################
 enable_gst=yes
-PKG_CHECK_MODULES(GSTREAMER, gstreamer-0.10, ,enable_gst=no)
+PKG_CHECK_MODULES(GSTREAMER, [gstreamer-0.10], ,
+		  [
+		   AC_MSG_RESULT(no)
+		   enable_gst=no
+		  ])
 AC_SUBST(GSTREAMER_CFLAGS)
 AC_SUBST(GSTREAMER_LIBS)
 AC_ARG_ENABLE(gstreamer,[  --disable-gstreamer     compile without GStreamer audio support],enable_gst=no)
@@ -175,7 +179,11 @@
 dnl # LibXML2
 dnl #################
 enable_libxml2=yes
-PKG_CHECK_MODULES(LIBXML, libxml-2.0, ,enable_libxml2=no)
+PKG_CHECK_MODULES(LIBXML, [libxml-2.0], ,
+		  [
+		   AC_MSG_RESULT(no)
+		   enable_libxml2=no
+		  ])
 AC_SUBST(LIBXML_CFLAGS)
 AC_SUBST(LIBXML_LIBS)
 AC_ARG_ENABLE(libxml,[  --disable-libxml     compile without libxml2 support],enable_libxml2=no)
@@ -690,7 +698,7 @@
 			PYTHON=$withval)
 
 if test "x$enable_dbus" = "xyes" ; then
-	if test -z "$PYTHON" ; then
+	if test -z "$PYTHON" -o "x$PYTHON" = "xyes"; then
 		AC_PATH_PROG([PYTHON], [python], [no])
 	fi
 

Modified: branches/soc-2006-file-loggers/doc/plugin-ids.dox
===================================================================
--- branches/soc-2006-file-loggers/doc/plugin-ids.dox	2006-06-24 12:04:32 UTC (rev 16329)
+++ branches/soc-2006-file-loggers/doc/plugin-ids.dox	2006-06-24 18:11:59 UTC (rev 16330)
@@ -28,10 +28,7 @@
     - qpe       - Gaim for Qtopia plugin.
 
   The @em username must be a unique identifier for that person. It
-  @em should be your Gaim website user ID
-  (registered <a href="http://gaim.sourceforge.net/register.php">here</a>).
-  If for some reason you cannot register there (it shouldn't be a
-  problem!), you can use your SourceForge ID. Do @em not leave this field
+  @em should be your SourceForge ID. Do @em not leave this field
   blank.
 
   The @em pluginname is the name of your plugin. It can be whatever you like,

Modified: branches/soc-2006-file-loggers/plugins/ChangeLog.API
===================================================================
--- branches/soc-2006-file-loggers/plugins/ChangeLog.API	2006-06-24 12:04:32 UTC (rev 16329)
+++ branches/soc-2006-file-loggers/plugins/ChangeLog.API	2006-06-24 18:11:59 UTC (rev 16330)
@@ -114,6 +114,7 @@
 	  gaim_proxy_connect() and gaim_network_listen*().
 	* gaim_gtk_create_imhtml(): Added sw_ret() parameter
 	* gaim_account_get_log(): Added create parameter
+	* GAIM_CMD_P_VERYHIGH is now GAIM_CMD_P_VERY_HIGH
 
 	Removed:
 	* gaim_gtk_sound_{get,set}_mute() (replaced by the /gaim/gtk/sound/mute
@@ -173,6 +174,8 @@
 	* GAIM_MESSAGE_COLORIZE
 	* user_data from gaim_notify_searchresults_new_rows and from 
 	  notify_searchresults in GaimNotifyUiOps.
+	* gaim_conversation_get_send_history(), and send_history from
+	  GaimConversation
 
 	Added:
 	* gaim_prefs_disconnect_by_handle()

Modified: branches/soc-2006-file-loggers/plugins/idle.c
===================================================================
--- branches/soc-2006-file-loggers/plugins/idle.c	2006-06-24 12:04:32 UTC (rev 16329)
+++ branches/soc-2006-file-loggers/plugins/idle.c	2006-06-24 18:11:59 UTC (rev 16330)
@@ -102,12 +102,13 @@
 idle_all_action_ok(void *ignored, GaimRequestFields *fields)
 {
 	GaimAccount *acct = NULL;
-	GList *l = gaim_accounts_get_all_active();
+	GList *list, *iter;
 	int tm = gaim_request_fields_get_integer(fields, "mins");
 	const char *prpl_id = NULL;
 
-	for(; l; l = l->next) {
-		acct = (GaimAccount *)(l->data);
+	list = gaim_accounts_get_all_active();
+	for(iter = list; iter; iter = iter->next) {
+		acct = (GaimAccount *)(iter->data);
 
 		if(acct)
 			prpl_id = gaim_account_get_protocol_id(acct);
@@ -122,6 +123,8 @@
 				idled_accts = g_list_append(idled_accts, acct);
 		}
 	}
+
+	g_list_free(list);
 }
 
 static void

Modified: branches/soc-2006-file-loggers/plugins/perl/common/Account.xs
===================================================================
--- branches/soc-2006-file-loggers/plugins/perl/common/Account.xs	2006-06-24 12:04:32 UTC (rev 16329)
+++ branches/soc-2006-file-loggers/plugins/perl/common/Account.xs	2006-06-24 18:11:59 UTC (rev 16330)
@@ -286,11 +286,13 @@
 void
 gaim_accounts_get_all_active()
 PREINIT:
-	GList *l;
+	GList *list, *iter;
 PPCODE:
-	for (l = gaim_accounts_get_all_active(); l != NULL; l = l->next) {
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::Account")));
+	list = gaim_accounts_get_all_active();
+	for (iter = gaim_accounts_get_all_active(); iter != NULL; iter = iter->next) {
+		XPUSHs(sv_2mortal(gaim_perl_bless_object(iter->data, "Gaim::Account")));
 	}
+	g_list_free(list);
 
 Gaim::Account
 gaim_accounts_find(name, protocol)

Modified: branches/soc-2006-file-loggers/plugins/perl/common/Conversation.xs
===================================================================
--- branches/soc-2006-file-loggers/plugins/perl/common/Conversation.xs	2006-06-24 12:04:32 UTC (rev 16329)
+++ branches/soc-2006-file-loggers/plugins/perl/common/Conversation.xs	2006-06-24 18:11:59 UTC (rev 16330)
@@ -46,16 +46,6 @@
 PROTOTYPES: ENABLE
 
 void
-gaim_conversation_get_send_history(conv)
-	Gaim::Conversation conv
-PREINIT:
-	GList *l;
-PPCODE:
-	for (l = gaim_conversation_get_send_history(conv); l != NULL; l = l->next) {
-		XPUSHs(sv_2mortal(newSVpv(l->data, 0)));
-	}
-
-void
 gaim_conversation_destroy(conv)
 	Gaim::Conversation conv
 
@@ -189,15 +179,15 @@
 	Gaim::Conversation::IM im
 
 void
-gaim_conv_im_start_type_again_timeout(im)
+gaim_conv_im_start_send_typed_timeout(im)
 	Gaim::Conversation::IM im
 
 void
-gaim_conv_im_stop_type_again_timeout(im)
+gaim_conv_im_stop_send_typed_timeout(im)
 	Gaim::Conversation::IM im
 
 guint
-gaim_conv_im_get_type_again_timeout(im)
+gaim_conv_im_get_send_typed_timeout(im)
 	Gaim::Conversation::IM im
 
 void

Modified: branches/soc-2006-file-loggers/plugins/perl/common/Server.xs
===================================================================
--- branches/soc-2006-file-loggers/plugins/perl/common/Server.xs	2006-06-24 12:04:32 UTC (rev 16329)
+++ branches/soc-2006-file-loggers/plugins/perl/common/Server.xs	2006-06-24 18:11:59 UTC (rev 16330)
@@ -200,10 +200,10 @@
 	Gaim::MessageFlags flags
 
 int  
-serv_send_typing(con, a, b)
+serv_send_typing(con, a, state)
 	Gaim::Connection con
 	const char * a
-	int b
+	Gaim::TypingState state
 
 void 
 serv_set_buddyicon(gc, filename)

Modified: branches/soc-2006-file-loggers/plugins/tcl/Makefile.am
===================================================================
--- branches/soc-2006-file-loggers/plugins/tcl/Makefile.am	2006-06-24 12:04:32 UTC (rev 16329)
+++ branches/soc-2006-file-loggers/plugins/tcl/Makefile.am	2006-06-24 18:11:59 UTC (rev 16330)
@@ -5,7 +5,7 @@
 plugin_LTLIBRARIES = tcl.la
 
 tcl_la_SOURCES = tcl.c tcl_glib.c tcl_glib.h tcl_cmds.c tcl_signals.c tcl_gaim.h \
-                 tcl_ref.c
+                 tcl_ref.c tcl_cmd.c
 
 EXTRA_DIST = signal-test.tcl Makefile.mingw
 

Modified: branches/soc-2006-file-loggers/plugins/tcl/Makefile.mingw
===================================================================
--- branches/soc-2006-file-loggers/plugins/tcl/Makefile.mingw	2006-06-24 12:04:32 UTC (rev 16329)
+++ branches/soc-2006-file-loggers/plugins/tcl/Makefile.mingw	2006-06-24 18:11:59 UTC (rev 16330)
@@ -61,6 +61,7 @@
 ##
 
 C_SRC =			tcl.c \
+			tcl_cmd.c \
 			tcl_cmds.c \
 			tcl_glib.c \
 			tcl_ref.c \

Modified: branches/soc-2006-file-loggers/plugins/tcl/tcl.c
===================================================================
--- branches/soc-2006-file-loggers/plugins/tcl/tcl.c	2006-06-24 12:04:32 UTC (rev 16329)
+++ branches/soc-2006-file-loggers/plugins/tcl/tcl.c	2006-06-24 18:11:59 UTC (rev 16330)
@@ -126,6 +126,7 @@
 
 	Tcl_CreateObjCommand(interp, "::gaim::account", tcl_cmd_account, (ClientData)NULL, NULL);
 	Tcl_CreateObjCommand(interp, "::gaim::buddy", tcl_cmd_buddy, (ClientData)NULL, NULL);
+	Tcl_CreateObjCommand(interp, "::gaim::cmd", tcl_cmd_cmd, (ClientData)NULL, NULL);
 	Tcl_CreateObjCommand(interp, "::gaim::connection", tcl_cmd_connection, (ClientData)NULL, NULL);
 	Tcl_CreateObjCommand(interp, "::gaim::conversation", tcl_cmd_conversation, (ClientData)NULL, NULL);
 	Tcl_CreateObjCommand(interp, "::gaim::core", tcl_cmd_core, (ClientData)NULL, NULL);
@@ -284,7 +285,9 @@
 
 	if (Tcl_EvalFile(interp, plugin->path) != TCL_OK) {
 		result = Tcl_GetObjResult(interp);
-		gaim_debug(GAIM_DEBUG_ERROR, "tcl", "Error evaluating %s: %s\n", plugin->path, Tcl_GetString(result));
+		gaim_debug(GAIM_DEBUG_ERROR, "tcl",
+		           "Error evaluating %s: %s\n", plugin->path,
+		           Tcl_GetString(result));
 		Tcl_DeleteInterp(interp);
 		return FALSE;
 	}
@@ -313,6 +316,7 @@
 	if (data != NULL) {
 		g_hash_table_remove(tcl_plugins, (gpointer)(data->interp));
 		gaim_signals_disconnect_by_handle(data->interp);
+		tcl_cmd_cleanup(data->interp);
 		tcl_signal_cleanup(data->interp);
 		Tcl_Release((ClientData)data->interp);
 		Tcl_DeleteInterp(data->interp);
@@ -341,6 +345,7 @@
 	if(!tcl_loaded)
 		return FALSE;
 	tcl_glib_init();
+	tcl_cmd_init();
 	tcl_signal_init();
 	gaim_tcl_ref_init();
 

Modified: branches/soc-2006-file-loggers/plugins/tcl/tcl_cmds.c
===================================================================
--- branches/soc-2006-file-loggers/plugins/tcl/tcl_cmds.c	2006-06-24 12:04:32 UTC (rev 16329)
+++ branches/soc-2006-file-loggers/plugins/tcl/tcl_cmds.c	2006-06-24 18:11:59 UTC (rev 16330)
@@ -73,7 +73,7 @@
 			return convo;
 	}
 	if (interp != NULL)
-		Tcl_SetStringObj(Tcl_GetObjResult(interp), "invalid account", -1);
+		Tcl_SetStringObj(Tcl_GetObjResult(interp), "invalid conversation", -1);
 	return NULL;
 }
 
@@ -541,6 +541,70 @@
 	return TCL_OK;
 }
 
+int tcl_cmd_cmd(ClientData unused, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+{
+	const char *cmds[] = { "register", "unregister", NULL };
+	enum { CMD_CMD_REGISTER, CMD_CMD_UNREGISTER } cmd;
+	struct tcl_cmd_handler *handler;
+	Tcl_Obj *result = Tcl_GetObjResult(interp);
+	GaimCmdId id;
+	int error;
+
+	if (objc < 2) {
+		Tcl_WrongNumArgs(interp, 1, objv, "subcommand ?args?");
+		return TCL_ERROR;
+	}
+
+	if ((error = Tcl_GetIndexFromObj(interp, objv[1], cmds, "subcommand", 0, (int *)&cmd)) != TCL_OK)
+		return error;
+
+	switch (cmd) {
+	case CMD_CMD_REGISTER:
+		if (objc != 9) {
+			Tcl_WrongNumArgs(interp, 2, objv, "cmd arglist priority flags prpl_id proc helpstr");
+			return TCL_ERROR;
+		}
+		handler = g_new0(struct tcl_cmd_handler, 1);
+		handler->cmd = objv[2];
+		handler->args = Tcl_GetString(objv[3]);
+		handler->nargs = strlen(handler->args);
+		if ((error = Tcl_GetIntFromObj(interp, objv[4],
+		                               &handler->priority)) != TCL_OK) {
+			g_free(handler);
+			return error;
+		}
+		if ((error = Tcl_GetIntFromObj(interp, objv[5],
+		                               &handler->flags)) != TCL_OK) {
+			g_free(handler);
+			return error;
+		}
+		handler->prpl_id = Tcl_GetString(objv[6]);
+		handler->proc = objv[7];
+		handler->helpstr = Tcl_GetString(objv[8]);
+		handler->interp = interp;
+		if ((id = tcl_cmd_register(handler)) == 0) {
+			tcl_cmd_handler_free(handler);
+			Tcl_SetIntObj(result, 0);
+		} else {
+			handler->id = id;
+			Tcl_SetIntObj(result, id);
+		}
+		break;
+	case CMD_CMD_UNREGISTER:
+		if (objc != 3) {
+			Tcl_WrongNumArgs(interp, 2, objv, "id");
+			return TCL_ERROR;
+		}
+		if ((error = Tcl_GetIntFromObj(interp, objv[2],
+		                               (int *)&id)) != TCL_OK)
+			return error;
+		tcl_cmd_unregister(id, interp);
+		break;
+	}
+
+	return TCL_OK;
+}
+
 int tcl_cmd_connection(ClientData unused, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
 	Tcl_Obj *result = Tcl_GetObjResult(interp), *list, *elem;

Modified: branches/soc-2006-file-loggers/plugins/tcl/tcl_gaim.h
===================================================================
--- branches/soc-2006-file-loggers/plugins/tcl/tcl_gaim.h	2006-06-24 12:04:32 UTC (rev 16329)
+++ branches/soc-2006-file-loggers/plugins/tcl/tcl_gaim.h	2006-06-24 18:11:59 UTC (rev 16330)
@@ -26,6 +26,7 @@
 #include <tcl.h>
 
 #include "internal.h"
+#include "cmds.h"
 #include "plugin.h"
 #include "value.h"
 #include "stringref.h"
@@ -45,6 +46,23 @@
 	GaimValue **argtypes;
 };
 
+struct tcl_cmd_handler {
+	int id;
+	Tcl_Obj *cmd;
+	Tcl_Interp *interp;
+
+	Tcl_Obj *namespace;
+	/* These are temporary during setup */
+	const char *args;
+	int priority;
+	int flags;
+	const char *prpl_id;
+	Tcl_Obj *proc;
+	const char *helpstr;
+
+	int nargs;
+};
+
 extern GaimPlugin *_tcl_plugin;
 
 /* Capitalized this way because these are "types" */
@@ -65,6 +83,12 @@
 gboolean tcl_signal_connect(struct tcl_signal_handler *handler);
 void tcl_signal_disconnect(void *instance, const char *signal, Tcl_Interp *interp);
 
+void tcl_cmd_init(void);
+void tcl_cmd_handler_free(struct tcl_cmd_handler *handler);
+void tcl_cmd_cleanup(Tcl_Interp *interp);
+GaimCmdId tcl_cmd_register(struct tcl_cmd_handler *handler);
+void tcl_cmd_unregister(GaimCmdId id, Tcl_Interp *interp);
+
 void gaim_tcl_ref_init(void);
 void *gaim_tcl_ref_get(Tcl_Interp *interp, Tcl_Obj *obj, GaimStringref *type);
 Tcl_Obj *gaim_tcl_ref_new(GaimStringref *type, void *value);
@@ -72,6 +96,7 @@
 Tcl_ObjCmdProc tcl_cmd_account;
 Tcl_ObjCmdProc tcl_cmd_signal_connect;
 Tcl_ObjCmdProc tcl_cmd_buddy;
+Tcl_ObjCmdProc tcl_cmd_cmd;
 Tcl_ObjCmdProc tcl_cmd_connection;
 Tcl_ObjCmdProc tcl_cmd_conversation;
 Tcl_ObjCmdProc tcl_cmd_core;

Modified: branches/soc-2006-file-loggers/plugins/tcl/tcl_signals.c
===================================================================
--- branches/soc-2006-file-loggers/plugins/tcl/tcl_signals.c	2006-06-24 12:04:32 UTC (rev 16329)
+++ branches/soc-2006-file-loggers/plugins/tcl/tcl_signals.c	2006-06-24 18:11:59 UTC (rev 16330)
@@ -387,7 +387,6 @@
 	g_string_free(val, TRUE);
 	g_free(vals);
 	g_free(strs);
-	
 
 	return retval;
 }

Modified: branches/soc-2006-file-loggers/src/cmds.h
===================================================================
--- branches/soc-2006-file-loggers/src/cmds.h	2006-06-24 12:04:32 UTC (rev 16329)
+++ branches/soc-2006-file-loggers/src/cmds.h	2006-06-24 18:11:59 UTC (rev 16330)
@@ -56,14 +56,14 @@
 typedef guint GaimCmdId;
 
 enum _GaimCmdPriority {
-	GAIM_CMD_P_VERY_LOW = -1000,
-	GAIM_CMD_P_LOW      =     0,
-	GAIM_CMD_P_DEFAULT  =  1000,
-	GAIM_CMD_P_PRPL     =  2000,
-	GAIM_CMD_P_PLUGIN   =  3000,
-	GAIM_CMD_P_ALIAS    =  4000,
-	GAIM_CMD_P_HIGH     =  5000,
-	GAIM_CMD_P_VERYHIGH =  6000,
+	GAIM_CMD_P_VERY_LOW  = -1000,
+	GAIM_CMD_P_LOW       =     0,
+	GAIM_CMD_P_DEFAULT   =  1000,
+	GAIM_CMD_P_PRPL      =  2000,
+	GAIM_CMD_P_PLUGIN    =  3000,
+	GAIM_CMD_P_ALIAS     =  4000,
+	GAIM_CMD_P_HIGH      =  5000,
+	GAIM_CMD_P_VERY_HIGH =  6000,
 };
 
 enum _GaimCmdFlag {
@@ -111,11 +111,11 @@
  * @param f These are the flags. You need to at least pass one of GAIM_CMD_FLAG_IM or
  *          GAIM_CMD_FLAG_CHAT (can may pass both) in order for the command to ever actually
  *          be called.
- * @param prpl_id This is the prpl's id string. This is only meaningful is the proper flag is set.
+ * @param prpl_id This is the prpl's id string. This is only meaningful if the proper flag is set.
  * @param func This is the function to call when someone enters this command.
  * @param helpstr This is a whitespace sensitive, UTF-8, HTML string describing how to use the command.
  *                The preferred format of this string shall be the commands name, followed by a space
- *                and any arguments it accpets (if it takes any arguments, otherwise no space), follow
+ *                and any arguments it accepts (if it takes any arguments, otherwise no space), followed
  *                by a colon, two spaces, and a description of the command in sentence form. No slash
  *                before the command name.
  * @param data User defined data to pass to the GaimCmdFunc

Modified: branches/soc-2006-file-loggers/src/conversation.c
===================================================================
--- branches/soc-2006-file-loggers/src/conversation.c	2006-06-24 12:04:32 UTC (rev 16329)
+++ branches/soc-2006-file-loggers/src/conversation.c	2006-06-24 18:11:59 UTC (rev 16330)
@@ -46,39 +46,44 @@
 }
 
 static gboolean
-reset_typing(gpointer data)
+reset_typing_cb(gpointer data)
 {
 	GaimConversation *c = (GaimConversation *)data;
 	GaimConvIm *im;
 
-	if (!g_list_find(conversations, c))
-		return FALSE;
-
 	im = GAIM_CONV_IM(c);
 
 	gaim_conv_im_set_typing_state(im, GAIM_NOT_TYPING);
 	gaim_conv_im_update_typing(im);
 	gaim_conv_im_stop_typing_timeout(im);
 
+	gaim_signal_emit(gaim_conversations_get_handle(),
+					 "buddy-typing-stopped", c->account, c->name);
+
 	return FALSE;
 }
 
 static gboolean
-send_typed(gpointer data)
+send_typed_cb(gpointer data)
 {
 	GaimConversation *conv = (GaimConversation *)data;
 	GaimConnection *gc;
 	const char *name;
 
 	g_return_val_if_fail(conv != NULL, FALSE);
-	
+
 	gc   = gaim_conversation_get_gc(conv);
 	name = gaim_conversation_get_name(conv);
 
 	if (gc != NULL && name != NULL) {
-		gaim_conv_im_set_type_again(GAIM_CONV_IM(conv), TRUE);
+		/* We set this to 1 so that GAIM_TYPING will be sent
+		 * if the Gaim user types anything else.
+		 */
+		gaim_conv_im_set_type_again(GAIM_CONV_IM(conv), 1);
 
 		serv_send_typing(gc, name, GAIM_TYPED);
+		gaim_signal_emit(gaim_conversations_get_handle(),
+						 "buddy-typed", conv->account, conv->name);
 
 		gaim_debug(GAIM_DEBUG_MISC, "conversation", "typed...\n");
 	}
@@ -263,7 +268,6 @@
 	conv->account      = account;
 	conv->name         = g_strdup(name);
 	conv->title        = g_strdup(name);
-	conv->send_history = g_list_append(NULL, NULL);
 	conv->data         = g_hash_table_new_full(g_str_hash, g_str_equal,
 											   g_free, NULL);
 	/* copy features from the connection. */
@@ -419,20 +423,9 @@
 	conv->name = NULL;
 	conv->title = NULL;
 
-	for (node = g_list_first(conv->send_history);
-		 node != NULL;
-		 node = g_list_next(node)) {
-
-		if (node->data != NULL)
-			g_free(node->data);
-		node->data = NULL;
-	}
-
-	g_list_free(g_list_first(conv->send_history));
-
 	if (conv->type == GAIM_CONV_TYPE_IM) {
 		gaim_conv_im_stop_typing_timeout(conv->u.im);
-		gaim_conv_im_stop_type_again_timeout(conv->u.im);
+		gaim_conv_im_stop_send_typed_timeout(conv->u.im);
 
 		if (conv->u.im->icon != NULL)
 			gaim_buddy_icon_unref(conv->u.im->icon);
@@ -708,14 +701,6 @@
 	conv->logs = NULL;
 }
 
-GList *
-gaim_conversation_get_send_history(const GaimConversation *conv)
-{
-	g_return_val_if_fail(conv != NULL, NULL);
-
-	return conv->send_history;
-}
-
 GaimConvIm *
 gaim_conversation_get_im_data(const GaimConversation *conv)
 {
@@ -1006,9 +991,14 @@
 			gaim_signal_emit(gaim_conversations_get_handle(),
 							 "buddy-typing", im->conv->account, im->conv->name);
 		}
-		else
+		else if (state == GAIM_TYPED)
 		{
 			gaim_signal_emit(gaim_conversations_get_handle(),
+							 "buddy-typed", im->conv->account, im->conv->name);
+		}
+		else if (state == GAIM_NOT_TYPING)
+		{
+			gaim_signal_emit(gaim_conversations_get_handle(),
 							 "buddy-typing-stopped", im->conv->account, im->conv->name);
 		}
 	}
@@ -1036,7 +1026,7 @@
 	conv = gaim_conv_im_get_conversation(im);
 	name = gaim_conversation_get_name(conv);
 
-	im->typing_timeout = gaim_timeout_add(timeout * 1000, reset_typing, conv);
+	im->typing_timeout = gaim_timeout_add(timeout * 1000, reset_typing_cb, conv);
 }
 
 void
@@ -1060,11 +1050,14 @@
 }
 
 void
-gaim_conv_im_set_type_again(GaimConvIm *im, time_t val)
+gaim_conv_im_set_type_again(GaimConvIm *im, unsigned int val)
 {
 	g_return_if_fail(im != NULL);
 
-	im->type_again = val;
+	if (val == 0)
+		im->type_again = 0;
+	else
+		im->type_again = time(NULL) + val;
 }
 
 time_t
@@ -1076,32 +1069,32 @@
 }
 
 void
-gaim_conv_im_start_type_again_timeout(GaimConvIm *im)
+gaim_conv_im_start_send_typed_timeout(GaimConvIm *im)
 {
 	g_return_if_fail(im != NULL);
 
-	im->type_again_timeout = gaim_timeout_add(SEND_TYPED_TIMEOUT, send_typed,
+	im->send_typed_timeout = gaim_timeout_add(SEND_TYPED_TIMEOUT, send_typed_cb,
 											  gaim_conv_im_get_conversation(im));
 }
 
 void
-gaim_conv_im_stop_type_again_timeout(GaimConvIm *im)
+gaim_conv_im_stop_send_typed_timeout(GaimConvIm *im)
 {
 	g_return_if_fail(im != NULL);
 
-	if (im->type_again_timeout == 0)
+	if (im->send_typed_timeout == 0)
 		return;
 
-	gaim_timeout_remove(im->type_again_timeout);
-	im->type_again_timeout = 0;
+	gaim_timeout_remove(im->send_typed_timeout);
+	im->send_typed_timeout = 0;
 }
 
 guint
-gaim_conv_im_get_type_again_timeout(const GaimConvIm *im)
+gaim_conv_im_get_send_typed_timeout(const GaimConvIm *im)
 {
 	g_return_val_if_fail(im != NULL, 0);
 
-	return im->type_again_timeout;
+	return im->send_typed_timeout;
 }
 
 void
@@ -2110,6 +2103,12 @@
 										GAIM_SUBTYPE_ACCOUNT),
 						 gaim_value_new(GAIM_TYPE_STRING));
 
+	gaim_signal_register(handle, "buddy-typed",
+						 gaim_marshal_VOID__POINTER_POINTER, NULL, 2,
+						 gaim_value_new(GAIM_TYPE_SUBTYPE,
+										GAIM_SUBTYPE_ACCOUNT),
+						 gaim_value_new(GAIM_TYPE_STRING));
+
 	gaim_signal_register(handle, "buddy-typing-stopped",
 						 gaim_marshal_VOID__POINTER_POINTER, NULL, 2,
 						 gaim_value_new(GAIM_TYPE_SUBTYPE,

Modified: branches/soc-2006-file-loggers/src/conversation.h
===================================================================
--- branches/soc-2006-file-loggers/src/conversation.h	2006-06-24 12:04:32 UTC (rev 16329)
+++ branches/soc-2006-file-loggers/src/conversation.h	2006-06-24 18:11:59 UTC (rev 16330)
@@ -186,7 +186,7 @@
 	GaimTypingState typing_state;      /**< The current typing state.    */
 	guint  typing_timeout;             /**< The typing timer handle.     */
 	time_t type_again;                 /**< The type again time.         */
-	guint  type_again_timeout;         /**< The type again timer handle. */
+	guint  send_typed_timeout;         /**< The type again timer handle. */
 
 	GaimBuddyIcon *icon;               /**< The buddy icon.              */
 };
@@ -236,8 +236,6 @@
 
 	GList *logs;                /**< This conversation's logs           */
 
-	GList *send_history;        /**< The send history.                  */
-
 	union
 	{
 		GaimConvIm   *im;       /**< IM-specific data.                  */
@@ -441,15 +439,6 @@
 void gaim_conversation_close_logs(GaimConversation *conv);
 
 /**
- * Returns the specified conversation's send history.
- *
- * @param conv The conversation.
- *
- * @return The conversation's send history.
- */
-GList *gaim_conversation_get_send_history(const GaimConversation *conv);
-
-/**
  * Returns the specified conversation's IM-specific data.
  *
  * If the conversation type is not GAIM_CONV_TYPE_IM, this will return @c NULL.
@@ -677,19 +666,25 @@
 guint gaim_conv_im_get_typing_timeout(const GaimConvIm *im);
 
 /**
- * Sets the IM's time until it should send another typing notification.
+ * Sets the quiet-time when no GAIM_TYPING messages will be sent.
+ * Few protocols need this (maybe only MSN).  If the user is still
+ * typing after this quiet-period, then another GAIM_TYPING message
+ * will be sent.
  *
  * @param im  The IM.
- * @param val The time.
+ * @param val The number of seconds to wait before allowing another
+ *            GAIM_TYPING message to be sent to the user.  Or 0 to
+ *            not send another GAIM_TYPING message.
  */
-void gaim_conv_im_set_type_again(GaimConvIm *im, time_t val);
+void gaim_conv_im_set_type_again(GaimConvIm *im, unsigned int val);
 
 /**
- * Returns the IM's time until it should send another typing notification.
+ * Returns the time after which another GAIM_TYPING message should be sent.
  *
  * @param im The IM.
  *
- * @return The time.
+ * @return The time in seconds since the epoch.  Or 0 if no additional
+ *         GAIM_TYPING message should be sent.
  */
 time_t gaim_conv_im_get_type_again(const GaimConvIm *im);
 
@@ -698,14 +693,14 @@
  *
  * @param im      The IM.
  */
-void gaim_conv_im_start_type_again_timeout(GaimConvIm *im);
+void gaim_conv_im_start_send_typed_timeout(GaimConvIm *im);
 
 /**
  * Stops the IM's type again timeout.
  *
  * @param im The IM.
  */
-void gaim_conv_im_stop_type_again_timeout(GaimConvIm *im);
+void gaim_conv_im_stop_send_typed_timeout(GaimConvIm *im);
 
 /**
  * Returns the IM's type again timeout interval.
@@ -714,7 +709,7 @@
  *
  * @return The type again timeout interval.
  */
-guint gaim_conv_im_get_type_again_timeout(const GaimConvIm *im);
+guint gaim_conv_im_get_send_typed_timeout(const GaimConvIm *im);
 
 /**
  * Updates the visual typing notification for an IM conversation.

Modified: branches/soc-2006-file-loggers/src/ft.c
===================================================================
--- branches/soc-2006-file-loggers/src/ft.c	2006-06-24 12:04:32 UTC (rev 16329)
+++ branches/soc-2006-file-loggers/src/ft.c	2006-06-24 18:11:59 UTC (rev 16330)
@@ -388,8 +388,9 @@
 		           gaim_xfer_get_status(xfer) == GAIM_XFER_STATUS_ACCEPTED)
 		{
 			gchar* message = NULL;
+			GaimBuddy *buddy = gaim_find_buddy(xfer->account, xfer->who);
 			message = g_strdup_printf(_("%s is offering to send file %s"),
-				xfer->who, gaim_xfer_get_filename(xfer));
+				buddy ? gaim_buddy_get_alias(buddy) : xfer->who, gaim_xfer_get_filename(xfer));
 			gaim_xfer_conversation_write(xfer, message, FALSE);
 			g_free(message);
 			/* Ask for a filename to save to if it's not already given by a plugin */

Modified: branches/soc-2006-file-loggers/src/gtkblist.c
===================================================================
--- branches/soc-2006-file-loggers/src/gtkblist.c	2006-06-24 12:04:32 UTC (rev 16329)
+++ branches/soc-2006-file-loggers/src/gtkblist.c	2006-06-24 18:11:59 UTC (rev 16330)
@@ -1659,6 +1659,11 @@
 static void gaim_gtk_blist_drag_data_rcv_cb(GtkWidget *widget, GdkDragContext *dc, guint x, guint y,
 			  GtkSelectionData *sd, guint info, guint t)
 {
+	if (gtkblist->drag_timeout) {
+		g_source_remove(gtkblist->drag_timeout);
+		gtkblist->drag_timeout = 0;
+	}
+
 	if (sd->target == gdk_atom_intern("GAIM_BLIST_NODE", FALSE) && sd->data) {
 		GaimBlistNode *n = NULL;
 		GtkTreePath *path = NULL;

Modified: branches/soc-2006-file-loggers/src/gtkconv.c
===================================================================
--- branches/soc-2006-file-loggers/src/gtkconv.c	2006-06-24 12:04:32 UTC (rev 16329)
+++ branches/soc-2006-file-loggers/src/gtkconv.c	2006-06-24 18:11:59 UTC (rev 16330)
@@ -427,18 +427,14 @@
 }
 
 static void
-send_history_add(GaimConversation *conv, const char *message)
+send_history_add(GaimGtkConversation *gtkconv, const char *message)
 {
 	GList *first;
 
-	first = g_list_first(conv->send_history);
-
-	if (first->data)
-		g_free(first->data);
-
+	first = g_list_first(gtkconv->send_history);
+	g_free(first->data);
 	first->data = g_strdup(message);
-
-	conv->send_history = g_list_prepend(first, NULL);
+	gtkconv->send_history = g_list_prepend(first, NULL);
 }
 
 static gboolean
@@ -462,7 +458,7 @@
 		GtkTextIter end;
 
 		send_history = gtk_imhtml_get_markup(GTK_IMHTML(gtkconv->entry));
-		send_history_add(conv, send_history);
+		send_history_add(gtkconv, send_history);
 		g_free(send_history);
 
 		cmdline = cmd + strlen(prefix);
@@ -562,7 +558,7 @@
 
 		bufs = gtk_imhtml_get_markup_lines(GTK_IMHTML(gtkconv->entry));
 		for (i = 0; bufs[i]; i++) {
-			send_history_add(conv, bufs[i]);
+			send_history_add(gtkconv, bufs[i]);
 			if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM)
 				gaim_conv_im_send_with_flags(GAIM_CONV_IM(conv), bufs[i], flags);
 			else if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT)
@@ -572,7 +568,7 @@
 		g_strfreev(bufs);
 
 	} else {
-		send_history_add(conv, buf);
+		send_history_add(gtkconv, buf);
 		if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM)
 			gaim_conv_im_send_with_flags(GAIM_CONV_IM(conv), buf, flags);
 		else if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT)
@@ -1787,29 +1783,28 @@
 	if (event->state & GDK_CONTROL_MASK) {
 		switch (event->keyval) {
 			case GDK_Up:
-				if (!conv->send_history)
+				if (!gtkconv->send_history)
 					break;
 
-				if (!conv->send_history->prev) {
+				if (!gtkconv->send_history->prev) {
 					GtkTextIter start, end;
 
-					if (conv->send_history->data)
-						g_free(conv->send_history->data);
+					g_free(gtkconv->send_history->data);
 
 					gtk_text_buffer_get_start_iter(gtkconv->entry_buffer,
 												   &start);
 					gtk_text_buffer_get_end_iter(gtkconv->entry_buffer, &end);
 
-					conv->send_history->data =
+					gtkconv->send_history->data =
 						gtk_imhtml_get_markup(GTK_IMHTML(gtkconv->entry));
 				}
 
-				if (conv->send_history->next && conv->send_history->next->data) {
+				if (gtkconv->send_history->next && gtkconv->send_history->next->data) {
 					GObject *object;
 					GtkTextIter iter;
 					GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(gtkconv->entry));
 
-					conv->send_history = conv->send_history->next;
+					gtkconv->send_history = gtkconv->send_history->next;
 
 					/* Block the signal to prevent application of default formatting. */
 					object = g_object_ref(G_OBJECT(gtkconv->entry));
@@ -1824,7 +1819,7 @@
 
 					gtk_imhtml_clear(GTK_IMHTML(gtkconv->entry));
 					gtk_imhtml_append_text_with_images(
-						GTK_IMHTML(gtkconv->entry), conv->send_history->data,
+						GTK_IMHTML(gtkconv->entry), gtkconv->send_history->data,
 						0, NULL);
 					/* this is mainly just a hack so the formatting at the
 					 * cursor gets picked up. */
@@ -1836,15 +1831,15 @@
 				break;
 
 			case GDK_Down:
-				if (!conv->send_history)
+				if (!gtkconv->send_history)
 					break;
 
-				if (conv->send_history->prev &&	conv->send_history->prev->data) {
+				if (gtkconv->send_history->prev && gtkconv->send_history->prev->data) {
 					GObject *object;
 					GtkTextIter iter;
 					GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(gtkconv->entry));
 
-					conv->send_history = conv->send_history->prev;
+					gtkconv->send_history = gtkconv->send_history->prev;
 
 					/* Block the signal to prevent application of default formatting. */
 					object = g_object_ref(G_OBJECT(gtkconv->entry));
@@ -1859,11 +1854,11 @@
 
 					gtk_imhtml_clear(GTK_IMHTML(gtkconv->entry));
 					gtk_imhtml_append_text_with_images(
-						GTK_IMHTML(gtkconv->entry), conv->send_history->data,
+						GTK_IMHTML(gtkconv->entry), gtkconv->send_history->data,
 						0, NULL);
 					/* this is mainly just a hack so the formatting at the
 					 * cursor gets picked up. */
-					if (*(char *)conv->send_history->data) {
+					if (*(char *)gtkconv->send_history->data) {
 						gtk_text_buffer_get_end_iter(buffer, &iter);
 						gtk_text_buffer_move_mark_by_name(buffer, "insert", &iter);
 					} else {
@@ -2173,8 +2168,7 @@
 	if (gtk_text_iter_is_start(start_pos) && gtk_text_iter_is_end(end_pos)) {
 
 		/* We deleted all the text, so turn off typing. */
-		if (gaim_conv_im_get_type_again_timeout(im))
-			gaim_conv_im_stop_type_again_timeout(im);
+		gaim_conv_im_stop_send_typed_timeout(im);
 
 		serv_send_typing(gaim_conversation_get_gc(conv),
 						 gaim_conversation_get_name(conv),
@@ -2918,22 +2912,18 @@
 
 	im = GAIM_CONV_IM(conv);
 
-	if (gaim_conv_im_get_type_again_timeout(im))
-		gaim_conv_im_stop_type_again_timeout(im);
+	gaim_conv_im_stop_send_typed_timeout(im);
+	gaim_conv_im_start_send_typed_timeout(im);
 
-	gaim_conv_im_start_type_again_timeout(im);
-
+	/* Check if we need to send another GAIM_TYPING message */
 	if (first || (gaim_conv_im_get_type_again(im) != 0 &&
-				  time(NULL) > gaim_conv_im_get_type_again(im))) {
-
-		int timeout = serv_send_typing(gaim_conversation_get_gc(conv),
-									   (char *)gaim_conversation_get_name(conv),
-									   GAIM_TYPING);
-
-		if (timeout)
-			gaim_conv_im_set_type_again(im, time(NULL) + timeout);
-		else
-			gaim_conv_im_set_type_again(im, 0);
+				  time(NULL) > gaim_conv_im_get_type_again(im)))
+	{
+		unsigned int timeout;
+		timeout = serv_send_typing(gaim_conversation_get_gc(conv),
+								   gaim_conversation_get_name(conv),
+								   GAIM_TYPING);
+		gaim_conv_im_set_type_again(im, timeout);
 	}
 }
 
@@ -4347,6 +4337,7 @@
 	conv->ui_data = gtkconv;
 	gtkconv->active_conv = conv;
 	gtkconv->convs = g_list_prepend(gtkconv->convs, conv);
+	gtkconv->send_history = g_list_append(NULL, NULL);
 
 	/* Setup some initial variables. */
 	gtkconv->sg       = gtk_size_group_new(GTK_SIZE_GROUP_BOTH);
@@ -4515,6 +4506,10 @@
 
 	gtk_object_sink(GTK_OBJECT(gtkconv->tooltips));
 
+	gtkconv->send_history = g_list_first(gtkconv->send_history);
+	g_list_foreach(gtkconv->send_history, (GFunc)g_free, NULL);
+	g_list_free(gtkconv->send_history);
+
 	g_free(gtkconv);
 }
 

Modified: branches/soc-2006-file-loggers/src/gtkconv.h
===================================================================
--- branches/soc-2006-file-loggers/src/gtkconv.h	2006-06-24 12:04:32 UTC (rev 16329)
+++ branches/soc-2006-file-loggers/src/gtkconv.h	2006-06-24 18:11:59 UTC (rev 16330)
@@ -114,6 +114,7 @@
 {
 	GaimConversation *active_conv;
 	GList *convs;
+	GList *send_history;
 
 	GaimGtkWindow *win;
 

Modified: branches/soc-2006-file-loggers/src/gtkmain.c
===================================================================
--- branches/soc-2006-file-loggers/src/gtkmain.c	2006-06-24 12:04:32 UTC (rev 16329)
+++ branches/soc-2006-file-loggers/src/gtkmain.c	2006-06-24 18:11:59 UTC (rev 16330)
@@ -432,6 +432,7 @@
 	char *opt_session_arg = NULL;
 	int dologin_ret = -1;
 	char *search_path;
+	GList *accounts;
 #ifdef HAVE_SIGNAL_H
 	int sig_indx;	/* for setting up signal catching */
 	sigset_t sigset;
@@ -752,10 +753,14 @@
 		gaim_accounts_restore_current_statuses();
 	}
 
-	if (gaim_accounts_get_all_active() == NULL)
+	if ((accounts = gaim_accounts_get_all_active()) == NULL)
 	{
 		gaim_gtk_accounts_window_show();
 	}
+	else
+	{
+		g_list_free(accounts);
+	}
 
 #ifdef HAVE_STARTUP_NOTIFICATION
 	startup_notification_complete();

Modified: branches/soc-2006-file-loggers/src/gtkpounce.c
===================================================================
--- branches/soc-2006-file-loggers/src/gtkpounce.c	2006-06-24 12:04:32 UTC (rev 16329)
+++ branches/soc-2006-file-loggers/src/gtkpounce.c	2006-06-24 18:11:59 UTC (rev 16330)
@@ -81,6 +81,7 @@
 	GtkWidget *idle;
 	GtkWidget *idle_return;
 	GtkWidget *typing;
+	GtkWidget *typed;
 	GtkWidget *stop_typing;
 	GtkWidget *message_recv;
 
@@ -278,6 +279,9 @@
 	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->typing)))
 		events |= GAIM_POUNCE_TYPING;
 
+	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->typed)))
+		events |= GAIM_POUNCE_TYPED;
+
 	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->stop_typing)))
 		events |= GAIM_POUNCE_TYPING_STOPPED;
 
@@ -564,7 +568,7 @@
 	/* Create the "Pounce When Buddy..." frame. */
 	frame = gaim_gtk_make_frame(vbox2, _("Pounce When Buddy..."));
 
-	table = gtk_table_new(2, 4, FALSE);
+	table = gtk_table_new(5, 2, FALSE);
 	gtk_container_add(GTK_CONTAINER(frame), table);
 	gtk_table_set_col_spacings(GTK_TABLE(table), GAIM_HIG_BORDER);
 	gtk_widget_show(table);
@@ -583,29 +587,33 @@
 		gtk_check_button_new_with_mnemonic(_("Is no longer i_dle"));
 	dialog->typing =
 		gtk_check_button_new_with_mnemonic(_("Starts _typing"));
+	dialog->typed =
+		gtk_check_button_new_with_mnemonic(_("P_auses while typing"));
 	dialog->stop_typing =
 		gtk_check_button_new_with_mnemonic(_("Stops t_yping"));
 	dialog->message_recv =
 		gtk_check_button_new_with_mnemonic(_("Sends a _message"));
 
-	gtk_table_attach(GTK_TABLE(table), dialog->signon,       0, 1, 0, 1,
+	gtk_table_attach(GTK_TABLE(table), dialog->message_recv, 0, 1, 0, 1,
 					 GTK_FILL, 0, 0, 0);
-	gtk_table_attach(GTK_TABLE(table), dialog->signoff,      1, 2, 0, 1,
+	gtk_table_attach(GTK_TABLE(table), dialog->signon,       0, 1, 1, 2,
 					 GTK_FILL, 0, 0, 0);
-	gtk_table_attach(GTK_TABLE(table), dialog->away,         0, 1, 1, 2,
+	gtk_table_attach(GTK_TABLE(table), dialog->signoff,      0, 1, 2, 3,
 					 GTK_FILL, 0, 0, 0);
-	gtk_table_attach(GTK_TABLE(table), dialog->away_return,  1, 2, 1, 2,
+	gtk_table_attach(GTK_TABLE(table), dialog->away,         0, 1, 3, 4,
 					 GTK_FILL, 0, 0, 0);
-	gtk_table_attach(GTK_TABLE(table), dialog->idle,         0, 1, 2, 3,
+	gtk_table_attach(GTK_TABLE(table), dialog->away_return,  0, 1, 4, 5,
 					 GTK_FILL, 0, 0, 0);
-	gtk_table_attach(GTK_TABLE(table), dialog->idle_return,  1, 2, 2, 3,
+	gtk_table_attach(GTK_TABLE(table), dialog->idle,         1, 2, 0, 1,
 					 GTK_FILL, 0, 0, 0);
-	gtk_table_attach(GTK_TABLE(table), dialog->typing,       0, 1, 3, 4,
+	gtk_table_attach(GTK_TABLE(table), dialog->idle_return,  1, 2, 1, 2,
 					 GTK_FILL, 0, 0, 0);
-	gtk_table_attach(GTK_TABLE(table), dialog->stop_typing,  1, 2, 3, 4,
+	gtk_table_attach(GTK_TABLE(table), dialog->typing,       1, 2, 2, 3,
 					 GTK_FILL, 0, 0, 0);
-	gtk_table_attach(GTK_TABLE(table), dialog->message_recv, 0, 1, 4, 5,
+	gtk_table_attach(GTK_TABLE(table), dialog->typed,        1, 2, 3, 4,
 					 GTK_FILL, 0, 0, 0);
+	gtk_table_attach(GTK_TABLE(table), dialog->stop_typing,  1, 2, 4, 5,
+					 GTK_FILL, 0, 0, 0);
 
 	gtk_widget_show(dialog->signon);
 	gtk_widget_show(dialog->signoff);
@@ -614,6 +622,7 @@
 	gtk_widget_show(dialog->idle);
 	gtk_widget_show(dialog->idle_return);
 	gtk_widget_show(dialog->typing);
+	gtk_widget_show(dialog->typed);
 	gtk_widget_show(dialog->stop_typing);
 	gtk_widget_show(dialog->message_recv);
 
@@ -845,6 +854,8 @@
 									(events & GAIM_POUNCE_IDLE_RETURN));
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dialog->typing),
 									(events & GAIM_POUNCE_TYPING));
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dialog->typed),
+									(events & GAIM_POUNCE_TYPED));
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dialog->stop_typing),
 									(events & GAIM_POUNCE_TYPING_STOPPED));
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dialog->message_recv),
@@ -1429,6 +1440,8 @@
 		tmp = g_strdup_printf(
 				   (events & GAIM_POUNCE_TYPING) ?
 				   _("%s has started typing to you (%s)") :
+				   (events & GAIM_POUNCE_TYPED) ?
+				   _("%s has paused while typing to you (%s)") :
 				   (events & GAIM_POUNCE_SIGNON) ?
 				   _("%s has signed on (%s)") :
 				   (events & GAIM_POUNCE_IDLE_RETURN) ?

Modified: branches/soc-2006-file-loggers/src/gtksavedstatuses.c
===================================================================
--- branches/soc-2006-file-loggers/src/gtksavedstatuses.c	2006-06-24 12:04:32 UTC (rev 16329)
+++ branches/soc-2006-file-loggers/src/gtksavedstatuses.c	2006-06-24 18:11:59 UTC (rev 16330)
@@ -760,6 +760,10 @@
 				type = gaim_account_get_status_type(account, id);
 				gaim_savedstatus_set_substatus(saved_status, account, type, message);
 			}
+			else
+			{
+				gaim_savedstatus_unset_substatus(saved_status, account);
+			}
 			g_free(id);
 			g_free(message);
 		} while (gtk_tree_model_iter_next(model, &iter));

Modified: branches/soc-2006-file-loggers/src/gtkstatusbox.c
===================================================================
--- branches/soc-2006-file-loggers/src/gtkstatusbox.c	2006-06-24 12:04:32 UTC (rev 16329)
+++ branches/soc-2006-file-loggers/src/gtkstatusbox.c	2006-06-24 18:11:59 UTC (rev 16330)
@@ -744,7 +744,11 @@
 	{
 		g_source_remove(status_box->typing);
 		status_box->typing = 0;
-		status_menu_refresh_iter(status_box);
+		if (status_box->account != NULL)
+			update_to_reflect_account_status(status_box, status_box->account,
+							gaim_account_get_active_status(status_box->account));
+		else
+			status_menu_refresh_iter(status_box);
 		return TRUE;
 	}
 	

Modified: branches/soc-2006-file-loggers/src/pounce.c
===================================================================
--- branches/soc-2006-file-loggers/src/pounce.c	2006-06-24 12:04:32 UTC (rev 16329)
+++ branches/soc-2006-file-loggers/src/pounce.c	2006-06-24 18:11:59 UTC (rev 16330)
@@ -206,6 +206,8 @@
 		add_event_to_xmlnode(child, "return-from-idle");
 	if (events & GAIM_POUNCE_TYPING)
 		add_event_to_xmlnode(child, "start-typing");
+	if (events & GAIM_POUNCE_TYPED)
+		add_event_to_xmlnode(child, "typed");
 	if (events & GAIM_POUNCE_TYPING_STOPPED)
 		add_event_to_xmlnode(child, "stop-typing");
 	if (events & GAIM_POUNCE_MESSAGE_RECEIVED)
@@ -411,7 +413,7 @@
 	else if (!strcmp(element_name, "option")) {
 		if (!strcmp(data->option_type, "on-away"))
 			data->options |= GAIM_POUNCE_OPTION_AWAY;
-		
+
 		g_free(data->option_type);
 		data->option_type = NULL;
 	}
@@ -430,6 +432,8 @@
 			data->events |= GAIM_POUNCE_IDLE_RETURN;
 		else if (!strcmp(data->event_type, "start-typing"))
 			data->events |= GAIM_POUNCE_TYPING;
+		else if (!strcmp(data->event_type, "typed"))
+			data->events |= GAIM_POUNCE_TYPED;
 		else if (!strcmp(data->event_type, "stop-typing"))
 			data->events |= GAIM_POUNCE_TYPING_STOPPED;
 		else if (!strcmp(data->event_type, "message-received"))
@@ -1059,10 +1063,16 @@
 	conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, name, account);
 	if (conv != NULL)
 	{
+		GaimTypingState state;
 		GaimPounceEvent event;
 
-		event = (gaim_conv_im_get_typing_state(GAIM_CONV_IM(conv)) == GAIM_TYPING
-				 ? GAIM_POUNCE_TYPING : GAIM_POUNCE_TYPING_STOPPED);
+		state = gaim_conv_im_get_typing_state(GAIM_CONV_IM(conv));
+		if (state == GAIM_TYPED)
+			event = GAIM_POUNCE_TYPED;
+		else if (state == GAIM_NOT_TYPING)
+			event = GAIM_POUNCE_TYPING_STOPPED;
+		else
+			event = GAIM_POUNCE_TYPING;
 
 		gaim_pounce_execute(account, name, event);
 	}
@@ -1105,6 +1115,8 @@
 
 	gaim_signal_connect(conv_handle, "buddy-typing",
 						handle, GAIM_CALLBACK(buddy_typing_cb), NULL);
+	gaim_signal_connect(conv_handle, "buddy-typed",
+						handle, GAIM_CALLBACK(buddy_typing_cb), NULL);
 	gaim_signal_connect(conv_handle, "buddy-typing-stopped",
 						handle, GAIM_CALLBACK(buddy_typing_cb), NULL);
 

Modified: branches/soc-2006-file-loggers/src/pounce.h
===================================================================
--- branches/soc-2006-file-loggers/src/pounce.h	2006-06-24 12:04:32 UTC (rev 16329)
+++ branches/soc-2006-file-loggers/src/pounce.h	2006-06-24 18:11:59 UTC (rev 16330)
@@ -35,16 +35,17 @@
  */
 typedef enum
 {
-	GAIM_POUNCE_NONE           = 0x00, /**< No events.                    */
-	GAIM_POUNCE_SIGNON         = 0x01, /**< The buddy signed on.          */
-	GAIM_POUNCE_SIGNOFF        = 0x02, /**< The buddy signed off.         */
-	GAIM_POUNCE_AWAY           = 0x04, /**< The buddy went away.          */
-	GAIM_POUNCE_AWAY_RETURN    = 0x08, /**< The buddy returned from away. */
-	GAIM_POUNCE_IDLE           = 0x10, /**< The buddy became idle.        */
-	GAIM_POUNCE_IDLE_RETURN    = 0x20, /**< The buddy is no longer idle.  */
-	GAIM_POUNCE_TYPING         = 0x40, /**< The buddy started typing.     */
-	GAIM_POUNCE_TYPING_STOPPED = 0x80, /**< The buddy stopped typing.     */
-	GAIM_POUNCE_MESSAGE_RECEIVED = 0x100 /**< The buddy sent a message    */
+	GAIM_POUNCE_NONE             = 0x000, /**< No events.                    */
+	GAIM_POUNCE_SIGNON           = 0x001, /**< The buddy signed on.          */
+	GAIM_POUNCE_SIGNOFF          = 0x002, /**< The buddy signed off.         */
+	GAIM_POUNCE_AWAY             = 0x004, /**< The buddy went away.          */
+	GAIM_POUNCE_AWAY_RETURN      = 0x008, /**< The buddy returned from away. */
+	GAIM_POUNCE_IDLE             = 0x010, /**< The buddy became idle.        */
+	GAIM_POUNCE_IDLE_RETURN      = 0x020, /**< The buddy is no longer idle.  */
+	GAIM_POUNCE_TYPING           = 0x040, /**< The buddy started typing.     */
+	GAIM_POUNCE_TYPED            = 0x080, /**< The buddy has entered text.   */
+	GAIM_POUNCE_TYPING_STOPPED   = 0x100, /**< The buddy stopped typing.     */
+	GAIM_POUNCE_MESSAGE_RECEIVED = 0x200  /**< The buddy sent a message      */
 
 } GaimPounceEvent;
 

Modified: branches/soc-2006-file-loggers/src/protocols/irc/cmds.c
===================================================================
--- branches/soc-2006-file-loggers/src/protocols/irc/cmds.c	2006-06-24 12:04:32 UTC (rev 16329)
+++ branches/soc-2006-file-loggers/src/protocols/irc/cmds.c	2006-06-24 18:11:59 UTC (rev 16330)
@@ -372,6 +372,8 @@
 		g_free(buf);
 
 		irc->quitting = TRUE;
+
+		gaim_account_set_status(irc->account, "offline", TRUE, NULL);
 	}
 
 	return 0;

Modified: branches/soc-2006-file-loggers/src/protocols/jabber/message.c
===================================================================
--- branches/soc-2006-file-loggers/src/protocols/jabber/message.c	2006-06-24 12:04:32 UTC (rev 16329)
+++ branches/soc-2006-file-loggers/src/protocols/jabber/message.c	2006-06-24 18:11:59 UTC (rev 16330)
@@ -589,7 +589,7 @@
 	return 1;
 }
 
-int jabber_send_typing(GaimConnection *gc, const char *who, int typing)
+unsigned int jabber_send_typing(GaimConnection *gc, const char *who, GaimTypingState state)
 {
 	JabberMessage *jm;
 	JabberBuddy *jb;
@@ -611,9 +611,9 @@
 	jm->to = g_strdup(who);
 	jm->id = jabber_get_next_id(jm->js);
 
-	if(GAIM_TYPING == typing)
+	if(GAIM_TYPING == state)
 		jm->chat_state = JM_STATE_COMPOSING;
-	else if(GAIM_TYPED == typing)
+	else if(GAIM_TYPED == state)
 		jm->chat_state = JM_STATE_PAUSED;
 	else
 		jm->chat_state = JM_STATE_ACTIVE;

Modified: branches/soc-2006-file-loggers/src/protocols/jabber/message.h
===================================================================
--- branches/soc-2006-file-loggers/src/protocols/jabber/message.h	2006-06-24 12:04:32 UTC (rev 16329)
+++ branches/soc-2006-file-loggers/src/protocols/jabber/message.h	2006-06-24 18:11:59 UTC (rev 16330)
@@ -71,7 +71,7 @@
 		GaimMessageFlags flags);
 int jabber_message_send_chat(GaimConnection *gc, int id, const char *message, GaimMessageFlags flags);
 
-int jabber_send_typing(GaimConnection *gc, const char *who, int typing);
+unsigned int jabber_send_typing(GaimConnection *gc, const char *who, GaimTypingState state);
 
 
 #endif /* _GAIM_JABBER_MESSAGE_H_ */

Modified: branches/soc-2006-file-loggers/src/protocols/msn/msn.c
===================================================================
--- branches/soc-2006-file-loggers/src/protocols/msn/msn.c	2006-06-24 12:04:32 UTC (rev 16329)
+++ branches/soc-2006-file-loggers/src/protocols/msn/msn.c	2006-06-24 18:11:59 UTC (rev 16330)
@@ -836,8 +836,8 @@
 	return 1;
 }
 
-static int
-msn_send_typing(GaimConnection *gc, const char *who, int typing)
+static unsigned int
+msn_send_typing(GaimConnection *gc, const char *who, GaimTypingState state)
 {
 	GaimAccount *account;
 	MsnSession *session;
@@ -847,7 +847,12 @@
 	account = gaim_connection_get_account(gc);
 	session = gc->proto_data;
 
-	if (!typing)
+	/*
+	 * TODO: I feel like this should be "if (state != GAIM_TYPING)"
+	 *       but this is how it was before, and I don't want to break
+	 *       anything. --KingAnt
+	 */
+	if (state == GAIM_NOT_TYPING)
 		return 0;
 
 	if (!g_ascii_strcasecmp(who, gaim_account_get_username(account)))

Modified: branches/soc-2006-file-loggers/src/protocols/novell/novell.c
===================================================================
--- branches/soc-2006-file-loggers/src/protocols/novell/novell.c	2006-06-24 12:04:32 UTC (rev 16329)
+++ branches/soc-2006-file-loggers/src/protocols/novell/novell.c	2006-06-24 18:11:59 UTC (rev 16330)
@@ -2303,8 +2303,8 @@
 	return 1;
 }
 
-static int
-novell_send_typing(GaimConnection * gc, const char *name, int typing)
+static unsigned int
+novell_send_typing(GaimConnection * gc, const char *name, GaimTypingState state)
 {
 	NMConference *conf = NULL;
 	NMUser *user;
@@ -2312,11 +2312,11 @@
 	NMERR_T rc = NM_OK;
 
 	if (gc == NULL || name == NULL)
-		return -1;
+		return 0;
 
 	user = gc->proto_data;
 	if (user == NULL)
-		return -1;
+		return 0;
 
 	/* Need to get the DN for the buddy so we can look up the convo */
 	dn = nm_lookup_dn(user, name);
@@ -2327,7 +2327,7 @@
 		if (conf) {
 
 			rc = nm_send_typing(user, conf,
-								((typing == GAIM_TYPING) ? TRUE : FALSE), NULL);
+								((state == GAIM_TYPING) ? TRUE : FALSE), NULL);
 			_check_for_disconnect(user, rc);
 
 		}

Modified: branches/soc-2006-file-loggers/src/protocols/oscar/oscar.c
===================================================================
--- branches/soc-2006-file-loggers/src/protocols/oscar/oscar.c	2006-06-24 12:04:32 UTC (rev 16329)
+++ branches/soc-2006-file-loggers/src/protocols/oscar/oscar.c	2006-06-24 18:11:59 UTC (rev 16330)
@@ -1113,9 +1113,8 @@
 
 	od->iconconnecting = FALSE;
 
-	if (od->icontimer)
-		gaim_timeout_remove(od->icontimer);
-	od->icontimer = gaim_timeout_add(100, gaim_icon_timerfunc, gc);
+	if (od->icontimer == 0)
+		od->icontimer = gaim_timeout_add(100, gaim_icon_timerfunc, gc);
 }
 
 static int
@@ -1815,9 +1814,8 @@
 				cur = cur->next;
 			if (!cur) {
 				od->requesticon = g_slist_append(od->requesticon, g_strdup(gaim_normalize(account, info->sn)));
-				if (od->icontimer)
-					gaim_timeout_remove(od->icontimer);
-				od->icontimer = gaim_timeout_add(500, gaim_icon_timerfunc, gc);
+				if (od->icontimer == 0)
+					od->icontimer = gaim_timeout_add(500, gaim_icon_timerfunc, gc);
 			}
 		}
 		g_free(b16);
@@ -3169,9 +3167,8 @@
 	od->requesticon = g_slist_remove(od->requesticon, sn);
 	g_free(sn);
 
-	if (od->icontimer)
-		gaim_timeout_remove(od->icontimer);
-	od->icontimer = gaim_timeout_add(500, gaim_icon_timerfunc, gc);
+	if (od->icontimer == 0)
+		od->icontimer = gaim_timeout_add(500, gaim_icon_timerfunc, gc);
 
 	return 1;
 }
@@ -3221,9 +3218,8 @@
 			cur = cur->next;
 	}
 
-	if (od->icontimer)
-		gaim_timeout_remove(od->icontimer);
-	od->icontimer = gaim_timeout_add(250, gaim_icon_timerfunc, gc);
+	if (od->icontimer == 0)
+		od->icontimer = gaim_timeout_add(250, gaim_icon_timerfunc, gc);
 
 	return 1;
 }
@@ -3234,6 +3230,8 @@
 	aim_userinfo_t *userinfo;
 	FlapConnection *conn;
 
+	od->icontimer = 0;
+
 	conn = flap_connection_getbytype(od, SNAC_FAMILY_BART);
 	if (!conn) {
 		if (!od->iconconnecting) {
@@ -3286,7 +3284,9 @@
 		g_free(sn);
 	}
 
-	return TRUE;
+	od->icontimer = gaim_timeout_add(100, gaim_icon_timerfunc, gc);
+
+	return FALSE;
 }
 
 /*
@@ -3945,8 +3945,8 @@
 		flap_connection_send_keepalive(od, conn);
 }
 
-static int
-oscar_send_typing(GaimConnection *gc, const char *name, int typing)
+static unsigned int
+oscar_send_typing(GaimConnection *gc, const char *name, GaimTypingState state)
 {
 	OscarData *od;
 	PeerConnection *conn;
@@ -3956,7 +3956,7 @@
 
 	if ((conn != NULL) && (conn->ready))
 	{
-		peer_odc_send_typing(conn, typing);
+		peer_odc_send_typing(conn, state);
 	}
 	else {
 		/* Don't send if this turkey is in our deny list */
@@ -3965,9 +3965,9 @@
 		if (!list) {
 			struct buddyinfo *bi = g_hash_table_lookup(od->buddyinfo, gaim_normalize(gc->account, name));
 			if (bi && bi->typingnot) {
-				if (typing == GAIM_TYPING)
+				if (state == GAIM_TYPING)
 					aim_im_sendmtn(od, 0x0001, name, 0x0002);
-				else if (typing == GAIM_TYPED)
+				else if (state == GAIM_TYPED)
 					aim_im_sendmtn(od, 0x0001, name, 0x0001);
 				else
 					aim_im_sendmtn(od, 0x0001, name, 0x0000);

Modified: branches/soc-2006-file-loggers/src/protocols/sametime/sametime.c
===================================================================
--- branches/soc-2006-file-loggers/src/protocols/sametime/sametime.c	2006-06-24 12:04:32 UTC (rev 16329)
+++ branches/soc-2006-file-loggers/src/protocols/sametime/sametime.c	2006-06-24 18:11:59 UTC (rev 16330)
@@ -3965,14 +3965,14 @@
 }
 
 
-static int mw_prpl_send_typing(GaimConnection *gc, const char *name,
-			       int typing) {
+static unsigned int mw_prpl_send_typing(GaimConnection *gc, const char *name,
+			       GaimTypingState state) {
   
   struct mwGaimPluginData *pd;
   struct mwIdBlock who = { (char *) name, NULL };
   struct mwConversation *conv;
 
-  gpointer t = GINT_TO_POINTER(!! typing);
+  gpointer t = GINT_TO_POINTER(!! state);
 
   g_return_val_if_fail(gc != NULL, 0);
   pd = gc->proto_data;
@@ -3984,7 +3984,7 @@
   if(mwConversation_isOpen(conv))
     return ! mwConversation_send(conv, mwImSend_TYPING, t);
 
-  if(typing) {
+  if ((state == GAIM_TYPING) || (state == GAIM_TYPED)) {
     /* let's only open a channel for typing, not for not-typing.
        Otherwise two users in psychic mode will continually open
        conversations to each other, never able to get rid of them, as
@@ -3996,6 +3996,11 @@
       mwConversation_open(conv);
   }
 
+  /*
+   * TODO: This should probably be "0."  When it's set to 1, the Gaim
+   *       core will call serv_send_typing(gc, who, GAIM_TYPING) once
+   *       every second until the Gaim user stops typing. --KingAnt
+   */
   return 1;
 }
 

Modified: branches/soc-2006-file-loggers/src/protocols/simple/simple.c
===================================================================
--- branches/soc-2006-file-loggers/src/protocols/simple/simple.c	2006-06-24 12:04:32 UTC (rev 16329)
+++ branches/soc-2006-file-loggers/src/protocols/simple/simple.c	2006-06-24 18:11:59 UTC (rev 16330)
@@ -1053,7 +1053,7 @@
 	send_sip_response(sip->gc, msg, 200, "OK", NULL);
 }
 
-static int simple_typing(GaimConnection *gc, const char *name, int typing) {
+static unsigned int simple_typing(GaimConnection *gc, const char *name, GaimTypingState state) {
 	struct simple_account_data *sip = gc->proto_data;
 
 	gchar *xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
@@ -1065,16 +1065,22 @@
 			"<refresh>60</refresh>\n"
 			"</isComposing>";
 	gchar *recv = g_strdup(name);
-	if(typing == GAIM_TYPING) {
+	if(state == GAIM_TYPING) {
 		gchar *msg = g_strdup_printf(xml, "active");
 		simple_send_message(sip, recv, msg, "application/im-iscomposing+xml");
 		g_free(msg);
-	} else {
+	} else /* TODO: Only if (state == GAIM_TYPED) ? */ {
 		gchar *msg = g_strdup_printf(xml, "idle");
 		simple_send_message(sip, recv, msg, "application/im-iscomposing+xml");
 		g_free(msg);
 	}
 	g_free(recv);
+	/*
+	 * TODO: Is this right?  It will cause the core to call
+	 *       serv_send_typing(gc, who, GAIM_TYPING) once every second
+	 *       until the user stops typing.  If that's not desired,
+	 *       then return 0 instead.
+	 */
 	return 1;
 }
 

Modified: branches/soc-2006-file-loggers/src/protocols/yahoo/yahoo.c
===================================================================
--- branches/soc-2006-file-loggers/src/protocols/yahoo/yahoo.c	2006-06-24 12:04:32 UTC (rev 16329)
+++ branches/soc-2006-file-loggers/src/protocols/yahoo/yahoo.c	2006-06-24 18:11:59 UTC (rev 16330)
@@ -670,6 +670,7 @@
 
 static void yahoo_process_message(GaimConnection *gc, struct yahoo_packet *pkt)
 {
+	struct yahoo_data *yd = gc->proto_data;
 	GSList *l = pkt->hash;
 	GSList *list = NULL;
 	struct _yahoo_im *im = NULL;
@@ -712,24 +713,29 @@
 
 	/** TODO: It seems that this check should be per IM, not global */
 	/* Check for the Doodle IMV */
-	if(im != NULL && imv != NULL && !strcmp(imv, "doodle;11"))
+	if (im != NULL && imv!= NULL && im->from != NULL)
 	{
-		GaimWhiteboard *wb;
+		g_hash_table_replace(yd->imvironments, g_strdup(im->from), g_strdup(imv));
 
-		if (!yahoo_privacy_check(gc, im->from)) {
-			gaim_debug_info("yahoo", "Doodle request from %s dropped.\n", im->from);
-			return;
-		}
+		if (strcmp(imv, "doodle;11") == 0)
+		{
+			GaimWhiteboard *wb;
 
-		wb = gaim_whiteboard_get_session(gc->account, im->from);
+			if (!yahoo_privacy_check(gc, im->from)) {
+				gaim_debug_info("yahoo", "Doodle request from %s dropped.\n", im->from);
+				return;
+			}
 
-		/* If a Doodle session doesn't exist between this user */
-		if(wb == NULL)
-		{
-			wb = gaim_whiteboard_create(gc->account, im->from, DOODLE_STATE_REQUESTED);
+			wb = gaim_whiteboard_get_session(gc->account, im->from);
 
-			yahoo_doodle_command_send_request(gc, im->from);
-			yahoo_doodle_command_send_ready(gc, im->from);
+			/* If a Doodle session doesn't exist between this user */
+			if(wb == NULL)
+			{
+				wb = gaim_whiteboard_create(gc->account, im->from, DOODLE_STATE_REQUESTED);
+
+				yahoo_doodle_command_send_request(gc, im->from);
+				yahoo_doodle_command_send_ready(gc, im->from);
+			}
 		}
 	}
 
@@ -2576,6 +2582,7 @@
 	/* TODO: Is there a good grow size for the buffer? */
 	yd->txbuf = gaim_circ_buffer_new(0);
 	yd->friends = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, yahoo_friend_free);
+	yd->imvironments = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
 	yd->confs = NULL;
 	yd->conf_id = 2;
 
@@ -2628,6 +2635,7 @@
 		yahoo_c_leave(gc, 1); /* 1 = YAHOO_CHAT_ID */
 
 	g_hash_table_destroy(yd->friends);
+	g_hash_table_destroy(yd->imvironments);
 	g_free(yd->chat_name);
 
 	g_free(yd->cookie_y);
@@ -3101,14 +3109,30 @@
 		yahoo_packet_hash_str(pkt, 97, "1");
 	yahoo_packet_hash_str(pkt, 14, msg2);
 
-	/* If this message is to a user who is also Doodling with the local user,
+	/*
+	 * IMVironment.
+	 *
+	 * If this message is to a user who is also Doodling with the local user,
 	 * format the chat packet with the correct IMV information (thanks Yahoo!)
-	*/
-	wb = gaim_whiteboard_get_session(gc->account, (char*)who);
+	 *
+	 * Otherwise attempt to use the same IMVironment as the remote user,
+	 * just so that we don't inadvertantly reset their IMVironment back
+	 * to nothing.
+	 *
+	 * If they have no set an IMVironment, then use the default.
+	 */
+	wb = gaim_whiteboard_get_session(gc->account, who);
 	if (wb)
-		yahoo_packet_hash_str(pkt,   63, "doodle;11");
+		yahoo_packet_hash_str(pkt, 63, "doodle;11");
 	else
-		yahoo_packet_hash_str(pkt,   63, ";0"); /* IMvironment */
+	{
+		const char *imv;
+		imv = g_hash_table_lookup(yd->imvironments, who);
+		if (imv != NULL)
+			yahoo_packet_hash_str(pkt, 63, imv);
+		else
+			yahoo_packet_hash_str(pkt, 63, ";0");
+	}
 
 	yahoo_packet_hash_str(pkt,   64, "0"); /* no idea */
 	yahoo_packet_hash_str(pkt, 1002, "1"); /* no idea, Yahoo 6 or later only it seems */
@@ -3131,12 +3155,12 @@
 	return ret;
 }
 
-static int yahoo_send_typing(GaimConnection *gc, const char *who, int typ)
+static unsigned int yahoo_send_typing(GaimConnection *gc, const char *who, GaimTypingState state)
 {
 	struct yahoo_data *yd = gc->proto_data;
 	struct yahoo_packet *pkt = yahoo_packet_new(YAHOO_SERVICE_NOTIFY, YAHOO_STATUS_TYPING, 0);
 	yahoo_packet_hash(pkt, "ssssss", 49, "TYPING", 1, gaim_connection_get_display_name(gc),
-	                  14, " ", 13, typ == GAIM_TYPING ? "1" : "0",
+	                  14, " ", 13, state == GAIM_TYPING ? "1" : "0",
 	                  5, who, 1002, "1");
 
 	yahoo_packet_send_and_free(pkt, yd);

Modified: branches/soc-2006-file-loggers/src/protocols/yahoo/yahoo.h
===================================================================
--- branches/soc-2006-file-loggers/src/protocols/yahoo/yahoo.h	2006-06-24 12:04:32 UTC (rev 16329)
+++ branches/soc-2006-file-loggers/src/protocols/yahoo/yahoo.h	2006-06-24 18:11:59 UTC (rev 16330)
@@ -105,6 +105,16 @@
 	GaimCircBuffer *txbuf;
 	guint txhandler;
 	GHashTable *friends;
+
+	/**
+	 * This is used to keep track of the IMVironment chosen
+	 * by people you talk to.  We don't do very much with
+	 * this right now... but at least now if the remote user
+	 * selects an IMVironment we won't reset it back to the
+	 * default of nothing.
+	 */
+	GHashTable *imvironments;
+
 	int current_status;
 	gboolean logged_in;
 	GString *tmp_serv_blist, *tmp_serv_ilist, *tmp_serv_plist;

Modified: branches/soc-2006-file-loggers/src/protocols/yahoo/yahoo_filexfer.c
===================================================================
--- branches/soc-2006-file-loggers/src/protocols/yahoo/yahoo_filexfer.c	2006-06-24 12:04:32 UTC (rev 16329)
+++ branches/soc-2006-file-loggers/src/protocols/yahoo/yahoo_filexfer.c	2006-06-24 18:11:59 UTC (rev 16330)
@@ -481,14 +481,18 @@
 	char *to = NULL;
 	char *msg = NULL;
 	char *url = NULL;
+	char *imv = NULL;
 	long expires = 0;
 	GaimXfer *xfer;
+	struct yahoo_data *yd;
 	struct yahoo_xfer_data *xfer_data;
 	char *service = NULL;
 	char *filename = NULL;
 	unsigned long filesize = 0L;
 	GSList *l;
 
+	yd = gc->proto_data;
+
 	for (l = pkt->hash; l; l = l->next) {
 		struct yahoo_pair *pair = l->data;
 
@@ -508,8 +512,19 @@
 			filesize = atol(pair->value);
 		if (pair->key == 49)
 			service = pair->value;
+		if (pair->key == 63)
+			imv = pair->value;
 	}
 
+	/*
+	 * The remote user has changed their IMVironment.  We
+	 * record it for later use.
+	 */
+	if (from && imv && service && (strcmp("IMVIRONMENT", service) == 0)) {
+		g_hash_table_replace(yd->imvironments, g_strdup(from), g_strdup(imv));
+		return;
+	}
+
 	if (pkt->service == YAHOO_SERVICE_P2PFILEXFER) {
 		if (service && (strcmp("FILEXFER", service) != 0)) {
 			gaim_debug_misc("yahoo", "unhandled service 0x%02x\n", pkt->service);

Modified: branches/soc-2006-file-loggers/src/protocols/zephyr/zephyr.c
===================================================================
--- branches/soc-2006-file-loggers/src/protocols/zephyr/zephyr.c	2006-06-24 12:04:32 UTC (rev 16329)
+++ branches/soc-2006-file-loggers/src/protocols/zephyr/zephyr.c	2006-06-24 18:11:59 UTC (rev 16330)
@@ -2450,14 +2450,15 @@
 	return "zephyr";
 }
 
-static int zephyr_send_typing(GaimConnection *gc, const char *who, int typing) {
+static unsigned int zephyr_send_typing(GaimConnection *gc, const char *who, GaimTypingState state) {
 	gchar *recipient;
 	zephyr_account *zephyr = gc->proto_data;
 	if (use_tzc(zephyr)) 
 		return 0;
 
-	if (!typing)
+	if (state == GAIM_NOT_TYPING)
 		return 0;
+
 	/* XXX We probably should care if this fails. Or maybe we don't want to */
 	if (!who) {
 		gaim_debug_info("zephyr", "who is null\n");
@@ -2476,6 +2477,12 @@
 	gaim_debug_info("zephyr","about to send typing notification to %s\n",recipient);
 	zephyr_send_message(zephyr,"MESSAGE","PERSONAL",recipient,"","","PING");
 	gaim_debug_info("zephyr","sent typing notification\n");
+
+	/*
+	 * TODO: Is this correct?  It means we will call
+	 *       serv_send_typing(gc, who, GAIM_TYPING) once every 15 seconds
+	 *       until the Gaim user stops typing.
+	 */
 	return ZEPHYR_TYPING_SEND_TIMEOUT;
 }
 

Modified: branches/soc-2006-file-loggers/src/prpl.h
===================================================================
--- branches/soc-2006-file-loggers/src/prpl.h	2006-06-24 12:04:32 UTC (rev 16329)
+++ branches/soc-2006-file-loggers/src/prpl.h	2006-06-24 18:11:59 UTC (rev 16330)
@@ -224,7 +224,7 @@
 					GaimMessageFlags flags);
 
 	void (*set_info)(GaimConnection *, const char *info);
-	int  (*send_typing)(GaimConnection *, const char *name, int typing);
+	unsigned int (*send_typing)(GaimConnection *, const char *name, GaimTypingState state);
 	void (*get_info)(GaimConnection *, const char *who);
 	void (*set_status)(GaimAccount *account, GaimStatus *status);
 

Modified: branches/soc-2006-file-loggers/src/server.c
===================================================================
--- branches/soc-2006-file-loggers/src/server.c	2006-06-24 12:04:32 UTC (rev 16329)
+++ branches/soc-2006-file-loggers/src/server.c	2006-06-24 18:11:59 UTC (rev 16330)
@@ -38,18 +38,16 @@
 #define SECS_BEFORE_RESENDING_AUTORESPONSE 600
 #define SEX_BEFORE_RESENDING_AUTORESPONSE "Only after you're married"
 
-/* This should return the elapsed time in seconds in which Gaim will not send
- * typing notifications.
- * if it returns zero, it will not send any more typing notifications
- * typing is a flag - TRUE for typing, FALSE for stopped typing */
-int serv_send_typing(GaimConnection *g, const char *name, int typing) {
+unsigned int
+serv_send_typing(GaimConnection *gc, const char *name, GaimTypingState state)
+{
 	GaimPluginProtocolInfo *prpl_info = NULL;
 
-	if (g != NULL && g->prpl != NULL)
-		prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(g->prpl);
+	if (gc != NULL && gc->prpl != NULL)
+		prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl);
 
-	if (g && prpl_info && prpl_info->send_typing)
-		return prpl_info->send_typing(g, name, typing);
+	if (prpl_info && prpl_info->send_typing)
+		return prpl_info->send_typing(gc, name, state);
 
 	return 0;
 }
@@ -150,8 +148,8 @@
 		lar->sent = time(NULL);
 	}
 
-	if (conv && gaim_conv_im_get_type_again_timeout(GAIM_CONV_IM(conv)))
-		gaim_conv_im_stop_type_again_timeout(GAIM_CONV_IM(conv));
+	if (conv && gaim_conv_im_get_send_typed_timeout(GAIM_CONV_IM(conv)))
+		gaim_conv_im_stop_send_typed_timeout(GAIM_CONV_IM(conv));
 
 	return val;
 }
@@ -593,7 +591,7 @@
 		else
 		{
 			gaim_signal_emit(gaim_conversations_get_handle(),
-							 "buddy-typing-stopped", gc->account, name);
+							 "buddy-typed", gc->account, name);
 		}
 	}
 
@@ -618,6 +616,11 @@
 		gaim_conv_im_set_typing_state(im, GAIM_NOT_TYPING);
 		gaim_conv_im_update_typing(im);
 	}
+	else
+	{
+		gaim_signal_emit(gaim_conversations_get_handle(),
+						 "buddy-typing-stopped", gc->account, name);
+	}
 
 	gaim_signal_emit(gaim_conversations_get_handle(),
 					 "buddy-typing-stopped", gc->account, name);

Modified: branches/soc-2006-file-loggers/src/server.h
===================================================================
--- branches/soc-2006-file-loggers/src/server.h	2006-06-24 12:04:32 UTC (rev 16329)
+++ branches/soc-2006-file-loggers/src/server.h	2006-06-24 18:11:59 UTC (rev 16330)
@@ -33,11 +33,27 @@
 extern "C" {
 #endif
 
+/**
+ * Send a typing message to a given user over a given connection.
+ *
+ * TODO: Could probably move this into the conversation API.
+ *
+ * @param typing One of GAIM_TYPING, GAIM_TYPED, or GAIM_NOT_TYPING.
+ * @return A quiet-period, specified in seconds, where Gaim will not
+ *         send any additional typing notification messages.  Most
+ *         protocols should return 0, which means that no additional
+ *         GAIM_TYPING messages need to be sent.  If this is 5, for
+ *         example, then Gaim will wait five seconds, and if the Gaim
+ *         user is still typing then Gaim will send another GAIM_TYPING
+ *         message.
+ */
+unsigned int serv_send_typing(GaimConnection *gc, const char *name, GaimTypingState state);
+
+void serv_move_buddy(GaimBuddy *, GaimGroup *, GaimGroup *);
 int  serv_send_im(GaimConnection *, const char *, const char *, GaimMessageFlags flags);
 void serv_get_info(GaimConnection *, const char *);
 void serv_set_info(GaimConnection *, const char *);
-int  serv_send_typing(GaimConnection *, const char *, int);
-void serv_move_buddy(GaimBuddy *, GaimGroup *, GaimGroup *);
+
 void serv_add_permit(GaimConnection *, const char *);
 void serv_add_deny(GaimConnection *, const char *);
 void serv_rem_permit(GaimConnection *, const char *);
@@ -51,12 +67,31 @@
 int  serv_chat_send(GaimConnection *, int, const char *, GaimMessageFlags flags);
 void serv_alias_buddy(GaimBuddy *);
 void serv_got_alias(GaimConnection *gc, const char *who, const char *alias);
+
+/**
+ * Receive a typing message from a remote user.  Either GAIM_TYPING
+ * or GAIM_TYPED.  If the user has stopped typing then use
+ * serv_got_typing_stopped instead.
+ *
+ * TODO: Could probably move this into the conversation API.
+ *
+ * @param timeout If this is a number greater than 0, then
+ *        Gaim will wait this number of seconds and then
+ *        set this buddy to the GAIM_NOT_TYPING state.  This
+ *        is used by protocols that send repeated typing messages
+ *        while the user is composing the message.
+ */
 void serv_got_typing(GaimConnection *gc, const char *name, int timeout,
 					 GaimTypingState state);
-void serv_set_buddyicon(GaimConnection *gc, const char *filename);
+
+/**
+ * TODO: Could probably move this into the conversation API.
+ */
 void serv_got_typing_stopped(GaimConnection *gc, const char *name);
+
 void serv_got_im(GaimConnection *gc, const char *who, const char *msg,
 				 GaimMessageFlags flags, time_t mtime);
+void serv_set_buddyicon(GaimConnection *gc, const char *filename);
 void serv_got_chat_invite(GaimConnection *gc, const char *name,
 						  const char *who, const char *message,
 						  GHashTable *data);

Modified: branches/soc-2006-file-loggers/src/xmlnode.c
===================================================================
--- branches/soc-2006-file-loggers/src/xmlnode.c	2006-06-24 12:04:32 UTC (rev 16329)
+++ branches/soc-2006-file-loggers/src/xmlnode.c	2006-06-24 18:11:59 UTC (rev 16330)
@@ -557,7 +557,9 @@
 {
 	struct _xmlnode_parser_data *xpd;
 	xmlnode *ret;
+#ifndef HAVE_LIBXML
 	GMarkupParseContext *context;
+#endif
 	gsize real_size;
 
 	g_return_val_if_fail(str != NULL, NULL);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16337
Author:   roast
Date:     2006-06-25 16:08:49 -0700 (Sun, 25 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16337&view=rev

Log Message:
-----------
fixed botched up 16271:16329 merge

Added Paths:
-----------
    branches/soc-2006-file-loggers/console/
    branches/soc-2006-file-loggers/console/Makefile
    branches/soc-2006-file-loggers/console/gntblist.c
    branches/soc-2006-file-loggers/console/gntblist.h
    branches/soc-2006-file-loggers/console/gntgaim.c
    branches/soc-2006-file-loggers/console/gntgaim.h
    branches/soc-2006-file-loggers/console/gntui.c
    branches/soc-2006-file-loggers/console/gntui.h
    branches/soc-2006-file-loggers/console/libgnt/
    branches/soc-2006-file-loggers/console/libgnt/Makefile
    branches/soc-2006-file-loggers/console/libgnt/gnt-skel.c
    branches/soc-2006-file-loggers/console/libgnt/gnt-skel.h
    branches/soc-2006-file-loggers/console/libgnt/gnt.h
    branches/soc-2006-file-loggers/console/libgnt/gntbox.c
    branches/soc-2006-file-loggers/console/libgnt/gntbox.h
    branches/soc-2006-file-loggers/console/libgnt/gntbutton.c
    branches/soc-2006-file-loggers/console/libgnt/gntbutton.h
    branches/soc-2006-file-loggers/console/libgnt/gntcolors.c
    branches/soc-2006-file-loggers/console/libgnt/gntcolors.h
    branches/soc-2006-file-loggers/console/libgnt/gntentry.c
    branches/soc-2006-file-loggers/console/libgnt/gntentry.h
    branches/soc-2006-file-loggers/console/libgnt/gntkeys.h
    branches/soc-2006-file-loggers/console/libgnt/gntlabel.c
    branches/soc-2006-file-loggers/console/libgnt/gntlabel.h
    branches/soc-2006-file-loggers/console/libgnt/gntmain.c
    branches/soc-2006-file-loggers/console/libgnt/gnttree.c
    branches/soc-2006-file-loggers/console/libgnt/gnttree.h
    branches/soc-2006-file-loggers/console/libgnt/gntutils.c
    branches/soc-2006-file-loggers/console/libgnt/gntutils.h
    branches/soc-2006-file-loggers/console/libgnt/gntwidget.c
    branches/soc-2006-file-loggers/console/libgnt/gntwidget.h
    branches/soc-2006-file-loggers/console/libgnt/test.c
    branches/soc-2006-file-loggers/plugins/tcl/tcl_cmd.c
    branches/soc-2006-file-loggers/plugins/tcl/tcl_ref.c
Added: branches/soc-2006-file-loggers/console/Makefile
===================================================================
--- branches/soc-2006-file-loggers/console/Makefile	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/Makefile	2006-06-25 23:08:49 UTC (rev 16337)
@@ -0,0 +1,27 @@
+CFLAGS=`pkg-config --cflags gaim gobject-2.0` -g -I./libgnt/
+LDFLAGS=`pkg-config --libs gaim gobject-2.0 libxml-2.0` -lncursesw -L./libgnt/ -lgnt
+
+GG_SOURCES = \
+	gntblist.c \
+	gntui.c
+
+GG_HEADERS = \
+	gntblist.h \
+	gntui.h
+
+GG_OBJECTS = \
+	gntblist.o \
+	gntui.o
+
+all: gntgaim
+
+gntgaim: gntgaim.o $(GG_OBJECTS)
+	$(CC) -o gntgaim gntgaim.o $(GG_OBJECTS) $(LDFLAGS)
+gntblist.o: gntblist.c $(GG_HEADERS)
+gntgaim.o: gntgaim.c gntgaim.h $(GG_HEADERS)
+gntui.o: gntui.c $(GG_HEADERS)
+
+clean:
+	rm *.o
+	rm gntgaim
+


Property changes on: branches/soc-2006-file-loggers/console/Makefile
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: branches/soc-2006-file-loggers/console/gntblist.c
===================================================================
--- branches/soc-2006-file-loggers/console/gntblist.c	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/gntblist.c	2006-06-25 23:08:49 UTC (rev 16337)
@@ -0,0 +1,369 @@
+#include <gaim/account.h>
+#include <gaim/blist.h>
+#include <signal.h>
+#include <gaim/util.h>
+#include <gaim/server.h>
+
+#include "gntgaim.h"
+#include "gntbox.h"
+#include "gnttree.h"
+
+#include "gntblist.h"
+#include <string.h>
+
+typedef struct
+{
+	GntWidget *window;
+	GntWidget *tree;
+
+	GntWidget *tooltip;
+	GaimBlistNode *tnode;		/* Who is the tooltip being displayed for? */
+} GGBlist;
+
+GGBlist *ggblist;
+
+static void add_buddy(GaimBuddy *buddy, GGBlist *ggblist);
+static void add_group(GaimGroup *group, GGBlist *ggblist);
+static void draw_tooltip(GGBlist *ggblist);
+
+static void
+new_node(GaimBlistNode *node)
+{
+}
+
+static void
+remove_tooltip(GGBlist *ggblist)
+{
+	gnt_widget_destroy(ggblist->tooltip);
+	ggblist->tooltip = NULL;
+	ggblist->tnode = NULL;
+}
+
+static void
+node_remove(GaimBuddyList *list, GaimBlistNode *node)
+{
+	GGBlist *ggblist = list->ui_data;
+
+	if (node->ui_data == NULL)
+		return;
+
+	gnt_tree_remove(GNT_TREE(ggblist->tree), node);
+	node->ui_data = NULL;
+
+	/* XXX: Depending on the node, we may want to remove the group/contact node if necessary */
+	if (GAIM_BLIST_NODE_IS_BUDDY(node))
+	{
+		GaimGroup *group = gaim_buddy_get_group((GaimBuddy*)node);
+		if (gaim_blist_get_group_online_count(group) == 0)
+			node_remove(list, (GaimBlistNode*)group);
+		else if (ggblist->tnode == (GaimBlistNode *)group)	/* Need to update the counts */
+			draw_tooltip(ggblist);
+	}
+
+	if (ggblist->tnode == node)
+	{
+		remove_tooltip(ggblist);
+	}
+}
+
+static void
+node_update(GaimBuddyList *list, GaimBlistNode *node)
+{
+	if (GAIM_BLIST_NODE_IS_BUDDY(node))
+	{
+		GaimBuddy *buddy = (GaimBuddy*)node;
+		if (gaim_presence_is_online(gaim_buddy_get_presence(buddy)))
+			add_buddy(buddy, list->ui_data);
+		else
+			node_remove(gaim_get_blist(), node);
+	}
+}
+
+static void
+new_list(GaimBuddyList *list)
+{
+}
+
+static GaimBlistUiOps blist_ui_ops = 
+{
+	new_list,
+	new_node,
+	NULL,
+	node_update,		/* This doesn't do crap */
+	node_remove,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL
+};
+
+static gpointer
+gg_blist_get_handle()
+{
+	static int handle;
+
+	return &handle;
+}
+
+static void
+add_group(GaimGroup *group, GGBlist *ggblist)
+{
+	GaimBlistNode *node = (GaimBlistNode *)group;
+	if (node->ui_data)
+		return;
+	node->ui_data = gnt_tree_add_row_after(GNT_TREE(ggblist->tree), group,
+			group->name, NULL, NULL);
+}
+
+static const char *
+get_buddy_display_name(GaimBuddy *buddy)
+{
+	static char text[2096];
+	char status[8];
+	GaimStatusPrimitive prim;
+	GaimPresence *presence;
+	GaimStatus *now;
+
+	presence = gaim_buddy_get_presence(buddy);
+	now = gaim_presence_get_active_status(presence);
+
+	prim = gaim_status_type_get_primitive(gaim_status_get_type(now));
+
+	switch(prim)
+	{
+#if 1
+		case GAIM_STATUS_OFFLINE:
+			strncpy(status, "x", sizeof(status) - 1);
+			break;
+		case GAIM_STATUS_AVAILABLE:
+			strncpy(status, "o", sizeof(status) - 1);
+			break;
+		default:
+			strncpy(status, ".", sizeof(status) - 1);
+			break;
+#else
+		/* XXX: Let's use these some time */
+		case GAIM_STATUS_OFFLINE:
+			strncpy(status, "M-bM-^JM-^W", sizeof(status) - 1);
+			break;
+		case GAIM_STATUS_AVAILABLE:
+			/* XXX: Detect idleness */
+			strncpy(status, "M-bM-^WM-/", sizeof(status) - 1);
+			break;
+		default:
+			strncpy(status, "M-bM-^JM-^V", sizeof(status) - 1);
+			break;
+#endif
+	}
+
+	snprintf(text, sizeof(text) - 1, "%s %s", status, gaim_buddy_get_alias(buddy));
+
+	return text;
+}
+
+static void
+add_buddy(GaimBuddy *buddy, GGBlist *ggblist)
+{
+	GaimGroup *group;
+	GaimBlistNode *node = (GaimBlistNode *)buddy;
+	if (node->ui_data)
+		return;
+
+	group = gaim_buddy_get_group(buddy);
+	add_group(group, ggblist);
+
+	node->ui_data = gnt_tree_add_row_after(GNT_TREE(ggblist->tree), buddy,
+				get_buddy_display_name(buddy), group, NULL);
+
+	if (ggblist->tnode == (GaimBlistNode*)group)
+		draw_tooltip(ggblist);
+}
+
+static void
+buddy_signed_on(GaimBuddy *buddy, GGBlist *ggblist)
+{
+	add_buddy(buddy, ggblist);
+}
+
+static void
+buddy_signed_off(GaimBuddy *buddy, GGBlist *ggblist)
+{
+	node_remove(gaim_get_blist(), (GaimBlistNode*)buddy);
+}
+
+GaimBlistUiOps *gg_blist_get_ui_ops()
+{
+	return &blist_ui_ops;
+}
+
+static void
+selection_activate(GntWidget *widget, GGBlist *ggblist)
+{
+	gnt_widget_set_focus(widget, FALSE);
+}
+
+static void
+draw_tooltip(GGBlist *ggblist)
+{
+	GaimBlistNode *node;
+	int x, y, top, width;
+	GString *str;
+	GaimPlugin *prpl;
+	GaimPluginProtocolInfo *prpl_info;
+	GaimAccount *account;
+	GntTree *tree;
+	GntWidget *widget, *box, *label;
+	char *title = NULL;
+
+	widget = ggblist->tree;
+	tree = GNT_TREE(widget);
+
+	if (ggblist->tooltip)
+	{
+		remove_tooltip(ggblist);
+	}
+
+	node = gnt_tree_get_selection_data(tree);
+	if (!node)
+		return;
+
+	str = g_string_new("");
+
+	if (GAIM_BLIST_NODE_IS_BUDDY(node))
+	{
+		GaimBuddy *buddy = (GaimBuddy *)node;
+		account = gaim_buddy_get_account(buddy);
+		
+		g_string_append_printf(str, _("Account: %s"), gaim_account_get_username(account));
+		
+		prpl = gaim_find_prpl(gaim_account_get_protocol_id(account));
+		prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(prpl);
+		if (prpl_info && prpl_info->tooltip_text)
+		{
+			GString *tip = g_string_new("");
+			char *strip, *br;
+			prpl_info->tooltip_text(buddy, tip, TRUE);
+
+			br = gaim_strreplace(tip->str, "\n", "<br>");
+			strip = gaim_markup_strip_html(br);
+			g_string_append(str, strip);
+			g_string_free(tip, TRUE);
+			g_free(strip);
+			g_free(br);
+		}
+
+		title = g_strdup(gaim_buddy_get_name(buddy));
+	}
+	else if (GAIM_BLIST_NODE_IS_GROUP(node))
+	{
+		GaimGroup *group = (GaimGroup *)node;
+
+		g_string_append_printf(str, _("Online: %d\nTotal: %d"),
+						gaim_blist_get_group_online_count(group),
+						gaim_blist_get_group_size(group, FALSE));
+
+		title = g_strdup(group->name);
+	}
+	else
+	{
+		g_string_free(str, TRUE);
+		return;
+	}
+
+	gnt_widget_get_position(widget, &x, &y);
+	gnt_widget_get_size(widget, &width, NULL);
+	top = gnt_tree_get_selection_visible_line(tree);
+
+	x += width;
+	y += top - 1;
+
+	box = gnt_box_new(FALSE, FALSE);
+	gnt_box_set_toplevel(GNT_BOX(box), TRUE);
+	GNT_WIDGET_SET_FLAGS(box, GNT_WIDGET_NO_SHADOW);
+	gnt_box_set_title(GNT_BOX(box), title);
+
+	gnt_box_add_widget(GNT_BOX(box), GNT_WIDGET(gnt_label_new(str->str)));
+
+	gnt_widget_set_position(box, x, y);
+	gnt_widget_draw(box);
+
+	g_free(title);
+	g_string_free(str, TRUE);
+	ggblist->tooltip = box;
+	ggblist->tnode = node;
+}
+
+static void
+selection_changed(GntWidget *widget, gpointer old, gpointer current, GGBlist *ggblist)
+{
+	draw_tooltip(ggblist);
+}
+
+
+static gboolean
+key_pressed(GntWidget *widget, const char *text, GGBlist *ggblist)
+{
+	if (text[0] == 27 && text[1] == 0)
+	{
+		/* Escape was pressed */
+		if (ggblist->tooltip)
+		{
+			gnt_widget_destroy(ggblist->tooltip);
+			ggblist->tooltip = NULL;
+			return TRUE;
+		}
+	}
+	return FALSE;
+}
+
+static void
+buddy_status_changed(GaimBuddy *buddy, GaimStatus *old, GaimStatus *now, GGBlist *ggblist)
+{
+	gnt_tree_change_text(GNT_TREE(ggblist->tree), buddy, get_buddy_display_name(buddy));
+	if (ggblist->tnode == (GaimBlistNode*)buddy)
+		draw_tooltip(ggblist);
+}
+
+void gg_blist_init()
+{
+	ggblist = g_new0(GGBlist, 1);
+
+	gaim_get_blist()->ui_data = ggblist;
+
+	ggblist->window = gnt_box_new(FALSE, FALSE);
+	gnt_box_set_toplevel(GNT_BOX(ggblist->window), TRUE);
+	gnt_box_set_title(GNT_BOX(ggblist->window), _("Buddy List"));
+	gnt_box_set_pad(GNT_BOX(ggblist->window), 0);
+
+	ggblist->tree = gnt_tree_new();
+	GNT_WIDGET_SET_FLAGS(ggblist->tree, GNT_WIDGET_NO_BORDER);
+	gnt_widget_set_size(ggblist->tree, 25, getmaxy(stdscr) - 2);
+
+	gnt_box_add_widget(GNT_BOX(ggblist->window), ggblist->tree);
+	gnt_widget_show(ggblist->window);
+
+	gaim_signal_connect(gaim_blist_get_handle(), "buddy-status-changed", gg_blist_get_handle(),
+				GAIM_CALLBACK(buddy_status_changed), ggblist);
+	
+#if 0
+	gaim_signal_connect(gaim_blist_get_handle(), "buddy-signed-on", gg_blist_get_handle(),
+				GAIM_CALLBACK(buddy_signed_on), ggblist);
+	gaim_signal_connect(gaim_blist_get_handle(), "buddy-signed-off", gg_blist_get_handle(),
+				GAIM_CALLBACK(buddy_signed_off), ggblist);
+
+	/* These I plan to use to indicate unread-messages etc. */
+	gaim_signal_connect(gaim_conversations_get_handle(), "received-im-msg", gg_blist_get_handle(),
+				GAIM_CALLBACK(received_im_msg), list);
+	gaim_signal_connect(gaim_conversations_get_handle(), "sent-im-msg", gg_blist_get_handle(),
+				GAIM_CALLBACK(sent_im_msg), NULL);
+
+	gaim_signal_connect(gaim_conversations_get_handle(), "received-chat-msg", gg_blist_get_handle(),
+				GAIM_CALLBACK(received_chat_msg), list);
+#endif
+
+	g_signal_connect(G_OBJECT(ggblist->tree), "selection_changed", G_CALLBACK(selection_changed), ggblist);
+	g_signal_connect(G_OBJECT(ggblist->tree), "key_pressed", G_CALLBACK(key_pressed), ggblist);
+	g_signal_connect(G_OBJECT(ggblist->tree), "activate", G_CALLBACK(selection_activate), ggblist);
+}
+


Property changes on: branches/soc-2006-file-loggers/console/gntblist.c
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: branches/soc-2006-file-loggers/console/gntblist.h
===================================================================
--- branches/soc-2006-file-loggers/console/gntblist.h	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/gntblist.h	2006-06-25 23:08:49 UTC (rev 16337)
@@ -0,0 +1,5 @@
+#include "blist.h"
+
+GaimBlistUiOps * gg_blist_get_ui_ops();
+
+void gg_blist_init();


Property changes on: branches/soc-2006-file-loggers/console/gntblist.h
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: branches/soc-2006-file-loggers/console/gntgaim.c
===================================================================
--- branches/soc-2006-file-loggers/console/gntgaim.c	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/gntgaim.c	2006-06-25 23:08:49 UTC (rev 16337)
@@ -0,0 +1,187 @@
+#include "account.h"
+#include "conversation.h"
+#include "core.h"
+#include "debug.h"
+#include "eventloop.h"
+#include "ft.h"
+#include "log.h"
+#include "notify.h"
+#include "prefs.h"
+#include "prpl.h"
+#include "pounce.h"
+#include "savedstatuses.h"
+#include "sound.h"
+#include "status.h"
+#include "util.h"
+#include "whiteboard.h"
+
+#include "gntgaim.h"
+
+/* Anything IO-related is directly copied from gtkgaim's source tree */
+
+static GaimCoreUiOps core_ops =
+{
+	NULL, /*gaim_gtk_prefs_init,*/
+	NULL, /*debug_init,*/
+	NULL, /*gaim_gtk_ui_init,*/
+	NULL, /*gaim_gtk_quit*/
+};
+
+static GaimCoreUiOps *
+gnt_core_get_ui_ops()
+{
+	return &core_ops;
+}
+
+#define GAIM_GTK_READ_COND  (G_IO_IN | G_IO_HUP | G_IO_ERR)
+#define GAIM_GTK_WRITE_COND (G_IO_OUT | G_IO_HUP | G_IO_ERR | G_IO_NVAL)
+
+typedef struct _GaimGtkIOClosure {
+	GaimInputFunction function;
+	guint result;
+	gpointer data;
+
+} GaimGtkIOClosure;
+
+static void gaim_gtk_io_destroy(gpointer data)
+{
+	g_free(data);
+}
+
+static gboolean gaim_gtk_io_invoke(GIOChannel *source, GIOCondition condition, gpointer data)
+{
+	GaimGtkIOClosure *closure = data;
+	GaimInputCondition gaim_cond = 0;
+
+	if (condition & GAIM_GTK_READ_COND)
+		gaim_cond |= GAIM_INPUT_READ;
+	if (condition & GAIM_GTK_WRITE_COND)
+		gaim_cond |= GAIM_INPUT_WRITE;
+
+#if 0
+	gaim_debug(GAIM_DEBUG_MISC, "gtk_eventloop",
+			   "CLOSURE: callback for %d, fd is %d\n",
+			   closure->result, g_io_channel_unix_get_fd(source));
+#endif
+
+#ifdef _WIN32
+	if(! gaim_cond) {
+#if DEBUG
+		gaim_debug(GAIM_DEBUG_MISC, "gtk_eventloop",
+			   "CLOSURE received GIOCondition of 0x%x, which does not"
+			   " match 0x%x (READ) or 0x%x (WRITE)\n",
+			   condition, GAIM_GTK_READ_COND, GAIM_GTK_WRITE_COND);
+#endif /* DEBUG */
+
+		return TRUE;
+	}
+#endif /* _WIN32 */
+
+	closure->function(closure->data, g_io_channel_unix_get_fd(source),
+			  gaim_cond);
+
+	return TRUE;
+}
+
+static guint gnt_input_add(gint fd, GaimInputCondition condition, GaimInputFunction function,
+							   gpointer data)
+{
+	GaimGtkIOClosure *closure = g_new0(GaimGtkIOClosure, 1);
+	GIOChannel *channel;
+	GIOCondition cond = 0;
+
+	closure->function = function;
+	closure->data = data;
+
+	if (condition & GAIM_INPUT_READ)
+		cond |= GAIM_GTK_READ_COND;
+	if (condition & GAIM_INPUT_WRITE)
+		cond |= GAIM_GTK_WRITE_COND;
+
+	channel = g_io_channel_unix_new(fd);
+	closure->result = g_io_add_watch_full(channel, G_PRIORITY_DEFAULT, cond,
+					      gaim_gtk_io_invoke, closure, gaim_gtk_io_destroy);
+
+#if 0
+	gaim_debug(GAIM_DEBUG_MISC, "gtk_eventloop",
+			   "CLOSURE: adding input watcher %d for fd %d\n",
+			   closure->result, fd);
+#endif
+
+	g_io_channel_unref(channel);
+	return closure->result;
+}
+
+static GaimEventLoopUiOps eventloop_ops =
+{
+	g_timeout_add,
+	(guint (*)(guint))g_source_remove,
+	gnt_input_add,
+	(guint (*)(guint))g_source_remove
+};
+
+GaimEventLoopUiOps *
+gnt_eventloop_get_ui_ops(void)
+{
+	return &eventloop_ops;
+}
+
+/* This is mostly copied from gtkgaim's source tree */
+static void
+init_libgaim()
+{
+	char *path;
+
+	gaim_debug_set_enabled(FALSE);
+
+	gaim_core_set_ui_ops(gnt_core_get_ui_ops());
+	gaim_eventloop_set_ui_ops(gnt_eventloop_get_ui_ops());
+
+	gaim_util_set_user_dir("/tmp/tmp/");		/* XXX: */
+
+	path = g_build_filename(gaim_user_dir(), "plugins", NULL);
+	gaim_plugins_add_search_path(path);
+	g_free(path);
+	gaim_plugins_add_search_path("/usr/local/lib/gaim");	/* XXX: */
+
+	if (!gaim_core_init(GAIM_GNT_UI))
+	{
+		fprintf(stderr, "OOPSSS!!\n");
+		abort();
+	}
+
+	/* TODO: Move blist loading into gaim_blist_init() */
+	gaim_set_blist(gaim_blist_new());
+	gaim_blist_load();
+
+	/* TODO: Move prefs loading into gaim_prefs_init() */
+	gaim_prefs_load();
+	gaim_prefs_update_old();
+
+	/* load plugins we had when we quit */
+	gaim_plugins_load_saved("/gaim/gtk/plugins/loaded");
+
+	/* TODO: Move pounces loading into gaim_pounces_init() */
+	gaim_pounces_load();
+
+}
+
+int main(int argc, char **argv)
+{
+	/* XXX: Don't puke */
+	freopen("/dev/null", "w", stderr);
+
+	/* Initialize the libgaim stuff */
+	init_libgaim();
+
+	/* Enable the accounts and restore the status */
+	gaim_accounts_restore_current_statuses();
+
+	/* Initialize the UI */
+	init_gnt_ui();
+
+	gaim_core_quit();
+
+	return 0;
+}
+


Property changes on: branches/soc-2006-file-loggers/console/gntgaim.c
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: branches/soc-2006-file-loggers/console/gntgaim.h
===================================================================
--- branches/soc-2006-file-loggers/console/gntgaim.h	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/gntgaim.h	2006-06-25 23:08:49 UTC (rev 16337)
@@ -0,0 +1,5 @@
+#include <glib.h>
+
+#define GAIM_GNT_UI "gnt-gaim"
+
+#define	_(x)	x


Property changes on: branches/soc-2006-file-loggers/console/gntgaim.h
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: branches/soc-2006-file-loggers/console/gntui.c
===================================================================
--- branches/soc-2006-file-loggers/console/gntui.c	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/gntui.c	2006-06-25 23:08:49 UTC (rev 16337)
@@ -0,0 +1,17 @@
+#include "gntui.h"
+
+void init_gnt_ui()
+{
+	gnt_init();
+
+	wbkgdset(stdscr, '\0' | COLOR_PAIR(GNT_COLOR_NORMAL));
+	werase(stdscr);
+	wrefresh(stdscr);
+
+	/* Initialize the buddy list */
+	gg_blist_init();
+	gaim_blist_set_ui_ops(gg_blist_get_ui_ops());
+
+	gnt_main();
+}
+


Property changes on: branches/soc-2006-file-loggers/console/gntui.c
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: branches/soc-2006-file-loggers/console/gntui.h
===================================================================
--- branches/soc-2006-file-loggers/console/gntui.h	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/gntui.h	2006-06-25 23:08:49 UTC (rev 16337)
@@ -0,0 +1,3 @@
+#include "gnt.h"
+
+void init_gnt_ui();


Property changes on: branches/soc-2006-file-loggers/console/gntui.h
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: branches/soc-2006-file-loggers/console/libgnt/Makefile
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/Makefile	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/libgnt/Makefile	2006-06-25 23:08:49 UTC (rev 16337)
@@ -0,0 +1,58 @@
+CFLAGS=`pkg-config --cflags gobject-2.0` -g
+LDFLAGS=`pkg-config --libs gobject-2.0` -lncursesw
+
+HEADERS = \
+	gntwidget.h \
+	gntbox.h \
+	gntbutton.h \
+	gntcolors.h \
+	gntentry.h \
+	gntlabel.h \
+	gnttree.h \
+	gntutils.h \
+	gnt.h
+
+SOURCES = \
+	gntwidget.c \
+	gntbox.c \
+	gntbutton.c \
+	gntcolors.c \
+	gntentry.c \
+	gntlabel.c \
+	gnttree.c \
+	gntutils.c \
+	gntmain.c
+
+OBJECTS = \
+	gntwidget.o \
+	gntbox.o \
+	gntbutton.o \
+	gntcolors.o \
+	gntentry.o \
+	gntlabel.o \
+	gnttree.o \
+	gntutils.o \
+	gntmain.o
+
+all: libgnt
+
+test2: $(OBJECTS)
+key: $(OBJECTS)
+
+gntwidget.o: gntwidget.c $(HEADERS)
+gntbox.o: gntbox.c $(HEADERS)
+gntbutton.o: gntbutton.c $(HEADERS)
+gntcolors.o: gntcolors.c $(HEADERS)
+gntentry.o: gntentry.c $(HEADERS)
+gntlabel.o: gntlabel.c $(HEADERS)
+gnttree.o: gnttree.c $(HEADERS)
+gntutils.o: gntutils.c $(HEADERS)
+gntmain.o: gntmain.c $(HEADERS)
+
+libgnt: $(OBJECTS)
+	$(CC) --shared -o libgnt.so $(OBJECTS)
+
+clean:
+	rm *.o
+	rm libgnt.so
+


Property changes on: branches/soc-2006-file-loggers/console/libgnt/Makefile
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: branches/soc-2006-file-loggers/console/libgnt/gnt-skel.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gnt-skel.c	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/libgnt/gnt-skel.c	2006-06-25 23:08:49 UTC (rev 16337)
@@ -0,0 +1,99 @@
+#include "gnt-skel.h"
+
+enum
+{
+	SIGS = 1,
+};
+
+static GntWidgetClass *parent_class = NULL;
+static guint signals[SIGS] = { 0 };
+
+static void
+gnt_skel_draw(GntWidget *widget)
+{
+	DEBUG;
+}
+
+static void
+gnt_skel_size_request(GntWidget *widget)
+{
+}
+
+static void
+gnt_skel_map(GntWidget *widget)
+{
+	if (widget->priv.width == 0 || widget->priv.height == 0)
+		gnt_widget_size_request(widget);
+	DEBUG;
+}
+
+static gboolean
+gnt_skel_key_pressed(GntWidget *widget, const char *text)
+{
+	return FALSE;
+}
+
+static void
+gnt_skel_destroy(GntWidget *widget)
+{
+}
+
+static void
+gnt_skel_class_init(GntSkelClass *klass)
+{
+	GObjectClass *obj_class = G_OBJECT_CLASS(klass);
+
+	parent_class = GNT_WIDGET_CLASS(klass);
+	parent_class->destroy = gnt_skel_destroy;
+	parent_class->draw = gnt_skel_draw;
+	parent_class->map = gnt_skel_map;
+	parent_class->size_request = gnt_skel_size_request;
+	parent_class->key_pressed = gnt_skel_key_pressed;
+
+	DEBUG;
+}
+
+static void
+gnt_skel_init(GTypeInstance *instance, gpointer class)
+{
+	DEBUG;
+}
+
+/******************************************************************************
+ * GntSkel API
+ *****************************************************************************/
+GType
+gnt_skel_get_gtype(void)
+{
+	static GType type = 0;
+
+	if(type == 0)
+	{
+		static const GTypeInfo info = {
+			sizeof(GntSkelClass),
+			NULL,					/* base_init		*/
+			NULL,					/* base_finalize	*/
+			(GClassInitFunc)gnt_skel_class_init,
+			NULL,					/* class_finalize	*/
+			NULL,					/* class_data		*/
+			sizeof(GntSkel),
+			0,						/* n_preallocs		*/
+			gnt_skel_init,			/* instance_init	*/
+		};
+
+		type = g_type_register_static(GNT_TYPE_WIDGET,
+									  "GntSkel",
+									  &info, 0);
+	}
+
+	return type;
+}
+
+GntWidget *gnt_skel_new()
+{
+	GntWidget *widget = g_object_new(GNT_TYPE_SKEL, NULL);
+	GntSkel *skel = GNT_SKEL(widget);
+
+	return widget;
+}
+


Property changes on: branches/soc-2006-file-loggers/console/libgnt/gnt-skel.c
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: branches/soc-2006-file-loggers/console/libgnt/gnt-skel.h
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gnt-skel.h	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/libgnt/gnt-skel.h	2006-06-25 23:08:49 UTC (rev 16337)
@@ -0,0 +1,47 @@
+#ifndef GNT_SKEL_H
+#define GNT_SKEL_H
+
+#include "gntwidget.h"
+#include "gnt.h"
+#include "gntcolors.h"
+#include "gntkeys.h"
+
+#define GNT_TYPE_SKEL				(gnt_skel_get_gtype())
+#define GNT_SKEL(obj)				(G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_SKEL, GntSkel))
+#define GNT_SKEL_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST((klass), GNT_TYPE_SKEL, GntSkelClass))
+#define GNT_IS_SKEL(obj)			(G_TYPE_CHECK_INSTANCE_TYPE((obj), GNT_TYPE_SKEL))
+#define GNT_IS_SKEL_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE((klass), GNT_TYPE_SKEL))
+#define GNT_SKEL_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS((obj), GNT_TYPE_SKEL, GntSkelClass))
+
+#define GNT_SKEL_FLAGS(obj)				(GNT_SKEL(obj)->priv.flags)
+#define GNT_SKEL_SET_FLAGS(obj, flags)		(GNT_SKEL_FLAGS(obj) |= flags)
+#define GNT_SKEL_UNSET_FLAGS(obj, flags)	(GNT_SKEL_FLAGS(obj) &= ~(flags))
+
+typedef struct _GnSkel			GntSkel;
+typedef struct _GnSkelPriv		GntSkelPriv;
+typedef struct _GnSkelClass		GntSkelClass;
+
+struct _GnSkel
+{
+	GntWidget parent;
+};
+
+struct _GnSkelClass
+{
+	GntWidgetClass parent;
+
+	void (*gnt_reserved1)(void);
+	void (*gnt_reserved2)(void);
+	void (*gnt_reserved3)(void);
+	void (*gnt_reserved4)(void);
+};
+
+G_BEGIN_DECLS
+
+GType gnt_skel_get_gtype(void);
+
+GntWidget *gnt_skel_new();
+
+G_END_DECLS
+
+#endif /* GNT_SKEL_H */


Property changes on: branches/soc-2006-file-loggers/console/libgnt/gnt-skel.h
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: branches/soc-2006-file-loggers/console/libgnt/gnt.h
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gnt.h	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/libgnt/gnt.h	2006-06-25 23:08:49 UTC (rev 16337)
@@ -0,0 +1,17 @@
+#include <glib.h>
+#include "gntwidget.h"
+#include "gntcolors.h"
+#include "gntkeys.h"
+
+/* XXX: Find a better place for this */
+#define SCROLL_HEIGHT	4096
+#define SCROLL_WIDTH 512
+
+void gnt_init();
+
+void gnt_main();
+
+void gnt_screen_take_focus(GntWidget *widget);
+
+void gnt_screen_remove_widget(GntWidget *widget);
+


Property changes on: branches/soc-2006-file-loggers/console/libgnt/gnt.h
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: branches/soc-2006-file-loggers/console/libgnt/gntbox.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntbox.c	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/libgnt/gntbox.c	2006-06-25 23:08:49 UTC (rev 16337)
@@ -0,0 +1,362 @@
+#include "gntbox.h"
+
+enum
+{
+	SIGS = 1,
+};
+
+static GntWidgetClass *parent_class = NULL;
+static guint signals[SIGS] = { 0 };
+
+static void
+gnt_box_draw(GntWidget *widget)
+{
+	GntBox *box = GNT_BOX(widget);
+	GList *iter;
+
+	for (iter = box->list; iter; iter = iter->next)
+	{
+		gnt_widget_draw(GNT_WIDGET(iter->data));
+	}
+
+	if (box->title)
+	{
+		gchar *title = g_strdup(box->title);
+		int pos = g_utf8_strlen(title, -1);
+
+		if (pos >= widget->priv.width - 2)
+		{
+			g_utf8_strncpy(title, box->title, widget->priv.width - 2);
+			pos = 1;
+		}
+		else
+		{
+			/* XXX: Position of the title might be configurable */
+			pos = (widget->priv.width - pos) / 2;
+		}
+		wbkgdset(widget->window, '\0' | COLOR_PAIR(GNT_COLOR_TITLE));
+		mvwprintw(widget->window, 0, pos, title);
+		g_free(title);
+	}
+	wrefresh(widget->window);
+	
+	DEBUG;
+}
+
+static void
+reposition_children(GntWidget *widget)
+{
+	GList *iter;
+	GntBox *box = GNT_BOX(widget);
+	int w, h, curx, cury, max;
+	gboolean has_border = FALSE;
+
+	w = h = 0;
+	max = -1;
+	curx = widget->priv.x;
+	cury = widget->priv.y;
+	if (!(GNT_WIDGET_FLAGS(widget) & GNT_WIDGET_NO_BORDER))
+	{
+		has_border = TRUE;
+		curx += 1;
+		cury += 1;
+	}
+
+	for (iter = box->list; iter; iter = iter->next)
+	{
+		gnt_widget_set_position(GNT_WIDGET(iter->data), curx, cury);
+		gnt_widget_get_size(GNT_WIDGET(iter->data), &w, &h);
+		if (box->vertical)
+		{
+			cury += h + box->pad;
+			if (max < w)
+				max = w;
+		}
+		else
+		{
+			curx += w + box->pad;
+			if (max < h)
+				max = h;
+		}
+	}
+
+	if (has_border)
+	{
+		curx += 1;
+		cury += 1;
+		max += 2;
+	}
+
+	if (box->vertical)
+	{
+		widget->priv.width = max;
+		widget->priv.height = cury - widget->priv.y;
+	}
+	else
+	{
+		widget->priv.width = curx - widget->priv.x;
+		widget->priv.height = max;
+	}
+}
+
+static void
+gnt_box_set_position(GntWidget *widget, int x, int y)
+{
+	gnt_widget_size_request(widget);
+	reposition_children(widget);
+}
+
+static void
+gnt_box_size_request(GntWidget *widget)
+{
+	GntBox *box = GNT_BOX(widget);
+	GList *iter;
+	
+	g_list_foreach(box->list, (GFunc)gnt_widget_size_request, NULL);
+
+	if (box->homogeneous)
+	{
+		int max = -1, w, h;
+
+		/* XXX: should probably be changed based on vertical-ness */
+		for (iter = box->list; iter; iter = iter->next)
+		{
+			gnt_widget_get_size(GNT_WIDGET(iter->data), &w, NULL);
+			if (max < w)
+				max = w;
+		}
+
+		for (iter = box->list; iter; iter = iter->next)
+		{
+			gnt_widget_get_size(GNT_WIDGET(iter->data), NULL, &h);
+			gnt_widget_set_size(GNT_WIDGET(iter->data), max, h);
+		}
+	}
+
+	reposition_children(widget);
+}
+
+static void
+gnt_box_map(GntWidget *widget)
+{
+	if (widget->priv.width == 0 || widget->priv.height == 0)
+		gnt_widget_size_request(widget);
+	DEBUG;
+}
+
+/* Ensures that the current widget can take focus */
+static void
+ensure_active(GntBox *box)
+{
+	int investigated = 0;
+	int total;
+
+	if (box->active == NULL)
+		box->active = box->list;
+
+	total = g_list_length(box->list);
+
+	while (box->active && !GNT_WIDGET_IS_FLAG_SET(box->active->data, GNT_WIDGET_CAN_TAKE_FOCUS))
+	{
+		box->active = box->active->next;
+		investigated++;
+	}
+
+	/* Rotate if necessary */
+	if (!box->active && investigated < total)
+	{
+		box->active = box->list;
+		while (investigated < total &&  !GNT_WIDGET_IS_FLAG_SET(box->active->data, GNT_WIDGET_CAN_TAKE_FOCUS))
+		{
+			box->active = box->active->next;
+			investigated++;
+		}
+	}
+}
+
+static gboolean
+gnt_box_key_pressed(GntWidget *widget, const char *text)
+{
+	GntBox *box = GNT_BOX(widget);
+
+	ensure_active(box);
+	if (box->active == NULL)
+		return FALSE;
+
+	if (gnt_widget_key_pressed(box->active->data, text))
+		return TRUE;
+	
+	if (text[0] == 27)
+	{
+		GList *now = NULL;
+		if (strcmp(text+1, GNT_KEY_LEFT) == 0)
+		{
+			now = box->active->prev;
+			if (now == NULL)
+				now = g_list_last(box->list);
+		}
+		else if (strcmp(text+1, GNT_KEY_RIGHT) == 0)
+		{
+			now = box->active->next;
+			if (now == NULL)
+				now = box->list;
+		}
+
+		if (now)
+		{
+			gnt_widget_set_focus(box->active->data, FALSE);
+			box->active = now;
+			gnt_widget_set_focus(box->active->data, TRUE);
+
+			return TRUE;
+		}
+	}
+
+	return FALSE;
+}
+
+static GntWidget *find_focused_widget(GntBox *box)
+{
+	GList *iter;
+
+	for (iter = box->list; iter; iter = iter->next)
+	{
+		GntWidget *w = iter->data;
+		
+		if (GNT_IS_BOX(w))
+		{
+			if ((w = find_focused_widget(GNT_BOX(w))) != NULL)
+				return w;
+		}
+		else
+		{
+			if (GNT_WIDGET_IS_FLAG_SET(w, GNT_WIDGET_CAN_TAKE_FOCUS) &&
+					GNT_WIDGET_IS_FLAG_SET(w, GNT_WIDGET_HAS_FOCUS))
+				return w;
+		}
+	}
+	return NULL;
+}
+
+static void
+gnt_box_lost_focus(GntWidget *widget)
+{
+	GntBox *box = GNT_BOX(widget);
+	GntWidget *p = widget;
+
+	while (p->parent)
+		p = p->parent;
+
+	p = find_focused_widget(GNT_BOX(p));
+	if (p)
+		gnt_widget_set_focus(p, FALSE);
+}
+
+static void
+gnt_box_destroy(GntWidget *w)
+{
+	GntBox *box = GNT_BOX(w);
+	GList *iter;
+
+	for (iter = box->list; iter; iter = iter->next)
+	{
+		gnt_widget_destroy(iter->data);
+	}
+
+	g_list_free(box->list);
+}
+
+static void
+gnt_box_class_init(GntBoxClass *klass)
+{
+	GObjectClass *obj_class = G_OBJECT_CLASS(klass);
+
+	parent_class = GNT_WIDGET_CLASS(klass);
+	parent_class->destroy = gnt_box_destroy;
+	parent_class->draw = gnt_box_draw;
+	parent_class->map = gnt_box_map;
+	parent_class->size_request = gnt_box_size_request;
+	parent_class->set_position = gnt_box_set_position;
+	parent_class->key_pressed = gnt_box_key_pressed;
+	parent_class->lost_focus = gnt_box_lost_focus;
+
+	DEBUG;
+}
+
+static void
+gnt_box_init(GTypeInstance *instance, gpointer class)
+{
+	DEBUG;
+}
+
+/******************************************************************************
+ * GntBox API
+ *****************************************************************************/
+GType
+gnt_box_get_gtype(void)
+{
+	static GType type = 0;
+
+	if(type == 0)
+	{
+		static const GTypeInfo info = {
+			sizeof(GntBoxClass),
+			NULL,					/* base_init		*/
+			NULL,					/* base_finalize	*/
+			(GClassInitFunc)gnt_box_class_init,
+			NULL,					/* class_finalize	*/
+			NULL,					/* class_data		*/
+			sizeof(GntBox),
+			0,						/* n_preallocs		*/
+			gnt_box_init,			/* instance_init	*/
+		};
+
+		type = g_type_register_static(GNT_TYPE_WIDGET,
+									  "GntBox",
+									  &info, 0);
+	}
+
+	return type;
+}
+
+GntWidget *gnt_box_new(gboolean homo, gboolean vert)
+{
+	GntWidget *widget = g_object_new(GNT_TYPE_BOX, NULL);
+	GntBox *box = GNT_BOX(widget);
+
+	box->homogeneous = homo;
+	box->vertical = vert;
+	box->pad = 1;
+	gnt_widget_set_take_focus(widget, TRUE);
+	GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW);
+
+	return widget;
+}
+
+void gnt_box_add_widget(GntBox *b, GntWidget *widget)
+{
+	b->list = g_list_append(b->list, widget);
+	widget->parent = GNT_WIDGET(b);
+}
+
+void gnt_box_set_title(GntBox *b, const char *title)
+{
+	g_free(b->title);
+	b->title = g_strdup(title);
+}
+
+void gnt_box_set_pad(GntBox *box, int pad)
+{
+	box->pad = pad;
+	/* XXX: Perhaps redraw if already showing? */
+}
+
+void gnt_box_set_toplevel(GntBox *box, gboolean set)
+{
+	GntWidget *widget = GNT_WIDGET(box);
+	if (set)
+		GNT_WIDGET_UNSET_FLAGS(widget, GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW);
+	else
+		GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW);
+}
+


Property changes on: branches/soc-2006-file-loggers/console/libgnt/gntbox.c
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: branches/soc-2006-file-loggers/console/libgnt/gntbox.h
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntbox.h	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/libgnt/gntbox.h	2006-06-25 23:08:49 UTC (rev 16337)
@@ -0,0 +1,63 @@
+#ifndef GNT_BOX_H
+#define GNT_BOX_H
+
+#include "gnt.h"
+#include "gntwidget.h"
+
+#define GNT_TYPE_BOX				(gnt_box_get_gtype())
+#define GNT_BOX(obj)				(G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_BOX, GntBox))
+#define GNT_BOX_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST((klass), GNT_TYPE_BOX, GntBoxClass))
+#define GNT_IS_BOX(obj)			(G_TYPE_CHECK_INSTANCE_TYPE((obj), GNT_TYPE_BOX))
+#define GNT_IS_BOX_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE((klass), GNT_TYPE_BOX))
+#define GNT_BOX_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS((obj), GNT_TYPE_BOX, GntBoxClass))
+
+typedef struct _GnBox			GntBox;
+typedef struct _GnBoxClass		GntBoxClass;
+
+struct _GnBox
+{
+	GntWidget parent;
+
+	gboolean vertical;
+	gboolean homogeneous;
+	GList *list;		/* List of widgets */
+
+	GList *active;
+	int pad;			/* Number of spaces to use between widgets */
+
+	char *title;
+
+    void (*gnt_reserved1)(void);
+    void (*gnt_reserved2)(void);
+    void (*gnt_reserved3)(void);
+    void (*gnt_reserved4)(void);
+};
+
+struct _GnBoxClass
+{
+	GntWidgetClass parent;
+
+	void (*gnt_reserved1)(void);
+	void (*gnt_reserved2)(void);
+	void (*gnt_reserved3)(void);
+	void (*gnt_reserved4)(void);
+};
+
+G_BEGIN_DECLS
+
+GType gnt_box_get_gtype(void);
+
+GntWidget *gnt_box_new(gboolean homo, gboolean vert);
+
+void gnt_box_add_widget(GntBox *box, GntWidget *widget);
+
+void gnt_box_set_title(GntBox *box, const char *title);
+
+void gnt_box_set_pad(GntBox *box, int pad);
+
+void gnt_box_set_toplevel(GntBox *box, gboolean set);
+
+G_END_DECLS
+
+#endif /* GNT_BOX_H */
+


Property changes on: branches/soc-2006-file-loggers/console/libgnt/gntbox.h
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: branches/soc-2006-file-loggers/console/libgnt/gntbutton.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntbutton.c	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/libgnt/gntbutton.c	2006-06-25 23:08:49 UTC (rev 16337)
@@ -0,0 +1,116 @@
+#include "gntbutton.h"
+
+enum
+{
+	SIGS = 1,
+};
+
+static GntWidgetClass *parent_class = NULL;
+static guint signals[SIGS] = { 0 };
+
+static void
+gnt_button_draw(GntWidget *widget)
+{
+	GntButton *button = GNT_BUTTON(widget);
+	GntColorType type;
+
+	if (GNT_WIDGET_FLAGS(widget) & GNT_WIDGET_HAS_FOCUS)
+		type = GNT_COLOR_HIGHLIGHT;
+	else
+		type = GNT_COLOR_NORMAL;
+	wbkgdset(widget->window, '\0' | COLOR_PAIR(type));
+	mvwprintw(widget->window, 1, 1, button->priv->text);
+
+	wrefresh(widget->window);
+
+	DEBUG;
+}
+
+static void
+gnt_button_size_request(GntWidget *widget)
+{
+	GntButton *button = GNT_BUTTON(widget);
+	widget->priv.width = g_utf8_strlen(button->priv->text, -1) + 2;
+	widget->priv.height = 3;
+}
+
+static void
+gnt_button_map(GntWidget *widget)
+{
+	if (widget->priv.width == 0 || widget->priv.height == 0)
+		gnt_widget_size_request(widget);
+	DEBUG;
+}
+
+static gboolean
+gnt_button_key_pressed(GntWidget *widget, const char *key)
+{
+	if (strcmp(key, GNT_KEY_ENTER) == 0)
+	{
+		gnt_widget_activate(widget);
+		return TRUE;
+	}
+	return FALSE;
+}
+
+static void
+gnt_button_class_init(GntWidgetClass *klass)
+{
+	GObjectClass *obj_class = G_OBJECT_CLASS(klass);
+
+	parent_class = GNT_WIDGET_CLASS(klass);
+	parent_class->draw = gnt_button_draw;
+	parent_class->map = gnt_button_map;
+	parent_class->size_request = gnt_button_size_request;
+	parent_class->key_pressed = gnt_button_key_pressed;
+
+	DEBUG;
+}
+
+static void
+gnt_button_init(GTypeInstance *instance, gpointer class)
+{
+	GntButton *button = GNT_BUTTON(instance);
+	button->priv = g_new0(GntButtonPriv, 1);
+	DEBUG;
+}
+
+/******************************************************************************
+ * GntButton API
+ *****************************************************************************/
+GType
+gnt_button_get_gtype(void) {
+	static GType type = 0;
+
+	if(type == 0) {
+		static const GTypeInfo info = {
+			sizeof(GntButtonClass),
+			NULL,					/* base_init		*/
+			NULL,					/* base_finalize	*/
+			(GClassInitFunc)gnt_button_class_init,
+			NULL,					/* class_finalize	*/
+			NULL,					/* class_data		*/
+			sizeof(GntButton),
+			0,						/* n_preallocs		*/
+			gnt_button_init,			/* instance_init	*/
+		};
+
+		type = g_type_register_static(GNT_TYPE_WIDGET,
+									  "GntButton",
+									  &info, 0);
+	}
+
+	return type;
+}
+
+GntWidget *gnt_button_new(const char *text)
+{
+	GntWidget *widget = g_object_new(GNT_TYPE_BUTTON, NULL);
+	GntButton *button = GNT_BUTTON(widget);
+
+	button->priv->text = g_strdup(text);
+	gnt_widget_set_take_focus(widget, TRUE);
+
+	return widget;
+}
+


Property changes on: branches/soc-2006-file-loggers/console/libgnt/gntbutton.c
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: branches/soc-2006-file-loggers/console/libgnt/gntbutton.h
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntbutton.h	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/libgnt/gntbutton.h	2006-06-25 23:08:49 UTC (rev 16337)
@@ -0,0 +1,55 @@
+#ifndef GNT_BUTTON_H
+#define GNT_BUTTON_H
+
+#include <glib.h>
+#include <glib-object.h>
+#include "gnt.h"
+#include "gntwidget.h"
+
+#define GNT_TYPE_BUTTON				(gnt_button_get_gtype())
+#define GNT_BUTTON(obj)				(G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_BUTTON, GntButton))
+#define GNT_BUTTON_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST((klass), GNT_TYPE_BUTTON, GntButtonClass))
+#define GNT_IS_BUTTON(obj)			(G_TYPE_CHECK_INSTANCE_TYPE((obj), GNT_TYPE_BUTTON))
+#define GNT_IS_BUTTON_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE((klass), GNT_TYPE_BUTTON))
+#define GNT_BUTTON_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS((obj), GNT_TYPE_BUTTON, GntButtonClass))
+
+typedef struct _GnButton			GntButton;
+typedef struct _GnButtonPriv		GntButtonPriv;
+typedef struct _GnButtonClass		GntButtonClass;
+
+struct _GnButtonPriv
+{
+	char *text;
+};
+
+struct _GnButton
+{
+	GntWidget parent;
+
+	GntButtonPriv *priv;
+
+    void (*gnt_reserved1)(void);
+    void (*gnt_reserved2)(void);
+    void (*gnt_reserved3)(void);
+    void (*gnt_reserved4)(void);
+};
+
+struct _GnButtonClass
+{
+	GntWidgetClass parent;
+
+	void (*gnt_reserved1)(void);
+	void (*gnt_reserved2)(void);
+	void (*gnt_reserved3)(void);
+	void (*gnt_reserved4)(void);
+};
+
+G_BEGIN_DECLS
+
+GType gnt_button_get_gtype(void);
+
+GntWidget *gnt_button_new(const char *text);
+
+G_END_DECLS
+
+#endif /* GNT_BUTTON_H */


Property changes on: branches/soc-2006-file-loggers/console/libgnt/gntbutton.h
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: branches/soc-2006-file-loggers/console/libgnt/gntcolors.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntcolors.c	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/libgnt/gntcolors.c	2006-06-25 23:08:49 UTC (rev 16337)
@@ -0,0 +1,33 @@
+#include <ncursesw/ncurses.h>
+#include "gntcolors.h"
+
+void gnt_init_colors()
+{
+	if (can_change_color())
+	{
+		/* XXX: Do some init_color()s */
+		init_color(GNT_COLOR_BLACK, 0, 0, 0);
+		init_color(GNT_COLOR_RED, 1000, 0, 0);
+		init_color(GNT_COLOR_GREEN, 0, 1000, 0);
+		init_color(GNT_COLOR_BLUE, 0, 0, 1000);
+		init_color(GNT_COLOR_WHITE, 1000, 1000, 1000);
+		init_color(GNT_COLOR_GRAY, 799, 799, 799);
+		init_color(GNT_COLOR_DARK_GRAY, 256, 256, 256);
+
+		/* Now some init_pair()s */
+		init_pair(GNT_COLOR_NORMAL, GNT_COLOR_BLACK, GNT_COLOR_WHITE);
+		init_pair(GNT_COLOR_HIGHLIGHT, GNT_COLOR_BLUE, GNT_COLOR_GRAY);
+		init_pair(GNT_COLOR_SHADOW, GNT_COLOR_BLACK, GNT_COLOR_DARK_GRAY);
+		init_pair(GNT_COLOR_TITLE, GNT_COLOR_WHITE, GNT_COLOR_DARK_GRAY);
+		init_pair(GNT_COLOR_TEXT_NORMAL, GNT_COLOR_BLACK, GNT_COLOR_GRAY);
+	}
+	else
+	{
+		init_pair(GNT_COLOR_NORMAL, COLOR_BLACK, COLOR_WHITE);
+		init_pair(GNT_COLOR_HIGHLIGHT, COLOR_CYAN, COLOR_BLACK);
+		init_pair(GNT_COLOR_SHADOW, COLOR_BLACK, COLOR_BLACK);
+		init_pair(GNT_COLOR_TITLE, COLOR_WHITE, COLOR_BLACK);
+		init_pair(GNT_COLOR_TEXT_NORMAL, COLOR_BLACK, COLOR_WHITE);
+	}
+}
+


Property changes on: branches/soc-2006-file-loggers/console/libgnt/gntcolors.c
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: branches/soc-2006-file-loggers/console/libgnt/gntcolors.h
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntcolors.h	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/libgnt/gntcolors.h	2006-06-25 23:08:49 UTC (rev 16337)
@@ -0,0 +1,34 @@
+#ifndef GNT_COLORS_H
+#define GNT_COLORS_H
+
+typedef enum
+{
+	GNT_COLOR_NORMAL = 1,
+	GNT_COLOR_HIGHLIGHT,		/* eg. when a button is selected */
+	GNT_COLOR_DISABLED,		/* eg. when a button is disabled */
+	GNT_COLOR_HIGHLIGHT_D,	/* eg. when a button is selected, but some other window is in focus */
+	GNT_COLOR_TEXT_NORMAL,
+	GNT_COLOR_TEXT_INACTIVE,	/* when the entry is out of focus */
+	GNT_COLOR_MNEMONIC,
+	GNT_COLOR_MNEMONIC_D,
+	GNT_COLOR_SHADOW,
+	GNT_COLOR_TITLE,
+	GNT_COLORS
+} GntColorType;
+
+enum
+{
+	GNT_COLOR_BLACK = 1,
+	GNT_COLOR_RED,
+	GNT_COLOR_GREEN,
+	GNT_COLOR_BLUE,
+	GNT_COLOR_WHITE,
+	GNT_COLOR_GRAY,
+	GNT_COLOR_DARK_GRAY,
+	GNT_TOTAL_COLORS
+};
+
+/* populate some default colors */
+void gnt_init_colors();
+
+#endif


Property changes on: branches/soc-2006-file-loggers/console/libgnt/gntcolors.h
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: branches/soc-2006-file-loggers/console/libgnt/gntentry.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntentry.c	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/libgnt/gntentry.c	2006-06-25 23:08:49 UTC (rev 16337)
@@ -0,0 +1,251 @@
+#include <string.h>
+#include "gntentry.h"
+
+enum
+{
+	SIGS = 1,
+};
+
+static GntWidgetClass *parent_class = NULL;
+static guint signals[SIGS] = { 0 };
+
+static void
+gnt_entry_draw(GntWidget *widget)
+{
+	GntEntry *entry = GNT_ENTRY(widget);
+	int stop;
+
+	wbkgdset(widget->window, '\0' | COLOR_PAIR(GNT_COLOR_TEXT_NORMAL));
+	mvwprintw(widget->window, 0, 0, entry->scroll);
+
+	stop = entry->end - entry->scroll;
+	if (stop < widget->priv.width)
+		mvwhline(widget->window, 0, stop, ENTRY_CHAR, widget->priv.width - stop);
+
+	wrefresh(widget->window);
+
+	DEBUG;
+}
+
+static void
+gnt_entry_size_request(GntWidget *widget)
+{
+	GntEntry *entry = GNT_ENTRY(widget);
+	widget->priv.height = 1;
+	widget->priv.width = 20;
+}
+
+static void
+gnt_entry_map(GntWidget *widget)
+{
+	if (widget->priv.width == 0 || widget->priv.height == 0)
+		gnt_widget_size_request(widget);
+	DEBUG;
+}
+
+static gboolean
+gnt_entry_key_pressed(GntWidget *widget, const char *text)
+{
+	GntEntry *entry = GNT_ENTRY(widget);
+
+	if (text[0] == 27)
+	{
+		if (strcmp(text + 1, GNT_KEY_DEL) == 0 && entry->cursor < entry->end)
+		{
+			memmove(entry->cursor, entry->cursor + 1, entry->end - entry->cursor + 1);
+			entry->end--;
+			gnt_entry_draw(widget);
+		}
+		else if (strcmp(text + 1, GNT_KEY_LEFT) == 0 && entry->cursor > entry->start)
+		{
+			entry->cursor--;
+			if (entry->cursor < entry->scroll)
+				entry->scroll--;
+			gnt_entry_draw(widget);
+		}
+		else if (strcmp(text + 1, GNT_KEY_RIGHT) == 0 && entry->cursor < entry->end)
+		{
+			entry->cursor++;
+			if (entry->cursor - entry->scroll > widget->priv.width)
+				entry->scroll++;
+			gnt_entry_draw(widget);
+		}
+		/* XXX: handle other keys, like home/end, and ctrl+ goodness */
+	}
+	else
+	{
+		if (!iscntrl(text[0]))
+		{
+			int i;
+
+			for (i = 0; text[i]; i++)
+			{
+				/* Valid input? */
+				if (ispunct(text[i]) && (entry->flag & GNT_ENTRY_FLAG_NO_PUNCT))
+					continue;
+				if (isspace(text[i]) && (entry->flag & GNT_ENTRY_FLAG_NO_SPACE))
+					continue;
+				if (isalpha(text[i]) && !(entry->flag & GNT_ENTRY_FLAG_ALPHA))
+					continue;
+				if (isdigit(text[i]) && !(entry->flag & GNT_ENTRY_FLAG_INT))
+					continue;
+
+				/* Reached the max? */
+				if (entry->max && entry->end - entry->start >= entry->max)
+					continue;
+
+				if (entry->end - entry->start >= entry->buffer)
+				{
+					char *tmp = g_strdup_printf(entry->start);
+					gnt_entry_set_text(entry, tmp);
+					g_free(tmp);
+				}
+
+				*(entry->cursor) = text[i];
+				entry->cursor++;
+
+				entry->end++;
+				if (entry->cursor - entry->scroll > widget->priv.width)
+					entry->scroll++;
+			}
+			gnt_entry_draw(widget);
+		}
+		else
+		{
+			/* Backspace is here */
+			if (strcmp(text, GNT_KEY_BACKSPACE) == 0 && entry->cursor > entry->start)
+			{
+				entry->cursor--;
+				memmove(entry->cursor, entry->cursor + 1, entry->end - entry->cursor);
+				entry->end--;
+
+				if (entry->scroll > entry->start)
+					entry->scroll--;
+
+				gnt_entry_draw(widget);
+			}
+		}
+	}
+
+	return FALSE;
+}
+
+static void
+gnt_entry_destroy(GntWidget *widget)
+{
+	GntEntry *entry = GNT_ENTRY(widget);
+	g_free(entry->start);
+}
+
+static void
+gnt_entry_class_init(GntEntryClass *klass)
+{
+	GObjectClass *obj_class = G_OBJECT_CLASS(klass);
+
+	parent_class = GNT_WIDGET_CLASS(klass);
+	parent_class->destroy = gnt_entry_destroy;
+	parent_class->draw = gnt_entry_draw;
+	parent_class->map = gnt_entry_map;
+	parent_class->size_request = gnt_entry_size_request;
+	parent_class->key_pressed = gnt_entry_key_pressed;
+
+	DEBUG;
+}
+
+static void
+gnt_entry_init(GTypeInstance *instance, gpointer class)
+{
+	GntEntry *entry = GNT_ENTRY(instance);
+
+	entry->flag = GNT_ENTRY_FLAG_ALL;
+	entry->max = 0;
+
+	GNT_WIDGET_SET_FLAGS(GNT_WIDGET(entry),
+			GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW | GNT_WIDGET_CAN_TAKE_FOCUS);
+	
+	DEBUG;
+}
+
+/******************************************************************************
+ * GntEntry API
+ *****************************************************************************/
+GType
+gnt_entry_get_gtype(void)
+{
+	static GType type = 0;
+
+	if(type == 0)
+	{
+		static const GTypeInfo info = {
+			sizeof(GntEntryClass),
+			NULL,					/* base_init		*/
+			NULL,					/* base_finalize	*/
+			(GClassInitFunc)gnt_entry_class_init,
+			NULL,					/* class_finalize	*/
+			NULL,					/* class_data		*/
+			sizeof(GntEntry),
+			0,						/* n_preallocs		*/
+			gnt_entry_init,			/* instance_init	*/
+		};
+
+		type = g_type_register_static(GNT_TYPE_WIDGET,
+									  "GntEntry",
+									  &info, 0);
+	}
+
+	return type;
+}
+
+GntWidget *gnt_entry_new(const char *text)
+{
+	GntWidget *widget = g_object_new(GNT_TYPE_ENTRY, NULL);
+	GntEntry *entry = GNT_ENTRY(widget);
+
+	gnt_entry_set_text(entry, text);
+
+	return widget;
+}
+
+void gnt_entry_set_text(GntEntry *entry, const char *text)
+{
+	int len;
+	int scroll, cursor;
+
+	g_free(entry->start);
+
+	if (text && text[0])
+	{
+		len = g_utf8_strlen(text, -1);
+		entry->buffer = len * 2;
+	}
+	else
+	{
+		entry->buffer = 128;
+		len = 0;
+	}
+
+	scroll = entry->scroll - entry->start;
+	cursor = entry->end - entry->cursor;
+
+	entry->start = g_new0(char, entry->buffer);
+	if (text)
+		snprintf(entry->start, len + 1, "%s", text);
+	entry->end = entry->start + len;
+
+	entry->scroll = entry->start + scroll;
+	entry->cursor = entry->end - cursor;
+
+	/* XXX: redraw if necessary? */
+}
+
+void gnt_entry_set_max(GntEntry *entry, int max)
+{
+	entry->max = max;
+}
+
+void gnt_entry_set_flag(GntEntry *entry, GntEntryFlag flag)
+{
+	entry->flag = flag;
+	/* XXX: Check the existing string to make sure the flags are respected? */
+}
+


Property changes on: branches/soc-2006-file-loggers/console/libgnt/gntentry.c
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: branches/soc-2006-file-loggers/console/libgnt/gntentry.h
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntentry.h	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/libgnt/gntentry.h	2006-06-25 23:08:49 UTC (rev 16337)
@@ -0,0 +1,78 @@
+#ifndef GNT_ENTRY_H
+#define GNT_ENTRY_H
+
+#include "gntwidget.h"
+#include "gnt.h"
+#include "gntcolors.h"
+#include "gntkeys.h"
+
+#define GNT_TYPE_ENTRY				(gnt_entry_get_gtype())
+#define GNT_ENTRY(obj)				(G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_ENTRY, GntEntry))
+#define GNT_ENTRY_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST((klass), GNT_TYPE_ENTRY, GntEntryClass))
+#define GNT_IS_ENTRY(obj)			(G_TYPE_CHECK_INSTANCE_TYPE((obj), GNT_TYPE_ENTRY))
+#define GNT_IS_ENTRY_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE((klass), GNT_TYPE_ENTRY))
+#define GNT_ENTRY_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS((obj), GNT_TYPE_ENTRY, GntEntryClass))
+
+#define GNT_ENTRY_FLAGS(obj)				(GNT_ENTRY(obj)->priv.flags)
+#define GNT_ENTRY_SET_FLAGS(obj, flags)		(GNT_ENTRY_FLAGS(obj) |= flags)
+#define GNT_ENTRY_UNSET_FLAGS(obj, flags)	(GNT_ENTRY_FLAGS(obj) &= ~(flags))
+
+#define	ENTRY_CHAR		'_'			/* The character to use to fill in the blank places */
+
+typedef struct _GnEntry			GntEntry;
+typedef struct _GnEntryPriv		GntEntryPriv;
+typedef struct _GnEntryClass	GntEntryClass;
+
+typedef enum
+{
+	GNT_ENTRY_FLAG_ALPHA    = 1 << 0,  /* Only alpha */
+	GNT_ENTRY_FLAG_INT      = 1 << 1,  /* Only integer */
+	GNT_ENTRY_FLAG_NO_SPACE = 1 << 2,  /* No blank space is allowed */
+	GNT_ENTRY_FLAG_NO_PUNCT = 1 << 3,  /* No punctuations */
+	GNT_ENTRY_FLAG_MASK     = 1 << 4,  /* Mask the inputs */
+} GntEntryFlag;
+
+#define GNT_ENTRY_FLAG_ALL    (GNT_ENTRY_FLAG_ALPHA | GNT_ENTRY_FLAG_INT)
+
+struct _GnEntry
+{
+	GntWidget parent;
+
+	GntEntryFlag flag;
+
+	char *start;
+	char *end;
+	char *scroll;   /* Current scrolling position */
+	char *cursor;   /* Cursor location */
+	                /* 0 <= cursor - scroll < widget-width */
+	
+	size_t buffer;  /* Size of the buffer */
+	
+	int max;        /* 0 means infinite */
+};
+
+struct _GnEntryClass
+{
+	GntWidgetClass parent;
+
+	void (*gnt_reserved1)(void);
+	void (*gnt_reserved2)(void);
+	void (*gnt_reserved3)(void);
+	void (*gnt_reserved4)(void);
+};
+
+G_BEGIN_DECLS
+
+GType gnt_entry_get_gtype(void);
+
+GntWidget *gnt_entry_new(const char *text);
+
+void gnt_entry_set_max(GntEntry *entry, int max);
+
+void gnt_entry_set_text(GntEntry *entry, const char *text);
+
+void gnt_entry_set_flag(GntEntry *entry, GntEntryFlag flag);
+
+G_END_DECLS
+
+#endif /* GNT_ENTRY_H */


Property changes on: branches/soc-2006-file-loggers/console/libgnt/gntentry.h
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: branches/soc-2006-file-loggers/console/libgnt/gntkeys.h
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntkeys.h	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/libgnt/gntkeys.h	2006-06-25 23:08:49 UTC (rev 16337)
@@ -0,0 +1,17 @@
+#ifndef GNT_KEYS_H
+#define GNT_KEYS_H
+
+#define GNT_KEY_POPUP   "[29~"
+
+/* Arrow keys */
+#define GNT_KEY_LEFT   "[D"
+#define GNT_KEY_RIGHT  "[C"
+#define GNT_KEY_UP     "[A"
+#define GNT_KEY_DOWN   "[B"
+
+#define GNT_KEY_ENTER  "\r"
+
+#define GNT_KEY_BACKSPACE "\177"
+#define GNT_KEY_DEL    "[3~"
+
+#endif


Property changes on: branches/soc-2006-file-loggers/console/libgnt/gntkeys.h
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: branches/soc-2006-file-loggers/console/libgnt/gntlabel.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntlabel.c	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/libgnt/gntlabel.c	2006-06-25 23:08:49 UTC (rev 16337)
@@ -0,0 +1,120 @@
+#include "gntlabel.h"
+
+#include <string.h>
+
+enum
+{
+	SIGS = 1,
+};
+
+static GntWidgetClass *parent_class = NULL;
+static guint signals[SIGS] = { 0 };
+
+static void
+gnt_label_destroy(GntWidget *widget)
+{
+	GntLabel *label = GNT_LABEL(widget);
+	g_free(label->text);
+}
+
+static void
+gnt_label_draw(GntWidget *widget)
+{
+	GntLabel *label = GNT_LABEL(widget);
+
+	wbkgdset(widget->window, '\0' | COLOR_PAIR(GNT_COLOR_NORMAL));
+	mvwprintw(widget->window, 0, 0, label->text);
+	wrefresh(widget->window);
+
+	DEBUG;
+}
+
+static void
+gnt_label_size_request(GntWidget *widget)
+{
+	GntLabel *label = GNT_LABEL(widget);
+	char *s = label->text, *last = s;
+	int count = 1;
+	int max = 0;
+
+	/* XXX: ew ... everyone look away */
+	while (*s)
+	{
+		if (*s == '\n' || *s == '\r')
+		{
+			count++;
+			if (max < s - last + 1)
+				max = s - last + 1;
+			last = s + 1;
+		}
+		s++;
+	}
+	if (max < s - last + 1)
+		max = s - last + 1;
+	widget->priv.height = count;
+
+	widget->priv.width = max;
+}
+
+static void
+gnt_label_class_init(GntLabelClass *klass)
+{
+	GObjectClass *obj_class = G_OBJECT_CLASS(klass);
+
+	parent_class = GNT_WIDGET_CLASS(klass);
+	parent_class->destroy = gnt_label_destroy;
+	parent_class->draw = gnt_label_draw;
+	parent_class->map = NULL;
+	parent_class->size_request = gnt_label_size_request;
+
+	DEBUG;
+}
+
+static void
+gnt_label_init(GTypeInstance *instance, gpointer class)
+{
+	DEBUG;
+}
+
+/******************************************************************************
+ * GntLabel API
+ *****************************************************************************/
+GType
+gnt_label_get_gtype(void)
+{
+	static GType type = 0;
+
+	if(type == 0)
+	{
+		static const GTypeInfo info = {
+			sizeof(GntLabelClass),
+			NULL,					/* base_init		*/
+			NULL,					/* base_finalize	*/
+			(GClassInitFunc)gnt_label_class_init,
+			NULL,					/* class_finalize	*/
+			NULL,					/* class_data		*/
+			sizeof(GntLabel),
+			0,						/* n_preallocs		*/
+			gnt_label_init,			/* instance_init	*/
+		};
+
+		type = g_type_register_static(GNT_TYPE_WIDGET,
+									  "GntLabel",
+									  &info, 0);
+	}
+
+	return type;
+}
+
+GntWidget *gnt_label_new(const char *text)
+{
+	GntWidget *widget = g_object_new(GNT_TYPE_LABEL, NULL);
+	GntLabel *label = GNT_LABEL(widget);
+
+	label->text = g_strdup(text);
+	gnt_widget_set_take_focus(widget, FALSE);
+	GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW);
+
+	return widget;
+}
+


Property changes on: branches/soc-2006-file-loggers/console/libgnt/gntlabel.c
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: branches/soc-2006-file-loggers/console/libgnt/gntlabel.h
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntlabel.h	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/libgnt/gntlabel.h	2006-06-25 23:08:49 UTC (rev 16337)
@@ -0,0 +1,48 @@
+#ifndef GNT_LABEL_H
+#define GNT_LABEL_H
+
+#include "gnt.h"
+#include "gntwidget.h"
+
+#define GNT_TYPE_LABEL				(gnt_label_get_gtype())
+#define GNT_LABEL(obj)				(G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_LABEL, GntLabel))
+#define GNT_LABEL_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST((klass), GNT_TYPE_LABEL, GntLabelClass))
+#define GNT_IS_LABEL(obj)			(G_TYPE_CHECK_INSTANCE_TYPE((obj), GNT_TYPE_LABEL))
+#define GNT_IS_LABEL_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE((klass), GNT_TYPE_LABEL))
+#define GNT_LABEL_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS((obj), GNT_TYPE_LABEL, GntLabelClass))
+
+typedef struct _GnLabel			GntLabel;
+typedef struct _GnLabelClass	GntLabelClass;
+
+struct _GnLabel
+{
+	GntWidget parent;
+
+	char *text;
+
+    void (*gnt_reserved1)(void);
+    void (*gnt_reserved2)(void);
+    void (*gnt_reserved3)(void);
+    void (*gnt_reserved4)(void);
+};
+
+struct _GnLabelClass
+{
+	GntWidgetClass parent;
+
+	void (*gnt_reserved1)(void);
+	void (*gnt_reserved2)(void);
+	void (*gnt_reserved3)(void);
+	void (*gnt_reserved4)(void);
+};
+
+G_BEGIN_DECLS
+
+GType gnt_label_get_gtype(void);
+
+GntWidget *gnt_label_new(const char *text);
+
+G_END_DECLS
+
+#endif /* GNT_LABEL_H */
+


Property changes on: branches/soc-2006-file-loggers/console/libgnt/gntlabel.h
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: branches/soc-2006-file-loggers/console/libgnt/gntmain.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntmain.c	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/libgnt/gntmain.c	2006-06-25 23:08:49 UTC (rev 16337)
@@ -0,0 +1,110 @@
+#include "gnt.h"
+#include "gntkeys.h"
+#include "gntcolors.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <locale.h>
+
+static GList *focus_list;
+static int max_x;
+static int max_y;
+
+void gnt_screen_take_focus(GntWidget *widget)
+{
+	focus_list = g_list_prepend(focus_list, widget);
+}
+
+void gnt_screen_remove_widget(GntWidget *widget)
+{
+	focus_list = g_list_remove(focus_list, widget);
+	if (focus_list)
+		gnt_widget_draw(focus_list->data);
+}
+
+static gboolean
+io_invoke(GIOChannel *source, GIOCondition cond, gpointer null)
+{
+	char buffer[256];
+
+	int rd = read(0, buffer, sizeof(buffer) - 1);
+	if (rd < 0)
+	{
+		endwin();
+		printf("ERROR!\n");
+		exit(1);
+	}
+	else if (rd == 0)
+	{
+		endwin();
+		printf("EOF\n");
+		exit(1);
+	}
+
+	buffer[rd] = 0;
+
+	if (focus_list)
+	{
+		gboolean ret = FALSE;
+		/*g_signal_emit_by_name(focus_list->data, "key_pressed", buffer, &ret);*/
+		ret = gnt_widget_key_pressed(focus_list->data, buffer);
+	}
+
+	if (buffer[0] == 27)
+	{
+		/* Some special key has been pressed */
+		if (strcmp(buffer+1, GNT_KEY_POPUP) == 0)
+		{
+			/*printf("popup\n");*/
+		}
+		else
+		{
+			/*printf("Unknown: %s\n", buffer+1);*/
+		}
+	}
+	else
+	{
+		if (buffer[0] == 'q')
+		{
+			endwin();
+			exit(1);
+		}
+		/*printf("%s\n", buffer);*/
+	}
+	refresh();
+
+	return TRUE;
+}
+
+void gnt_init()
+{
+	GIOChannel *channel = g_io_channel_unix_new(0);
+
+	g_io_channel_set_encoding(channel, NULL, NULL);
+	g_io_channel_set_buffered(channel, FALSE);
+	g_io_channel_set_flags(channel, G_IO_FLAG_NONBLOCK, NULL );
+
+	int result = g_io_add_watch(channel, 
+					(G_IO_IN | G_IO_HUP | G_IO_ERR),
+					io_invoke, NULL);
+
+	setlocale(LC_ALL, "");
+	initscr();
+	start_color();
+	gnt_init_colors();
+
+	max_x = getmaxx(stdscr);
+	max_y = getmaxy(stdscr);
+
+	wbkgdset(stdscr, '\0' | COLOR_PAIR(GNT_COLOR_NORMAL));
+	noecho();
+	refresh();
+	mousemask(ALL_MOUSE_EVENTS | REPORT_MOUSE_POSITION, NULL);
+	g_type_init();
+}
+
+void gnt_main()
+{
+	GMainLoop *loop = g_main_new(FALSE);
+	g_main_run(loop);
+}
+


Property changes on: branches/soc-2006-file-loggers/console/libgnt/gntmain.c
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: branches/soc-2006-file-loggers/console/libgnt/gnttree.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gnttree.c	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/libgnt/gnttree.c	2006-06-25 23:08:49 UTC (rev 16337)
@@ -0,0 +1,613 @@
+#include "gnttree.h"
+#include "gntutils.h"
+
+#include <string.h>
+
+enum
+{
+	SIG_SELECTION_CHANGED,
+	SIGS,
+};
+
+#define	TAB_SIZE 3
+
+/* XXX: Make this one into a GObject?
+ * 		 ... Probably not */
+struct _GnTreeRow
+{
+	void *key;
+	char *text;
+	void *data;		/* XXX: unused */
+
+	gboolean collapsed;
+
+	GntTreeRow *parent;
+	GntTreeRow *child;
+	GntTreeRow *next;
+	GntTreeRow *prev;
+};
+
+static GntWidgetClass *parent_class = NULL;
+static guint signals[SIGS] = { 0 };
+
+static GntTreeRow *
+_get_next(GntTreeRow *row, gboolean godeep)
+{
+	if (row == NULL)
+		return NULL;
+	if (godeep && row->child)
+		return row->child;
+	if (row->next)
+		return row->next;
+	return _get_next(row->parent, FALSE);
+}
+
+static GntTreeRow *
+get_next(GntTreeRow *row)
+{
+	if (row == NULL)
+		return;
+	return _get_next(row, !row->collapsed);
+}
+
+/* Returns the n-th next row. If it doesn't exist, returns NULL */
+static GntTreeRow *
+get_next_n(GntTreeRow *row, int n)
+{
+	while (row && n--)
+		row = get_next(row);
+	return row;
+}
+
+/* Returns the n-th next row. If it doesn't exist, then the last non-NULL node */
+static GntTreeRow *
+get_next_n_opt(GntTreeRow *row, int n, int *pos)
+{
+	GntTreeRow *next = row;
+	int r = 0;
+
+	if (row == NULL)
+		return NULL;
+
+	while (row && n--)
+	{
+		row = get_next(row);
+		if (row)
+		{
+			next = row;
+			r++;
+		}
+	}
+
+	if (pos)
+		*pos = r;
+
+	return next;
+}
+
+static GntTreeRow *
+get_last_child(GntTreeRow *row)
+{
+	if (row == NULL)
+		return NULL;
+	if (!row->collapsed && row->child)
+		row = row->child;
+	else
+		return row;
+
+	while(row->next)
+		row = row->next;
+	if (row->child)
+		row = get_last_child(row->child);
+	return row;
+}
+
+static GntTreeRow *
+get_prev(GntTreeRow *row)
+{
+	if (row == NULL)
+		return NULL;
+	if (row->prev)
+		return get_last_child(row->prev);
+	return row->parent;
+}
+
+static GntTreeRow *
+get_prev_n(GntTreeRow *row, int n)
+{
+	while (row && n--)
+		row = get_prev(row);
+	return row;
+}
+
+/* Distance of row from the root */
+/* XXX: This is uber-inefficient */
+static int
+get_root_distance(GntTreeRow *row)
+{
+	if (row == NULL)
+		return -1;
+	return get_root_distance(get_prev(row)) + 1;
+}
+
+/* Returns the distance between a and b. 
+ * If a is 'above' b, then the distance is positive */
+static int
+get_distance(GntTreeRow *a, GntTreeRow *b)
+{
+	/* First get the distance from a to the root.
+	 * Then the distance from b to the root.
+	 * Subtract.
+	 * It's not that good, but it works. */
+	int ha = get_root_distance(a);
+	int hb = get_root_distance(b);
+
+	return (hb - ha);
+}
+
+static void
+redraw_tree(GntTree *tree)
+{
+	int start;
+	GntWidget *widget = GNT_WIDGET(tree);
+	GntTreeRow *row;
+	int pos;
+	gboolean deep;
+
+	if (GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_NO_BORDER))
+		pos = 0;
+	else
+		pos = 1;
+
+	if (tree->top == NULL)
+		tree->top = tree->root;
+	if (tree->current == NULL)
+		tree->current = tree->root;
+
+	wbkgd(widget->window, COLOR_PAIR(GNT_COLOR_NORMAL));
+
+	deep = TRUE;
+	row = tree->top;
+	for (start = pos; row && start < widget->priv.height - pos;
+				start++, row = get_next(row))
+	{
+		char str[2048];
+		int wr;
+		char format[16] = "";
+
+		deep = TRUE;
+
+		if (row->parent == NULL && row->child)
+		{
+			if (row->collapsed)
+			{
+				strcpy(format, "+ ");
+				deep = FALSE;
+			}
+			else
+				strcpy(format, "- ");
+		}
+
+		if ((wr = g_snprintf(str, widget->priv.width, "%s%s", format, row->text)) >= widget->priv.width)
+		{
+			/* XXX: ellipsize */
+			str[widget->priv.width - 1 - pos] = 0;
+		}
+		else
+		{
+			while (wr < widget->priv.width - 1 - pos)
+				str[wr++] = ' ';
+			str[wr] = 0;
+		}
+		
+		if (row == tree->current)
+		{
+			wbkgdset(widget->window, '\0' | COLOR_PAIR(GNT_COLOR_HIGHLIGHT));
+			mvwprintw(widget->window, start, pos, str);
+			wbkgdset(widget->window, '\0' | COLOR_PAIR(GNT_COLOR_NORMAL));
+		}
+		else
+			mvwprintw(widget->window, start, pos, str);
+		tree->bottom = row;
+	}
+
+	while (start < widget->priv.height - pos)
+	{
+		mvwhline(widget->window, start, pos, ' ',
+				widget->priv.width - pos * 2);
+		start++;
+	}
+
+	wrefresh(widget->window);
+}
+
+static void
+gnt_tree_draw(GntWidget *widget)
+{
+	GntTree *tree = GNT_TREE(widget);
+	int bottom;
+
+	scrollok(widget->window, TRUE);
+	wsetscrreg(widget->window, 0, widget->priv.height - 1);
+
+	tree->top = tree->root;
+
+	redraw_tree(tree);
+	
+	DEBUG;
+}
+
+static void
+gnt_tree_size_request(GntWidget *widget)
+{
+	if (widget->priv.height == 0)
+		widget->priv.height = 10;	/* XXX: Why?! */
+	if (widget->priv.width == 0)
+		widget->priv.width = 20;	/* YYY: 'cuz ... */
+}
+
+static void
+gnt_tree_map(GntWidget *widget)
+{
+	if (widget->priv.width == 0 || widget->priv.height == 0)
+		gnt_widget_size_request(widget);
+	DEBUG;
+}
+
+static void
+tree_selection_changed(GntTree *tree, GntTreeRow *old, GntTreeRow *current)
+{
+	g_signal_emit(tree, signals[SIG_SELECTION_CHANGED], 0, old, current);
+}
+
+static GntTreeRow *
+get_nth_row(GntTree *tree, int n)
+{
+	gpointer key = g_list_nth_data(tree->list, n);
+	return g_hash_table_lookup(tree->hash, key);
+}
+
+static gboolean
+gnt_tree_key_pressed(GntWidget *widget, const char *text)
+{
+	GntTree *tree = GNT_TREE(widget);
+	GntTreeRow *old = tree->current;
+	GntTreeRow *row;
+
+	if (text[0] == 27)
+	{
+		int dist;
+		if (strcmp(text+1, GNT_KEY_DOWN) == 0 && (row = get_next(tree->current)) != NULL)
+		{
+			tree->current = row;
+			if ((dist = get_distance(tree->current, tree->bottom)) < 0)
+				gnt_tree_scroll(tree, -dist);
+			else
+				redraw_tree(tree);
+		}
+		else if (strcmp(text+1, GNT_KEY_UP) == 0 && (row = get_prev(tree->current)) != NULL)
+		{
+			tree->current = row;
+
+			if ((dist = get_distance(tree->current, tree->top)) > 0)
+				gnt_tree_scroll(tree, -dist);
+			else
+				redraw_tree(tree);
+		}
+	}
+	else if (text[0] == '\r')
+	{
+		gnt_widget_activate(widget);
+	}
+	else if (text[0] == ' ' && text[1] == 0)
+	{
+		/* Space pressed */
+		GntTreeRow *row = tree->current;
+		if (row && row->child)
+		{
+			row->collapsed = !row->collapsed;
+			redraw_tree(tree);
+		}
+	}
+
+	if (old != tree->current)
+		tree_selection_changed(tree, old, tree->current);
+
+	return FALSE;
+}
+
+static void
+gnt_tree_destroy(GntWidget *widget)
+{
+	GntTree *tree = GNT_TREE(widget);
+
+	g_hash_table_destroy(tree->hash);
+	g_list_free(tree->list);
+}
+
+static void
+gnt_tree_class_init(GntTreeClass *klass)
+{
+	GObjectClass *obj_class = G_OBJECT_CLASS(klass);
+
+	parent_class = GNT_WIDGET_CLASS(klass);
+	parent_class->destroy = gnt_tree_destroy;
+	parent_class->draw = gnt_tree_draw;
+	parent_class->map = gnt_tree_map;
+	parent_class->size_request = gnt_tree_size_request;
+	parent_class->key_pressed = gnt_tree_key_pressed;
+
+	signals[SIG_SELECTION_CHANGED] = 
+		g_signal_new("selection-changed",
+					 G_TYPE_FROM_CLASS(klass),
+					 G_SIGNAL_RUN_LAST,
+					 G_STRUCT_OFFSET(GntTreeClass, selection_changed),
+					 NULL, NULL,
+					 gnt_closure_marshal_VOID__POINTER_POINTER,
+					 G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER);
+
+	DEBUG;
+}
+
+static void
+gnt_tree_init(GTypeInstance *instance, gpointer class)
+{
+	DEBUG;
+}
+
+/******************************************************************************
+ * GntTree API
+ *****************************************************************************/
+GType
+gnt_tree_get_gtype(void)
+{
+	static GType type = 0;
+
+	if(type == 0)
+	{
+		static const GTypeInfo info = {
+			sizeof(GntTreeClass),
+			NULL,					/* base_init		*/
+			NULL,					/* base_finalize	*/
+			(GClassInitFunc)gnt_tree_class_init,
+			NULL,					/* class_finalize	*/
+			NULL,					/* class_data		*/
+			sizeof(GntTree),
+			0,						/* n_preallocs		*/
+			gnt_tree_init,			/* instance_init	*/
+		};
+
+		type = g_type_register_static(GNT_TYPE_WIDGET,
+									  "GntTree",
+									  &info, 0);
+	}
+
+	return type;
+}
+
+static void
+free_tree_row(gpointer data)
+{
+	GntTreeRow *row = data;
+
+	if (!row)
+		return;
+
+	g_free(row->text);
+	g_free(row);
+}
+
+GntWidget *gnt_tree_new()
+{
+	GntWidget *widget = g_object_new(GNT_TYPE_TREE, NULL);
+	GntTree *tree = GNT_TREE(widget);
+
+	tree->hash = g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL, free_tree_row);
+	GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_NO_SHADOW);
+	gnt_widget_set_take_focus(widget, TRUE);
+
+	return widget;
+}
+
+void gnt_tree_set_visible_rows(GntTree *tree, int rows)
+{
+	GntWidget *widget = GNT_WIDGET(tree);
+	widget->priv.height = rows;
+	if (!GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_NO_BORDER))
+		widget->priv.height += 2;
+}
+
+int gnt_tree_get_visible_rows(GntTree *tree)
+{
+	GntWidget *widget = GNT_WIDGET(tree);
+	int ret = widget->priv.height;
+	if (!GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_NO_BORDER))
+		widget->priv.height -= 2;
+}
+
+void gnt_tree_scroll(GntTree *tree, int count)
+{
+	GntTreeRow *row;
+
+	if (count < 0)
+	{
+		if (get_root_distance(tree->top) == 0)
+			return;
+		row = get_prev_n(tree->top, -count);
+		if (row == NULL)
+			row = tree->root;
+		tree->top = row;
+	}
+	else
+	{
+		get_next_n_opt(tree->bottom, count, &count);
+		tree->top = get_next_n(tree->top, count);
+	}
+
+	redraw_tree(tree);
+}
+
+static int
+find_depth(GntTreeRow *row)
+{
+	int dep = -1;
+
+	while (row)
+	{
+		dep++;
+		row = row->parent;
+	}
+
+	return dep;
+}
+
+GntTreeRow *gnt_tree_add_row_after(GntTree *tree, void *key, const char *text, void *parent, void *bigbro)
+{
+	GntTreeRow *row = g_new0(GntTreeRow, 1), *pr = NULL;
+
+	g_hash_table_replace(tree->hash, key, row);
+
+	if (tree->root == NULL)
+	{
+		tree->root = row;
+		tree->list = g_list_prepend(tree->list, key);
+	}
+	else
+	{
+		int position;
+
+		if (bigbro)
+		{
+			pr = g_hash_table_lookup(tree->hash, bigbro);
+			if (pr)
+			{
+				if (pr->next)	pr->next->prev = row;
+				row->next = pr->next;
+				row->prev = pr;
+				pr->next = row;
+				row->parent = pr->parent;
+
+				position = g_list_index(tree->list, bigbro);
+			}
+		}
+
+		if (pr == NULL && parent)	
+		{
+			pr = g_hash_table_lookup(tree->hash, parent);
+			if (pr)
+			{
+				if (pr->child)	pr->child->prev = row;
+				row->next = pr->child;
+				pr->child = row;
+				row->parent = pr;
+
+				position = g_list_index(tree->list, parent);
+			}
+		}
+
+		if (pr == NULL)
+		{
+			GntTreeRow *r = tree->root;
+			while (r->next)
+				r = r->next;
+			r->next = row;
+			row->prev = r;
+
+			tree->list = g_list_append(tree->list, key);
+		}
+		else
+		{
+			tree->list = g_list_insert(tree->list, key, position + 1);
+		}
+	}
+
+	row->key = key;
+	row->text = g_strdup_printf("%*s%s", TAB_SIZE * find_depth(row), "", text);
+	row->data = NULL;
+
+	if (GNT_WIDGET_IS_FLAG_SET(GNT_WIDGET(tree), GNT_WIDGET_MAPPED))
+		redraw_tree(tree);
+
+	return row;
+}
+
+gpointer gnt_tree_get_selection_data(GntTree *tree)
+{
+	if (tree->current)
+		return tree->current->key;	/* XXX: perhaps we should just get rid of 'data' */
+	return NULL;
+}
+
+/* XXX: Should this also remove all the children of the row being removed? */
+void gnt_tree_remove(GntTree *tree, gpointer key)
+{
+	GntTreeRow *row = g_hash_table_lookup(tree->hash, key);
+	if (row)
+	{
+		gboolean redraw = FALSE;
+
+		if (get_distance(tree->top, row) >= 0 && get_distance(row, tree->bottom) >= 0)
+			redraw = TRUE;
+
+		/* Update root/top/current/bottom if necessary */
+		if (tree->root == row)
+			tree->root = get_next(row);
+		if (tree->top == row)
+		{
+			if (tree->top != tree->root)
+				tree->top = get_prev(row);
+			else
+				tree->top = get_next(row);
+			if (tree->current == row)
+				tree->current = tree->top;
+		}
+		else if (tree->current == row)
+		{
+			if (tree->current != tree->root)
+				tree->current = get_prev(row);
+			else
+				tree->current = get_next(row);
+		}
+		else if (tree->bottom == row)
+		{
+			tree->bottom = get_prev(row);
+		}
+
+		/* Fix the links */
+		if (row->next)
+			row->next->prev = row->prev;
+		if (row->parent && row->parent->child == row)
+			row->parent->child = row->next;
+		if (row->prev)
+			row->prev->next = row->next;
+		
+		g_hash_table_remove(tree->hash, key);
+		tree->list = g_list_remove(tree->list, key);
+
+		if (redraw)
+		{
+			redraw_tree(tree);
+		}
+	}
+}
+
+int gnt_tree_get_selection_visible_line(GntTree *tree)
+{
+	return get_distance(tree->top, tree->current) +
+			!!(GNT_WIDGET_IS_FLAG_SET(GNT_WIDGET(tree), GNT_WIDGET_NO_BORDER));
+}
+
+void gnt_tree_change_text(GntTree *tree, gpointer key, const char *text)
+{
+	GntTreeRow *row = g_hash_table_lookup(tree->hash, key);
+	if (row)
+	{
+		g_free(row->text);
+		row->text = g_strdup_printf("%*s%s", TAB_SIZE * find_depth(row), "", text);
+
+		if (get_distance(tree->top, row) >= 0 && get_distance(row, tree->bottom) > 0)
+			redraw_tree(tree);
+	}
+}
+
+


Property changes on: branches/soc-2006-file-loggers/console/libgnt/gnttree.c
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: branches/soc-2006-file-loggers/console/libgnt/gnttree.h
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gnttree.h	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/libgnt/gnttree.h	2006-06-25 23:08:49 UTC (rev 16337)
@@ -0,0 +1,78 @@
+#ifndef GNT_TREE_H
+#define GNT_TREE_H
+
+#include "gntwidget.h"
+#include "gnt.h"
+#include "gntcolors.h"
+#include "gntkeys.h"
+
+#define GNT_TYPE_TREE				(gnt_tree_get_gtype())
+#define GNT_TREE(obj)				(G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_TREE, GntTree))
+#define GNT_TREE_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST((klass), GNT_TYPE_TREE, GntTreeClass))
+#define GNT_IS_TREE(obj)			(G_TYPE_CHECK_INSTANCE_TYPE((obj), GNT_TYPE_TREE))
+#define GNT_IS_TREE_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE((klass), GNT_TYPE_TREE))
+#define GNT_TREE_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS((obj), GNT_TYPE_TREE, GntTreeClass))
+
+#define GNT_TREE_FLAGS(obj)				(GNT_TREE(obj)->priv.flags)
+#define GNT_TREE_SET_FLAGS(obj, flags)		(GNT_TREE_FLAGS(obj) |= flags)
+#define GNT_TREE_UNSET_FLAGS(obj, flags)	(GNT_TREE_FLAGS(obj) &= ~(flags))
+
+typedef struct _GnTree			GntTree;
+typedef struct _GnTreePriv		GntTreePriv;
+typedef struct _GnTreeClass		GntTreeClass;
+
+typedef struct _GnTreeRow		GntTreeRow;
+
+struct _GnTree
+{
+	GntWidget parent;
+
+	GntTreeRow *current;	/* current selection */
+
+	GntTreeRow *top;		/* The topmost visible item */
+	GntTreeRow *bottom;		/* The bottommost visible item */
+	
+	GntTreeRow *root; /* The root of all evil */
+	
+	GList *list;	/* List of GntTreeRow s */
+	GHashTable *hash;	/* XXX: We may need this for quickly referencing the rows */
+};
+
+struct _GnTreeClass
+{
+	GntWidgetClass parent;
+
+	void (*selection_changed)(int old, int current);
+
+	void (*gnt_reserved1)(void);
+	void (*gnt_reserved2)(void);
+	void (*gnt_reserved3)(void);
+	void (*gnt_reserved4)(void);
+};
+
+G_BEGIN_DECLS
+
+GType gnt_tree_get_gtype(void);
+
+GntWidget *gnt_tree_new();
+
+void gnt_tree_set_visible_rows(GntTree *tree, int rows);
+
+int gnt_tree_get_visible_rows(GntTree *tree);
+
+void gnt_tree_scroll(GntTree *tree, int count);
+
+GntTreeRow *gnt_tree_add_row_after(GntTree *tree, void *key, const char *text, void *parent, void *bigbro);
+
+gpointer gnt_tree_get_selection_data(GntTree *tree);
+
+void gnt_tree_remove(GntTree *tree, gpointer key);
+
+/* Returns the visible line number of the selected row */
+int gnt_tree_get_selection_visible_line(GntTree *tree);
+
+void gnt_tree_change_text(GntTree *tree, gpointer key, const char *text);
+
+G_END_DECLS
+
+#endif /* GNT_TREE_H */


Property changes on: branches/soc-2006-file-loggers/console/libgnt/gnttree.h
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: branches/soc-2006-file-loggers/console/libgnt/gntutils.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntutils.c	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/libgnt/gntutils.c	2006-06-25 23:08:49 UTC (rev 16337)
@@ -0,0 +1,132 @@
+#include "gntutils.h"
+
+void gnt_closure_marshal_BOOLEAN__STRING(GClosure *closure,
+										GValue *ret_value,
+										guint n_param_values,
+										const GValue *param_values,
+										gpointer invocation_hint,
+										gpointer marshal_data)
+{
+	typedef gboolean (*func) (gpointer data1, const char *arg1, gpointer data2);
+	register func callback;
+	register GCClosure *cc = (GCClosure*)closure;
+	register gpointer data1, data2;
+	gboolean ret;
+
+	g_return_if_fail(ret_value != NULL);
+	g_return_if_fail(n_param_values == 2);
+
+	if (G_CCLOSURE_SWAP_DATA(closure))
+	{
+		data1 = closure->data;
+		data2 = g_value_peek_pointer(param_values + 0);
+	}
+	else
+	{
+		data1 = g_value_peek_pointer(param_values + 0);
+		data2 = closure->data;
+	}
+
+	callback = (func) (marshal_data ? marshal_data : cc->callback);
+	ret = callback(data1, g_value_get_string(param_values + 1) , data2);
+	g_value_set_boolean(ret_value, ret);
+}
+
+void gnt_closure_marshal_VOID__INT_INT_INT_INT(GClosure *closure,
+										GValue *ret_value,
+										guint n_param_values,
+										const GValue *param_values,
+										gpointer invocation_hint,
+										gpointer marshal_data)
+{
+	typedef void (*func) (gpointer data1, int, int, int, int, gpointer data2);
+	register func callback;
+	register GCClosure *cc = (GCClosure*)closure;
+	register gpointer data1, data2;
+
+	g_return_if_fail(n_param_values == 5);
+
+	if (G_CCLOSURE_SWAP_DATA(closure))
+	{
+		data1 = closure->data;
+		data2 = g_value_peek_pointer(param_values + 0);
+	}
+	else
+	{
+		data1 = g_value_peek_pointer(param_values + 0);
+		data2 = closure->data;
+	}
+
+	callback = (func) (marshal_data ? marshal_data : cc->callback);
+	callback(data1,
+			g_value_get_int(param_values + 1) ,
+			g_value_get_int(param_values + 2) ,
+			g_value_get_int(param_values + 3) ,
+			g_value_get_int(param_values + 4) ,
+			data2);
+}
+
+void gnt_closure_marshal_VOID__INT_INT(GClosure *closure,
+										GValue *ret_value,
+										guint n_param_values,
+										const GValue *param_values,
+										gpointer invocation_hint,
+										gpointer marshal_data)
+{
+	typedef void (*func) (gpointer data1, int, int, gpointer data2);
+	register func callback;
+	register GCClosure *cc = (GCClosure*)closure;
+	register gpointer data1, data2;
+
+	g_return_if_fail(n_param_values == 3);
+
+	if (G_CCLOSURE_SWAP_DATA(closure))
+	{
+		data1 = closure->data;
+		data2 = g_value_peek_pointer(param_values + 0);
+	}
+	else
+	{
+		data1 = g_value_peek_pointer(param_values + 0);
+		data2 = closure->data;
+	}
+
+	callback = (func) (marshal_data ? marshal_data : cc->callback);
+	callback(data1,
+			g_value_get_int(param_values + 1) ,
+			g_value_get_int(param_values + 2) ,
+			data2);
+}
+
+void gnt_closure_marshal_VOID__POINTER_POINTER(GClosure *closure,
+										GValue *ret_value,
+										guint n_param_values,
+										const GValue *param_values,
+										gpointer invocation_hint,
+										gpointer marshal_data)
+{
+	typedef void (*func) (gpointer data1, gpointer, gpointer, gpointer data2);
+	register func callback;
+	register GCClosure *cc = (GCClosure*)closure;
+	register gpointer data1, data2;
+
+	g_return_if_fail(n_param_values == 3);
+
+	if (G_CCLOSURE_SWAP_DATA(closure))
+	{
+		data1 = closure->data;
+		data2 = g_value_peek_pointer(param_values + 0);
+	}
+	else
+	{
+		data1 = g_value_peek_pointer(param_values + 0);
+		data2 = closure->data;
+	}
+
+	callback = (func) (marshal_data ? marshal_data : cc->callback);
+	callback(data1,
+			g_value_get_pointer(param_values + 1) ,
+			g_value_get_pointer(param_values + 2) ,
+			data2);
+}
+


Property changes on: branches/soc-2006-file-loggers/console/libgnt/gntutils.c
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: branches/soc-2006-file-loggers/console/libgnt/gntutils.h
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntutils.h	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/libgnt/gntutils.h	2006-06-25 23:08:49 UTC (rev 16337)
@@ -0,0 +1,30 @@
+#include "gntwidget.h"
+
+void gnt_closure_marshal_BOOLEAN__STRING(GClosure *closure,
+										GValue *ret_value,
+										guint n_param_values,
+										const GValue *param_values,
+										gpointer invocation_hint,
+										gpointer marshal_data);
+
+void gnt_closure_marshal_VOID__INT_INT_INT_INT(GClosure *closure,
+										GValue *ret_value,
+										guint n_param_values,
+										const GValue *param_values,
+										gpointer invocation_hint,
+										gpointer marshal_data);
+
+void gnt_closure_marshal_VOID__INT_INT(GClosure *closure,
+										GValue *ret_value,
+										guint n_param_values,
+										const GValue *param_values,
+										gpointer invocation_hint,
+										gpointer marshal_data);
+
+void gnt_closure_marshal_VOID__POINTER_POINTER(GClosure *closure,
+										GValue *ret_value,
+										guint n_param_values,
+										const GValue *param_values,
+										gpointer invocation_hint,
+										gpointer marshal_data);
+


Property changes on: branches/soc-2006-file-loggers/console/libgnt/gntutils.h
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: branches/soc-2006-file-loggers/console/libgnt/gntwidget.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntwidget.c	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/libgnt/gntwidget.c	2006-06-25 23:08:49 UTC (rev 16337)
@@ -0,0 +1,391 @@
+/* Stuff brutally ripped from Gflib */
+
+#include "gntwidget.h"
+#include "gntutils.h"
+#include "gnt.h"
+
+enum
+{
+	SIG_DESTROY,
+	SIG_DRAW,
+	SIG_GIVE_FOCUS,
+	SIG_LOST_FOCUS,
+	SIG_KEY_PRESSED,
+	SIG_MAP,
+	SIG_ACTIVATE,
+	SIG_EXPOSE,
+	SIG_SIZE_REQUEST,
+	SIG_POSITION,
+	SIGS
+};
+
+static GObjectClass *parent_class = NULL;
+static guint signals[SIGS] = { 0 };
+
+static void
+gnt_widget_init(GTypeInstance *instance, gpointer class)
+{
+	GntWidget *widget = GNT_WIDGET(instance);
+	widget->priv.name = NULL;
+	DEBUG;
+}
+
+static void
+gnt_widget_map(GntWidget *widget)
+{
+	/* Get some default size for the widget */
+	DEBUG;
+	g_signal_emit(widget, signals[SIG_MAP], 0);
+	GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_MAPPED);
+}
+
+static void
+gnt_widget_dispose(GObject *obj)
+{
+	GntWidget *self = GNT_WIDGET(obj);
+
+	if(!(GNT_WIDGET_FLAGS(self) & GNT_WIDGET_DESTROYING)) {
+		GNT_WIDGET_SET_FLAGS(self, GNT_WIDGET_DESTROYING);
+
+		g_signal_emit(self, signals[SIG_DESTROY], 0);
+
+		GNT_WIDGET_UNSET_FLAGS(self, GNT_WIDGET_DESTROYING);
+	}
+
+	parent_class->dispose(obj);
+	DEBUG;
+}
+
+static void
+gnt_widget_focus_change(GntWidget *widget)
+{
+	if (GNT_WIDGET_FLAGS(widget) & GNT_WIDGET_MAPPED)
+		gnt_widget_draw(widget);
+}
+
+static void
+gnt_widget_class_init(GntWidgetClass *klass)
+{
+	GObjectClass *obj_class = G_OBJECT_CLASS(klass);
+
+	parent_class = g_type_class_peek_parent(klass);
+
+	obj_class->dispose = gnt_widget_dispose;
+
+	klass->destroy = gnt_widget_destroy;
+	klass->show = gnt_widget_show;
+	klass->draw = gnt_widget_draw;
+	klass->expose = gnt_widget_expose;
+	klass->map = gnt_widget_map;
+	klass->lost_focus = gnt_widget_focus_change;
+	klass->gained_focus = gnt_widget_focus_change;
+	
+	klass->key_pressed = NULL;
+	klass->activate = NULL;
+	
+	signals[SIG_DESTROY] = 
+		g_signal_new("destroy",
+					 G_TYPE_FROM_CLASS(klass),
+					 G_SIGNAL_RUN_LAST,
+					 G_STRUCT_OFFSET(GntWidgetClass, destroy),
+					 NULL, NULL,
+					 g_cclosure_marshal_VOID__VOID,
+					 G_TYPE_NONE, 0);
+	signals[SIG_GIVE_FOCUS] = 
+		g_signal_new("gained-focus",
+					 G_TYPE_FROM_CLASS(klass),
+					 G_SIGNAL_RUN_LAST,
+					 G_STRUCT_OFFSET(GntWidgetClass, gained_focus),
+					 NULL, NULL,
+					 g_cclosure_marshal_VOID__VOID,
+					 G_TYPE_NONE, 0);
+	signals[SIG_LOST_FOCUS] = 
+		g_signal_new("lost-focus",
+					 G_TYPE_FROM_CLASS(klass),
+					 G_SIGNAL_RUN_LAST,
+					 G_STRUCT_OFFSET(GntWidgetClass, lost_focus),
+					 NULL, NULL,
+					 g_cclosure_marshal_VOID__VOID,
+					 G_TYPE_NONE, 0);
+	signals[SIG_ACTIVATE] = 
+		g_signal_new("activate",
+					 G_TYPE_FROM_CLASS(klass),
+					 G_SIGNAL_RUN_LAST,
+					 G_STRUCT_OFFSET(GntWidgetClass, activate),
+					 NULL, NULL,
+					 g_cclosure_marshal_VOID__VOID,
+					 G_TYPE_NONE, 0);
+	signals[SIG_MAP] = 
+		g_signal_new("map",
+					 G_TYPE_FROM_CLASS(klass),
+					 G_SIGNAL_RUN_LAST,
+					 G_STRUCT_OFFSET(GntWidgetClass, map),
+					 NULL, NULL,
+					 g_cclosure_marshal_VOID__VOID,
+					 G_TYPE_NONE, 0);
+	signals[SIG_DRAW] = 
+		g_signal_new("draw",
+					 G_TYPE_FROM_CLASS(klass),
+					 G_SIGNAL_RUN_LAST,
+					 G_STRUCT_OFFSET(GntWidgetClass, draw),
+					 NULL, NULL,
+					 g_cclosure_marshal_VOID__VOID,
+					 G_TYPE_NONE, 0);
+	signals[SIG_EXPOSE] = 
+		g_signal_new("expose",
+					 G_TYPE_FROM_CLASS(klass),
+					 G_SIGNAL_RUN_LAST,
+					 G_STRUCT_OFFSET(GntWidgetClass, expose),
+					 NULL, NULL,
+					 gnt_closure_marshal_VOID__INT_INT_INT_INT,
+					 G_TYPE_NONE, 4, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT);
+	signals[SIG_POSITION] = 
+		g_signal_new("position-set",
+					 G_TYPE_FROM_CLASS(klass),
+					 G_SIGNAL_RUN_LAST,
+					 G_STRUCT_OFFSET(GntWidgetClass, set_position),
+					 NULL, NULL,
+					 gnt_closure_marshal_VOID__INT_INT,
+					 G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
+	signals[SIG_SIZE_REQUEST] = 
+		g_signal_new("size_request",
+					 G_TYPE_FROM_CLASS(klass),
+					 G_SIGNAL_RUN_LAST,
+					 G_STRUCT_OFFSET(GntWidgetClass, size_request),
+					 NULL, NULL,
+					 g_cclosure_marshal_VOID__VOID,
+					 G_TYPE_NONE, 0);
+	signals[SIG_KEY_PRESSED] = 
+		g_signal_new("key_pressed",
+					 G_TYPE_FROM_CLASS(klass),
+					 G_SIGNAL_RUN_LAST,
+					 G_STRUCT_OFFSET(GntWidgetClass, key_pressed),
+					 NULL, NULL,
+					 gnt_closure_marshal_BOOLEAN__STRING,
+					 G_TYPE_BOOLEAN, 1, G_TYPE_STRING);
+	DEBUG;
+}
+
+/******************************************************************************
+ * GntWidget API
+ *****************************************************************************/
+GType
+gnt_widget_get_gtype(void)
+{
+	static GType type = 0;
+
+	if(type == 0) {
+		static const GTypeInfo info = {
+			sizeof(GntWidgetClass),
+			NULL,					/* base_init		*/
+			NULL,					/* base_finalize	*/
+			(GClassInitFunc)gnt_widget_class_init,
+			NULL,					/* class_finalize	*/
+			NULL,					/* class_data		*/
+			sizeof(GntWidget),
+			0,						/* n_preallocs		*/
+			gnt_widget_init,					/* instance_init	*/
+		};
+
+		type = g_type_register_static(G_TYPE_OBJECT,
+									  "GntWidget",
+									  &info, G_TYPE_FLAG_ABSTRACT);
+	}
+
+	return type;
+}
+
+static void
+gnt_widget_take_focus(GntWidget *widget)
+{
+	gnt_screen_take_focus(widget);
+}
+
+void gnt_widget_set_take_focus(GntWidget *widget, gboolean can)
+{
+	if (can)
+		GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_CAN_TAKE_FOCUS);
+	else
+		GNT_WIDGET_UNSET_FLAGS(widget, GNT_WIDGET_CAN_TAKE_FOCUS);
+}
+
+/**
+ * gnt_widget_destroy:
+ * @obj: The #GntWidget instance.
+ *
+ * Emits the "destroy" signal notifying all reference holders that they
+ * should release @obj.
+ */
+void
+gnt_widget_destroy(GntWidget *obj)
+{
+	g_return_if_fail(GNT_IS_WIDGET(obj));
+
+	gnt_widget_hide(obj);
+	delwin(obj->window);
+	if(!(GNT_WIDGET_FLAGS(obj) & GNT_WIDGET_DESTROYING))
+		g_object_run_dispose(G_OBJECT(obj));
+	/* XXX: This may be the wrong place */
+	/*gnt_screen_remove_widget(obj);*/
+	DEBUG;
+}
+
+void
+gnt_widget_show(GntWidget *widget)
+{
+	/* Draw the widget and take focus */
+	gnt_widget_draw(widget);
+	if (GNT_WIDGET_FLAGS(widget) & GNT_WIDGET_CAN_TAKE_FOCUS)
+	{
+		gnt_widget_take_focus(widget);
+	}
+}
+
+void
+gnt_widget_draw(GntWidget *widget)
+{
+	/* Draw the widget */
+	DEBUG;
+	if (!(GNT_WIDGET_FLAGS(widget) & GNT_WIDGET_MAPPED))
+		gnt_widget_map(widget);
+
+	if (widget->window)
+	{
+		delwin(widget->window);
+	}
+	
+	widget->window = newwin(widget->priv.height, widget->priv.width,
+					widget->priv.y, widget->priv.x);
+	wbkgd(widget->window, COLOR_PAIR(GNT_COLOR_NORMAL));
+	if (!(GNT_WIDGET_FLAGS(widget) & GNT_WIDGET_NO_BORDER))
+	{
+		box(widget->window, 0, 0);
+	}
+	else
+		werase(widget->window);
+
+	if (!(GNT_WIDGET_FLAGS(widget) & GNT_WIDGET_NO_SHADOW))
+	{
+		/* XXX: Find out the actual windows beneath this window, and 
+		 * draw the shadow on them */
+		/* XXX: Or perhaps do all these from a psedo-WM! */
+		widget->back = newwin(widget->priv.height, widget->priv.width,
+						widget->priv.y + 1, widget->priv.x + 1);
+		wbkgd(widget->back, COLOR_PAIR(GNT_COLOR_SHADOW));
+		werase(widget->back);
+
+		mvwchgat(widget->back, 0, 0, widget->priv.height,
+					A_REVERSE | A_BLINK, 0, 0);
+		touchline(widget->back, 0, widget->priv.height);
+		wrefresh(widget->back);
+	}
+
+	wrefresh(widget->window);
+	g_signal_emit(widget, signals[SIG_DRAW], 0);
+}
+
+gboolean
+gnt_widget_key_pressed(GntWidget *widget, const char *keys)
+{
+	gboolean ret;
+	if (!GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_CAN_TAKE_FOCUS))
+		return FALSE;
+	g_signal_emit(widget, signals[SIG_KEY_PRESSED], 0, keys, &ret);
+	return ret;
+}
+
+void
+gnt_widget_expose(GntWidget *widget, int x, int y, int width, int height)
+{
+	g_signal_emit(widget, signals[SIG_EXPOSE], 0, x, y, width, height);
+}
+
+void
+gnt_widget_hide(GntWidget *widget)
+{
+	int i;
+
+	/* XXX: Currently it simply empties the window. Ideally, it will
+	 * detect what windows are immediately beneath this one, and cause
+	 * those windows to redraw themselves by emitting the approrpiate
+	 * expose signal. */
+
+	wbkgdset(widget->window, '\0' | COLOR_PAIR(GNT_COLOR_NORMAL));
+	werase(widget->window);
+	wrefresh(widget->window);
+}
+
+void
+gnt_widget_set_position(GntWidget *wid, int x, int y)
+{
+	/* XXX: Need to install properties for these and g_object_notify */
+	wid->priv.x = x;
+	wid->priv.y = y;
+	g_signal_emit(wid, signals[SIG_POSITION], 0, x, y);
+}
+
+void
+gnt_widget_get_position(GntWidget *wid, int *x, int *y)
+{
+	if (x)
+		*x = wid->priv.x;
+	if (y)
+		*y = wid->priv.y;
+}
+
+void
+gnt_widget_size_request(GntWidget *widget)
+{
+	g_signal_emit(widget, signals[SIG_SIZE_REQUEST], 0);
+}
+
+void
+gnt_widget_get_size(GntWidget *wid, int *width, int *height)
+{
+	if (width)
+		*width = wid->priv.width;
+	if (height)
+		*height = wid->priv.height;
+}
+
+void
+gnt_widget_set_size(GntWidget *widget, int width, int height)
+{
+	widget->priv.width = width;
+	widget->priv.height = height;
+}
+
+gboolean
+gnt_widget_set_focus(GntWidget *widget, gboolean set)
+{
+	if (!(GNT_WIDGET_FLAGS(widget) & GNT_WIDGET_CAN_TAKE_FOCUS))
+		return FALSE;
+
+	if (set && !GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_HAS_FOCUS))
+	{
+		g_signal_emit(widget->parent, signals[SIG_LOST_FOCUS], 0);
+		GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_HAS_FOCUS);
+		g_signal_emit(widget, signals[SIG_GIVE_FOCUS], 0);
+	}
+	else if (!set)
+	{
+		GNT_WIDGET_UNSET_FLAGS(widget, GNT_WIDGET_HAS_FOCUS);
+		g_signal_emit(widget, signals[SIG_LOST_FOCUS], 0);
+	}
+	else
+		return FALSE;
+
+	return TRUE;
+}
+
+void gnt_widget_set_name(GntWidget *widget, const char *name)
+{
+	g_free(widget->priv.name);
+	widget->priv.name = g_strdup(name);
+}
+
+void gnt_widget_activate(GntWidget *widget)
+{
+	g_signal_emit(widget, signals[SIG_ACTIVATE], 0);
+}
+


Property changes on: branches/soc-2006-file-loggers/console/libgnt/gntwidget.c
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: branches/soc-2006-file-loggers/console/libgnt/gntwidget.h
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntwidget.h	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/libgnt/gntwidget.h	2006-06-25 23:08:49 UTC (rev 16337)
@@ -0,0 +1,117 @@
+#ifndef GNT_WIDGET_H
+#define GNT_WIDGET_H
+
+#include <stdio.h>
+#include <glib.h>
+#include <glib-object.h>
+#include <ncursesw/curses.h>
+
+#define GNT_TYPE_WIDGET				(gnt_widget_get_gtype())
+#define GNT_WIDGET(obj)				(G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_WIDGET, GntWidget))
+#define GNT_WIDGET_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST((klass), GNT_TYPE_WIDGET, GntWidgetClass))
+#define GNT_IS_WIDGET(obj)			(G_TYPE_CHECK_INSTANCE_TYPE((obj), GNT_TYPE_WIDGET))
+#define GNT_IS_OBJECT_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE((klass), GNT_TYPE_WIDGET))
+#define GNT_WIDGET_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS((obj), GNT_TYPE_WIDGET, GntWidgetClass))
+
+#define GNT_WIDGET_FLAGS(obj)				(GNT_WIDGET(obj)->priv.flags)
+#define GNT_WIDGET_SET_FLAGS(obj, flags)		(GNT_WIDGET_FLAGS(obj) |= flags)
+#define GNT_WIDGET_UNSET_FLAGS(obj, flags)	(GNT_WIDGET_FLAGS(obj) &= ~(flags))
+#define GNT_WIDGET_IS_FLAG_SET(obj, flags)	(GNT_WIDGET_FLAGS(obj) & (flags))
+#define	DEBUG
+//#define	DEBUG	printf("%s\n", __FUNCTION__)
+
+typedef struct _GnWidget			GntWidget;
+typedef struct _GnWidgetPriv		GntWidgetPriv;
+typedef struct _GnWidgetClass		GntWidgetClass;
+
+#define	N_(X)	X
+
+typedef enum _GnWidgetFlags
+{
+	GNT_WIDGET_DESTROYING	= 1 << 0,
+	GNT_WIDGET_CAN_TAKE_FOCUS= 1 << 1,
+	GNT_WIDGET_MAPPED 		= 1 << 2,
+	/* XXX: Need to set the following two as properties, and setup a callback whenever these
+	 * get chnaged. */
+	GNT_WIDGET_NO_BORDER		= 1 << 3,
+	GNT_WIDGET_NO_SHADOW		= 1 << 4,
+	GNT_WIDGET_HAS_FOCUS		= 1 << 5
+} GntWidgetFlags;
+
+typedef enum _GnParamFlags
+{
+	GNT_PARAM_SERIALIZABLE	= 1 << G_PARAM_USER_SHIFT
+} GntParamFlags;
+
+struct _GnWidgetPriv
+{
+	int x, y;
+	int width, height;
+	GntWidgetFlags flags;
+	char *name;
+};
+
+struct _GnWidget
+{
+	GObject inherit;
+
+	GntWidget *parent;
+
+	GntWidgetPriv priv;
+	WINDOW *window;
+	WINDOW *back;
+
+    void (*gnt_reserved1)(void);
+    void (*gnt_reserved2)(void);
+    void (*gnt_reserved3)(void);
+    void (*gnt_reserved4)(void);
+};
+
+struct _GnWidgetClass
+{
+	GObjectClass parent;
+
+	void (*map)(GntWidget *obj);
+	void (*show)(GntWidget *obj);		/* This will call draw() and take focus (if it can take focus) */
+	void (*destroy)(GntWidget *obj);
+	void (*draw)(GntWidget *obj);		/* This will draw the widget */
+	void (*expose)(GntWidget *widget, int x, int y, int width, int height);
+	void (*gained_focus)(GntWidget *widget);
+	void (*lost_focus)(GntWidget *widget);
+
+	void (*size_request)(GntWidget *widget);
+	void (*set_position)(GntWidget *widget, int x, int y);
+	gboolean (*key_pressed)(GntWidget *widget, const char *key);
+	void (*activate)(GntWidget *widget);
+
+	void (*gnt_reserved1)(void);
+	void (*gnt_reserved2)(void);
+	void (*gnt_reserved3)(void);
+	void (*gnt_reserved4)(void);
+};
+
+G_BEGIN_DECLS
+
+GType gnt_widget_get_gtype(void);
+void gnt_widget_destroy(GntWidget *widget);
+void gnt_widget_show(GntWidget *widget);
+void gnt_widget_draw(GntWidget *widget);
+void gnt_widget_expose(GntWidget *widget, int x, int y, int width, int height);
+void gnt_widget_hide(GntWidget *widget);
+
+void gnt_widget_get_position(GntWidget *widget, int *x, int *y);
+void gnt_widget_set_position(GntWidget *widget, int x, int y);
+void gnt_widget_size_request(GntWidget *widget);
+void gnt_widget_get_size(GntWidget *widget, int *width, int *height);
+void gnt_widget_set_size(GntWidget *widget, int width, int height);
+
+gboolean gnt_widget_key_pressed(GntWidget *widget, const char *keys);
+
+gboolean gnt_widget_set_focus(GntWidget *widget, gboolean set);
+void gnt_widget_activate(GntWidget *widget);
+
+void gnt_widget_set_name(GntWidget *widget, const char *name);
+
+G_END_DECLS
+
+#endif /* GNT_WIDGET_H */


Property changes on: branches/soc-2006-file-loggers/console/libgnt/gntwidget.h
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: branches/soc-2006-file-loggers/console/libgnt/test.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/test.c	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/libgnt/test.c	2006-06-25 23:08:49 UTC (rev 16337)
@@ -0,0 +1,125 @@
+#include "gntbutton.h"
+#include "gnt.h"
+#include "gntkeys.h"
+#include "gnttree.h"
+#include "gntbox.h"
+
+static gboolean
+key_pressed(GntWidget *widget, const char *text, gpointer null)
+{
+	GntWidget *w = null;
+	GntWidget *box = gnt_box_new(FALSE, FALSE);
+	GntWidget *label = gnt_label_new("so wassup!!");
+
+	gnt_box_add_widget(GNT_BOX(box), label);
+	GNT_WIDGET_UNSET_FLAGS(box, GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW);
+	gnt_box_set_title(GNT_BOX(box), "This is a test");
+
+	gnt_widget_show(box);
+#if 0
+
+	gnt_widget_set_focus(w, TRUE);
+
+	/* XXX: This is to just test stuff */
+	if (text[0] == 27)
+	{
+		if (strcmp(text+1, GNT_KEY_LEFT) == 0 && w->priv.x)
+			(w->priv.x)--;
+		else if (strcmp(text+1, GNT_KEY_RIGHT) == 0)
+			(w->priv.x)++;
+		else if (strcmp(text+1, GNT_KEY_UP) == 0 && w->priv.y)
+			(w->priv.y)--;
+		else if (strcmp(text+1, GNT_KEY_DOWN) == 0)
+			(w->priv.y)++;
+	}
+
+	gnt_widget_draw(w);
+#endif
+
+	return FALSE;
+}
+
+static void
+button1(GntWidget *widget, gpointer null)
+{
+	printf("OLAAA");
+	gnt_widget_destroy(null);
+}
+
+static void
+button2(GntWidget *widget, gpointer null)
+{
+	printf("BOOYAA");
+}
+
+static gboolean
+w_scroll(GntWidget *tree)
+{
+	g_return_val_if_fail(GNT_IS_TREE(tree), FALSE);
+	gnt_tree_scroll(GNT_TREE(tree), 1);
+	/*wscrl(tree->window, 1);*/
+	/*box(tree->window, ACS_VLINE, ACS_HLINE);*/
+	/*wrefresh(tree->window);*/
+	/*char *s = 0;*/
+	/**s = 'a';*/
+	return TRUE;
+}
+
+int main()
+{
+	gnt_init();
+
+	GntWidget *widget = gnt_button_new("Button 1");
+	GntWidget *widget2 = gnt_button_new("Button 2 has a longish text with a UTF-8 thing M-bM-^@M-&");
+	GntWidget *label = gnt_label_new("So wassup dudes and dudettes!!\nSo this is, like,\nthe third line!! \\o/");
+	GntWidget *vbox, *hbox, *tree;
+	WINDOW *test;
+
+	box(stdscr, 0, 0);
+	wrefresh(stdscr);
+
+	vbox = gnt_box_new(FALSE, FALSE);
+	hbox = gnt_box_new(FALSE, TRUE);
+
+	gnt_widget_set_name(vbox, "vbox");
+	gnt_widget_set_name(hbox, "hbox");
+	gnt_widget_set_name(widget, "widget");
+	gnt_widget_set_name(widget2, "widget2");
+
+	gnt_box_add_widget(GNT_BOX(vbox), widget);
+	gnt_box_add_widget(GNT_BOX(vbox), widget2);
+
+	gnt_box_add_widget(GNT_BOX(hbox), label);
+	/*gnt_box_add_widget(GNT_BOX(hbox), vbox);*/
+
+	gnt_box_add_widget(GNT_BOX(hbox), gnt_entry_new("a"));
+
+	tree = gnt_tree_new();
+	gnt_box_add_widget(GNT_BOX(hbox), tree);
+
+	gnt_tree_add_row_after(GNT_TREE(tree), "a", "a", NULL, NULL);
+	gnt_tree_add_row_after(GNT_TREE(tree), "c", "c", NULL, NULL);
+	gnt_tree_add_row_after(GNT_TREE(tree), "d", "d", NULL, NULL);
+	gnt_tree_add_row_after(GNT_TREE(tree), "e", "e", "a", NULL);
+	gnt_tree_add_row_after(GNT_TREE(tree), "b", "b", "d", NULL);
+
+	GNT_WIDGET_UNSET_FLAGS(hbox, GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW);
+	gnt_box_set_title(GNT_BOX(hbox), "111111111111111111111111111111111111111111111111111111111111111This is the title M-bM-^@M-&");
+
+	/*gnt_widget_set_take_focus(vbox, TRUE);*/
+	/*gnt_widget_set_take_focus(hbox, TRUE);*/
+	/*gnt_widget_set_position(hbox, 10, 10);*/
+
+	gnt_widget_show(hbox);
+
+	g_signal_connect(hbox, "key_pressed", G_CALLBACK(key_pressed), tree);
+	g_signal_connect(widget, "activate", G_CALLBACK(button1), hbox);
+	g_signal_connect(widget2, "activate", G_CALLBACK(button2), hbox);
+
+	/*g_timeout_add(1000, (GSourceFunc)w_scroll, tree);*/
+
+	gnt_main();
+
+	return 0;
+}
+


Property changes on: branches/soc-2006-file-loggers/console/libgnt/test.c
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Added: branches/soc-2006-file-loggers/plugins/tcl/tcl_cmd.c
===================================================================
--- branches/soc-2006-file-loggers/plugins/tcl/tcl_cmd.c	                        (rev 0)
+++ branches/soc-2006-file-loggers/plugins/tcl/tcl_cmd.c	2006-06-25 23:08:49 UTC (rev 16337)
@@ -0,0 +1,190 @@
+/**
+ * @file tcl_cmd.c Gaim Tcl cmd API
+ *
+ * gaim
+ *
+ * Copyright (C) 2006 Etan Reisner <deryni@...>
+ *
+ * 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
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#include <tcl.h>
+
+#include "tcl_gaim.h"
+
+#include "internal.h"
+#include "cmds.h"
+#include "debug.h"
+
+static GList *tcl_cmd_callbacks;
+
+static GaimCmdRet tcl_cmd_callback(GaimConversation *conv, const gchar *cmd,
+                                   gchar **args, gchar **errors,
+                                   struct tcl_cmd_handler *handler);
+static Tcl_Obj *new_cmd_cb_namespace(void);
+
+void tcl_cmd_init()
+{
+    tcl_cmd_callbacks = NULL;
+}
+
+void tcl_cmd_handler_free(struct tcl_cmd_handler *handler)
+{
+	if (handler == NULL)
+		return;
+
+	Tcl_DecrRefCount(handler->namespace);
+	g_free(handler);
+}
+
+void tcl_cmd_cleanup(Tcl_Interp *interp)
+{
+	GList *cur;
+	struct tcl_cmd_handler *handler;
+
+	for (cur = tcl_cmd_callbacks; cur != NULL; cur = g_list_next(cur)) {
+		handler = cur->data;
+		if (handler->interp == interp) {
+			gaim_cmd_unregister(handler->id);
+			tcl_cmd_handler_free(handler);
+			cur->data = NULL;
+		}
+	}
+	tcl_cmd_callbacks = g_list_remove_all(tcl_cmd_callbacks, NULL);
+}
+
+GaimCmdId tcl_cmd_register(struct tcl_cmd_handler *handler)
+{
+	int id;
+	GString *proc;
+
+	if ((id = gaim_cmd_register(Tcl_GetString(handler->cmd),
+				    handler->args, handler->priority,
+				    handler->flags, handler->prpl_id,
+				    GAIM_CMD_FUNC(tcl_cmd_callback),
+				    handler->helpstr, (void *)handler)) == 0)
+		return 0;
+
+	handler->namespace = new_cmd_cb_namespace ();
+	Tcl_IncrRefCount(handler->namespace);
+	proc = g_string_new("");
+	g_string_append_printf(proc, "namespace eval %s { proc cb { conv cmd arglist } { %s } }",
+	                       Tcl_GetString(handler->namespace),
+	                       Tcl_GetString(handler->proc));
+	if (Tcl_Eval(handler->interp, proc->str) != TCL_OK) {
+		Tcl_DecrRefCount(handler->namespace);
+		g_string_free(proc, TRUE);
+		return 0;
+	}
+	g_string_free(proc, TRUE);
+
+	tcl_cmd_callbacks = g_list_append(tcl_cmd_callbacks, (gpointer)handler);
+
+	return id;
+}
+
+void tcl_cmd_unregister(GaimCmdId id, Tcl_Interp *interp)
+{
+	GList *cur;
+	GString *cmd;
+	gboolean found = FALSE;
+	struct tcl_cmd_handler *handler;
+

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16396
Author:   roast
Date:     2006-07-02 09:02:29 -0700 (Sun, 02 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16396&view=rev

Log Message:
-----------
merged with svn trunk. 16338:16395.

Modified Paths:
--------------
    branches/soc-2006-file-loggers/COPYRIGHT
    branches/soc-2006-file-loggers/ChangeLog
    branches/soc-2006-file-loggers/configure.ac
    branches/soc-2006-file-loggers/console/Makefile
    branches/soc-2006-file-loggers/console/gntblist.c
    branches/soc-2006-file-loggers/console/gntgaim.c
    branches/soc-2006-file-loggers/console/gntui.c
    branches/soc-2006-file-loggers/console/libgnt/gnt.h
    branches/soc-2006-file-loggers/console/libgnt/gntbox.c
    branches/soc-2006-file-loggers/console/libgnt/gntbox.h
    branches/soc-2006-file-loggers/console/libgnt/gntbutton.c
    branches/soc-2006-file-loggers/console/libgnt/gntcolors.c
    branches/soc-2006-file-loggers/console/libgnt/gntcolors.h
    branches/soc-2006-file-loggers/console/libgnt/gntentry.c
    branches/soc-2006-file-loggers/console/libgnt/gntentry.h
    branches/soc-2006-file-loggers/console/libgnt/gntkeys.h
    branches/soc-2006-file-loggers/console/libgnt/gntlabel.c
    branches/soc-2006-file-loggers/console/libgnt/gntmain.c
    branches/soc-2006-file-loggers/console/libgnt/gnttree.c
    branches/soc-2006-file-loggers/console/libgnt/gntwidget.c
    branches/soc-2006-file-loggers/console/libgnt/gntwidget.h
    branches/soc-2006-file-loggers/doc/C-HOWTO.dox
    branches/soc-2006-file-loggers/pixmaps/smileys/default/Makefile.am
    branches/soc-2006-file-loggers/pixmaps/smileys/default/theme
    branches/soc-2006-file-loggers/pixmaps/status/default/Makefile.am
    branches/soc-2006-file-loggers/src/blist.c
    branches/soc-2006-file-loggers/src/blist.h
    branches/soc-2006-file-loggers/src/buddyicon.c
    branches/soc-2006-file-loggers/src/dnssrv.c
    branches/soc-2006-file-loggers/src/gtkblist.c
    branches/soc-2006-file-loggers/src/protocols/Makefile.am
    branches/soc-2006-file-loggers/src/protocols/bonjour/jabber.c
    branches/soc-2006-file-loggers/src/protocols/bonjour/jabber.h
    branches/soc-2006-file-loggers/src/protocols/irc/cmds.c
    branches/soc-2006-file-loggers/src/protocols/irc/irc.h
    branches/soc-2006-file-loggers/src/protocols/irc/msgs.c
    branches/soc-2006-file-loggers/src/protocols/irc/parse.c
    branches/soc-2006-file-loggers/src/protocols/jabber/jabber.c
    branches/soc-2006-file-loggers/src/protocols/jabber/presence.c
    branches/soc-2006-file-loggers/src/protocols/msn/dialog.c
    branches/soc-2006-file-loggers/src/protocols/msn/session.c
    branches/soc-2006-file-loggers/src/protocols/oscar/family_feedbag.c
    branches/soc-2006-file-loggers/src/protocols/oscar/family_oservice.c
    branches/soc-2006-file-loggers/src/protocols/oscar/oscar.c
    branches/soc-2006-file-loggers/src/protocols/oscar/oscar.h
    branches/soc-2006-file-loggers/src/protocols/silc/silc.c
    branches/soc-2006-file-loggers/src/protocols/yahoo/yahoo.c

Added Paths:
-----------
    branches/soc-2006-file-loggers/console/gntconv.c
    branches/soc-2006-file-loggers/console/gntconv.h
    branches/soc-2006-file-loggers/console/libgnt/AUTHORS
    branches/soc-2006-file-loggers/console/libgnt/COPYING
    branches/soc-2006-file-loggers/console/libgnt/ChangeLog
    branches/soc-2006-file-loggers/console/libgnt/INSTALL
    branches/soc-2006-file-loggers/console/libgnt/Makefile.am
    branches/soc-2006-file-loggers/console/libgnt/NEWS
    branches/soc-2006-file-loggers/console/libgnt/README
    branches/soc-2006-file-loggers/console/libgnt/autogen.sh
    branches/soc-2006-file-loggers/console/libgnt/configure.ac
    branches/soc-2006-file-loggers/console/libgnt/gnt.pc.in
    branches/soc-2006-file-loggers/console/libgnt/gnttextview.c
    branches/soc-2006-file-loggers/console/libgnt/gnttextview.h
    branches/soc-2006-file-loggers/console/libgnt/test/
    branches/soc-2006-file-loggers/console/libgnt/test/Makefile
    branches/soc-2006-file-loggers/console/libgnt/test/focus.c
    branches/soc-2006-file-loggers/console/libgnt/test/multiwin.c
    branches/soc-2006-file-loggers/console/libgnt/test/tv.c
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_0.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_1.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_10.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_11.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_12.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_13.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_14.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_15.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_16.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_17.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_18.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_19.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_2.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_20.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_21.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_22.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_23.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_24.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_25.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_26.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_27.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_28.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_29.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_3.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_30.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_31.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_32.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_33.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_34.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_35.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_36.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_37.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_38.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_39.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_4.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_40.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_41.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_42.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_43.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_44.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_45.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_46.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_47.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_48.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_49.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_5.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_50.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_51.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_52.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_53.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_54.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_55.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_56.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_57.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_58.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_59.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_6.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_60.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_61.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_62.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_63.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_64.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_65.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_66.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_67.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_68.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_69.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_7.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_70.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_71.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_72.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_73.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_74.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_75.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_76.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_77.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_78.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_79.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_8.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_80.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_81.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_82.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_83.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_84.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_85.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_86.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_87.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_88.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_89.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_9.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_90.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_91.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_92.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_93.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_94.gif
    branches/soc-2006-file-loggers/pixmaps/smileys/default/qq_smiley_95.gif
    branches/soc-2006-file-loggers/pixmaps/status/default/qq.png
    branches/soc-2006-file-loggers/src/protocols/qq/
    branches/soc-2006-file-loggers/src/protocols/qq/Makefile.am
    branches/soc-2006-file-loggers/src/protocols/qq/Makefile.mingw
    branches/soc-2006-file-loggers/src/protocols/qq/TODO
    branches/soc-2006-file-loggers/src/protocols/qq/buddy_info.c
    branches/soc-2006-file-loggers/src/protocols/qq/buddy_info.h
    branches/soc-2006-file-loggers/src/protocols/qq/buddy_list.c
    branches/soc-2006-file-loggers/src/protocols/qq/buddy_list.h
    branches/soc-2006-file-loggers/src/protocols/qq/buddy_opt.c
    branches/soc-2006-file-loggers/src/protocols/qq/buddy_opt.h
    branches/soc-2006-file-loggers/src/protocols/qq/buddy_status.c
    branches/soc-2006-file-loggers/src/protocols/qq/buddy_status.h
    branches/soc-2006-file-loggers/src/protocols/qq/char_conv.c
    branches/soc-2006-file-loggers/src/protocols/qq/char_conv.h
    branches/soc-2006-file-loggers/src/protocols/qq/crypt.c
    branches/soc-2006-file-loggers/src/protocols/qq/crypt.h
    branches/soc-2006-file-loggers/src/protocols/qq/file_trans.c
    branches/soc-2006-file-loggers/src/protocols/qq/file_trans.h
    branches/soc-2006-file-loggers/src/protocols/qq/group.c
    branches/soc-2006-file-loggers/src/protocols/qq/group.h
    branches/soc-2006-file-loggers/src/protocols/qq/group_admindlg.c
    branches/soc-2006-file-loggers/src/protocols/qq/group_admindlg.h
    branches/soc-2006-file-loggers/src/protocols/qq/group_conv.c
    branches/soc-2006-file-loggers/src/protocols/qq/group_conv.h
    branches/soc-2006-file-loggers/src/protocols/qq/group_find.c
    branches/soc-2006-file-loggers/src/protocols/qq/group_find.h
    branches/soc-2006-file-loggers/src/protocols/qq/group_free.c
    branches/soc-2006-file-loggers/src/protocols/qq/group_free.h
    branches/soc-2006-file-loggers/src/protocols/qq/group_hash.c
    branches/soc-2006-file-loggers/src/protocols/qq/group_hash.h
    branches/soc-2006-file-loggers/src/protocols/qq/group_im.c
    branches/soc-2006-file-loggers/src/protocols/qq/group_im.h
    branches/soc-2006-file-loggers/src/protocols/qq/group_info.c
    branches/soc-2006-file-loggers/src/protocols/qq/group_info.h
    branches/soc-2006-file-loggers/src/protocols/qq/group_join.c
    branches/soc-2006-file-loggers/src/protocols/qq/group_join.h
    branches/soc-2006-file-loggers/src/protocols/qq/group_misc.c
    branches/soc-2006-file-loggers/src/protocols/qq/group_misc.h
    branches/soc-2006-file-loggers/src/protocols/qq/group_network.c
    branches/soc-2006-file-loggers/src/protocols/qq/group_network.h
    branches/soc-2006-file-loggers/src/protocols/qq/group_opt.c
    branches/soc-2006-file-loggers/src/protocols/qq/group_opt.h
    branches/soc-2006-file-loggers/src/protocols/qq/group_search.c
    branches/soc-2006-file-loggers/src/protocols/qq/group_search.h
    branches/soc-2006-file-loggers/src/protocols/qq/header_info.c
    branches/soc-2006-file-loggers/src/protocols/qq/header_info.h
    branches/soc-2006-file-loggers/src/protocols/qq/im.c
    branches/soc-2006-file-loggers/src/protocols/qq/im.h
    branches/soc-2006-file-loggers/src/protocols/qq/infodlg.c
    branches/soc-2006-file-loggers/src/protocols/qq/infodlg.h
    branches/soc-2006-file-loggers/src/protocols/qq/ip_location.c
    branches/soc-2006-file-loggers/src/protocols/qq/ip_location.h
    branches/soc-2006-file-loggers/src/protocols/qq/keep_alive.c
    branches/soc-2006-file-loggers/src/protocols/qq/keep_alive.h
    branches/soc-2006-file-loggers/src/protocols/qq/login_logout.c
    branches/soc-2006-file-loggers/src/protocols/qq/login_logout.h
    branches/soc-2006-file-loggers/src/protocols/qq/packet_parse.c
    branches/soc-2006-file-loggers/src/protocols/qq/packet_parse.h
    branches/soc-2006-file-loggers/src/protocols/qq/qq.c
    branches/soc-2006-file-loggers/src/protocols/qq/qq.h
    branches/soc-2006-file-loggers/src/protocols/qq/qq_proxy.c
    branches/soc-2006-file-loggers/src/protocols/qq/qq_proxy.h
    branches/soc-2006-file-loggers/src/protocols/qq/recv_core.c
    branches/soc-2006-file-loggers/src/protocols/qq/recv_core.h
    branches/soc-2006-file-loggers/src/protocols/qq/send_core.c
    branches/soc-2006-file-loggers/src/protocols/qq/send_core.h
    branches/soc-2006-file-loggers/src/protocols/qq/send_file.c
    branches/soc-2006-file-loggers/src/protocols/qq/send_file.h
    branches/soc-2006-file-loggers/src/protocols/qq/sendqueue.c
    branches/soc-2006-file-loggers/src/protocols/qq/sendqueue.h
    branches/soc-2006-file-loggers/src/protocols/qq/show.c
    branches/soc-2006-file-loggers/src/protocols/qq/show.h
    branches/soc-2006-file-loggers/src/protocols/qq/sys_msg.c
    branches/soc-2006-file-loggers/src/protocols/qq/sys_msg.h
    branches/soc-2006-file-loggers/src/protocols/qq/udp_proxy_s5.c
    branches/soc-2006-file-loggers/src/protocols/qq/udp_proxy_s5.h
    branches/soc-2006-file-loggers/src/protocols/qq/utils.c
    branches/soc-2006-file-loggers/src/protocols/qq/utils.h

Removed Paths:
-------------
    branches/soc-2006-file-loggers/console/libgnt/Makefile
    branches/soc-2006-file-loggers/console/libgnt/test/Makefile
    branches/soc-2006-file-loggers/console/libgnt/test/focus.c
    branches/soc-2006-file-loggers/console/libgnt/test/multiwin.c
    branches/soc-2006-file-loggers/console/libgnt/test/tv.c
    branches/soc-2006-file-loggers/src/protocols/qq/Makefile.am
    branches/soc-2006-file-loggers/src/protocols/qq/Makefile.mingw
    branches/soc-2006-file-loggers/src/protocols/qq/TODO
    branches/soc-2006-file-loggers/src/protocols/qq/buddy_info.c
    branches/soc-2006-file-loggers/src/protocols/qq/buddy_info.h
    branches/soc-2006-file-loggers/src/protocols/qq/buddy_list.c
    branches/soc-2006-file-loggers/src/protocols/qq/buddy_list.h
    branches/soc-2006-file-loggers/src/protocols/qq/buddy_opt.c
    branches/soc-2006-file-loggers/src/protocols/qq/buddy_opt.h
    branches/soc-2006-file-loggers/src/protocols/qq/buddy_status.c
    branches/soc-2006-file-loggers/src/protocols/qq/buddy_status.h
    branches/soc-2006-file-loggers/src/protocols/qq/char_conv.c
    branches/soc-2006-file-loggers/src/protocols/qq/char_conv.h
    branches/soc-2006-file-loggers/src/protocols/qq/crypt.c
    branches/soc-2006-file-loggers/src/protocols/qq/crypt.h
    branches/soc-2006-file-loggers/src/protocols/qq/file_trans.c
    branches/soc-2006-file-loggers/src/protocols/qq/file_trans.h
    branches/soc-2006-file-loggers/src/protocols/qq/group.c
    branches/soc-2006-file-loggers/src/protocols/qq/group.h
    branches/soc-2006-file-loggers/src/protocols/qq/group_admindlg.c
    branches/soc-2006-file-loggers/src/protocols/qq/group_admindlg.h
    branches/soc-2006-file-loggers/src/protocols/qq/group_conv.c
    branches/soc-2006-file-loggers/src/protocols/qq/group_conv.h
    branches/soc-2006-file-loggers/src/protocols/qq/group_find.c
    branches/soc-2006-file-loggers/src/protocols/qq/group_find.h
    branches/soc-2006-file-loggers/src/protocols/qq/group_free.c
    branches/soc-2006-file-loggers/src/protocols/qq/group_free.h
    branches/soc-2006-file-loggers/src/protocols/qq/group_hash.c
    branches/soc-2006-file-loggers/src/protocols/qq/group_hash.h
    branches/soc-2006-file-loggers/src/protocols/qq/group_im.c
    branches/soc-2006-file-loggers/src/protocols/qq/group_im.h
    branches/soc-2006-file-loggers/src/protocols/qq/group_info.c
    branches/soc-2006-file-loggers/src/protocols/qq/group_info.h
    branches/soc-2006-file-loggers/src/protocols/qq/group_join.c
    branches/soc-2006-file-loggers/src/protocols/qq/group_join.h
    branches/soc-2006-file-loggers/src/protocols/qq/group_misc.c
    branches/soc-2006-file-loggers/src/protocols/qq/group_misc.h
    branches/soc-2006-file-loggers/src/protocols/qq/group_network.c
    branches/soc-2006-file-loggers/src/protocols/qq/group_network.h
    branches/soc-2006-file-loggers/src/protocols/qq/group_opt.c
    branches/soc-2006-file-loggers/src/protocols/qq/group_opt.h
    branches/soc-2006-file-loggers/src/protocols/qq/group_search.c
    branches/soc-2006-file-loggers/src/protocols/qq/group_search.h
    branches/soc-2006-file-loggers/src/protocols/qq/header_info.c
    branches/soc-2006-file-loggers/src/protocols/qq/header_info.h
    branches/soc-2006-file-loggers/src/protocols/qq/im.c
    branches/soc-2006-file-loggers/src/protocols/qq/im.h
    branches/soc-2006-file-loggers/src/protocols/qq/infodlg.c
    branches/soc-2006-file-loggers/src/protocols/qq/infodlg.h
    branches/soc-2006-file-loggers/src/protocols/qq/ip_location.c
    branches/soc-2006-file-loggers/src/protocols/qq/ip_location.h
    branches/soc-2006-file-loggers/src/protocols/qq/keep_alive.c
    branches/soc-2006-file-loggers/src/protocols/qq/keep_alive.h
    branches/soc-2006-file-loggers/src/protocols/qq/login_logout.c
    branches/soc-2006-file-loggers/src/protocols/qq/login_logout.h
    branches/soc-2006-file-loggers/src/protocols/qq/packet_parse.c
    branches/soc-2006-file-loggers/src/protocols/qq/packet_parse.h
    branches/soc-2006-file-loggers/src/protocols/qq/qq.c
    branches/soc-2006-file-loggers/src/protocols/qq/qq.h
    branches/soc-2006-file-loggers/src/protocols/qq/qq_proxy.c
    branches/soc-2006-file-loggers/src/protocols/qq/qq_proxy.h
    branches/soc-2006-file-loggers/src/protocols/qq/recv_core.c
    branches/soc-2006-file-loggers/src/protocols/qq/recv_core.h
    branches/soc-2006-file-loggers/src/protocols/qq/send_core.c
    branches/soc-2006-file-loggers/src/protocols/qq/send_core.h
    branches/soc-2006-file-loggers/src/protocols/qq/send_file.c
    branches/soc-2006-file-loggers/src/protocols/qq/send_file.h
    branches/soc-2006-file-loggers/src/protocols/qq/sendqueue.c
    branches/soc-2006-file-loggers/src/protocols/qq/sendqueue.h
    branches/soc-2006-file-loggers/src/protocols/qq/show.c
    branches/soc-2006-file-loggers/src/protocols/qq/show.h
    branches/soc-2006-file-loggers/src/protocols/qq/sys_msg.c
    branches/soc-2006-file-loggers/src/protocols/qq/sys_msg.h
    branches/soc-2006-file-loggers/src/protocols/qq/udp_proxy_s5.c
    branches/soc-2006-file-loggers/src/protocols/qq/udp_proxy_s5.h
    branches/soc-2006-file-loggers/src/protocols/qq/utils.c
    branches/soc-2006-file-loggers/src/protocols/qq/utils.h
Modified: branches/soc-2006-file-loggers/COPYRIGHT
===================================================================
--- branches/soc-2006-file-loggers/COPYRIGHT	2006-07-02 15:49:54 UTC (rev 16395)
+++ branches/soc-2006-file-loggers/COPYRIGHT	2006-07-02 16:02:29 UTC (rev 16396)
@@ -59,6 +59,7 @@
 Eoin Coffey
 Jason Cohen
 Todd Cohen
+Jono Cole
 Nathan Conrad
 Felipe Contreras
 Alex Converse
@@ -302,6 +303,7 @@
 Wan Hing Wah
 Philip Walford
 Nathan Walp
+Jonty Wareing
 Eric Warmenhoven
 Adam J. Warrington
 Andrew Wellington

Modified: branches/soc-2006-file-loggers/ChangeLog
===================================================================
--- branches/soc-2006-file-loggers/ChangeLog	2006-07-02 15:49:54 UTC (rev 16395)
+++ branches/soc-2006-file-loggers/ChangeLog	2006-07-02 16:02:29 UTC (rev 16396)
@@ -130,6 +130,7 @@
 	  channel or change your nick
 	* Added /nickserv, /memoserv, /chanserv and /operserv
 	  commands (Joao Luís Marques Pinto)
+	* Added CTCP VERSION via /version (Andrej Krivulčík)
 
 	Jabber Features:
 	* Support for SRV lookups

Modified: branches/soc-2006-file-loggers/configure.ac
===================================================================
--- branches/soc-2006-file-loggers/configure.ac	2006-07-02 15:49:54 UTC (rev 16395)
+++ branches/soc-2006-file-loggers/configure.ac	2006-07-02 16:02:29 UTC (rev 16396)
@@ -401,7 +401,7 @@
 fi
 
 if test "x$STATIC_PRPLS" = "xall" ; then
-	STATIC_PRPLS="bonjour gg irc jabber msn novell oscar sametime silc simple yahoo zephyr"
+	STATIC_PRPLS="bonjour gg irc jabber msn novell oscar qq sametime silc simple yahoo zephyr"
 fi
 if test "x$have_meanwhile" != "xyes" ; then
 	STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/sametime//'`
@@ -436,6 +436,7 @@
 		msn)		static_msn=yes ;;
 		novell)		static_novell=yes ;;
 		oscar)		static_oscar=yes ;;
+		qq)		static_qq=yes ;;
 		sametime)	static_sametime=yes ;;
 		silc)		static_silc=yes ;;
 		simple)		static_simple=yes ;;
@@ -452,6 +453,7 @@
 AM_CONDITIONAL(STATIC_MSN, test "x$static_msn" = "xyes")
 AM_CONDITIONAL(STATIC_NOVELL, test "x$static_novell" = "xyes")
 AM_CONDITIONAL(STATIC_OSCAR, test "x$static_oscar" = "xyes")
+AM_CONDITIONAL(STATIC_QQ, test "x$static_qq" = "xyes")
 AM_CONDITIONAL(STATIC_SAMETIME, test "x$static_sametime" = "xyes" -a "x$have_meanwhile" = "xyes")
 AM_CONDITIONAL(STATIC_SILC, test "x$static_silc" = "xyes" -a "x$silcincludes" = "xyes" -a "x$silcclient" = "xyes")
 AM_CONDITIONAL(STATIC_SIMPLE, test "x$static_simple" = "xyes")
@@ -464,7 +466,7 @@
 
 AC_ARG_WITH(dynamic_prpls, [AC_HELP_STRING([--with-dynamic-prpls], [specify which protocols to build dynamically])], [DYNAMIC_PRPLS=`echo $withval | $sedpath 's/,/ /g'`])
 if test "x$DYNAMIC_PRPLS" = "xall" ; then
-	DYNAMIC_PRPLS="bonjour gg irc jabber msn novell oscar sametime silc simple yahoo zephyr"
+	DYNAMIC_PRPLS="bonjour gg irc jabber msn novell oscar qq sametime silc simple yahoo zephyr"
 fi
 if test "x$have_meanwhile" != "xyes"; then
         DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/sametime//'`
@@ -488,6 +490,7 @@
 		msn)		dynamic_msn=yes ;;
 		novell)		dynamic_novell=yes ;;
 		oscar)		dynamic_oscar=yes ;;
+		qq)		dynamic_qq=yes ;;
 		sametime)	dynamic_sametime=yes ;;
 		silc)		dynamic_silc=yes ;;
 		simple)		dynamic_simple=yes ;;
@@ -504,6 +507,7 @@
 AM_CONDITIONAL(DYNAMIC_MSN, test "x$dynamic_msn" = "xyes")
 AM_CONDITIONAL(DYNAMIC_NOVELL, test "x$dynamic_novell" = "xyes")
 AM_CONDITIONAL(DYNAMIC_OSCAR, test "x$dynamic_oscar" = "xyes")
+AM_CONDITIONAL(DYNAMIC_QQ, test "x$dynamic_qq" = "xyes")
 AM_CONDITIONAL(DYNAMIC_SAMETIME, test "x$dynamic_sametime" = "xyes" -a "x$have_meanwhile" = "xyes")
 AM_CONDITIONAL(DYNAMIC_SILC, test "x$dynamic_silc" = "xyes" -a "x$silcincludes" = "xyes" -a "x$silcclient" = "xyes")
 AM_CONDITIONAL(DYNAMIC_SIMPLE, test "x$dynamic_simple" = "xyes")
@@ -1772,6 +1776,7 @@
 		   src/protocols/napster/Makefile
 		   src/protocols/novell/Makefile
 		   src/protocols/oscar/Makefile
+		   src/protocols/qq/Makefile
 		   src/protocols/sametime/Makefile
 		   src/protocols/silc/Makefile
 		   src/protocols/simple/Makefile

Modified: branches/soc-2006-file-loggers/console/Makefile
===================================================================
--- branches/soc-2006-file-loggers/console/Makefile	2006-07-02 15:49:54 UTC (rev 16395)
+++ branches/soc-2006-file-loggers/console/Makefile	2006-07-02 16:02:29 UTC (rev 16396)
@@ -1,30 +1,32 @@
-CFLAGS=`pkg-config --cflags gaim gobject-2.0` -g -I./libgnt/
-LDFLAGS=`pkg-config --libs gaim gobject-2.0 libxml-2.0` -lncursesw -L./libgnt/ -lgnt -pg
+CC=gcc
+CFLAGS=`pkg-config --cflags gaim gobject-2.0 gnt` -g -Wall
+LDFLAGS=`pkg-config --libs gaim gobject-2.0 libxml-2.0 gnt` -pg
 
 GG_SOURCES = \
 	gntblist.c \
+	gntconv.c \
 	gntui.c
 
 GG_HEADERS = \
 	gntblist.h \
+	gntconv.h \
 	gntui.h
 
 GG_OBJECTS = \
 	gntblist.o \
+	gntconv.o \
 	gntui.o
 
-all:
-	cd libgnt && make
-	make gntgaim
+all: gntgaim
 
 gntgaim: gntgaim.o $(GG_OBJECTS)
 	$(CC) -o gntgaim gntgaim.o $(GG_OBJECTS) $(LDFLAGS)
 gntblist.o: gntblist.c $(GG_HEADERS)
+gntconv.o: gntconv.c $(GG_HEADERS)
 gntgaim.o: gntgaim.c gntgaim.h $(GG_HEADERS)
 gntui.o: gntui.c $(GG_HEADERS)
 
 clean:
-	cd libgnt && make clean
-	rm *.o
-	rm gntgaim
+	rm -f *.o
+	rm -f gntgaim
 

Modified: branches/soc-2006-file-loggers/console/gntblist.c
===================================================================
--- branches/soc-2006-file-loggers/console/gntblist.c	2006-07-02 15:49:54 UTC (rev 16395)
+++ branches/soc-2006-file-loggers/console/gntblist.c	2006-07-02 16:02:29 UTC (rev 16396)
@@ -1,11 +1,12 @@
-#include <gaim/account.h>
-#include <gaim/blist.h>
+#include <account.h>
+#include <blist.h>
+#include <server.h>
 #include <signal.h>
-#include <gaim/util.h>
-#include <gaim/server.h>
+#include <util.h>
 
 #include "gntgaim.h"
 #include "gntbox.h"
+#include "gntlabel.h"
 #include "gnttree.h"
 
 #include "gntblist.h"
@@ -24,6 +25,7 @@
 
 static void add_buddy(GaimBuddy *buddy, GGBlist *ggblist);
 static void add_group(GaimGroup *group, GGBlist *ggblist);
+static void add_chat(GaimChat *chat, GGBlist *ggblist);
 static void add_node(GaimBlistNode *node, GGBlist *ggblist);
 static void draw_tooltip(GGBlist *ggblist);
 
@@ -38,6 +40,8 @@
 		add_buddy((GaimBuddy*)node, ggblist);
 	else if (GAIM_BLIST_NODE_IS_GROUP(node))
 		add_group((GaimGroup*)node, ggblist);
+	else if (GAIM_BLIST_NODE_IS_CHAT(node))
+		add_chat((GaimChat *)node, ggblist);
 	draw_tooltip(ggblist);
 }
 
@@ -81,6 +85,10 @@
 		else
 			node_remove(gaim_get_blist(), node);
 	}
+	else if (GAIM_BLIST_NODE_IS_CHAT(node))
+	{
+		add_chat((GaimChat *)node, list->ui_data);
+	}
 }
 
 static void
@@ -121,52 +129,82 @@
 }
 
 static const char *
-get_buddy_display_name(GaimBuddy *buddy)
+get_display_name(GaimBlistNode *node)
 {
 	static char text[2096];
-	char status[8];
-	GaimStatusPrimitive prim;
-	GaimPresence *presence;
-	GaimStatus *now;
+	char status[8] = " ";
+	const char *name = NULL;
 
-	presence = gaim_buddy_get_presence(buddy);
-	now = gaim_presence_get_active_status(presence);
+	if (GAIM_BLIST_NODE_IS_BUDDY(node))
+	{
+		GaimBuddy *buddy = (GaimBuddy *)node;
+		GaimStatusPrimitive prim;
+		GaimPresence *presence;
+		GaimStatus *now;
 
-	prim = gaim_status_type_get_primitive(gaim_status_get_type(now));
+		
+		presence = gaim_buddy_get_presence(buddy);
+		now = gaim_presence_get_active_status(presence);
 
-	switch(prim)
-	{
+		prim = gaim_status_type_get_primitive(gaim_status_get_type(now));
+
+		switch(prim)
+		{
 #if 1
-		case GAIM_STATUS_OFFLINE:
-			strncpy(status, "x", sizeof(status) - 1);
-			break;
-		case GAIM_STATUS_AVAILABLE:
-			strncpy(status, "o", sizeof(status) - 1);
-			break;
-		default:
-			strncpy(status, ".", sizeof(status) - 1);
-			break;
+			case GAIM_STATUS_OFFLINE:
+				strncpy(status, "x", sizeof(status) - 1);
+				break;
+			case GAIM_STATUS_AVAILABLE:
+				strncpy(status, "o", sizeof(status) - 1);
+				break;
+			default:
+				strncpy(status, ".", sizeof(status) - 1);
+				break;
 #else
-		/* XXX: Let's use these some time */
-		case GAIM_STATUS_OFFLINE:
-			strncpy(status, "⊗", sizeof(status) - 1);
-			break;
-		case GAIM_STATUS_AVAILABLE:
-			/* XXX: Detect idleness */
-			strncpy(status, "◯", sizeof(status) - 1);
-			break;
-		default:
-			strncpy(status, "⊖", sizeof(status) - 1);
-			break;
+			/* XXX: Let's use these some time */
+			case GAIM_STATUS_OFFLINE:
+				strncpy(status, "⊗", sizeof(status) - 1);
+				break;
+			case GAIM_STATUS_AVAILABLE:
+				/* XXX: Detect idleness */
+				strncpy(status, "◯", sizeof(status) - 1);
+				break;
+			default:
+				strncpy(status, "⊖", sizeof(status) - 1);
+				break;
 #endif
+		}
+		name = gaim_buddy_get_alias(buddy);
 	}
+	else if (GAIM_BLIST_NODE_IS_CHAT(node))
+	{
+		GaimChat *chat = (GaimChat*)node;
+		name = gaim_chat_get_name(chat);
 
-	snprintf(text, sizeof(text) - 1, "%s %s", status, gaim_buddy_get_alias(buddy));
+		strncpy(status, "~", sizeof(status) - 1);
+	}
 
+	snprintf(text, sizeof(text) - 1, "%s %s", status, name);
+
 	return text;
 }
 
 static void
+add_chat(GaimChat *chat, GGBlist *ggblist)
+{
+	GaimGroup *group;
+	GaimBlistNode *node = (GaimBlistNode *)chat;
+	if (node->ui_data)
+		return;
+
+	group = gaim_chat_get_group(chat);
+	add_node((GaimBlistNode*)group, ggblist);
+
+	node->ui_data = gnt_tree_add_row_after(GNT_TREE(ggblist->tree), chat,
+				get_display_name(node), group, NULL);
+}
+
+static void
 add_buddy(GaimBuddy *buddy, GGBlist *ggblist)
 {
 	GaimGroup *group;
@@ -178,9 +216,10 @@
 	add_node((GaimBlistNode*)group, ggblist);
 
 	node->ui_data = gnt_tree_add_row_after(GNT_TREE(ggblist->tree), buddy,
-				get_buddy_display_name(buddy), group, NULL);
+				get_display_name(node), group, NULL);
 }
 
+#if 0
 static void
 buddy_signed_on(GaimBuddy *buddy, GGBlist *ggblist)
 {
@@ -192,6 +231,7 @@
 {
 	node_remove(gaim_get_blist(), (GaimBlistNode*)buddy);
 }
+#endif
 
 GaimBlistUiOps *gg_blist_get_ui_ops()
 {
@@ -201,7 +241,21 @@
 static void
 selection_activate(GntWidget *widget, GGBlist *ggblist)
 {
-	gnt_widget_set_focus(widget, FALSE);
+	GntTree *tree = GNT_TREE(ggblist->tree);
+	GaimBlistNode *node = gnt_tree_get_selection_data(tree);
+
+	if (GAIM_BLIST_NODE_IS_BUDDY(node))
+	{
+		GaimBuddy *buddy = (GaimBuddy *)node;
+		gaim_conversation_new(GAIM_CONV_TYPE_IM,
+				gaim_buddy_get_account(buddy),
+				gaim_buddy_get_name(buddy));
+	}
+	else if (GAIM_BLIST_NODE_IS_CHAT(node))
+	{
+		GaimChat *chat = (GaimChat*)node;
+		serv_join_chat(chat->account->gc, chat->components);
+	}
 }
 
 static void
@@ -214,12 +268,15 @@
 	GaimPluginProtocolInfo *prpl_info;
 	GaimAccount *account;
 	GntTree *tree;
-	GntWidget *widget, *box, *label;
+	GntWidget *widget, *box;
 	char *title = NULL;
 
 	widget = ggblist->tree;
 	tree = GNT_TREE(widget);
 
+	if (!gnt_widget_has_focus(ggblist->tree))
+		return;
+
 	if (ggblist->tooltip)
 	{
 		/* XXX: Once we can properly redraw on expose events, this can be removed at the end
@@ -268,6 +325,15 @@
 
 		title = g_strdup(group->name);
 	}
+	else if (GAIM_BLIST_NODE_IS_CHAT(node))
+	{
+		GaimChat *chat = (GaimChat *)node;
+		GaimAccount *account = chat->account;
+
+		g_string_append_printf(str, _("Account: %s"), gaim_account_get_username(account));
+
+		title = g_strdup(gaim_chat_get_name(chat));
+	}
 	else
 	{
 		g_string_free(str, TRUE);
@@ -286,7 +352,7 @@
 	GNT_WIDGET_SET_FLAGS(box, GNT_WIDGET_NO_SHADOW);
 	gnt_box_set_title(GNT_BOX(box), title);
 
-	gnt_box_add_widget(GNT_BOX(box), GNT_WIDGET(gnt_label_new(str->str)));
+	gnt_box_add_widget(GNT_BOX(box), gnt_label_new(str->str));
 
 	gnt_widget_set_position(box, x, y);
 	gnt_widget_draw(box);
@@ -319,13 +385,14 @@
 			return TRUE;
 		}
 	}
+
 	return FALSE;
 }
 
 static void
 buddy_status_changed(GaimBuddy *buddy, GaimStatus *old, GaimStatus *now, GGBlist *ggblist)
 {
-	gnt_tree_change_text(GNT_TREE(ggblist->tree), buddy, get_buddy_display_name(buddy));
+	gnt_tree_change_text(GNT_TREE(ggblist->tree), buddy, get_display_name((GaimBlistNode*)buddy));
 	if (ggblist->tnode == (GaimBlistNode*)buddy)
 		draw_tooltip(ggblist);
 }
@@ -344,7 +411,7 @@
 
 	ggblist->tree = gnt_tree_new();
 	GNT_WIDGET_SET_FLAGS(ggblist->tree, GNT_WIDGET_NO_BORDER);
-	gnt_widget_set_size(ggblist->tree, 25, getmaxy(stdscr) - 2);
+	gnt_widget_set_size(ggblist->tree, 25, getmaxy(stdscr) - 3);
 
 	gnt_box_add_widget(GNT_BOX(ggblist->window), ggblist->tree);
 	gnt_widget_show(ggblist->window);

Copied: branches/soc-2006-file-loggers/console/gntconv.c (from rev 16395, trunk/console/gntconv.c)
===================================================================
--- branches/soc-2006-file-loggers/console/gntconv.c	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/gntconv.c	2006-07-02 16:02:29 UTC (rev 16396)
@@ -0,0 +1,263 @@
+#include <string.h>
+#include <util.h>
+
+#include "gntgaim.h"
+#include "gntconv.h"
+
+#include "gnt.h"
+#include "gntbox.h"
+#include "gntentry.h"
+#include "gnttextview.h"
+
+GHashTable *ggconvs;
+
+typedef struct _GGConv GGConv;
+typedef struct _GGConvChat GGConvChat;
+typedef struct _GGConvIm GGConvIm;
+
+struct _GGConv
+{
+	GaimConversation *conv;
+
+	GntWidget *window;        /* the container */
+	GntWidget *entry;         /* entry */
+	GntWidget *tv;            /* text-view */
+
+	union
+	{
+		GGConvChat *chat;
+		GGConvIm *im;
+	} u;
+};
+
+struct _GGConvChat
+{
+	GntWidget *userlist;       /* the userlist */
+};
+
+struct _GGConvIm
+{
+	void *nothing_for_now;
+};
+
+static gboolean
+entry_key_pressed(GntWidget *w, const char *key, GGConv *ggconv)
+{
+	if (key[0] == '\r' && key[1] == 0)
+	{
+		const char *text = gnt_entry_get_text(GNT_ENTRY(ggconv->entry));
+		switch (gaim_conversation_get_type(ggconv->conv))
+		{
+			case GAIM_CONV_TYPE_IM:
+				gaim_conv_im_send_with_flags(GAIM_CONV_IM(ggconv->conv), text, GAIM_MESSAGE_SEND);
+				break;
+			case GAIM_CONV_TYPE_CHAT:
+				gaim_conv_chat_send(GAIM_CONV_CHAT(ggconv->conv), text);
+				break;
+			default:
+				g_return_val_if_reached(FALSE);
+		}
+		gnt_entry_clear(GNT_ENTRY(ggconv->entry));
+		return TRUE;
+	}
+	else if (key[0] == 27)
+	{
+		if (strcmp(key+1, GNT_KEY_DOWN) == 0)
+			gnt_text_view_scroll(GNT_TEXT_VIEW(ggconv->tv), 1);
+		else if (strcmp(key+1, GNT_KEY_UP) == 0)
+			gnt_text_view_scroll(GNT_TEXT_VIEW(ggconv->tv), -1);
+		else if (strcmp(key+1, GNT_KEY_PGDOWN) == 0)
+			gnt_text_view_scroll(GNT_TEXT_VIEW(ggconv->tv), ggconv->tv->priv.height - 2);
+		else if (strcmp(key+1, GNT_KEY_PGUP) == 0)
+			gnt_text_view_scroll(GNT_TEXT_VIEW(ggconv->tv), -(ggconv->tv->priv.height - 2));
+		else
+			return FALSE;
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+static void
+closing_window(GntWidget *window, GGConv *ggconv)
+{
+	ggconv->window = NULL;
+	gaim_conversation_destroy(ggconv->conv);
+}
+
+static void
+gg_create_conversation(GaimConversation *conv)
+{
+	GGConv *ggc = g_hash_table_lookup(ggconvs, conv);
+	char *title;
+	GaimConversationType type;
+
+	if (ggc)
+		return;
+
+	ggc = g_new0(GGConv, 1);
+	g_hash_table_insert(ggconvs, conv, ggc);
+
+	ggc->conv = conv;
+
+	type = gaim_conversation_get_type(conv);
+	title = g_strdup_printf(_("%s"), gaim_conversation_get_name(conv));
+	ggc->window = gnt_box_new(FALSE, TRUE);
+	gnt_box_set_title(GNT_BOX(ggc->window), title);
+	gnt_box_set_toplevel(GNT_BOX(ggc->window), TRUE);
+	gnt_widget_set_name(ggc->window, title);
+
+	ggc->tv = gnt_text_view_new();
+	gnt_box_add_widget(GNT_BOX(ggc->window), ggc->tv);
+	gnt_widget_set_name(ggc->tv, "conversation-window-textview");
+	gnt_widget_set_size(ggc->tv, getmaxx(stdscr) - 40, getmaxy(stdscr) - 15);
+
+	ggc->entry = gnt_entry_new(NULL);
+	gnt_box_add_widget(GNT_BOX(ggc->window), ggc->entry);
+	gnt_widget_set_name(ggc->entry, "conversation-window-entry");
+	gnt_widget_set_size(ggc->entry, getmaxx(stdscr) - 40, 1);
+
+	g_signal_connect(G_OBJECT(ggc->entry), "key_pressed", G_CALLBACK(entry_key_pressed), ggc);
+	g_signal_connect(G_OBJECT(ggc->window), "destroy", G_CALLBACK(closing_window), ggc);
+
+	gnt_widget_set_position(ggc->window, 32, 0);
+	gnt_widget_show(ggc->window);
+
+	g_free(title);
+}
+
+static void
+gg_destroy_conversation(GaimConversation *conv)
+{
+	g_hash_table_remove(ggconvs, conv);
+}
+
+static void
+gg_write_common(GaimConversation *conv, const char *who, const char *message,
+		GaimMessageFlags flags, time_t mtime)
+{
+	GGConv *ggconv = g_hash_table_lookup(ggconvs, conv);
+	char *strip;
+	GntTextViewFlags fl = 0;
+
+	g_return_if_fail(ggconv != NULL);
+
+	if (who && *who && (flags & (GAIM_MESSAGE_SEND | GAIM_MESSAGE_RECV)))
+	{
+		char * name = g_strdup_printf("%s: ", who);
+		gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(ggconv->tv),
+				name, GNT_TEXT_FLAG_BOLD);
+		g_free(name);
+	}
+	else
+		fl = GNT_TEXT_FLAG_DIM;
+
+	if (flags & GAIM_MESSAGE_ERROR)
+		fl |= GNT_TEXT_FLAG_BOLD;
+	if (flags & GAIM_MESSAGE_NICK)
+		fl |= GNT_TEXT_FLAG_UNDERLINE;
+
+	strip = gaim_markup_strip_html(message);
+	gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(ggconv->tv),
+				strip, fl);
+	gnt_text_view_next_line(GNT_TEXT_VIEW(ggconv->tv));
+	gnt_text_view_scroll(GNT_TEXT_VIEW(ggconv->tv), 0);
+
+	g_free(strip);
+
+	gnt_widget_set_urgent(ggconv->tv);
+}
+
+static void
+gg_write_chat(GaimConversation *conv, const char *who, const char *message,
+		GaimMessageFlags flags, time_t mtime)
+{
+	gg_write_common(conv, who, message, flags, mtime);
+}
+
+static void
+gg_write_im(GaimConversation *conv, const char *who, const char *message,
+		GaimMessageFlags flags, time_t mtime)
+{
+	if (flags & GAIM_MESSAGE_SEND)
+	{
+		who = gaim_connection_get_display_name(conv->account->gc);
+		if (!who)
+			who = gaim_account_get_alias(conv->account);
+		if (!who)
+			who = gaim_account_get_username(conv->account);
+	}
+	else if (flags & GAIM_MESSAGE_RECV)
+		who = gaim_conversation_get_name(conv);
+
+	gg_write_common(conv, who, message, flags, mtime);
+}
+
+static void
+gg_write_conv(GaimConversation *conv, const char *who, const char *alias,
+		const char *message, GaimMessageFlags flags, time_t mtime)
+{
+	const char *name;
+	if (alias && *alias)
+		name = alias;
+	else if (who && *who)
+		name = who;
+	else
+		name = NULL;
+
+	gg_write_common(conv, name, message, flags, mtime);
+}
+
+static void
+gg_chat_add_users(GaimConversation *conv, GList *users, GList *flags, GList *aliases, gboolean new_arrivals)
+{}
+
+static void
+gg_chat_rename_user(GaimConversation *conv, const char *old, const char *new_n, const char *new_a)
+{}
+
+static void
+gg_chat_remove_user(GaimConversation *conv, GList *list)
+{}
+
+static void
+gg_chat_update_user(GaimConversation *conv, const char *user)
+{}
+
+static GaimConversationUiOps conv_ui_ops = 
+{
+	.create_conversation = gg_create_conversation,
+	.destroy_conversation = gg_destroy_conversation,
+	.write_chat = gg_write_chat,
+	.write_im = gg_write_im,
+	.write_conv = gg_write_conv,
+	.chat_add_users = gg_chat_add_users,
+	.chat_rename_user = gg_chat_rename_user,
+	.chat_remove_users = gg_chat_remove_user,
+	.chat_update_user = gg_chat_update_user,
+	.present = NULL,
+	.has_focus = NULL,
+	.custom_smiley_add = NULL,
+	.custom_smiley_write = NULL,
+	.custom_smiley_close = NULL
+};
+
+static void
+destroy_ggconv(gpointer data)
+{
+	GGConv *conv = data;
+	gnt_widget_destroy(conv->window);
+	g_free(conv);
+}
+
+GaimConversationUiOps *gg_conv_get_ui_ops()
+{
+	return &conv_ui_ops;
+}
+
+
+void gg_conversation_init()
+{
+	ggconvs = g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL, destroy_ggconv);
+}
+

Copied: branches/soc-2006-file-loggers/console/gntconv.h (from rev 16395, trunk/console/gntconv.h)
===================================================================
--- branches/soc-2006-file-loggers/console/gntconv.h	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/gntconv.h	2006-07-02 16:02:29 UTC (rev 16396)
@@ -0,0 +1,5 @@
+#include "conversation.h"
+
+GaimConversationUiOps *gg_conv_get_ui_ops();
+
+void gg_conversation_init();

Modified: branches/soc-2006-file-loggers/console/gntgaim.c
===================================================================
--- branches/soc-2006-file-loggers/console/gntgaim.c	2006-07-02 15:49:54 UTC (rev 16395)
+++ branches/soc-2006-file-loggers/console/gntgaim.c	2006-07-02 16:02:29 UTC (rev 16396)
@@ -16,6 +16,7 @@
 #include "whiteboard.h"
 
 #include "gntgaim.h"
+#include "gntui.h"
 
 /* Anything IO-related is directly copied from gtkgaim's source tree */
 

Modified: branches/soc-2006-file-loggers/console/gntui.c
===================================================================
--- branches/soc-2006-file-loggers/console/gntui.c	2006-07-02 15:49:54 UTC (rev 16395)
+++ branches/soc-2006-file-loggers/console/gntui.c	2006-07-02 16:02:29 UTC (rev 16396)
@@ -1,4 +1,6 @@
 #include "gntui.h"
+#include "gntblist.h"
+#include "gntconv.h"
 
 void init_gnt_ui()
 {
@@ -12,6 +14,10 @@
 	gg_blist_init();
 	gaim_blist_set_ui_ops(gg_blist_get_ui_ops());
 
+	/* Now the conversations */
+	gg_conversation_init();
+	gaim_conversations_set_ui_ops(gg_conv_get_ui_ops());
+
 	gnt_main();
 }
 

Copied: branches/soc-2006-file-loggers/console/libgnt/AUTHORS (from rev 16395, trunk/console/libgnt/AUTHORS)
===================================================================

Copied: branches/soc-2006-file-loggers/console/libgnt/COPYING (from rev 16395, trunk/console/libgnt/COPYING)
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/COPYING	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/libgnt/COPYING	2006-07-02 16:02:29 UTC (rev 16396)
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.

Copied: branches/soc-2006-file-loggers/console/libgnt/ChangeLog (from rev 16395, trunk/console/libgnt/ChangeLog)
===================================================================

Copied: branches/soc-2006-file-loggers/console/libgnt/INSTALL (from rev 16395, trunk/console/libgnt/INSTALL)
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/INSTALL	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/libgnt/INSTALL	2006-07-02 16:02:29 UTC (rev 16396)
@@ -0,0 +1,229 @@
+Copyright 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
+Foundation, Inc.
+
+   This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+   These are generic installation instructions.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  (Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.)
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You only need
+`configure.ac' if you want to change it or regenerate `configure' using
+a newer version of `autoconf'.
+
+The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.  If you're
+     using `csh' on an old version of System V, you might need to type
+     `sh ./configure' instead to prevent `csh' from trying to execute
+     `configure' itself.
+
+     Running `configure' takes awhile.  While running, it prints some
+     messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.
+
+  5. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+Compilers and Options
+=====================
+
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
+
+     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+   You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+   If you have to use a `make' that does not support the `VPATH'
+variable, you have to compile the package for one architecture at a
+time in the source code directory.  After you have installed the
+package for one architecture, use `make distclean' before reconfiguring
+for another architecture.
+
+Installation Names
+==================
+
+   By default, `make install' will install the package's files in
+`/usr/local/bin', `/usr/local/man', etc.  You can specify an
+installation prefix other than `/usr/local' by giving `configure' the
+option `--prefix=PATH'.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+give `configure' the option `--exec-prefix=PATH', the package will use
+PATH as the prefix for installing programs and libraries.
+Documentation and other data files will still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=PATH' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+   Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+   There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on.  Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+     CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+     OS KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the `--target=TYPE' option to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+   Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+will cause the specified gcc to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+`configure' Invocation
+======================
+
+   `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+     Print a summary of the options to `configure', and exit.
+
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.
+

Deleted: branches/soc-2006-file-loggers/console/libgnt/Makefile
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/Makefile	2006-07-02 15:49:54 UTC (rev 16395)
+++ branches/soc-2006-file-loggers/console/libgnt/Makefile	2006-07-02 16:02:29 UTC (rev 16396)
@@ -1,58 +0,0 @@
-CFLAGS=`pkg-config --cflags gobject-2.0` -g
-LDFLAGS=`pkg-config --libs gobject-2.0` -lncursesw -pg
-
-HEADERS = \
-	gntwidget.h \
-	gntbox.h \
-	gntbutton.h \
-	gntcolors.h \
-	gntentry.h \
-	gntlabel.h \
-	gnttree.h \
-	gntutils.h \
-	gnt.h
-
-SOURCES = \
-	gntwidget.c \
-	gntbox.c \
-	gntbutton.c \
-	gntcolors.c \
-	gntentry.c \
-	gntlabel.c \
-	gnttree.c \
-	gntutils.c \
-	gntmain.c
-
-OBJECTS = \
-	gntwidget.o \
-	gntbox.o \
-	gntbutton.o \
-	gntcolors.o \
-	gntentry.o \
-	gntlabel.o \
-	gnttree.o \
-	gntutils.o \
-	gntmain.o
-
-all: libgnt
-
-test2: $(OBJECTS)
-key: $(OBJECTS)
-
-gntwidget.o: gntwidget.c $(HEADERS)
-gntbox.o: gntbox.c $(HEADERS)
-gntbutton.o: gntbutton.c $(HEADERS)
-gntcolors.o: gntcolors.c $(HEADERS)
-gntentry.o: gntentry.c $(HEADERS)
-gntlabel.o: gntlabel.c $(HEADERS)
-gnttree.o: gnttree.c $(HEADERS)
-gntutils.o: gntutils.c $(HEADERS)
-gntmain.o: gntmain.c $(HEADERS)
-
-libgnt: $(OBJECTS)
-	$(CC) --shared -o libgnt.so $(OBJECTS)
-
-clean:
-	rm *.o
-	rm libgnt.so
-

Copied: branches/soc-2006-file-loggers/console/libgnt/Makefile.am (from rev 16395, trunk/console/libgnt/Makefile.am)
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/Makefile.am	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/libgnt/Makefile.am	2006-07-02 16:02:29 UTC (rev 16396)
@@ -0,0 +1,43 @@
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = gnt.pc
+
+lib_LTLIBRARIES = libgnt.la
+
+libgnt_la_SOURCES = \
+	gntwidget.c \
+	gntbox.c \
+	gntbutton.c \
+	gntcolors.c \
+	gntentry.c \
+	gntlabel.c \
+	gnttextview.c \
+	gnttree.c \
+	gntutils.c \
+	gntmain.c
+
+libgnt_la_headers = \
+	gntwidget.h \
+	gntbox.h \
+	gntbutton.h \
+	gntcolors.h \
+	gntentry.h \
+	gntkeys.h \
+	gntlabel.h \
+	gnttextview.h \
+	gnttree.h \
+	gntutils.h \
+	gnt.h
+
+libgnt_laincludedir=$(includedir)/gnt
+libgnt_lainclude_HEADERS = \
+	$(libgnt_la_headers)
+
+libgnt_la_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS) $(MS_LIBS)
+libgnt_la_LDFLAGS = -export-dynamic
+libgnt_la_LIBADD = \
+	$(GLIB_LIBS) \
+	$(STATIC_LINK_LIBS) \
+	-lncursesw
+
+AM_CPPFLAGS = \
+	$(GLIB_CFLAGS)

Copied: branches/soc-2006-file-loggers/console/libgnt/NEWS (from rev 16395, trunk/console/libgnt/NEWS)
===================================================================

Copied: branches/soc-2006-file-loggers/console/libgnt/README (from rev 16395, trunk/console/libgnt/README)
===================================================================

Copied: branches/soc-2006-file-loggers/console/libgnt/autogen.sh (from rev 16395, trunk/console/libgnt/autogen.sh)
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/autogen.sh	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/libgnt/autogen.sh	2006-07-02 16:02:29 UTC (rev 16396)
@@ -0,0 +1,48 @@
+#!/bin/sh
+
+(libtoolize --version) < /dev/null > /dev/null 2>&1 || {
+	echo;
+	echo "You must have libtool installed to compile LibGNT";
+	echo;
+	exit;
+}
+
+(automake --version) < /dev/null > /dev/null 2>&1 || {
+	echo;
+	echo "You must have automake installed to compile LibGNT";
+	echo;
+	exit;
+}
+
+(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+	echo;
+	echo "You must have autoconf installed to compile LibGNT";
+	echo;
+	exit;
+}
+
+echo "Generating configuration files for LibGNT, please wait...."
+echo;
+
+echo "Running libtoolize, please ignore non-fatal messages...."
+echo n | libtoolize --copy --force || exit;
+
+# Add other directories to this list if people continue to experience
+# brokennesses ...  Obviously the real answer is for them to fix it
+# themselves, but for Luke's sake we have this.
+for dir in "/usr/local/share/aclocal" \
+           "/opt/gnome-1.4/share/aclocal"
+do
+	if test -d $dir ; then
+		ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $dir"
+	fi
+done
+
+libtoolize -c -f --automake
+aclocal $ACLOCAL_FLAGS || exit;
+autoheader || exit;
+automake --add-missing --copy;
+autoconf || exit;
+automake || exit;
+./configure $@
+

Copied: branches/soc-2006-file-loggers/console/libgnt/configure.ac (from rev 16395, trunk/console/libgnt/configure.ac)
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/configure.ac	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/libgnt/configure.ac	2006-07-02 16:02:29 UTC (rev 16396)
@@ -0,0 +1,246 @@
+dnl Process this file with autoconf to produce a configure script.
+AC_INIT([libgnt], [0.0.0dev], [gaim-devel@...])
+AC_CANONICAL_SYSTEM
+AM_CONFIG_HEADER(config.h)
+AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
+
+AC_PREREQ([2.50])
+
+AC_PATH_PROG(sedpath, sed)
+
+dnl Storing configure arguments
+AC_DEFINE_UNQUOTED(CONFIG_ARGS, "$ac_configure_args", [configure arguments])
+
+dnl Checks for programs.
+AC_PROG_CC
+AC_DISABLE_STATIC
+AM_PROG_LIBTOOL
+LIBTOOL="$LIBTOOL --silent"
+AC_PROG_INSTALL
+
+dnl we don't use autobreak on cygwin!!
+dnl AC_CYGWIN
+
+dnl Checks for header files.
+AC_HEADER_STDC
+AC_HEADER_SYS_WAIT
+AC_CHECK_HEADERS(arpa/nameser_compat.h fcntl.h sys/time.h unistd.h locale.h signal.h stdint.h regex.h)
+
+dnl Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST
+AC_STRUCT_TM
+
+AC_C_BIGENDIAN
+
+dnl Checks for library functions.
+AC_TYPE_SIGNAL
+AC_FUNC_STRFTIME
+AC_CHECK_FUNCS(strdup strstr atexit setlocale)
+
+dnl Check for inet_aton
+AC_CHECK_FUNC(inet_aton, , [AC_CHECK_LIB(resolv, inet_aton, ,
+				         [AC_ERROR(inet_aton not found)])])
+AC_CHECK_LIB(resolv, __res_query)
+AC_CHECK_LIB(nsl, gethostent)
+AC_CHECK_FUNC(socket, ,
+              [AC_CHECK_LIB(socket, socket, , [AC_ERROR([socket not found])])])
+dnl If all goes well, by this point the previous two checks will have
+dnl pulled in -lsocket and -lnsl if we need them.
+AC_CHECK_FUNC(getaddrinfo, [AC_DEFINE([HAVE_GETADDRINFO], [1],
+                                      [Define to 1 if you have the getaddrinfo function.])],
+              [AC_CHECK_LIB(socket, getaddrinfo,
+                            [AC_DEFINE([HAVE_GETADDRINFO]) LIBS="-lsocket -lsnl $LIBS"], , , -lnsl)])
+
+dnl Check for socklen_t (in Unix98)
+AC_MSG_CHECKING(for socklen_t)
+AC_TRY_COMPILE([
+	#include <sys/types.h>
+	#include <sys/socket.h>
+	socklen_t x;
+], [],
+[
+	AC_MSG_RESULT(yes)
+], [
+	AC_TRY_COMPILE([
+		#include <sys/types.h>
+		#include <sys/socket.h>
+		int accept(int, struct sockaddr *, size_t *);
+	], [], [
+		AC_MSG_RESULT(size_t)
+		AC_DEFINE(socklen_t, size_t, [socklen_t size])
+	], [
+		AC_MSG_RESULT(int)
+		AC_DEFINE(socklen_t, int, [socklen_t size])
+	])
+])
+
+dnl to prevent the g_stat()/g_unlink() crash,
+dnl (09:50:07) Robot101: LSchiere2: it's easy. +LC_SYS_LARGEFILE somewhere in configure.ac
+AC_SYS_LARGEFILE
+
+dnl FreeBSD doesn't have libdl, dlopen is provided by libc
+AC_CHECK_FUNC(dlopen, LIBDL="", [AC_CHECK_LIB(dl, dlopen, LIBDL="-ldl")])
+
+AC_MSG_CHECKING(for the %z format string in strftime())
+AC_TRY_RUN([
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#include <time.h>
+#include <stdio.h>
+
+int main()
+{
+	char buf[6];
+	time_t t = time(NULL);
+
+	if (strftime(buf, sizeof(buf), "%z", localtime(&t)) != 5)
+		return 1;
+
+	fprintf(stderr, "strftime(\"%%z\") yields: \"%s\"\n", buf);
+
+	return !((buf[0] == '-' || buf[0] == '+') &&
+	         (buf[1] >= '0' && buf[1] <= '9') &&
+	         (buf[2] >= '0' && buf[2] <= '9') &&
+	         (buf[3] >= '0' && buf[3] <= '9') &&
+	         (buf[4] >= '0' && buf[4] <= '9')
+	        );
+}
+],
+[
+	AC_MSG_RESULT(yes)
+	AC_DEFINE([HAVE_STRFTIME_Z_FORMAT], [1],
+                                      [Define to 1 if you have a strftime() that supports the %z format string.])
+],
+[
+	AC_MSG_RESULT(no)
+],
+[
+	# Fallback for Cross Compiling...
+	# This will enable the compatibility code.
+	AC_MSG_RESULT(no)
+]
+)
+
+
+AC_CHECK_HEADER(sys/utsname.h)
+AC_CHECK_FUNC(uname)
+
+if test "x$enable_debug" = "xyes" ; then
+	AC_DEFINE(DEBUG, 1, [Define if debugging is enabled.])
+	enable_fatal_asserts="yes"
+fi
+
+if test "x$enable_fatal_asserts" = "xyes" ; then
+	AC_DEFINE(GAIM_FATAL_ASSERTS, 1, [Define to make assertions fatal (useful for debugging).])
+fi
+
+if test "x$enable_deprecated" = "xno"; then
+	DEBUG_CFLAGS="$DEBUG_CFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
+fi
+
+if test "x$GCC" = "xyes"; then
+	dnl We enable -Wall later.
+	dnl If it's set after the warning CFLAGS in the compiler invocation, it counteracts the -Wno... flags.
+	dnl This leads to warnings we don't want.
+	CFLAGS=`echo $CFLAGS |$sedpath 's/-Wall//'`
+
+	dnl ENABLE WARNINGS SUPPORTED BY THE VERSION OF GCC IN USE
+	dnl
+	dnl Future Possibilities
+	dnl
+	dnl Consider adding -Wbad-function-cast.
+	dnl	This leads to spurious warnings using GPOINTER_TO_INT(), et al. directly on a function call.
+	dnl		We'd need an intermediate variable.
+	dnl
+	dnl Consider adding -Wfloat-equal.
+	dnl	This leads to warnings with Perl.
+	dnl 		Perhaps we could write ugly configure magic and pass -Wno-float-equal down to that subdirectory.
+	dnl		On the other hand, it's probably actually broken, so maybe the Perl folks should fix that?
+	dnl
+	dnl Consider removing -Wno-sign-compare (from the -Wextra set) and fixing all those cases.
+	dnl	This is likely non-trivial.
+	dnl
+	for newflag in \
+			"-Waggregate-return" \
+			"-Wcast-align" \
+			"-Wdeclaration-after-statement" \
+			"-Werror-implicit-function-declaration" \
+			"-Wextra -Wno-sign-compare -Wno-unused-parameter" \
+			"-Winit-self" \
+			"-Wmissing-declarations" \
+			"-Wmissing-prototypes" \
+			"-Wnested-externs" \
+			"-Wpointer-arith" \
+			"-Wundef" \
+	; do
+		orig_CFLAGS="$CFLAGS"
+		CFLAGS="$CFLAGS $newflag"
+		AC_MSG_CHECKING(for $newflag option to gcc)
+		AC_TRY_COMPILE([], [
+			int main() {return 0;}
+		], [
+			AC_MSG_RESULT(yes)
+			CFLAGS="$orig_CFLAGS"
+			DEBUG_CFLAGS="$DEBUG_CFLAGS $newflag"
+		], [
+			AC_MSG_RESULT(no)
+			CFLAGS="$orig_CFLAGS"
+		])
+	done
+
+	if test "x$enable_fortify" = "xyes"; then
+		AC_MSG_CHECKING(for FORTIFY_SOURCE support)
+		AC_TRY_COMPILE([#include <features.h>], [
+			int main() {
+			#if !(__GNUC_PREREQ (4, 1) \
+				|| (defined __GNUC_RH_RELEASE__ && __GNUC_PREREQ (4, 0)) \
+				|| (defined __GNUC_RH_RELEASE__ && __GNUC_PREREQ (3, 4) \
+					&& __GNUC_MINOR__ == 4 \
+					&& (__GNUC_PATCHLEVEL__ > 2 \
+						|| (__GNUC_PATCHLEVEL__ == 2 && __GNUC_RH_RELEASE__ >= 8))))
+			#error No FORTIFY_SOURCE support
+			#endif
+				return 0;
+			}
+		], [
+			AC_MSG_RESULT(yes)
+			DEBUG_CFLAGS="$DEBUG_CFLAGS -D_FORTIFY_SOURCE=2"
+		], [
+			AC_MSG_RESULT(no)
+		])
+	fi
+
+	DEBUG_CFLAGS="-Wall $DEBUG_CFLAGS"
+	CFLAGS="-g $CFLAGS"
+fi
+AC_SUBST(CFLAGS)
+
+PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.0.0 gobject-2.0 gmodule-2.0],
+	[
+		AC_SUBST(GLIB_CFLAGS)
+		AC_SUBST(GLIB_LIBS)
+	],
+	[
+		AC_MSG_ERROR([
+*** GLib 2.0 is required to build Gaim; please make sure you have the GLib
+*** development headers installed. The latest version of GLib is
+*** always available at http://www.gtk.org/.])
+	])
+
+
+AC_MSG_CHECKING(for me pot o' gold)
+AC_MSG_RESULT(no)
+AC_CHECK_FUNCS(gethostid lrand48)
+AC_CHECK_FUNCS(memcpy memmove random strchr strerror vprintf)
+AC_CHECK_HEADERS(malloc.h paths.h sgtty.h stdarg.h sys/cdefs.h)
+AC_CHECK_HEADERS(sys/file.h sys/filio.h sys/ioctl.h sys/msgbuf.h)
+AC_CHECK_HEADERS(sys/select.h sys/uio.h sys/utsname.h sys/wait.h)
+AC_CHECK_HEADERS(termios.h)
+#AC_VAR_TIMEZONE_EXTERNALS
+
+
+AC_OUTPUT([Makefile
+           gnt.pc
+		  ])
+

Modified: branches/soc-2006-file-loggers/console/libgnt/gnt.h
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gnt.h	2006-07-02 15:49:54 UTC (rev 16395)
+++ branches/soc-2006-file-loggers/console/libgnt/gnt.h	2006-07-02 16:02:29 UTC (rev 16396)
@@ -11,3 +11,10 @@
 
 void gnt_screen_release(GntWidget *widget);
 
+void gnt_screen_update(GntWidget *widget);
+
+void gnt_screen_take_focus(GntWidget *widget);
+
+gboolean gnt_widget_has_focus(GntWidget *widget);
+
+void gnt_widget_set_urgent(GntWidget *widget);

Copied: branches/soc-2006-file-loggers/console/libgnt/gnt.pc.in (from rev 16395, trunk/console/libgnt/gnt.pc.in)
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gnt.pc.in	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/libgnt/gnt.pc.in	2006-07-02 16:02:29 UTC (rev 16396)
@@ -0,0 +1,13 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+datadir=@datadir@
+sysconfdir=@sysconfdir@
+ 
+Name: LibGNT
+Description: Gaim Ncurses Toolkit is a collection of curses-widgets.
+Version: @VERSION@
+Requires: glib-2.0
+Cflags: -I${includedir}/gnt
+Libs: -L${libdir} -lgnt -lncursesw

Modified: branches/soc-2006-file-loggers/console/libgnt/gntbox.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntbox.c	2006-07-02 15:49:54 UTC (rev 16395)
+++ branches/soc-2006-file-loggers/console/libgnt/gntbox.c	2006-07-02 16:02:29 UTC (rev 16396)
@@ -1,5 +1,7 @@
 #include "gntbox.h"
 
+#include <string.h>
+
 enum
 {
 	SIGS = 1,
@@ -8,19 +10,17 @@
 static GntWidgetClass *parent_class = NULL;
 static guint signals[SIGS] = { 0 };
 
+static GntWidget * find_focusable_widget(GntBox *box);
+
 static void
 gnt_box_draw(GntWidget *widget)
 {
 	GntBox *box = GNT_BOX(widget);
-	GList *iter;
 
-	for (iter = box->list; iter; iter = iter->next)
-	{
-		GntWidget *w = GNT_WIDGET(iter->data);
-		gnt_widget_draw(w);
-		overwrite(w->window, widget->window);
-	}
+	g_list_foreach(box->list, (GFunc)gnt_widget_draw, NULL);
 
+	gnt_box_sync_children(box);
+
 	if (box->title)
 	{
 		gchar *title = g_strdup(box->title);
@@ -36,13 +36,14 @@
 			/* XXX: Position of the title might be configurable */
 			pos = (widget->priv.width - pos) / 2;
 		}
-		wbkgdset(widget->window, '\0' | COLOR_PAIR(GNT_COLOR_TITLE));
+
+		if (gnt_widget_has_focus(widget))
+			wbkgdset(widget->window, '\0' | COLOR_PAIR(GNT_COLOR_TITLE));
+		else
+			wbkgdset(widget->window, '\0' | COLOR_PAIR(GNT_COLOR_TITLE_D));
 		mvwprintw(widget->window, 0, pos, title);
 		g_free(title);
 	}
-	wrefresh(widget->window);
-
-	gnt_screen_occupy(widget);
 	
 	DEBUG;
 }
@@ -144,23 +145,88 @@
 gnt_box_map(GntWidget *widget)
 {
 	if (widget->priv.width == 0 || widget->priv.height == 0)
+	{
 		gnt_widget_size_request(widget);
+		find_focusable_widget(GNT_BOX(widget));
+	}
 	DEBUG;
 }
 
+static GntWidget *
+find_next_focus(GntBox *box)
+{
+	GntWidget *w = box->active;
+	GList *iter;
+
+	while (w && !(iter = g_list_find(box->list, w)))
+		w = w->parent;
+
+	if (!w)
+		box->active = NULL;
+	else if (iter)
+	{
+		GntWidget *next = NULL;
+		
+		do
+		{
+			next = find_next_focus(iter->data);
+			box->active = next;
+			iter = iter->next;
+		} while (!next && iter);
+	}
+
+	if (box->active == NULL && GNT_WIDGET(box)->parent == NULL)
+	{
+		box->active = find_focusable_widget(box);
+	}
+	
+	if (box->active)
+		GNT_WIDGET_SET_FLAGS(box->active, GNT_WIDGET_HAS_FOCUS);
+
+	return box->active;
+}
+
 /* Ensures that the current widget can take focus */
-static void
-ensure_active(GntBox *box)
+static GntWidget *
+find_focusable_widget(GntBox *box)
 {
 	int investigated = 0;
 	int total;
+	GntWidget *w = NULL;
+	GList *iter;
 
-	if (box->active == NULL)
-		box->active = box->list;
+	for (iter = box->list; iter; iter = iter->next)
+	{
+		w = iter->data;
+		if (GNT_IS_BOX(w))
+		{
+			w = find_focusable_widget(GNT_BOX(w));
+			if (w)
+				break;
+		}
+		else if (GNT_WIDGET_IS_FLAG_SET(w, GNT_WIDGET_CAN_TAKE_FOCUS))
+			break;
+	}
 
+	if (iter)
+		box->active = w;
+	else
+		box->active = NULL;
+
+	if (box->active)
+		GNT_WIDGET_SET_FLAGS(box->active, GNT_WIDGET_HAS_FOCUS);
+
+	return box->active;
+
+#if 0
+	if (box->active == NULL && box->list)
+		box->active = box->list->data;
+	else
+		w = box->active;
+
 	total = g_list_length(box->list);
 
-	while (box->active && !GNT_WIDGET_IS_FLAG_SET(box->active->data, GNT_WIDGET_CAN_TAKE_FOCUS))
+	while (box->active && !GNT_WIDGET_IS_FLAG_SET(box->active, GNT_WIDGET_CAN_TAKE_FOCUS))
 	{
 		box->active = box->active->next;
 		investigated++;
@@ -176,6 +242,12 @@
 			investigated++;
 		}
 	}
+
+	if (box->active)
+		gnt_widget_set_focus(box->active->data, TRUE);
+	if (w && w != box->active->data)
+		gnt_widget_set_focus(w, FALSE);
+#endif
 }
 
 static gboolean
@@ -183,15 +255,15 @@
 {
 	GntBox *box = GNT_BOX(widget);
 
-	ensure_active(box);
-	if (box->active == NULL)
+	if (box->active == NULL && !find_focusable_widget(box))
 		return FALSE;
 
-	if (gnt_widget_key_pressed(box->active->data, text))
+	if (gnt_widget_key_pressed(box->active, text))
 		return TRUE;
 	
 	if (text[0] == 27)
 	{
+#if 0
 		GList *now = NULL;
 		if (strcmp(text+1, GNT_KEY_LEFT) == 0)
 		{
@@ -214,6 +286,7 @@
 
 			return TRUE;
 		}
+#endif
 	}
 
 	return FALSE;
@@ -242,10 +315,10 @@
 	return NULL;
 }
 
+#if 0
 static void
-gnt_box_lost_focus(GntWidget *widget)
+gnt_box_set_focus(GntWidget *widget, gboolean set)
 {
-	GntBox *box = GNT_BOX(widget);
 	GntWidget *p = widget;
 
 	while (p->parent)
@@ -253,10 +326,32 @@
 
 	p = find_focused_widget(GNT_BOX(p));
 	if (p)
-		gnt_widget_set_focus(p, FALSE);
+		gnt_widget_set_focus(p, set);
+	gnt_widget_draw(widget);
 }
 
 static void
+gnt_box_lost_focus(GntWidget *widget)
+{
+	gnt_box_set_focus(widget, FALSE);
+}
+
+static void
+gnt_box_gained_focus(GntWidget *widget)
+{
+	GntWidget *p;
+
+	while (widget->parent)
+		widget = widget->parent;
+	
+	p = find_focused_widget(GNT_BOX(widget));
+	GNT_BOX(widget)->active = g_list_find(GNT_BOX(widget)->list, p);
+	if (p)
+		gnt_widget_draw(p);
+}
+#endif
+
+static void
 gnt_box_destroy(GntWidget *w)
 {
 	GntBox *box = GNT_BOX(w);
@@ -284,8 +379,6 @@
 static void
 gnt_box_class_init(GntBoxClass *klass)
 {
-	GObjectClass *obj_class = G_OBJECT_CLASS(klass);
-
 	parent_class = GNT_WIDGET_CLASS(klass);
 	parent_class->destroy = gnt_box_destroy;
 	parent_class->draw = gnt_box_draw;
@@ -294,7 +387,11 @@
 	parent_class->size_request = gnt_box_size_request;
 	parent_class->set_position = gnt_box_set_position;
 	parent_class->key_pressed = gnt_box_key_pressed;
+#if 0
+	/* We are going to need this when there are multiple focusble widgets in a box */
 	parent_class->lost_focus = gnt_box_lost_focus;
+	parent_class->gained_focus = gnt_box_gained_focus;
+#endif
 
 	DEBUG;
 }
@@ -376,3 +473,22 @@
 		GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW);
 }
 
+void gnt_box_sync_children(GntBox *box)
+{
+	GList *iter;
+	GntWidget *widget = GNT_WIDGET(box);
+
+	/* XXX: werase first? */
+
+	for (iter = box->list; iter; iter = iter->next)
+	{
+		GntWidget *w = GNT_WIDGET(iter->data);
+		copywin(w->window, widget->window, 0, 0,
+				w->priv.y - widget->priv.y,
+				w->priv.x - widget->priv.x,
+				w->priv.y - widget->priv.y + w->priv.height - 1,
+				w->priv.x - widget->priv.x + w->priv.width - 1,
+				FALSE);
+	}
+}
+

Modified: branches/soc-2006-file-loggers/console/libgnt/gntbox.h
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntbox.h	2006-07-02 15:49:54 UTC (rev 16395)
+++ branches/soc-2006-file-loggers/console/libgnt/gntbox.h	2006-07-02 16:02:29 UTC (rev 16396)
@@ -22,7 +22,7 @@
 	gboolean homogeneous;
 	GList *list;		/* List of widgets */
 
-	GList *active;
+	GntWidget *active;
 	int pad;			/* Number of spaces to use between widgets */
 
 	char *title;
@@ -57,6 +57,8 @@
 
 void gnt_box_set_toplevel(GntBox *box, gboolean set);
 
+void gnt_box_sync_children(GntBox *box);
+
 G_END_DECLS
 
 #endif /* GNT_BOX_H */

Modified: branches/soc-2006-file-loggers/console/libgnt/gntbutton.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntbutton.c	2006-07-02 15:49:54 UTC (rev 16395)
+++ branches/soc-2006-file-loggers/console/libgnt/gntbutton.c	2006-07-02 16:02:29 UTC (rev 16396)
@@ -1,3 +1,5 @@
+#include <string.h>
+
 #include "gntbutton.h"
 
 enum
@@ -21,8 +23,6 @@
 	wbkgdset(widget->window, '\0' | COLOR_PAIR(type));
 	mvwprintw(widget->window, 1, 1, button->priv->text);
 
-	wrefresh(widget->window);
-
 	DEBUG;
 }
 
@@ -56,8 +56,6 @@
 static void
 gnt_button_class_init(GntWidgetClass *klass)
 {
-	GObjectClass *obj_class = G_OBJECT_CLASS(klass);
-
 	parent_class = GNT_WIDGET_CLASS(klass);
 	parent_class->draw = gnt_button_draw;
 	parent_class->map = gnt_button_map;

Modified: branches/soc-2006-file-loggers/console/libgnt/gntcolors.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntcolors.c	2006-07-02 15:49:54 UTC (rev 16395)
+++ branches/soc-2006-file-loggers/console/libgnt/gntcolors.c	2006-07-02 16:02:29 UTC (rev 16396)
@@ -9,25 +9,32 @@
 		init_color(GNT_COLOR_BLACK, 0, 0, 0);
 		init_color(GNT_COLOR_RED, 1000, 0, 0);
 		init_color(GNT_COLOR_GREEN, 0, 1000, 0);
-		init_color(GNT_COLOR_BLUE, 0, 0, 1000);
+		init_color(GNT_COLOR_BLUE, 250, 250, 700);
 		init_color(GNT_COLOR_WHITE, 1000, 1000, 1000);
-		init_color(GNT_COLOR_GRAY, 799, 799, 799);
+		init_color(GNT_COLOR_GRAY, 699, 699, 699);
 		init_color(GNT_COLOR_DARK_GRAY, 256, 256, 256);
 
 		/* Now some init_pair()s */
 		init_pair(GNT_COLOR_NORMAL, GNT_COLOR_BLACK, GNT_COLOR_WHITE);
-		init_pair(GNT_COLOR_HIGHLIGHT, GNT_COLOR_BLUE, GNT_COLOR_GRAY);
+		init_pair(GNT_COLOR_HIGHLIGHT, GNT_COLOR_WHITE, GNT_COLOR_BLUE);
 		init_pair(GNT_COLOR_SHADOW, GNT_COLOR_BLACK, GNT_COLOR_DARK_GRAY);
-		init_pair(GNT_COLOR_TITLE, GNT_COLOR_WHITE, GNT_COLOR_DARK_GRAY);
-		init_pair(GNT_COLOR_TEXT_NORMAL, GNT_COLOR_BLACK, GNT_COLOR_GRAY);
+
+		init_pair(GNT_COLOR_TITLE, GNT_COLOR_WHITE, GNT_COLOR_BLUE);
+		init_pair(GNT_COLOR_TITLE_D, GNT_COLOR_WHITE, GNT_COLOR_GRAY);
+
+		init_pair(GNT_COLOR_TEXT_NORMAL, GNT_COLOR_WHITE, GNT_COLOR_BLUE);
+		init_pair(GNT_COLOR_HIGHLIGHT_D, GNT_COLOR_BLACK, GNT_COLOR_GRAY);
+		init_pair(GNT_COLOR_DISABLED, GNT_COLOR_GRAY, GNT_COLOR_WHITE);
 	}
 	else
 	{
 		init_pair(GNT_COLOR_NORMAL, COLOR_BLACK, COLOR_WHITE);
-		init_pair(GNT_COLOR_HIGHLIGHT, COLOR_CYAN, COLOR_BLACK);
+		init_pair(GNT_COLOR_HIGHLIGHT, COLOR_YELLOW, COLOR_BLACK);
 		init_pair(GNT_COLOR_SHADOW, COLOR_BLACK, COLOR_BLACK);
 		init_pair(GNT_COLOR_TITLE, COLOR_WHITE, COLOR_BLACK);
 		init_pair(GNT_COLOR_TEXT_NORMAL, COLOR_BLACK, COLOR_WHITE);
+		init_pair(GNT_COLOR_HIGHLIGHT_D, COLOR_CYAN, COLOR_BLACK);
+		init_pair(GNT_COLOR_DISABLED, COLOR_YELLOW, COLOR_WHITE);
 	}
 }
 

Modified: branches/soc-2006-file-loggers/console/libgnt/gntcolors.h
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntcolors.h	2006-07-02 15:49:54 UTC (rev 16395)
+++ branches/soc-2006-file-loggers/console/libgnt/gntcolors.h	2006-07-02 16:02:29 UTC (rev 16396)
@@ -13,12 +13,13 @@
 	GNT_COLOR_MNEMONIC_D,
 	GNT_COLOR_SHADOW,
 	GNT_COLOR_TITLE,
+	GNT_COLOR_TITLE_D,
 	GNT_COLORS
 } GntColorType;
 
 enum
 {
-	GNT_COLOR_BLACK = 1,
+	GNT_COLOR_BLACK = 0,
 	GNT_COLOR_RED,
 	GNT_COLOR_GREEN,
 	GNT_COLOR_BLUE,

Modified: branches/soc-2006-file-loggers/console/libgnt/gntentry.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntentry.c	2006-07-02 15:49:54 UTC (rev 16395)
+++ branches/soc-2006-file-loggers/console/libgnt/gntentry.c	2006-07-02 16:02:29 UTC (rev 16396)
@@ -1,4 +1,6 @@
+#include <ctype.h>
 #include <string.h>
+
 #include "gntentry.h"
 
 enum
@@ -15,24 +17,27 @@
 	GntEntry *entry = GNT_ENTRY(widget);
 	int stop;
 
-	wbkgdset(widget->window, '\0' | COLOR_PAIR(GNT_COLOR_TEXT_NORMAL));
+	if (gnt_widget_has_focus(widget))
+		wbkgdset(widget->window, '\0' | COLOR_PAIR(GNT_COLOR_TEXT_NORMAL));
+	else
+		wbkgdset(widget->window, '\0' | COLOR_PAIR(GNT_COLOR_HIGHLIGHT_D));
 	mvwprintw(widget->window, 0, 0, entry->scroll);
 
 	stop = entry->end - entry->scroll;
 	if (stop < widget->priv.width)
 		mvwhline(widget->window, 0, stop, ENTRY_CHAR, widget->priv.width - stop);
 
-	wrefresh(widget->window);
-
 	DEBUG;
 }
 
 static void
 gnt_entry_size_request(GntWidget *widget)
 {
-	GntEntry *entry = GNT_ENTRY(widget);
-	widget->priv.height = 1;
-	widget->priv.width = 20;
+	if (!GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_MAPPED))
+	{
+		widget->priv.height = 1;
+		widget->priv.width = 20;
+	}
 }
 
 static void
@@ -43,6 +48,13 @@
 	DEBUG;
 }
 
+static void
+entry_redraw(GntWidget *widget)
+{
+	gnt_entry_draw(widget);
+	gnt_widget_queue_update(widget);
+}
+
 static gboolean
 gnt_entry_key_pressed(GntWidget *widget, const char *text)
 {
@@ -54,21 +66,21 @@
 		{
 			memmove(entry->cursor, entry->cursor + 1, entry->end - entry->cursor + 1);
 			entry->end--;
-			gnt_entry_draw(widget);
+			entry_redraw(widget);
 		}
 		else if (strcmp(text + 1, GNT_KEY_LEFT) == 0 && entry->cursor > entry->start)
 		{
 			entry->cursor--;
 			if (entry->cursor < entry->scroll)
 				entry->scroll--;
-			gnt_entry_draw(widget);
+			entry_redraw(widget);
 		}
 		else if (strcmp(text + 1, GNT_KEY_RIGHT) == 0 && entry->cursor < entry->end)
 		{
 			entry->cursor++;
 			if (entry->cursor - entry->scroll > widget->priv.width)
 				entry->scroll++;
-			gnt_entry_draw(widget);
+			entry_redraw(widget);
 		}
 		/* XXX: handle other keys, like home/end, and ctrl+ goodness */
 	}
@@ -108,7 +120,8 @@
 				if (entry->cursor - entry->scroll > widget->priv.width)
 					entry->scroll++;
 			}
-			gnt_entry_draw(widget);
+			entry_redraw(widget);
+			return TRUE;
 		}
 		else
 		{
@@ -122,7 +135,7 @@
 				if (entry->scroll > entry->start)
 					entry->scroll--;
 
-				gnt_entry_draw(widget);
+				entry_redraw(widget);
 			}
 		}
 	}
@@ -140,8 +153,6 @@
 static void
 gnt_entry_class_init(GntEntryClass *klass)
 {
-	GObjectClass *obj_class = G_OBJECT_CLASS(klass);
-
 	parent_class = GNT_WIDGET_CLASS(klass);
 	parent_class->destroy = gnt_entry_destroy;
 	parent_class->draw = gnt_entry_draw;
@@ -235,7 +246,8 @@
 	entry->scroll = entry->start + scroll;
 	entry->cursor = entry->end - cursor;
 
-	/* XXX: redraw if necessary? */
+	if (GNT_WIDGET_IS_FLAG_SET(GNT_WIDGET(entry), GNT_WIDGET_MAPPED))
+		entry_redraw(GNT_WIDGET(entry));
 }
 
 void gnt_entry_set_max(GntEntry *entry, int max)
@@ -249,3 +261,16 @@
 	/* XXX: Check the existing string to make sure the flags are respected? */
 }
 
+const char *gnt_entry_get_text(GntEntry *entry)
+{
+	return entry->start;
+}
+
+void gnt_entry_clear(GntEntry *entry)
+{
+	gnt_entry_set_text(entry, NULL);
+	entry->scroll = entry->cursor = entry->end = entry->start;
+	entry_redraw(GNT_WIDGET(entry));
+}
+
+

Modified: branches/soc-2006-file-loggers/console/libgnt/gntentry.h
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntentry.h	2006-07-02 15:49:54 UTC (rev 16395)
+++ branches/soc-2006-file-loggers/console/libgnt/gntentry.h	2006-07-02 16:02:29 UTC (rev 16396)
@@ -69,10 +69,15 @@
 
 void gnt_entry_set_max(GntEntry *entry, int max);
 
+/* XXX: For now, call gnt_entry_clear before calling this */
 void gnt_entry_set_text(GntEntry *entry, const char *text);
 
 void gnt_entry_set_flag(GntEntry *entry, GntEntryFlag flag);
 
+const char *gnt_entry_get_text(GntEntry *entry);
+
+void gnt_entry_clear(GntEntry *entry);
+
 G_END_DECLS
 
 #endif /* GNT_ENTRY_H */

Modified: branches/soc-2006-file-loggers/console/libgnt/gntkeys.h
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntkeys.h	2006-07-02 15:49:54 UTC (rev 16395)
+++ branches/soc-2006-file-loggers/console/libgnt/gntkeys.h	2006-07-02 16:02:29 UTC (rev 16396)
@@ -9,6 +9,9 @@
 #define GNT_KEY_UP     "[A"
 #define GNT_KEY_DOWN   "[B"
 
+#define GNT_KEY_PGUP   "[5~"
+#define GNT_KEY_PGDOWN "[6~"
+
 #define GNT_KEY_ENTER  "\r"
 
 #define GNT_KEY_BACKSPACE "\177"

Modified: branches/soc-2006-file-loggers/console/libgnt/gntlabel.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntlabel.c	2006-07-02 15:49:54 UTC (rev 16395)
+++ branches/soc-2006-file-loggers/console/libgnt/gntlabel.c	2006-07-02 16:02:29 UTC (rev 16396)
@@ -24,7 +24,6 @@
 
 	wbkgdset(widget->window, '\0' | COLOR_PAIR(GNT_COLOR_NORMAL));
 	mvwprintw(widget->window, 0, 0, label->text);
-	wrefresh(widget->window);
 
 	DEBUG;
 }
@@ -59,8 +58,6 @@
 static void
 gnt_label_class_init(GntLabelClass *klass)
 {
-	GObjectClass *obj_class = G_OBJECT_CLASS(klass);
-
 	parent_class = GNT_WIDGET_CLASS(klass);
 	parent_class->destroy = gnt_label_destroy;
 	parent_class->draw = gnt_label_draw;

Modified: branches/soc-2006-file-loggers/console/libgnt/gntmain.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntmain.c	2006-07-02 15:49:54 UTC (rev 16395)
+++ branches/soc-2006-file-loggers/console/libgnt/gntmain.c	2006-07-02 16:02:29 UTC (rev 16396)
@@ -1,30 +1,121 @@
 #include "gnt.h"
+#include "gntbox.h"
 #include "gntkeys.h"
 #include "gntcolors.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <locale.h>
+#include <unistd.h>
+#include <string.h>
 
 static GList *focus_list;
 static int max_x;
 static int max_y;
 
+typedef struct
+{
+	GntWidget *me;
+	GList *below;		/* List of widgets below me */
+	GList *above;		/* List of widgets above me */
+} GntNode;
+
 static GHashTable *nodes;
 
 static void free_node(gpointer data);
+static void draw_taskbar();
 
 void gnt_screen_take_focus(GntWidget *widget)
 {
+	GntWidget *w = NULL;
+	if (focus_list)
+		w = focus_list->data;
 	focus_list = g_list_prepend(focus_list, widget);
+	gnt_widget_set_focus(widget, TRUE);
+	if (w)
+		gnt_widget_set_focus(w, FALSE);
+	draw_taskbar();
 }
 
 void gnt_screen_remove_widget(GntWidget *widget)
 {
 	focus_list = g_list_remove(focus_list, widget);
 	if (focus_list)
+	{
+		gnt_widget_set_focus(focus_list->data, TRUE);
 		gnt_widget_draw(focus_list->data);
+	}
+	draw_taskbar();
 }
 
+static void
+bring_on_top(GntWidget *widget)
+{
+	GntNode *node = g_hash_table_lookup(nodes, widget);
+	GList *iter;
+
+	if (!node)
+		return;
+
+	for (iter = node->above; iter;)
+	{
+		GntNode *n = iter->data;
+		iter = iter->next;
+		n->below = g_list_remove(n->below, node);
+		n->above = g_list_prepend(n->above, node);
+
+		node->above = g_list_remove(node->above, n);
+		node->below = g_list_prepend(node->below, n);
+	}
+}
+
+static void
+draw_taskbar()
+{
+	static WINDOW *taskbar = NULL;
+	GList *iter;
+	int n, width;
+	int i;
+
+	if (taskbar == NULL)
+	{
+		taskbar = newwin(1, getmaxx(stdscr), getmaxy(stdscr) - 1, 0);
+	}
+
+	werase(taskbar);
+
+	n = g_list_length(g_list_first(focus_list));
+	if (n)
+		width = getmaxx(stdscr) / n;
+
+	for (i = 0, iter = g_list_first(focus_list); iter; iter = iter->next, i++)
+	{
+		GntWidget *w = iter->data;
+		int color;
+
+		if (w == focus_list->data)
+		{
+			/* This is the current window in focus */
+			color = GNT_COLOR_TITLE;
+			GNT_WIDGET_UNSET_FLAGS(w, GNT_WIDGET_URGENT);
+		}
+		else if (GNT_WIDGET_IS_FLAG_SET(w, GNT_WIDGET_URGENT))
+		{
+			/* This is a window with the URGENT hint set */
+			color = GNT_COLOR_TITLE_D;
+		}
+		else
+		{
+			color = GNT_COLOR_NORMAL;
+		}
+		wbkgdset(taskbar, '\0' | COLOR_PAIR(color));
+		mvwhline(taskbar, 0, width * i, ' ' | COLOR_PAIR(color), width);
+		mvwprintw(taskbar, 0, width * i, "%s", GNT_BOX(w)->title);
+	}
+
+	wrefresh(taskbar);
+}
+
 static gboolean
 io_invoke(GIOChannel *source, GIOCondition cond, gpointer null)
 {
@@ -49,7 +140,6 @@
 	if (focus_list)
 	{
 		gboolean ret = FALSE;
-		/*g_signal_emit_by_name(focus_list->data, "key_pressed", buffer, &ret);*/
 		ret = gnt_widget_key_pressed(focus_list->data, buffer);
 	}
 
@@ -57,23 +147,46 @@
 	{
 		/* Some special key has been pressed */
 		if (strcmp(buffer+1, GNT_KEY_POPUP) == 0)
+		{}
+		else if (strcmp(buffer + 1, "c") == 0)
 		{
-			/*printf("popup\n");*/
+			/* Alt + c was pressed. I am going to use it to close a window. */
+			if (focus_list)
+			{
+				gnt_widget_destroy(focus_list->data);
+				gnt_screen_remove_widget(focus_list->data);
+			}
 		}
-		else
+		else if (strcmp(buffer + 1, "q") == 0)
 		{
-			/*printf("Unknown: %s\n", buffer+1);*/
-		}
-	}
-	else
-	{
-		if (buffer[0] == 'q')
-		{
+			/* I am going to use Alt + q to quit. */
 			endwin();
 			exit(1);
 		}
-		/*printf("%s\n", buffer);*/
+		else if (strcmp(buffer + 1, "n") == 0)
+		{
+			/* Alt + n to go to the next window */
+			GntWidget *w = NULL;
+			if (focus_list)
+				w = focus_list->data;
+
+			if (focus_list && focus_list->next)
+				focus_list = focus_list->next;
+			else
+				focus_list = g_list_first(focus_list);
+			if (focus_list)
+			{
+				gnt_widget_set_focus(focus_list->data, TRUE);
+				bring_on_top(focus_list->data);
+				gnt_widget_draw(focus_list->data);
+			}
+
+			if (w && w != focus_list->data)
+				gnt_widget_set_focus(w, FALSE);
+		}
 	}
+
+	draw_taskbar();
 	refresh();
 
 	return TRUE;
@@ -118,13 +231,6 @@
  * Stuff for 'window management' *
  *********************************/
 
-typedef struct
-{
-	GntWidget *me;
-	GList *below;		/* List of widgets below me */
-	GList *above;		/* List of widgets above me */
-} GntNode;
-
 static void
 free_node(gpointer data)
 {
@@ -142,6 +248,8 @@
 
 	if (value == NULL)
 		return;
+	if (n->me == nu->me)
+		return;
 
 	if (n->me->priv.x + n->me->priv.width < nu->me->priv.x)
 		return;
@@ -153,15 +261,24 @@
 	if (nu->me->priv.y + nu->me->priv.height < n->me->priv.y)
 		return;
 
-	n->above = g_list_prepend(n->above, nu->me);
-	nu->below = g_list_prepend(nu->below, n->me);
+	n->above = g_list_prepend(n->above, nu);
+	nu->below = g_list_prepend(nu->below, n);
 }
 
 void gnt_screen_occupy(GntWidget *widget)
 {
-	/* XXX: what happens if this is called more than once for the same widget?
-	 *      perhaps _release first? */
-	GntNode *node = g_new0(GntNode, 1);
+	GntNode *node;
+
+	if (widget->parent)
+	{
+		while (widget->parent)
+			widget = widget->parent;
+	}
+	
+	if (g_hash_table_lookup(nodes, widget))
+		return;		/* XXX: perhaps _update instead? */
+
+	node = g_new0(GntNode, 1);
 	node->me = widget;
 
 	g_hash_table_foreach(nodes, check_intersection, node);
@@ -170,16 +287,21 @@
 
 void gnt_screen_release(GntWidget *widget)
 {
+	WINDOW *win;
 	GList *iter;
 	GntNode *node = g_hash_table_lookup(nodes, widget);
-	if (node == NULL || node->below == NULL)	/* Yay! Nothing to do. */
+	if (node == NULL)	/* Yay! Nothing to do. */
 		return;
 
+	win = dupwin(widget->window);
+	werase(win);
+
 	/* XXX: This is not going to work.
 	 *      It will be necessary to build a topology and go from there. */
 	for (iter = node->below; iter; iter = iter->next)
 	{
-		GntWidget *w = iter->data;
+		GntNode *n = iter->data;
+		GntWidget *w = n->me;
 		int left, right, top, bottom;
 
 		left = MAX(widget->priv.x, w->priv.x) - w->priv.x;
@@ -187,10 +309,103 @@
 		
 		top = MAX(widget->priv.y, w->priv.y) - w->priv.y;
 		bottom = MIN(widget->priv.y + widget->priv.height, w->priv.y + w->priv.height) - w->priv.y;
-		
-		gnt_widget_expose(w, left, top, right - left, bottom - top);
+
+		copywin(w->window, win, top, left,
+					w->priv.y - widget->priv.y + top,
+					w->priv.x - widget->priv.x + left,
+					w->priv.y - widget->priv.y + bottom - 1,
+					w->priv.x - widget->priv.x + right - 1, FALSE);
+		n->above = g_list_remove(n->above, node);
 	}
 
+	for (iter = node->above; iter; iter = iter->next)
+	{
+		GntNode *n = iter->data;
+		n->below = g_list_remove(n->below, node);
+	}
+
+	wrefresh(win);
+	delwin(win);
+
 	g_hash_table_remove(nodes, widget);
 }
 
+void gnt_screen_update(GntWidget *widget)
+{
+	GList *iter;
+	WINDOW *win;
+	GntNode *node;
+	
+	if (widget->parent)
+	{
+		while (widget->parent)
+			widget = widget->parent;
+	}
+	
+	gnt_box_sync_children(GNT_BOX(widget));
+	node = g_hash_table_lookup(nodes, widget);
+
+	win = dupwin(widget->window);
+	
+	if (node && node->above)
+	{
+		/* XXX: Same here: need to build a topology first. */
+		for (iter = node->above; iter; iter = iter->next)
+		{
+			GntNode *n = iter->data;
+			GntWidget *w = n->me;
+			int left, right, top, bottom;
+
+			left = MAX(widget->priv.x, w->priv.x) - w->priv.x;
+			right = MIN(widget->priv.x + widget->priv.width, w->priv.x + w->priv.width) - w->priv.x;
+			
+			top = MAX(widget->priv.y, w->priv.y) - w->priv.y;
+			bottom = MIN(widget->priv.y + widget->priv.height, w->priv.y + w->priv.height) - w->priv.y;
+
+			copywin(w->window, win, top, left,
+					w->priv.y - widget->priv.y + top,
+					w->priv.x - widget->priv.x + left,
+					w->priv.y - widget->priv.y + bottom - 1,
+					w->priv.x - widget->priv.x + right - 1, FALSE);
+		}
+	}
+
+	wrefresh(win);
+	delwin(win);
+}
+
+gboolean gnt_widget_has_focus(GntWidget *widget)
+{
+	GntWidget *w;
+	if (!widget)
+		return FALSE;
+
+	w = widget;
+
+	while (widget->parent)
+	{
+		fprintf(stderr, "%p %p\n", widget, widget->parent);
+		widget = widget->parent;
+	}
+	fprintf(stderr, "%p %p\n", widget, widget->parent);
+
+	if (focus_list && focus_list->data == widget &&
+			(!GNT_WIDGET_IS_FLAG_SET(w, GNT_WIDGET_CAN_TAKE_FOCUS) ||
+			GNT_WIDGET_IS_FLAG_SET(w, GNT_WIDGET_HAS_FOCUS)))
+		return TRUE;
+
+	return FALSE;
+}
+
+void gnt_widget_set_urgent(GntWidget *widget)
+{
+	while (widget->parent)
+		widget = widget->parent;
+
+	if (focus_list && focus_list->data == widget)
+		return;
+
+	GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_URGENT);
+	draw_taskbar();
+}
+

Copied: branches/soc-2006-file-loggers/console/libgnt/gnttextview.c (from rev 16395, trunk/console/libgnt/gnttextview.c)
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gnttextview.c	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/libgnt/gnttextview.c	2006-07-02 16:02:29 UTC (rev 16396)
@@ -0,0 +1,256 @@
+#include "gnttextview.h"
+
+enum
+{
+	SIGS = 1,
+};
+
+typedef struct
+{
+	GntTextViewFlags flags;
+	char *text;
+} GntTextSegment;
+
+typedef struct
+{
+	GList *segments;         /* A list of GntTextSegments */
+	int length;              /* The current length of the line so far */
+} GntTextLine;
+
+static GntWidgetClass *parent_class = NULL;
+static guint signals[SIGS] = { 0 };
+
+static void
+gnt_text_view_draw(GntWidget *widget)
+{
+	GntTextView *view = GNT_TEXT_VIEW(widget);
+	int i = 0;
+	GList *lines;
+
+	werase(widget->window);
+
+	for (i = 0, lines = view->list; i < widget->priv.height && lines; i++, lines = lines->next)
+	{
+		GList *iter;
+		GntTextLine *line = lines->data;
+
+		wmove(widget->window, widget->priv.height - 1 - i, 0);
+
+		for (iter = line->segments; iter; iter = iter->next)
+		{
+			GntTextSegment *seg = iter->data;
+			wattrset(widget->window, seg->flags);
+			wprintw(widget->window, "%s", seg->text);
+			if (!iter->next)
+				whline(widget->window, ' ' | seg->flags, widget->priv.width - line->length - 1);
+		}
+	}
+	
+	DEBUG;
+}
+
+static void
+gnt_text_view_size_request(GntWidget *widget)
+{
+	if (!GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_MAPPED))
+	{
+		gnt_widget_set_size(widget, 64, 24);
+	}
+}
+
+static void
+gnt_text_view_map(GntWidget *widget)
+{
+	if (widget->priv.width == 0 || widget->priv.height == 0)
+		gnt_widget_size_request(widget);
+	DEBUG;
+}
+
+static gboolean
+gnt_text_view_key_pressed(GntWidget *widget, const char *text)
+{
+	return FALSE;
+}
+
+static void
+free_text_segment(gpointer data, gpointer null)
+{
+	GntTextSegment *seg = data;
+	g_free(seg->text);
+	g_free(seg);
+}
+
+static void
+free_text_line(gpointer data, gpointer null)
+{
+	GntTextLine *line = data;
+	g_list_foreach(line->segments, free_text_segment, NULL);
+	g_list_free(line->segments);
+	g_free(line);
+}
+
+static void
+gnt_text_view_destroy(GntWidget *widget)
+{
+	GntTextView *view = GNT_TEXT_VIEW(widget);
+	g_list_foreach(view->list, free_text_line, NULL);
+	g_list_free(view->list);
+}
+
+static void
+gnt_text_view_class_init(GntTextViewClass *klass)
+{
+	parent_class = GNT_WIDGET_CLASS(klass);
+	parent_class->destroy = gnt_text_view_destroy;
+	parent_class->draw = gnt_text_view_draw;
+	parent_class->map = gnt_text_view_map;
+	parent_class->size_request = gnt_text_view_size_request;
+	parent_class->key_pressed = gnt_text_view_key_pressed;
+
+	DEBUG;
+}
+
+static void
+gnt_text_view_init(GTypeInstance *instance, gpointer class)
+{
+	DEBUG;
+}
+
+/******************************************************************************
+ * GntTextView API
+ *****************************************************************************/
+GType
+gnt_text_view_get_gtype(void)
+{
+	static GType type = 0;
+
+	if(type == 0)
+	{
+		static const GTypeInfo info = {
+			sizeof(GntTextViewClass),
+			NULL,					/* base_init		*/
+			NULL,					/* base_finalize	*/
+			(GClassInitFunc)gnt_text_view_class_init,
+			NULL,					/* class_finalize	*/
+			NULL,					/* class_data		*/
+			sizeof(GntTextView),
+			0,						/* n_preallocs		*/
+			gnt_text_view_init,			/* instance_init	*/
+		};
+
+		type = g_type_register_static(GNT_TYPE_WIDGET,
+									  "GntTextView",
+									  &info, 0);
+	}
+
+	return type;
+}
+
+GntWidget *gnt_text_view_new()
+{
+	GntWidget *widget = g_object_new(GNT_TYPE_TEXTVIEW, NULL);
+	GntTextView *view = GNT_TEXT_VIEW(widget);
+	GntTextLine *line = g_new0(GntTextLine, 1);
+
+	GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_NO_BORDER);
+
+	view->list = g_list_append(view->list, line);
+
+	return widget;
+}
+
+void gnt_text_view_append_text_with_flags(GntTextView *view, const char *text, GntTextViewFlags flags)
+{
+	GntWidget *widget = GNT_WIDGET(view);
+	int fl = 0;
+	char **split;
+	int i;
+	GList *list = view->list;
+
+	if (text == NULL || *text == '\0')
+		return;
+
+	if (flags & GNT_TEXT_FLAG_BOLD)
+		fl |= A_BOLD;
+	if (flags & GNT_TEXT_FLAG_UNDERLINE)
+		fl |= A_UNDERLINE;
+	if (flags & GNT_TEXT_FLAG_BLINK)
+		fl |= A_BLINK;
+
+	if (flags & GNT_TEXT_FLAG_DIM)
+		fl |= (A_DIM | COLOR_PAIR(GNT_COLOR_DISABLED));
+	else if (flags & GNT_TEXT_FLAG_HIGHLIGHT)
+		fl |= (A_DIM | COLOR_PAIR(GNT_COLOR_HIGHLIGHT));
+	else
+		fl |= COLOR_PAIR(GNT_COLOR_NORMAL);
+
+	view->list = g_list_first(view->list);
+
+	split = g_strsplit(text, "\n", 0);
+	for (i = 0; split[i]; i++)
+	{
+		GntTextLine *line = view->list->data;
+		int len = g_utf8_strlen(split[i], -1);
+		char *iter = split[i];
+		int prev = 0;
+
+		while (iter && *iter)
+		{
+			GntTextSegment *seg = g_new0(GntTextSegment, 1);
+			seg->flags = fl;
+			seg->text = g_new0(char, len);		/* XXX: MUST be improved */
+			g_utf8_strncpy(seg->text, iter, widget->priv.width - line->length - 1);
+			line->segments = g_list_append(line->segments, seg);
+
+			prev = g_utf8_strlen(seg->text, -1);
+			line->length += prev;
+			iter = g_utf8_offset_to_pointer(iter, prev);
+			if (line->length >= widget->priv.width - 1 && *iter)
+			{
+				line = g_new0(GntTextLine, 1);
+				view->list = g_list_prepend(g_list_first(view->list), line);
+			}
+			/*len -= prev;*/
+		}
+	}
+
+	g_strfreev(split);
+	view->list = list;
+
+	gnt_widget_draw(widget);
+}
+
+void gnt_text_view_scroll(GntTextView *view, int scroll)
+{
+	if (scroll == 0)
+	{
+		view->list = g_list_first(view->list);
+	}
+	else if (scroll > 0)
+	{
+		GList *list = g_list_nth_prev(view->list, scroll);
+		if (list == NULL)
+			list = g_list_first(view->list);
+		view->list = list;
+	}
+	else if (scroll < 0)
+	{
+		GList *list = g_list_nth(view->list, -scroll);
+		if (list == NULL)
+			list = g_list_last(view->list);
+		view->list = list;
+	}
+		
+	gnt_widget_draw(GNT_WIDGET(view));
+}
+
+void gnt_text_view_next_line(GntTextView *view)
+{
+	GntTextLine *line = g_new0(GntTextLine, 1);
+	GList *list = view->list;
+	
+	view->list = g_list_prepend(g_list_first(view->list), line);
+	view->list = list;
+	gnt_widget_draw(GNT_WIDGET(view));
+}
+

Copied: branches/soc-2006-file-loggers/console/libgnt/gnttextview.h (from rev 16395, trunk/console/libgnt/gnttextview.h)
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gnttextview.h	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/libgnt/gnttextview.h	2006-07-02 16:02:29 UTC (rev 16396)
@@ -0,0 +1,69 @@
+#ifndef GNT_TEXT_VIEW_H
+#define GNT_TEXT_VIEW_H
+
+#include "gntwidget.h"
+#include "gnt.h"
+#include "gntcolors.h"
+#include "gntkeys.h"
+
+#define GNT_TYPE_TEXTVIEW				(gnt_text_view_get_gtype())
+#define GNT_TEXT_VIEW(obj)				(G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_TEXTVIEW, GntTextView))
+#define GNT_TEXT_VIEW_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST((klass), GNT_TYPE_TEXTVIEW, GntTextViewClass))
+#define GNT_IS_TEXTVIEW(obj)			(G_TYPE_CHECK_INSTANCE_TYPE((obj), GNT_TYPE_TEXTVIEW))
+#define GNT_IS_TEXTVIEW_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE((klass), GNT_TYPE_TEXTVIEW))
+#define GNT_TEXT_VIEW_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS((obj), GNT_TYPE_TEXTVIEW, GntTextViewClass))
+
+#define GNT_TEXT_VIEW_FLAGS(obj)				(GNT_TEXT_VIEW(obj)->priv.flags)
+#define GNT_TEXT_VIEW_SET_FLAGS(obj, flags)		(GNT_TEXT_VIEW_FLAGS(obj) |= flags)
+#define GNT_TEXT_VIEW_UNSET_FLAGS(obj, flags)	(GNT_TEXT_VIEW_FLAGS(obj) &= ~(flags))
+
+typedef struct _GnTextView			GntTextView;
+typedef struct _GnTextViewPriv		GntTextViewPriv;
+typedef struct _GnTextViewClass		GntTextViewClass;
+
+struct _GnTextView
+{
+	GntWidget parent;
+
+	GList *list;        /* List of GntTextLine */
+};
+
+typedef enum
+{
+	GNT_TEXT_FLAG_BOLD        = 1 << 0,
+	GNT_TEXT_FLAG_UNDERLINE   = 1 << 1,
+	GNT_TEXT_FLAG_BLINK       = 1 << 2,
+	GNT_TEXT_FLAG_DIM         = 1 << 3,
+	GNT_TEXT_FLAG_HIGHLIGHT   = 1 << 4,
+} GntTextViewFlags;
+
+struct _GnTextViewClass
+{
+	GntWidgetClass parent;
+
+	void (*gnt_reserved1)(void);
+	void (*gnt_reserved2)(void);
+	void (*gnt_reserved3)(void);
+	void (*gnt_reserved4)(void);
+};
+
+G_BEGIN_DECLS
+
+GType gnt_text_view_get_gtype(void);
+
+/* XXX: For now, don't set a textview to have any border.
+ *      If you want borders real bad, put it in a box. */
+GntWidget *gnt_text_view_new();
+
+/* scroll > 0 means scroll up, < 0 means scroll down, == 0 means scroll to the end */
+void gnt_text_view_scroll(GntTextView *view, int scroll);
+
+void gnt_text_view_append_text_with_flags(GntTextView *view, const char *text, GntTextViewFlags flags);
+
+/* Move the cursor to the beginning of the next line and resets text-attributes.
+ * It first completes the current line with the current text-attributes. */
+void gnt_text_view_next_line(GntTextView *view);
+
+G_END_DECLS
+
+#endif /* GNT_TEXT_VIEW_H */

Modified: branches/soc-2006-file-loggers/console/libgnt/gnttree.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gnttree.c	2006-07-02 15:49:54 UTC (rev 16395)
+++ branches/soc-2006-file-loggers/console/libgnt/gnttree.c	2006-07-02 16:02:29 UTC (rev 16396)
@@ -47,7 +47,7 @@
 get_next(GntTreeRow *row)
 {
 	if (row == NULL)
-		return;
+		return NULL;
 	return _get_next(row, !row->collapsed);
 }
 
@@ -203,7 +203,10 @@
 		
 		if (row == tree->current)
 		{
-			wbkgdset(widget->window, '\0' | COLOR_PAIR(GNT_COLOR_HIGHLIGHT));
+			if (gnt_widget_has_focus(widget))
+				wbkgdset(widget->window, '\0' | COLOR_PAIR(GNT_COLOR_HIGHLIGHT));
+			else
+				wbkgdset(widget->window, '\0' | COLOR_PAIR(GNT_COLOR_HIGHLIGHT_D)); /* XXX: This, somehow, doesn't work */
 			mvwprintw(widget->window, start, pos, str);
 			wbkgdset(widget->window, '\0' | COLOR_PAIR(GNT_COLOR_NORMAL));
 		}
@@ -219,20 +222,14 @@
 		start++;
 	}
 
-	wrefresh(widget->window);
+	gnt_widget_queue_update(widget);
 }
 
 static void
 gnt_tree_draw(GntWidget *widget)
 {
 	GntTree *tree = GNT_TREE(widget);
-	int bottom;
 
-	scrollok(widget->window, TRUE);
-	wsetscrreg(widget->window, 0, widget->priv.height - 1);
-
-	tree->top = tree->root;
-
 	redraw_tree(tree);
 	
 	DEBUG;
@@ -329,8 +326,6 @@
 static void
 gnt_tree_class_init(GntTreeClass *klass)
 {
-	GObjectClass *obj_class = G_OBJECT_CLASS(klass);
-
 	parent_class = GNT_WIDGET_CLASS(klass);
 	parent_class->destroy = gnt_tree_destroy;
 	parent_class->draw = gnt_tree_draw;
@@ -431,7 +426,8 @@
 	GntWidget *widget = GNT_WIDGET(tree);
 	int ret = widget->priv.height;
 	if (!GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_NO_BORDER))
-		widget->priv.height -= 2;
+		ret -= 2;
+	return ret;
 }
 
 void gnt_tree_scroll(GntTree *tree, int count)

Modified: branches/soc-2006-file-loggers/console/libgnt/gntwidget.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntwidget.c	2006-07-02 15:49:54 UTC (rev 16395)
+++ branches/soc-2006-file-loggers/console/libgnt/gntwidget.c	2006-07-02 16:02:29 UTC (rev 16396)
@@ -219,8 +219,15 @@
 void
 gnt_widget_destroy(GntWidget *obj)
 {
+	int id;
 	g_return_if_fail(GNT_IS_WIDGET(obj));
 
+	if ((id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(obj), "gnt:queue_update"))))
+	{
+		g_source_remove(id);
+		g_object_set_data(G_OBJECT(obj), "gnt:queue_update", NULL);
+	}
+
 	gnt_widget_hide(obj);
 	delwin(obj->window);
 	if(!(GNT_WIDGET_FLAGS(obj) & GNT_WIDGET_DESTROYING))
@@ -244,23 +251,28 @@
 {
 	/* Draw the widget */
 	DEBUG;
+	if (GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_DRAWING))
+		return;
+
+	GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_DRAWING);
 	if (!(GNT_WIDGET_FLAGS(widget) & GNT_WIDGET_MAPPED))
+	{
 		gnt_widget_map(widget);
+		gnt_screen_occupy(widget);
+	}
 
-	if (widget->window)
+	if (widget->window == NULL)
 	{
-		delwin(widget->window);
-	}
+		/* XXX: It may be necessary to make sure the size hasn't changed */
+		widget->window = newwin(widget->priv.height, widget->priv.width,
+						widget->priv.y, widget->priv.x);
+		wbkgd(widget->window, COLOR_PAIR(GNT_COLOR_NORMAL));
 	
-	widget->window = newwin(widget->priv.height, widget->priv.width,
-					widget->priv.y, widget->priv.x);
-	wbkgd(widget->window, COLOR_PAIR(GNT_COLOR_NORMAL));
-	if (!(GNT_WIDGET_FLAGS(widget) & GNT_WIDGET_NO_BORDER))
-	{
-		box(widget->window, 0, 0);
+		if (!(GNT_WIDGET_FLAGS(widget) & GNT_WIDGET_NO_BORDER))
+			box(widget->window, 0, 0);
+		else
+			werase(widget->window);
 	}
-	else
-		werase(widget->window);
 
 #if 0
 	/* XXX: No shadow for now :( */
@@ -276,10 +288,12 @@
 		touchline(widget->back, 0, widget->priv.height);
 		wrefresh(widget->back);
 	}
-#endif
 
 	wrefresh(widget->window);
+#endif
 	g_signal_emit(widget, signals[SIG_DRAW], 0);
+	gnt_widget_queue_update(widget);
+	GNT_WIDGET_UNSET_FLAGS(widget, GNT_WIDGET_DRAWING);
 }
 
 gboolean
@@ -301,16 +315,9 @@
 void
 gnt_widget_hide(GntWidget *widget)
 {
-	int i;
-
-	/* XXX: Currently it simply empties the window. Ideally, it will
-	 * detect what windows are immediately beneath this one, and cause
-	 * those windows to redraw themselves by emitting the approrpiate
-	 * expose signal. */
-
 	wbkgdset(widget->window, '\0' | COLOR_PAIR(GNT_COLOR_NORMAL));
 	werase(widget->window);
-	wrefresh(widget->window);
+	gnt_screen_release(widget);
 }
 
 void
@@ -351,6 +358,7 @@
 {
 	widget->priv.width = width;
 	widget->priv.height = height;
+	GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_MAPPED);
 }
 
 gboolean
@@ -361,7 +369,6 @@
 
 	if (set && !GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_HAS_FOCUS))
 	{
-		g_signal_emit(widget->parent, signals[SIG_LOST_FOCUS], 0);
 		GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_HAS_FOCUS);
 		g_signal_emit(widget, signals[SIG_GIVE_FOCUS], 0);
 	}
@@ -387,3 +394,27 @@
 	g_signal_emit(widget, signals[SIG_ACTIVATE], 0);
 }
 
+static gboolean
+update_queue_callback(gpointer data)
+{
+	GntWidget *widget = GNT_WIDGET(data);
+
+	if (!g_object_get_data(G_OBJECT(widget), "gnt:queue_update"))
+		return FALSE;
+	gnt_screen_update(widget);
+	g_object_set_data(G_OBJECT(widget), "gnt:queue_update", GINT_TO_POINTER(FALSE));
+	return FALSE;
+}
+
+void gnt_widget_queue_update(GntWidget *widget)
+{
+	while (widget->parent)
+		widget = widget->parent;
+	
+	if (!g_object_get_data(G_OBJECT(widget), "gnt:queue_update"))
+	{
+		int id = g_timeout_add(0, update_queue_callback, widget);
+		g_object_set_data(G_OBJECT(widget), "gnt:queue_update", GINT_TO_POINTER(id));
+	}
+}
+

Modified: branches/soc-2006-file-loggers/console/libgnt/gntwidget.h
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntwidget.h	2006-07-02 15:49:54 UTC (rev 16395)
+++ branches/soc-2006-file-loggers/console/libgnt/gntwidget.h	2006-07-02 16:02:29 UTC (rev 16396)
@@ -17,8 +17,7 @@
 #define GNT_WIDGET_SET_FLAGS(obj, flags)		(GNT_WIDGET_FLAGS(obj) |= flags)
 #define GNT_WIDGET_UNSET_FLAGS(obj, flags)	(GNT_WIDGET_FLAGS(obj) &= ~(flags))
 #define GNT_WIDGET_IS_FLAG_SET(obj, flags)	(GNT_WIDGET_FLAGS(obj) & (flags))
-#define	DEBUG
-//#define	DEBUG	printf("%s\n", __FUNCTION__)
+#define	DEBUG	fprintf(stderr, "%s\n", __FUNCTION__)
 
 typedef struct _GnWidget			GntWidget;

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16465
Author:   roast
Date:     2006-07-08 15:43:22 -0700 (Sat, 08 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16465&view=rev

Log Message:
-----------
merged with svn trunk. 16395:16464.

Modified Paths:
--------------
    branches/soc-2006-file-loggers/console/Makefile
    branches/soc-2006-file-loggers/console/gntblist.c
    branches/soc-2006-file-loggers/console/gntblist.h
    branches/soc-2006-file-loggers/console/gntconv.c
    branches/soc-2006-file-loggers/console/gntconv.h
    branches/soc-2006-file-loggers/console/gntgaim.c
    branches/soc-2006-file-loggers/console/gntui.c
    branches/soc-2006-file-loggers/console/libgnt/Makefile.am
    branches/soc-2006-file-loggers/console/libgnt/configure.ac
    branches/soc-2006-file-loggers/console/libgnt/gnt.h
    branches/soc-2006-file-loggers/console/libgnt/gntbox.c
    branches/soc-2006-file-loggers/console/libgnt/gntbox.h
    branches/soc-2006-file-loggers/console/libgnt/gntbutton.c
    branches/soc-2006-file-loggers/console/libgnt/gntcolors.c
    branches/soc-2006-file-loggers/console/libgnt/gntentry.c
    branches/soc-2006-file-loggers/console/libgnt/gntlabel.c
    branches/soc-2006-file-loggers/console/libgnt/gntmain.c
    branches/soc-2006-file-loggers/console/libgnt/gnttextview.c
    branches/soc-2006-file-loggers/console/libgnt/gnttextview.h
    branches/soc-2006-file-loggers/console/libgnt/gnttree.c
    branches/soc-2006-file-loggers/console/libgnt/gnttree.h
    branches/soc-2006-file-loggers/console/libgnt/gntutils.c
    branches/soc-2006-file-loggers/console/libgnt/gntutils.h
    branches/soc-2006-file-loggers/console/libgnt/gntwidget.c
    branches/soc-2006-file-loggers/console/libgnt/gntwidget.h
    branches/soc-2006-file-loggers/console/libgnt/test/Makefile
    branches/soc-2006-file-loggers/console/libgnt/test/focus.c
    branches/soc-2006-file-loggers/console/libgnt/test/multiwin.c
    branches/soc-2006-file-loggers/console/libgnt/test/tv.c
    branches/soc-2006-file-loggers/gaim.spec.in
    branches/soc-2006-file-loggers/plugins/ssl/ssl-gnutls.c
    branches/soc-2006-file-loggers/src/connection.c
    branches/soc-2006-file-loggers/src/connection.h
    branches/soc-2006-file-loggers/src/conversation.c
    branches/soc-2006-file-loggers/src/debug.c
    branches/soc-2006-file-loggers/src/debug.h
    branches/soc-2006-file-loggers/src/gtkblist.c
    branches/soc-2006-file-loggers/src/gtkdebug.c
    branches/soc-2006-file-loggers/src/gtkprefs.c
    branches/soc-2006-file-loggers/src/protocols/bonjour/bonjour.c
    branches/soc-2006-file-loggers/src/protocols/bonjour/bonjour.h
    branches/soc-2006-file-loggers/src/protocols/bonjour/buddy.c
    branches/soc-2006-file-loggers/src/protocols/bonjour/dns_sd.c
    branches/soc-2006-file-loggers/src/protocols/bonjour/dns_sd.h
    branches/soc-2006-file-loggers/src/protocols/bonjour/jabber.c
    branches/soc-2006-file-loggers/src/protocols/bonjour/jabber.h
    branches/soc-2006-file-loggers/src/protocols/gg/lib/libgadu.c
    branches/soc-2006-file-loggers/src/protocols/irc/cmds.c
    branches/soc-2006-file-loggers/src/protocols/jabber/roster.c
    branches/soc-2006-file-loggers/src/protocols/msn/httpconn.c
    branches/soc-2006-file-loggers/src/protocols/msn/httpconn.h
    branches/soc-2006-file-loggers/src/protocols/msn/msn.c
    branches/soc-2006-file-loggers/src/protocols/oscar/oscar.c
    branches/soc-2006-file-loggers/src/proxy.c
    branches/soc-2006-file-loggers/src/server.c
    branches/soc-2006-file-loggers/src/util.c

Added Paths:
-----------
    branches/soc-2006-file-loggers/console/gntaccount.c
    branches/soc-2006-file-loggers/console/gntaccount.h

Property Changed:
----------------
    branches/soc-2006-file-loggers/src/protocols/qq/
Modified: branches/soc-2006-file-loggers/console/Makefile
===================================================================
--- branches/soc-2006-file-loggers/console/Makefile	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/console/Makefile	2006-07-08 22:43:22 UTC (rev 16465)
@@ -1,18 +1,22 @@
+VERSION=gntgaim-0.0.0dev
 CC=gcc
-CFLAGS=`pkg-config --cflags gaim gobject-2.0 gnt` -g -Wall
+CFLAGS=`pkg-config --cflags gaim gobject-2.0 gnt` -g -Wall -DVERSION=\"$(VERSION)\"
 LDFLAGS=`pkg-config --libs gaim gobject-2.0 libxml-2.0 gnt` -pg
 
 GG_SOURCES = \
+	gntaccount.c \
 	gntblist.c \
 	gntconv.c \
 	gntui.c
 
 GG_HEADERS = \
+	gntaccount.h \
 	gntblist.h \
 	gntconv.h \
 	gntui.h
 
 GG_OBJECTS = \
+	gntaccount.o \
 	gntblist.o \
 	gntconv.o \
 	gntui.o
@@ -21,6 +25,7 @@
 
 gntgaim: gntgaim.o $(GG_OBJECTS)
 	$(CC) -o gntgaim gntgaim.o $(GG_OBJECTS) $(LDFLAGS)
+gntaccount.o: gntaccount.c $(GG_HEADERS)
 gntblist.o: gntblist.c $(GG_HEADERS)
 gntconv.o: gntconv.c $(GG_HEADERS)
 gntgaim.o: gntgaim.c gntgaim.h $(GG_HEADERS)

Copied: branches/soc-2006-file-loggers/console/gntaccount.c (from rev 16464, trunk/console/gntaccount.c)
===================================================================
--- branches/soc-2006-file-loggers/console/gntaccount.c	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/gntaccount.c	2006-07-08 22:43:22 UTC (rev 16465)
@@ -0,0 +1,181 @@
+#include <gnt.h>
+#include <gntbox.h>
+#include <gntbutton.h>
+#include <gntlabel.h>
+#include <gnttree.h>
+
+#include <connection.h>
+#include <notify.h>
+#include <request.h>
+
+#include "gntaccount.h"
+#include "gntgaim.h"
+
+typedef struct
+{
+	GntWidget *window;
+	GntWidget *tree;
+} GGAccountList;
+
+static GGAccountList accounts;
+
+static void
+account_toggled(GntWidget *widget, void *key, gpointer null)
+{
+	GaimAccount *account = key;
+
+	gaim_account_set_enabled(account, GAIM_GNT_UI, gnt_tree_get_choice(GNT_TREE(widget), key));
+}
+
+void gg_accounts_init()
+{
+	GList *iter;
+	GntWidget *box, *button;
+
+	accounts.window = gnt_box_new(TRUE, TRUE);
+	gnt_box_set_toplevel(GNT_BOX(accounts.window), TRUE);
+	gnt_box_set_title(GNT_BOX(accounts.window), _("Accounts"));
+	gnt_box_set_pad(GNT_BOX(accounts.window), 0);
+	gnt_widget_set_name(accounts.window, "accounts");
+
+	gnt_box_add_widget(GNT_BOX(accounts.window),
+			gnt_label_new(_("You can enable/disable accounts from the following list.")));
+
+	accounts.tree = gnt_tree_new();
+	GNT_WIDGET_SET_FLAGS(accounts.tree, GNT_WIDGET_NO_BORDER);
+
+	for (iter = gaim_accounts_get_all(); iter; iter = iter->next)
+	{
+		GaimAccount *account = iter->data;
+		char *str = g_strdup_printf("%s (%s)",
+				gaim_account_get_username(account), gaim_account_get_protocol_id(account));
+
+		gnt_tree_add_choice(GNT_TREE(accounts.tree), account,
+				str, NULL, NULL);
+		gnt_tree_set_choice(GNT_TREE(accounts.tree), account,
+				gaim_account_get_enabled(account, GAIM_GNT_UI));
+		g_free(str);
+	}
+
+	g_signal_connect(G_OBJECT(accounts.tree), "toggled", G_CALLBACK(account_toggled), NULL);
+	
+	gnt_widget_set_size(accounts.tree, 40, 10);
+	gnt_box_add_widget(GNT_BOX(accounts.window), accounts.tree);
+
+	box = gnt_box_new(FALSE, FALSE);
+
+	button = gnt_button_new(_("Add"));
+	gnt_box_add_widget(GNT_BOX(box), button);
+
+	button = gnt_button_new(_("Modify"));
+	gnt_box_add_widget(GNT_BOX(box), button);
+
+	button = gnt_button_new(_("Delete"));
+	gnt_box_add_widget(GNT_BOX(box), button);
+	
+	gnt_box_add_widget(GNT_BOX(accounts.window), box);
+	
+	gnt_widget_show(accounts.window);
+}
+
+void gg_accounts_uninit()
+{
+	gnt_widget_destroy(accounts.window);
+}
+
+#if 0
+/* The following uiops stuff are copied from gtkaccount.c */
+/* Need to do some work on notify- and request-ui before this works */
+typedef struct
+{
+	GaimAccount *account;
+	char *username;
+	char *alias;
+} AddUserData;
+
+static char *
+make_info(GaimAccount *account, GaimConnection *gc, const char *remote_user,
+          const char *id, const char *alias, const char *msg)
+{
+	if (msg != NULL && *msg == '\0')
+		msg = NULL;
+
+	return g_strdup_printf(_("%s%s%s%s has made %s his or her buddy%s%s"),
+	                       remote_user,
+	                       (alias != NULL ? " ("  : ""),
+	                       (alias != NULL ? alias : ""),
+	                       (alias != NULL ? ")"   : ""),
+	                       (id != NULL
+	                        ? id
+	                        : (gaim_connection_get_display_name(gc) != NULL
+	                           ? gaim_connection_get_display_name(gc)
+	                           : gaim_account_get_username(account))),
+	                       (msg != NULL ? ": " : "."),
+	                       (msg != NULL ? msg  : ""));
+}
+
+static void
+notify_added(GaimAccount *account, const char *remote_user,
+			const char *id, const char *alias,
+			const char *msg)
+{
+	char *buffer;
+	GaimConnection *gc;
+
+	gc = gaim_account_get_connection(account);
+
+	buffer = make_info(account, gc, remote_user, id, alias, msg);
+
+	gaim_notify_info(NULL, NULL, buffer, NULL);
+
+	g_free(buffer);
+}
+
+static void
+request_add(GaimAccount *account, const char *remote_user,
+		  const char *id, const char *alias,
+		  const char *msg)
+{
+	char *buffer;
+	GaimConnection *gc;
+	AddUserData *data;
+
+	gc = gaim_account_get_connection(account);
+
+	data = g_new0(AddUserData, 1);
+	data->account  = account;
+	data->username = g_strdup(remote_user);
+	data->alias    = (alias != NULL ? g_strdup(alias) : NULL);
+
+	buffer = make_info(account, gc, remote_user, id, alias, msg);
+#if 0
+	gaim_request_action(NULL, NULL, _("Add buddy to your list?"),
+	                    buffer, GAIM_DEFAULT_ACTION_NONE, data, 2,
+	                    _("Add"),    G_CALLBACK(add_user_cb),
+	                    _("Cancel"), G_CALLBACK(free_add_user_data));
+#endif
+	g_free(buffer);
+}
+
+static GaimAccountUiOps ui_ops = 
+{
+	.notify_added = notify_added,
+	.status_changed = NULL,
+	.request_add  = request_add
+};
+#else
+
+static GaimAccountUiOps ui_ops = 
+{
+	.notify_added = NULL,
+	.status_changed = NULL,
+	.request_add  = NULL
+};
+
+#endif
+
+GaimAccountUiOps *gg_accounts_get_ui_ops()
+{
+	return &ui_ops;
+}
+

Copied: branches/soc-2006-file-loggers/console/gntaccount.h (from rev 16464, trunk/console/gntaccount.h)
===================================================================
--- branches/soc-2006-file-loggers/console/gntaccount.h	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/gntaccount.h	2006-07-08 22:43:22 UTC (rev 16465)
@@ -0,0 +1,7 @@
+#include "account.h"
+
+GaimAccountUiOps *gg_accounts_get_ui_ops();
+
+void gg_accounts_init();
+
+void gg_accounts_uninit();

Modified: branches/soc-2006-file-loggers/console/gntblist.c
===================================================================
--- branches/soc-2006-file-loggers/console/gntblist.c	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/console/gntblist.c	2006-07-08 22:43:22 UTC (rev 16465)
@@ -141,7 +141,7 @@
 		GaimStatusPrimitive prim;
 		GaimPresence *presence;
 		GaimStatus *now;
-
+		gboolean ascii = gnt_ascii_only();
 		
 		presence = gaim_buddy_get_presence(buddy);
 		now = gaim_presence_get_active_status(presence);
@@ -150,29 +150,15 @@
 
 		switch(prim)
 		{
-#if 1
 			case GAIM_STATUS_OFFLINE:
-				strncpy(status, "x", sizeof(status) - 1);
+				strncpy(status, ascii ? "x" : "⊗", sizeof(status) - 1);
 				break;
 			case GAIM_STATUS_AVAILABLE:
-				strncpy(status, "o", sizeof(status) - 1);
+				strncpy(status, ascii ? "o" : "◯", sizeof(status) - 1);
 				break;
 			default:
-				strncpy(status, ".", sizeof(status) - 1);
+				strncpy(status, ascii ? "." : "⊖", sizeof(status) - 1);
 				break;
-#else
-			/* XXX: Let's use these some time */
-			case GAIM_STATUS_OFFLINE:
-				strncpy(status, "⊗", sizeof(status) - 1);
-				break;
-			case GAIM_STATUS_AVAILABLE:
-				/* XXX: Detect idleness */
-				strncpy(status, "◯", sizeof(status) - 1);
-				break;
-			default:
-				strncpy(status, "⊖", sizeof(status) - 1);
-				break;
-#endif
 		}
 		name = gaim_buddy_get_alias(buddy);
 	}
@@ -217,6 +203,10 @@
 
 	node->ui_data = gnt_tree_add_row_after(GNT_TREE(ggblist->tree), buddy,
 				get_display_name(node), group, NULL);
+	if (gaim_presence_is_idle(gaim_buddy_get_presence(buddy)))
+		gnt_tree_set_row_flags(GNT_TREE(ggblist->tree), buddy, GNT_TEXT_FLAG_DIM);
+	else
+		gnt_tree_set_row_flags(GNT_TREE(ggblist->tree), buddy, 0);
 }
 
 #if 0
@@ -355,6 +345,7 @@
 	gnt_box_add_widget(GNT_BOX(box), gnt_label_new(str->str));
 
 	gnt_widget_set_position(box, x, y);
+	GNT_WIDGET_UNSET_FLAGS(box, GNT_WIDGET_CAN_TAKE_FOCUS);
 	gnt_widget_draw(box);
 
 	g_free(title);
@@ -371,7 +362,6 @@
 	draw_tooltip(ggblist);
 }
 
-
 static gboolean
 key_pressed(GntWidget *widget, const char *text, GGBlist *ggblist)
 {
@@ -390,13 +380,30 @@
 }
 
 static void
-buddy_status_changed(GaimBuddy *buddy, GaimStatus *old, GaimStatus *now, GGBlist *ggblist)
+update_buddy_display(GaimBuddy *buddy, GGBlist *ggblist)
 {
 	gnt_tree_change_text(GNT_TREE(ggblist->tree), buddy, get_display_name((GaimBlistNode*)buddy));
 	if (ggblist->tnode == (GaimBlistNode*)buddy)
 		draw_tooltip(ggblist);
+
+	if (gaim_presence_is_idle(gaim_buddy_get_presence(buddy)))
+		gnt_tree_set_row_flags(GNT_TREE(ggblist->tree), buddy, GNT_TEXT_FLAG_DIM);
+	else
+		gnt_tree_set_row_flags(GNT_TREE(ggblist->tree), buddy, 0);
 }
 
+static void
+buddy_status_changed(GaimBuddy *buddy, GaimStatus *old, GaimStatus *now, GGBlist *ggblist)
+{
+	update_buddy_display(buddy, ggblist);
+}
+
+static void
+buddy_idle_changed(GaimBuddy *buddy, int old, int new, GGBlist *ggblist)
+{
+	update_buddy_display(buddy, ggblist);
+}
+
 void gg_blist_init()
 {
 	ggblist = g_new0(GGBlist, 1);
@@ -411,13 +418,15 @@
 
 	ggblist->tree = gnt_tree_new();
 	GNT_WIDGET_SET_FLAGS(ggblist->tree, GNT_WIDGET_NO_BORDER);
-	gnt_widget_set_size(ggblist->tree, 25, getmaxy(stdscr) - 3);
+	gnt_widget_set_size(ggblist->tree, 25, getmaxy(stdscr) - 4);
 
 	gnt_box_add_widget(GNT_BOX(ggblist->window), ggblist->tree);
 	gnt_widget_show(ggblist->window);
 
 	gaim_signal_connect(gaim_blist_get_handle(), "buddy-status-changed", gg_blist_get_handle(),
 				GAIM_CALLBACK(buddy_status_changed), ggblist);
+	gaim_signal_connect(gaim_blist_get_handle(), "buddy-idle-changed", gg_blist_get_handle(),
+				GAIM_CALLBACK(buddy_idle_changed), ggblist);
 	
 #if 0
 	gaim_signal_connect(gaim_blist_get_handle(), "buddy-signed-on", gg_blist_get_handle(),
@@ -438,5 +447,36 @@
 	g_signal_connect(G_OBJECT(ggblist->tree), "selection_changed", G_CALLBACK(selection_changed), ggblist);
 	g_signal_connect(G_OBJECT(ggblist->tree), "key_pressed", G_CALLBACK(key_pressed), ggblist);
 	g_signal_connect(G_OBJECT(ggblist->tree), "activate", G_CALLBACK(selection_activate), ggblist);
+	g_signal_connect_data(G_OBJECT(ggblist->tree), "gained-focus", G_CALLBACK(draw_tooltip),
+				ggblist, 0, G_CONNECT_AFTER | G_CONNECT_SWAPPED);
+	g_signal_connect_data(G_OBJECT(ggblist->tree), "lost-focus", G_CALLBACK(remove_tooltip),
+				ggblist, 0, G_CONNECT_AFTER | G_CONNECT_SWAPPED);
 }
 
+void gg_blist_uninit()
+{
+	gnt_widget_destroy(ggblist->window);
+	g_free(ggblist);
+	ggblist = NULL;
+}
+
+void gg_blist_get_position(int *x, int *y)
+{
+	gnt_widget_get_position(ggblist->window, x, y);
+}
+
+void gg_blist_set_position(int x, int y)
+{
+	gnt_widget_set_position(ggblist->window, x, y);
+}
+
+void gg_blist_get_size(int *width, int *height)
+{
+	gnt_widget_get_size(ggblist->window, width, height);
+}
+
+void gg_blist_set_size(int width, int height)
+{
+	gnt_widget_set_size(ggblist->window, width, height);
+}
+

Modified: branches/soc-2006-file-loggers/console/gntblist.h
===================================================================
--- branches/soc-2006-file-loggers/console/gntblist.h	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/console/gntblist.h	2006-07-08 22:43:22 UTC (rev 16465)
@@ -3,3 +3,14 @@
 GaimBlistUiOps * gg_blist_get_ui_ops();
 
 void gg_blist_init();
+
+void gg_blist_uninit();
+
+void gg_blist_get_position(int *x, int *y);
+
+void gg_blist_set_position(int x, int y);
+
+void gg_blist_get_size(int *width, int *height);
+
+void gg_blist_set_size(int width, int height);
+

Modified: branches/soc-2006-file-loggers/console/gntconv.c
===================================================================
--- branches/soc-2006-file-loggers/console/gntconv.c	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/console/gntconv.c	2006-07-08 22:43:22 UTC (rev 16465)
@@ -2,6 +2,7 @@
 #include <util.h>
 
 #include "gntgaim.h"
+#include "gntblist.h"
 #include "gntconv.h"
 
 #include "gnt.h"
@@ -91,10 +92,14 @@
 	GGConv *ggc = g_hash_table_lookup(ggconvs, conv);
 	char *title;
 	GaimConversationType type;
+	int x, width;
 
 	if (ggc)
 		return;
 
+	gg_blist_get_position(&x, NULL);
+	gg_blist_get_size(&width, NULL);
+
 	ggc = g_new0(GGConv, 1);
 	g_hash_table_insert(ggconvs, conv, ggc);
 
@@ -102,25 +107,28 @@
 
 	type = gaim_conversation_get_type(conv);
 	title = g_strdup_printf(_("%s"), gaim_conversation_get_name(conv));
-	ggc->window = gnt_box_new(FALSE, TRUE);
+	ggc->window = gnt_box_new(TRUE, TRUE);
 	gnt_box_set_title(GNT_BOX(ggc->window), title);
 	gnt_box_set_toplevel(GNT_BOX(ggc->window), TRUE);
+	gnt_box_set_pad(GNT_BOX(ggc->window), 0);
 	gnt_widget_set_name(ggc->window, title);
 
 	ggc->tv = gnt_text_view_new();
 	gnt_box_add_widget(GNT_BOX(ggc->window), ggc->tv);
 	gnt_widget_set_name(ggc->tv, "conversation-window-textview");
-	gnt_widget_set_size(ggc->tv, getmaxx(stdscr) - 40, getmaxy(stdscr) - 15);
+	gnt_widget_set_size(ggc->tv, getmaxx(stdscr) - 3 - x - width, getmaxy(stdscr) - 5);
 
 	ggc->entry = gnt_entry_new(NULL);
 	gnt_box_add_widget(GNT_BOX(ggc->window), ggc->entry);
 	gnt_widget_set_name(ggc->entry, "conversation-window-entry");
-	gnt_widget_set_size(ggc->entry, getmaxx(stdscr) - 40, 1);
 
 	g_signal_connect(G_OBJECT(ggc->entry), "key_pressed", G_CALLBACK(entry_key_pressed), ggc);
 	g_signal_connect(G_OBJECT(ggc->window), "destroy", G_CALLBACK(closing_window), ggc);
 
-	gnt_widget_set_position(ggc->window, 32, 0);
+	/* XXX: I am assuming the buddylist is on the leftmost corner.
+	 *      That may not always be correct, since the windows can be moved.
+	 *      It might be an option to remember the position of conv. windows. */
+	gnt_widget_set_position(ggc->window, x + width, 0);
 	gnt_widget_show(ggc->window);
 
 	g_free(title);
@@ -138,7 +146,7 @@
 {
 	GGConv *ggconv = g_hash_table_lookup(ggconvs, conv);
 	char *strip;
-	GntTextViewFlags fl = 0;
+	GntTextFormatFlags fl = 0;
 
 	g_return_if_fail(ggconv != NULL);
 
@@ -165,7 +173,8 @@
 
 	g_free(strip);
 
-	gnt_widget_set_urgent(ggconv->tv);
+	if (flags & (GAIM_MESSAGE_RECV | GAIM_MESSAGE_NICK | GAIM_MESSAGE_ERROR))
+		gnt_widget_set_urgent(ggconv->tv);
 }
 
 static void
@@ -261,3 +270,9 @@
 	ggconvs = g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL, destroy_ggconv);
 }
 
+void gg_conversation_uninit()
+{
+	g_hash_table_destroy(ggconvs);
+	ggconvs = NULL;
+}
+

Modified: branches/soc-2006-file-loggers/console/gntconv.h
===================================================================
--- branches/soc-2006-file-loggers/console/gntconv.h	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/console/gntconv.h	2006-07-08 22:43:22 UTC (rev 16465)
@@ -3,3 +3,5 @@
 GaimConversationUiOps *gg_conv_get_ui_ops();
 
 void gg_conversation_init();
+
+void gg_conversation_uninit();

Modified: branches/soc-2006-file-loggers/console/gntgaim.c
===================================================================
--- branches/soc-2006-file-loggers/console/gntgaim.c	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/console/gntgaim.c	2006-07-08 22:43:22 UTC (rev 16465)
@@ -18,6 +18,9 @@
 #include "gntgaim.h"
 #include "gntui.h"
 
+#define _GNU_SOURCE
+#include <getopt.h>
+
 /* Anything IO-related is directly copied from gtkgaim's source tree */
 
 static GaimCoreUiOps core_ops =
@@ -103,12 +106,6 @@
 	closure->result = g_io_add_watch_full(channel, G_PRIORITY_DEFAULT, cond,
 					      gaim_gtk_io_invoke, closure, gaim_gtk_io_destroy);
 
-#if 0
-	gaim_debug(GAIM_DEBUG_MISC, "gtk_eventloop",
-			   "CLOSURE: adding input watcher %d for fd %d\n",
-			   closure->result, fd);
-#endif
-
 	g_io_channel_unref(channel);
 	return closure->result;
 }
@@ -129,25 +126,124 @@
 
 /* This is mostly copied from gtkgaim's source tree */
 static void
-init_libgaim()
+show_usage(const char *name, gboolean terse)
 {
+	char *text;
+
+	if (terse) {
+		text = g_strdup_printf(_("Gaim %s. Try `%s -h' for more information.\n"), VERSION, name);
+	} else {
+		text = g_strdup_printf(_("Gaim %s\n"
+		       "Usage: %s [OPTION]...\n\n"
+		       "  -c, --config=DIR    use DIR for config files\n"
+		       "  -d, --debug         print debugging messages to stdout\n"
+		       "  -h, --help          display this help and exit\n"
+		       "  -n, --nologin       don't automatically login\n"
+		       "  -v, --version       display the current version and exit\n"), VERSION, name);
+	}
+
+	gaim_print_utf8_to_console(stdout, text);
+	g_free(text);
+}
+
+static int
+init_libgaim(int argc, char **argv)
+{
 	char *path;
+	int opt;
+	gboolean opt_help = FALSE;
+	gboolean opt_nologin = FALSE;
+	gboolean opt_version = FALSE;
+	char *opt_config_dir_arg = NULL;
+	char *opt_session_arg = NULL;
+	gboolean debug_enabled = FALSE;
 
-	gaim_debug_set_enabled(FALSE);
+	struct option long_options[] = {
+		{"config",   required_argument, NULL, 'c'},
+		{"debug",    no_argument,       NULL, 'd'},
+		{"help",     no_argument,       NULL, 'h'},
+		{"nologin",  no_argument,       NULL, 'n'},
+		{"session",  required_argument, NULL, 's'},
+		{"version",  no_argument,       NULL, 'v'},
+		{0, 0, 0, 0}
+	};
 
+	/* scan command-line options */
+	opterr = 1;
+	while ((opt = getopt_long(argc, argv,
+#ifndef _WIN32
+				  "c:dhn::s:v",
+#else
+				  "c:dhn::v",
+#endif
+				  long_options, NULL)) != -1) {
+		switch (opt) {
+		case 'c':	/* config dir */
+			g_free(opt_config_dir_arg);
+			opt_config_dir_arg = g_strdup(optarg);
+			break;
+		case 'd':	/* debug */
+			debug_enabled = TRUE;
+			break;
+		case 'h':	/* help */
+			opt_help = TRUE;
+			break;
+		case 'n':	/* no autologin */
+			opt_nologin = TRUE;
+			break;
+		case 's':	/* use existing session ID */
+			g_free(opt_session_arg);
+			opt_session_arg = g_strdup(optarg);
+			break;
+		case 'v':	/* version */
+			opt_version = TRUE;
+			break;
+		case '?':	/* show terse help */
+		default:
+			show_usage(argv[0], TRUE);
+			return 0;
+			break;
+		}
+	}
+
+	/* show help message */
+	if (opt_help) {
+		show_usage(argv[0], FALSE);
+		return 0;
+	}
+	/* show version message */
+	if (opt_version) {
+		printf("Gaim %s\n", VERSION);
+		return 0;
+	}
+
+	/* set a user-specified config directory */
+	if (opt_config_dir_arg != NULL) {
+		gaim_util_set_user_dir(opt_config_dir_arg);
+	}
+
+	/*
+	 * We're done piddling around with command line arguments.
+	 * Fire up this baby.
+	 */
+
+	/* Because we don't want debug-messages to show up and corrup the display */
+	gaim_debug_set_enabled(debug_enabled);
+
 	gaim_core_set_ui_ops(gnt_core_get_ui_ops());
 	gaim_eventloop_set_ui_ops(gnt_eventloop_get_ui_ops());
 
-	gaim_util_set_user_dir("/tmp/tmp/");		/* XXX: */
-
 	path = g_build_filename(gaim_user_dir(), "plugins", NULL);
 	gaim_plugins_add_search_path(path);
 	g_free(path);
+
 	gaim_plugins_add_search_path("/usr/local/lib/gaim");	/* XXX: */
 
 	if (!gaim_core_init(GAIM_GNT_UI))
 	{
-		fprintf(stderr, "OOPSSS!!\n");
+		fprintf(stderr,
+				"Initialization of the Gaim core failed. Dumping core.\n"
+				"Please report this!\n");
 		abort();
 	}
 
@@ -160,11 +256,36 @@
 	gaim_prefs_update_old();
 
 	/* load plugins we had when we quit */
-	gaim_plugins_load_saved("/gaim/gtk/plugins/loaded");
+	gaim_plugins_load_saved("/gaim/gnt/plugins/loaded");
 
 	/* TODO: Move pounces loading into gaim_pounces_init() */
 	gaim_pounces_load();
 
+	if (opt_nologin)
+	{
+		/* Set all accounts to "offline" */
+		GaimSavedStatus *saved_status;
+
+		/* If we've used this type+message before, lookup the transient status */
+		saved_status = gaim_savedstatus_find_transient_by_type_and_message(
+							GAIM_STATUS_OFFLINE, NULL);
+
+		/* If this type+message is unique then create a new transient saved status */
+		if (saved_status == NULL)
+			saved_status = gaim_savedstatus_new(NULL, GAIM_STATUS_OFFLINE);
+
+		/* Set the status for each account */
+		gaim_savedstatus_activate(saved_status);
+	}
+	else
+	{
+		/* Everything is good to go--sign on already */
+		if (!gaim_prefs_get_bool("/core/savedstatus/startup_current_status"))
+			gaim_savedstatus_activate(gaim_savedstatus_get_startup());
+		gaim_accounts_restore_current_statuses();
+	}
+
+	return 1;
 }
 
 int main(int argc, char **argv)
@@ -173,12 +294,10 @@
 	freopen(".error", "w", stderr);
 
 	/* Initialize the libgaim stuff */
-	init_libgaim();
+	if (!init_libgaim(argc, argv))
+		return 0;
 
-	/* Enable the accounts and restore the status */
-	gaim_accounts_restore_current_statuses();
-
-	/* Initialize the UI */
+	/* Initialize and run the UI */
 	init_gnt_ui();
 
 	gaim_core_quit();

Modified: branches/soc-2006-file-loggers/console/gntui.c
===================================================================
--- branches/soc-2006-file-loggers/console/gntui.c	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/console/gntui.c	2006-07-08 22:43:22 UTC (rev 16465)
@@ -1,4 +1,6 @@
 #include "gntui.h"
+
+#include "gntaccount.h"
 #include "gntblist.h"
 #include "gntconv.h"
 
@@ -6,9 +8,9 @@
 {
 	gnt_init();
 
-	wbkgdset(stdscr, '\0' | COLOR_PAIR(GNT_COLOR_NORMAL));
-	werase(stdscr);
-	wrefresh(stdscr);
+	/* Accounts */
+	gg_accounts_init();
+	gaim_accounts_set_ui_ops(gg_accounts_get_ui_ops());
 
 	/* Initialize the buddy list */
 	gg_blist_init();
@@ -19,5 +21,16 @@
 	gaim_conversations_set_ui_ops(gg_conv_get_ui_ops());
 
 	gnt_main();
+
+	gaim_accounts_set_ui_ops(NULL);
+	gg_accounts_uninit();
+
+	gaim_blist_set_ui_ops(NULL);
+	gg_blist_uninit();
+
+	gaim_conversations_set_ui_ops(NULL);
+	gg_conversation_uninit();
+
+	gnt_quit();
 }
 

Modified: branches/soc-2006-file-loggers/console/libgnt/Makefile.am
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/Makefile.am	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/console/libgnt/Makefile.am	2006-07-08 22:43:22 UTC (rev 16465)
@@ -37,7 +37,8 @@
 libgnt_la_LIBADD = \
 	$(GLIB_LIBS) \
 	$(STATIC_LINK_LIBS) \
-	-lncursesw
+	-lncursesw -lpanelw
 
 AM_CPPFLAGS = \
-	$(GLIB_CFLAGS)
+	$(GLIB_CFLAGS) \
+	-Wall

Modified: branches/soc-2006-file-loggers/console/libgnt/configure.ac
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/configure.ac	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/console/libgnt/configure.ac	2006-07-08 22:43:22 UTC (rev 16465)
@@ -239,6 +239,8 @@
 AC_CHECK_HEADERS(termios.h)
 #AC_VAR_TIMEZONE_EXTERNALS
 
+AC_CHECK_LIB(ncursesw, initscr, , [AC_MSG_ERROR([
+*** You need ncursesw. ])])
 
 AC_OUTPUT([Makefile
            gnt.pc

Modified: branches/soc-2006-file-loggers/console/libgnt/gnt.h
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gnt.h	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/console/libgnt/gnt.h	2006-07-08 22:43:22 UTC (rev 16465)
@@ -7,6 +7,8 @@
 
 void gnt_main();
 
+gboolean gnt_ascii_only();
+
 void gnt_screen_occupy(GntWidget *widget);
 
 void gnt_screen_release(GntWidget *widget);
@@ -18,3 +20,6 @@
 gboolean gnt_widget_has_focus(GntWidget *widget);
 
 void gnt_widget_set_urgent(GntWidget *widget);
+
+void gnt_quit();
+

Modified: branches/soc-2006-file-loggers/console/libgnt/gntbox.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntbox.c	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/console/libgnt/gntbox.c	2006-07-08 22:43:22 UTC (rev 16465)
@@ -13,10 +13,25 @@
 static GntWidget * find_focusable_widget(GntBox *box);
 
 static void
+add_to_focus(gpointer value, gpointer data)
+{
+	GntBox *box = GNT_BOX(data);
+	GntWidget *w = GNT_WIDGET(value);
+
+	if (GNT_IS_BOX(w))
+		g_list_foreach(GNT_BOX(w)->list, add_to_focus, box);
+	else if (GNT_WIDGET_IS_FLAG_SET(w, GNT_WIDGET_CAN_TAKE_FOCUS))
+		box->focus = g_list_append(box->focus, w);
+}
+
+static void
 gnt_box_draw(GntWidget *widget)
 {
 	GntBox *box = GNT_BOX(widget);
 
+	if (box->focus == NULL && widget->parent == NULL)
+		g_list_foreach(box->list, add_to_focus, box);
+
 	g_list_foreach(box->list, (GFunc)gnt_widget_draw, NULL);
 
 	gnt_box_sync_children(box);
@@ -24,24 +39,29 @@
 	if (box->title)
 	{
 		gchar *title = g_strdup(box->title);
-		int pos = g_utf8_strlen(title, -1);
+		int pos = g_utf8_strlen(title, -1), right;
 
-		if (pos >= widget->priv.width - 2)
+		if (pos >= widget->priv.width - 4)
 		{
-			g_utf8_strncpy(title, box->title, widget->priv.width - 2);
-			pos = 1;
+			g_utf8_strncpy(title, box->title, widget->priv.width - 4);
+			pos = 2;
+			right = pos + g_utf8_strlen(title, -1);
 		}
 		else
 		{
 			/* XXX: Position of the title might be configurable */
+			right = pos;
 			pos = (widget->priv.width - pos) / 2;
+			right += pos;
 		}
 
 		if (gnt_widget_has_focus(widget))
 			wbkgdset(widget->window, '\0' | COLOR_PAIR(GNT_COLOR_TITLE));
 		else
 			wbkgdset(widget->window, '\0' | COLOR_PAIR(GNT_COLOR_TITLE_D));
+		mvwaddch(widget->window, 0, pos-1, ACS_RTEE | COLOR_PAIR(GNT_COLOR_NORMAL));
 		mvwprintw(widget->window, 0, pos, title);
+		mvwaddch(widget->window, 0, right, ACS_LTEE | COLOR_PAIR(GNT_COLOR_NORMAL));
 		g_free(title);
 	}
 	
@@ -152,102 +172,17 @@
 	DEBUG;
 }
 
-static GntWidget *
-find_next_focus(GntBox *box)
-{
-	GntWidget *w = box->active;
-	GList *iter;
-
-	while (w && !(iter = g_list_find(box->list, w)))
-		w = w->parent;
-
-	if (!w)
-		box->active = NULL;
-	else if (iter)
-	{
-		GntWidget *next = NULL;
-		
-		do
-		{
-			next = find_next_focus(iter->data);
-			box->active = next;
-			iter = iter->next;
-		} while (!next && iter);
-	}
-
-	if (box->active == NULL && GNT_WIDGET(box)->parent == NULL)
-	{
-		box->active = find_focusable_widget(box);
-	}
-	
-	if (box->active)
-		GNT_WIDGET_SET_FLAGS(box->active, GNT_WIDGET_HAS_FOCUS);
-
-	return box->active;
-}
-
 /* Ensures that the current widget can take focus */
 static GntWidget *
 find_focusable_widget(GntBox *box)
 {
-	int investigated = 0;
-	int total;
-	GntWidget *w = NULL;
-	GList *iter;
+	if (box->focus == NULL && GNT_WIDGET(box)->parent == NULL)
+		g_list_foreach(box->list, add_to_focus, box);
 
-	for (iter = box->list; iter; iter = iter->next)
-	{
-		w = iter->data;
-		if (GNT_IS_BOX(w))
-		{
-			w = find_focusable_widget(GNT_BOX(w));
-			if (w)
-				break;
-		}
-		else if (GNT_WIDGET_IS_FLAG_SET(w, GNT_WIDGET_CAN_TAKE_FOCUS))
-			break;
-	}
+	if (box->active == NULL && box->focus)
+		box->active = box->focus->data;
 
-	if (iter)
-		box->active = w;
-	else
-		box->active = NULL;
-
-	if (box->active)
-		GNT_WIDGET_SET_FLAGS(box->active, GNT_WIDGET_HAS_FOCUS);
-
 	return box->active;
-
-#if 0
-	if (box->active == NULL && box->list)
-		box->active = box->list->data;
-	else
-		w = box->active;
-
-	total = g_list_length(box->list);
-
-	while (box->active && !GNT_WIDGET_IS_FLAG_SET(box->active, GNT_WIDGET_CAN_TAKE_FOCUS))
-	{
-		box->active = box->active->next;
-		investigated++;
-	}
-
-	/* Rotate if necessary */
-	if (!box->active && investigated < total)
-	{
-		box->active = box->list;
-		while (investigated < total &&  !GNT_WIDGET_IS_FLAG_SET(box->active->data, GNT_WIDGET_CAN_TAKE_FOCUS))
-		{
-			box->active = box->active->next;
-			investigated++;
-		}
-	}
-
-	if (box->active)
-		gnt_widget_set_focus(box->active->data, TRUE);
-	if (w && w != box->active->data)
-		gnt_widget_set_focus(w, FALSE);
-#endif
 }
 
 static gboolean
@@ -263,93 +198,60 @@
 	
 	if (text[0] == 27)
 	{
-#if 0
-		GList *now = NULL;
+		GntWidget *now = box->active;
 		if (strcmp(text+1, GNT_KEY_LEFT) == 0)
 		{
-			now = box->active->prev;
-			if (now == NULL)
-				now = g_list_last(box->list);
+			GList *iter = g_list_find(box->focus, box->active);
+			if ((!iter || !iter->prev) && box->focus)
+			{
+				box->active = box->focus->data;
+			}
+			else
+			{
+				box->active = iter->prev->data;
+			}
 		}
 		else if (strcmp(text+1, GNT_KEY_RIGHT) == 0)
 		{
-			now = box->active->next;
-			if (now == NULL)
-				now = box->list;
+			GList *iter = g_list_find(box->focus, box->active);
+			if (iter && iter->next)
+			{
+				box->active = iter->next->data;
+			}
+			else if (box->focus)
+			{
+				box->active = box->focus->data;
+			}
 		}
 
 		if (now && now != box->active)
 		{
-			gnt_widget_set_focus(box->active->data, FALSE);
-			box->active = now;
-			gnt_widget_set_focus(box->active->data, TRUE);
-
+			gnt_widget_set_focus(now, FALSE);
+			gnt_widget_set_focus(box->active, TRUE);
 			return TRUE;
 		}
-#endif
 	}
 
 	return FALSE;
 }
 
-static GntWidget *find_focused_widget(GntBox *box)
-{
-	GList *iter;
-
-	for (iter = box->list; iter; iter = iter->next)
-	{
-		GntWidget *w = iter->data;
-		
-		if (GNT_IS_BOX(w))
-		{
-			if ((w = find_focused_widget(GNT_BOX(w))) != NULL)
-				return w;
-		}
-		else
-		{
-			if (GNT_WIDGET_IS_FLAG_SET(w, GNT_WIDGET_CAN_TAKE_FOCUS) &&
-					GNT_WIDGET_IS_FLAG_SET(w, GNT_WIDGET_HAS_FOCUS))
-				return w;
-		}
-	}
-	return NULL;
-}
-
-#if 0
 static void
-gnt_box_set_focus(GntWidget *widget, gboolean set)
+gnt_box_lost_focus(GntWidget *widget)
 {
-	GntWidget *p = widget;
-
-	while (p->parent)
-		p = p->parent;
-
-	p = find_focused_widget(GNT_BOX(p));
-	if (p)
-		gnt_widget_set_focus(p, set);
+	GntWidget *w = GNT_BOX(widget)->active;
+	if (w)
+		gnt_widget_set_focus(w, FALSE);
 	gnt_widget_draw(widget);
 }
 
 static void
-gnt_box_lost_focus(GntWidget *widget)
-{
-	gnt_box_set_focus(widget, FALSE);
-}
-
-static void
 gnt_box_gained_focus(GntWidget *widget)
 {
-	GntWidget *p;
-
-	while (widget->parent)
-		widget = widget->parent;
-	
-	p = find_focused_widget(GNT_BOX(widget));
-	GNT_BOX(widget)->active = g_list_find(GNT_BOX(widget)->list, p);
-	if (p)
-		gnt_widget_draw(p);
+	GntWidget *w = GNT_BOX(widget)->active;
+	if (w)
+		gnt_widget_set_focus(w, TRUE);
+	gnt_widget_draw(widget);
 }
-#endif
 
 static void
 gnt_box_destroy(GntWidget *w)
@@ -376,6 +278,33 @@
 	delwin(win);
 }
 
+static gboolean
+gnt_box_confirm_size(GntWidget *widget, int width, int height)
+{
+	GList *iter;
+	GntBox *box = GNT_BOX(widget);
+	int wchange, hchange;
+
+	wchange = widget->priv.width - width;
+	hchange = widget->priv.height - height;
+
+	/* XXX: Right now, I am trying to just apply all the changes to 
+	 * just one widget. It should be possible to distribute the
+	 * changes to all the widgets in the box. */
+	for (iter = box->list; iter; iter = iter->next)
+	{
+		GntWidget *wid = iter->data;
+		int w, h;
+
+		gnt_widget_get_size(wid, &w, &h);
+
+		if (gnt_widget_set_size(wid, w - wchange, h - hchange))
+			return TRUE;
+	}
+
+	return FALSE;
+}
+
 static void
 gnt_box_class_init(GntBoxClass *klass)
 {
@@ -387,11 +316,9 @@
 	parent_class->size_request = gnt_box_size_request;
 	parent_class->set_position = gnt_box_set_position;
 	parent_class->key_pressed = gnt_box_key_pressed;
-#if 0
-	/* We are going to need this when there are multiple focusble widgets in a box */
 	parent_class->lost_focus = gnt_box_lost_focus;
 	parent_class->gained_focus = gnt_box_gained_focus;
-#endif
+	parent_class->confirm_size = gnt_box_confirm_size;
 
 	DEBUG;
 }
@@ -399,6 +326,9 @@
 static void
 gnt_box_init(GTypeInstance *instance, gpointer class)
 {
+	/* Initially make both the height and width resizable.
+	 * Update the flags as necessary when widgets are added to it. */
+	GNT_WIDGET_SET_FLAGS(GNT_WIDGET(instance), GNT_WIDGET_GROW_X | GNT_WIDGET_GROW_Y);
 	DEBUG;
 }
 
@@ -450,6 +380,17 @@
 {
 	b->list = g_list_append(b->list, widget);
 	widget->parent = GNT_WIDGET(b);
+
+	if (b->vertical)
+	{
+		if (!GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_GROW_X))
+			GNT_WIDGET_UNSET_FLAGS(GNT_WIDGET(b), GNT_WIDGET_GROW_X);
+	}
+	else
+	{
+		if (!GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_GROW_Y))
+			GNT_WIDGET_UNSET_FLAGS(GNT_WIDGET(b), GNT_WIDGET_GROW_Y);
+	}
 }
 
 void gnt_box_set_title(GntBox *b, const char *title)
@@ -468,9 +409,15 @@
 {
 	GntWidget *widget = GNT_WIDGET(box);
 	if (set)
+	{
 		GNT_WIDGET_UNSET_FLAGS(widget, GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW);
+		GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_CAN_TAKE_FOCUS);
+	}
 	else
+	{
 		GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW);
+		GNT_WIDGET_UNSET_FLAGS(widget, GNT_WIDGET_CAN_TAKE_FOCUS);
+	}
 }
 
 void gnt_box_sync_children(GntBox *box)
@@ -483,11 +430,18 @@
 	for (iter = box->list; iter; iter = iter->next)
 	{
 		GntWidget *w = GNT_WIDGET(iter->data);
+		int height, width;
+
+		if (GNT_IS_BOX(w))
+			gnt_box_sync_children(GNT_BOX(w));
+
+		gnt_widget_get_size(w, &width, &height);
+
 		copywin(w->window, widget->window, 0, 0,
 				w->priv.y - widget->priv.y,
 				w->priv.x - widget->priv.x,
-				w->priv.y - widget->priv.y + w->priv.height - 1,
-				w->priv.x - widget->priv.x + w->priv.width - 1,
+				w->priv.y - widget->priv.y + height - 1,
+				w->priv.x - widget->priv.x + width - 1,
 				FALSE);
 	}
 }

Modified: branches/soc-2006-file-loggers/console/libgnt/gntbox.h
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntbox.h	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/console/libgnt/gntbox.h	2006-07-08 22:43:22 UTC (rev 16465)
@@ -26,6 +26,7 @@
 	int pad;			/* Number of spaces to use between widgets */
 
 	char *title;
+	GList *focus;		/* List of widgets to cycle focus (only valid for parent boxes) */
 
     void (*gnt_reserved1)(void);
     void (*gnt_reserved2)(void);

Modified: branches/soc-2006-file-loggers/console/libgnt/gntbutton.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntbutton.c	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/console/libgnt/gntbutton.c	2006-07-08 22:43:22 UTC (rev 16465)
@@ -16,10 +16,11 @@
 	GntButton *button = GNT_BUTTON(widget);
 	GntColorType type;
 
-	if (GNT_WIDGET_FLAGS(widget) & GNT_WIDGET_HAS_FOCUS)
+	if (gnt_widget_has_focus(widget))
 		type = GNT_COLOR_HIGHLIGHT;
 	else
 		type = GNT_COLOR_NORMAL;
+	
 	wbkgdset(widget->window, '\0' | COLOR_PAIR(type));
 	mvwprintw(widget->window, 1, 1, button->priv->text);
 
@@ -70,6 +71,8 @@
 {
 	GntButton *button = GNT_BUTTON(instance);
 	button->priv = g_new0(GntButtonPriv, 1);
+
+	GNT_WIDGET_SET_FLAGS(GNT_WIDGET(button), GNT_WIDGET_GROW_X); /* Can be resized sideways */
 	DEBUG;
 }
 

Modified: branches/soc-2006-file-loggers/console/libgnt/gntcolors.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntcolors.c	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/console/libgnt/gntcolors.c	2006-07-08 22:43:22 UTC (rev 16465)
@@ -29,10 +29,11 @@
 	else
 	{
 		init_pair(GNT_COLOR_NORMAL, COLOR_BLACK, COLOR_WHITE);
-		init_pair(GNT_COLOR_HIGHLIGHT, COLOR_YELLOW, COLOR_BLACK);
+		init_pair(GNT_COLOR_HIGHLIGHT, COLOR_WHITE, COLOR_BLUE);
 		init_pair(GNT_COLOR_SHADOW, COLOR_BLACK, COLOR_BLACK);
-		init_pair(GNT_COLOR_TITLE, COLOR_WHITE, COLOR_BLACK);
-		init_pair(GNT_COLOR_TEXT_NORMAL, COLOR_BLACK, COLOR_WHITE);
+		init_pair(GNT_COLOR_TITLE, COLOR_WHITE, COLOR_BLUE);
+		init_pair(GNT_COLOR_TITLE_D, COLOR_WHITE, COLOR_BLACK);
+		init_pair(GNT_COLOR_TEXT_NORMAL, COLOR_WHITE, COLOR_BLUE);
 		init_pair(GNT_COLOR_HIGHLIGHT_D, COLOR_CYAN, COLOR_BLACK);
 		init_pair(GNT_COLOR_DISABLED, COLOR_YELLOW, COLOR_WHITE);
 	}

Modified: branches/soc-2006-file-loggers/console/libgnt/gntentry.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntentry.c	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/console/libgnt/gntentry.c	2006-07-08 22:43:22 UTC (rev 16465)
@@ -173,6 +173,7 @@
 
 	GNT_WIDGET_SET_FLAGS(GNT_WIDGET(entry),
 			GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW | GNT_WIDGET_CAN_TAKE_FOCUS);
+	GNT_WIDGET_SET_FLAGS(GNT_WIDGET(entry), GNT_WIDGET_GROW_X);
 	
 	DEBUG;
 }

Modified: branches/soc-2006-file-loggers/console/libgnt/gntlabel.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntlabel.c	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/console/libgnt/gntlabel.c	2006-07-08 22:43:22 UTC (rev 16465)
@@ -70,6 +70,7 @@
 static void
 gnt_label_init(GTypeInstance *instance, gpointer class)
 {
+	GNT_WIDGET_SET_FLAGS(GNT_WIDGET(instance), GNT_WIDGET_GROW_X | GNT_WIDGET_GROW_Y);
 	DEBUG;
 }
 

Modified: branches/soc-2006-file-loggers/console/libgnt/gntmain.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntmain.c	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/console/libgnt/gntmain.c	2006-07-08 22:43:22 UTC (rev 16465)
@@ -1,3 +1,5 @@
+#include <panel.h>
+
 #include "gnt.h"
 #include "gntbox.h"
 #include "gntkeys.h"
@@ -2,2 +4,3 @@
 #include "gntcolors.h"
+#include "gnttree.h"
 
@@ -9,28 +12,60 @@
 #include <unistd.h>
 #include <string.h>
 
+static int lock_focus_list;
 static GList *focus_list;
-static int max_x;
-static int max_y;
 
+static int X_MIN;
+static int X_MAX;
+static int Y_MIN;
+static int Y_MAX;
+
+static gboolean ascii_only;
+
+static GMainLoop *loop;
+static struct
+{
+	GntWidget *window;
+	GntWidget *tree;
+} window_list;
+
 typedef struct
 {
 	GntWidget *me;
-	GList *below;		/* List of widgets below me */
-	GList *above;		/* List of widgets above me */
+
+	PANEL *panel;
 } GntNode;
 
+typedef enum
+{
+	GNT_KP_MODE_NORMAL,
+	GNT_KP_MODE_RESIZE,
+	GNT_KP_MODE_MOVE,
+	GNT_KP_MODE_MENU,
+	GNT_KP_MODE_WINDOW_LIST
+} GntKeyPressMode;
+
 static GHashTable *nodes;
 
 static void free_node(gpointer data);
 static void draw_taskbar();
+static void bring_on_top(GntWidget *widget);
 
 void gnt_screen_take_focus(GntWidget *widget)
 {
 	GntWidget *w = NULL;
+
+	if (lock_focus_list)
+		return;
+
 	if (focus_list)
 		w = focus_list->data;
-	focus_list = g_list_prepend(focus_list, widget);
+
+	/* XXX: ew */
+	focus_list = g_list_first(focus_list);
+	focus_list = g_list_append(focus_list, widget);
+	focus_list = g_list_find(focus_list, widget);
+
 	gnt_widget_set_focus(widget, TRUE);
 	if (w)
 		gnt_widget_set_focus(w, FALSE);
@@ -39,11 +74,24 @@
 
 void gnt_screen_remove_widget(GntWidget *widget)
 {
+	int pos = g_list_index(g_list_first(focus_list), widget);
+	GList *next;
+
+	if (lock_focus_list)
+		return;
+
+	if (pos == -1)
+		return;
+
+	focus_list = g_list_first(focus_list);
 	focus_list = g_list_remove(focus_list, widget);
+	next = g_list_nth(focus_list, pos - 1);
+	if (next)
+		focus_list = next;
+
 	if (focus_list)
 	{
-		gnt_widget_set_focus(focus_list->data, TRUE);
-		gnt_widget_draw(focus_list->data);
+		bring_on_top(focus_list->data);
 	}
 	draw_taskbar();
 }
@@ -52,29 +100,49 @@
 bring_on_top(GntWidget *widget)
 {
 	GntNode *node = g_hash_table_lookup(nodes, widget);
-	GList *iter;
 
+	g_return_if_fail(focus_list->data == widget);
+
 	if (!node)
 		return;
 
-	for (iter = node->above; iter;)
+	gnt_widget_set_focus(focus_list->data, TRUE);
+	gnt_widget_draw(focus_list->data);
+
+	top_panel(node->panel);
+
+	if (window_list.window)
 	{
-		GntNode *n = iter->data;
-		iter = iter->next;
-		n->below = g_list_remove(n->below, node);
-		n->above = g_list_prepend(n->above, node);
-
-		node->above = g_list_remove(node->above, n);
-		node->below = g_list_prepend(node->below, n);
+		GntNode *nd = g_hash_table_lookup(nodes, window_list.window);
+		top_panel(nd->panel);
 	}
+	update_panels();
+	doupdate();
+	draw_taskbar();
 }
 
 static void
+update_window_in_list(GntWidget *wid)
+{
+	GntTextFormatFlags flag = 0;
+
+	if (window_list.window == NULL)
+		return;
+
+	if (wid == focus_list->data)
+		flag |= GNT_TEXT_FLAG_DIM;
+	else if (GNT_WIDGET_IS_FLAG_SET(wid, GNT_WIDGET_URGENT))
+		flag |= GNT_TEXT_FLAG_BOLD;
+
+	gnt_tree_set_row_flags(GNT_TREE(window_list.tree), wid, flag);
+}
+
+static void
 draw_taskbar()
 {
 	static WINDOW *taskbar = NULL;
 	GList *iter;
-	int n, width;
+	int n, width = 0;
 	int i;
 
 	if (taskbar == NULL)
@@ -82,6 +150,7 @@
 		taskbar = newwin(1, getmaxx(stdscr), getmaxy(stdscr) - 1, 0);
 	}
 
+	wbkgdset(taskbar, '\0' | COLOR_PAIR(GNT_COLOR_NORMAL));
 	werase(taskbar);
 
 	n = g_list_length(g_list_first(focus_list));
@@ -111,15 +180,106 @@
 		wbkgdset(taskbar, '\0' | COLOR_PAIR(color));
 		mvwhline(taskbar, 0, width * i, ' ' | COLOR_PAIR(color), width);
 		mvwprintw(taskbar, 0, width * i, "%s", GNT_BOX(w)->title);
+
+		update_window_in_list(w);
 	}
 
 	wrefresh(taskbar);
 }
 
+static void
+switch_window(int direction)
+{
+	GntWidget *w = NULL;
+	if (focus_list)
+		w = focus_list->data;
+
+	if (direction == 1)
+	{
+		if (focus_list && focus_list->next)
+			focus_list = focus_list->next;
+		else
+			focus_list = g_list_first(focus_list);
+	}
+	else if (direction == -1)
+	{
+		if (focus_list && focus_list->prev)
+			focus_list = focus_list->prev;
+		else
+			focus_list = g_list_last(focus_list);
+	}
+	
+	if (focus_list)
+	{
+		bring_on_top(focus_list->data);
+	}
+
+	if (w && (!focus_list || w != focus_list->data))
+	{
+		gnt_widget_set_focus(w, FALSE);
+	}
+}
+
+static void
+window_list_activate(GntTree *tree, gpointer null)
+{
+	GntWidget *widget = gnt_tree_get_selection_data(GNT_TREE(tree));
+	GntWidget *old = NULL;
+
+	if (focus_list)
+		old = focus_list->data;
+
+	focus_list = g_list_find(g_list_first(focus_list), widget);
+	bring_on_top(widget);
+
+	if (old && (!focus_list || old != focus_list->data))
+	{
+		gnt_widget_set_focus(old, FALSE);
+	}
+}
+
+static void
+show_window_list()
+{
+	GntWidget *tree, *win;
+	GList *iter;
+
+	if (window_list.window)
+		return;
+
+	win = window_list.window = gnt_box_new(FALSE, FALSE);
+	gnt_box_set_toplevel(GNT_BOX(win), TRUE);
+	gnt_box_set_title(GNT_BOX(win), "Window List");
+	gnt_box_set_pad(GNT_BOX(win), 0);
+
+	tree = window_list.tree = gnt_tree_new();
+
+	for (iter = g_list_first(focus_list); iter; iter = iter->next)
+	{
+		GntBox *box = GNT_BOX(iter->data);
+
+		gnt_tree_add_row_after(GNT_TREE(tree), box, box->title, NULL, NULL);
+		update_window_in_list(GNT_WIDGET(box));
+	}
+
+	gnt_box_add_widget(GNT_BOX(win), tree);
+
+	gnt_widget_set_size(tree, getmaxx(stdscr) / 3, getmaxy(stdscr) / 2);
+	gnt_widget_set_position(win, getmaxx(stdscr) / 3, getmaxy(stdscr) / 4);
+
+	lock_focus_list = 1;
+	gnt_widget_show(win);
+	lock_focus_list = 0;
+
+	g_signal_connect(G_OBJECT(tree), "activate", G_CALLBACK(window_list_activate), NULL);
+}
+
 static gboolean
 io_invoke(GIOChannel *source, GIOCondition cond, gpointer null)
 {
 	char buffer[256];
+	gboolean ret = FALSE;
+	static GntKeyPressMode mode = GNT_KP_MODE_NORMAL;
 
 	int rd = read(0, buffer, sizeof(buffer) - 1);
 	if (rd < 0)
@@ -137,56 +297,197 @@
 
 	buffer[rd] = 0;
 
-	if (focus_list)
+	if (mode == GNT_KP_MODE_NORMAL)
 	{
-		gboolean ret = FALSE;
-		ret = gnt_widget_key_pressed(focus_list->data, buffer);
+		if (focus_list)
+		{
+			ret = gnt_widget_key_pressed(focus_list->data, buffer);
+		}
+
+		if (!ret)
+		{
+			if (buffer[0] == 27)
+			{
+				/* Some special key has been pressed */
+				if (strcmp(buffer+1, GNT_KEY_POPUP) == 0)
+				{}
+				else if (strcmp(buffer + 1, "c") == 0)
+				{
+					/* Alt + c was pressed. I am going to use it to close a window. */
+					if (focus_list)
+					{
+						gnt_widget_destroy(focus_list->data);
+					}
+				}
+				else if (strcmp(buffer + 1, "q") == 0)
+				{
+					/* I am going to use Alt + q to quit. */
+					g_main_loop_quit(loop);
+				}
+				else if (strcmp(buffer + 1, "n") == 0)
+				{
+					/* Alt + n to go to the next window */
+					switch_window(1);
+				}
+				else if (strcmp(buffer + 1, "p") == 0)
+				{
+					/* Alt + p to go to the previous window */
+					switch_window(-1);
+				}
+				else if (strcmp(buffer + 1, "m") == 0 && focus_list)
+				{
+					/* Move a window */
+					mode = GNT_KP_MODE_MOVE;
+				}
+				else if (strcmp(buffer + 1, "w") == 0 && focus_list)
+				{
+					/* Window list */
+					mode = GNT_KP_MODE_WINDOW_LIST;
+					show_window_list();
+				}
+				else if (strcmp(buffer + 1, "r") == 0 && focus_list)
+				{
+					/* Resize window */
+					mode = GNT_KP_MODE_RESIZE;
+				}
+			}
+		}
 	}
-
-	if (buffer[0] == 27)
+	else if (mode == GNT_KP_MODE_MOVE && focus_list)
 	{
-		/* Some special key has been pressed */
-		if (strcmp(buffer+1, GNT_KEY_POPUP) == 0)
-		{}
-		else if (strcmp(buffer + 1, "c") == 0)
+		if (buffer[0] == 27)
 		{
-			/* Alt + c was pressed. I am going to use it to close a window. */
-			if (focus_list)
+			gboolean changed = FALSE;
+			int x, y, w, h;
+			GntWidget *widget = GNT_WIDGET(focus_list->data);
+
+			gnt_widget_get_position(widget, &x, &y);
+			gnt_widget_get_size(widget, &w, &h);
+
+			if (strcmp(buffer + 1, GNT_KEY_LEFT) == 0)
 			{
-				gnt_widget_destroy(focus_list->data);
-				gnt_screen_remove_widget(focus_list->data);
+				if (x > X_MIN)
+				{
+					x--;
+					changed = TRUE;
+				}
 			}
+			else if (strcmp(buffer + 1, GNT_KEY_RIGHT) == 0)
+			{
+				if (x + w < X_MAX)
+				{
+					x++;
+					changed = TRUE;
+				}
+			}
+			else if (strcmp(buffer + 1, GNT_KEY_UP) == 0)
+			{
+				if (y > Y_MIN)
+				{
+					y--;
+					changed = TRUE;
+				}						
+			}
+			else if (strcmp(buffer + 1, GNT_KEY_DOWN) == 0)
+			{
+				if (y + h < Y_MAX)
+				{
+					y++;
+					changed = TRUE;
+				}
+			}
+			else if (buffer[1] == 0)
+			{
+				mode = GNT_KP_MODE_NORMAL;
+				changed = TRUE;
+			}
+
+			if (changed)
+			{
+				GntNode *node = g_hash_table_lookup(nodes, widget);
+				gnt_widget_set_position(widget, x, y);
+				move_panel(node->panel, y, x);
+				update_panels();
+				doupdate();
+			}
 		}
-		else if (strcmp(buffer + 1, "q") == 0)
+		else if (*buffer == '\r')
 		{
-			/* I am going to use Alt + q to quit. */
-			endwin();
-			exit(1);
+			mode = GNT_KP_MODE_NORMAL;
 		}
-		else if (strcmp(buffer + 1, "n") == 0)
+	}
+	else if (mode == GNT_KP_MODE_WINDOW_LIST && window_list.window)
+	{
+		gnt_widget_key_pressed(window_list.window, buffer);
+
+		if (buffer[0] == '\r' || (buffer[0] == 27 && buffer[1] == 0))
 		{
-			/* Alt + n to go to the next window */
-			GntWidget *w = NULL;
-			if (focus_list)
-				w = focus_list->data;
+			mode = GNT_KP_MODE_NORMAL;
+			lock_focus_list = 1;
+			gnt_widget_destroy(window_list.window);
+			window_list.window = NULL;
+			window_list.tree = NULL;
+			lock_focus_list = 0;
+		}
+	}
+	else if (mode == GNT_KP_MODE_RESIZE)
+	{
+		if (buffer[0] == '\r' || (buffer[0] == 27 && buffer[1] == 0))
+			mode = GNT_KP_MODE_NORMAL;
+		else if (buffer[0] == 27)
+		{
+			GntWidget *widget = focus_list->data;
+			gboolean changed = FALSE;
+			int width, height;
 
-			if (focus_list && focus_list->next)
-				focus_list = focus_list->next;
-			else
-				focus_list = g_list_first(focus_list);
-			if (focus_list)
+			gnt_widget_get_size(widget, &width, &height);
+
+			if (strcmp(buffer + 1, GNT_KEY_DOWN) == 0)
 			{
-				gnt_widget_set_focus(focus_list->data, TRUE);
-				bring_on_top(focus_list->data);
-				gnt_widget_draw(focus_list->data);
+				if (widget->priv.y + height < Y_MAX)
+				{
+					height++;
+					changed = TRUE;
+				}
 			}
+			else if (strcmp(buffer + 1, GNT_KEY_UP) == 0)
+			{
+				height--;
+				changed = TRUE;
+			}
+			else if (strcmp(buffer + 1, GNT_KEY_LEFT) == 0)
+			{
+				width--;
+				changed = TRUE;
+			}
+			else if (strcmp(buffer + 1, GNT_KEY_RIGHT) == 0)
+			{
+				if (widget->priv.x + width < X_MAX)
+				{
+					width++;
+					changed = TRUE;
+				}
+			}
 
-			if (w && w != focus_list->data)
-				gnt_widget_set_focus(w, FALSE);
+			if (changed)
+			{
+				GntNode *node = g_hash_table_lookup(nodes, widget);
+				int x, y;
+
+				gnt_widget_get_position(widget, &x, &y);
+
+				hide_panel(node->panel);
+				gnt_widget_set_size(widget, width, height);
+				gnt_widget_set_position(widget, x, y);
+				gnt_widget_draw(widget);
+				replace_panel(node->panel, widget->window);
+				show_panel(node->panel);
+				update_panels();
+				doupdate();
+			}
 		}
 	}
 
-	draw_taskbar();
 	refresh();
 
 	return TRUE;
@@ -203,28 +504,41 @@
 	int result = g_io_add_watch(channel, 
 					(G_IO_IN | G_IO_HUP | G_IO_ERR),
 					io_invoke, NULL);
+	const char *locale = setlocale(LC_ALL, "");
 
-	setlocale(LC_ALL, "");
+	if (locale && (strstr(locale, "UTF") || strstr(locale, "utf")))
+		ascii_only = FALSE;
+	else
+		ascii_only = TRUE;
+
 	initscr();
 	start_color();
 	gnt_init_colors();
 
-	max_x = getmaxx(stdscr);
-	max_y = getmaxy(stdscr);
+	X_MIN = 0;
+	Y_MIN = 0;
+	X_MAX = getmaxx(stdscr);
+	Y_MAX = getmaxy(stdscr) - 1;
 
 	nodes = g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL, free_node);
 
 	wbkgdset(stdscr, '\0' | COLOR_PAIR(GNT_COLOR_NORMAL));
 	noecho();
 	refresh();
+#if MAYBE_SOMEDAY
 	mousemask(ALL_MOUSE_EVENTS | REPORT_MOUSE_POSITION, NULL);
+#endif
+	wbkgdset(stdscr, '\0' | COLOR_PAIR(GNT_COLOR_NORMAL));
+	werase(stdscr);
+	wrefresh(stdscr);
+
 	g_type_init();
 }
 
 void gnt_main()
 {
-	GMainLoop *loop = g_main_new(FALSE);
-	g_main_run(loop);
+	loop = g_main_loop_new(NULL, FALSE);
+	g_main_loop_run(loop);
 }
 
 /*********************************
@@ -235,45 +549,17 @@
 free_node(gpointer data)
 {
 	GntNode *node = data;
-	g_list_free(node->below);
-	g_list_free(node->above);
+	hide_panel(node->panel);
+	del_panel(node->panel);
 	g_free(node);
 }
 
-static void
-check_intersection(gpointer key, gpointer value, gpointer data)
-{
-	GntNode *n = value;
-	GntNode *nu = data;
-
-	if (value == NULL)
-		return;
-	if (n->me == nu->me)
-		return;
-
-	if (n->me->priv.x + n->me->priv.width < nu->me->priv.x)
-		return;
-	if (nu->me->priv.x + nu->me->priv.width < n->me->priv.x)
-		return;
-
-	if (n->me->priv.y + n->me->priv.height < nu->me->priv.y)
-		return;
-	if (nu->me->priv.y + nu->me->priv.height < n->me->priv.y)
-		return;
-
-	n->above = g_list_prepend(n->above, nu);
-	nu->below = g_list_prepend(nu->below, n);
-}
-
 void gnt_screen_occupy(GntWidget *widget)
 {
 	GntNode *node;
 
-	if (widget->parent)
-	{
-		while (widget->parent)
-			widget = widget->parent;
-	}
+	while (widget->parent)
+		widget = widget->parent;
 	
 	if (g_hash_table_lookup(nodes, widget))
 		return;		/* XXX: perhaps _update instead? */
@@ -281,97 +567,64 @@
 	node = g_new0(GntNode, 1);
 	node->me = widget;
 
-	g_hash_table_foreach(nodes, check_intersection, node);
 	g_hash_table_replace(nodes, widget, node);
+
+	if (window_list.window)
+	{
+		if ((GNT_IS_BOX(widget) && GNT_BOX(widget)->title) && window_list.window != widget
+				&& GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_CAN_TAKE_FOCUS))
+		{
+			gnt_tree_add_row_after(GNT_TREE(window_list.tree), widget,
+					GNT_BOX(widget)->title, NULL, NULL);
+			update_window_in_list(widget);
+		}
+	}
+
+	update_panels();
+	doupdate();
 }
 
 void gnt_screen_release(GntWidget *widget)
 {
-	WINDOW *win;
-	GList *iter;
-	GntNode *node = g_hash_table_lookup(nodes, widget);
+	GntNode *node;
+
+	gnt_screen_remove_widget(widget);
+	node = g_hash_table_lookup(nodes, widget);
+
 	if (node == NULL)	/* Yay! Nothing to do. */
 		return;
 
-	win = dupwin(widget->window);
-	werase(win);
+	g_hash_table_remove(nodes, widget);
 
-	/* XXX: This is not going to work.
-	 *      It will be necessary to build a topology and go from there. */
-	for (iter = node->below; iter; iter = iter->next)
+	if (window_list.window)
 	{
-		GntNode *n = iter->data;
-		GntWidget *w = n->me;
-		int left, right, top, bottom;
-
-		left = MAX(widget->priv.x, w->priv.x) - w->priv.x;
-		right = MIN(widget->priv.x + widget->priv.width, w->priv.x + w->priv.width) - w->priv.x;
-		
-		top = MAX(widget->priv.y, w->priv.y) - w->priv.y;
-		bottom = MIN(widget->priv.y + widget->priv.height, w->priv.y + w->priv.height) - w->priv.y;
-
-		copywin(w->window, win, top, left,
-					w->priv.y - widget->priv.y + top,
-					w->priv.x - widget->priv.x + left,
-					w->priv.y - widget->priv.y + bottom - 1,
-					w->priv.x - widget->priv.x + right - 1, FALSE);
-		n->above = g_list_remove(n->above, node);
+		gnt_tree_remove(GNT_TREE(window_list.tree), widget);
 	}
 
-	for (iter = node->above; iter; iter = iter->next)
-	{
-		GntNode *n = iter->data;
-		n->below = g_list_remove(n->below, node);
-	}
-
-	wrefresh(win);
-	delwin(win);
-
-	g_hash_table_remove(nodes, widget);
+	update_panels();
+	doupdate();
 }
 
 void gnt_screen_update(GntWidget *widget)
 {
-	GList *iter;
-	WINDOW *win;
 	GntNode *node;
 	
-	if (widget->parent)
-	{
-		while (widget->parent)
-			widget = widget->parent;
-	}
+	while (widget->parent)
+		widget = widget->parent;
 	
 	gnt_box_sync_children(GNT_BOX(widget));
 	node = g_hash_table_lookup(nodes, widget);
+	if (node && !node->panel)
+		node->panel = new_panel(node->me->window);
 
-	win = dupwin(widget->window);
-	
-	if (node && node->above)
+	if (window_list.window)
 	{
-		/* XXX: Same here: need to build a topology first. */
-		for (iter = node->above; iter; iter = iter->next)
-		{
-			GntNode *n = iter->data;
-			GntWidget *w = n->me;
-			int left, right, top, bottom;
-
-			left = MAX(widget->priv.x, w->priv.x) - w->priv.x;
-			right = MIN(widget->priv.x + widget->priv.width, w->priv.x + w->priv.width) - w->priv.x;
-			
-			top = MAX(widget->priv.y, w->priv.y) - w->priv.y;
-			bottom = MIN(widget->priv.y + widget->priv.height, w->priv.y + w->priv.height) - w->priv.y;
-
-			copywin(w->window, win, top, left,
-					w->priv.y - widget->priv.y + top,
-					w->priv.x - widget->priv.x + left,
-					w->priv.y - widget->priv.y + bottom - 1,
-					w->priv.x - widget->priv.x + right - 1, FALSE);
-		}
+		GntNode *nd = g_hash_table_lookup(nodes, window_list.window);
+		top_panel(nd->panel);
 	}
 
-	wrefresh(win);
-	delwin(win);
+	update_panels();
+	doupdate();
 }
 
 gboolean gnt_widget_has_focus(GntWidget *widget)
@@ -383,17 +636,18 @@
 	w = widget;
 
 	while (widget->parent)
-	{
-		fprintf(stderr, "%p %p\n", widget, widget->parent);
 		widget = widget->parent;
-	}
-	fprintf(stderr, "%p %p\n", widget, widget->parent);
 
-	if (focus_list && focus_list->data == widget &&
-			(!GNT_WIDGET_IS_FLAG_SET(w, GNT_WIDGET_CAN_TAKE_FOCUS) ||
-			GNT_WIDGET_IS_FLAG_SET(w, GNT_WIDGET_HAS_FOCUS)))
+	if (widget == window_list.window)
 		return TRUE;
 
+	if (focus_list && focus_list->data == widget)
+	{
+		if (GNT_IS_BOX(widget) &&
+				(GNT_BOX(widget)->active == w || widget == w))
+			return TRUE;
+	}
+
 	return FALSE;
 }
 
@@ -409,3 +663,13 @@
 	draw_taskbar();
 }
 
+void gnt_quit()
+{
+	endwin();
+}
+
+gboolean gnt_ascii_only()
+{
+	return ascii_only;
+}
+

Modified: branches/soc-2006-file-loggers/console/libgnt/gnttextview.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gnttextview.c	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/console/libgnt/gnttextview.c	2006-07-08 22:43:22 UTC (rev 16465)
@@ -7,7 +7,7 @@
 
 typedef struct
 {
-	GntTextViewFlags flags;
+	GntTextFormatFlags flags;
 	char *text;
 } GntTextSegment;
 
@@ -113,6 +113,9 @@
 static void
 gnt_text_view_init(GTypeInstance *instance, gpointer class)
 {
+	/* XXX: For now, resizing the width is not permitted. This is because
+	 * of the way I am handling wrapped lines. */
+	GNT_WIDGET_SET_FLAGS(GNT_WIDGET(instance), GNT_WIDGET_GROW_Y);
 	DEBUG;
 }
 
@@ -152,14 +155,14 @@
 	GntTextView *view = GNT_TEXT_VIEW(widget);
 	GntTextLine *line = g_new0(GntTextLine, 1);
 
-	GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_NO_BORDER);
+	GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW);
 
 	view->list = g_list_append(view->list, line);
 
 	return widget;
 }
 
-void gnt_text_view_append_text_with_flags(GntTextView *view, const char *text, GntTextViewFlags flags)
+void gnt_text_view_append_text_with_flags(GntTextView *view, const char *text, GntTextFormatFlags flags)
 {
 	GntWidget *widget = GNT_WIDGET(view);
 	int fl = 0;
@@ -198,7 +201,7 @@
 		{
 			GntTextSegment *seg = g_new0(GntTextSegment, 1);
 			seg->flags = fl;
-			seg->text = g_new0(char, len);		/* XXX: MUST be improved */
+			seg->text = g_new0(char, len + 1);		/* XXX: MUST be improved */
 			g_utf8_strncpy(seg->text, iter, widget->priv.width - line->length - 1);
 			line->segments = g_list_append(line->segments, seg);
 

Modified: branches/soc-2006-file-loggers/console/libgnt/gnttextview.h
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gnttextview.h	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/console/libgnt/gnttextview.h	2006-07-08 22:43:22 UTC (rev 16465)
@@ -35,7 +35,7 @@
 	GNT_TEXT_FLAG_BLINK       = 1 << 2,
 	GNT_TEXT_FLAG_DIM         = 1 << 3,
 	GNT_TEXT_FLAG_HIGHLIGHT   = 1 << 4,
-} GntTextViewFlags;
+} GntTextFormatFlags;
 
 struct _GnTextViewClass
 {
@@ -58,7 +58,7 @@
 /* scroll > 0 means scroll up, < 0 means scroll down, == 0 means scroll to the end */
 void gnt_text_view_scroll(GntTextView *view, int scroll);
 
-void gnt_text_view_append_text_with_flags(GntTextView *view, const char *text, GntTextViewFlags flags);
+void gnt_text_view_append_text_with_flags(GntTextView *view, const char *text, GntTextFormatFlags flags);
 
 /* Move the cursor to the beginning of the next line and resets text-attributes.
  * It first completes the current line with the current text-attributes. */

Modified: branches/soc-2006-file-loggers/console/libgnt/gnttree.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gnttree.c	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/console/libgnt/gnttree.c	2006-07-08 22:43:22 UTC (rev 16465)
@@ -7,6 +7,7 @@
 {
 	SIG_SELECTION_CHANGED,
 	SIG_SCROLLED,
+	SIG_TOGGLED,
 	SIGS,
 };
 
@@ -21,6 +22,10 @@
 	void *data;		/* XXX: unused */
 
 	gboolean collapsed;
+	gboolean choice;            /* Is this a choice-box?
+	                               If choice is true, then child will be NULL */
+	gboolean isselected;
+	GntTextFormatFlags flags;
 
 	GntTreeRow *parent;
 	GntTreeRow *child;
@@ -176,6 +181,9 @@
 		int wr;
 		char format[16] = "";
 
+		GntTextFormatFlags flags = row->flags;
+		int attr = 0;
+
 		deep = TRUE;
 
 		if (row->parent == NULL && row->child)
@@ -188,7 +196,12 @@
 			else
 				strcpy(format, "- ");
 		}
+		else if (row->choice)
+		{
+			g_snprintf(format, sizeof(format) - 1, "[%c] ", row->isselected ? 'X' : ' ');
+		}
 
+		/* XXX: Need a utf8 version of snprintf */
 		if ((wr = g_snprintf(str, widget->priv.width, "%s%s", format, row->text)) >= widget->priv.width)
 		{
 			/* XXX: ellipsize */
@@ -200,21 +213,38 @@
 				str[wr++] = ' ';
 			str[wr] = 0;
 		}
-		
+
+		if (flags & GNT_TEXT_FLAG_BOLD)
+			attr |= A_BOLD;
+		if (flags & GNT_TEXT_FLAG_UNDERLINE)
+			attr |= A_UNDERLINE;
+		if (flags & GNT_TEXT_FLAG_BLINK)
+			attr |= A_BLINK;
+
 		if (row == tree->current)
 		{
 			if (gnt_widget_has_focus(widget))
-				wbkgdset(widget->window, '\0' | COLOR_PAIR(GNT_COLOR_HIGHLIGHT));
+				attr |= COLOR_PAIR(GNT_COLOR_HIGHLIGHT);
 			else
-				wbkgdset(widget->window, '\0' | COLOR_PAIR(GNT_COLOR_HIGHLIGHT_D)); /* XXX: This, somehow, doesn't work */
-			mvwprintw(widget->window, start, pos, str);
-			wbkgdset(widget->window, '\0' | COLOR_PAIR(GNT_COLOR_NORMAL));
+				attr |= COLOR_PAIR(GNT_COLOR_HIGHLIGHT_D);
 		}
 		else
-			mvwprintw(widget->window, start, pos, str);
+		{
+			if (flags & GNT_TEXT_FLAG_DIM)
+				attr |= (A_DIM | COLOR_PAIR(GNT_COLOR_DISABLED));
+			else if (flags & GNT_TEXT_FLAG_HIGHLIGHT)
+				attr |= (A_DIM | COLOR_PAIR(GNT_COLOR_HIGHLIGHT));
+			else
+				attr |= COLOR_PAIR(GNT_COLOR_NORMAL);
+		}
+
+		wbkgdset(widget->window, '\0' | attr);
+		mvwprintw(widget->window, start, pos, str);
+		whline(widget->window, ' ', widget->priv.width - pos * 2 - g_utf8_strlen(str, -1));
 		tree->bottom = row;
 	}
 
+	wbkgdset(widget->window, '\0' | COLOR_PAIR(GNT_COLOR_NORMAL));
 	while (start < widget->priv.height - pos)
 	{
 		mvwhline(widget->window, start, pos, ' ',
@@ -306,10 +336,19 @@
 			row->collapsed = !row->collapsed;
 			redraw_tree(tree);
 		}
+		else if (row && row->choice)
+		{
+			row->isselected = !row->isselected;
+			g_signal_emit(tree, signals[SIG_TOGGLED], 0, row->key);
+			redraw_tree(tree);
+		}
 	}
 
 	if (old != tree->current)
+	{
 		tree_selection_changed(tree, old, tree->current);
+		return TRUE;
+	}
 
 	return FALSE;
 }
@@ -349,6 +388,14 @@
 					 NULL, NULL,
 					 g_cclosure_marshal_VOID__INT,
 					 G_TYPE_NONE, 1, G_TYPE_INT);
+	signals[SIG_TOGGLED] = 
+		g_signal_new("toggled",
+					 G_TYPE_FROM_CLASS(klass),
+					 G_SIGNAL_RUN_LAST,
+					 0,
+					 NULL, NULL,
+					 g_cclosure_marshal_VOID__POINTER,
+					 G_TYPE_NONE, 1, G_TYPE_POINTER);
 
 	DEBUG;
 }
@@ -356,6 +403,7 @@
 static void
 gnt_tree_init(GTypeInstance *instance, gpointer class)
 {
+	GNT_WIDGET_SET_FLAGS(GNT_WIDGET(instance), GNT_WIDGET_GROW_X | GNT_WIDGET_GROW_Y);
 	DEBUG;
 }
 
@@ -480,7 +528,7 @@
 	}
 	else
 	{
-		int position;
+		int position = 0;
 
 		if (bigbro)
 		{
@@ -616,4 +664,49 @@
 	}
 }
 
+GntTreeRow *gnt_tree_add_choice(GntTree *tree, void *key, const char *text, void *parent, void *bigbro)
+{
+	GntTreeRow *row;
 
+	row = g_hash_table_lookup(tree->hash, key);
+	g_return_val_if_fail(!row || !row->choice, NULL);
+		
+	row = gnt_tree_add_row_after(tree, key, text, parent, bigbro);
+	row->choice = TRUE;
+
+	return row;
+}
+
+void gnt_tree_set_choice(GntTree *tree, void *key, gboolean set)
+{
+	GntTreeRow *row = g_hash_table_lookup(tree->hash, key);
+
+	if (!row)
+		return;
+	g_return_if_fail(row->choice);
+
+	row->isselected = set;
+	redraw_tree(tree);
+}
+
+gboolean gnt_tree_get_choice(GntTree *tree, void *key)
+{
+	GntTreeRow *row = g_hash_table_lookup(tree->hash, key);
+
+	if (!row)
+		return FALSE;
+	g_return_val_if_fail(row->choice, FALSE);
+
+	return row->isselected;
+}
+
+void gnt_tree_set_row_flags(GntTree *tree, void *key, GntTextFormatFlags flags)
+{
+	GntTreeRow *row = g_hash_table_lookup(tree->hash, key);
+	if (!row || row->flags == flags)
+		return;
+
+	row->flags = flags;
+	redraw_tree(tree);	/* XXX: Is shouldn't be necessary to redraw the whole darned tree */
+}
+

Modified: branches/soc-2006-file-loggers/console/libgnt/gnttree.h
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gnttree.h	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/console/libgnt/gnttree.h	2006-07-08 22:43:22 UTC (rev 16465)
@@ -5,6 +5,7 @@
 #include "gnt.h"
 #include "gntcolors.h"
 #include "gntkeys.h"
+#include "gnttextview.h"
 
 #define GNT_TYPE_TREE				(gnt_tree_get_gtype())
 #define GNT_TREE(obj)				(G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_TREE, GntTree))
@@ -73,6 +74,14 @@
 
 void gnt_tree_change_text(GntTree *tree, gpointer key, const char *text);
 
+GntTreeRow *gnt_tree_add_choice(GntTree *tree, void *key, const char *text, void *parent, void *bigbro);
+
+void gnt_tree_set_choice(GntTree *tree, void *key, gboolean set);
+
+gboolean gnt_tree_get_choice(GntTree *tree, void *key);
+
+void gnt_tree_set_row_flags(GntTree *tree, void *key, GntTextFormatFlags flags);
+
 G_END_DECLS
 
 #endif /* GNT_TREE_H */

Modified: branches/soc-2006-file-loggers/console/libgnt/gntutils.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntutils.c	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/console/libgnt/gntutils.c	2006-07-08 22:43:22 UTC (rev 16465)
@@ -130,3 +130,39 @@
 			data2);
 }
 
+void gnt_closure_marshal_BOOLEAN__INT_INT(GClosure *closure,
+										GValue *ret_value,
+										guint n_param_values,
+										const GValue *param_values,
+										gpointer invocation_hint,
+										gpointer marshal_data)
+{
+	typedef gboolean (*func) (gpointer data1, int, int, gpointer data2);
+	register func callback;
+	register GCClosure *cc = (GCClosure*)closure;
+	register gpointer data1, data2;
+	gboolean ret;
+
+	g_return_if_fail(ret_value != NULL);
+	g_return_if_fail(n_param_values == 3);
+
+	if (G_CCLOSURE_SWAP_DATA(closure))
+	{
+		data1 = closure->data;
+		data2 = g_value_peek_pointer(param_values + 0);
+	}
+	else
+	{
+		data1 = g_value_peek_pointer(param_values + 0);
+		data2 = closure->data;
+	}
+
+	callback = (func) (marshal_data ? marshal_data : cc->callback);
+	ret = callback(data1,
+			g_value_get_int(param_values + 1) ,
+			g_value_get_int(param_values + 2) ,
+			data2);
+	g_value_set_boolean(ret_value, ret);
+}
+
+

Modified: branches/soc-2006-file-loggers/console/libgnt/gntutils.h
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntutils.h	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/console/libgnt/gntutils.h	2006-07-08 22:43:22 UTC (rev 16465)
@@ -28,3 +28,10 @@
 										gpointer invocation_hint,
 										gpointer marshal_data);
 
+void gnt_closure_marshal_BOOLEAN__INT_INT(GClosure *closure,
+										GValue *ret_value,
+										guint n_param_values,
+										const GValue *param_values,
+										gpointer invocation_hint,
+										gpointer marshal_data);
+

Modified: branches/soc-2006-file-loggers/console/libgnt/gntwidget.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntwidget.c	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/console/libgnt/gntwidget.c	2006-07-08 22:43:22 UTC (rev 16465)
@@ -4,6 +4,8 @@
 #include "gntutils.h"
 #include "gnt.h"
 
+#define MIN_SIZE 5
+
 enum
 {
 	SIG_DESTROY,
@@ -15,6 +17,7 @@
 	SIG_ACTIVATE,
 	SIG_EXPOSE,
 	SIG_SIZE_REQUEST,
+	SIG_CONFIRM_SIZE,
 	SIG_POSITION,
 	SIGS
 };
@@ -22,6 +25,8 @@
 static GObjectClass *parent_class = NULL;
 static guint signals[SIGS] = { 0 };
 
+static void init_widget(GntWidget *widget);
+
 static void
 gnt_widget_init(GTypeInstance *instance, gpointer class)
 {
@@ -63,6 +68,18 @@
 		gnt_widget_draw(widget);
 }
 
+static gboolean
+gnt_widget_dummy_confirm_size(GntWidget *widget, int width, int height)
+{
+	if (width < MIN_SIZE || height < MIN_SIZE)
+		return FALSE;
+	if (widget->priv.width != width && !GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_GROW_X))
+		return FALSE;
+	if (widget->priv.height != height && !GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_GROW_Y))
+		return FALSE;
+	return TRUE;
+}
+
 static void
 gnt_widget_class_init(GntWidgetClass *klass)
 {
@@ -79,6 +96,7 @@
 	klass->map = gnt_widget_map;
 	klass->lost_focus = gnt_widget_focus_change;
 	klass->gained_focus = gnt_widget_focus_change;
+	klass->confirm_size = gnt_widget_dummy_confirm_size;
 	
 	klass->key_pressed = NULL;
 	klass->activate = NULL;
@@ -155,6 +173,14 @@
 					 NULL, NULL,
 					 g_cclosure_marshal_VOID__VOID,
 					 G_TYPE_NONE, 0);
+	signals[SIG_CONFIRM_SIZE] = 
+		g_signal_new("confirm_size",
+					 G_TYPE_FROM_CLASS(klass),
+					 G_SIGNAL_RUN_LAST,
+					 G_STRUCT_OFFSET(GntWidgetClass, confirm_size),
+					 NULL, NULL,
+					 gnt_closure_marshal_BOOLEAN__INT_INT,
+					 G_TYPE_BOOLEAN, 2, G_TYPE_INT, G_TYPE_INT);
 	signals[SIG_KEY_PRESSED] = 
 		g_signal_new("key_pressed",
 					 G_TYPE_FROM_CLASS(klass),
@@ -239,11 +265,11 @@
 gnt_widget_show(GntWidget *widget)
 {
 	/* Draw the widget and take focus */
-	gnt_widget_draw(widget);
 	if (GNT_WIDGET_FLAGS(widget) & GNT_WIDGET_CAN_TAKE_FOCUS)
 	{
 		gnt_widget_take_focus(widget);
 	}
+	gnt_widget_draw(widget);
 }
 
 void
@@ -263,34 +289,17 @@
 
 	if (widget->window == NULL)
 	{
-		/* XXX: It may be necessary to make sure the size hasn't changed */
-		widget->window = newwin(widget->priv.height, widget->priv.width,
+		gboolean shadow = TRUE;
+
+		if (GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_NO_SHADOW))
+			shadow = FALSE;
+		
+		widget->window = newwin(widget->priv.height + shadow, widget->priv.width + shadow,
 						widget->priv.y, widget->priv.x);
-		wbkgd(widget->window, COLOR_PAIR(GNT_COLOR_NORMAL));
-	
-		if (!(GNT_WIDGET_FLAGS(widget) & GNT_WIDGET_NO_BORDER))
-			box(widget->window, 0, 0);
-		else
-			werase(widget->window);
-	}
 
-#if 0
-	/* XXX: No shadow for now :( */
-	if (!(GNT_WIDGET_FLAGS(widget) & GNT_WIDGET_NO_SHADOW))
-	{
-		widget->back = newwin(widget->priv.height, widget->priv.width,
-						widget->priv.y + 1, widget->priv.x + 1);
-		wbkgd(widget->back, COLOR_PAIR(GNT_COLOR_SHADOW));
-		werase(widget->back);
-
-		mvwchgat(widget->back, 0, 0, widget->priv.height,
-					A_REVERSE | A_BLINK, 0, 0);
-		touchline(widget->back, 0, widget->priv.height);
-		wrefresh(widget->back);
+		init_widget(widget);
 	}
 
-	wrefresh(widget->window);
-#endif
 	g_signal_emit(widget, signals[SIG_DRAW], 0);
 	gnt_widget_queue_update(widget);
 	GNT_WIDGET_UNSET_FLAGS(widget, GNT_WIDGET_DRAWING);
@@ -316,8 +325,13 @@
 gnt_widget_hide(GntWidget *widget)
 {
 	wbkgdset(widget->window, '\0' | COLOR_PAIR(GNT_COLOR_NORMAL));
-	werase(widget->window);
+#if 1
+	/* XXX: I have no clue why, but this seems to be necessary. */
+	if (!GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_NO_SHADOW))
+		mvwvline(widget->window, 1, widget->priv.width, ' ', widget->priv.height);
+#endif
 	gnt_screen_release(widget);
+	GNT_WIDGET_UNSET_FLAGS(widget, GNT_WIDGET_MAPPED);
 }
 
 void
@@ -326,6 +340,7 @@
 	/* XXX: Need to install properties for these and g_object_notify */
 	wid->priv.x = x;
 	wid->priv.y = y;
+	
 	g_signal_emit(wid, signals[SIG_POSITION], 0, x, y);
 }
 
@@ -347,18 +362,76 @@
 void
 gnt_widget_get_size(GntWidget *wid, int *width, int *height)
 {
+	gboolean shadow = TRUE;
+	if (GNT_WIDGET_IS_FLAG_SET(wid, GNT_WIDGET_NO_SHADOW))
+		shadow = FALSE;
+
 	if (width)
-		*width = wid->priv.width;
+		*width = wid->priv.width + shadow;
 	if (height)
-		*height = wid->priv.height;
+		*height = wid->priv.height + shadow;
+	
 }
 
-void
+static void
+init_widget(GntWidget *widget)
+{
+	gboolean shadow = TRUE;
+
+	if (GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_NO_SHADOW))
+		shadow = FALSE;
+
+	wbkgd(widget->window, COLOR_PAIR(GNT_COLOR_NORMAL));
+	werase(widget->window);
+
+	if (!(GNT_WIDGET_FLAGS(widget) & GNT_WIDGET_NO_BORDER))
+	{
+		WINDOW *tmp = derwin(widget->window, widget->priv.height, widget->priv.width, 0, 0);
+		box(tmp, 0, 0);
+		delwin(tmp);
+	}
+
+	if (shadow)
+	{
+		wbkgdset(widget->window, '\0' | COLOR_PAIR(GNT_COLOR_SHADOW));
+		mvwvline(widget->window, 1, widget->priv.width, ' ', widget->priv.height);
+		mvwhline(widget->window, widget->priv.height, 1, ' ', widget->priv.width);
+	}
+}
+
+gboolean
 gnt_widget_set_size(GntWidget *widget, int width, int height)
 {
-	widget->priv.width = width;
-	widget->priv.height = height;
-	GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_MAPPED);
+	gboolean ret = TRUE;
+
+	if (GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_MAPPED))
+	{
+		if (!GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_NO_SHADOW))
+		{
+			width--;
+			height--;
+		}
+		g_signal_emit(widget, signals[SIG_CONFIRM_SIZE], 0, width, height, &ret);
+	}
+
+	if (ret)
+	{
+		gboolean shadow = TRUE;
+
+		if (GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_NO_SHADOW))
+			shadow = FALSE;
+
+		widget->priv.width = width;
+		widget->priv.height = height;
+		if (widget->window)
+			wresize(widget->window, height + shadow, width + shadow);
+		if (GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_MAPPED))
+			init_widget(widget);
+		else
+			GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_MAPPED);
+	}
+
+	return ret;
 }
 
 gboolean

Modified: branches/soc-2006-file-loggers/console/libgnt/gntwidget.h
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntwidget.h	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/console/libgnt/gntwidget.h	2006-07-08 22:43:22 UTC (rev 16465)
@@ -36,7 +36,9 @@
 	GNT_WIDGET_NO_SHADOW      = 1 << 4,
 	GNT_WIDGET_HAS_FOCUS      = 1 << 5,
 	GNT_WIDGET_DRAWING        = 1 << 6,
-	GNT_WIDGET_URGENT         = 1 << 7
+	GNT_WIDGET_URGENT         = 1 << 7,
+	GNT_WIDGET_GROW_X         = 1 << 8,
+	GNT_WIDGET_GROW_Y         = 1 << 9,
 } GntWidgetFlags;
 
 /* XXX: I'll have to ask grim what he's using this for in guifications. */
@@ -61,7 +63,6 @@
 
 	GntWidgetPriv priv;
 	WINDOW *window;
-	WINDOW *back;
 
     void (*gnt_reserved1)(void);
     void (*gnt_reserved2)(void);
@@ -82,6 +83,7 @@
 	void (*lost_focus)(GntWidget *widget);
 
 	void (*size_request)(GntWidget *widget);
+	gboolean (*confirm_size)(GntWidget *widget, int x, int y);
 	void (*set_position)(GntWidget *widget, int x, int y);
 	gboolean (*key_pressed)(GntWidget *widget, const char *key);
 	void (*activate)(GntWidget *widget);
@@ -105,7 +107,7 @@
 void gnt_widget_set_position(GntWidget *widget, int x, int y);
 void gnt_widget_size_request(GntWidget *widget);
 void gnt_widget_get_size(GntWidget *widget, int *width, int *height);
-void gnt_widget_set_size(GntWidget *widget, int width, int height);
+gboolean gnt_widget_set_size(GntWidget *widget, int width, int height);
 
 gboolean gnt_widget_key_pressed(GntWidget *widget, const char *keys);
 

Modified: branches/soc-2006-file-loggers/console/libgnt/test/Makefile
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/test/Makefile	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/console/libgnt/test/Makefile	2006-07-08 22:43:22 UTC (rev 16465)
@@ -1,11 +1,10 @@
 CC=gcc
 CFLAGS=`pkg-config --cflags gobject-2.0` -g -I../
-LDFLAGS=`pkg-config --libs gobject-2.0` -lncursesw -pg -lgnt -L../
+LDFLAGS=`pkg-config --libs gobject-2.0` -pg -lgnt -L../
 
 EXAMPLES=focus tv multiwin
 
 all:
-	cd .. && make
 	make examples
 
 clean:

Modified: branches/soc-2006-file-loggers/console/libgnt/test/focus.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/test/focus.c	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/console/libgnt/test/focus.c	2006-07-08 22:43:22 UTC (rev 16465)
@@ -6,44 +6,79 @@
 #include "gntentry.h"
 #include "gntlabel.h"
 
+static void
+toggled(GntWidget *tree, gpointer key, gpointer null)
+{
+	GntWidget *w = gnt_box_new(FALSE, FALSE);
+
+	gnt_box_set_toplevel(GNT_BOX(w), TRUE);
+
+	gnt_box_add_widget(GNT_BOX(w),
+			gnt_label_new(gnt_tree_get_choice(GNT_TREE(tree), key) ? "Selected" : "NOT"));
+	gnt_widget_show(w);
+}
+
 int main()
 {
 	gnt_init();
 
 	GntWidget *label = gnt_label_new("So wassup dudes and dudettes!!\nSo this is, like,\nthe third line!! \\o/");
-	GntWidget *vbox, *hbox, *tree;
+	GntWidget *vbox, *hbox, *tree, *box, *button;
 	WINDOW *test;
 
 	box(stdscr, 0, 0);
 	wrefresh(stdscr);
 
 	vbox = gnt_box_new(FALSE, FALSE);
-	hbox = gnt_box_new(FALSE, TRUE);
+	hbox = gnt_box_new(TRUE, TRUE);
 
 	gnt_widget_set_name(vbox, "vbox");
 	gnt_widget_set_name(hbox, "hbox");
 
 	gnt_box_add_widget(GNT_BOX(hbox), label);
-	gnt_box_add_widget(GNT_BOX(hbox), vbox);
 
-	gnt_box_add_widget(GNT_BOX(hbox), gnt_entry_new("a"));
+	GntWidget *entry = gnt_entry_new("a");
+	gnt_widget_set_name(entry, "entry");
+	gnt_box_add_widget(GNT_BOX(hbox), entry);
 
+	box = gnt_box_new(FALSE, FALSE);
 	tree = gnt_tree_new();
-	gnt_box_add_widget(GNT_BOX(hbox), tree);
+	gnt_widget_set_name(tree, "tree");
+	gnt_box_add_widget(GNT_BOX(box), tree);
+	gnt_box_add_widget(GNT_BOX(hbox), box);
 
 	gnt_tree_add_row_after(GNT_TREE(tree), "a", "a", NULL, NULL);
 	gnt_tree_add_row_after(GNT_TREE(tree), "c", "c", NULL, NULL);
 	gnt_tree_add_row_after(GNT_TREE(tree), "d", "d", NULL, NULL);
 	gnt_tree_add_row_after(GNT_TREE(tree), "e", "e", "a", NULL);
-	gnt_tree_add_row_after(GNT_TREE(tree), "b", "b", "d", NULL);
+	gnt_tree_add_choice(GNT_TREE(tree), "b", "b", "d", NULL);
 
 	GNT_WIDGET_UNSET_FLAGS(hbox, GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW);
 	gnt_box_set_title(GNT_BOX(hbox), "This is the title …");
 
+
+	g_signal_connect(G_OBJECT(tree), "toggled", G_CALLBACK(toggled), NULL);
+
+	button = gnt_button_new("one");
+	gnt_widget_set_name(button, "one");
+	gnt_box_add_widget(GNT_BOX(vbox), button);
+
+	button = gnt_button_new("two");
+	gnt_widget_set_name(button, "two");
+	gnt_box_add_widget(GNT_BOX(vbox), button);
+
+	button = gnt_button_new("three");
+	gnt_widget_set_name(button, "three");
+	gnt_box_add_widget(GNT_BOX(vbox), button);
+
+	gnt_box_add_widget(GNT_BOX(hbox), vbox);
+	
 	gnt_widget_show(hbox);
 
 	gnt_main();
 
+	gnt_quit();
+
 	return 0;
 }
 

Modified: branches/soc-2006-file-loggers/console/libgnt/test/multiwin.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/test/multiwin.c	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/console/libgnt/test/multiwin.c	2006-07-08 22:43:22 UTC (rev 16465)
@@ -1,18 +1,19 @@
+#include "gnt.h"
 #include "gntbutton.h"
-#include "gnt.h"
+#include "gntentry.h"
 #include "gntkeys.h"
+#include "gntlabel.h"
 #include "gnttree.h"
 #include "gntbox.h"
 
 gboolean show(GntWidget *w)
 {
-	gnt_widget_draw(w);
-
-	return TRUE;
+	return FALSE;
 }
 
 int main()
 {
+	freopen(".error", "w", stderr);
 	gnt_init();
 
 	GntWidget *hbox, *tree, *box2;
@@ -36,11 +37,11 @@
 	gnt_box_set_toplevel(GNT_BOX(box2), TRUE);
 	gnt_box_set_title(GNT_BOX(box2), "On top");
 
-	gnt_box_add_widget(GNT_BOX(box2), GNT_WIDGET(gnt_label_new("asdasd")));
+	gnt_box_add_widget(GNT_BOX(box2), gnt_label_new("asdasd"));
 	gnt_box_add_widget(GNT_BOX(box2), gnt_entry_new(NULL));
 
 	gnt_widget_show(hbox);
-	gnt_widget_set_position(box2, 5, 5);
+	gnt_widget_set_position(box2, 35, 15);
 	gnt_widget_show(box2);
 
 	gnt_tree_add_row_after(GNT_TREE(tree), "a", "a", NULL, NULL);
@@ -49,17 +50,22 @@
 	gnt_tree_add_row_after(GNT_TREE(tree), "e", "e", "a", NULL);
 	gnt_tree_add_row_after(GNT_TREE(tree), "b", "b", "d", NULL);
 
-	gnt_tree_add_row_after(GNT_TREE(tree), "1", "1", NULL, NULL);
+	gnt_tree_add_choice(GNT_TREE(tree), "1", "1", NULL, NULL);
 	gnt_tree_add_row_after(GNT_TREE(tree), "2", "2", NULL, NULL);
 	gnt_tree_add_row_after(GNT_TREE(tree), "3", "3", NULL, NULL);
 	gnt_tree_add_row_after(GNT_TREE(tree), "4", "4", "a", NULL);
 	gnt_tree_add_row_after(GNT_TREE(tree), "5", "5", "d", NULL);
 
 	gnt_tree_add_row_after(GNT_TREE(tree), "6", "6", "4", NULL);
-	g_timeout_add(1000, (GSourceFunc)show, hbox);
 
+	gnt_tree_set_row_flags(GNT_TREE(tree), "e", GNT_TEXT_FLAG_DIM);
+
+	g_timeout_add(5000, show, box2);
+
 	gnt_main();
 
+	gnt_quit();
+
 	return 0;
 }
 

Modified: branches/soc-2006-file-loggers/console/libgnt/test/tv.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/test/tv.c	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/console/libgnt/test/tv.c	2006-07-08 22:43:22 UTC (rev 16465)
@@ -66,6 +66,8 @@
 
 	gnt_main();
 
+	gnt_quit();
+
 	return 0;
 }
 

Modified: branches/soc-2006-file-loggers/gaim.spec.in
===================================================================
--- branches/soc-2006-file-loggers/gaim.spec.in	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/gaim.spec.in	2006-07-08 22:43:22 UTC (rev 16465)
@@ -6,10 +6,10 @@
 # When not doing betas comment this out
 # NOTE: %defines in spec files are evaluated in comments so the correct
 #       way to comment it out is to replace the % with #
-%define beta 3
+%define beta 4
 
 %if 0%{?beta}
-%define gaimver %(echo "@VERSION@... -e 's/svn//; s/beta.*//')
+%define gaimver %(echo "@VERSION@... -e 's/dev//; s/beta.*//')
 %else
 %define gaimver @VERSION@
 %endif
@@ -28,7 +28,7 @@
 
 # Generic build requirements
 BuildRequires: libtool, pkgconfig, libao-devel, audiofile-devel, intltool, gettext
-%{?_with_avahi:BuildRequires: avahi-devel}
+%{?_with_avahi:BuildRequires: avahi-compat-howl avahi-compat-howl-devel}
 %{?_with_howl:BuildRequires: howl-devel}
 %{?_with_silc:BuildRequires: /usr/include/silc/silcclient.h}
 %{?_with_meanwhile:BuildRequires: meanwhile-devel}

Modified: branches/soc-2006-file-loggers/plugins/ssl/ssl-gnutls.c
===================================================================
--- branches/soc-2006-file-loggers/plugins/ssl/ssl-gnutls.c	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/plugins/ssl/ssl-gnutls.c	2006-07-08 22:43:22 UTC (rev 16465)
@@ -106,6 +106,11 @@
 	GaimSslGnutlsData *gnutls_data;
 	static const int cert_type_priority[2] = { GNUTLS_CRT_X509, 0 };
 
+	/*
+	 * TODO: Uh, this needs to somehow check to make sure that gsc is
+	 *       still valid before actually doing anything.
+	 */
+
 	if(source < 0) {
 		if(gsc->error_cb != NULL)
 			gsc->error_cb(gsc, GAIM_SSL_CONNECT_FAILED, gsc->connect_cb_data);

Modified: branches/soc-2006-file-loggers/src/connection.c
===================================================================
--- branches/soc-2006-file-loggers/src/connection.c	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/src/connection.c	2006-07-08 22:43:22 UTC (rev 16465)
@@ -217,12 +217,9 @@
 
 	gaim_account_set_connection(account, NULL);
 
-	if (gc->password != NULL)
-		g_free(gc->password);
+	g_free(gc->password);
+	g_free(gc->display_name);
 
-	if (gc->display_name != NULL)
-		g_free(gc->display_name);
-
 	if (gc->disconnect_timeout)
 		gaim_timeout_remove(gc->disconnect_timeout);
 

Modified: branches/soc-2006-file-loggers/src/connection.h
===================================================================
--- branches/soc-2006-file-loggers/src/connection.h	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/src/connection.h	2006-07-08 22:43:22 UTC (rev 16465)
@@ -130,12 +130,12 @@
 									const char *password);
 
 /**
+ * Disconnects and destroys a GaimConnection.
+ *
  * This function should only be called by gaim_account_disconnect()
- * in account.c.  If you're trying to sign on an account, use that
+ * in account.c.  If you're trying to sign off an account, use that
  * function instead.
  *
- * Disconnects and destroys a GaimConnection.
- *
  * @param gc The gaim connection to destroy.
  */
 void gaim_connection_destroy(GaimConnection *gc);

Modified: branches/soc-2006-file-loggers/src/conversation.c
===================================================================
--- branches/soc-2006-file-loggers/src/conversation.c	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/src/conversation.c	2006-07-08 22:43:22 UTC (rev 16465)
@@ -57,9 +57,6 @@
 	gaim_conv_im_update_typing(im);
 	gaim_conv_im_stop_typing_timeout(im);
 
-	gaim_signal_emit(gaim_conversations_get_handle(),
-					 "buddy-typing-stopped", c->account, c->name);
-
 	return FALSE;
 }
 

Modified: branches/soc-2006-file-loggers/src/debug.c
===================================================================
--- branches/soc-2006-file-loggers/src/debug.c	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/src/debug.c	2006-07-08 22:43:22 UTC (rev 16465)
@@ -46,15 +46,21 @@
 				 const char *format, va_list args)
 {
 	GaimDebugUiOps *ops;
+	char *arg_s = NULL;
 
 	g_return_if_fail(level != GAIM_DEBUG_ALL);
 	g_return_if_fail(format != NULL);
 
+	ops = gaim_debug_get_ui_ops();
+
+	if (!debug_enabled && ((ops == NULL) || (ops->print == NULL)))
+		return;
+
+	arg_s = g_strdup_vprintf(format, args);
+
 	if (debug_enabled) {
-		gchar *arg_s, *ts_s;
+		gchar *ts_s;
 
-		arg_s = g_strdup_vprintf(format, args);
-
 		if ((category != NULL) &&
 			(gaim_prefs_exists("/core/debug/timestamps")) &&
 			(gaim_prefs_get_bool("/core/debug/timestamps"))) {
@@ -72,14 +78,13 @@
 		else
 			g_print("%s%s: %s", ts_s, category, arg_s);
 
-		g_free(arg_s);
 		g_free(ts_s);
 	}
 
-	ops = gaim_debug_get_ui_ops();
+	if (ops != NULL && ops->print != NULL)
+		ops->print(level, category, arg_s);
 
-	if (ops != NULL && ops->print != NULL)
-		ops->print(level, category, format, args);
+	g_free(arg_s);
 }
 
 void

Modified: branches/soc-2006-file-loggers/src/debug.h
===================================================================
--- branches/soc-2006-file-loggers/src/debug.h	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/src/debug.h	2006-07-08 22:43:22 UTC (rev 16465)
@@ -48,7 +48,7 @@
 typedef struct
 {
 	void (*print)(GaimDebugLevel level, const char *category,
-				  const char *format, va_list args);
+				  const char *arg_s);
 } GaimDebugUiOps;
 
 #ifdef __cplusplus

Modified: branches/soc-2006-file-loggers/src/gtkblist.c
===================================================================
--- branches/soc-2006-file-loggers/src/gtkblist.c	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/src/gtkblist.c	2006-07-08 22:43:22 UTC (rev 16465)
@@ -4106,14 +4106,16 @@
 	gboolean show = FALSE;
 	GaimBlistNode* gnode;
 
+	g_return_if_fail(node != NULL);
 
 	if (GAIM_BLIST_NODE_IS_GROUP(node))
 		gnode = node;
-	else if (GAIM_BLIST_NODE_IS_BUDDY(node)) /* maybe OR'ed with IS_CHAT? */
+	else if (GAIM_BLIST_NODE_IS_BUDDY(node))
 		gnode = node->parent->parent;
-	else if (GAIM_BLIST_NODE_IS_CONTACT(node))
+	else if (GAIM_BLIST_NODE_IS_CONTACT(node) || GAIM_BLIST_NODE_IS_CHAT(node))
 		gnode = node->parent;
-	g_return_if_fail(GAIM_BLIST_NODE_IS_GROUP(gnode));
+	else
+		return;
 
 	group = (GaimGroup*)gnode;
 

Modified: branches/soc-2006-file-loggers/src/gtkdebug.c
===================================================================
--- branches/soc-2006-file-loggers/src/gtkdebug.c	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/src/gtkdebug.c	2006-07-08 22:43:22 UTC (rev 16465)
@@ -931,13 +931,13 @@
 
 static void
 gaim_gtk_debug_print(GaimDebugLevel level, const char *category,
-					 const char *format, va_list args)
+					 const char *arg_s)
 {
 #ifdef HAVE_REGEX_H
 	GtkTreeIter iter;
 #endif /* HAVE_REGEX_H */
 	gboolean timestamps;
-	gchar *arg_s, *ts_s;
+	gchar *ts_s;
 	gchar *esc_s, *cat_s, *tmp, *s;
 
 	if (!gaim_prefs_get_bool("/gaim/gtk/debug/enabled") ||
@@ -948,8 +948,6 @@
 
 	timestamps = gaim_prefs_get_bool("/core/debug/timestamps");
 
-	arg_s = g_strdup_vprintf(format, args);
-
 	/*
 	 * For some reason we only print the timestamp if category is
 	 * not NULL.  Why the hell do we do that?  --Mark
@@ -971,8 +969,6 @@
 
 	esc_s = g_markup_escape_text(arg_s, -1);
 
-	g_free(arg_s);
-
 	s = g_strdup_printf("<font color=\"%s\">%s%s%s</font>",
 						debug_fg_colors[level], ts_s, cat_s, esc_s);
 

Modified: branches/soc-2006-file-loggers/src/gtkprefs.c
===================================================================
--- branches/soc-2006-file-loggers/src/gtkprefs.c	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/src/gtkprefs.c	2006-07-08 22:43:22 UTC (rev 16465)
@@ -1818,7 +1818,7 @@
 	}
 
 	/* Signon status stuff */
-	vbox = gaim_gtk_make_frame(ret, _("Status at startup"));
+	vbox = gaim_gtk_make_frame(ret, _("Status at Startup"));
 
 	button = gaim_gtk_prefs_checkbox(_("Use status from last _exit at startup"),
 		"/core/savedstatus/startup_current_status", vbox);

Modified: branches/soc-2006-file-loggers/src/protocols/bonjour/bonjour.c
===================================================================
--- branches/soc-2006-file-loggers/src/protocols/bonjour/bonjour.c	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/src/protocols/bonjour/bonjour.c	2006-07-08 22:43:22 UTC (rev 16465)
@@ -103,7 +103,7 @@
 
 	/* Start waiting for jabber connections (iChat style) */
 	bd->jabber_data = g_new(BonjourJabber, 1);
-	bd->jabber_data->port = gaim_account_get_int(account, "port", BONJOUR_DEFAULT_PORT_INT);
+	bd->jabber_data->port = BONJOUR_DEFAULT_PORT_INT;
 	bd->jabber_data->account = account;
 
 	if (bonjour_jabber_start(bd->jabber_data) == -1) {
@@ -123,12 +123,12 @@
 	bd->dns_sd_data->version = g_strdup("1");
 	bd->dns_sd_data->first = g_strdup(gaim_account_get_string(account, "first", default_firstname));
 	bd->dns_sd_data->last = g_strdup(gaim_account_get_string(account, "last", default_lastname));
-	bd->dns_sd_data->port_p2pj = gaim_account_get_int(account, "port", BONJOUR_DEFAULT_PORT_INT);
+	bd->dns_sd_data->port_p2pj = bd->jabber_data->port;
 	bd->dns_sd_data->phsh = g_strdup("");
 	bd->dns_sd_data->email = g_strdup(gaim_account_get_string(account, "email", ""));
 	bd->dns_sd_data->vc = g_strdup("");
-	bd->dns_sd_data->jid = g_strdup("");
-	bd->dns_sd_data->AIM = g_strdup("");
+	bd->dns_sd_data->jid = g_strdup(gaim_account_get_string(account, "jid", ""));
+	bd->dns_sd_data->AIM = g_strdup(gaim_account_get_string(account, "AIM", ""));
 
 	status = gaim_account_get_active_status(account);
 	presence = gaim_account_get_presence(account);
@@ -356,7 +356,8 @@
 	OPT_PROTO_NO_PASSWORD,
 	NULL,                                                    /* user_splits */
 	NULL,                                                    /* protocol_options */
-	{"png", 0, 0, 96, 96, GAIM_ICON_SCALE_DISPLAY},          /* icon_spec */
+	/* {"png", 0, 0, 96, 96, GAIM_ICON_SCALE_DISPLAY}, */    /* icon_spec */
+	NO_BUDDY_ICONS, /* not yet */                            /* icon_spec */
 	bonjour_list_icon,                                       /* list_icon */
 	bonjour_list_emblems,                                    /* list_emblems */
 	bonjour_status_text,                                     /* status_text */
@@ -555,7 +556,7 @@
 #endif
 
 	/* Try to figure out a good host name to use */
-	/* TODO: Avoiding 'localhost,' if possible */
+	/* TODO: Avoid 'localhost,' if possible */
 	if (gethostname(hostname, 255) != 0) {
 		gaim_debug_warning("bonjour", "Error %d when getting host name.  Using \"localhost.\"\n", errno);
 		strcpy(hostname, "localhost");
@@ -576,9 +577,6 @@
 	prpl_info.user_splits = g_list_append(prpl_info.user_splits, split);
 
 	/* Creating the options for the protocol */
-	option = gaim_account_option_int_new(_("Port"), "port", 5298);
-	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
-
 	option = gaim_account_option_string_new(_("First name"), "first", default_firstname);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 
@@ -588,6 +586,12 @@
 	option = gaim_account_option_string_new(_("E-mail"), "email", "");
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 
+	option = gaim_account_option_string_new(_("AIM Account"), "AIM", "");
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+
+	option = gaim_account_option_string_new(_("Jabber Account"), "jid", "");
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+
 	my_protocol = plugin;
 }
 

Modified: branches/soc-2006-file-loggers/src/protocols/bonjour/bonjour.h
===================================================================
--- branches/soc-2006-file-loggers/src/protocols/bonjour/bonjour.h	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/src/protocols/bonjour/bonjour.h	2006-07-08 22:43:22 UTC (rev 16465)
@@ -40,6 +40,8 @@
 #define BONJOUR_STATUS_ID_AVAILABLE "available"
 #define BONJOUR_STATUS_ID_AWAY      "away"
 
+#define BONJOUR_DEFAULT_PORT_INT 5298
+
 typedef struct _BonjourData
 {
 	BonjourDnsSd *dns_sd_data;

Modified: branches/soc-2006-file-loggers/src/protocols/bonjour/buddy.c
===================================================================
--- branches/soc-2006-file-loggers/src/protocols/bonjour/buddy.c	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/src/protocols/bonjour/buddy.c	2006-07-08 22:43:22 UTC (rev 16465)
@@ -69,10 +69,6 @@
 		return FALSE;
 	}
 
-	if (buddy->port_p2pj == -1) {
-		return FALSE;
-	}
-
 	if (buddy->status == NULL) {
 		return FALSE;
 	}

Modified: branches/soc-2006-file-loggers/src/protocols/bonjour/dns_sd.c
===================================================================
--- branches/soc-2006-file-loggers/src/protocols/bonjour/dns_sd.c	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/src/protocols/bonjour/dns_sd.c	2006-07-08 22:43:22 UTC (rev 16465)
@@ -21,27 +21,6 @@
 #include "buddy.h"
 #include "debug.h"
 
-/* Private data */
-
-typedef struct _dns_sd_packet
-{
-	gchar *name;
-	gchar *txtvers;
-	gchar *version;
-	gchar *first;
-	gchar *last;
-	gint port_p2pj;
-	gchar *phsh;
-	gchar *status;
-	gchar *message;
-	gchar *email;
-	gchar *vc;
-	gchar *jid;
-	gchar *AIM;
-} dns_sd_packet;
-
-/* End private data */
-
 /* Private functions */
 
 static sw_result HOWL_API
@@ -83,7 +62,6 @@
 	gchar *txtvers = NULL;
 	gchar *version = NULL;
 	gchar *first = NULL;
-	gint port_p2pj = -1;
 	gchar *phsh = NULL;
 	gchar *status = NULL;
 	gchar *email = NULL;
@@ -119,8 +97,6 @@
 				version = g_strdup(value);
 			} else if (strcmp(key, "1st") == 0) {
 				first = g_strdup(value);
-			} else if (strcmp(key, "port.p2pj") == 0) {
-				port_p2pj = atoi(value);
 			} else if (strcmp(key, "status") == 0) {
 				status = g_strdup(value);
 			} else if (strcmp(key, "email") == 0) {
@@ -143,7 +119,7 @@
 
 	/* Put the parameters of the text_record in a buddy and add the buddy to */
 	/* the buddy list */
-	buddy = bonjour_buddy_new(name, first, port_p2pj, phsh,
+	buddy = bonjour_buddy_new(name, first, port, phsh,
 							  status, email, last, jid, AIM, vc, ip, msg);
 
 	if (bonjour_buddy_check(buddy) == FALSE)
@@ -200,7 +176,7 @@
 			gaim_debug_warning("bonjour", "_browser_reply --> Remove domain\n");
 			break;
 		case SW_DISCOVERY_BROWSE_ADD_SERVICE:
-			/* A new peer has join the network and uses iChat bonjour */
+			/* A new peer has joined the network and uses iChat bonjour */
 			gaim_debug_info("bonjour", "_browser_reply --> Add service\n");
 			if (g_ascii_strcasecmp(name, account->username) != 0)
 			{
@@ -235,6 +211,7 @@
 {
 	sw_text_record dns_data;
 	sw_result publish_result = SW_OKAY;
+	char portstring[6];
 
 	/* Fill the data for the service */
 	if (sw_text_record_init(&dns_data) != SW_OKAY)
@@ -243,20 +220,32 @@
 		return -1;
 	}
 
+	/* Convert the port to a string */
+	snprintf(portstring, sizeof(portstring), "%d", data->port_p2pj);
+
+	/* Publish standard records */
 	sw_text_record_add_key_and_string_value(dns_data, "txtvers", data->txtvers);
 	sw_text_record_add_key_and_string_value(dns_data, "version", data->version);
 	sw_text_record_add_key_and_string_value(dns_data, "1st", data->first);
 	sw_text_record_add_key_and_string_value(dns_data, "last", data->last);
-	/* sw_text_record_add_key_and_string_value(dns_data, "port.p2pj", itoa(data->port_p2pj)); */
-	sw_text_record_add_key_and_string_value(dns_data, "port.p2pj", BONJOUR_DEFAULT_PORT);
+	sw_text_record_add_key_and_string_value(dns_data, "port.p2pj", portstring);
 	sw_text_record_add_key_and_string_value(dns_data, "phsh", data->phsh);
 	sw_text_record_add_key_and_string_value(dns_data, "status", data->status);
-	sw_text_record_add_key_and_string_value(dns_data, "msg", data->msg);
-	sw_text_record_add_key_and_string_value(dns_data, "email", data->email);
 	sw_text_record_add_key_and_string_value(dns_data, "vc", data->vc);
-	sw_text_record_add_key_and_string_value(dns_data, "jid", data->jid);
-	sw_text_record_add_key_and_string_value(dns_data, "AIM", data->AIM);
 
+	/* Publish extra records */
+	if ((data->email != NULL) && (*data->email != '\0'))
+		sw_text_record_add_key_and_string_value(dns_data, "email", data->email);
+
+	if ((data->jid != NULL) && (*data->jid != '\0'))
+		sw_text_record_add_key_and_string_value(dns_data, "jid", data->jid);
+
+	if ((data->AIM != NULL) && (*data->AIM != '\0'))
+		sw_text_record_add_key_and_string_value(dns_data, "AIM", data->AIM);
+
+	if ((data->msg != NULL) && (*data->msg != '\0'))
+		sw_text_record_add_key_and_string_value(dns_data, "msg", data->msg);
+
 	/* Publish the service */
 	switch (type)
 	{
@@ -272,7 +261,7 @@
 	}
 	if (publish_result != SW_OKAY)
 	{
-		gaim_debug_error("bonjour", "Unable to publish or change the status of the _presence._tcp service.");
+		gaim_debug_error("bonjour", "Unable to publish or change the status of the _presence._tcp service.\n");
 		return -1;
 	}
 

Modified: branches/soc-2006-file-loggers/src/protocols/bonjour/dns_sd.h
===================================================================
--- branches/soc-2006-file-loggers/src/protocols/bonjour/dns_sd.h	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/src/protocols/bonjour/dns_sd.h	2006-07-08 22:43:22 UTC (rev 16465)
@@ -21,8 +21,6 @@
 #include <glib.h>
 #include "account.h"
 
-#define BONJOUR_DEFAULT_PORT "5298"
-#define BONJOUR_DEFAULT_PORT_INT 5298
 #define ICHAT_SERVICE "_presence._tcp."
 
 /**

Modified: branches/soc-2006-file-loggers/src/protocols/bonjour/jabber.c
===================================================================
--- branches/soc-2006-file-loggers/src/protocols/bonjour/jabber.c	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/src/protocols/bonjour/jabber.c	2006-07-08 22:43:22 UTC (rev 16465)
@@ -379,7 +379,8 @@
 		_jabber_parse_and_write_message_to_ui(message, account->gc, gb);
 	}
 
-	xmlnode_free(message_node);
+	if (message_node != NULL)
+		xmlnode_free(message_node);
 }
 
 static void
@@ -450,6 +451,8 @@
 {
 	struct sockaddr_in my_addr;
 	int yes = 1;
+	int i;
+	gboolean bind_successful;
 
 	/* Open a listening socket for incoming conversations */
 	if ((data->socket = socket(PF_INET, SOCK_STREAM, 0)) < 0)
@@ -469,19 +472,33 @@
 
 	memset(&my_addr, 0, sizeof(struct sockaddr_in));
 	my_addr.sin_family = PF_INET;
-	my_addr.sin_port = htons(data->port);
 
-	if (bind(data->socket, (struct sockaddr*)&my_addr, sizeof(struct sockaddr)) != 0)
+	/* Attempt to find a free port */
+	bind_successful = FALSE;
+	for (i = 0; i < 10; i++)
 	{
+		my_addr.sin_port = htons(data->port);
+		if (bind(data->socket, (struct sockaddr*)&my_addr, sizeof(struct sockaddr)) == 0)
+		{
+			bind_successful = TRUE;
+			break;
+		}
+		data->port++;
+	}
+
+	/* On no!  We tried 10 ports and could not bind to ANY of them */
+	if (!bind_successful)
+	{
 		gaim_debug_error("bonjour", "Cannot bind socket: %s\n", strerror(errno));
-		gaim_connection_error(data->account->gc, _("Cannot bind socket to port"));
+		gaim_connection_error(data->account->gc, _("Could not bind socket to port"));
 		return -1;
 	}
 
+	/* Attempt to listen on the bound socket */
 	if (listen(data->socket, 10) != 0)
 	{
 		gaim_debug_error("bonjour", "Cannot listen on socket: %s\n", strerror(errno));
-		gaim_connection_error(data->account->gc, _("Cannot listen on socket"));
+		gaim_connection_error(data->account->gc, _("Could not listen on socket"));
 		return -1;
 	}
 
@@ -498,7 +515,7 @@
 	/* Open a watcher in the socket we have just opened */
 	data->watcher_id = gaim_input_add(data->socket, GAIM_INPUT_READ, _server_socket_handler, data);
 
-	return 0;
+	return data->port;
 }
 
 int
@@ -547,6 +564,7 @@
 
 	message_node = xmlnode_new("message");
 	xmlnode_set_attrib(message_node, "to", ((BonjourBuddy*)(gb->proto_data))->name);
+	xmlnode_set_attrib(message_node, "from", data->account->username);
 	xmlnode_set_attrib(message_node, "type", "chat");
 	xmlnode_insert_child(message_node, message_body_node);
 	xmlnode_insert_child(message_node, message_html_node);

Modified: branches/soc-2006-file-loggers/src/protocols/bonjour/jabber.h
===================================================================
--- branches/soc-2006-file-loggers/src/protocols/bonjour/jabber.h	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/src/protocols/bonjour/jabber.h	2006-07-08 22:43:22 UTC (rev 16465)
@@ -49,8 +49,10 @@
 } BonjourJabberConversation;
 
 /**
- * Start listening for jabber connections. Returns 0 if the connection could be
- * stablished, -1 if a problem appears.
+ * Start listening for jabber connections.
+ *
+ * @return -1 if there was a problem, else returns the listening
+ *         port number.
  */
 gint bonjour_jabber_start(BonjourJabber *data);
 

Modified: branches/soc-2006-file-loggers/src/protocols/gg/lib/libgadu.c
===================================================================
--- branches/soc-2006-file-loggers/src/protocols/gg/lib/libgadu.c	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/src/protocols/gg/lib/libgadu.c	2006-07-08 22:43:22 UTC (rev 16465)
@@ -357,7 +357,7 @@
 
 		write(pipes[1], &a, sizeof(a));
 
-		exit(0);
+		_exit(0);
 	}
 
 	close(pipes[1]);

Modified: branches/soc-2006-file-loggers/src/protocols/irc/cmds.c
===================================================================
--- branches/soc-2006-file-loggers/src/protocols/irc/cmds.c	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/src/protocols/irc/cmds.c	2006-07-08 22:43:22 UTC (rev 16465)
@@ -388,7 +388,8 @@
 
 		irc->quitting = TRUE;
 
-		gaim_account_set_status(irc->account, "offline", TRUE, NULL);
+		if (!irc->account->disconnecting)
+			gaim_account_set_status(irc->account, "offline", TRUE, NULL);
 	}
 
 	return 0;

Modified: branches/soc-2006-file-loggers/src/protocols/jabber/roster.c
===================================================================
--- branches/soc-2006-file-loggers/src/protocols/jabber/roster.c	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/src/protocols/jabber/roster.c	2006-07-08 22:43:22 UTC (rev 16465)
@@ -56,6 +56,7 @@
 		const char *alias, GSList *groups)
 {
 	GSList *buddies, *g2, *l;
+	gchar *my_bare_jid;
 
 	buddies = gaim_find_buddies(js->gc->account, jid);
 
@@ -68,6 +69,8 @@
 			return;
 	}
 
+	my_bare_jid = g_strdup_printf("%s@...", js->user->node, js->user->domain);
+
 	while(buddies) {
 		GaimBuddy *b = buddies->data;
 		GaimGroup *g = gaim_buddy_get_group(b);
@@ -100,10 +103,27 @@
 
 		gaim_blist_add_buddy(b, NULL, g, NULL);
 		gaim_blist_alias_buddy(b, alias);
+
+
+		/* If we just learned about ourself, then fake our status,
+		 * because we won't be receiving a normal presence message
+		 * about ourself. */
+		if(!strcmp(b->name, my_bare_jid)) {
+			GaimPresence *gpresence;
+			GaimStatus *status;
+
+			gpresence = gaim_account_get_presence(js->gc->account);
+			status = gaim_presence_get_active_status(gpresence);
+			jabber_presence_fake_to_self(js, status);
+		}
+
+
+
 		g_free(g2->data);
 		g2 = g_slist_delete_link(g2, g2);
 	}
 
+	g_free(my_bare_jid);
 	g_slist_free(buddies);
 }
 

Modified: branches/soc-2006-file-loggers/src/protocols/msn/httpconn.c
===================================================================
--- branches/soc-2006-file-loggers/src/protocols/msn/httpconn.c	2006-07-08 22:08:51 UTC (rev 16464)
+++ branches/soc-2006-file-loggers/src/protocols/msn/httpconn.c	2006-07-08 22:43:22 UTC (rev 16465)
@@ -25,317 +25,242 @@
 #include "debug.h"
 #include "httpconn.h"
 
-static void read_cb(gpointer data, gint source, GaimInputCondition cond);
-gboolean msn_httpconn_parse_data(MsnHttpConn *httpconn, const char *buf,
-								 size_t size, char **ret_buf, size_t *ret_size,
-								 gboolean *error);
-
-MsnHttpConn *
-msn_httpconn_new(MsnServConn *servconn)
+typedef struct
 {
 	MsnHttpConn *httpconn;
+	char *body;
+	size_t body_len;
+} MsnHttpQueueData;
 
-	g_return_val_if_fail(servconn != NULL, NULL);

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16598
Author:   roast
Date:     2006-07-29 14:38:18 -0700 (Sat, 29 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16598&view=rev

Log Message:
-----------
merged with svn trunk. 16534:16597.

Modified Paths:
--------------
    branches/soc-2006-file-loggers/COPYRIGHT
    branches/soc-2006-file-loggers/config.h.mingw
    branches/soc-2006-file-loggers/configure.ac
    branches/soc-2006-file-loggers/console/Makefile
    branches/soc-2006-file-loggers/console/gntaccount.c
    branches/soc-2006-file-loggers/console/gntaccount.h
    branches/soc-2006-file-loggers/console/gntconv.c
    branches/soc-2006-file-loggers/console/gntgaim.c
    branches/soc-2006-file-loggers/console/gntnotify.c
    branches/soc-2006-file-loggers/console/gntui.c
    branches/soc-2006-file-loggers/console/libgnt/Makefile.am
    branches/soc-2006-file-loggers/console/libgnt/gntbox.c
    branches/soc-2006-file-loggers/console/libgnt/gntbutton.c
    branches/soc-2006-file-loggers/console/libgnt/gntcolors.c
    branches/soc-2006-file-loggers/console/libgnt/gntcolors.h
    branches/soc-2006-file-loggers/console/libgnt/gntcombobox.c
    branches/soc-2006-file-loggers/console/libgnt/gntcombobox.h
    branches/soc-2006-file-loggers/console/libgnt/gntentry.c
    branches/soc-2006-file-loggers/console/libgnt/gntentry.h
    branches/soc-2006-file-loggers/console/libgnt/gntmain.c
    branches/soc-2006-file-loggers/console/libgnt/gnttree.c
    branches/soc-2006-file-loggers/console/libgnt/gnttree.h
    branches/soc-2006-file-loggers/console/libgnt/gntwidget.c
    branches/soc-2006-file-loggers/console/libgnt/gntwidget.h
    branches/soc-2006-file-loggers/console/libgnt/test/combo.c
    branches/soc-2006-file-loggers/doc/gtkconv-signals.dox
    branches/soc-2006-file-loggers/doc/log-signals.dox
    branches/soc-2006-file-loggers/plugins/ChangeLog.API
    branches/soc-2006-file-loggers/plugins/timestamp_format.c
    branches/soc-2006-file-loggers/src/conversation.c
    branches/soc-2006-file-loggers/src/gtkaccount.c
    branches/soc-2006-file-loggers/src/gtkconn.c
    branches/soc-2006-file-loggers/src/gtkconv.c
    branches/soc-2006-file-loggers/src/gtkconv.h
    branches/soc-2006-file-loggers/src/log.c
    branches/soc-2006-file-loggers/src/notify.c
    branches/soc-2006-file-loggers/src/protocols/gg/gg.c
    branches/soc-2006-file-loggers/src/protocols/jabber/jabber.c
    branches/soc-2006-file-loggers/src/protocols/jabber/jabber.h
    branches/soc-2006-file-loggers/src/protocols/jabber/message.c
    branches/soc-2006-file-loggers/src/protocols/msn/servconn.c
    branches/soc-2006-file-loggers/src/protocols/oscar/flap_connection.c
    branches/soc-2006-file-loggers/src/protocols/oscar/odc.c
    branches/soc-2006-file-loggers/src/protocols/oscar/oscar.h
    branches/soc-2006-file-loggers/src/protocols/qq/Makefile.am
    branches/soc-2006-file-loggers/src/protocols/qq/Makefile.mingw
    branches/soc-2006-file-loggers/src/protocols/qq/buddy_info.c
    branches/soc-2006-file-loggers/src/protocols/qq/buddy_info.h
    branches/soc-2006-file-loggers/src/protocols/qq/buddy_list.c
    branches/soc-2006-file-loggers/src/protocols/qq/buddy_status.c
    branches/soc-2006-file-loggers/src/protocols/qq/buddy_status.h
    branches/soc-2006-file-loggers/src/protocols/qq/crypt.c
    branches/soc-2006-file-loggers/src/protocols/qq/group_opt.c
    branches/soc-2006-file-loggers/src/protocols/qq/qq.c
    branches/soc-2006-file-loggers/src/protocols/qq/qq.h
    branches/soc-2006-file-loggers/src/protocols/qq/qq_proxy.c
    branches/soc-2006-file-loggers/src/protocols/qq/qq_proxy.h
    branches/soc-2006-file-loggers/src/protocols/qq/utils.c
    branches/soc-2006-file-loggers/src/protocols/qq/utils.h
    branches/soc-2006-file-loggers/src/protocols/sametime/sametime.c
    branches/soc-2006-file-loggers/src/protocols/simple/simple.c
    branches/soc-2006-file-loggers/src/signals.c
    branches/soc-2006-file-loggers/src/signals.h
    branches/soc-2006-file-loggers/src/sslconn.c
    branches/soc-2006-file-loggers/src/value.h
    branches/soc-2006-file-loggers/src/win32/win32dep.c

Added Paths:
-----------
    branches/soc-2006-file-loggers/console/gntdebug.c
    branches/soc-2006-file-loggers/console/gntdebug.h
    branches/soc-2006-file-loggers/console/gntprefs.c
    branches/soc-2006-file-loggers/console/gntprefs.h
    branches/soc-2006-file-loggers/console/gntrequest.c
    branches/soc-2006-file-loggers/console/gntrequest.h
    branches/soc-2006-file-loggers/console/libgnt/gntcheckbox.c
    branches/soc-2006-file-loggers/console/libgnt/gntcheckbox.h
    branches/soc-2006-file-loggers/console/libgnt/gntrc.sample
    branches/soc-2006-file-loggers/console/libgnt/gntstyle.c
    branches/soc-2006-file-loggers/console/libgnt/gntstyle.h

Removed Paths:
-------------
    branches/soc-2006-file-loggers/src/protocols/qq/TODO
    branches/soc-2006-file-loggers/src/protocols/qq/group_admindlg.c
    branches/soc-2006-file-loggers/src/protocols/qq/group_admindlg.h
    branches/soc-2006-file-loggers/src/protocols/qq/infodlg.c
    branches/soc-2006-file-loggers/src/protocols/qq/infodlg.h
    branches/soc-2006-file-loggers/src/protocols/qq/show.c
    branches/soc-2006-file-loggers/src/protocols/qq/show.h
Modified: branches/soc-2006-file-loggers/COPYRIGHT
===================================================================
--- branches/soc-2006-file-loggers/COPYRIGHT	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/COPYRIGHT	2006-07-29 21:38:18 UTC (rev 16598)
@@ -195,6 +195,7 @@
 Richard Nelson
 Dennis Nezic
 Matthew A. Nicholson
+Henning Norén
 Szilard Novaki
 Novell
 Padraig O'Briain

Modified: branches/soc-2006-file-loggers/config.h.mingw
===================================================================
--- branches/soc-2006-file-loggers/config.h.mingw	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/config.h.mingw	2006-07-29 21:38:18 UTC (rev 16598)
@@ -641,3 +641,5 @@
  * Following are added for Win32 version of Gaim
  */
 #define HAVE_VSNPRINTF 1
+
+#define SIZEOF_TIME_T 4

Modified: branches/soc-2006-file-loggers/configure.ac
===================================================================
--- branches/soc-2006-file-loggers/configure.ac	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/configure.ac	2006-07-29 21:38:18 UTC (rev 16598)
@@ -60,6 +60,9 @@
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_STRUCT_TM
+AC_CHECK_SIZEOF(time_t, ,[
+#include <stdio.h>
+#include <time.h>])
 
 AC_C_BIGENDIAN
 

Modified: branches/soc-2006-file-loggers/console/Makefile
===================================================================
--- branches/soc-2006-file-loggers/console/Makefile	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/console/Makefile	2006-07-29 21:38:18 UTC (rev 16598)
@@ -8,7 +8,10 @@
 	gntblist.c \
 	gntconn.c \
 	gntconv.c \
+	gntdebug.c \
 	gntnotify.c \
+	gntprefs.c \
+	gntrequest.c \
 	gntui.c
 
 GG_HEADERS = \
@@ -16,7 +19,10 @@
 	gntblist.h \
 	gntconn.h \
 	gntconv.h \
+	gntdebug.h \
 	gntnotify.h \
+	gntprefs.h \
+	gntrequest.h \
 	gntui.h
 
 GG_OBJECTS = \
@@ -24,7 +30,10 @@
 	gntblist.o \
 	gntconn.o \
 	gntconv.o \
+	gntdebug.o \
 	gntnotify.o \
+	gntprefs.o \
+	gntrequest.o \
 	gntui.o
 
 all: gntgaim

Modified: branches/soc-2006-file-loggers/console/gntaccount.c
===================================================================
--- branches/soc-2006-file-loggers/console/gntaccount.c	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/console/gntaccount.c	2006-07-29 21:38:18 UTC (rev 16598)
@@ -1,6 +1,7 @@
 #include <gnt.h>
 #include <gntbox.h>
 #include <gntbutton.h>
+#include <gntcheckbox.h>
 #include <gntcombobox.h>
 #include <gntentry.h>
 #include <gntlabel.h>
@@ -17,6 +18,8 @@
 #include "gntaccount.h"
 #include "gntgaim.h"
 
+#include <string.h>
+
 typedef struct
 {
 	GntWidget *window;
@@ -38,17 +41,157 @@
 	
 	GntWidget *splits;
 	GList *split_entries;
+
+	GList *prpl_entries;
+	GntWidget *prpls;
+
+	GntWidget *newmail;
+	GntWidget *remember;
 } AccountEditDialog;
 
 static void
+account_add(GaimAccount *account)
+{
+	gnt_tree_add_choice(GNT_TREE(accounts.tree), account,
+			gnt_tree_create_row(GNT_TREE(accounts.tree),
+				gaim_account_get_username(account),
+				gaim_account_get_protocol_name(account)),
+			NULL, NULL);
+	gnt_tree_set_choice(GNT_TREE(accounts.tree), account,
+			gaim_account_get_enabled(account, GAIM_GNT_UI));
+}
+
+static void
 edit_dialog_destroy(AccountEditDialog *dialog)
 {
+	g_list_free(dialog->prpl_entries);
+	g_list_free(dialog->split_entries);
 	g_free(dialog);
 }
 
 static void
 save_account_cb(AccountEditDialog *dialog)
 {
+	GaimAccount *account;
+	GaimPlugin *plugin;
+	GaimPluginProtocolInfo *prplinfo;
+	const char *value;
+	GString *username;
+
+	/* XXX: Do some error checking first. */
+
+	plugin = gnt_combo_box_get_selected_data(GNT_COMBO_BOX(dialog->protocol));
+	prplinfo = GAIM_PLUGIN_PROTOCOL_INFO(plugin);
+
+	/* Screenname && user-splits */
+	value = gnt_entry_get_text(GNT_ENTRY(dialog->screenname));
+
+	if (value == NULL || *value == '\0')
+	{
+		gaim_notify_error(NULL, _("Error"), _("Account was not added"),
+				_("Screenname of an account must be non-empty."));
+		return;
+	}
+	
+	username = g_string_new(value);
+
+	if (prplinfo != NULL)
+	{
+		GList *iter, *entries;
+		for (iter = prplinfo->user_splits, entries = dialog->split_entries;
+				iter && entries; iter = iter->next, entries = entries->next)
+		{
+			GaimAccountUserSplit *split = iter->data;
+			GntWidget *entry = entries->data;
+
+			value = gnt_entry_get_text(GNT_ENTRY(entry));
+			if (value == NULL || *value == '\0')
+				value = gaim_account_user_split_get_default_value(split);
+			g_string_append_printf(username, "%c%s",
+					gaim_account_user_split_get_separator(split),
+					value);
+		}
+	}
+
+	if (dialog->account == NULL)
+	{
+		account = gaim_account_new(username->str, gaim_plugin_get_id(plugin));
+		gaim_accounts_add(account);
+	}
+	else
+	{
+		account = dialog->account;
+
+		/* Protocol */
+		gaim_account_set_protocol_id(account, gaim_plugin_get_id(plugin));
+		gaim_account_set_username(account, username->str);
+	}
+	g_string_free(username, TRUE);
+
+	/* Alias */
+	value = gnt_entry_get_text(GNT_ENTRY(dialog->alias));
+	if (value && *value)
+		gaim_account_set_alias(account, value);
+
+	/* Remember password and password */
+	gaim_account_set_remember_password(account,
+			gnt_check_box_get_checked(GNT_CHECK_BOX(dialog->remember)));
+	value = gnt_entry_get_text(GNT_ENTRY(dialog->password));
+	if (value && *value && gaim_account_get_remember_password(account))
+		gaim_account_set_password(account, value);
+	else
+		gaim_account_set_password(account, NULL);
+
+	/* Mail notification */
+	/* XXX: Only if the protocol has anything to do with emails */
+	gaim_account_set_check_mail(account,
+			gnt_check_box_get_checked(GNT_CHECK_BOX(dialog->newmail)));
+
+	/* Protocol options */
+	if (prplinfo)
+	{
+		GList *iter, *entries;
+		
+		for (iter = prplinfo->protocol_options, entries = dialog->prpl_entries;
+				iter && entries; iter = iter->next, entries = entries->next)
+		{
+			GaimAccountOption *option = iter->data;
+			GntWidget *entry = entries->data;
+			GaimPrefType type = gaim_account_option_get_type(option);
+			const char *setting = gaim_account_option_get_setting(option);
+
+			if (type == GAIM_PREF_STRING)
+			{
+				const char *value = gnt_entry_get_text(GNT_ENTRY(entry));
+				gaim_account_set_string(account, setting, value);
+			}
+			else if (type == GAIM_PREF_INT)
+			{
+				const char *str = gnt_entry_get_text(GNT_ENTRY(entry));
+				int value = 0;
+				if (str)
+					value = atoi(str);
+				gaim_account_set_int(account, setting, value);
+			}
+			else if (type == GAIM_PREF_BOOLEAN)
+			{
+				gboolean value = gnt_check_box_get_checked(GNT_CHECK_BOX(entry));
+				gaim_account_set_bool(account, setting, value);
+			}
+			else if (type == GAIM_PREF_STRING_LIST)
+			{
+				/* TODO: */
+			}
+			else
+			{
+				g_assert_not_reached();
+			}
+		}
+	}
+
+	/* XXX: Proxy options */
+
+	gnt_widget_destroy(dialog->window);
 }
 
 static void
@@ -57,7 +200,7 @@
 	GntWidget *hbox;
 	GaimPlugin *plugin;
 	GaimPluginProtocolInfo *prplinfo;
-	GList *iter;
+	GList *iter, *entries;
 	char *username = NULL;
 
 	if (dialog->splits)
@@ -99,20 +242,184 @@
 		g_free(buf);
 	}
 
-	/* XXX: Add default/custom values to the splits */
+	for (iter = g_list_last(prplinfo->user_splits), entries = g_list_last(dialog->split_entries);
+			iter && entries; iter = iter->prev, entries = entries->prev)
+	{
+		GntWidget *entry = entries->data;
+		GaimAccountUserSplit *split = iter->data;
+		const char *value = NULL;
+		char *s;
+
+		if (dialog->account)
+		{
+			s = strrchr(username, gaim_account_user_split_get_separator(split));
+			if (s != NULL)
+			{
+				*s = '\0';
+				s++;
+				value = s;
+			}
+		}
+		if (value == NULL)
+			value = gaim_account_user_split_get_default_value(split);
+
+		if (value != NULL)
+			gnt_entry_set_text(GNT_ENTRY(entry), value);
+	}
+
+	if (username != NULL)
+		gnt_entry_set_text(GNT_ENTRY(dialog->screenname), username);
+
 	g_free(username);
 }
 
 static void
+add_protocol_options(AccountEditDialog *dialog)
+{
+	GaimPlugin *plugin;
+	GaimPluginProtocolInfo *prplinfo;
+	GList *iter;
+	GntWidget *vbox, *box;
+	GaimAccount *account;
+
+	if (dialog->prpls)
+		gnt_box_remove_all(GNT_BOX(dialog->prpls));
+	else
+	{
+		dialog->prpls = vbox = gnt_vbox_new(FALSE);
+		gnt_box_set_pad(GNT_BOX(vbox), 0);
+		gnt_box_set_alignment(GNT_BOX(vbox), GNT_ALIGN_LEFT);
+		gnt_box_set_fill(GNT_BOX(vbox), TRUE);
+	}
+
+	if (dialog->prpl_entries)
+	{
+		g_list_free(dialog->prpl_entries);
+		dialog->prpl_entries = NULL;
+	}
+
+	vbox = dialog->prpls;
+
+	plugin = gnt_combo_box_get_selected_data(GNT_COMBO_BOX(dialog->protocol));
+	if (!plugin)
+		return;
+
+	prplinfo = GAIM_PLUGIN_PROTOCOL_INFO(plugin);
+
+	account = dialog->account;
+
+	for (iter = prplinfo->protocol_options; iter; iter = iter->next)
+	{
+		GaimAccountOption *option = iter->data;
+		GaimPrefType type = gaim_account_option_get_type(option);
+
+		box = gnt_hbox_new(TRUE);
+		gnt_box_set_pad(GNT_BOX(box), 0);
+		gnt_box_add_widget(GNT_BOX(vbox), box);
+
+		if (type == GAIM_PREF_BOOLEAN)
+		{
+			GntWidget *widget = gnt_check_box_new(gaim_account_option_get_text(option));
+			gnt_box_add_widget(GNT_BOX(box), widget);
+			dialog->prpl_entries = g_list_append(dialog->prpl_entries, widget);
+
+			if (account)
+				gnt_check_box_set_checked(GNT_CHECK_BOX(widget),
+						gaim_account_get_bool(account,
+							gaim_account_option_get_setting(option),
+							gaim_account_option_get_default_bool(option)));
+			else
+				gnt_check_box_set_checked(GNT_CHECK_BOX(widget),
+						gaim_account_option_get_default_bool(option));
+		}
+		else
+		{
+			gnt_box_add_widget(GNT_BOX(box),
+					gnt_label_new(gaim_account_option_get_text(option)));
+
+			if (type == GAIM_PREF_STRING_LIST)
+			{
+				/* TODO: Use a combobox */
+				/*       Don't forget to append the widget to prpl_entries */
+			}
+			else
+			{
+				GntWidget *entry = gnt_entry_new(NULL);
+				gnt_box_add_widget(GNT_BOX(box), entry);
+				dialog->prpl_entries = g_list_append(dialog->prpl_entries, entry);
+
+				if (type == GAIM_PREF_STRING)
+				{
+					const char *dv = gaim_account_option_get_default_string(option);
+
+					if (account)
+						gnt_entry_set_text(GNT_ENTRY(entry),
+								gaim_account_get_string(account,
+									gaim_account_option_get_setting(option), dv));
+					else
+						gnt_entry_set_text(GNT_ENTRY(entry), dv);
+				}
+				else if (type == GAIM_PREF_INT)
+				{
+					char str[32];
+					int value = gaim_account_option_get_default_int(option);
+					if (account)
+						value = gaim_account_get_int(account,
+								gaim_account_option_get_setting(option), value);
+					snprintf(str, sizeof(str), "%d", value);
+					gnt_entry_set_flag(GNT_ENTRY(entry), GNT_ENTRY_FLAG_INT);
+					gnt_entry_set_text(GNT_ENTRY(entry), str);
+				}
+				else
+				{
+					g_assert_not_reached();
+				}
+			}
+		}
+	}
+}
+
+static void
+update_user_options(AccountEditDialog *dialog)
+{
+	GaimPlugin *plugin;
+	GaimPluginProtocolInfo *prplinfo;
+
+	plugin = gnt_combo_box_get_selected_data(GNT_COMBO_BOX(dialog->protocol));
+	if (!plugin)
+		return;
+
+	prplinfo = GAIM_PLUGIN_PROTOCOL_INFO(plugin);
+
+	if (dialog->newmail == NULL)
+		dialog->newmail = gnt_check_box_new(_("New mail notifications"));
+	if (dialog->account)
+		gnt_check_box_set_checked(GNT_CHECK_BOX(dialog->newmail),
+				gaim_account_get_check_mail(dialog->account));
+	if (!prplinfo || !(prplinfo->options & OPT_PROTO_MAIL_CHECK))
+		gnt_widget_set_visible(dialog->newmail, FALSE);
+	else
+		gnt_widget_set_visible(dialog->newmail, TRUE);
+
+	if (dialog->remember == NULL)
+		dialog->remember = gnt_check_box_new(_("Remember password"));
+	if (dialog->account)
+		gnt_check_box_set_checked(GNT_CHECK_BOX(dialog->remember),
+				gaim_account_get_remember_password(dialog->account));
+}
+
+static void
 prpl_changed_cb(GntWidget *combo, GaimPlugin *old, GaimPlugin *new, AccountEditDialog *dialog)
 {
 	update_user_splits(dialog);
+	add_protocol_options(dialog);
+	update_user_options(dialog);  /* This may not be necessary here */
 	gnt_box_readjust(GNT_BOX(dialog->window));
 	gnt_widget_draw(dialog->window);
 }
 
 static void
-add_account(GntWidget *b, gpointer null)
+edit_account(GaimAccount *account)
 {
 	GntWidget *window, *hbox;
 	GntWidget *combo, *button, *entry;
@@ -122,8 +429,9 @@
 	dialog = g_new0(AccountEditDialog, 1);
 
 	dialog->window = window = gnt_box_new(FALSE, TRUE);
+	dialog->account = account;
 	gnt_box_set_toplevel(GNT_BOX(window), TRUE);
-	gnt_box_set_title(GNT_BOX(window), _("New Account"));
+	gnt_box_set_title(GNT_BOX(window), account ? _("Modify Account") : _("New Account"));
 	gnt_box_set_alignment(GNT_BOX(window), GNT_ALIGN_MID);
 	gnt_box_set_pad(GNT_BOX(window), 0);
 
@@ -138,6 +446,12 @@
 		gnt_combo_box_add_data(GNT_COMBO_BOX(combo), iter->data,
 				((GaimPlugin*)iter->data)->info->name);
 	}
+	if (account)
+		gnt_combo_box_set_selected(GNT_COMBO_BOX(combo),
+				gaim_plugins_find_with_id(gaim_account_get_protocol_id(account)));
+	else
+		gnt_combo_box_set_selected(GNT_COMBO_BOX(combo), list->data);
+
 	g_signal_connect(G_OBJECT(combo), "selection-changed", G_CALLBACK(prpl_changed_cb), dialog);
 	gnt_box_add_widget(GNT_BOX(hbox), gnt_label_new(_("Protocol:")));
 	gnt_box_add_widget(GNT_BOX(hbox), combo);
@@ -157,8 +471,11 @@
 	gnt_box_add_widget(GNT_BOX(window), hbox);
 
 	dialog->password = entry = gnt_entry_new(NULL);
+	gnt_entry_set_masked(GNT_ENTRY(entry), TRUE);
 	gnt_box_add_widget(GNT_BOX(hbox), gnt_label_new(_("Password:")));
 	gnt_box_add_widget(GNT_BOX(hbox), entry);
+	if (account)
+		gnt_entry_set_text(GNT_ENTRY(entry), gaim_account_get_password(account));
 
 	hbox = gnt_box_new(TRUE, FALSE);
 	gnt_box_add_widget(GNT_BOX(window), hbox);
@@ -166,9 +483,23 @@
 	dialog->alias = entry = gnt_entry_new(NULL);
 	gnt_box_add_widget(GNT_BOX(hbox), gnt_label_new(_("Alias:")));
 	gnt_box_add_widget(GNT_BOX(hbox), entry);
+	if (account)
+		gnt_entry_set_text(GNT_ENTRY(entry), gaim_account_get_alias(account));
 
+	/* User options */
+	update_user_options(dialog);
+	gnt_box_add_widget(GNT_BOX(window), dialog->remember);
+	gnt_box_add_widget(GNT_BOX(window), dialog->newmail);
+
 	gnt_box_add_widget(GNT_BOX(window), gnt_line_new(FALSE));
-	
+
+	/* The advanced box */
+	add_protocol_options(dialog);
+	gnt_box_add_widget(GNT_BOX(window), dialog->prpls);
+
+	/* TODO: Add proxy options */
+
+	/* The button box */
 	hbox = gnt_box_new(FALSE, FALSE);
 	gnt_box_add_widget(GNT_BOX(window), hbox);
 
@@ -183,9 +514,33 @@
 	g_signal_connect_swapped(G_OBJECT(window), "destroy", G_CALLBACK(edit_dialog_destroy), dialog);
 
 	gnt_widget_show(window);
+	gnt_box_readjust(GNT_BOX(window));
+	gnt_widget_draw(window);
 }
 
 static void
+add_account_cb(GntWidget *widget, gpointer null)
+{
+	edit_account(NULL);
+}
+
+static void
+modify_account_cb(GntWidget *widget, GntTree *tree)
+{
+	GaimAccount *account = gnt_tree_get_selection_data(tree);
+	if (!account)
+		return;
+	edit_account(account);
+}
+
+static void
+delete_account_cb(GntWidget *widget, GntTree *tree)
+{
+	/* XXX: After the request-api is complete */
+	/* Note: remove the modify-dialog for the account */
+}
+
+static void
 account_toggled(GntWidget *widget, void *key, gpointer null)
 {
 	GaimAccount *account = key;
@@ -193,7 +548,7 @@
 	gaim_account_set_enabled(account, GAIM_GNT_UI, gnt_tree_get_choice(GNT_TREE(widget), key));
 }
 
-void gg_accounts_init()
+void gg_accounts_show_all()
 {
 	GList *iter;
 	GntWidget *box, *button;
@@ -216,14 +571,7 @@
 	for (iter = gaim_accounts_get_all(); iter; iter = iter->next)
 	{
 		GaimAccount *account = iter->data;
-
-		gnt_tree_add_choice(GNT_TREE(accounts.tree), account,
-				gnt_tree_create_row(GNT_TREE(accounts.tree),
-					gaim_account_get_username(account),
-					gaim_account_get_protocol_name(account)),
-				NULL, NULL);
-		gnt_tree_set_choice(GNT_TREE(accounts.tree), account,
-				gaim_account_get_enabled(account, GAIM_GNT_UI));
+		account_add(account);
 	}
 
 	g_signal_connect(G_OBJECT(accounts.tree), "toggled", G_CALLBACK(account_toggled), NULL);
@@ -238,27 +586,65 @@
 
 	button = gnt_button_new(_("Add"));
 	gnt_box_add_widget(GNT_BOX(box), button);
-	g_signal_connect(G_OBJECT(button), "activate", G_CALLBACK(add_account), NULL);
+	g_signal_connect(G_OBJECT(button), "activate", G_CALLBACK(add_account_cb), NULL);
 
 	button = gnt_button_new(_("Modify"));
 	gnt_box_add_widget(GNT_BOX(box), button);
+	g_signal_connect(G_OBJECT(button), "activate", G_CALLBACK(modify_account_cb), accounts.tree);
 
 	button = gnt_button_new(_("Delete"));
 	gnt_box_add_widget(GNT_BOX(box), button);
+	g_signal_connect(G_OBJECT(button), "activate", G_CALLBACK(delete_account_cb), accounts.tree);
 	
 	gnt_box_add_widget(GNT_BOX(accounts.window), box);
 	
 	gnt_widget_show(accounts.window);
 }
 
+static gpointer
+gg_accounts_get_handle()
+{
+	static int handle;
+
+	return &handle;
+}
+
+static void
+account_added_callback(GaimAccount *account)
+{
+	if (accounts.window == NULL)
+		return;
+	account_add(account);
+	gnt_widget_draw(accounts.tree);
+}
+
+static void
+account_removed_callback(GaimAccount *account)
+{
+	if (accounts.window == NULL)
+		return;
+
+	gnt_tree_remove(GNT_TREE(accounts.tree), account);
+}
+
+void gg_accounts_init()
+{
+	gaim_signal_connect(gaim_accounts_get_handle(), "account-added",
+			gg_accounts_get_handle(), GAIM_CALLBACK(account_added_callback),
+			NULL);
+	gaim_signal_connect(gaim_accounts_get_handle(), "account-removed",
+			gg_accounts_get_handle(), GAIM_CALLBACK(account_removed_callback),
+			NULL);
+	
+	gg_accounts_show_all();
+}
+
 void gg_accounts_uninit()
 {
 	gnt_widget_destroy(accounts.window);
 }
 
-#if 0
 /* The following uiops stuff are copied from gtkaccount.c */
-/* Need to do some work on notify- and request-ui before this works */
 typedef struct
 {
 	GaimAccount *account;
@@ -305,6 +691,31 @@
 }
 
 static void
+free_add_user_data(AddUserData *data)
+{
+	g_free(data->username);
+
+	if (data->alias != NULL)
+		g_free(data->alias);
+
+	g_free(data);
+}
+
+static void
+add_user_cb(AddUserData *data)
+{
+	GaimConnection *gc = gaim_account_get_connection(data->account);
+
+	if (g_list_find(gaim_connections_get_all(), gc))
+	{
+		gaim_blist_request_add_buddy(data->account, data->username,
+									 NULL, data->alias);
+	}
+
+	free_add_user_data(data);
+}
+
+static void
 request_add(GaimAccount *account, const char *remote_user,
 		  const char *id, const char *alias,
 		  const char *msg)
@@ -321,12 +732,10 @@
 	data->alias    = (alias != NULL ? g_strdup(alias) : NULL);
 
 	buffer = make_info(account, gc, remote_user, id, alias, msg);
-#if 0
 	gaim_request_action(NULL, NULL, _("Add buddy to your list?"),
 	                    buffer, GAIM_DEFAULT_ACTION_NONE, data, 2,
 	                    _("Add"),    G_CALLBACK(add_user_cb),
 	                    _("Cancel"), G_CALLBACK(free_add_user_data));
-#endif
 	g_free(buffer);
 }
 
@@ -336,17 +745,7 @@
 	.status_changed = NULL,
 	.request_add  = request_add
 };
-#else
 
-static GaimAccountUiOps ui_ops = 
-{
-	.notify_added = NULL,
-	.status_changed = NULL,
-	.request_add  = NULL
-};
-
-#endif
-
 GaimAccountUiOps *gg_accounts_get_ui_ops()
 {
 	return &ui_ops;

Modified: branches/soc-2006-file-loggers/console/gntaccount.h
===================================================================
--- branches/soc-2006-file-loggers/console/gntaccount.h	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/console/gntaccount.h	2006-07-29 21:38:18 UTC (rev 16598)
@@ -5,3 +5,6 @@
 void gg_accounts_init();
 
 void gg_accounts_uninit();
+
+void gg_accounts_show_all();
+

Modified: branches/soc-2006-file-loggers/console/gntconv.c
===================================================================
--- branches/soc-2006-file-loggers/console/gntconv.c	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/console/gntconv.c	2006-07-29 21:38:18 UTC (rev 16598)
@@ -159,9 +159,10 @@
 	g_hash_table_insert(ggconvs, conv, ggc);
 
 	ggc->conv = conv;
+	conv->ui_data = ggc;
 
 	type = gaim_conversation_get_type(conv);
-	title = g_strdup_printf(_("%s"), gaim_conversation_get_name(conv));
+	title = g_strdup_printf(_("%s"), gaim_conversation_get_title(conv));
 	ggc->window = gnt_box_new(FALSE, TRUE);
 	gnt_box_set_title(GNT_BOX(ggc->window), title);
 	gnt_box_set_toplevel(GNT_BOX(ggc->window), TRUE);
@@ -199,7 +200,7 @@
 gg_write_common(GaimConversation *conv, const char *who, const char *message,
 		GaimMessageFlags flags, time_t mtime)
 {
-	GGConv *ggconv = g_hash_table_lookup(ggconvs, conv);
+	GGConv *ggconv = g_hash_table_lookup(ggconvs, conv); /* XXX: ggconv = conv->ui_data; should do */
 	char *strip;
 	GntTextFormatFlags fl = 0;
 
@@ -243,9 +244,9 @@
 gg_write_im(GaimConversation *conv, const char *who, const char *message,
 		GaimMessageFlags flags, time_t mtime)
 {
+	GaimAccount *account = gaim_conversation_get_account(conv);
 	if (flags & GAIM_MESSAGE_SEND)
 	{
-		GaimAccount *account = gaim_conversation_get_account(conv);
 		who = gaim_connection_get_display_name(gaim_account_get_connection(account));
 		if (!who)
 			who = gaim_account_get_alias(account);
@@ -253,7 +254,13 @@
 			who = gaim_account_get_username(account);
 	}
 	else if (flags & GAIM_MESSAGE_RECV)
+	{
+		GaimBuddy *buddy;
 		who = gaim_conversation_get_name(conv);
+		buddy = gaim_find_buddy(account, who);
+		if (buddy)
+			who = gaim_buddy_get_contact_alias(buddy);
+	}
 
 	gg_write_common(conv, who, message, flags, mtime);
 }

Copied: branches/soc-2006-file-loggers/console/gntdebug.c (from rev 16597, trunk/console/gntdebug.c)
===================================================================
--- branches/soc-2006-file-loggers/console/gntdebug.c	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/gntdebug.c	2006-07-29 21:38:18 UTC (rev 16598)
@@ -0,0 +1,114 @@
+#include <gnt.h>
+#include <gntbox.h>
+#include <gnttextview.h>
+
+#include "gntdebug.h"
+#include "gntgaim.h"
+
+#include <stdio.h>
+#include <string.h>
+
+static struct
+{
+	GntWidget *window;
+	GntWidget *tview;
+} debug;
+
+static gboolean
+debug_window_kpress_cb(GntWidget *wid, const char *key, GntTextView *view)
+{
+	if (key[0] == 27)
+	{
+		/* XXX: This doesn't seem to always work */
+		if (strcmp(key+1, GNT_KEY_DOWN) == 0)
+			gnt_text_view_scroll(view, 1);
+		else if (strcmp(key+1, GNT_KEY_UP) == 0)
+			gnt_text_view_scroll(view, -1);
+		else if (strcmp(key+1, GNT_KEY_PGDOWN) == 0)
+			gnt_text_view_scroll(view, wid->priv.height - 2);
+		else if (strcmp(key+1, GNT_KEY_PGUP) == 0)
+			gnt_text_view_scroll(view, -(wid->priv.height - 2));
+		else
+			return FALSE;
+		return TRUE;
+	}
+	return FALSE;
+}
+
+static void
+gg_debug_print(GaimDebugLevel level, const char *category,
+		const char *args)
+{
+	if (debug.window == NULL)
+		fprintf(stderr, "%s: %s\n", category, args);
+	else
+	{
+		GntTextFormatFlags flag = GNT_TEXT_FLAG_NORMAL;
+
+		gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(debug.tview),
+				category, GNT_TEXT_FLAG_BOLD);
+		gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(debug.tview),
+				": ", GNT_TEXT_FLAG_BOLD);
+		
+		switch (level)
+		{
+			case GAIM_DEBUG_WARNING:
+				flag |= GNT_TEXT_FLAG_UNDERLINE;
+			case GAIM_DEBUG_ERROR:
+			case GAIM_DEBUG_FATAL:
+				flag |= GNT_TEXT_FLAG_BOLD;
+				break;
+			default:
+				break;
+		}
+		
+		gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(debug.tview), args, flag);
+		gnt_text_view_next_line(GNT_TEXT_VIEW(debug.tview));
+		gnt_text_view_scroll(GNT_TEXT_VIEW(debug.tview), 0);
+
+		g_signal_connect(G_OBJECT(debug.window), "key_pressed", G_CALLBACK(debug_window_kpress_cb), debug.tview);
+	}
+}
+
+static GaimDebugUiOps uiops = 
+{
+	gg_debug_print,
+};
+
+GaimDebugUiOps *gg_debug_get_ui_ops()
+{
+	return &uiops;
+}
+
+static void
+reset_debug_win(GntWidget *w, gpointer null)
+{
+	debug.window = debug.tview = NULL;
+}
+
+void gg_debug_window_show()
+{
+	if (debug.window == NULL)
+	{
+		debug.window = gnt_vbox_new(FALSE);
+		gnt_box_set_toplevel(GNT_BOX(debug.window), TRUE);
+		gnt_box_set_title(GNT_BOX(debug.window), _("Debug Window"));
+
+		debug.tview = gnt_text_view_new();
+		gnt_box_add_widget(GNT_BOX(debug.window), debug.tview);
+
+		g_signal_connect(G_OBJECT(debug.window), "destroy", G_CALLBACK(reset_debug_win), NULL);
+	}
+
+	gnt_widget_show(debug.window);
+}
+
+void gg_debug_init()
+{
+	gg_debug_window_show();
+}
+
+void gg_debug_uninit()
+{
+}
+

Copied: branches/soc-2006-file-loggers/console/gntdebug.h (from rev 16597, trunk/console/gntdebug.h)
===================================================================
--- branches/soc-2006-file-loggers/console/gntdebug.h	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/gntdebug.h	2006-07-29 21:38:18 UTC (rev 16598)
@@ -0,0 +1,8 @@
+#include "debug.h"
+
+GaimDebugUiOps *gg_debug_get_ui_ops();
+
+void gg_debug_init();
+
+void gg_debug_uninit();
+

Modified: branches/soc-2006-file-loggers/console/gntgaim.c
===================================================================
--- branches/soc-2006-file-loggers/console/gntgaim.c	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/console/gntgaim.c	2006-07-29 21:38:18 UTC (rev 16598)
@@ -15,18 +15,25 @@
 #include "util.h"
 #include "whiteboard.h"
 
+#include "gntdebug.h"
 #include "gntgaim.h"
+#include "gntprefs.h"
 #include "gntui.h"
 
 #define _GNU_SOURCE
 #include <getopt.h>
 
-/* Anything IO-related is directly copied from gtkgaim's source tree */
+static void
+debug_init()
+{
+	gg_debug_init();
+	gaim_debug_set_ui_ops(gg_debug_get_ui_ops());
+}
 
 static GaimCoreUiOps core_ops =
 {
-	NULL, /*gaim_gtk_prefs_init,*/
-	NULL, /*debug_init,*/
+	gg_prefs_init,
+	debug_init,
 	NULL, /*gaim_gtk_ui_init,*/
 	NULL, /*gaim_gtk_quit*/
 };
@@ -37,6 +44,8 @@
 	return &core_ops;
 }
 
+/* Anything IO-related is directly copied from gtkgaim's source tree */
+
 #define GAIM_GTK_READ_COND  (G_IO_IN | G_IO_HUP | G_IO_ERR)
 #define GAIM_GTK_WRITE_COND (G_IO_OUT | G_IO_HUP | G_IO_ERR | G_IO_NVAL)
 
@@ -237,7 +246,11 @@
 	gaim_plugins_add_search_path(path);
 	g_free(path);
 
-	gaim_plugins_add_search_path("/usr/local/lib/gaim");	/* XXX: */
+#ifdef LIBDIR
+	gaim_plugins_add_search_path(LIBDIR);
+#else
+	gaim_plugins_add_search_path("/usr/local/lib/gaim");	/* XXX: Remove this after the restructure */
+#endif
 
 	if (!gaim_core_init(GAIM_GNT_UI))
 	{
@@ -293,6 +306,8 @@
 	/* XXX: Don't puke */
 	freopen(".error", "w", stderr);
 
+	gnt_init();
+
 	/* Initialize the libgaim stuff */
 	if (!init_libgaim(argc, argv))
 		return 0;

Modified: branches/soc-2006-file-loggers/console/gntnotify.c
===================================================================
--- branches/soc-2006-file-loggers/console/gntnotify.c	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/console/gntnotify.c	2006-07-29 21:38:18 UTC (rev 16598)
@@ -15,6 +15,12 @@
 	GntWidget *tree;
 } emaildialog;
 
+static void
+notify_msg_window_destroy_cb(GntWidget *window, GaimNotifyMsgType type)
+{
+	gaim_notify_close(type, window);
+}
+
 static void *
 gg_notify_message(GaimNotifyMsgType type, const char *title,
 		const char *primary, const char *secondary)
@@ -48,7 +54,10 @@
 
 	button = gnt_button_new(_("OK"));
 	gnt_box_add_widget(GNT_BOX(window), button);
-	g_signal_connect_swapped(G_OBJECT(button), "activate", G_CALLBACK(gnt_widget_destroy), window);
+	g_signal_connect_swapped(G_OBJECT(button), "activate",
+			G_CALLBACK(gnt_widget_destroy), window);
+	g_signal_connect(G_OBJECT(window), "destroy",
+			G_CALLBACK(notify_msg_window_destroy_cb), GINT_TO_POINTER(type));
 
 	gnt_widget_show(window);
 	return window;
@@ -57,7 +66,22 @@
 /* handle is, in all/most occasions, a GntWidget * */
 static void gg_close_notify(GaimNotifyType type, void *handle)
 {
-	gnt_widget_destroy(GNT_WIDGET(handle));
+	GntWidget *widget = handle;
+
+	if (!widget)
+		return;
+
+	while (widget->parent)
+		widget = widget->parent;
+	
+	if (type == GAIM_NOTIFY_SEARCHRESULTS)
+		gaim_notify_searchresults_free(g_object_get_data(handle, "notify-results"));
+#if 0
+	/* This does not seem to be necessary */
+	g_signal_handlers_disconnect_by_func(G_OBJECT(widget),
+			G_CALLBACK(notify_msg_window_destroy_cb), GINT_TO_POINTER(type));
+#endif
+	gnt_widget_destroy(widget);
 }
 
 static void *gg_notify_formatted(const char *title, const char *primary,
@@ -71,7 +95,7 @@
 			secondary ? "\n" : "",
 			unformat ? unformat : "");
 
-	void *ret = gg_notify_message(GAIM_NOTIFY_MSG_INFO, title, primary, t);
+	void *ret = gg_notify_message(GAIM_NOTIFY_FORMATTED, title, primary, t);
 
 	g_free(t);
 	g_free(unformat);
@@ -151,7 +175,7 @@
 		return NULL;
 	}
 
-	ret = gg_notify_message(GAIM_NOTIFY_MSG_INFO, _("New Mail"), _("You have mail!"), message->str);
+	ret = gg_notify_message(GAIM_NOTIFY_EMAIL, _("New Mail"), _("You have mail!"), message->str);
 	g_string_free(message, TRUE);
 	return ret;
 }
@@ -180,6 +204,112 @@
 	return ui_handle;
 }
 
+static void
+notify_button_activated(GntWidget *widget, GaimNotifySearchButton *b)
+{
+	GList *list = NULL;
+	GaimAccount *account = g_object_get_data(G_OBJECT(widget), "notify-account");
+	gpointer data = g_object_get_data(G_OBJECT(widget), "notify-data");
+
+	list = gnt_tree_get_selection_text_list(GNT_TREE(widget));
+
+	b->callback(gaim_account_get_connection(account), list, data);
+	g_list_foreach(list, (GFunc)g_free, NULL);
+	g_list_free(list);
+}
+
+static void
+gg_notify_sr_new_rows(GaimConnection *gc,
+		GaimNotifySearchResults *results, void *data)
+{
+	GntTree *tree = GNT_TREE(data);
+	GList *o;
+
+	/* XXX: Do I need to empty the tree here? */
+
+	for (o = results->rows; o; o = o->next)
+	{
+		gnt_tree_add_row_after(GNT_TREE(tree), o->data,
+				gnt_tree_create_row_from_list(GNT_TREE(tree), o->data),
+				NULL, NULL);
+	}
+}
+
+static void *
+gg_notify_searchresults(GaimConnection *gc, const char *title,
+		const char *primary, const char *secondary,
+		GaimNotifySearchResults *results, gpointer data)
+{
+	GntWidget *window, *tree, *box, *button;
+	GList *iter;
+
+	window = gnt_vbox_new(FALSE);
+	gnt_box_set_toplevel(GNT_BOX(window), TRUE);
+	gnt_box_set_title(GNT_BOX(window), title);
+	gnt_box_set_fill(GNT_BOX(window), FALSE);
+	gnt_box_set_pad(GNT_BOX(window), 0);
+	gnt_box_set_alignment(GNT_BOX(window), GNT_ALIGN_MID);
+
+	gnt_box_add_widget(GNT_BOX(window),
+			gnt_label_new_with_format(primary, GNT_TEXT_FLAG_BOLD));
+	gnt_box_add_widget(GNT_BOX(window),
+			gnt_label_new_with_format(secondary, GNT_TEXT_FLAG_NORMAL));
+
+	tree = gnt_tree_new_with_columns(g_list_length(results->columns));
+	gnt_tree_set_show_title(GNT_TREE(tree), TRUE);
+	gnt_box_add_widget(GNT_BOX(window), tree);
+
+	box = gnt_hbox_new(TRUE);
+
+	for (iter = results->buttons; iter; iter = iter->next)
+	{
+		GaimNotifySearchButton *b = iter->data;
+		const char *text;
+
+		switch (b->type)
+		{
+			case GAIM_NOTIFY_BUTTON_LABELED:
+				text = b->label;
+				break;
+			case GAIM_NOTIFY_BUTTON_CONTINUE:
+				text = _("Continue");
+				break;
+			case GAIM_NOTIFY_BUTTON_ADD:
+				text = _("Add");
+				break;
+			case GAIM_NOTIFY_BUTTON_INFO:
+				text = _("Info");
+				break;
+			case GAIM_NOTIFY_BUTTON_IM:
+				text = _("IM");
+				break;
+			case GAIM_NOTIFY_BUTTON_JOIN:
+				text = _("Join");
+				break;
+			case GAIM_NOTIFY_BUTTON_INVITE:
+				text = _("Invite");
+				break;
+		}
+
+		button = gnt_button_new(text);
+		g_object_set_data(G_OBJECT(button), "notify-account", gaim_connection_get_account(gc));
+		g_object_set_data(G_OBJECT(button), "notify-data", data);
+		g_signal_connect_swapped(G_OBJECT(button), "activate",
+				G_CALLBACK(notify_button_activated), b);
+
+		gnt_box_add_widget(GNT_BOX(box), button);
+	}
+
+	gnt_box_add_widget(GNT_BOX(window), box);
+
+	gg_notify_sr_new_rows(gc, results, tree);
+
+	gnt_widget_show(window);
+	g_object_set_data(G_OBJECT(window), "notify-results", results);
+
+	return tree;
+}
+
 static GaimNotifyUiOps ops = 
 {
 	.notify_message = gg_notify_message,
@@ -190,8 +320,8 @@
 	.notify_emails = gg_notify_emails,
 	.notify_userinfo = gg_notify_userinfo,
 
-	.notify_searchresults = NULL,          /* We are going to need multi-column GntTree's for this */
-	.notify_searchresults_new_rows = NULL,
+	.notify_searchresults = gg_notify_searchresults,
+	.notify_searchresults_new_rows = gg_notify_sr_new_rows,
 	.notify_uri = NULL                     /* This is of low-priority to me */
 };
 

Copied: branches/soc-2006-file-loggers/console/gntprefs.c (from rev 16597, trunk/console/gntprefs.c)
===================================================================
--- branches/soc-2006-file-loggers/console/gntprefs.c	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/gntprefs.c	2006-07-29 21:38:18 UTC (rev 16598)
@@ -0,0 +1,14 @@
+#include <prefs.h>
+
+#include "gntprefs.h"
+#include "gntgaim.h"
+
+void gg_prefs_init()
+{
+	gaim_prefs_add_none("/gaim");
+	gaim_prefs_add_none("/gaim/gnt");
+
+	gaim_prefs_add_none("/gaim/gnt/plugins");
+	gaim_prefs_add_string_list("/gaim/gnt/plugins/loaded", NULL);
+}
+

Copied: branches/soc-2006-file-loggers/console/gntprefs.h (from rev 16597, trunk/console/gntprefs.h)
===================================================================
--- branches/soc-2006-file-loggers/console/gntprefs.h	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/gntprefs.h	2006-07-29 21:38:18 UTC (rev 16598)
@@ -0,0 +1,2 @@
+void gg_prefs_init();
+

Copied: branches/soc-2006-file-loggers/console/gntrequest.c (from rev 16597, trunk/console/gntrequest.c)
===================================================================
--- branches/soc-2006-file-loggers/console/gntrequest.c	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/gntrequest.c	2006-07-29 21:38:18 UTC (rev 16598)
@@ -0,0 +1,218 @@
+#include <gnt.h>
+#include <gntbox.h>
+#include <gntbutton.h>
+#include <gntcombobox.h>
+#include <gntentry.h>
+#include <gntlabel.h>
+
+#include "gntrequest.h"
+
+static GntWidget *
+setup_request_window(const char *title, const char *primary,
+		const char *secondary)
+{
+	GntWidget *window;
+
+	window = gnt_vbox_new(FALSE);
+	gnt_box_set_toplevel(GNT_BOX(window), TRUE);
+	gnt_box_set_title(GNT_BOX(window), title);
+	gnt_box_set_alignment(GNT_BOX(window), GNT_ALIGN_MID);
+
+	if (primary)
+		gnt_box_add_widget(GNT_BOX(window),
+				gnt_label_new_with_format(primary, GNT_TEXT_FLAG_BOLD));
+	if (secondary)
+		gnt_box_add_widget(GNT_BOX(window), gnt_label_new(secondary));
+
+	return window;
+}
+
+static GntWidget *
+setup_button_box(gpointer userdata, gpointer cb, gpointer data, ...)
+{
+	GntWidget *box, *button;
+	va_list list;
+	const char *text;
+	gpointer callback;
+
+	box = gnt_hbox_new(TRUE);
+
+	va_start(list, data);
+
+	while ((text = va_arg(list, const char *)))
+	{
+		callback = va_arg(list, gpointer);
+		button = gnt_button_new(text);
+		gnt_box_add_widget(GNT_BOX(box), button);
+		g_object_set_data(G_OBJECT(button), "activate-callback", callback);
+		g_object_set_data(G_OBJECT(button), "activate-userdata", userdata);
+		g_signal_connect(G_OBJECT(button), "activate", G_CALLBACK(cb), data);
+	}
+
+	va_end(list);
+	return box;
+}
+
+static void
+notify_input_cb(GntWidget *button, GntWidget *entry)
+{
+	GaimRequestInputCb callback = g_object_get_data(G_OBJECT(button), "activate-callback");
+	gpointer data = g_object_get_data(G_OBJECT(button), "activate-userdata");
+	const char *text = gnt_entry_get_text(GNT_ENTRY(entry));
+
+	if (callback)
+		callback(data, text);
+
+	while (button->parent)
+		button = button->parent;
+
+	gaim_request_close(GAIM_REQUEST_INPUT, button);
+}
+
+static void *
+gg_request_input(const char *title, const char *primary,
+		const char *secondary, const char *default_value,
+		gboolean multiline, gboolean masked, gchar *hint,
+		const char *ok_text, GCallback ok_cb,
+		const char *cancel_text, GCallback cancel_cb,
+		void *user_data)
+{
+	GntWidget *window, *box, *entry;
+
+	window = setup_request_window(title, primary, secondary);
+
+	entry = gnt_entry_new(default_value);
+	if (masked)
+		gnt_entry_set_masked(GNT_ENTRY(entry), TRUE);
+	gnt_box_add_widget(GNT_BOX(window), entry);
+
+	box = setup_button_box(user_data, notify_input_cb, entry,
+			ok_text, ok_cb, cancel_text, cancel_cb, NULL);
+	gnt_box_add_widget(GNT_BOX(window), box);
+
+	gnt_widget_show(window);
+
+	return window;
+}
+
+static void
+gg_close_request(GaimRequestType type, gpointer ui_handle)
+{
+	GntWidget *widget = GNT_WIDGET(ui_handle);
+	while (widget->parent)
+		widget = widget->parent;
+	gnt_widget_destroy(widget);
+}
+
+static void
+request_choice_cb(GntWidget *button, GntComboBox *combo)
+{
+	GaimRequestChoiceCb callback = g_object_get_data(G_OBJECT(button), "activate-callback");
+	gpointer data = g_object_get_data(G_OBJECT(button), "activate-userdata");
+	int choice = GPOINTER_TO_INT(gnt_combo_box_get_selected_data(GNT_COMBO_BOX(combo))) - 1;
+
+	if (callback)
+		callback(data, choice);
+
+	while (button->parent)
+		button = button->parent;
+
+	gaim_request_close(GAIM_REQUEST_INPUT, button);
+}
+
+static void *
+gg_request_choice(const char *title, const char *primary,
+		const char *secondary, unsigned int default_value,
+		const char *ok_text, GCallback ok_cb,
+		const char *cancel_text, GCallback cancel_cb,
+		void *user_data, va_list choices)
+{
+	GntWidget *window, *combo, *box;
+	const char *text;
+	int val;
+
+	window = setup_request_window(title, primary, secondary);
+
+	combo = gnt_combo_box_new();
+	gnt_box_add_widget(GNT_BOX(window), combo);
+	while ((text = va_arg(choices, const char *)))
+	{
+		val = va_arg(choices, int);
+		gnt_combo_box_add_data(GNT_COMBO_BOX(combo), GINT_TO_POINTER(val + 1), text);
+	}
+	gnt_combo_box_set_selected(GNT_COMBO_BOX(combo), GINT_TO_POINTER(default_value + 1));
+
+	box = setup_button_box(user_data, request_choice_cb, combo,
+			ok_text, ok_cb, cancel_text, cancel_cb, NULL);
+	gnt_box_add_widget(GNT_BOX(window), box);
+
+	gnt_widget_show(window);
+	
+	return window;
+}
+
+static void
+request_action_cb(GntWidget *button, GntWidget *window)
+{
+	GaimRequestActionCb callback = g_object_get_data(G_OBJECT(button), "activate-callback");
+	gpointer data = g_object_get_data(G_OBJECT(button), "activate-userdata");
+	int id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(button), "activate-id"));
+
+	callback(data, id);
+
+	gaim_request_close(GAIM_REQUEST_ACTION, window);
+}
+
+static void*
+gg_request_action(const char *title, const char *primary,
+		const char *secondary, unsigned int default_value,
+		void *user_data, size_t actioncount,
+		va_list actions)
+{
+	GntWidget *window, *box, *button;
+	int i;
+
+	window = setup_request_window(title, primary, secondary);
+
+	box = gnt_hbox_new(TRUE);
+	gnt_box_add_widget(GNT_BOX(window), box);
+	for (i = 0; i < actioncount; i++)
+	{
+		const char *text = va_arg(actions, const char *);
+		GaimRequestActionCb callback = va_arg(actions, GaimRequestActionCb);
+
+		button = gnt_button_new(text);
+		gnt_box_add_widget(GNT_BOX(box), button);
+
+		g_object_set_data(G_OBJECT(button), "activate-callback", callback);
+		g_object_set_data(G_OBJECT(button), "activate-userdata", user_data);
+		g_object_set_data(G_OBJECT(button), "activate-id", GINT_TO_POINTER(i));
+		g_signal_connect(G_OBJECT(button), "activate", G_CALLBACK(request_action_cb), window);
+	}
+
+	gnt_widget_show(window);
+
+	return window;
+}
+
+static GaimRequestUiOps uiops =
+{
+	.request_input = gg_request_input,
+	.close_request = gg_close_request,
+	.request_choice = gg_request_choice,
+	.request_action = gg_request_action,
+};
+
+GaimRequestUiOps *gg_request_get_ui_ops()
+{
+	return &uiops;
+}
+
+void gg_request_init()
+{
+}
+
+void gg_request_uninit()
+{
+}
+

Copied: branches/soc-2006-file-loggers/console/gntrequest.h (from rev 16597, trunk/console/gntrequest.h)
===================================================================
--- branches/soc-2006-file-loggers/console/gntrequest.h	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/gntrequest.h	2006-07-29 21:38:18 UTC (rev 16598)
@@ -0,0 +1,8 @@
+#include "request.h"
+
+GaimRequestUiOps *gg_request_get_ui_ops();
+
+void gg_request_init();
+
+void gg_request_uninit();
+

Modified: branches/soc-2006-file-loggers/console/gntui.c
===================================================================
--- branches/soc-2006-file-loggers/console/gntui.c	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/console/gntui.c	2006-07-29 21:38:18 UTC (rev 16598)
@@ -5,6 +5,7 @@
 #include "gntconn.h"
 #include "gntconv.h"
 #include "gntnotify.h"
+#include "gntrequest.h"
 
 void init_gnt_ui()
 {
@@ -31,6 +32,9 @@
 	gg_notify_init();
 	gaim_notify_set_ui_ops(gg_notify_get_ui_ops());
 
+	gg_request_init();
+	gaim_request_set_ui_ops(gg_request_get_ui_ops());
+
 #ifdef STANDALONE
 	gnt_main();
 
@@ -49,6 +53,9 @@
 	gaim_notify_set_ui_ops(NULL);
 	gg_notify_uninit();
 
+	gaim_request_set_ui_ops(NULL);
+	gg_request_uninit();
+
 	gnt_quit();
 #endif
 }

Modified: branches/soc-2006-file-loggers/console/libgnt/Makefile.am
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/Makefile.am	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/console/libgnt/Makefile.am	2006-07-29 21:38:18 UTC (rev 16598)
@@ -7,12 +7,14 @@
 	gntwidget.c \
 	gntbox.c \
 	gntbutton.c \
+	gntcheckbox.c \
 	gntcolors.c \
 	gntcombobox.c \
 	gntentry.c \
 	gntlabel.c \
 	gntline.c \
 	gntmarshal.c \
+	gntstyle.c \
 	gnttextview.c \
 	gnttree.c \
 	gntmain.c
@@ -21,6 +23,7 @@
 	gntwidget.h \
 	gntbox.h \
 	gntbutton.h \
+	gntcheckbox.h \
 	gntcolors.h \
 	gntcombobox.h \
 	gntentry.h \
@@ -28,6 +31,7 @@
 	gntlabel.h \
 	gntline.h \
 	gntmarshal.h \
+	gntstyle.h \
 	gnttextview.h \
 	gnttree.h \
 	gnt.h

Modified: branches/soc-2006-file-loggers/console/libgnt/gntbox.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntbox.c	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/console/libgnt/gntbox.c	2006-07-29 21:38:18 UTC (rev 16598)
@@ -89,6 +89,8 @@
 
 	for (iter = box->list; iter; iter = iter->next)
 	{
+		if (GNT_WIDGET_IS_FLAG_SET(GNT_WIDGET(iter->data), GNT_WIDGET_INVISIBLE))
+			continue;
 		gnt_widget_set_position(GNT_WIDGET(iter->data), curx, cury);
 		gnt_widget_get_size(GNT_WIDGET(iter->data), &w, &h);
 		if (box->vertical)
@@ -217,6 +219,7 @@
 static GntWidget *
 find_focusable_widget(GntBox *box)
 {
+	/* XXX: Make sure the widget is visible? */
 	if (box->focus == NULL && GNT_WIDGET(box)->parent == NULL)
 		g_list_foreach(box->list, add_to_focus, box);
 
@@ -229,11 +232,17 @@
 static void
 find_next_focus(GntBox *box)
 {
-	GList *iter = g_list_find(box->focus, box->active);
-	if (iter && iter->next)
-		box->active = iter->next->data;
-	else if (box->focus)
-		box->active = box->focus->data;
+	gpointer last = box->active;
+	do
+	{
+		GList *iter = g_list_find(box->focus, box->active);
+		if (iter && iter->next)
+			box->active = iter->next->data;
+		else if (box->focus)
+			box->active = box->focus->data;
+		if (!GNT_WIDGET_IS_FLAG_SET(box->active, GNT_WIDGET_INVISIBLE))
+			break;
+	} while (box->active != last);
 }
 
 static gboolean
@@ -564,6 +573,9 @@
 		int height, width;
 		int x, y;
 
+		if (GNT_WIDGET_IS_FLAG_SET(w, GNT_WIDGET_INVISIBLE))
+			continue;
+
 		if (GNT_IS_BOX(w))
 			gnt_box_sync_children(GNT_BOX(w));
 

Modified: branches/soc-2006-file-loggers/console/libgnt/gntbutton.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntbutton.c	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/console/libgnt/gntbutton.c	2006-07-29 21:38:18 UTC (rev 16598)
@@ -22,7 +22,7 @@
 		type = GNT_COLOR_NORMAL;
 	
 	wbkgdset(widget->window, '\0' | COLOR_PAIR(type));
-	mvwprintw(widget->window, 1, 1, button->priv->text);
+	mvwprintw(widget->window, 1, 2, button->priv->text);
 
 	DEBUG;
 }
@@ -31,8 +31,10 @@
 gnt_button_size_request(GntWidget *widget)
 {
 	GntButton *button = GNT_BUTTON(widget);
-	widget->priv.width = g_utf8_strlen(button->priv->text, -1) + 2;
-	widget->priv.height = 3;
+	widget->priv.width = g_utf8_strlen(button->priv->text, -1) + 4;
+	widget->priv.height = 1;
+	if (!GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_NO_SHADOW))
+		widget->priv.height += 2;
 }
 
 static void

Copied: branches/soc-2006-file-loggers/console/libgnt/gntcheckbox.c (from rev 16597, trunk/console/libgnt/gntcheckbox.c)
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntcheckbox.c	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/libgnt/gntcheckbox.c	2006-07-29 21:38:18 UTC (rev 16598)
@@ -0,0 +1,153 @@
+#include "gntcheckbox.h"
+
+enum
+{
+	SIG_TOGGLED = 1,
+	SIGS,
+};
+
+static GntButtonClass *parent_class = NULL;
+static guint signals[SIGS] = { 0 };
+
+static void
+gnt_check_box_draw(GntWidget *widget)
+{
+	GntCheckBox *cb = GNT_CHECK_BOX(widget);
+	GntColorType type;
+	char *text;
+
+	if (gnt_widget_has_focus(widget))
+		type = GNT_COLOR_HIGHLIGHT;
+	else
+		type = GNT_COLOR_NORMAL;
+	
+	wbkgdset(widget->window, '\0' | COLOR_PAIR(type));
+
+	text = g_strdup_printf("[%c]", cb->checked ? 'X' : ' ');
+	mvwprintw(widget->window, 0, 0, text);
+	g_free(text);
+
+	wbkgdset(widget->window, '\0' | COLOR_PAIR(GNT_COLOR_NORMAL));
+	mvwprintw(widget->window, 0, 4, GNT_BUTTON(cb)->priv->text);
+	
+	DEBUG;
+}
+
+static void
+gnt_check_box_size_request(GntWidget *widget)
+{
+}
+
+static void
+gnt_check_box_map(GntWidget *widget)
+{
+	if (widget->priv.width == 0 || widget->priv.height == 0)
+		gnt_widget_size_request(widget);
+	DEBUG;
+}
+
+static gboolean
+gnt_check_box_key_pressed(GntWidget *widget, const char *text)
+{
+	if (text[0] == ' ' && text[1] == '\0')
+	{
+		GNT_CHECK_BOX(widget)->checked = !GNT_CHECK_BOX(widget)->checked;
+		g_signal_emit(widget, signals[SIG_TOGGLED], 0);
+		gnt_widget_draw(widget);
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+static void
+gnt_check_box_destroy(GntWidget *widget)
+{
+}
+
+static void
+gnt_check_box_class_init(GntCheckBoxClass *klass)
+{
+	GntWidgetClass *wclass = GNT_WIDGET_CLASS(klass);
+
+	parent_class = GNT_BUTTON_CLASS(klass);
+	/*parent_class->destroy = gnt_check_box_destroy;*/
+	wclass->draw = gnt_check_box_draw;
+	/*parent_class->map = gnt_check_box_map;*/
+	/*parent_class->size_request = gnt_check_box_size_request;*/
+	wclass->key_pressed = gnt_check_box_key_pressed;
+
+	signals[SIG_TOGGLED] = 
+		g_signal_new("toggled",
+					 G_TYPE_FROM_CLASS(klass),
+					 G_SIGNAL_RUN_LAST,
+					 G_STRUCT_OFFSET(GntCheckBoxClass, toggled),
+					 NULL, NULL,
+					 g_cclosure_marshal_VOID__VOID,
+					 G_TYPE_NONE, 0);
+	DEBUG;
+}
+
+static void
+gnt_check_box_init(GTypeInstance *instance, gpointer class)
+{
+	GNT_WIDGET_SET_FLAGS(GNT_WIDGET(instance), GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW);
+	DEBUG;
+}
+
+/******************************************************************************
+ * GntCheckBox API
+ *****************************************************************************/
+GType
+gnt_check_box_get_gtype(void)
+{
+	static GType type = 0;
+
+	if(type == 0)
+	{
+		static const GTypeInfo info = {
+			sizeof(GntCheckBoxClass),
+			NULL,					/* base_init		*/
+			NULL,					/* base_finalize	*/
+			(GClassInitFunc)gnt_check_box_class_init,
+			NULL,					/* class_finalize	*/
+			NULL,					/* class_data		*/
+			sizeof(GntCheckBox),
+			0,						/* n_preallocs		*/
+			gnt_check_box_init,			/* instance_init	*/
+		};
+
+		type = g_type_register_static(GNT_TYPE_BUTTON,
+									  "GntCheckBox",
+									  &info, 0);
+	}
+
+	return type;
+}
+
+GntWidget *gnt_check_box_new(const char *text)
+{
+	GntWidget *widget = g_object_new(GNT_TYPE_CHECK_BOX, NULL);
+
+	GNT_BUTTON(widget)->priv->text = g_strdup(text);
+	gnt_widget_set_take_focus(widget, TRUE);
+
+	return widget;
+}
+
+void gnt_check_box_set_checked(GntCheckBox *box, gboolean set)
+{
+	if (set != box->checked)
+	{
+		box->checked = set;
+		g_signal_emit(box, signals[SIG_TOGGLED], 0);
+	}
+}
+
+gboolean gnt_check_box_get_checked(GntCheckBox *box)
+{
+	return box->checked;
+}
+
+
+

Copied: branches/soc-2006-file-loggers/console/libgnt/gntcheckbox.h (from rev 16597, trunk/console/libgnt/gntcheckbox.h)
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntcheckbox.h	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/libgnt/gntcheckbox.h	2006-07-29 21:38:18 UTC (rev 16598)
@@ -0,0 +1,54 @@
+#ifndef GNT_CHECK_BOX_H
+#define GNT_CHECK_BOX_H
+
+#include "gntbutton.h"
+#include "gnt.h"
+#include "gntcolors.h"
+#include "gntkeys.h"
+
+#define GNT_TYPE_CHECK_BOX				(gnt_check_box_get_gtype())
+#define GNT_CHECK_BOX(obj)				(G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_CHECK_BOX, GntCheckBox))
+#define GNT_CHECK_BOX_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST((klass), GNT_TYPE_CHECK_BOX, GntCheckBoxClass))
+#define GNT_IS_CHECK_BOX(obj)			(G_TYPE_CHECK_INSTANCE_TYPE((obj), GNT_TYPE_CHECK_BOX))
+#define GNT_IS_CHECK_BOX_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE((klass), GNT_TYPE_CHECK_BOX))
+#define GNT_CHECK_BOX_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS((obj), GNT_TYPE_CHECK_BOX, GntCheckBoxClass))
+
+#define GNT_CHECK_BOX_FLAGS(obj)				(GNT_CHECK_BOX(obj)->priv.flags)
+#define GNT_CHECK_BOX_SET_FLAGS(obj, flags)		(GNT_CHECK_BOX_FLAGS(obj) |= flags)
+#define GNT_CHECK_BOX_UNSET_FLAGS(obj, flags)	(GNT_CHECK_BOX_FLAGS(obj) &= ~(flags))
+
+typedef struct _GnCheckBox			GntCheckBox;
+typedef struct _GnCheckBoxPriv		GntCheckBoxPriv;
+typedef struct _GnCheckBoxClass		GntCheckBoxClass;
+
+struct _GnCheckBox
+{
+	GntButton parent;
+	gboolean checked;
+};
+
+struct _GnCheckBoxClass
+{
+	GntButtonClass parent;
+
+	void (*toggled)(void);
+
+	void (*gnt_reserved1)(void);
+	void (*gnt_reserved2)(void);
+	void (*gnt_reserved3)(void);
+	void (*gnt_reserved4)(void);
+};
+
+G_BEGIN_DECLS
+
+GType gnt_check_box_get_gtype(void);
+
+GntWidget *gnt_check_box_new(const char *text);
+
+void gnt_check_box_set_checked(GntCheckBox *box, gboolean set);
+
+gboolean gnt_check_box_get_checked(GntCheckBox *box);
+
+G_END_DECLS
+
+#endif /* GNT_CHECK_BOX_H */

Modified: branches/soc-2006-file-loggers/console/libgnt/gntcolors.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntcolors.c	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/console/libgnt/gntcolors.c	2006-07-29 21:38:18 UTC (rev 16598)
@@ -1,6 +1,11 @@
 #include <ncursesw/ncurses.h>
 #include "gntcolors.h"
 
+#include <glib.h>
+
+#include <stdlib.h>
+#include <string.h>
+
 static struct
 {
 	short r, g, b;
@@ -75,3 +80,125 @@
 	restore_colors();
 }
 
+static int
+get_color(char *key)
+{
+	int color;
+
+	key = g_strstrip(key);
+
+	if (strcmp(key, "black") == 0)
+		color = GNT_COLOR_BLACK;
+	else if (strcmp(key, "red") == 0)
+		color = GNT_COLOR_RED;
+	else if (strcmp(key, "green") == 0)
+		color = GNT_COLOR_GREEN;
+	else if (strcmp(key, "blue") == 0)
+		color = GNT_COLOR_BLUE;
+	else if (strcmp(key, "white") == 0)
+		color = GNT_COLOR_WHITE;
+	else if (strcmp(key, "gray") == 0)
+		color = GNT_COLOR_GRAY;
+	else if (strcmp(key, "darkgray") == 0)
+		color = GNT_COLOR_DARK_GRAY;
+	else
+		color = -1;
+	return color;
+}
+
+void gnt_colors_parse(GKeyFile *kfile)
+{
+	GError *error = NULL;
+	gsize nkeys;
+	char **keys = g_key_file_get_keys(kfile, "colors", &nkeys, &error);
+
+	if (error)
+	{
+		/* XXX: some error happened. */
+		g_error_free(error);
+	}
+	else
+	{
+		while (nkeys--)
+		{
+			gsize len;
+			char *key = keys[nkeys];
+			char **list = g_key_file_get_string_list(kfile, "colors", key, &len, NULL);
+			if (len == 3)
+			{
+				int r = atoi(list[0]);
+				int g = atoi(list[1]);
+				int b = atoi(list[2]);
+				int color = -1;
+
+				g_ascii_strdown(key, -1);
+				color = get_color(key);
+				if (color == -1)
+					continue;
+
+				init_color(color, r, g, b);
+			}
+			g_strfreev(list);
+		}
+
+		g_strfreev(keys);
+	}
+
+	gnt_color_pairs_parse(kfile);
+}
+
+void gnt_color_pairs_parse(GKeyFile *kfile)
+{
+	GError *error = NULL;
+	gsize nkeys;
+	char **keys = g_key_file_get_keys(kfile, "colorpairs", &nkeys, &error);
+
+	if (error)
+	{
+		/* XXX: some error happened. */
+		g_error_free(error);
+		return;
+	}
+
+	while (nkeys--)
+	{
+		gsize len;
+		char *key = keys[nkeys];
+		char **list = g_key_file_get_string_list(kfile, "colorpairs", key, &len, NULL);
+		if (len == 2)
+		{
+			GntColorType type = 0;
+			int fg = get_color(g_ascii_strdown(list[0], -1));
+			int bg = get_color(g_ascii_strdown(list[1], -1));
+			if (fg == -1 || bg == -1)
+				continue;
+
+			g_ascii_strdown(key, -1);
+
+			if (strcmp(key, "normal") == 0)
+				type = GNT_COLOR_NORMAL;
+			else if (strcmp(key, "highlight") == 0)
+				type = GNT_COLOR_HIGHLIGHT;
+			else if (strcmp(key, "highlightd") == 0)
+				type = GNT_COLOR_HIGHLIGHT_D;
+			else if (strcmp(key, "shadow") == 0)
+				type = GNT_COLOR_SHADOW;
+			else if (strcmp(key, "title") == 0)
+				type = GNT_COLOR_TITLE;
+			else if (strcmp(key, "titled") == 0)
+				type = GNT_COLOR_TITLE_D;
+			else if (strcmp(key, "text") == 0)
+				type = GNT_COLOR_TEXT_NORMAL;
+			else if (strcmp(key, "disabled") == 0)
+				type = GNT_COLOR_DISABLED;
+			else
+				continue;
+
+			init_pair(type, fg, bg);
+		}
+		g_strfreev(list);
+	}
+
+	g_strfreev(keys);
+}
+

Modified: branches/soc-2006-file-loggers/console/libgnt/gntcolors.h
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntcolors.h	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/console/libgnt/gntcolors.h	2006-07-29 21:38:18 UTC (rev 16598)
@@ -1,6 +1,8 @@
 #ifndef GNT_COLORS_H
 #define GNT_COLORS_H
 
+#include <glib.h>
+
 typedef enum
 {
 	GNT_COLOR_NORMAL = 1,
@@ -34,4 +36,8 @@
 
 void gnt_uninit_colors();
 
+void gnt_colors_parse(GKeyFile *kfile);
+
+void gnt_color_pairs_parse(GKeyFile *kfile);
+
 #endif

Modified: branches/soc-2006-file-loggers/console/libgnt/gntcombobox.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntcombobox.c	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/console/libgnt/gntcombobox.c	2006-07-29 21:38:18 UTC (rev 16598)
@@ -20,10 +20,14 @@
 {
 	if (box->selected != key)
 	{
+		/* XXX: make sure the key actually does exist */
 		gpointer old = box->selected;
 		box->selected = key;
 		g_signal_emit(box, signals[SIG_SELECTION_CHANGED], 0, old, key);
-		gnt_widget_draw(GNT_WIDGET(box));
+		if (GNT_WIDGET(box)->window)
+			gnt_widget_draw(GNT_WIDGET(box));
+		if (box->dropdown)
+			gnt_tree_set_selected(GNT_TREE(box->dropdown), key);
 	}
 }
 
@@ -246,3 +250,8 @@
 	return box->selected;
 }
 
+void gnt_combo_box_set_selected(GntComboBox *box, gpointer key)
+{
+	set_selection(box, key);
+}
+

Modified: branches/soc-2006-file-loggers/console/libgnt/gntcombobox.h
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntcombobox.h	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/console/libgnt/gntcombobox.h	2006-07-29 21:38:18 UTC (rev 16598)
@@ -50,6 +50,8 @@
 
 gpointer gnt_combo_box_get_selected_data(GntComboBox *box);
 
+void gnt_combo_box_set_selected(GntComboBox *box, gpointer key);
+
 G_END_DECLS
 
 #endif /* GNT_COMBO_BOX_H */

Modified: branches/soc-2006-file-loggers/console/libgnt/gntentry.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntentry.c	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/console/libgnt/gntentry.c	2006-07-29 21:38:18 UTC (rev 16598)
@@ -21,8 +21,15 @@
 		wbkgdset(widget->window, '\0' | COLOR_PAIR(GNT_COLOR_TEXT_NORMAL));
 	else
 		wbkgdset(widget->window, '\0' | COLOR_PAIR(GNT_COLOR_HIGHLIGHT_D));
-	mvwprintw(widget->window, 0, 0, entry->scroll);
 
+	if (entry->masked)
+	{
+		mvwhline(widget->window, 0, 0, gnt_ascii_only() ? '*' : ACS_BULLET,
+				entry->end - entry->scroll);
+	}
+	else
+		mvwprintw(widget->window, 0, 0, entry->scroll);
+
 	stop = entry->end - entry->scroll;
 	if (stop < widget->priv.width)
 		mvwhline(widget->window, 0, stop, ENTRY_CHAR, widget->priv.width - stop);
@@ -283,4 +290,8 @@
 	entry_redraw(GNT_WIDGET(entry));
 }
 
+void gnt_entry_set_masked(GntEntry *entry, gboolean set)
+{
+	entry->masked = set;
+}
 

Modified: branches/soc-2006-file-loggers/console/libgnt/gntentry.h
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntentry.h	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/console/libgnt/gntentry.h	2006-07-29 21:38:18 UTC (rev 16598)
@@ -49,6 +49,7 @@
 	size_t buffer;  /* Size of the buffer */
 	
 	int max;        /* 0 means infinite */
+	gboolean masked;
 };
 
 struct _GnEntryClass
@@ -78,6 +79,8 @@
 
 void gnt_entry_clear(GntEntry *entry);
 
+void gnt_entry_set_masked(GntEntry *entry, gboolean set);
+
 G_END_DECLS
 
 #endif /* GNT_ENTRY_H */

Modified: branches/soc-2006-file-loggers/console/libgnt/gntmain.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntmain.c	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/console/libgnt/gntmain.c	2006-07-29 21:38:18 UTC (rev 16598)
@@ -2,8 +2,9 @@
 
 #include "gnt.h"
 #include "gntbox.h"
+#include "gntcolors.h"
 #include "gntkeys.h"
-#include "gntcolors.h"
+#include "gntstyle.h"
 #include "gnttree.h"
 
 #include <stdio.h>
@@ -57,6 +58,8 @@
 
 	if (lock_focus_list)
 		return;
+	if (g_list_find(g_list_first(focus_list), widget))
+		return;
 
 	if (focus_list)
 		w = focus_list->data;
@@ -524,7 +527,13 @@
 
 void gnt_init()
 {
-	GIOChannel *channel = g_io_channel_unix_new(0);
+	static GIOChannel *channel = NULL;
+	char *filename;
+	
+	if (channel)
+		return;
+	
+	channel = g_io_channel_unix_new(0);
 
 	g_io_channel_set_encoding(channel, NULL, NULL);
 	g_io_channel_set_buffered(channel, FALSE);
@@ -543,6 +552,10 @@
 	initscr();
 	gnt_init_colors();
 
+	filename = g_build_filename(g_get_home_dir(), ".gntrc", NULL);
+	gnt_style_read_configure_file(filename);
+	g_free(filename);
+
 	X_MIN = 0;
 	Y_MIN = 0;
 	X_MAX = getmaxx(stdscr);

Copied: branches/soc-2006-file-loggers/console/libgnt/gntrc.sample (from rev 16597, trunk/console/libgnt/gntrc.sample)
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntrc.sample	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/libgnt/gntrc.sample	2006-07-29 21:38:18 UTC (rev 16598)
@@ -0,0 +1,21 @@
+[general]
+shadow = 0
+
+[colors]
+black = 0; 0; 0
+red = 1000; 0; 0
+green = 0; 1000; 0
+blue = 250; 250; 700
+white = 1000; 1000; 1000
+gray = 700; 700; 700
+darkgray = 256; 256; 256
+
+[colorpairs]
+normal = black; white
+highlight = white; blue
+highlightd = black; gray
+shadow = black; darkgray
+title = white; blue
+titled = white; gray
+text = white; blue
+disabled = gray; white

Copied: branches/soc-2006-file-loggers/console/libgnt/gntstyle.c (from rev 16597, trunk/console/libgnt/gntstyle.c)
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntstyle.c	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/libgnt/gntstyle.c	2006-07-29 21:38:18 UTC (rev 16598)
@@ -0,0 +1,21 @@
+#include "gntstyle.h"
+#include "gntcolors.h"
+
+void gnt_style_read_configure_file(const char *filename)
+{
+#if GLIB_CHECK_VERSION(2,6,0)
+	GKeyFile *kfile = g_key_file_new();
+	GError *error = NULL;
+
+	if (!g_key_file_load_from_file(kfile, filename, G_KEY_FILE_NONE, &error))
+	{
+		/* XXX: Print the error or something */
+		g_error_free(error);
+		return;
+	}
+	gnt_colors_parse(kfile);
+
+	g_key_file_free(kfile);
+#endif
+}
+

Copied: branches/soc-2006-file-loggers/console/libgnt/gntstyle.h (from rev 16597, trunk/console/libgnt/gntstyle.h)
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntstyle.h	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/libgnt/gntstyle.h	2006-07-29 21:38:18 UTC (rev 16598)
@@ -0,0 +1,4 @@
+#include "gnt.h"
+
+void gnt_style_read_configure_file(const char *filename);
+

Modified: branches/soc-2006-file-loggers/console/libgnt/gnttree.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gnttree.c	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/console/libgnt/gnttree.c	2006-07-29 21:38:18 UTC (rev 16598)
@@ -278,7 +278,11 @@
 			x += tree->columns[i].width;
 		}
 		if (pos)
+		{
 			tree_mark_columns(tree, pos, 0, ACS_TTEE | COLOR_PAIR(GNT_COLOR_NORMAL));
+			tree_mark_columns(tree, pos, widget->priv.height - pos,
+					ACS_BTEE | COLOR_PAIR(GNT_COLOR_NORMAL));
+		}
 		tree_mark_columns(tree, pos, pos + 1, ACS_PLUS | COLOR_PAIR(GNT_COLOR_NORMAL));
 		tree_mark_columns(tree, pos, pos, ACS_VLINE | COLOR_PAIR(GNT_COLOR_NORMAL));
 		start = 2;
@@ -691,10 +695,28 @@
 char *gnt_tree_get_selection_text(GntTree *tree)
 {
 	if (tree->current)
-		update_row_text(tree, tree->current);
+		return update_row_text(tree, tree->current);
 	return NULL;
 }
 
+GList *gnt_tree_get_selection_text_list(GntTree *tree)
+{
+	GList *list = NULL, *iter;
+	int i;
+
+	if (!tree->current)
+		return NULL;
+
+	for (i = 0, iter = tree->current->columns; i < tree->ncol && iter;
+			i++, iter = iter->next)
+	{
+		GntTreeCol *col = iter->data;
+		list = g_list_append(list, g_strdup(col->text));
+	}
+
+	return list;
+}
+
 /* XXX: Should this also remove all the children of the row being removed? */
 void gnt_tree_remove(GntTree *tree, gpointer key)
 {
@@ -859,24 +881,41 @@
 	return widget;
 }
 
-GntTreeRow *gnt_tree_create_row(GntTree *tree, ...)
+GntTreeRow *gnt_tree_create_row_from_list(GntTree *tree, GList *list)
 {
+	GList *iter;
+	int i;
 	GntTreeRow *row = g_new0(GntTreeRow, 1);
-	int i;
-	va_list args;
 
-	va_start(args, tree);
-
-	for (i = 0; i < tree->ncol; i++)
+	for (i = 0, iter = list; i < tree->ncol && iter; iter = iter->next, i++)
 	{
 		GntTreeCol *col = g_new0(GntTreeCol, 1);
 		col->span = 1;
-		col->text = g_strdup(va_arg(args, const char *));
+		col->text = g_strdup(iter->data);
 
 		row->columns = g_list_append(row->columns, col);
 	}
+
+	return row;
+}
+
+GntTreeRow *gnt_tree_create_row(GntTree *tree, ...)
+{
+	int i;
+	va_list args;
+	GList *list = NULL;
+	GntTreeRow *row;
+
+	va_start(args, tree);
+	for (i = 0; i < tree->ncol; i++)
+	{
+		list = g_list_append(list, va_arg(args, const char *));
+	}
 	va_end(args);
 
+	row = gnt_tree_create_row_from_list(tree, list);
+	g_list_free(list);
+
 	return row;
 }
 

Modified: branches/soc-2006-file-loggers/console/libgnt/gnttree.h
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gnttree.h	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/console/libgnt/gnttree.h	2006-07-29 21:38:18 UTC (rev 16598)
@@ -80,6 +80,8 @@
 
 char *gnt_tree_get_selection_text(GntTree *tree);
 
+GList *gnt_tree_get_selection_text_list(GntTree *tree);
+
 void gnt_tree_remove(GntTree *tree, gpointer key);
 
 /* Returns the visible line number of the selected row */
@@ -99,6 +101,8 @@
 
 GntTreeRow *gnt_tree_create_row(GntTree *tree, ...);
 
+GntTreeRow *gnt_tree_create_row_from_list(GntTree *tree, GList *list);
+
 void gnt_tree_set_col_width(GntTree *tree, int col, int width);
 
 void gnt_tree_set_column_titles(GntTree *tree, ...);

Modified: branches/soc-2006-file-loggers/console/libgnt/gntwidget.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntwidget.c	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/console/libgnt/gntwidget.c	2006-07-29 21:38:18 UTC (rev 16598)
@@ -329,6 +329,7 @@
 		mvwvline(widget->window, 1, widget->priv.width, ' ', widget->priv.height);
 #endif
 	gnt_screen_release(widget);
+	GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_INVISIBLE);
 	GNT_WIDGET_UNSET_FLAGS(widget, GNT_WIDGET_MAPPED);
 }
 
@@ -489,6 +490,8 @@
 
 void gnt_widget_queue_update(GntWidget *widget)
 {
+	if (widget->window == NULL)
+		return;
 	while (widget->parent)
 		widget = widget->parent;
 	
@@ -507,3 +510,11 @@
 	return ret;
 }
 
+void gnt_widget_set_visible(GntWidget *widget, gboolean set)
+{
+	if (set)
+		GNT_WIDGET_UNSET_FLAGS(widget, GNT_WIDGET_INVISIBLE);
+	else
+		GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_INVISIBLE);
+}
+

Modified: branches/soc-2006-file-loggers/console/libgnt/gntwidget.h
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntwidget.h	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/console/libgnt/gntwidget.h	2006-07-29 21:38:18 UTC (rev 16598)
@@ -39,6 +39,7 @@
 	GNT_WIDGET_URGENT         = 1 << 7,
 	GNT_WIDGET_GROW_X         = 1 << 8,
 	GNT_WIDGET_GROW_Y         = 1 << 9,
+	GNT_WIDGET_INVISIBLE      = 1 << 10,
 } GntWidgetFlags;
 
 /* XXX: I'll have to ask grim what he's using this for in guifications. */
@@ -125,6 +126,9 @@
 void gnt_widget_queue_update(GntWidget *widget);
 
 void gnt_widget_set_take_focus(GntWidget *widget, gboolean set);
+
+void gnt_widget_set_visible(GntWidget *widget, gboolean set);
+
 G_END_DECLS
 
 #endif /* GNT_WIDGET_H */

Modified: branches/soc-2006-file-loggers/console/libgnt/test/combo.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/test/combo.c	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/console/libgnt/test/combo.c	2006-07-29 21:38:18 UTC (rev 16598)
@@ -1,6 +1,7 @@
 #include <gnt.h>
 #include <gntbox.h>
 #include <gntbutton.h>
+#include <gntcheckbox.h>
 #include <gntcombobox.h>
 #include <gntlabel.h>
 
@@ -61,6 +62,8 @@
 
 	gnt_box_add_widget(GNT_BOX(box), hbox);
 
+	gnt_box_add_widget(GNT_BOX(box), gnt_check_box_new("check box"));
+
 	gnt_widget_show(box);
 
 #ifdef STANDALONE

Modified: branches/soc-2006-file-loggers/doc/gtkconv-signals.dox
===================================================================
--- branches/soc-2006-file-loggers/doc/gtkconv-signals.dox	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/doc/gtkconv-signals.dox	2006-07-29 21:38:18 UTC (rev 16598)
@@ -24,12 +24,12 @@
 
  @signaldef conversation-timestamp
   @signalproto
-char *(*conversation_timestamp)(GaimConversation *conv, struct tm *tm);
+char *(*conversation_timestamp)(GaimConversation *conv, time_t when);
   @endsignalproto
   @signaldesc
    Emitted to allow plugins to customize the timestamp on a message.
   @param conv The conversation the message belongs to.
-  @param tm The time to be converted to a string.
+  @param when The time to be converted to a string.
   @return A textual representation of the time, or @c NULL to use a
           default format.
  @endsignaldef

Modified: branches/soc-2006-file-loggers/doc/log-signals.dox
===================================================================
--- branches/soc-2006-file-loggers/doc/log-signals.dox	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/doc/log-signals.dox	2006-07-29 21:38:18 UTC (rev 16598)
@@ -8,13 +8,13 @@
 
  @signaldef log-timestamp
   @signalproto
-char *(*log_timestamp)(GaimConversation *conv, struct tm *tm);
+char *(*log_timestamp)(GaimConversation *conv, time_t when);
   @endsignalproto
   @signaldesc
    Emitted to allow plugins to customize the timestamp on a message
    being logged.
   @param log The log the message belongs to.
-  @param tm The time to be converted to a string.
+  @param when The time to be converted to a string.
   @return A textual representation of the time, or @c NULL to use a
           default format.
   @note Plugins must be careful of logs with a type of GAIM_LOG_SYSTEM.

Modified: branches/soc-2006-file-loggers/plugins/ChangeLog.API
===================================================================
--- branches/soc-2006-file-loggers/plugins/ChangeLog.API	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/plugins/ChangeLog.API	2006-07-29 21:38:18 UTC (rev 16598)
@@ -43,9 +43,11 @@
 	  const char *name, const char *alias
 	* gaim_conv_chat_add_users(), added extra_msgs and new_arrivals (pass NULL
 	  and FALSE respectively, to get the same behavior as before)
-	* chat_add_users in GaimConversationUiOps, added flags, aliases,
-	  and new_arrivals
+	* chat_add_users in GaimConversationUiOps, added cbuddies and 
+	  new_arrivals and removed buddies.
 	* chat_rename_user in GaimConversationUiOps, added new_alias
+	* gaim_conv_chat_cb_new(), added alias. (pass NULL to get the same
+	  behavior as before).
 	* GaimConversation.log became GList * GaimConversation.logs, so that a
 	  conversation can have multiple logs at once
 	* gaim_conv_chat_add_user, added extra_msgs

Modified: branches/soc-2006-file-loggers/plugins/timestamp_format.c
===================================================================
--- branches/soc-2006-file-loggers/plugins/timestamp_format.c	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/plugins/timestamp_format.c	2006-07-29 21:38:18 UTC (rev 16598)
@@ -52,18 +52,18 @@
 }
 
 static char *timestamp_cb_common(GaimConversation *conv,
-                                 const struct tm *tm,
+                                 time_t t,
                                  gboolean force,
                                  const char *dates)
 {
+	struct tm *tm = localtime(&t);
 	g_return_val_if_fail(conv != NULL, NULL);
-	g_return_val_if_fail(tm != NULL, NULL);
 	g_return_val_if_fail(dates != NULL, NULL);
 
 	if (!strcmp(dates, "always") ||
 	    (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT &&
 	     !strcmp(dates, "chats")) ||
-	    (time(NULL) > (mktime((struct tm *)tm) + 20*60)))
+	    (time(NULL) > (mktime(tm) + 20*60)))
 	{
 		if (force)
 			return g_strdup(gaim_utf8_strftime("%Y-%m-%d %H:%M:%S", tm));
@@ -78,7 +78,7 @@
 }
 
 static char *conversation_timestamp_cb(GaimConversation *conv,
-                                       const struct tm *tm, gpointer data)
+                                       time_t t, gpointer data)
 {
 	gboolean force = gaim_prefs_get_bool(
 				"/plugins/gtk/timestamp_format/force_24hr");
@@ -86,13 +86,11 @@
 				"/plugins/gtk/timestamp_format/use_dates/conversation");
 
 	g_return_val_if_fail(conv != NULL, NULL);
-	g_return_val_if_fail(tm != NULL, NULL);
 
-	return timestamp_cb_common(conv, tm, force, dates);
+	return timestamp_cb_common(conv, t, force, dates);
 }
 
-static char *log_timestamp_cb(GaimLog *log,
-                                  const struct tm *tm, gpointer data)
+static char *log_timestamp_cb(GaimLog *log, time_t t, gpointer data)
 {
 	gboolean force = gaim_prefs_get_bool(
 				"/plugins/gtk/timestamp_format/force_24hr");
@@ -100,17 +98,18 @@
 				"/plugins/gtk/timestamp_format/use_dates/log");
 
 	g_return_val_if_fail(log != NULL, NULL);
-	g_return_val_if_fail(tm != NULL, NULL);
 
 	if (log->type == GAIM_LOG_SYSTEM)
 	{
-		if (force)
+		if (force) {
+			struct tm *tm = localtime(&t);
 			return g_strdup(gaim_utf8_strftime("%Y-%m-%d %H:%M:%S", tm));
-		else
+		} else {
 			return NULL;
+		}
 	}
 
-	return timestamp_cb_common(log->conv, tm, force, dates);
+	return timestamp_cb_common(log->conv, t, force, dates);
 }
 
 static gboolean

Modified: branches/soc-2006-file-loggers/src/conversation.c
===================================================================
--- branches/soc-2006-file-loggers/src/conversation.c	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/src/conversation.c	2006-07-29 21:38:18 UTC (rev 16598)
@@ -1440,7 +1440,7 @@
 	g_list_free(flags2);
 }
 
-int
+static int
 gaim_conv_chat_cb_compare(GaimConvChatBuddy *a, GaimConvChatBuddy *b)
 {
 	GaimConvChatBuddyFlags f1 = 0, f2 = 0;
@@ -1952,8 +1952,12 @@
 {
 	g_return_if_fail(cb != NULL);
 
+	g_free(cb->alias);
+	g_free(cb->alias_key);
 	g_free(cb->name);
 	cb->name = NULL;
+	cb->alias = NULL;
+	cb->alias_key = NULL;
 	cb->flags = 0;
 
 	GAIM_DBUS_UNREGISTER_POINTER(cb);

Modified: branches/soc-2006-file-loggers/src/gtkaccount.c
===================================================================
--- branches/soc-2006-file-loggers/src/gtkaccount.c	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/src/gtkaccount.c	2006-07-29 21:38:18 UTC (rev 16598)
@@ -2221,9 +2221,15 @@
 					   COLUMN_ENABLED, &enabled,
 					   -1);
 
-	/* Set the statuses for this account to the current status */
-	saved_status = gaim_savedstatus_get_current();
-	gaim_savedstatus_activate_for_account(saved_status, account);
+	/*
+	 * If we just enabled the account, then set the statuses
+	 * to the current status.
+	 */
+	if (!enabled)
+	{
+		saved_status = gaim_savedstatus_get_current();
+		gaim_savedstatus_activate_for_account(saved_status, account);
+	}
 
 	gaim_account_set_enabled(account, GAIM_GTK_UI, !enabled);
 }

Modified: branches/soc-2006-file-loggers/src/gtkconn.c
===================================================================
--- branches/soc-2006-file-loggers/src/gtkconn.c	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/src/gtkconn.c	2006-07-29 21:38:18 UTC (rev 16598)
@@ -37,7 +37,9 @@
 #include "gtkutils.h"
 #include "util.h"
 
-#define INITIAL_RECON_DELAY 8000
+#define INITIAL_RECON_DELAY_MIN  8000
+#define INITIAL_RECON_DELAY_MAX 60000
+
 #define MAX_RECON_DELAY 600000
 
 typedef struct {
@@ -155,7 +157,7 @@
 		if (info == NULL) {
 			info = g_new0(GaimAutoRecon, 1);
 			g_hash_table_insert(hash, account, info);
-			info->delay = INITIAL_RECON_DELAY;
+			info->delay = g_random_int_range(INITIAL_RECON_DELAY_MIN, INITIAL_RECON_DELAY_MAX);
 		} else {
 			info->delay = MIN(2 * info->delay, MAX_RECON_DELAY);
 			if (info->timeout != 0)

Modified: branches/soc-2006-file-loggers/src/gtkconv.c
===================================================================
--- branches/soc-2006-file-loggers/src/gtkconv.c	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/src/gtkconv.c	2006-07-29 21:38:18 UTC (rev 16598)
@@ -3869,10 +3869,9 @@
 	GtkWidget *vbox, *hbox, *frame;
 	GtkWidget *imhtml_sw;
 	GtkPolicyType imhtml_sw_hscroll;
-	GtkWidget *lbox, *bbox;
+	GtkWidget *lbox;
 	GtkWidget *label;
 	GtkWidget *list;
-	GtkWidget *button;
 	GtkWidget *sw;
 	GtkListStore *ls;
 	GtkCellRenderer *rend;
@@ -4020,48 +4019,6 @@
 
 	gtk_container_add(GTK_CONTAINER(sw), list);
 
-	/* Setup the user list toolbar. */
-	bbox = gtk_hbox_new(TRUE, GAIM_HIG_BOX_SPACE);
-	gtk_box_pack_start(GTK_BOX(lbox), bbox, FALSE, FALSE, 0);
-	gtk_widget_show(bbox);
-
-	/* IM */
-	button = gaim_pixbuf_button_from_stock(NULL, GAIM_STOCK_IM,
-										   GAIM_BUTTON_VERTICAL);
-	gtkchat->userlist_im = button;
-	gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
-	gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
-	gtk_tooltips_set_tip(gtkconv->tooltips, button, _("IM the user"), NULL);
-	g_signal_connect(G_OBJECT(button), "clicked",
-					 G_CALLBACK(chat_im_button_cb), gtkconv);
-
-	gtk_widget_show(button);
-
-	/* Ignore */
-	button = gaim_pixbuf_button_from_stock(NULL, GAIM_STOCK_IGNORE,
-										   GAIM_BUTTON_VERTICAL);
-	gtkchat->userlist_ignore = button;
-	gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
-	gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
-	gtk_tooltips_set_tip(gtkconv->tooltips, button,
-						 _("Ignore the user"), NULL);
-	g_signal_connect(G_OBJECT(button), "clicked",
-					 G_CALLBACK(ignore_cb), gtkconv);
-	gtk_widget_show(button);
-
-	/* Info */
-	button = gaim_pixbuf_button_from_stock(NULL, GAIM_STOCK_INFO,
-										   GAIM_BUTTON_VERTICAL);
-	gtkchat->userlist_info = button;
-	gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
-	gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
-	gtk_tooltips_set_tip(gtkconv->tooltips, button,
-						 _("Get the user's information"), NULL);
-	g_signal_connect(G_OBJECT(button), "clicked",
-	                 G_CALLBACK(info_cb), gtkconv);
-
-	gtk_widget_show(button);
-
 	/* Setup the bottom half of the conversation window */
 	vbox = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE);
 	gtk_paned_pack2(GTK_PANED(vpaned), vbox, FALSE, TRUE);
@@ -4691,7 +4648,6 @@
 	GaimConversationType type;
 	char *displaying;
 	gboolean plugin_return;
-	struct tm tm;
 
 	g_return_if_fail(conv != NULL);
 	gtkconv = GAIM_GTK_CONVERSATION(conv);
@@ -4776,16 +4732,16 @@
 	if (gtk_text_buffer_get_char_count(gtk_text_view_get_buffer(GTK_TEXT_VIEW(gtkconv->imhtml))))
 		gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), "<BR>", gtk_font_options_all);
 
-	tm = *(localtime(&mtime));
 	mdate = gaim_signal_emit_return_1(gaim_gtk_conversations_get_handle(),
 	                                  "conversation-timestamp",
-	                                  conv, &tm);
+	                                  conv, mtime);
 	if (mdate == NULL)
 	{
+		struct tm *tm = localtime(&mtime);
 		if (time(NULL) > mtime + 20*60) /* show date if older than 20 minutes */
-			mdate = g_strdup(gaim_date_format_long(&tm));
+			mdate = g_strdup(gaim_date_format_long(tm));
 		else
-			mdate = g_strdup(gaim_time_format(&tm));
+			mdate = g_strdup(gaim_time_format(tm));
 	}
 
 	sml_attrib = g_strdup_printf("sml=\"%s\"", gaim_account_get_protocol_name(account));
@@ -5587,13 +5543,7 @@
 									 (gaim_blist_find_chat(account, gaim_conversation_get_name(conv)) != NULL));
 		}
 
-		/* Deal with chat userlist buttons */
-		if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT)
-		{
-			gtk_widget_set_sensitive(gtkconv->u.chat->userlist_im, TRUE);
-			gtk_widget_set_sensitive(gtkconv->u.chat->userlist_ignore, TRUE);
-			gtk_widget_set_sensitive(gtkconv->u.chat->userlist_info, (prpl_info->get_info != NULL));
-		}
+  
 	} else {
 		/* Account is offline */
 		/* Or it's a chat that we've left. */
@@ -5609,14 +5559,6 @@
 		gtk_widget_set_sensitive(win->menu.remove, FALSE);
 		gtk_widget_set_sensitive(win->menu.insert_link, TRUE);
 		gtk_widget_set_sensitive(win->menu.insert_image, FALSE);
-
-		/* Deal with chat userlist buttons */
-		if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT)
-		{
-			gtk_widget_set_sensitive(gtkconv->u.chat->userlist_im, FALSE);
-			gtk_widget_set_sensitive(gtkconv->u.chat->userlist_ignore, FALSE);
-			gtk_widget_set_sensitive(gtkconv->u.chat->userlist_info, FALSE);
-		}
 	}
 
 	/*
@@ -6576,11 +6518,23 @@
 	                                    "GaimGtkWindow *"));
 
 	gaim_signal_register(handle, "conversation-timestamp",
-	                     gaim_marshal_POINTER__POINTER_POINTER,
+#if SIZEOF_TIME_T == 4
+	                     gaim_marshal_POINTER__POINTER_INT,
+#elif SIZEOF_TIME_T == 8
+			     gaim_marshal_POINTER__POINTER_INT64,
+#else
+#error Unkown size of time_t
+#endif
 	                     gaim_value_new(GAIM_TYPE_POINTER), 2,
 	                     gaim_value_new(GAIM_TYPE_SUBTYPE,
-	                                    GAIM_SUBTYPE_CONVERSATION),
-	                     gaim_value_new(GAIM_TYPE_POINTER));
+	                                    GAIM_SUBTYPE_LOG),
+#if SIZEOF_TIME_T == 4
+	                     gaim_value_new(GAIM_TYPE_INT));
+#elif SIZEOF_TIME_T == 8
+	                     gaim_value_new(GAIM_TYPE_INT64));
+#else
+# error Unknown size of time_t
+#endif
 
 	gaim_signal_register(handle, "displaying-im-msg",
 						 gaim_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER,

Modified: branches/soc-2006-file-loggers/src/gtkconv.h
===================================================================
--- branches/soc-2006-file-loggers/src/gtkconv.h	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/src/gtkconv.h	2006-07-29 21:38:18 UTC (rev 16598)
@@ -103,9 +103,6 @@
 	GtkWidget *count;
 	GtkWidget *list;
 	GtkWidget *topic_text;
-	GtkWidget *userlist_im;
-	GtkWidget *userlist_ignore;
-	GtkWidget *userlist_info;
 };
 
 /**

Modified: branches/soc-2006-file-loggers/src/log.c
===================================================================
--- branches/soc-2006-file-loggers/src/log.c	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/src/log.c	2006-07-29 21:38:18 UTC (rev 16598)
@@ -615,12 +615,23 @@
 	gaim_log_logger_add(old_logger);
 
 	gaim_signal_register(handle, "log-timestamp",
-	                     gaim_marshal_POINTER__POINTER_POINTER,
+#if SIZEOF_TIME_T == 4
+	                     gaim_marshal_POINTER__POINTER_INT,
+#elif SIZEOF_TIME_T == 8
+			     gaim_marshal_POINTER__POINTER_INT64,
+#else
+#error Unknown size of time_t
+#endif
 	                     gaim_value_new(GAIM_TYPE_POINTER), 2,
 	                     gaim_value_new(GAIM_TYPE_SUBTYPE,
 	                                    GAIM_SUBTYPE_LOG),
-	                     gaim_value_new(GAIM_TYPE_BOXED,
-	                                    "struct tm *"));
+#if SIZEOF_TIME_T == 4
+	                     gaim_value_new(GAIM_TYPE_INT));
+#elif SIZEOF_TIME_T == 8
+	                     gaim_value_new(GAIM_TYPE_INT64));
+#else
+# error Unknown size of time_t
+#endif
 
 	gaim_prefs_connect_callback(NULL, "/core/logging/format",
 							    logger_pref_cb, NULL);
@@ -644,14 +655,15 @@
 static char *log_get_timestamp(GaimLog *log, time_t when)
 {
 	char *date;
-	struct tm tm = *(localtime(&when));
+	struct tm tm;
 
 	date = gaim_signal_emit_return_1(gaim_log_get_handle(),
 	                          "log-timestamp",
-	                          log, &tm);
+	                          log, when);
 	if (date != NULL)
 		return date;
 
+	tm = *(localtime(&when));
 	if (log->type == GAIM_LOG_SYSTEM || time(NULL) > when + 20*60)
 		return g_strdup(gaim_date_format_long(&tm));
 	else

Modified: branches/soc-2006-file-loggers/src/notify.c
===================================================================
--- branches/soc-2006-file-loggers/src/notify.c	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/src/notify.c	2006-07-29 21:38:18 UTC (rev 16598)
@@ -58,9 +58,23 @@
 		info->cb = cb;
 		info->cb_user_data = user_data;
 
-		handles = g_list_append(handles, info);
+		if (info->ui_handle != NULL) {
+			handles = g_list_append(handles, info);
+			
+			return info->ui_handle;
+			
+		} else {
+			if (info->cb != NULL)
+				info->cb(info->cb_user_data);
 
-		return info->ui_handle;
+			g_free(info);
+
+			return NULL;
+		}
+
+	} else {
+		if (cb != NULL)
+			cb(user_data);
 	}
 
 	return NULL;
@@ -85,9 +99,22 @@
 		info->cb = cb;
 		info->cb_user_data = user_data;
 
-		handles = g_list_append(handles, info);
+		if (info->ui_handle != NULL) {
+			handles = g_list_append(handles, info);
 
-		return info->ui_handle;
+			return info->ui_handle;
+
+		} else {
+			if (info->cb != NULL)
+				info->cb(info->cb_user_data);
+
+			g_free(info);
+
+			return NULL;
+		}		
+	} else {
+		if (cb != NULL)
+			cb(user_data);
 	}
 
 	return NULL;
@@ -125,9 +152,23 @@
 		info->cb = cb;
 		info->cb_user_data = user_data;
 
-		handles = g_list_append(handles, info);
+		if (info->ui_handle != NULL) {
+			handles = g_list_append(handles, info);
 
-		return info->ui_handle;
+			return info->ui_handle;
+
+		} else {
+			if (info->cb != NULL)
+				info->cb(info->cb_user_data);
+
+			g_free(info);
+
+			return NULL;
+		}
+
+	} else {
+		if (cb != NULL)
+			cb(user_data);
 	}
 
 	return NULL;
@@ -154,9 +195,23 @@
 		info->cb = cb;
 		info->cb_user_data = user_data;
 
-		handles = g_list_append(handles, info);
+		if (info->ui_handle != NULL) {
+			handles = g_list_append(handles, info);
+			
+			return info->ui_handle;
+			
+		} else {
+			if (info->cb != NULL)
+				info->cb(info->cb_user_data);
+			
+			g_free(info);
+			
+			return NULL;
+		}
 
-		return info->ui_handle;
+	} else {
+		if (cb != NULL)
+			cb(user_data);
 	}
 
 	return NULL;
@@ -183,9 +238,23 @@
 		info->cb = cb;
 		info->cb_user_data = user_data;
 
-		handles = g_list_append(handles, info);
+		if (info->ui_handle != NULL) {
+			handles = g_list_append(handles, info);
 
-		return info->ui_handle;
+			return info->ui_handle;
+
+		} else {
+			if (info->cb != NULL)
+				info->cb(info->cb_user_data);
+
+			g_free(info);
+
+			return NULL;
+		}
+
+	} else {
+		if (cb != NULL)
+			cb(user_data);
 	}
 
 	return NULL;
@@ -375,10 +444,25 @@
 		info->cb = cb;
 		info->cb_user_data = user_data;
 
-		handles = g_list_append(handles, info);
+		g_free(infotext);
 
-		g_free(infotext);
-		return info->ui_handle;
+		if (info->ui_handle != NULL) {
+			handles = g_list_append(handles, info);
+
+			return info->ui_handle;
+
+		} else {
+			if (info->cb != NULL)
+				info->cb(info->cb_user_data);
+
+			g_free(info);
+
+			return NULL;
+		}
+
+	} else {
+		if (cb != NULL)
+			cb(user_data);
 	}
 
 	return NULL;
@@ -401,9 +485,16 @@
 		info->handle    = handle;
 		info->ui_handle = ops->notify_uri(uri);
 
-		handles = g_list_append(handles, info);
+		if (info->ui_handle != NULL) {
+			handles = g_list_append(handles, info);
+			
+			return info->ui_handle;
 
-		return info->ui_handle;
+		} else {
+			g_free(info);
+
+			return NULL;
+		}
 	}
 
 	return NULL;

Modified: branches/soc-2006-file-loggers/src/protocols/gg/gg.c
===================================================================
--- branches/soc-2006-file-loggers/src/protocols/gg/gg.c	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/src/protocols/gg/gg.c	2006-07-29 21:38:18 UTC (rev 16598)
@@ -1160,7 +1160,6 @@
 			gaim_notify_error(gc, NULL,
 					  _("Unable to display the search results."),
 					  NULL);
-			ggp_sr_close_cb(form);
 			return;
 		}
 
@@ -1737,6 +1736,11 @@
 			gg_free_session(info->session);
 		}
 
+		/* Immediately close any notifications on this handle since that process depends
+		 * upon the contents of info->searches, which we are about to destroy.
+		 */
+		gaim_notify_close_with_handle(gc);
+
 		ggp_search_destroy(info->searches);
 		g_free(info);
 		gc->proto_data = NULL;

Modified: branches/soc-2006-file-loggers/src/protocols/jabber/jabber.c
===================================================================
--- branches/soc-2006-file-loggers/src/protocols/jabber/jabber.c	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/src/protocols/jabber/jabber.c	2006-07-29 21:38:18 UTC (rev 16598)
@@ -66,6 +66,7 @@
 	/* setup the parser fresh for each stream */
 	jabber_parser_setup(js);
 	jabber_send_raw(js, open_stream, -1);
+	js->reinit = FALSE;
 	g_free(open_stream);
 }
 
@@ -354,6 +355,8 @@
 		buf[len] = '\0';
 		gaim_debug(GAIM_DEBUG_INFO, "jabber", "Recv (ssl)(%d): %s\n", len, buf);
 		jabber_parser_process(js, buf, len);
+		if(js->reinit)
+			jabber_stream_init(js);
 	}
 
 	if(errno == EAGAIN)
@@ -370,7 +373,7 @@
 	int len;
 	static char buf[4096];
 
-	if(!g_list_find(gaim_connections_get_all(), gc))
+	if(!GAIM_CONNECTION_IS_VALID(gc))
 		return;
 
 	if((len = read(js->fd, buf, sizeof(buf) - 1)) > 0) {
@@ -486,7 +489,7 @@
 	JabberStream *js;
 
 	gc = data;
-	if (!g_list_find(gaim_connections_get_all(), gc))
+	if (!GAIM_CONNECTION_IS_VALID(gc))
 	{
 		/* This connection has been closed */
 		g_free(resp);
@@ -500,7 +503,7 @@
 		g_free(resp);
 	} else {
 		jabber_login_connect(js, js->user->domain,
-			gaim_account_get_int(js->gc->account, "port", 0));
+			gaim_account_get_int(js->gc->account, "port", 5222));
 	}
 }
 
@@ -1009,7 +1012,7 @@
 		case JABBER_STREAM_REINITIALIZING:
 			gaim_connection_update_progress(js->gc, _("Re-initializing Stream"),
 					6, JABBER_CONNECT_STEPS);
-			jabber_stream_init(js);
+			js->reinit = TRUE;
 			break;
 		case JABBER_STREAM_CONNECTED:
 			jabber_roster_request(js);

Modified: branches/soc-2006-file-loggers/src/protocols/jabber/jabber.h
===================================================================
--- branches/soc-2006-file-loggers/src/protocols/jabber/jabber.h	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/src/protocols/jabber/jabber.h	2006-07-29 21:38:18 UTC (rev 16598)
@@ -121,6 +121,8 @@
 	GaimCircBuffer *write_buffer;
 	guint writeh;
 
+	gboolean reinit;
+
 	/* OK, this stays at the end of the struct, so plugins can depend
 	 * on the rest of the stuff being in the right place
 	 */

Modified: branches/soc-2006-file-loggers/src/protocols/jabber/message.c
===================================================================
--- branches/soc-2006-file-loggers/src/protocols/jabber/message.c	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/src/protocols/jabber/message.c	2006-07-29 21:38:18 UTC (rev 16598)
@@ -245,9 +245,6 @@
 	const char *type;
 	xmlnode *child;
 
-	if(strcmp(packet->name, "message"))
-		return;
-
 	jm = g_new0(JabberMessage, 1);
 	jm->js = js;
 	jm->sent = time(NULL);

Modified: branches/soc-2006-file-loggers/src/protocols/msn/servconn.c
===================================================================
--- branches/soc-2006-file-loggers/src/protocols/msn/servconn.c	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/src/protocols/msn/servconn.c	2006-07-29 21:38:18 UTC (rev 16598)
@@ -125,6 +125,8 @@
 	const char *names[] = { "Notification", "Switchboard" };
 	const char *name;
 
+	msn_servconn_disconnect(servconn);
+
 	name = names[servconn->type];
 
 	switch (error)
@@ -156,8 +158,6 @@
 			swboard->error = MSN_SB_ERROR_CONNECTION;
 	}
 
-	msn_servconn_disconnect(servconn);
-
 	g_free(tmp);
 }
 

Modified: branches/soc-2006-file-loggers/src/protocols/oscar/flap_connection.c
===================================================================
--- branches/soc-2006-file-loggers/src/protocols/oscar/flap_connection.c	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/src/protocols/oscar/flap_connection.c	2006-07-29 21:38:18 UTC (rev 16598)
@@ -205,7 +205,6 @@
 	flap_connection_destroy_rates(conn->rates);
 
 	od->oscar_connections = g_list_remove(od->oscar_connections, conn);
-	g_free(conn);
 
 	account = gaim_connection_get_account(od->gc);
 
@@ -227,12 +226,18 @@
 		else if (conn->disconnect_reason == OSCAR_DISCONNECT_COULD_NOT_CONNECT)
 			tmp = _("Could not establish a connection with the server.");
 		else
+			/*
+			 * We shouldn't print a message for some disconnect_reasons.
+			 * Like OSCAR_DISCONNECT_LOCAL_CLOSED.
+			 */
 			tmp = NULL;
 
 		if (tmp != NULL)
 			gaim_connection_error(od->gc, tmp);
 	}
 
+	g_free(conn);
+
 	return FALSE;
 }
 

Modified: branches/soc-2006-file-loggers/src/protocols/oscar/odc.c
===================================================================
--- branches/soc-2006-file-loggers/src/protocols/oscar/odc.c	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/src/protocols/oscar/odc.c	2006-07-29 21:38:18 UTC (rev 16598)
@@ -37,25 +37,15 @@
 	const gchar *tmp;
 
 	if (conn->disconnect_reason == OSCAR_DISCONNECT_REMOTE_CLOSED)
-	{
 		tmp = _("The remote user has closed the connection.");
-	}
 	else if (conn->disconnect_reason == OSCAR_DISCONNECT_REMOTE_REFUSED)
-	{
 		tmp = _("The remote user has declined your request.");
-	}
 	else if (conn->disconnect_reason == OSCAR_DISCONNECT_LOST_CONNECTION)
-	{
 		tmp = _("Lost connection with the remote user for an unknown reason.");
-	}
 	else if (conn->disconnect_reason == OSCAR_DISCONNECT_INVALID_DATA)
-	{
 		tmp = _("Received invalid data on connection with remote user.");
-	}
 	else if (conn->disconnect_reason == OSCAR_DISCONNECT_COULD_NOT_CONNECT)
-	{
 		tmp = _("Could not establish a connection with the remote user.");
-	}
 	else
 		/*
 		 * We shouldn't print a message for some disconnect_reasons.

Modified: branches/soc-2006-file-loggers/src/protocols/oscar/oscar.h
===================================================================
--- branches/soc-2006-file-loggers/src/protocols/oscar/oscar.h	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/src/protocols/oscar/oscar.h	2006-07-29 21:38:18 UTC (rev 16598)
@@ -287,14 +287,14 @@
 
 typedef enum
 {
-	OSCAR_DISCONNECT_DONE,
-	OSCAR_DISCONNECT_LOCAL_CLOSED,
+	OSCAR_DISCONNECT_DONE, /* not considered an error */
+	OSCAR_DISCONNECT_LOCAL_CLOSED, /* peer connections only, not considered an error */
 	OSCAR_DISCONNECT_REMOTE_CLOSED,
-	OSCAR_DISCONNECT_REMOTE_REFUSED,
+	OSCAR_DISCONNECT_REMOTE_REFUSED, /* peer connections only */
 	OSCAR_DISCONNECT_LOST_CONNECTION,
 	OSCAR_DISCONNECT_INVALID_DATA,
 	OSCAR_DISCONNECT_COULD_NOT_CONNECT,
-	OSCAR_DISCONNECT_RETRYING
+	OSCAR_DISCONNECT_RETRYING /* peer connections only */
 } OscarDisconnectReason;
 
 typedef enum

Modified: branches/soc-2006-file-loggers/src/protocols/qq/Makefile.am
===================================================================
--- branches/soc-2006-file-loggers/src/protocols/qq/Makefile.am	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/src/protocols/qq/Makefile.am	2006-07-29 21:38:18 UTC (rev 16598)
@@ -21,8 +21,6 @@
 	char_conv.h \
 	crypt.c \
 	crypt.h \
-	group_admindlg.c \
-	group_admindlg.h \
 	group.c \
 	group_conv.c \
 	group_conv.h \
@@ -52,8 +50,6 @@
 	header_info.h \
 	im.c \
 	im.h \
-	infodlg.c \
-	infodlg.h \
 	ip_location.c \
 	ip_location.h \
 	keep_alive.c \
@@ -68,8 +64,6 @@
 	send_core.h \
 	sendqueue.c \
 	sendqueue.h \
-	show.c \
-	show.h \
 	sys_msg.c \
 	sys_msg.h \
 	udp_proxy_s5.c \
@@ -104,6 +98,5 @@
 	-DLOCALEDIR=\"${datadir}/locale\" \
         -DVERSION=\"$(VERSION)\" \
         $(DEBUG_CFLAGS) \
-        $(GTK_CFLAGS) \
         $(GLIB_CFLAGS) \
 	$(GAIM_CFLAGS)

Modified: branches/soc-2006-file-loggers/src/protocols/qq/Makefile.mingw
===================================================================
--- branches/soc-2006-file-loggers/src/protocols/qq/Makefile.mingw	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/src/protocols/qq/Makefile.mingw	2006-07-29 21:38:18 UTC (rev 16598)
@@ -82,7 +82,6 @@
 	crypt.c \
 	file_trans.c \
 	group.c \
-	group_admindlg.c \
 	group_conv.c \
 	group_find.c \
 	group_free.c \
@@ -96,7 +95,6 @@
 	group_search.c \
 	header_info.c \
 	im.c \
-	infodlg.c \
 	ip_location.c \
 	keep_alive.c \
 	login_logout.c \

Deleted: branches/soc-2006-file-loggers/src/protocols/qq/TODO
===================================================================
--- branches/soc-2006-file-loggers/src/protocols/qq/TODO	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/src/protocols/qq/TODO	2006-07-29 21:38:18 UTC (rev 16598)
@@ -1,18 +0,0 @@
-* Decide how to handle QQ status icons, which are customizable and legion.
-* Give "Online Offline" and "My Offline" statuses appropriate titles.
-* Handle emoticon at beginning of message via passthrough_unknown_commands.
-* Fix file transfer.
-* QQ protocol currently breaks Chinese localization of Gaim. Fix this.
-* Fix ability to insert images into a conversation via the menubar.
-* Fix _qq_menu_block_buddy in qq.c
-* Eliminate all references to QQWry.dat and the geolocation lookup feature previously present OpenQ.
-* Give smileys verbal instead of numerical titles.
-* Clean up signedness warnings.
-* Clean up mixed declaration and code warnings.
-* Better decomposition: 
-** some of these functions are _really_ long
-** buddy_status.c has a helper function which seems to belong in buddy_status.c
-** consider cleaning up qq_encrypt (nested function declarations)
-** eliminate group_misc.c
-** investigate whether all of these externs are appropriate
-* Check for memory leaks.

Modified: branches/soc-2006-file-loggers/src/protocols/qq/buddy_info.c
===================================================================
--- branches/soc-2006-file-loggers/src/protocols/qq/buddy_info.c	2006-07-29 20:26:50 UTC (rev 16597)
+++ branches/soc-2006-file-loggers/src/protocols/qq/buddy_info.c	2006-07-29 21:38:18 UTC (rev 16598)
@@ -20,11 +20,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-// START OF FILE
-/*****************************************************************************/
 #include "internal.h"		// strlen, _("get_text)
 #include "debug.h"		// gaim_debug
 #include "notify.h"		// gaim_notify
+#include "request.h"		// gaim_request_fields_new
 
 #include "utils.h"		// uid_to_gaim_name
 #include "packet_parse.h"	// MAX_PACKET_SIZE
@@ -32,68 +31,295 @@
 #include "char_conv.h"		// qq_to_utf8
 #include "crypt.h"		// qq_crypt
 #include "header_info.h"	// cmd alias
-#include "infodlg.h"		// info_window
 #include "keep_alive.h"		// qq_update_buddy_contact
 #include "send_core.h"		// qq_send_cmd
 
-// amount of fiedls in user info
-#define QQ_CONTACT_FIELDS 				37
+// Below is all of the information necessary to reconstruct the various
+// information fields that one can set in the official client. When we need
+// to know about a specific field (e.g., should "city" be a choice
+// or text field?), we can simply look it up from the template. Note that
+// there are a number of unidentified fields.
 
-// There is no user id stored in the reply packet for information query
-// we have to manually store the query, so that we know the query source
-typedef struct _qq_info_query {
-	guint32 uid;
-	gboolean show_window;
-	contact_info *ret_info;
-} qq_info_query;
+typedef struct _info_field {
+	gchar *title;
+	gchar *id;		// used by gaim_request fields
+	gint pos;
+	gchar *group;
+	gint group_pos;		// for display order in the UI
+	gint choice;		// indicates which character array contains the choices 
+	gboolean customizable;	// whether a user can enter any text as a value, regardless of choice arrays
+	gchar *value;
+} info_field;
 
-/*****************************************************************************/
-// send a packet to get detailed information of uid,
-// if show_window, a info window will be display upon receiving a reply
+static const info_field info_template_data[] = {
+	{ N_("User ID"), "uid", 		0, QQ_MAIN_INFO, 0, QQ_NO_CHOICE, TRUE, NULL },	
+	{ N_("Nickname"), "nick",		1, QQ_MAIN_INFO, 1, QQ_NO_CHOICE, TRUE, NULL },	
+	{ N_("Country/Region"), "country",	2, QQ_MAIN_INFO, 5, QQ_COUNTRY, TRUE, NULL },
+	{ N_("Province/State"), "province",	3, QQ_MAIN_INFO, 6, QQ_PROVINCE, TRUE, NULL },
+	{ N_("Zipcode"), "zipcode",		4, QQ_EXTRA_INFO, 7, QQ_NO_CHOICE, TRUE, NULL },
+	{ N_("Address"), "address",		5, QQ_EXTRA_INFO, 6, QQ_NO_CHOICE, TRUE, NULL },
+	{ N_("Phone Number"), "tel",		6, QQ_EXTRA_INFO, 9, QQ_NO_CHOICE, TRUE, NULL },
+	{ N_("Age"), "age",			7, QQ_MAIN_INFO, 3, QQ_NO_CHOICE, TRUE, NULL },
+	{ N_("Gender"), "gender",		8, QQ_MAIN_INFO, 4, QQ_GENDER, FALSE, NULL },
+	{ N_("Name"), "name",			9, QQ_MAIN_INFO, 2, QQ_NO_CHOICE, TRUE, NULL },
+	{ N_("Email"), "email",			10, QQ_EXTRA_INFO, 5, QQ_NO_CHOICE, TRUE, NULL },
+	{ "pager_sn", "pager_sn",		11, QQ_MISC, 0, QQ_NO_CHOICE, TRUE, NULL },
+	{ "pager_num", "pager_num",		12, QQ_MISC, 1, QQ_NO_CHOICE, TRUE, NULL },
+	{ "pager_sp", "pager_sp",		13, QQ_MISC, 2, QQ_NO_CHOICE, TRUE, NULL },
+	{ "pager_base_num", "pager_base_num",	14, QQ_MISC, 3, QQ_NO_CHOICE, TRUE, NULL },
+	{ "pager_type", "pager_type",		15, QQ_MISC, 4, QQ_NO_CHOICE, TRUE, NULL },
+	{ N_("Occupation"), "occupation",	16, QQ_EXTRA_INFO, 1, QQ_OCCUPATION, TRUE, NULL },
+	{ N_("Homepage"), "homepage",		17, QQ_EXTRA_INFO, 10, QQ_NO_CHOICE, TRUE, NULL },
+	{ "auth_type", "auth_type",		18, QQ_MISC, 5, QQ_NO_CHOICE, TRUE, NULL },
+	{ "unknown1", "unknown1",		19, QQ_MISC, 6, QQ_NO_CHOICE, TRUE, NULL },
+	{ "unknown2", "unknown2",		20, QQ_MISC, 7, QQ_NO_CHOICE, TRUE, NULL },
+	{ "face", "face",			21, QQ_MISC, 8, QQ_NO_CHOICE, TRUE, NULL },
+	{ N_("Cellphone Number"), "hp_num",	22, QQ_EXTRA_INFO, 8, QQ_NO_CHOICE, TRUE, NULL },
+	{ "hp_type", "hp_type",			23, QQ_MISC, 9, QQ_NO_CHOICE, TRUE, NULL },
+	{ N_("Personal Introduction"), "intro",	24, QQ_PERSONAL_INTRO, 0, QQ_NO_CHOICE, TRUE, NULL },
+	{ N_("City"), "city",			25, QQ_MAIN_INFO, 7, QQ_NO_CHOICE, TRUE, NULL },
+	{ "unknown3", "unknown3",		26, QQ_MISC, 10, QQ_NO_CHOICE, TRUE, NULL },
+	{ "unknown4", "unknown4",		27, QQ_MISC, 11, QQ_NO_CHOICE, TRUE, NULL },
+	{ "unknown5", "unknown5",		28, QQ_MISC, 12, QQ_NO_CHOICE, TRUE, NULL },
+	{ "is_open_hp",	"is_open_hp",		29, QQ_MISC, 13, QQ_NO_CHOICE, TRUE, NULL },
+	{ "is_open_contact", "is_open_contact",	30, QQ_MISC, 14, QQ_NO_CHOICE, TRUE, NULL },
+	{ N_("College"), "college",		31, QQ_EXTRA_INFO, 4, QQ_NO_CHOICE, TRUE, NULL },
+	{ N_("Horoscope Symbol"), "horoscope",	32, QQ_EXTRA_INFO, 0, QQ_HOROSCOPE, FALSE, NULL },
+	{ N_("Zodiac Symbol"), "zodiac",	33, QQ_EXTRA_INFO, 2, QQ_ZODIAC, FALSE, NULL },
+	{ N_("Blood Type"), "blood",		34, QQ_EXTRA_INFO, 3, QQ_BLOOD, FALSE, NULL },
+	{ "qq_show", "qq_show",			35, QQ_MISC, 15, QQ_NO_CHOICE, TRUE, NULL },
+	{ "unknown6", "unknown6",		36, QQ_MISC, 16, QQ_NO_CHOICE, TRUE, NULL },
+	{ NULL,	NULL, 0, NULL, 0, 0, 0, NULL	}	//NULL termination
+};
+
+//TODO: translate these arrays to their English equivalents
+// and move these characters to the zh_CN po file
+static const gchar *horoscope_names[] = {
+	"-", "水瓶座", "双鱼座", "牡羊座", "金牛座",
+	"双子座", "巨蟹座", "狮子座", "处女座", "天秤座",
+        "天蝎座", "射手座", "魔羯座", NULL
+};
+
+static const gchar *zodiac_names[] = {
+	"-", "鼠", "牛", "虎", "兔",
+	"龙", "蛇", "马", "羊", "猴",
+	"鸡", "狗", "猪", NULL
+};
+
+static const gchar *blood_types[] = {
+	"-", N_("A"), N_("B"), N_("O"), N_("AB"), N_("Other"), NULL
+};
+
+static const gchar *genders[] = {
+	N_("Male"),
+	N_("Female"),
+	NULL
+};
+
+static const gchar *country_names[] = {
+        "中国", "中国香港", "中国澳门", "中国台湾",
+        "新加坡", "马来西亚", "美国", NULL
+};
+
+static const gchar *province_names[] = {
+        "北京", "天津", "上海", "重庆", "香港",
+        "河北", "山西", "内蒙古", "辽宁", "吉林",
+        "黑龙江", "江西", "浙江", "江苏", "安徽",
+        "福建", "山东", "河南", "湖北", "湖南",
+        "广东", "广西", "海南", "四川", "贵州",
+        "云南", "西藏", "陕西", "甘肃", "宁夏",
+        "青海", "新疆", "台湾", "澳门", NULL
+};
+
+static const gchar *occupation_names[] = {
+        "全职", "兼职", "制造业", "商业", "失业中",
+        "学生", "工程师", "政府部门", "教育业", "服务行业",
+        "老板", "计算机业", "退休", "金融业",
+        "销售/广告/市场", NULL
+};
+
+static const gint choice_sizes[] = { 0, 13, 13, 6, 2, 7, 34, 15 };
+
+
+static const gchar *info_group_headers[] = {
+       QQ_MAIN_INFO,
+       QQ_EXTRA_INFO,
+       QQ_PERSONAL_INTRO,
+       QQ_MISC
+};
+
+static const gchar **choices[] = {
+        NULL,
+        horoscope_names,
+        zodiac_names,
+        blood_types,
+        genders,
+        country_names,
+        province_names,
+        occupation_names
+};
+
+/*************** info and info_field methods *****************/
+
+// Given an id, return the template for that field.
+// Returns NULL if the id is not found.
+static const info_field *info_field_get_template(const gchar *id)
+{
+	const info_field *cur_field;
+	const gchar *cur_id;
+	
+	cur_field = info_template_data;
+	cur_id = cur_field->id;
+	while(cur_id != NULL) {
+		if (g_ascii_strcasecmp(cur_id, id) == 0) return cur_field;
+		cur_field++;
+		cur_id = cur_field->id;
+	}
+	gaim_debug(GAIM_DEBUG_WARNING, "QQ", "Info field with id %s not found!", id);
+	return NULL;
+}
+
+// info_fields are compared by their group positions

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16677
Author:   roast
Date:     2006-08-08 21:49:19 -0700 (Tue, 08 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16677&view=rev

Log Message:
-----------
merged with svn trunk. 16597:16676.

Modified Paths:
--------------
    branches/soc-2006-file-loggers/COPYRIGHT
    branches/soc-2006-file-loggers/ChangeLog
    branches/soc-2006-file-loggers/Makefile.mingw
    branches/soc-2006-file-loggers/configure.ac
    branches/soc-2006-file-loggers/console/Makefile
    branches/soc-2006-file-loggers/console/gntaccount.c
    branches/soc-2006-file-loggers/console/gntblist.c
    branches/soc-2006-file-loggers/console/gntblist.h
    branches/soc-2006-file-loggers/console/gntconv.c
    branches/soc-2006-file-loggers/console/gntdebug.c
    branches/soc-2006-file-loggers/console/gntdebug.h
    branches/soc-2006-file-loggers/console/gntgaim.c
    branches/soc-2006-file-loggers/console/gntprefs.c
    branches/soc-2006-file-loggers/console/gntprefs.h
    branches/soc-2006-file-loggers/console/gntrequest.c
    branches/soc-2006-file-loggers/console/gntui.c
    branches/soc-2006-file-loggers/console/libgnt/Makefile.am
    branches/soc-2006-file-loggers/console/libgnt/gntbox.c
    branches/soc-2006-file-loggers/console/libgnt/gntbox.h
    branches/soc-2006-file-loggers/console/libgnt/gntbutton.c
    branches/soc-2006-file-loggers/console/libgnt/gntcombobox.c
    branches/soc-2006-file-loggers/console/libgnt/gntentry.c
    branches/soc-2006-file-loggers/console/libgnt/gntlabel.c
    branches/soc-2006-file-loggers/console/libgnt/gntline.c
    branches/soc-2006-file-loggers/console/libgnt/gntmain.c
    branches/soc-2006-file-loggers/console/libgnt/gntstyle.c
    branches/soc-2006-file-loggers/console/libgnt/gntstyle.h
    branches/soc-2006-file-loggers/console/libgnt/gnttextview.c
    branches/soc-2006-file-loggers/console/libgnt/gnttextview.h
    branches/soc-2006-file-loggers/console/libgnt/gnttree.c
    branches/soc-2006-file-loggers/console/libgnt/gnttree.h
    branches/soc-2006-file-loggers/console/libgnt/gntwidget.c
    branches/soc-2006-file-loggers/console/libgnt/gntwidget.h
    branches/soc-2006-file-loggers/console/libgnt/test/combo.c
    branches/soc-2006-file-loggers/console/libgnt/test/multiwin.c
    branches/soc-2006-file-loggers/console/libgnt/test/tv.c
    branches/soc-2006-file-loggers/doc/Makefile.am
    branches/soc-2006-file-loggers/doc/gaim.1.in
    branches/soc-2006-file-loggers/doc/gaims_funniest_home_convos.txt
    branches/soc-2006-file-loggers/gaim.spec.in
    branches/soc-2006-file-loggers/pixmaps/status/default/Makefile.am
    branches/soc-2006-file-loggers/plugins/codeinline.c
    branches/soc-2006-file-loggers/plugins/contact_priority.c
    branches/soc-2006-file-loggers/plugins/dbus-example.c
    branches/soc-2006-file-loggers/plugins/history.c
    branches/soc-2006-file-loggers/plugins/log_reader.c
    branches/soc-2006-file-loggers/plugins/timestamp.c
    branches/soc-2006-file-loggers/po/POTFILES.in
    branches/soc-2006-file-loggers/src/account.c
    branches/soc-2006-file-loggers/src/accountopt.c
    branches/soc-2006-file-loggers/src/blist.c
    branches/soc-2006-file-loggers/src/buddyicon.c
    branches/soc-2006-file-loggers/src/cipher.c
    branches/soc-2006-file-loggers/src/cmds.c
    branches/soc-2006-file-loggers/src/connection.c
    branches/soc-2006-file-loggers/src/conversation.c
    branches/soc-2006-file-loggers/src/core.c
    branches/soc-2006-file-loggers/src/dbus-define-api.h
    branches/soc-2006-file-loggers/src/dbus-server.h
    branches/soc-2006-file-loggers/src/dbus-useful.c
    branches/soc-2006-file-loggers/src/dbus-useful.h
    branches/soc-2006-file-loggers/src/ft.c
    branches/soc-2006-file-loggers/src/gaim-client-example.c
    branches/soc-2006-file-loggers/src/gaim-client.c
    branches/soc-2006-file-loggers/src/gtkaccount.c
    branches/soc-2006-file-loggers/src/gtkblist.c
    branches/soc-2006-file-loggers/src/gtkconv.c
    branches/soc-2006-file-loggers/src/gtkdebug.c
    branches/soc-2006-file-loggers/src/gtkdialogs.c
    branches/soc-2006-file-loggers/src/gtkft.c
    branches/soc-2006-file-loggers/src/gtkimhtml.c
    branches/soc-2006-file-loggers/src/gtkimhtmltoolbar.c
    branches/soc-2006-file-loggers/src/gtklog.c
    branches/soc-2006-file-loggers/src/gtkpluginpref.c
    branches/soc-2006-file-loggers/src/gtkpounce.c
    branches/soc-2006-file-loggers/src/gtkprefs.c
    branches/soc-2006-file-loggers/src/gtkprivacy.c
    branches/soc-2006-file-loggers/src/gtkrequest.c
    branches/soc-2006-file-loggers/src/gtkroomlist.c
    branches/soc-2006-file-loggers/src/gtksound.c
    branches/soc-2006-file-loggers/src/gtkstatusbox.c
    branches/soc-2006-file-loggers/src/gtkthemes.c
    branches/soc-2006-file-loggers/src/gtkutils.c
    branches/soc-2006-file-loggers/src/imgstore.c
    branches/soc-2006-file-loggers/src/log.c
    branches/soc-2006-file-loggers/src/mime.c
    branches/soc-2006-file-loggers/src/mime.h
    branches/soc-2006-file-loggers/src/notify.c
    branches/soc-2006-file-loggers/src/plugin.c
    branches/soc-2006-file-loggers/src/pluginpref.c
    branches/soc-2006-file-loggers/src/pounce.c
    branches/soc-2006-file-loggers/src/prefs.c
    branches/soc-2006-file-loggers/src/protocols/Makefile.am
    branches/soc-2006-file-loggers/src/protocols/bonjour/jabber.c
    branches/soc-2006-file-loggers/src/protocols/jabber/jabber.c
    branches/soc-2006-file-loggers/src/protocols/msn/servconn.c
    branches/soc-2006-file-loggers/src/protocols/oscar/oft.c
    branches/soc-2006-file-loggers/src/protocols/oscar/oscar.c
    branches/soc-2006-file-loggers/src/protocols/qq/Makefile.am
    branches/soc-2006-file-loggers/src/protocols/qq/Makefile.mingw
    branches/soc-2006-file-loggers/src/protocols/qq/buddy_info.c
    branches/soc-2006-file-loggers/src/protocols/qq/buddy_info.h
    branches/soc-2006-file-loggers/src/protocols/qq/buddy_list.c
    branches/soc-2006-file-loggers/src/protocols/qq/buddy_list.h
    branches/soc-2006-file-loggers/src/protocols/qq/buddy_opt.c
    branches/soc-2006-file-loggers/src/protocols/qq/buddy_opt.h
    branches/soc-2006-file-loggers/src/protocols/qq/buddy_status.c
    branches/soc-2006-file-loggers/src/protocols/qq/buddy_status.h
    branches/soc-2006-file-loggers/src/protocols/qq/char_conv.c
    branches/soc-2006-file-loggers/src/protocols/qq/char_conv.h
    branches/soc-2006-file-loggers/src/protocols/qq/crypt.c
    branches/soc-2006-file-loggers/src/protocols/qq/crypt.h
    branches/soc-2006-file-loggers/src/protocols/qq/file_trans.c
    branches/soc-2006-file-loggers/src/protocols/qq/file_trans.h
    branches/soc-2006-file-loggers/src/protocols/qq/group.c
    branches/soc-2006-file-loggers/src/protocols/qq/group.h
    branches/soc-2006-file-loggers/src/protocols/qq/group_conv.c
    branches/soc-2006-file-loggers/src/protocols/qq/group_conv.h
    branches/soc-2006-file-loggers/src/protocols/qq/group_find.c
    branches/soc-2006-file-loggers/src/protocols/qq/group_find.h
    branches/soc-2006-file-loggers/src/protocols/qq/group_free.c
    branches/soc-2006-file-loggers/src/protocols/qq/group_free.h
    branches/soc-2006-file-loggers/src/protocols/qq/group_hash.c
    branches/soc-2006-file-loggers/src/protocols/qq/group_hash.h
    branches/soc-2006-file-loggers/src/protocols/qq/group_im.c
    branches/soc-2006-file-loggers/src/protocols/qq/group_im.h
    branches/soc-2006-file-loggers/src/protocols/qq/group_info.c
    branches/soc-2006-file-loggers/src/protocols/qq/group_info.h
    branches/soc-2006-file-loggers/src/protocols/qq/group_join.c
    branches/soc-2006-file-loggers/src/protocols/qq/group_join.h
    branches/soc-2006-file-loggers/src/protocols/qq/group_misc.c
    branches/soc-2006-file-loggers/src/protocols/qq/group_misc.h
    branches/soc-2006-file-loggers/src/protocols/qq/group_network.c
    branches/soc-2006-file-loggers/src/protocols/qq/group_network.h
    branches/soc-2006-file-loggers/src/protocols/qq/group_opt.c
    branches/soc-2006-file-loggers/src/protocols/qq/group_opt.h
    branches/soc-2006-file-loggers/src/protocols/qq/group_search.c
    branches/soc-2006-file-loggers/src/protocols/qq/group_search.h
    branches/soc-2006-file-loggers/src/protocols/qq/header_info.c
    branches/soc-2006-file-loggers/src/protocols/qq/header_info.h
    branches/soc-2006-file-loggers/src/protocols/qq/im.c
    branches/soc-2006-file-loggers/src/protocols/qq/im.h
    branches/soc-2006-file-loggers/src/protocols/qq/keep_alive.c
    branches/soc-2006-file-loggers/src/protocols/qq/keep_alive.h
    branches/soc-2006-file-loggers/src/protocols/qq/login_logout.c
    branches/soc-2006-file-loggers/src/protocols/qq/login_logout.h
    branches/soc-2006-file-loggers/src/protocols/qq/packet_parse.c
    branches/soc-2006-file-loggers/src/protocols/qq/packet_parse.h
    branches/soc-2006-file-loggers/src/protocols/qq/qq.c
    branches/soc-2006-file-loggers/src/protocols/qq/qq.h
    branches/soc-2006-file-loggers/src/protocols/qq/qq_proxy.c
    branches/soc-2006-file-loggers/src/protocols/qq/qq_proxy.h
    branches/soc-2006-file-loggers/src/protocols/qq/recv_core.c
    branches/soc-2006-file-loggers/src/protocols/qq/recv_core.h
    branches/soc-2006-file-loggers/src/protocols/qq/send_core.c
    branches/soc-2006-file-loggers/src/protocols/qq/send_core.h
    branches/soc-2006-file-loggers/src/protocols/qq/send_file.c
    branches/soc-2006-file-loggers/src/protocols/qq/send_file.h
    branches/soc-2006-file-loggers/src/protocols/qq/sendqueue.c
    branches/soc-2006-file-loggers/src/protocols/qq/sendqueue.h
    branches/soc-2006-file-loggers/src/protocols/qq/sys_msg.c
    branches/soc-2006-file-loggers/src/protocols/qq/sys_msg.h
    branches/soc-2006-file-loggers/src/protocols/qq/udp_proxy_s5.c
    branches/soc-2006-file-loggers/src/protocols/qq/udp_proxy_s5.h
    branches/soc-2006-file-loggers/src/protocols/qq/utils.c
    branches/soc-2006-file-loggers/src/protocols/qq/utils.h
    branches/soc-2006-file-loggers/src/protocols/yahoo/yahoo.c
    branches/soc-2006-file-loggers/src/protocols/yahoo/yahoo_packet.c
    branches/soc-2006-file-loggers/src/protocols/yahoo/yahoo_packet.h
    branches/soc-2006-file-loggers/src/proxy.c
    branches/soc-2006-file-loggers/src/prpl.c
    branches/soc-2006-file-loggers/src/request.c
    branches/soc-2006-file-loggers/src/roomlist.c
    branches/soc-2006-file-loggers/src/server.c
    branches/soc-2006-file-loggers/src/signals.c
    branches/soc-2006-file-loggers/src/status.c
    branches/soc-2006-file-loggers/src/util.c
    branches/soc-2006-file-loggers/src/value.c
    branches/soc-2006-file-loggers/src/whiteboard.c
    branches/soc-2006-file-loggers/src/xmlnode.c

Added Paths:
-----------
    branches/soc-2006-file-loggers/console/gntplugin.c
    branches/soc-2006-file-loggers/console/gntplugin.h
    branches/soc-2006-file-loggers/console/libgnt/gntutils.c
    branches/soc-2006-file-loggers/console/libgnt/gntutils.h
    branches/soc-2006-file-loggers/doc/gntgaim.1.in

Removed Paths:
-------------
    branches/soc-2006-file-loggers/pixmaps/status/default/napster.png
    branches/soc-2006-file-loggers/src/gaim-socket.h
    branches/soc-2006-file-loggers/src/protocols/napster/
    branches/soc-2006-file-loggers/src/protocols/qq/ip_location.c
    branches/soc-2006-file-loggers/src/protocols/qq/ip_location.h
    branches/soc-2006-file-loggers/src/socket.c

Property Changed:
----------------
    branches/soc-2006-file-loggers/doc/
    branches/soc-2006-file-loggers/plugins/codeinline.c
Modified: branches/soc-2006-file-loggers/COPYRIGHT
===================================================================
--- branches/soc-2006-file-loggers/COPYRIGHT	2006-08-09 04:22:08 UTC (rev 16676)
+++ branches/soc-2006-file-loggers/COPYRIGHT	2006-08-09 04:49:19 UTC (rev 16677)
@@ -86,6 +86,7 @@
 Nelson Elhage
 Ignacio J. Elia
 Brian Enigma
+Mattias Eriksson
 Stefan Esser
 Steffen Eschenbacher
 Marc Etcheverry

Modified: branches/soc-2006-file-loggers/ChangeLog
===================================================================
--- branches/soc-2006-file-loggers/ChangeLog	2006-08-09 04:22:08 UTC (rev 16676)
+++ branches/soc-2006-file-loggers/ChangeLog	2006-08-09 04:49:19 UTC (rev 16677)
@@ -152,6 +152,7 @@
 	* SIP/SIMPLE support (Thomas Butter, Google Summer of Code)
 	* Sametime protocol support
 	  Requires the meanwhile library: http://meanwhile.sourceforge.net
+	* Removed support for the napster and toc protocols
 
 	Other Noteworthy Changes:
 	* UPnP and NAT traversal support (Adam J. Warrington, Google Summer of

Modified: branches/soc-2006-file-loggers/Makefile.mingw
===================================================================
--- branches/soc-2006-file-loggers/Makefile.mingw	2006-08-09 04:22:08 UTC (rev 16676)
+++ branches/soc-2006-file-loggers/Makefile.mingw	2006-08-09 04:49:19 UTC (rev 16677)
@@ -21,7 +21,6 @@
 TOC = $(GAIM_PROTOS)/toc
 IRC = $(GAIM_PROTOS)/irc
 JABBER = $(GAIM_PROTOS)/jabber
-NAPSTER = $(GAIM_PROTOS)/napster
 GG = $(GAIM_PROTOS)/gg
 NOVELL = $(GAIM_PROTOS)/novell
 SILC = $(GAIM_PROTOS)/silc
@@ -55,7 +54,6 @@
 TOC_TYPE = PLUGIN
 IRC_TYPE = PLUGIN
 JABBER_TYPE = PLUGIN
-NAPSTER_TYPE = PLUGIN
 GG_TYPE = PLUGIN
 NOVELL_TYPE = PLUGIN
 SILC_TYPE = PLUGIN
@@ -69,7 +67,6 @@
 	$(MAKE) TYPE='$(MSN_TYPE)' -C $(MSN) -f Makefile.mingw
 	$(MAKE) TYPE='$(IRC_TYPE)' -C $(IRC) -f Makefile.mingw
 	$(MAKE) TYPE='$(JABBER_TYPE)' -C $(JABBER) -f Makefile.mingw
-	$(MAKE) TYPE='$(NAPSTER_TYPE)' -C $(NAPSTER) -f Makefile.mingw
 	$(MAKE) TYPE='$(GG_TYPE)' -C $(GG) -f Makefile.mingw
 	$(MAKE) TYPE='$(NOVELL_TYPE)' -C $(NOVELL) -f Makefile.mingw
 	$(MAKE) TYPE='$(SILC_TYPE)' -C $(SILC) -f Makefile.mingw
@@ -91,7 +88,6 @@
 	$(MAKE) TYPE='$(MSN_TYPE)' -C $(MSN) -f Makefile.mingw install
 	$(MAKE) TYPE='$(IRC_TYPE)' -C $(IRC) -f Makefile.mingw install
 	$(MAKE) TYPE='$(JABBER_TYPE)' -C $(JABBER) -f Makefile.mingw install
-	$(MAKE) TYPE='$(NAPSTER_TYPE)' -C $(NAPSTER) -f Makefile.mingw install
 	$(MAKE) TYPE='$(GG_TYPE)' -C $(GG) -f Makefile.mingw install
 	$(MAKE) TYPE='$(NOVELL_TYPE)' -C $(NOVELL) -f Makefile.mingw install
 	$(MAKE) TYPE='$(SILC_TYPE)' -C $(SILC) -f Makefile.mingw install
@@ -119,7 +115,6 @@
 	$(MAKE) -C $(MSN) -f Makefile.mingw clean
 	$(MAKE) -C $(IRC) -f Makefile.mingw clean
 	$(MAKE) -C $(JABBER) -f Makefile.mingw clean
-	$(MAKE) -C $(NAPSTER) -f Makefile.mingw clean
 	$(MAKE) -C $(GG) -f Makefile.mingw clean
 	$(MAKE) -C $(NOVELL) -f Makefile.mingw clean
 	$(MAKE) -C $(SILC) -f Makefile.mingw clean

Modified: branches/soc-2006-file-loggers/configure.ac
===================================================================
--- branches/soc-2006-file-loggers/configure.ac	2006-08-09 04:22:08 UTC (rev 16676)
+++ branches/soc-2006-file-loggers/configure.ac	2006-08-09 04:49:19 UTC (rev 16677)
@@ -1747,6 +1747,7 @@
 		   gaim.service
 		   doc/Makefile
 		   doc/gaim.1
+		   doc/gntgaim.1
 		   m4macros/Makefile
 		   pixmaps/Makefile
 		   pixmaps/smileys/Makefile
@@ -1776,7 +1777,6 @@
 		   src/protocols/irc/Makefile
 		   src/protocols/jabber/Makefile
 		   src/protocols/msn/Makefile
-		   src/protocols/napster/Makefile
 		   src/protocols/novell/Makefile
 		   src/protocols/oscar/Makefile
 		   src/protocols/qq/Makefile

Modified: branches/soc-2006-file-loggers/console/Makefile
===================================================================
--- branches/soc-2006-file-loggers/console/Makefile	2006-08-09 04:22:08 UTC (rev 16676)
+++ branches/soc-2006-file-loggers/console/Makefile	2006-08-09 04:49:19 UTC (rev 16677)
@@ -1,7 +1,7 @@
 VERSION=gntgaim-0.0.0dev
 CC=gcc
 CFLAGS=`pkg-config --cflags gaim gobject-2.0 gnt` -g -Wall -DVERSION=\"$(VERSION)\" -DSTANDALONE
-LDFLAGS=`pkg-config --libs gaim gobject-2.0 libxml-2.0 gnt` -pg
+LDFLAGS=`pkg-config --libs gaim gobject-2.0 libxml-2.0 gnt` -pg -lgaim
 
 GG_SOURCES = \
 	gntaccount.c \
@@ -10,6 +10,7 @@
 	gntconv.c \
 	gntdebug.c \
 	gntnotify.c \
+	gntplugin.c \
 	gntprefs.c \
 	gntrequest.c \
 	gntui.c
@@ -22,6 +23,7 @@
 	gntdebug.h \
 	gntnotify.h \
 	gntprefs.h \
+	gntplugin.h \
 	gntrequest.h \
 	gntui.h
 
@@ -32,6 +34,7 @@
 	gntconv.o \
 	gntdebug.o \
 	gntnotify.o \
+	gntplugin.o \
 	gntprefs.o \
 	gntrequest.o \
 	gntui.o

Modified: branches/soc-2006-file-loggers/console/gntaccount.c
===================================================================
--- branches/soc-2006-file-loggers/console/gntaccount.c	2006-08-09 04:22:08 UTC (rev 16676)
+++ branches/soc-2006-file-loggers/console/gntaccount.c	2006-08-09 04:49:19 UTC (rev 16677)
@@ -49,6 +49,9 @@
 	GntWidget *remember;
 } AccountEditDialog;
 
+/* This is necessary to close an edit-dialog when an account is deleted */
+static GList *accountdialogs;
+
 static void
 account_add(GaimAccount *account)
 {
@@ -64,6 +67,7 @@
 static void
 edit_dialog_destroy(AccountEditDialog *dialog)
 {
+	accountdialogs = g_list_remove(accountdialogs, dialog);
 	g_list_free(dialog->prpl_entries);
 	g_list_free(dialog->split_entries);
 	g_free(dialog);
@@ -143,7 +147,6 @@
 		gaim_account_set_password(account, NULL);
 
 	/* Mail notification */
-	/* XXX: Only if the protocol has anything to do with emails */
 	gaim_account_set_check_mail(account,
 			gnt_check_box_get_checked(GNT_CHECK_BOX(dialog->newmail)));
 
@@ -210,8 +213,9 @@
 	}
 	else
 	{
-		dialog->splits = gnt_box_new(FALSE, TRUE);
+		dialog->splits = gnt_vbox_new(FALSE);
 		gnt_box_set_pad(GNT_BOX(dialog->splits), 0);
+		gnt_box_set_fill(GNT_BOX(dialog->splits), TRUE);
 	}
 
 	dialog->split_entries = NULL;
@@ -229,7 +233,7 @@
 		GntWidget *entry;
 		char *buf;
 
-		hbox = gnt_box_new(TRUE, FALSE);
+		hbox = gnt_hbox_new(TRUE);
 		gnt_box_add_widget(GNT_BOX(dialog->splits), hbox);
 
 		buf = g_strdup_printf("%s:", gaim_account_user_split_get_text(split));
@@ -426,18 +430,32 @@
 	GList *list, *iter;
 	AccountEditDialog *dialog;
 
+	if (account)
+	{
+		GList *iter;
+		for (iter = accountdialogs; iter; iter = iter->next)
+		{
+			AccountEditDialog *dlg = iter->data;
+			if (dlg->account == account)
+				return;
+		}
+	}
+
 	dialog = g_new0(AccountEditDialog, 1);
+	accountdialogs = g_list_prepend(accountdialogs, dialog);
 
-	dialog->window = window = gnt_box_new(FALSE, TRUE);
+	dialog->window = window = gnt_vbox_new(FALSE);
 	dialog->account = account;
 	gnt_box_set_toplevel(GNT_BOX(window), TRUE);
 	gnt_box_set_title(GNT_BOX(window), account ? _("Modify Account") : _("New Account"));
 	gnt_box_set_alignment(GNT_BOX(window), GNT_ALIGN_MID);
 	gnt_box_set_pad(GNT_BOX(window), 0);
+	gnt_widget_set_name(window, "edit-account");
+	gnt_box_set_fill(GNT_BOX(window), TRUE);
 
-	hbox = gnt_box_new(TRUE, FALSE);
+	hbox = gnt_hbox_new(TRUE);
+	gnt_box_set_pad(GNT_BOX(hbox), 0);
 	gnt_box_add_widget(GNT_BOX(window), hbox);
-	gnt_box_set_alignment(GNT_BOX(hbox), GNT_ALIGN_MID);
 
 	dialog->protocol = combo = gnt_combo_box_new();
 	list = gaim_plugins_get_protocols();
@@ -446,6 +464,7 @@
 		gnt_combo_box_add_data(GNT_COMBO_BOX(combo), iter->data,
 				((GaimPlugin*)iter->data)->info->name);
 	}
+
 	if (account)
 		gnt_combo_box_set_selected(GNT_COMBO_BOX(combo),
 				gaim_plugins_find_with_id(gaim_account_get_protocol_id(account)));
@@ -453,10 +472,12 @@
 		gnt_combo_box_set_selected(GNT_COMBO_BOX(combo), list->data);
 
 	g_signal_connect(G_OBJECT(combo), "selection-changed", G_CALLBACK(prpl_changed_cb), dialog);
+
 	gnt_box_add_widget(GNT_BOX(hbox), gnt_label_new(_("Protocol:")));
 	gnt_box_add_widget(GNT_BOX(hbox), combo);
 
-	hbox = gnt_box_new(TRUE, FALSE);
+	hbox = gnt_hbox_new(TRUE);
+	gnt_box_set_pad(GNT_BOX(hbox), 0);
 	gnt_box_add_widget(GNT_BOX(window), hbox);
 
 	dialog->screenname = entry = gnt_entry_new(NULL);
@@ -467,7 +488,8 @@
 	update_user_splits(dialog);
 	gnt_box_add_widget(GNT_BOX(window), dialog->splits);
 
-	hbox = gnt_box_new(TRUE, FALSE);
+	hbox = gnt_hbox_new(TRUE);
+	gnt_box_set_pad(GNT_BOX(hbox), 0);
 	gnt_box_add_widget(GNT_BOX(window), hbox);
 
 	dialog->password = entry = gnt_entry_new(NULL);
@@ -477,7 +499,8 @@
 	if (account)
 		gnt_entry_set_text(GNT_ENTRY(entry), gaim_account_get_password(account));
 
-	hbox = gnt_box_new(TRUE, FALSE);
+	hbox = gnt_hbox_new(TRUE);
+	gnt_box_set_pad(GNT_BOX(hbox), 0);
 	gnt_box_add_widget(GNT_BOX(window), hbox);
 
 	dialog->alias = entry = gnt_entry_new(NULL);
@@ -500,8 +523,9 @@
 	/* TODO: Add proxy options */
 
 	/* The button box */
-	hbox = gnt_box_new(FALSE, FALSE);
+	hbox = gnt_hbox_new(FALSE);
 	gnt_box_add_widget(GNT_BOX(window), hbox);
+	gnt_box_set_alignment(GNT_BOX(hbox), GNT_ALIGN_MID);
 
 	button = gnt_button_new(_("Cancel"));
 	gnt_box_add_widget(GNT_BOX(hbox), button);
@@ -534,10 +558,38 @@
 }
 
 static void
+really_delete_account(GaimAccount *account)
+{
+	GList *iter;
+	for (iter = accountdialogs; iter; iter = iter->next)
+	{
+		AccountEditDialog *dlg = iter->data;
+		if (dlg->account == account)
+		{
+			gnt_widget_destroy(dlg->window);
+			break;
+		}
+	}
+	gaim_accounts_delete(account);
+}
+
+static void
 delete_account_cb(GntWidget *widget, GntTree *tree)
 {
-	/* XXX: After the request-api is complete */
-	/* Note: remove the modify-dialog for the account */
+	GaimAccount *account;
+	char *prompt;
+
+	account  = gnt_tree_get_selection_data(tree);
+	if (!account)
+		return;
+
+	prompt = g_strdup_printf(_("Are you sure you want to delete %s?"),
+			gaim_account_get_username(account));
+
+	gaim_request_close_with_handle(account); /* Close any other opened delete window */
+	gaim_request_action(account, _("Delete Account"), prompt, NULL, 0, account, 2,
+			_("Delete"), really_delete_account, _("Cancel"), NULL);
+	g_free(prompt);
 }
 
 static void
@@ -548,12 +600,19 @@
 	gaim_account_set_enabled(account, GAIM_GNT_UI, gnt_tree_get_choice(GNT_TREE(widget), key));
 }
 
+static void
+reset_accounts_win(GntWidget *widget, gpointer null)
+{
+	accounts.window = NULL;
+	accounts.tree = NULL;
+}
+
 void gg_accounts_show_all()
 {
 	GList *iter;
 	GntWidget *box, *button;
 
-	accounts.window = gnt_box_new(FALSE, TRUE);
+	accounts.window = gnt_vbox_new(FALSE);
 	gnt_box_set_toplevel(GNT_BOX(accounts.window), TRUE);
 	gnt_box_set_title(GNT_BOX(accounts.window), _("Accounts"));
 	gnt_box_set_pad(GNT_BOX(accounts.window), 0);
@@ -582,7 +641,7 @@
 
 	gnt_box_add_widget(GNT_BOX(accounts.window), gnt_line_new(FALSE));
 
-	box = gnt_box_new(FALSE, FALSE);
+	box = gnt_hbox_new(FALSE);
 
 	button = gnt_button_new(_("Add"));
 	gnt_box_add_widget(GNT_BOX(box), button);
@@ -597,6 +656,8 @@
 	g_signal_connect(G_OBJECT(button), "activate", G_CALLBACK(delete_account_cb), accounts.tree);
 	
 	gnt_box_add_widget(GNT_BOX(accounts.window), box);
+
+	g_signal_connect(G_OBJECT(accounts.window), "destroy", G_CALLBACK(reset_accounts_win), NULL);
 	
 	gnt_widget_show(accounts.window);
 }
@@ -641,7 +702,8 @@
 
 void gg_accounts_uninit()
 {
-	gnt_widget_destroy(accounts.window);
+	if (accounts.window)
+		gnt_widget_destroy(accounts.window);
 }
 
 /* The following uiops stuff are copied from gtkaccount.c */

Modified: branches/soc-2006-file-loggers/console/gntblist.c
===================================================================
--- branches/soc-2006-file-loggers/console/gntblist.c	2006-08-09 04:22:08 UTC (rev 16676)
+++ branches/soc-2006-file-loggers/console/gntblist.c	2006-08-09 04:49:19 UTC (rev 16677)
@@ -1,18 +1,26 @@
 #include <account.h>
 #include <blist.h>
 #include <request.h>
+#include <savedstatuses.h>
 #include <server.h>
 #include <signal.h>
+#include <status.h>
 #include <util.h>
 
 #include "gntgaim.h"
 #include "gntbox.h"
+#include "gntcombobox.h"
+#include "gntentry.h"
 #include "gntlabel.h"
+#include "gntline.h"
 #include "gnttree.h"
 
 #include "gntblist.h"
 #include <string.h>
 
+#define PREF_ROOT "/gaim/gnt/blist"
+#define TYPING_TIMEOUT 4000
+
 typedef struct
 {
 	GntWidget *window;
@@ -23,8 +31,29 @@
 
 	GntWidget *context;
 	GaimBlistNode *cnode;
+
+	/* XXX: I am KISSing */
+	GntWidget *status;          /* Dropdown with the statuses  */
+	GntWidget *statustext;      /* Status message */
+	int typing;
 } GGBlist;
 
+typedef enum
+{
+	STATUS_PRIMITIVE = 0,
+	STATUS_SAVED
+} StatusType;
+
+typedef struct
+{
+	StatusType type;
+	union
+	{
+		GaimStatusPrimitive prim;
+		GaimSavedStatus *saved;
+	} u;
+} StatusBoxItem;
+
 GGBlist *ggblist;
 
 static void add_buddy(GaimBuddy *buddy, GGBlist *ggblist);
@@ -32,7 +61,9 @@
 static void add_chat(GaimChat *chat, GGBlist *ggblist);
 static void add_node(GaimBlistNode *node, GGBlist *ggblist);
 static void draw_tooltip(GGBlist *ggblist);
+static gboolean remove_typing_cb(gpointer null);
 static void remove_peripherals(GGBlist *ggblist);
+static const char * get_display_name(GaimBlistNode *node);
 
 static void
 new_node(GaimBlistNode *node)
@@ -63,7 +94,7 @@
 {
 	GGBlist *ggblist = list->ui_data;
 
-	if (node->ui_data == NULL)
+	if (ggblist == NULL || node->ui_data == NULL)
 		return;
 
 	gnt_tree_remove(GNT_TREE(ggblist->tree), node);
@@ -82,6 +113,15 @@
 static void
 node_update(GaimBuddyList *list, GaimBlistNode *node)
 {
+	if (list->ui_data == NULL)
+		return;
+
+	if (node->ui_data != NULL)
+	{
+		gnt_tree_change_text(GNT_TREE(ggblist->tree), node,
+				0, get_display_name(node));
+	}
+
 	if (GAIM_BLIST_NODE_IS_BUDDY(node))
 	{
 		GaimBuddy *buddy = (GaimBuddy*)node;
@@ -101,7 +141,7 @@
 {
 }
 
-static GaimBlistUiOps blist_ui_ops = 
+static GaimBlistUiOps blist_ui_ops =
 {
 	new_list,
 	new_node,
@@ -131,7 +171,7 @@
 		return;
 	gnt_tree_remove(GNT_TREE(ggblist->tree), group);
 	node->ui_data = gnt_tree_add_row_after(GNT_TREE(ggblist->tree), group,
-			gnt_tree_create_row(GNT_TREE(ggblist->tree), group->name), NULL, NULL);
+			gnt_tree_create_row(GNT_TREE(ggblist->tree), get_display_name(node)), NULL, NULL);
 }
 
 static const char *
@@ -175,6 +215,8 @@
 
 		strncpy(status, "~", sizeof(status) - 1);
 	}
+	else if (GAIM_BLIST_NODE_IS_GROUP(node))
+		return ((GaimGroup*)node)->name;
 
 	snprintf(text, sizeof(text) - 1, "%s %s", status, name);
 
@@ -188,6 +230,8 @@
 	GaimBlistNode *node = (GaimBlistNode *)chat;
 	if (node->ui_data)
 		return;
+	if (!gaim_account_is_connected(chat->account))
+		return;
 
 	group = gaim_chat_get_group(chat);
 	add_node((GaimBlistNode*)group, ggblist);
@@ -274,7 +318,9 @@
 gnt_append_menu_action(GntTree *tree, GaimMenuAction *action, gpointer parent)
 {
 	GList *list;
-	
+	if (action == NULL)
+		return;
+
 	gnt_tree_add_row_after(tree, action,
 			gnt_tree_create_row(tree, action->label), parent, NULL);
 	for (list = action->children; list; list = list->next)
@@ -351,7 +397,7 @@
 	add_custom_action(tree, _("View Log"),
 			GAIM_CALLBACK(gg_blist_view_log_cb)), buddy);
 #endif
-	
+
 	/* Protocol actions */
 	append_proto_menu(tree,
 			gaim_account_get_connection(gaim_buddy_get_account(buddy)),
@@ -380,15 +426,54 @@
 	{
 		void (*callback)(GaimBlistNode *, gpointer);
 		callback = (void (*)(GaimBlistNode *, gpointer))action->callback;
-		callback(node, action->data);
+		if (callback)
+			callback(node, action->data);
+		else
+			return;
 	}
 
 	remove_context_menu(ggblist);
 }
 
 static void
+rename_blist_node(GaimBlistNode *node, const char *newname)
+{
+	const char *name = newname;
+	if (name && !*name)
+		name = NULL;
+
+	if (GAIM_BLIST_NODE_IS_BUDDY(node))
+		gaim_blist_alias_buddy((GaimBuddy*)node, name);
+	else if (GAIM_BLIST_NODE_IS_CHAT(node))
+		gaim_blist_alias_chat((GaimChat*)node, name);
+	else if (GAIM_BLIST_NODE_IS_GROUP(node))
+		gaim_blist_rename_group((GaimGroup*)node, name);
+	else
+		g_return_if_reached();
+}
+
+static void
 gg_blist_rename_node_cb(GaimBlistNode *node, GaimBlistNode *null)
 {
+	const char *name = NULL;
+	char *prompt;
+
+	if (GAIM_BLIST_NODE_IS_BUDDY(node))
+		name = gaim_buddy_get_contact_alias((GaimBuddy*)node);
+	else if (GAIM_BLIST_NODE_IS_CHAT(node))
+		name = gaim_chat_get_name((GaimChat*)node);
+	else if (GAIM_BLIST_NODE_IS_GROUP(node))
+		name = ((GaimGroup*)node)->name;
+	else
+		g_return_if_reached();
+
+	prompt = g_strdup_printf(_("Please enter the new name for %s"), name);
+
+	gaim_request_input(node, _("Rename"), prompt, _("Enter empty string to reset the name."),
+			name, FALSE, FALSE, NULL, _("Rename"), G_CALLBACK(rename_blist_node),
+			_("Cancel"), NULL, node);
+
+	g_free(prompt);
 }
 
 /* XXX: This still doesn't do anything, because request doesn't have a ui yet */
@@ -472,7 +557,8 @@
 	window = gnt_vbox_new(FALSE);
 	gnt_box_set_toplevel(GNT_BOX(window), TRUE);
 	gnt_box_set_title(GNT_BOX(window), title);
-			
+
+	gnt_widget_set_size(context, 0, g_list_length(GNT_TREE(context)->list));
 	gnt_box_add_widget(GNT_BOX(window), context);
 
 	/* Set the position for the popup */
@@ -593,6 +679,7 @@
 
 	gnt_widget_set_position(box, x, y);
 	GNT_WIDGET_UNSET_FLAGS(box, GNT_WIDGET_CAN_TAKE_FOCUS);
+	GNT_WIDGET_SET_FLAGS(box, GNT_WIDGET_TRANSIENT);
 	gnt_widget_draw(box);
 
 	g_free(title);
@@ -626,7 +713,7 @@
 		ret = gnt_widget_key_pressed(ggblist->context, text);
 		stop = TRUE;
 	}
-	
+
 	if (text[0] == 27)
 	{
 		if (strcmp(text + 1, GNT_KEY_POPUP) == 0)
@@ -677,13 +764,243 @@
 		remove_context_menu(ggblist);
 }
 
+static void
+size_changed_cb(GntWidget *w, int width, int height)
+{
+	gaim_prefs_set_int(PREF_ROOT "/size/width", width);
+	gaim_prefs_set_int(PREF_ROOT "/size/height", height);
+}
+
+static void
+save_position_cb(GntWidget *w, int x, int y)
+{
+	gaim_prefs_set_int(PREF_ROOT "/position/x", x);
+	gaim_prefs_set_int(PREF_ROOT "/position/y", y);
+}
+
+static void
+reset_blist_window(GntWidget *window, gpointer null)
+{
+	GaimBlistNode *node;
+	gaim_signals_disconnect_by_handle(gg_blist_get_handle());
+	gaim_get_blist()->ui_data = NULL;
+
+	node = gaim_blist_get_root();
+	while (node)
+	{
+		node->ui_data = NULL;
+		node = gaim_blist_node_next(node, TRUE);
+	}
+
+	remove_typing_cb(NULL);
+	remove_peripherals(ggblist);
+	g_free(ggblist);
+	ggblist = NULL;
+}
+
+static void
+populate_buddylist()
+{
+	GaimBlistNode *node;
+	GaimBuddyList *list;
+
+	list = gaim_get_blist();
+	node = gaim_blist_get_root();
+	while (node)
+	{
+		node_update(list, node);
+		node = gaim_blist_node_next(node, FALSE);
+	}
+}
+
+static void
+destroy_status_list(GList *list)
+{
+	g_list_foreach(list, (GFunc)g_free, NULL);
+	g_list_free(list);
+}
+
+static void
+populate_status_dropdown()
+{
+	int i;
+	GList *iter;
+	GList *items = NULL;
+
+	/* First the primitives */
+	GaimStatusPrimitive prims[] = {GAIM_STATUS_AVAILABLE, GAIM_STATUS_AWAY,
+			GAIM_STATUS_INVISIBLE, GAIM_STATUS_OFFLINE, GAIM_STATUS_UNSET};
+
+	for (i = 0; prims[i] != GAIM_STATUS_UNSET; i++)
+	{
+		StatusBoxItem *item = g_new0(StatusBoxItem, 1);
+		item->type = STATUS_PRIMITIVE;
+		item->u.prim = prims[i];
+		items = g_list_prepend(items, item);
+		gnt_combo_box_add_data(GNT_COMBO_BOX(ggblist->status), item,
+				gaim_primitive_get_name_from_type(prims[i]));
+	}
+
+	/* Now the popular statuses */
+	for (iter = gaim_savedstatuses_get_popular(6); iter; iter = iter->next)
+	{
+		StatusBoxItem *item = g_new0(StatusBoxItem, 1);
+		item->type = STATUS_SAVED;
+		item->u.saved = iter->data;
+		items = g_list_prepend(items, item);
+		gnt_combo_box_add_data(GNT_COMBO_BOX(ggblist->status), item,
+				gaim_savedstatus_get_title(iter->data));
+	}
+
+	/* The keys for the combobox are created here, and never used
+	 * anywhere else. So make sure the keys are freed when the widget
+	 * is destroyed. */
+	g_object_set_data_full(G_OBJECT(ggblist->status), "list of statuses", items, (GDestroyNotify)destroy_status_list);
+}
+
 void gg_blist_init()
 {
+	gaim_prefs_add_none(PREF_ROOT);
+	gaim_prefs_add_none(PREF_ROOT "/size");
+	gaim_prefs_add_int(PREF_ROOT "/size/width", 20);
+	gaim_prefs_add_int(PREF_ROOT "/size/height", 20);
+	gaim_prefs_add_none(PREF_ROOT "/position");
+	gaim_prefs_add_int(PREF_ROOT "/position/x", 0);
+	gaim_prefs_add_int(PREF_ROOT "/position/y", 0);
+
+	gg_blist_show();
+
+	return;
+}
+
+static gboolean
+remove_typing_cb(gpointer null)
+{
+	GaimSavedStatus *current;
+	const char *message, *newmessage;
+	GaimStatusPrimitive prim, newprim;
+	StatusBoxItem *item;
+
+	current = gaim_savedstatus_get_current();
+	message = gaim_savedstatus_get_message(current);
+	prim = gaim_savedstatus_get_type(current);
+
+	newmessage = gnt_entry_get_text(GNT_ENTRY(ggblist->statustext));
+	item = gnt_combo_box_get_selected_data(GNT_COMBO_BOX(ggblist->status));
+	g_return_val_if_fail(item->type == STATUS_PRIMITIVE, FALSE);
+	newprim = item->u.prim;
+
+	if (newprim != prim || ((message && !newmessage) ||
+				(!message && newmessage) ||
+				(message && newmessage && g_utf8_collate(message, newmessage) != 0)))
+	{
+		GaimSavedStatus *status = gaim_savedstatus_find_transient_by_type_and_message(newprim, newmessage);
+									/* Holy Crap! That's a LAWNG function name */
+		if (status == NULL)
+		{
+			status = gaim_savedstatus_new(NULL, newprim);
+			gaim_savedstatus_set_message(status, newmessage);
+		}
+
+		gaim_savedstatus_activate(status);
+	}
+
+	gnt_box_give_focus_to_child(GNT_BOX(ggblist->window), ggblist->tree);
+	if (ggblist->typing)
+		g_source_remove(ggblist->typing);
+	ggblist->typing = 0;
+	return FALSE;
+}
+
+static void
+status_selection_changed(GntComboBox *box, StatusBoxItem *old, StatusBoxItem *now, gpointer null)
+{
+	gnt_entry_set_text(GNT_ENTRY(ggblist->statustext), NULL);
+	if (now->type == STATUS_SAVED)
+	{
+		/* Set the status immediately */
+		gaim_savedstatus_activate(now->u.saved);
+	}
+	else if (now->type == STATUS_PRIMITIVE)
+	{
+		/* Move the focus to the entry box */
+		/* XXX: Make sure the selected status can have a message */
+		gnt_box_move_focus(GNT_BOX(ggblist->window), 1);
+		ggblist->typing = g_timeout_add(TYPING_TIMEOUT, (GSourceFunc)remove_typing_cb, NULL);
+	}
+	else
+		g_return_if_reached();
+}
+
+static gboolean
+status_text_changed(GntEntry *entry, const char *text, gpointer null)
+{
+	if ((text[0] == 27 || (text[0] == '\t' && text[1] == '\0')) && ggblist->typing == 0)
+		return FALSE;
+
+	if (ggblist->typing)
+		g_source_remove(ggblist->typing);
+	ggblist->typing = 0;
+
+	if (text[0] == '\r' && text[1] == 0)
+	{
+		/* Set the status only after you press 'Enter' */
+		remove_typing_cb(NULL);
+		return TRUE;
+	}
+
+	ggblist->typing = g_timeout_add(TYPING_TIMEOUT, (GSourceFunc)remove_typing_cb, NULL);
+	return FALSE;
+}
+
+static void
+savedstatus_changed(GaimSavedStatus *now, GaimSavedStatus *old)
+{
+	/* Block the signals we don't want to emit */
+	GList *list;
+	GaimStatusPrimitive prim;
+	const char *message;
+
+	if (!ggblist)
+		return;
+
+	g_signal_handlers_block_matched(ggblist->status, G_SIGNAL_MATCH_FUNC,
+			0, 0, NULL, status_selection_changed, NULL);
+	g_signal_handlers_block_matched(ggblist->statustext, G_SIGNAL_MATCH_FUNC,
+			0, 0, NULL, status_text_changed, NULL);
+
+	prim = gaim_savedstatus_get_type(now);
+	message = gaim_savedstatus_get_message(now);
+
+	list = g_object_get_data(G_OBJECT(ggblist->status), "list of statuses");
+	for (; list; list = list->next)
+	{
+		StatusBoxItem *item = list->data;
+		if (item->type == STATUS_PRIMITIVE && item->u.prim == prim)
+		{
+			gnt_combo_box_set_selected(GNT_COMBO_BOX(ggblist->status), item);
+			gnt_entry_set_text(GNT_ENTRY(ggblist->statustext), message);
+			gnt_widget_draw(ggblist->status);
+			break;
+		}
+	}
+
+	g_signal_handlers_unblock_matched(ggblist->status, G_SIGNAL_MATCH_FUNC,
+			0, 0, NULL, status_selection_changed, NULL);
+	g_signal_handlers_unblock_matched(ggblist->statustext, G_SIGNAL_MATCH_FUNC,
+			0, 0, NULL, status_text_changed, NULL);
+}
+
+void gg_blist_show()
+{
+	if (ggblist)
+		return;
+
 	ggblist = g_new0(GGBlist, 1);
 
 	gaim_get_blist()->ui_data = ggblist;
 
-	ggblist->window = gnt_box_new(FALSE, FALSE);
+	ggblist->window = gnt_vbox_new(FALSE);
 	gnt_widget_set_name(ggblist->window, "buddylist");
 	gnt_box_set_toplevel(GNT_BOX(ggblist->window), TRUE);
 	gnt_box_set_title(GNT_BOX(ggblist->window), _("Buddy List"));
@@ -692,16 +1009,29 @@
 	ggblist->tree = gnt_tree_new();
 	GNT_WIDGET_SET_FLAGS(ggblist->tree, GNT_WIDGET_NO_BORDER);
 	gnt_tree_set_col_width(GNT_TREE(ggblist->tree), 0, 25);
-	gnt_widget_set_size(ggblist->tree, 0, getmaxy(stdscr) - 4);
+	gnt_widget_set_size(ggblist->tree, gaim_prefs_get_int(PREF_ROOT "/size/width"),
+			gaim_prefs_get_int(PREF_ROOT "/size/height"));
+	gnt_widget_set_position(ggblist->window, gaim_prefs_get_int(PREF_ROOT "/position/x"),
+			gaim_prefs_get_int(PREF_ROOT "/position/y"));
 
 	gnt_box_add_widget(GNT_BOX(ggblist->window), ggblist->tree);
+
+	gnt_box_add_widget(GNT_BOX(ggblist->window), gnt_hline_new());
+
+	ggblist->status = gnt_combo_box_new();
+	gnt_box_add_widget(GNT_BOX(ggblist->window), ggblist->status);
+	ggblist->statustext = gnt_entry_new(NULL);
+	gnt_box_add_widget(GNT_BOX(ggblist->window), ggblist->statustext);
+
+	populate_status_dropdown();
+
 	gnt_widget_show(ggblist->window);
 
 	gaim_signal_connect(gaim_blist_get_handle(), "buddy-status-changed", gg_blist_get_handle(),
 				GAIM_CALLBACK(buddy_status_changed), ggblist);
 	gaim_signal_connect(gaim_blist_get_handle(), "buddy-idle-changed", gg_blist_get_handle(),
 				GAIM_CALLBACK(buddy_idle_changed), ggblist);
-	
+
 #if 0
 	gaim_signal_connect(gaim_blist_get_handle(), "buddy-signed-on", gg_blist_get_handle(),
 				GAIM_CALLBACK(buddy_signed_on), ggblist);
@@ -725,10 +1055,28 @@
 				ggblist, 0, G_CONNECT_AFTER | G_CONNECT_SWAPPED);
 	g_signal_connect_data(G_OBJECT(ggblist->tree), "lost-focus", G_CALLBACK(remove_peripherals),
 				ggblist, 0, G_CONNECT_AFTER | G_CONNECT_SWAPPED);
+	g_signal_connect(G_OBJECT(ggblist->tree), "size_changed", G_CALLBACK(size_changed_cb), NULL);
+	g_signal_connect(G_OBJECT(ggblist->window), "position_set", G_CALLBACK(save_position_cb), NULL);
+	g_signal_connect(G_OBJECT(ggblist->window), "destroy", G_CALLBACK(reset_blist_window), NULL);
+
+	/* Status signals */
+	gaim_signal_connect(gaim_savedstatuses_get_handle(), "savedstatus-changed", gg_blist_get_handle(),
+				GAIM_CALLBACK(savedstatus_changed), NULL);
+	g_signal_connect(G_OBJECT(ggblist->status), "selection_changed",
+				G_CALLBACK(status_selection_changed), NULL);
+	g_signal_connect(G_OBJECT(ggblist->statustext), "key_pressed",
+				G_CALLBACK(status_text_changed), NULL);
+
+	populate_buddylist();
+
+	savedstatus_changed(gaim_savedstatus_get_current(), NULL);
 }
 
 void gg_blist_uninit()
 {
+	if (ggblist == NULL)
+		return;
+
 	gnt_widget_destroy(ggblist->window);
 	g_free(ggblist);
 	ggblist = NULL;

Modified: branches/soc-2006-file-loggers/console/gntblist.h
===================================================================
--- branches/soc-2006-file-loggers/console/gntblist.h	2006-08-09 04:22:08 UTC (rev 16676)
+++ branches/soc-2006-file-loggers/console/gntblist.h	2006-08-09 04:49:19 UTC (rev 16677)
@@ -6,6 +6,8 @@
 
 void gg_blist_uninit();
 
+void gg_blist_show();
+
 void gg_blist_get_position(int *x, int *y);
 
 void gg_blist_set_position(int x, int y);

Modified: branches/soc-2006-file-loggers/console/gntconv.c
===================================================================
--- branches/soc-2006-file-loggers/console/gntconv.c	2006-08-09 04:22:08 UTC (rev 16676)
+++ branches/soc-2006-file-loggers/console/gntconv.c	2006-08-09 04:49:19 UTC (rev 16677)
@@ -1,17 +1,24 @@
 #include <string.h>
 
 #include <cmds.h>
+#include <prefs.h>
 #include <util.h>
 
 #include "gntgaim.h"
+#include "gntaccount.h"
 #include "gntblist.h"
 #include "gntconv.h"
+#include "gntdebug.h"
+#include "gntplugin.h"
+#include "gntprefs.h"
 
 #include "gnt.h"
 #include "gntbox.h"
 #include "gntentry.h"
 #include "gnttextview.h"
 
+#define PREF_ROOT	"/gaim/gnt/conversations"
+
 GHashTable *ggconvs;
 
 typedef struct _GGConv GGConv;
@@ -101,17 +108,20 @@
 		}
 		else
 		{
+			char *escape = g_markup_escape_text(text, -1);
 			switch (gaim_conversation_get_type(ggconv->conv))
 			{
 				case GAIM_CONV_TYPE_IM:
-					gaim_conv_im_send_with_flags(GAIM_CONV_IM(ggconv->conv), text, GAIM_MESSAGE_SEND);
+					gaim_conv_im_send_with_flags(GAIM_CONV_IM(ggconv->conv), escape, GAIM_MESSAGE_SEND);
 					break;
 				case GAIM_CONV_TYPE_CHAT:
-					gaim_conv_chat_send(GAIM_CONV_CHAT(ggconv->conv), text);
+					gaim_conv_chat_send(GAIM_CONV_CHAT(ggconv->conv), escape);
 					break;
 				default:
+					g_free(escape);
 					g_return_val_if_reached(FALSE);
 			}
+			g_free(escape);
 		}
 		gnt_entry_clear(GNT_ENTRY(ggconv->entry));
 		return TRUE;
@@ -142,19 +152,29 @@
 }
 
 static void
+size_changed_cb(GntWidget *w, int width, int height)
+{
+	gaim_prefs_set_int(PREF_ROOT "/size/width", width);
+	gaim_prefs_set_int(PREF_ROOT "/size/height", height);
+}
+
+static void
+save_position_cb(GntWidget *w, int x, int y)
+{
+	gaim_prefs_set_int(PREF_ROOT "/position/x", x);
+	gaim_prefs_set_int(PREF_ROOT "/position/y", y);
+}
+
+static void
 gg_create_conversation(GaimConversation *conv)
 {
 	GGConv *ggc = g_hash_table_lookup(ggconvs, conv);
 	char *title;
 	GaimConversationType type;
-	int x, width;
 
 	if (ggc)
 		return;
 
-	gg_blist_get_position(&x, NULL);
-	gg_blist_get_size(&width, NULL);
-
 	ggc = g_new0(GGConv, 1);
 	g_hash_table_insert(ggconvs, conv, ggc);
 
@@ -172,7 +192,8 @@
 	ggc->tv = gnt_text_view_new();
 	gnt_box_add_widget(GNT_BOX(ggc->window), ggc->tv);
 	gnt_widget_set_name(ggc->tv, "conversation-window-textview");
-	gnt_widget_set_size(ggc->tv, getmaxx(stdscr) - 3 - x - width, getmaxy(stdscr) - 5);
+	gnt_widget_set_size(ggc->tv, gaim_prefs_get_int(PREF_ROOT "/size/width"),
+			gaim_prefs_get_int(PREF_ROOT "/size/height"));
 
 	ggc->entry = gnt_entry_new(NULL);
 	gnt_box_add_widget(GNT_BOX(ggc->window), ggc->entry);
@@ -181,12 +202,13 @@
 	g_signal_connect(G_OBJECT(ggc->entry), "key_pressed", G_CALLBACK(entry_key_pressed), ggc);
 	g_signal_connect(G_OBJECT(ggc->window), "destroy", G_CALLBACK(closing_window), ggc);
 
-	/* XXX: I am assuming the buddylist is on the leftmost corner.
-	 *      That may not always be correct, since the windows can be moved.
-	 *      It might be an option to remember the position of conv. windows. */
-	gnt_widget_set_position(ggc->window, x + width, 0);
+	gnt_widget_set_position(ggc->window, gaim_prefs_get_int(PREF_ROOT "/position/x"),
+			gaim_prefs_get_int(PREF_ROOT "/position/y"));
 	gnt_widget_show(ggc->window);
 
+	g_signal_connect(G_OBJECT(ggc->tv), "size_changed", G_CALLBACK(size_changed_cb), NULL);
+	g_signal_connect(G_OBJECT(ggc->window), "position_set", G_CALLBACK(save_position_cb), NULL);
+
 	g_free(title);
 }
 
@@ -201,8 +223,9 @@
 		GaimMessageFlags flags, time_t mtime)
 {
 	GGConv *ggconv = g_hash_table_lookup(ggconvs, conv); /* XXX: ggconv = conv->ui_data; should do */
-	char *strip;
+	char *strip, *newline;
 	GntTextFormatFlags fl = 0;
+	int pos;
 
 	g_return_if_fail(ggconv != NULL);
 
@@ -221,12 +244,18 @@
 	if (flags & GAIM_MESSAGE_NICK)
 		fl |= GNT_TEXT_FLAG_UNDERLINE;
 
-	strip = gaim_markup_strip_html(message);
+	pos = gnt_text_view_get_lines_below(GNT_TEXT_VIEW(ggconv->tv));
+
+	/* XXX: Remove this workaround when textview can parse messages. */
+	newline = gaim_strdup_withhtml(message);
+	strip = gaim_markup_strip_html(newline);
 	gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(ggconv->tv),
 				strip, fl);
 	gnt_text_view_next_line(GNT_TEXT_VIEW(ggconv->tv));
-	gnt_text_view_scroll(GNT_TEXT_VIEW(ggconv->tv), 0);
+	if (pos <= 1)
+		gnt_text_view_scroll(GNT_TEXT_VIEW(ggconv->tv), 0);
 
+	g_free(newline);
 	g_free(strip);
 
 	if (flags & (GAIM_MESSAGE_RECV | GAIM_MESSAGE_NICK | GAIM_MESSAGE_ERROR))
@@ -460,12 +489,27 @@
 	return GAIM_CMD_STATUS_OK;
 }
 
+static GaimCmdRet
+cmd_show_window(GaimConversation *conv, const char *cmd, char **args, char **error, gpointer data)
+{
+	void (*callback)() = data;
+	callback();
+	return GAIM_CMD_STATUS_OK;
+}
 
 void gg_conversation_init()
 {
 	ggconvs = g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL, destroy_ggconv);
 
-	/* Xerox */
+	gaim_prefs_add_none(PREF_ROOT);
+	gaim_prefs_add_none(PREF_ROOT "/size");
+	gaim_prefs_add_int(PREF_ROOT "/size/width", 70);
+	gaim_prefs_add_int(PREF_ROOT "/size/height", 20);
+	gaim_prefs_add_none(PREF_ROOT "/position");
+	gaim_prefs_add_int(PREF_ROOT "/position/x", 0);
+	gaim_prefs_add_int(PREF_ROOT "/position/y", 0);
+
+	/* Xerox the commands */
 	gaim_cmd_register("say", "S", GAIM_CMD_P_DEFAULT,
 	                  GAIM_CMD_FLAG_CHAT | GAIM_CMD_FLAG_IM, NULL,
 	                  say_command_cb, _("say &lt;message&gt;:  Send a message normally as if you weren't using a command."), NULL);
@@ -481,6 +525,23 @@
 	gaim_cmd_register("help", "w", GAIM_CMD_P_DEFAULT,
 	                  GAIM_CMD_FLAG_CHAT | GAIM_CMD_FLAG_IM | GAIM_CMD_FLAG_ALLOW_WRONG_ARGS, NULL,
 	                  help_command_cb, _("help &lt;command&gt;:  Help on a specific command."), NULL);
+
+	/* Now some commands to bring up some other windows */
+	gaim_cmd_register("plugins", "", GAIM_CMD_P_DEFAULT,
+	                  GAIM_CMD_FLAG_CHAT | GAIM_CMD_FLAG_IM, NULL,
+	                  cmd_show_window, _("plugins: Show the plugins window."), gg_plugins_show_all);
+	gaim_cmd_register("buddylist", "", GAIM_CMD_P_DEFAULT,
+	                  GAIM_CMD_FLAG_CHAT | GAIM_CMD_FLAG_IM, NULL,
+	                  cmd_show_window, _("buddylist: Show the buddylist."), gg_blist_show);
+	gaim_cmd_register("accounts", "", GAIM_CMD_P_DEFAULT,
+	                  GAIM_CMD_FLAG_CHAT | GAIM_CMD_FLAG_IM, NULL,
+	                  cmd_show_window, _("accounts: Show the accounts window."), gg_accounts_show_all);
+	gaim_cmd_register("debugwin", "", GAIM_CMD_P_DEFAULT,
+	                  GAIM_CMD_FLAG_CHAT | GAIM_CMD_FLAG_IM, NULL,
+	                  cmd_show_window, _("debugwin: Show the debug window."), gg_debug_window_show);
+	gaim_cmd_register("prefs", "", GAIM_CMD_P_DEFAULT,
+	                  GAIM_CMD_FLAG_CHAT | GAIM_CMD_FLAG_IM, NULL,
+	                  cmd_show_window, _("prefs: Show the preference window."), gg_prefs_show_all);
 }
 
 void gg_conversation_uninit()

Modified: branches/soc-2006-file-loggers/console/gntdebug.c
===================================================================
--- branches/soc-2006-file-loggers/console/gntdebug.c	2006-08-09 04:22:08 UTC (rev 16676)
+++ branches/soc-2006-file-loggers/console/gntdebug.c	2006-08-09 04:49:19 UTC (rev 16677)
@@ -19,7 +19,6 @@
 {
 	if (key[0] == 27)
 	{
-		/* XXX: This doesn't seem to always work */
 		if (strcmp(key+1, GNT_KEY_DOWN) == 0)
 			gnt_text_view_scroll(view, 1);
 		else if (strcmp(key+1, GNT_KEY_UP) == 0)
@@ -39,9 +38,7 @@
 gg_debug_print(GaimDebugLevel level, const char *category,
 		const char *args)
 {
-	if (debug.window == NULL)
-		fprintf(stderr, "%s: %s\n", category, args);
-	else
+	if (debug.window)
 	{
 		GntTextFormatFlags flag = GNT_TEXT_FLAG_NORMAL;
 
@@ -63,10 +60,7 @@
 		}
 		
 		gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(debug.tview), args, flag);
-		gnt_text_view_next_line(GNT_TEXT_VIEW(debug.tview));
 		gnt_text_view_scroll(GNT_TEXT_VIEW(debug.tview), 0);
-
-		g_signal_connect(G_OBJECT(debug.window), "key_pressed", G_CALLBACK(debug_window_kpress_cb), debug.tview);
 	}
 }
 
@@ -97,7 +91,10 @@
 		debug.tview = gnt_text_view_new();
 		gnt_box_add_widget(GNT_BOX(debug.window), debug.tview);
 
+		/* XXX: Add checkboxes/buttons for Clear, Pause, Timestamps */
+
 		g_signal_connect(G_OBJECT(debug.window), "destroy", G_CALLBACK(reset_debug_win), NULL);
+		g_signal_connect(G_OBJECT(debug.window), "key_pressed", G_CALLBACK(debug_window_kpress_cb), debug.tview);
 	}
 
 	gnt_widget_show(debug.window);
@@ -105,7 +102,8 @@
 
 void gg_debug_init()
 {
-	gg_debug_window_show();
+	if (gaim_debug_is_enabled())
+		gg_debug_window_show();
 }
 
 void gg_debug_uninit()

Modified: branches/soc-2006-file-loggers/console/gntdebug.h
===================================================================
--- branches/soc-2006-file-loggers/console/gntdebug.h	2006-08-09 04:22:08 UTC (rev 16676)
+++ branches/soc-2006-file-loggers/console/gntdebug.h	2006-08-09 04:49:19 UTC (rev 16677)
@@ -6,3 +6,4 @@
 
 void gg_debug_uninit();
 
+void gg_debug_window_show();

Modified: branches/soc-2006-file-loggers/console/gntgaim.c
===================================================================
--- branches/soc-2006-file-loggers/console/gntgaim.c	2006-08-09 04:22:08 UTC (rev 16676)
+++ branches/soc-2006-file-loggers/console/gntgaim.c	2006-08-09 04:49:19 UTC (rev 16677)
@@ -140,9 +140,9 @@
 	char *text;
 
 	if (terse) {
-		text = g_strdup_printf(_("Gaim %s. Try `%s -h' for more information.\n"), VERSION, name);
+		text = g_strdup_printf(_("%s. Try `%s -h' for more information.\n"), VERSION, name);
 	} else {
-		text = g_strdup_printf(_("Gaim %s\n"
+		text = g_strdup_printf(_("%s\n"
 		       "Usage: %s [OPTION]...\n\n"
 		       "  -c, --config=DIR    use DIR for config files\n"
 		       "  -d, --debug         print debugging messages to stdout\n"
@@ -151,6 +151,7 @@
 		       "  -v, --version       display the current version and exit\n"), VERSION, name);
 	}
 
+	gnt_quit();
 	gaim_print_utf8_to_console(stdout, text);
 	g_free(text);
 }

Copied: branches/soc-2006-file-loggers/console/gntplugin.c (from rev 16676, trunk/console/gntplugin.c)
===================================================================
--- branches/soc-2006-file-loggers/console/gntplugin.c	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/gntplugin.c	2006-08-09 04:49:19 UTC (rev 16677)
@@ -0,0 +1,135 @@
+#include <gnt.h>
+#include <gntbox.h>
+#include <gntlabel.h>
+#include <gntline.h>
+#include <gnttree.h>
+
+#include "notify.h"
+
+#include "gntgaim.h"
+#include "gntplugin.h"
+
+static struct
+{
+	GntWidget *tree;
+	GntWidget *window;
+	GntWidget *aboot;
+} plugins;
+
+static void
+plugin_toggled_cb(GntWidget *tree, GaimPlugin *plugin, gpointer null)
+{
+	if (gnt_tree_get_choice(GNT_TREE(tree), plugin))
+	{
+		if(!gaim_plugin_load(plugin))
+			gaim_notify_error(NULL, "ERROR", "loading plugin failed", NULL);
+	}
+	else
+	{
+		if (!gaim_plugin_unload(plugin))
+			gaim_notify_error(NULL, "ERROR", "unloading plugin failed", NULL);
+	}
+	gg_plugins_save_loaded();
+}
+
+/* Xerox */
+void
+gg_plugins_save_loaded(void)
+{
+	GList *pl;
+	GList *files = NULL;
+	GaimPlugin *p;
+
+	for (pl = gaim_plugins_get_loaded(); pl != NULL; pl = pl->next) {
+		p = pl->data;
+
+		if (p->info->type != GAIM_PLUGIN_PROTOCOL &&
+			p->info->type != GAIM_PLUGIN_LOADER) {
+
+			files = g_list_append(files, p->path);
+		}
+	}
+
+	gaim_prefs_set_string_list("/gaim/gnt/plugins/loaded", files);
+	g_list_free(files);
+}
+
+static void
+selection_changed(GntWidget *widget, gpointer old, gpointer current, gpointer null)
+{
+	GaimPlugin *plugin = current;
+	char *text;
+
+	/* XXX: Use formatting and stuff */
+	gnt_text_view_clear(GNT_TEXT_VIEW(plugins.aboot));
+	text = g_strdup_printf(_("Name: %s\nVersion: %s\nDescription: %s\nAuthor: %s\nWebsite: %s\nFilename: %s\n"),
+			plugin->info->name, plugin->info->version, plugin->info->description,
+			plugin->info->author, plugin->info->homepage, plugin->path);
+	gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(plugins.aboot),
+			text, GNT_TEXT_FLAG_NORMAL);
+	gnt_text_view_scroll(GNT_TEXT_VIEW(plugins.aboot), 0);
+}
+
+static void
+reset_plugin_window(GntWidget *window, gpointer null)
+{
+	plugins.window = NULL;
+	plugins.tree = NULL;
+	plugins.aboot = NULL;
+}
+
+void gg_plugins_show_all()
+{
+	GntWidget *window, *tree, *box, *aboot;
+	GList *iter;
+	if (plugins.window)
+		return;
+
+	gaim_plugins_probe(G_MODULE_SUFFIX);
+
+	plugins.window = window = gnt_vbox_new(FALSE);
+	gnt_box_set_toplevel(GNT_BOX(window), TRUE);
+	gnt_box_set_title(GNT_BOX(window), _("Plugins"));
+	gnt_box_set_pad(GNT_BOX(window), 0);
+
+	gnt_box_add_widget(GNT_BOX(window),
+			gnt_label_new(_("You can (un)load plugins from the following list.")));
+	gnt_box_add_widget(GNT_BOX(window), gnt_hline_new());
+
+	box = gnt_hbox_new(FALSE);
+	gnt_box_add_widget(GNT_BOX(window), box);
+	gnt_box_add_widget(GNT_BOX(window), gnt_hline_new());
+
+	gnt_box_set_pad(GNT_BOX(box), 0);
+	plugins.tree = tree = gnt_tree_new();
+	GNT_WIDGET_SET_FLAGS(tree, GNT_WIDGET_NO_BORDER);
+	gnt_box_add_widget(GNT_BOX(box), tree);
+	gnt_box_add_widget(GNT_BOX(box), gnt_vline_new());
+
+	plugins.aboot = aboot = gnt_text_view_new();
+	gnt_widget_set_size(aboot, 40, 20);
+	gnt_box_add_widget(GNT_BOX(box), aboot);
+
+	for (iter = gaim_plugins_get_all(); iter; iter = iter->next)
+	{
+		GaimPlugin *plug = iter->data;
+
+		if (plug->info->type != GAIM_PLUGIN_STANDARD ||
+			(plug->info->flags & GAIM_PLUGIN_FLAG_INVISIBLE) ||
+			plug->error)
+			continue;
+
+		gnt_tree_add_choice(GNT_TREE(tree), plug,
+				gnt_tree_create_row(GNT_TREE(tree), plug->info->name), NULL, NULL);
+		gnt_tree_set_choice(GNT_TREE(tree), plug, gaim_plugin_is_loaded(plug));
+	}
+	gnt_tree_set_col_width(GNT_TREE(tree), 0, 30);
+	g_signal_connect(G_OBJECT(tree), "toggled", G_CALLBACK(plugin_toggled_cb), NULL);
+	g_signal_connect(G_OBJECT(tree), "selection_changed", G_CALLBACK(selection_changed), NULL);
+	g_signal_connect(G_OBJECT(window), "destroy", G_CALLBACK(reset_plugin_window), NULL);
+
+	gnt_tree_set_selected(GNT_TREE(tree), gaim_plugins_get_all()->data);
+
+	gnt_widget_show(window);
+}
+

Copied: branches/soc-2006-file-loggers/console/gntplugin.h (from rev 16676, trunk/console/gntplugin.h)
===================================================================
--- branches/soc-2006-file-loggers/console/gntplugin.h	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/gntplugin.h	2006-08-09 04:49:19 UTC (rev 16677)
@@ -0,0 +1,6 @@
+#include <plugin.h>
+
+void gg_plugins_show_all();
+
+void gg_plugins_save_loaded();
+

Modified: branches/soc-2006-file-loggers/console/gntprefs.c
===================================================================
--- branches/soc-2006-file-loggers/console/gntprefs.c	2006-08-09 04:22:08 UTC (rev 16676)
+++ branches/soc-2006-file-loggers/console/gntprefs.c	2006-08-09 04:49:19 UTC (rev 16677)
@@ -1,8 +1,11 @@
 #include <prefs.h>
 
+#include "gntgaim.h"
 #include "gntprefs.h"
-#include "gntgaim.h"
+#include "gntrequest.h"
 
+#include <string.h>
+
 void gg_prefs_init()
 {
 	gaim_prefs_add_none("/gaim");
@@ -10,5 +13,182 @@
 
 	gaim_prefs_add_none("/gaim/gnt/plugins");
 	gaim_prefs_add_string_list("/gaim/gnt/plugins/loaded", NULL);
+
+	gaim_prefs_add_none("/gaim/gnt/conversations");
+	gaim_prefs_add_bool("/gaim/gnt/conversations/timestamps", TRUE);
+	gaim_prefs_add_bool("/gaim/gnt/conversations/notify_typing", FALSE);
 }
 
+typedef struct
+{
+	GaimPrefType type;
+	const char *pref;
+	const char *label;
+	GList *(*lv)();   /* If the value is to be selected from a number of choices */
+} Prefs;
+
+static GList *
+get_log_options()
+{
+	return gaim_log_logger_get_options();
+}
+
+static GaimRequestField *
+get_pref_field(Prefs *prefs)
+{
+	GaimRequestField *field = NULL;
+
+	if (prefs->lv == NULL)
+	{
+		switch (prefs->type)
+		{
+			case GAIM_PREF_BOOLEAN:
+				field = gaim_request_field_bool_new(prefs->pref, prefs->label,
+						gaim_prefs_get_bool(prefs->pref));
+				break;
+			case GAIM_PREF_INT:
+				field = gaim_request_field_int_new(prefs->pref, prefs->label,
+						gaim_prefs_get_int(prefs->pref));
+				break;
+			case GAIM_PREF_STRING:
+				field = gaim_request_field_string_new(prefs->pref, prefs->label,
+						gaim_prefs_get_string(prefs->pref), FALSE);
+				break;
+			default:
+				break;
+		}
+	}
+	else
+	{
+		GList *list = prefs->lv(), *iter;
+		field = gaim_request_field_list_new(prefs->pref, prefs->label);
+		for (iter = list; iter; iter = iter->next)
+		{
+			gboolean select = FALSE;
+			const char *data = iter->data;
+			iter = iter->next;
+			switch (prefs->type)
+			{
+				case GAIM_PREF_BOOLEAN:
+					if (gaim_prefs_get_bool(prefs->pref) == GPOINTER_TO_INT(iter->data))
+						select = TRUE;
+					break;
+				case GAIM_PREF_INT:
+					if (gaim_prefs_get_int(prefs->pref) == GPOINTER_TO_INT(iter->data))
+						select = TRUE;
+					break;
+				case GAIM_PREF_STRING:
+					if (strcmp(gaim_prefs_get_string(prefs->pref), iter->data) == 0)
+						select = TRUE;
+					break;
+				default:
+					break;
+			}
+			gaim_request_field_list_add(field, data, iter->data);
+			if (select)
+				gaim_request_field_list_add_selected(field, data);
+		}
+		g_list_free(list);
+	}
+	return field;
+}
+
+static Prefs convs[] = 
+{
+	{GAIM_PREF_BOOLEAN, "/gaim/gnt/conversations/timestamps", _("Show Timestamps"), NULL},
+	{GAIM_PREF_BOOLEAN, "/gaim/gnt/conversations/notify_typing", _("Notify buddies when you are typing"), NULL},
+	{GAIM_PREF_NONE, NULL, NULL, NULL}
+};
+
+static Prefs logging[] = 
+{
+	{GAIM_PREF_STRING, "/core/logging/format", _("Log format"), get_log_options},
+	{GAIM_PREF_BOOLEAN, "/core/logging/log_ims", _("Log IMs"), NULL},
+	{GAIM_PREF_BOOLEAN, "/core/logging/log_chats", _("Log chats"), NULL},
+	{GAIM_PREF_BOOLEAN, "/core/logging/log_system", _("Log status change events"), NULL},
+	{GAIM_PREF_NONE, NULL, NULL, NULL},
+};
+
+static void
+save_cb(void *data, GaimRequestFields *allfields)
+{
+	GList *list;
+	for (list = gaim_request_fields_get_groups(allfields); list; list = list->next)
+	{
+		GaimRequestFieldGroup *group = list->data;
+		GList *fields = gaim_request_field_group_get_fields(group);
+		
+		for (; fields ; fields = fields->next)
+		{
+			GaimRequestField *field = fields->data;
+			GaimRequestFieldType type = gaim_request_field_get_type(field);
+			GaimPrefType pt;
+			gpointer val = NULL;
+			const char *id = gaim_request_field_get_id(field);
+
+			switch (type)
+			{
+				case GAIM_REQUEST_FIELD_LIST:
+					val = gaim_request_field_list_get_selected(field)->data;
+					break;
+				case GAIM_REQUEST_FIELD_BOOLEAN:
+					val = GINT_TO_POINTER(gaim_request_field_bool_get_value(field));
+					break;
+				case GAIM_REQUEST_FIELD_INTEGER:
+					val = GINT_TO_POINTER(gaim_request_field_int_get_value(field));
+					break;
+				case GAIM_REQUEST_FIELD_STRING:
+					val = (gpointer)gaim_request_field_string_get_value(field);
+					break;
+				default:
+					break;
+			}
+
+			pt = gaim_prefs_get_type(id);
+			switch (pt)
+			{
+				case GAIM_PREF_INT:
+					gaim_prefs_set_int(id, GPOINTER_TO_INT(val));
+					break;
+				case GAIM_PREF_BOOLEAN:
+					gaim_prefs_set_bool(id, GPOINTER_TO_INT(val));
+					break;
+				case GAIM_PREF_STRING:
+					gaim_prefs_set_string(id, val);
+					break;
+				default:
+					break;
+			}
+		}
+	}
+}
+
+void gg_prefs_show_all()
+{
+	GaimRequestFields *fields;
+	GaimRequestField *field;
+	GaimRequestFieldGroup *group;
+	int i;
+
+	fields = gaim_request_fields_new();
+
+	group = gaim_request_field_group_new(_("Conversations"));
+	gaim_request_fields_add_group(fields, group);
+	for (i = 0; convs[i].pref; i++)
+	{
+		field = get_pref_field(convs + i);
+		gaim_request_field_group_add_field(group, field);
+	}
+
+	group = gaim_request_field_group_new(_("Logging"));
+	gaim_request_fields_add_group(fields, group);
+	for (i = 0; logging[i].pref; i++)
+	{
+		field = get_pref_field(logging + i);
+		gaim_request_field_group_add_field(group, field);
+	}
+
+	gaim_request_fields(NULL, _("Preferences"), NULL, NULL, fields,
+			_("Save"), G_CALLBACK(save_cb), _("Cancel"), NULL, NULL);
+}
+

Modified: branches/soc-2006-file-loggers/console/gntprefs.h
===================================================================
--- branches/soc-2006-file-loggers/console/gntprefs.h	2006-08-09 04:22:08 UTC (rev 16676)
+++ branches/soc-2006-file-loggers/console/gntprefs.h	2006-08-09 04:49:19 UTC (rev 16677)
@@ -1,2 +1,4 @@
 void gg_prefs_init();
 
+void gg_prefs_show_all();
+

Modified: branches/soc-2006-file-loggers/console/gntrequest.c
===================================================================
--- branches/soc-2006-file-loggers/console/gntrequest.c	2006-08-09 04:22:08 UTC (rev 16676)
+++ branches/soc-2006-file-loggers/console/gntrequest.c	2006-08-09 04:49:19 UTC (rev 16677)
@@ -1,15 +1,19 @@
 #include <gnt.h>
 #include <gntbox.h>
 #include <gntbutton.h>
+#include <gntcheckbox.h>
 #include <gntcombobox.h>
 #include <gntentry.h>
 #include <gntlabel.h>
+#include <gntline.h>
+#include <gnttree.h>
 
+#include "gntgaim.h"
 #include "gntrequest.h"
 
 static GntWidget *
 setup_request_window(const char *title, const char *primary,
-		const char *secondary)
+		const char *secondary, GaimRequestType type)
 {
 	GntWidget *window;
 
@@ -24,6 +28,9 @@
 	if (secondary)
 		gnt_box_add_widget(GNT_BOX(window), gnt_label_new(secondary));
 
+	g_signal_connect_swapped(G_OBJECT(window), "destroy", G_CALLBACK(gaim_request_close),
+			GINT_TO_POINTER(type));
+
 	return window;
 }
 
@@ -35,7 +42,7 @@
 	const char *text;
 	gpointer callback;
 
-	box = gnt_hbox_new(TRUE);
+	box = gnt_hbox_new(FALSE);
 
 	va_start(list, data);
 
@@ -79,7 +86,7 @@
 {
 	GntWidget *window, *box, *entry;
 
-	window = setup_request_window(title, primary, secondary);
+	window = setup_request_window(title, primary, secondary, GAIM_REQUEST_INPUT);
 
 	entry = gnt_entry_new(default_value);
 	if (masked)
@@ -131,7 +138,7 @@
 	const char *text;
 	int val;
 
-	window = setup_request_window(title, primary, secondary);
+	window = setup_request_window(title, primary, secondary, GAIM_REQUEST_CHOICE);
 
 	combo = gnt_combo_box_new();
 	gnt_box_add_widget(GNT_BOX(window), combo);
@@ -158,7 +165,8 @@
 	gpointer data = g_object_get_data(G_OBJECT(button), "activate-userdata");
 	int id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(button), "activate-id"));
 
-	callback(data, id);
+	if (callback)
+		callback(data, id);
 
 	gaim_request_close(GAIM_REQUEST_ACTION, window);
 }
@@ -172,7 +180,7 @@
 	GntWidget *window, *box, *button;
 	int i;
 
-	window = setup_request_window(title, primary, secondary);
+	window = setup_request_window(title, primary, secondary, GAIM_REQUEST_ACTION);
 
 	box = gnt_hbox_new(TRUE);
 	gnt_box_add_widget(GNT_BOX(window), box);
@@ -195,12 +203,256 @@
 	return window;
 }
 
+static void
+request_fields_cb(GntWidget *button, GaimRequestFields *fields)
+{
+	GaimRequestFieldsCb callback = g_object_get_data(G_OBJECT(button), "activate-callback");
+	gpointer data = g_object_get_data(G_OBJECT(button), "activate-userdata");
+	GList *list;
+
+	/* Update the data of the fields. GtkGaim does this differently. Instead of
+	 * updating the fields at the end like here, it updates the appropriate field
+	 * instantly whenever a change is made. That allows it to make sure the
+	 * 'required' fields are entered before the user can hit OK. It's not the case
+	 * here, althought it can be done. I am not honouring the 'required' fields
+	 * for the moment. */
+	for (list = gaim_request_fields_get_groups(fields); list; list = list->next)
+	{
+		GaimRequestFieldGroup *group = list->data;
+		GList *fields = gaim_request_field_group_get_fields(group);
+		
+		for (; fields ; fields = fields->next)
+		{
+			GaimRequestField *field = fields->data;
+			GaimRequestFieldType type = gaim_request_field_get_type(field);
+			if (type == GAIM_REQUEST_FIELD_BOOLEAN)
+			{
+				GntWidget *check = field->ui_data;
+				gboolean value = gnt_check_box_get_checked(GNT_CHECK_BOX(check));
+				gaim_request_field_bool_set_value(field, value);
+			}
+			else if (type == GAIM_REQUEST_FIELD_STRING)
+			{
+				GntWidget *entry = field->ui_data;
+				gaim_request_field_string_set_value(field, gnt_entry_get_text(GNT_ENTRY(entry)));
+			}
+			else if (type == GAIM_REQUEST_FIELD_INTEGER)
+			{
+				GntWidget *entry = field->ui_data;
+				const char *text = gnt_entry_get_text(GNT_ENTRY(entry));
+				int value = (text && *text) ? atoi(text) : 0;
+				gaim_request_field_int_set_value(field, value);
+			}
+			else if (type == GAIM_REQUEST_FIELD_CHOICE)
+			{
+				GntWidget *combo = field->ui_data;;
+				int id = GPOINTER_TO_INT(gnt_combo_box_get_selected_data(GNT_COMBO_BOX(combo)));
+				gaim_request_field_choice_set_value(field, id);
+			}
+			else if (type == GAIM_REQUEST_FIELD_LIST)
+			{
+				GList *list = NULL;
+				if (gaim_request_field_list_get_multi_select(field))
+				{
+					const GList *iter;
+					GntWidget *tree = field->ui_data;
+
+					iter = gaim_request_field_list_get_items(field);
+					for (; iter; iter = iter->next)
+					{
+						const char *text = list->data;
+						gpointer key = gaim_request_field_list_get_data(field, text);
+						if (gnt_tree_get_choice(GNT_TREE(tree), key))
+							list = g_list_prepend(list, key);
+					}
+				}
+				else
+				{
+					GntWidget *combo = field->ui_data;
+					gpointer data = gnt_combo_box_get_selected_data(GNT_COMBO_BOX(combo));
+					list = g_list_append(list, data);
+				}
+
+				gaim_request_field_list_set_selected(field, list);
+				g_list_free(list);
+			}
+			else if (type == GAIM_REQUEST_FIELD_ACCOUNT)
+			{
+			}
+		}
+	}
+
+	if (callback)
+		callback(data, fields);
+
+	while (button->parent)
+		button = button->parent;
+
+	gaim_request_close(GAIM_REQUEST_FIELDS, button);
+}
+
+static void *
+gg_request_fields(const char *title, const char *primary,
+		const char *secondary, GaimRequestFields *fields,
+		const char *ok, GCallback ok_cb,
+		const char *cancel, GCallback cancel_cb,
+		void *userdata)
+{
+	GntWidget *window, *box;
+	GList *list;
+
+	window = setup_request_window(title, primary, secondary, GAIM_REQUEST_FIELDS);
+
+	/* This is how it's going to work: the request-groups are going to be
+	 * stacked vertically one after the other. A GntLine will be separating
+	 * the groups. */
+	box = gnt_vbox_new(FALSE);
+	gnt_box_set_pad(GNT_BOX(box), 0);
+	gnt_box_set_fill(GNT_BOX(box), TRUE);
+	for (list = gaim_request_fields_get_groups(fields); list; list = list->next)
+	{
+		GaimRequestFieldGroup *group = list->data;
+		GList *fields = gaim_request_field_group_get_fields(group);
+		GntWidget *hbox;
+		
+		gnt_box_add_widget(GNT_BOX(box),
+				gnt_label_new_with_format(gaim_request_field_group_get_title(group),
+					GNT_TEXT_FLAG_BOLD));
+
+		for (; fields ; fields = fields->next)
+		{
+			GaimRequestField *field = fields->data;
+			GaimRequestFieldType type = gaim_request_field_get_type(field);
+			const char *label = gaim_request_field_get_label(field);
+				
+			hbox = gnt_hbox_new(FALSE);
+			gnt_box_set_pad(GNT_BOX(hbox), 0);
+			gnt_box_add_widget(GNT_BOX(box), hbox);
+			
+			if (type != GAIM_REQUEST_FIELD_BOOLEAN)
+			{
+				GntWidget *l = gnt_label_new(label);
+				gnt_widget_set_size(l, 0, 1);
+				gnt_box_add_widget(GNT_BOX(hbox), l);
+			}
+
+			if (type == GAIM_REQUEST_FIELD_BOOLEAN)
+			{
+				GntWidget *check = gnt_check_box_new(label);
+				gnt_check_box_set_checked(GNT_CHECK_BOX(check),
+						gaim_request_field_bool_get_default_value(field));
+				gnt_box_add_widget(GNT_BOX(hbox), check);
+				field->ui_data = check;
+			}
+			else if (type == GAIM_REQUEST_FIELD_STRING)
+			{
+				GntWidget *entry = gnt_entry_new(
+							gaim_request_field_string_get_default_value(field));
+				gnt_entry_set_masked(GNT_ENTRY(entry),
+						gaim_request_field_string_is_masked(field));
+				gnt_box_add_widget(GNT_BOX(hbox), entry);
+				field->ui_data = entry;
+			}
+			else if (type == GAIM_REQUEST_FIELD_INTEGER)
+			{
+				GntWidget *entry = gnt_entry_new(
+							gaim_request_field_string_get_default_value(field));
+				gnt_entry_set_flag(GNT_ENTRY(entry), GNT_ENTRY_FLAG_INT);
+				gnt_box_add_widget(GNT_BOX(hbox), entry);
+				field->ui_data = entry;
+			}
+			else if (type == GAIM_REQUEST_FIELD_CHOICE)
+			{
+				int id;
+				const GList *list;
+				GntWidget *combo = gnt_combo_box_new();
+				gnt_box_add_widget(GNT_BOX(hbox), combo);
+				field->ui_data = combo;
+
+				list = gaim_request_field_choice_get_labels(field);
+				for (id = 1; list; list = list->next, id++)
+				{
+					gnt_combo_box_add_data(GNT_COMBO_BOX(combo),
+							GINT_TO_POINTER(id), list->data);
+				}
+				gnt_combo_box_set_selected(GNT_COMBO_BOX(combo),
+						GINT_TO_POINTER(gaim_request_field_choice_get_default_value(field)));
+			}
+			else if (type == GAIM_REQUEST_FIELD_LIST)
+			{
+				const GList *list;
+				gboolean multi = gaim_request_field_list_get_multi_select(field);
+				if (multi)
+				{
+					GntWidget *tree = gnt_tree_new();
+					gnt_box_add_widget(GNT_BOX(hbox), tree);
+					field->ui_data = tree;
+
+					list = gaim_request_field_list_get_items(field);
+					for (; list; list = list->next)
+					{
+						const char *text = list->data;
+						gpointer key = gaim_request_field_list_get_data(field, text);
+						gnt_tree_add_choice(GNT_TREE(tree), key,
+								gnt_tree_create_row(GNT_TREE(tree), text), NULL, NULL);
+						if (gaim_request_field_list_is_selected(field, text))
+							gnt_tree_set_choice(GNT_TREE(tree), key, TRUE);
+					}
+				}
+				else
+				{
+					GntWidget *combo = gnt_combo_box_new();
+					gnt_box_set_alignment(GNT_BOX(hbox), GNT_ALIGN_MID);
+					gnt_box_add_widget(GNT_BOX(hbox), combo);
+					field->ui_data = combo;
+
+					list = gaim_request_field_list_get_items(field);
+					for (; list; list = list->next)
+					{
+						const char *text = list->data;
+						gpointer key = gaim_request_field_list_get_data(field, text);
+						gnt_combo_box_add_data(GNT_COMBO_BOX(combo), key, text);
+						if (gaim_request_field_list_is_selected(field, text))
+							gnt_combo_box_set_selected(GNT_COMBO_BOX(combo), key);
+					}
+				}
+			}
+#if 0
+			else if (type == GAIM_REQUEST_FIELD_ACCOUNT)
+			{
+				/* XXX: remember to set the field->ui_data */
+			}
+#endif
+			else
+			{
+				gnt_box_add_widget(GNT_BOX(hbox),
+						gnt_label_new_with_format(_("Not implemented yet."),
+							GNT_TEXT_FLAG_BOLD));
+			}
+		}
+		if (list->next)
+			gnt_box_add_widget(GNT_BOX(box), gnt_hline_new());
+	}
+	gnt_box_add_widget(GNT_BOX(window), box);
+
+	box = setup_button_box(userdata, request_fields_cb, fields,
+			ok, ok_cb, cancel, cancel_cb, NULL);
+	gnt_box_add_widget(GNT_BOX(window), box);
+
+	gnt_widget_show(window);
+	
+	return window;
+}
+
 static GaimRequestUiOps uiops =
 {
 	.request_input = gg_request_input,
 	.close_request = gg_close_request,
 	.request_choice = gg_request_choice,
 	.request_action = gg_request_action,
+	.request_fields = gg_request_fields,
+	.request_file = NULL,                  /* No plans for these */
+	.request_folder = NULL
 };
 
 GaimRequestUiOps *gg_request_get_ui_ops()

Modified: branches/soc-2006-file-loggers/console/gntui.c
===================================================================
--- branches/soc-2006-file-loggers/console/gntui.c	2006-08-09 04:22:08 UTC (rev 16676)
+++ branches/soc-2006-file-loggers/console/gntui.c	2006-08-09 04:49:19 UTC (rev 16677)
@@ -5,13 +5,19 @@
 #include "gntconn.h"
 #include "gntconv.h"
 #include "gntnotify.h"
+#include "gntplugin.h"
 #include "gntrequest.h"
 
+#include <prefs.h>
+
 void init_gnt_ui()
 {
 #ifdef STANDALONE
 	gnt_init();
 #endif
+
+	gaim_prefs_add_none("/gaim/gnt");
+	
 	/* Accounts */
 	gg_accounts_init();
 	gaim_accounts_set_ui_ops(gg_accounts_get_ui_ops());
@@ -35,7 +41,12 @@
 	gg_request_init();
 	gaim_request_set_ui_ops(gg_request_get_ui_ops());
 
+	gg_plugins_show_all();
+
 #ifdef STANDALONE
+
+	gg_plugins_save_loaded();
+
 	gnt_main();
 
 	gaim_accounts_set_ui_ops(NULL);

Modified: branches/soc-2006-file-loggers/console/libgnt/Makefile.am
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/Makefile.am	2006-08-09 04:22:08 UTC (rev 16676)
+++ branches/soc-2006-file-loggers/console/libgnt/Makefile.am	2006-08-09 04:49:19 UTC (rev 16677)
@@ -17,6 +17,7 @@
 	gntstyle.c \
 	gnttextview.c \
 	gnttree.c \
+	gntutils.c \
 	gntmain.c
 
 libgnt_la_headers = \
@@ -34,6 +35,7 @@
 	gntstyle.h \
 	gnttextview.h \
 	gnttree.h \
+	gntutils.h \
 	gnt.h
 
 libgnt_laincludedir=$(includedir)/gnt

Modified: branches/soc-2006-file-loggers/console/libgnt/gntbox.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntbox.c	2006-08-09 04:22:08 UTC (rev 16676)
+++ branches/soc-2006-file-loggers/console/libgnt/gntbox.c	2006-08-09 04:49:19 UTC (rev 16677)
@@ -245,6 +245,28 @@
 	} while (box->active != last);
 }
 
+static void
+find_prev_focus(GntBox *box)
+{
+	gpointer last = box->active;
+
+	if (!box->focus)
+		return;
+
+	do
+	{
+		GList *iter = g_list_find(box->focus, box->active);
+		if (!iter)
+			box->active = box->focus->data;
+		else if (!iter->prev)
+			box->active = g_list_last(box->focus)->data;
+		else
+			box->active = iter->prev->data;
+		if (!GNT_WIDGET_IS_FLAG_SET(box->active, GNT_WIDGET_INVISIBLE))
+			break;
+	} while (box->active != last);
+}
+
 static gboolean
 gnt_box_key_pressed(GntWidget *widget, const char *text)
 {
@@ -263,15 +285,7 @@
 	{
 		if (strcmp(text+1, GNT_KEY_LEFT) == 0)
 		{
-			GList *iter = g_list_find(box->focus, box->active);
-			if ((!iter || !iter->prev) && box->focus)
-			{
-				box->active = box->focus->data;
-			}
-			else
-			{
-				box->active = iter->prev->data;
-			}
+			find_prev_focus(box);
 		}
 		else if (strcmp(text+1, GNT_KEY_RIGHT) == 0)
 		{
@@ -430,8 +444,11 @@
 
 	for (i = box->list; i; i = i->next)
 	{
-		gnt_widget_get_size(GNT_WIDGET(i->data), &tw, &th);
-		gnt_widget_set_size(i->data, tw + wchange, th + hchange);
+		if (wid != i->data)
+		{
+			gnt_widget_get_size(GNT_WIDGET(i->data), &tw, &th);
+			gnt_widget_set_size(i->data, tw + wchange, th + hchange);
+		}
 	}
 
 	reposition_children(widget);
@@ -686,3 +703,46 @@
 	box->fill = fill;
 }
 
+void gnt_box_move_focus(GntBox *box, int dir)
+{
+	GntWidget *now;
+
+	if (box->active == NULL)
+	{
+		find_focusable_widget(box);
+		return;
+	}
+
+	now = box->active;
+
+	if (dir == 1)
+		find_next_focus(box);
+	else if (dir == -1)
+		find_prev_focus(box);
+
+	if (now && now != box->active)
+	{
+		gnt_widget_set_focus(now, FALSE);
+		gnt_widget_set_focus(box->active, TRUE);
+	}
+
+	if (GNT_WIDGET(box)->window)
+		gnt_widget_draw(GNT_WIDGET(box));
+}
+
+void gnt_box_give_focus_to_child(GntBox *box, GntWidget *widget)
+{
+	GList *find = g_list_find(box->focus, widget);
+	gpointer now = box->active;
+	if (find)
+		box->active = widget;
+	if (now && now != box->active)
+	{
+		gnt_widget_set_focus(now, FALSE);
+		gnt_widget_set_focus(box->active, TRUE);
+	}
+
+	if (GNT_WIDGET(box)->window)
+		gnt_widget_draw(GNT_WIDGET(box));
+}
+

Modified: branches/soc-2006-file-loggers/console/libgnt/gntbox.h
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntbox.h	2006-08-09 04:22:08 UTC (rev 16676)
+++ branches/soc-2006-file-loggers/console/libgnt/gntbox.h	2006-08-09 04:49:19 UTC (rev 16677)
@@ -88,6 +88,10 @@
 
 void gnt_box_set_fill(GntBox *box, gboolean fill);
 
+void gnt_box_move_focus(GntBox *box, int dir);  /* +1 to move forward, -1 for backward */
+
+void gnt_box_give_focus_to_child(GntBox *box, GntWidget *widget);
+
 G_END_DECLS
 
 #endif /* GNT_BOX_H */

Modified: branches/soc-2006-file-loggers/console/libgnt/gntbutton.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntbutton.c	2006-08-09 04:22:08 UTC (rev 16676)
+++ branches/soc-2006-file-loggers/console/libgnt/gntbutton.c	2006-08-09 04:49:19 UTC (rev 16677)
@@ -1,6 +1,7 @@
 #include <string.h>
 
 #include "gntbutton.h"
+#include "gntutils.h"
 
 enum
 {
@@ -31,9 +32,10 @@
 gnt_button_size_request(GntWidget *widget)
 {
 	GntButton *button = GNT_BUTTON(widget);
-	widget->priv.width = g_utf8_strlen(button->priv->text, -1) + 4;
-	widget->priv.height = 1;
-	if (!GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_NO_SHADOW))
+	gnt_util_get_text_bound(button->priv->text,
+			&widget->priv.width, &widget->priv.height);
+	widget->priv.width += 4;
+	if (!GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_NO_BORDER))
 		widget->priv.height += 2;
 }
 

Modified: branches/soc-2006-file-loggers/console/libgnt/gntcombobox.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntcombobox.c	2006-08-09 04:22:08 UTC (rev 16676)
+++ branches/soc-2006-file-loggers/console/libgnt/gntcombobox.c	2006-08-09 04:49:19 UTC (rev 16677)
@@ -23,11 +23,11 @@
 		/* XXX: make sure the key actually does exist */
 		gpointer old = box->selected;
 		box->selected = key;
-		g_signal_emit(box, signals[SIG_SELECTION_CHANGED], 0, old, key);
 		if (GNT_WIDGET(box)->window)
 			gnt_widget_draw(GNT_WIDGET(box));
 		if (box->dropdown)
 			gnt_tree_set_selected(GNT_TREE(box->dropdown), key);
+		g_signal_emit(box, signals[SIG_SELECTION_CHANGED], 0, old, key);
 	}
 }
 
@@ -41,15 +41,13 @@
 	
 	if (box->dropdown)
 	{
-		text = (char *)gnt_tree_get_selection_text(GNT_TREE(box->dropdown));
+		text = gnt_tree_get_selection_text(GNT_TREE(box->dropdown));
 		box->selected = gnt_tree_get_selection_data(GNT_TREE(box->dropdown));
 	}
 
 	if (text == NULL)
-		text = "";
+		text = g_strdup(text);
 
-	text = g_strdup(text);
-
 	if (gnt_widget_has_focus(widget))
 		type = GNT_COLOR_HIGHLIGHT;
 	else
@@ -65,7 +63,7 @@
 	}
 
 	mvwprintw(widget->window, 1, 1, text);
-	whline(widget->window, '\0' | COLOR_PAIR(type), widget->priv.width - 4 - len);
+	whline(widget->window, ' ' | COLOR_PAIR(type), widget->priv.width - 4 - len);
 	mvwaddch(widget->window, 1, widget->priv.width - 3, ACS_VLINE | COLOR_PAIR(GNT_COLOR_NORMAL));
 	mvwaddch(widget->window, 1, widget->priv.width - 2, ACS_DARROW | COLOR_PAIR(GNT_COLOR_NORMAL));
 
@@ -102,6 +100,7 @@
 				case '\t':
 					set_selection(box, gnt_tree_get_selection_data(GNT_TREE(box->dropdown)));
 				case 27:
+					gnt_tree_set_selected(GNT_TREE(box->dropdown), box->selected);
 					gnt_widget_hide(box->dropdown->parent);
 					return TRUE;
 					break;
@@ -118,15 +117,16 @@
 					strcmp(text + 1, GNT_KEY_DOWN) == 0)
 			{
 				GntWidget *parent = box->dropdown->parent;
-				gnt_widget_set_size(box->dropdown, widget->priv.width, 9);
-				gnt_widget_set_position(parent,
-						widget->priv.x, widget->priv.y + widget->priv.height - 1);
+				int height = g_list_length(GNT_TREE(box->dropdown)->list);
+				int y = widget->priv.y + widget->priv.height - 1;
+				gnt_widget_set_size(box->dropdown, widget->priv.width, height + 2);
+
+				if (y + height + 2 >= getmaxy(stdscr))
+					y = widget->priv.y - height - 1;
+				gnt_widget_set_position(parent, widget->priv.x, y);
 				if (parent->window)
 				{
-					if (mvwin(parent->window, widget->priv.y + widget->priv.height - 1,
-								widget->priv.x) == ERR)
-						mvwin(parent->window,
-							widget->priv.y - 9 + 1, widget->priv.x);
+					mvwin(parent->window, y, widget->priv.x);
 				}
 
 				gnt_widget_draw(parent);
@@ -191,7 +191,7 @@
 	combo->dropdown = gnt_tree_new();
 
 	box = gnt_box_new(FALSE, FALSE);
-	GNT_WIDGET_SET_FLAGS(box, GNT_WIDGET_NO_SHADOW | GNT_WIDGET_NO_BORDER);
+	GNT_WIDGET_SET_FLAGS(box, GNT_WIDGET_NO_SHADOW | GNT_WIDGET_NO_BORDER | GNT_WIDGET_TRANSIENT);
 	gnt_box_set_pad(GNT_BOX(box), 0);
 	gnt_box_add_widget(GNT_BOX(box), combo->dropdown);
 	

Modified: branches/soc-2006-file-loggers/console/libgnt/gntentry.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntentry.c	2006-08-09 04:22:08 UTC (rev 16676)
+++ branches/soc-2006-file-loggers/console/libgnt/gntentry.c	2006-08-09 04:49:19 UTC (rev 16677)
@@ -16,8 +16,9 @@
 {
 	GntEntry *entry = GNT_ENTRY(widget);
 	int stop;
+	gboolean focus;
 
-	if (gnt_widget_has_focus(widget))
+	if ((focus = gnt_widget_has_focus(widget)))
 		wbkgdset(widget->window, '\0' | COLOR_PAIR(GNT_COLOR_TEXT_NORMAL));
 	else
 		wbkgdset(widget->window, '\0' | COLOR_PAIR(GNT_COLOR_HIGHLIGHT_D));
@@ -25,15 +26,19 @@
 	if (entry->masked)
 	{
 		mvwhline(widget->window, 0, 0, gnt_ascii_only() ? '*' : ACS_BULLET,
-				entry->end - entry->scroll);
+				g_utf8_pointer_to_offset(entry->scroll, entry->end));
 	}
 	else
 		mvwprintw(widget->window, 0, 0, entry->scroll);
 
-	stop = entry->end - entry->scroll;
+	stop = g_utf8_pointer_to_offset(entry->scroll, entry->end);
 	if (stop < widget->priv.width)
 		mvwhline(widget->window, 0, stop, ENTRY_CHAR, widget->priv.width - stop);
 
+	if (focus)
+		mvwchgat(widget->window, 0, g_utf8_pointer_to_offset(entry->scroll, entry->cursor),
+				1, A_REVERSE, COLOR_PAIR(GNT_COLOR_TEXT_NORMAL), NULL);
+
 	DEBUG;
 }
 
@@ -71,22 +76,23 @@
 	{
 		if (strcmp(text + 1, GNT_KEY_DEL) == 0 && entry->cursor < entry->end)
 		{
-			memmove(entry->cursor, entry->cursor + 1, entry->end - entry->cursor + 1);
-			entry->end--;
+			int len = g_utf8_find_next_char(entry->cursor, NULL) - entry->cursor;
+			memmove(entry->cursor, entry->cursor + len, entry->end - entry->cursor - len + 1);
+			entry->end -= len;
 			entry_redraw(widget);
 		}
 		else if (strcmp(text + 1, GNT_KEY_LEFT) == 0 && entry->cursor > entry->start)
 		{
-			entry->cursor--;
+			entry->cursor = g_utf8_find_prev_char(entry->start, entry->cursor);
 			if (entry->cursor < entry->scroll)
-				entry->scroll--;
+				entry->scroll = entry->cursor;
 			entry_redraw(widget);
 		}
 		else if (strcmp(text + 1, GNT_KEY_RIGHT) == 0 && entry->cursor < entry->end)
 		{
-			entry->cursor++;
-			if (entry->cursor - entry->scroll > widget->priv.width)
-				entry->scroll++;
+			entry->cursor = g_utf8_find_next_char(entry->cursor, NULL);
+			if (g_utf8_pointer_to_offset(entry->scroll, entry->cursor) >= widget->priv.width)
+				entry->scroll = g_utf8_find_next_char(entry->scroll, NULL);
 			entry_redraw(widget);
 		}
 		/* XXX: handle other keys, like home/end, and ctrl+ goodness */
@@ -99,22 +105,27 @@
 	{
 		if (!iscntrl(text[0]))
 		{
-			int i;
+			const char *str, *next;
 
-			for (i = 0; text[i]; i++)
+			for (str = text; *str;)
 			{
+				int len;
+				next = g_utf8_find_next_char(str, NULL);
+				len = next - str;
+
 				/* Valid input? */
-				if (ispunct(text[i]) && (entry->flag & GNT_ENTRY_FLAG_NO_PUNCT))
+				/* XXX: Is it necessary to use _unichar_ variants here? */
+				if (ispunct(*str) && (entry->flag & GNT_ENTRY_FLAG_NO_PUNCT))
 					continue;
-				if (isspace(text[i]) && (entry->flag & GNT_ENTRY_FLAG_NO_SPACE))
+				if (isspace(*str) && (entry->flag & GNT_ENTRY_FLAG_NO_SPACE))
 					continue;
-				if (isalpha(text[i]) && !(entry->flag & GNT_ENTRY_FLAG_ALPHA))
+				if (isalpha(*str) && !(entry->flag & GNT_ENTRY_FLAG_ALPHA))
 					continue;
-				if (isdigit(text[i]) && !(entry->flag & GNT_ENTRY_FLAG_INT))
+				if (isdigit(*str) && !(entry->flag & GNT_ENTRY_FLAG_INT))
 					continue;
 
 				/* Reached the max? */
-				if (entry->max && entry->end - entry->start >= entry->max)
+				if (entry->max && g_utf8_pointer_to_offset(entry->start, entry->end) >= entry->max)
 					continue;
 
 				if (entry->end - entry->start >= entry->buffer)
@@ -124,12 +135,14 @@
 					g_free(tmp);
 				}
 
-				*(entry->cursor) = text[i];
-				entry->cursor++;
+				memmove(entry->cursor + len, entry->cursor, entry->end - entry->cursor + 1);
+				entry->end += len;
 
-				entry->end++;
-				if (entry->cursor - entry->scroll > widget->priv.width)
-					entry->scroll++;
+				while (str < next)
+					*(entry->cursor++) = *str++;
+
+				while (g_utf8_pointer_to_offset(entry->scroll, entry->cursor) >= widget->priv.width)
+					entry->scroll = g_utf8_find_next_char(entry->scroll, NULL);
 			}
 			entry_redraw(widget);
 			return TRUE;
@@ -139,12 +152,13 @@
 			/* Backspace is here */
 			if (strcmp(text, GNT_KEY_BACKSPACE) == 0 && entry->cursor > entry->start)
 			{
-				entry->cursor--;
-				memmove(entry->cursor, entry->cursor + 1, entry->end - entry->cursor);
-				entry->end--;
+				int len = entry->cursor - g_utf8_find_prev_char(entry->start, entry->cursor);
+				entry->cursor -= len;
+				memmove(entry->cursor, entry->cursor + len, entry->end - entry->cursor);
+				entry->end -= len;
 
 				if (entry->scroll > entry->start)
-					entry->scroll--;
+					entry->scroll = g_utf8_find_prev_char(entry->start, entry->scroll);
 
 				entry_redraw(widget);
 				return TRUE;
@@ -243,15 +257,15 @@
 
 	if (text && text[0])
 	{
-		len = g_utf8_strlen(text, -1);
-		entry->buffer = len * 2;
+		len = strlen(text);
 	}
 	else
 	{
-		entry->buffer = 128;
 		len = 0;
 	}
 
+	entry->buffer = len + 128;
+
 	scroll = entry->scroll - entry->start;
 	cursor = entry->end - entry->cursor;
 

Modified: branches/soc-2006-file-loggers/console/libgnt/gntlabel.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntlabel.c	2006-08-09 04:22:08 UTC (rev 16676)
+++ branches/soc-2006-file-loggers/console/libgnt/gntlabel.c	2006-08-09 04:49:19 UTC (rev 16677)
@@ -1,4 +1,5 @@
 #include "gntlabel.h"
+#include "gntutils.h"
 
 #include <string.h>
 
@@ -33,27 +34,9 @@
 gnt_label_size_request(GntWidget *widget)
 {
 	GntLabel *label = GNT_LABEL(widget);
-	char *s = label->text, *last = s;
-	int count = 1;
-	int max = 0;
 
-	/* XXX: ew ... everyone look away */
-	while (*s)
-	{
-		if (*s == '\n' || *s == '\r')
-		{
-			count++;
-			if (max < s - last + 1)
-				max = s - last + 1;
-			last = s + 1;
-		}
-		s++;
-	}
-	if (max < s - last + 1)
-		max = s - last + 1;
-	widget->priv.height = count;
-
-	widget->priv.width = max;
+	gnt_util_get_text_bound(label->text,
+			&widget->priv.width, &widget->priv.height);
 }
 
 static void

Modified: branches/soc-2006-file-loggers/console/libgnt/gntline.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntline.c	2006-08-09 04:22:08 UTC (rev 16676)
+++ branches/soc-2006-file-loggers/console/libgnt/gntline.c	2006-08-09 04:49:19 UTC (rev 16677)
@@ -14,10 +14,10 @@
 	GntLine *line = GNT_LINE(widget);
 	if (line->vertical)
 		mvwvline(widget->window, 1, 0, ACS_VLINE | COLOR_PAIR(GNT_COLOR_NORMAL),
-				widget->priv.height - 3);
+				widget->priv.height - 2);
 	else
 		mvwhline(widget->window, 0, 1, ACS_HLINE | COLOR_PAIR(GNT_COLOR_NORMAL),
-				widget->priv.width - 3);
+				widget->priv.width - 2);
 }
 
 static void

Modified: branches/soc-2006-file-loggers/console/libgnt/gntmain.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntmain.c	2006-08-09 04:22:08 UTC (rev 16676)
+++ branches/soc-2006-file-loggers/console/libgnt/gntmain.c	2006-08-09 04:49:19 UTC (rev 16677)
@@ -67,7 +67,7 @@
 	/* XXX: ew */
 	focus_list = g_list_first(focus_list);
 	focus_list = g_list_append(focus_list, widget);
-	focus_list = g_list_find(focus_list, widget);
+	focus_list = g_list_find(focus_list, w ? w : widget);
 
 	gnt_widget_set_focus(widget, TRUE);
 	if (w)
@@ -308,6 +308,106 @@
 	draw_taskbar();
 }
 
+static void
+dump_screen()
+{
+	int x, y;
+	chtype old = 0, now = 0;
+	FILE *file = fopen("dump.html", "w");
+
+	fprintf(file, "<pre>");
+	for (y = 0; y < getmaxy(stdscr); y++)
+	{
+		for (x = 0; x < getmaxx(stdscr); x++)
+		{
+			char ch;
+			now = mvwinch(newscr, y, x);
+			ch = now & A_CHARTEXT;
+			now ^= ch;
+
+#define CHECK(attr, start, end) \
+			do \
+			{  \
+				if (now & attr)  \
+				{  \
+					if (!(old & attr))  \
+						fprintf(file, start);  \
+				}  \
+				else if (old & attr)  \
+				{  \
+					fprintf(file, end);  \
+				}  \
+			} while (0) 
+
+			CHECK(A_BOLD, "<b>", "</b>");
+			CHECK(A_UNDERLINE, "<u>", "</u>");
+			CHECK(A_BLINK, "<blink>", "</blink>");
+
+			if ((now & A_COLOR) != (old & A_COLOR))
+			{
+				int ret;
+				short fgp, bgp, r, g, b;
+				struct
+				{
+					int r, g, b;
+				} fg, bg;
+
+				ret = pair_content(PAIR_NUMBER(now & A_COLOR), &fgp, &bgp);
+				ret = color_content(fgp, &r, &g, &b);
+				fg.r = r; fg.b = b; fg.g = g;
+				ret = color_content(bgp, &r, &g, &b);
+				bg.r = r; bg.b = b; bg.g = g;
+#define ADJUST(x) (x = x * 255 / 1000)
+				ADJUST(fg.r);
+				ADJUST(fg.g);
+				ADJUST(fg.b);
+				ADJUST(bg.r);
+				ADJUST(bg.b);
+				ADJUST(bg.g);
+				
+				if (x) fprintf(file, "</span>");
+				fprintf(file, "<span style=\"background:#%02x%02x%02x;color:#%02x%02x%02x\">",
+						bg.r, bg.g, bg.b, fg.r, fg.g, fg.b);
+			}
+			if (now & A_ALTCHARSET)
+			{
+				switch (ch)
+				{
+					case 'q':
+						ch = '-'; break;
+					case 't':
+					case 'u':
+					case 'x':
+						ch = '|'; break;
+					case 'v':
+					case 'w':
+					case 'l':
+					case 'm':
+					case 'k':
+					case 'j':
+					case 'n':
+						ch = '+'; break;
+					default:
+						ch = ' '; break;
+				}
+			}
+			if (ch == '&')
+				fprintf(file, "&amp;");
+			else if (ch == '<')
+				fprintf(file, "&lt;");
+			else if (ch == '>')
+				fprintf(file, "&gt;");
+			else
+				fprintf(file, "%c", ch);
+			old = now;
+		}
+		fprintf(file, "</span>\n");
+		old = 0;
+	}
+	fprintf(file, "</pre>");
+	fclose(file);
+}
+
 static gboolean
 io_invoke(GIOChannel *source, GIOCondition cond, gpointer null)
 {
@@ -331,6 +431,12 @@
 
 	buffer[rd] = 0;
 
+	if (buffer[0] == 27 && buffer[1] == 'd' && buffer[2] == 0)
+	{
+		/* This dumps the screen contents in an html file */
+		dump_screen();
+	}
+
 	if (mode == GNT_KP_MODE_NORMAL)
 	{
 		if (focus_list)
@@ -551,6 +657,7 @@
 
 	initscr();
 	gnt_init_colors();
+	gnt_init_styles();
 
 	filename = g_build_filename(g_get_home_dir(), ".gntrc", NULL);
 	gnt_style_read_configure_file(filename);
@@ -566,8 +673,8 @@
 	wbkgdset(stdscr, '\0' | COLOR_PAIR(GNT_COLOR_NORMAL));
 	noecho();
 	refresh();
-#if MAYBE_SOMEDAY
-	mousemask(ALL_MOUSE_EVENTS | REPORT_MOUSE_POSITION, NULL);
+#if 0
+	mousemask(NCURSES_BUTTON_PRESSED | NCURSES_BUTTON_RELEASED | REPORT_MOUSE_POSITION, NULL);
 #endif
 	wbkgdset(stdscr, '\0' | COLOR_PAIR(GNT_COLOR_NORMAL));
 	werase(stdscr);
@@ -657,7 +764,14 @@
 	gnt_box_sync_children(GNT_BOX(widget));
 	node = g_hash_table_lookup(nodes, widget);
 	if (node && !node->panel)
+	{
 		node->panel = new_panel(node->me->window);
+		if (!GNT_WIDGET_IS_FLAG_SET(node->me, GNT_WIDGET_TRANSIENT))
+		{
+			bottom_panel(node->panel);     /* New windows should not grab focus */
+			gnt_widget_set_urgent(node->me);
+		}
+	}
 
 	if (window_list.window)
 	{
@@ -708,6 +822,7 @@
 void gnt_quit()
 {
 	gnt_uninit_colors();
+	gnt_uninit_styles();
 	endwin();
 }
 

Modified: branches/soc-2006-file-loggers/console/libgnt/gntstyle.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntstyle.c	2006-08-09 04:22:08 UTC (rev 16676)
+++ branches/soc-2006-file-loggers/console/libgnt/gntstyle.c	2006-08-09 04:49:19 UTC (rev 16677)
@@ -1,6 +1,76 @@
 #include "gntstyle.h"
 #include "gntcolors.h"
 
+#include <string.h>
+
+static char * str_styles[GNT_STYLES];
+static int int_styles[GNT_STYLES];
+static int bool_styles[GNT_STYLES];
+
+const char *gnt_style_get(GntStyle style)
+{
+	return str_styles[style];
+}
+
+gboolean gnt_style_get_bool(GntStyle style, gboolean def)
+{
+	int i;
+	const char * str;
+
+	if (bool_styles[style] != -1)
+		return bool_styles[style];
+	
+	str = gnt_style_get(style);
+
+	if (str)
+	{
+		if (strcmp(str, "false") == 0)
+			def = FALSE;
+		else if (strcmp(str, "true") == 0)
+			def = TRUE;
+		else if (sscanf(str, "%d", &i) == 1)
+		{
+			if (i)
+				def = TRUE;
+			else
+				def = FALSE;
+		}
+	}
+
+	bool_styles[style] = def;
+	return bool_styles[style];
+}
+
+static void
+read_general_style(GKeyFile *kfile)
+{
+	GError *error = NULL;
+	gsize nkeys;
+	char **keys = g_key_file_get_keys(kfile, "general", &nkeys, &error);
+	int i;
+	struct
+	{
+		const char *style;
+		GntStyle en;
+	} styles[] = {{"shadow", GNT_STYLE_SHADOW},
+	              {NULL, 0}};
+
+	if (error)
+	{
+		/* XXX: some error happened. */
+		g_error_free(error);
+	}
+	else
+	{
+		for (i = 0; styles[i].style; i++)
+		{
+			error = NULL;
+			str_styles[styles[i].en] =
+					g_key_file_get_string(kfile, "general", styles[i].style, &error);
+		}
+	}
+}
+
 void gnt_style_read_configure_file(const char *filename)
 {
 #if GLIB_CHECK_VERSION(2,6,0)
@@ -14,8 +84,27 @@
 		return;
 	}
 	gnt_colors_parse(kfile);
+	read_general_style(kfile);
 
 	g_key_file_free(kfile);
 #endif
 }
 
+void gnt_init_styles()
+{
+	int i;
+	for (i = 0; i < GNT_STYLES; i++)
+	{
+		str_styles[i] = NULL;
+		int_styles[i] = -1;
+		bool_styles[i] = -1;
+	}
+}
+
+void gnt_uninit_styles()
+{
+	int i;
+	for (i = 0; i < GNT_STYLES; i++)
+		g_free(str_styles[i]);
+}
+

Modified: branches/soc-2006-file-loggers/console/libgnt/gntstyle.h
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntstyle.h	2006-08-09 04:22:08 UTC (rev 16676)
+++ branches/soc-2006-file-loggers/console/libgnt/gntstyle.h	2006-08-09 04:49:19 UTC (rev 16677)
@@ -1,4 +1,19 @@
 #include "gnt.h"
 
+typedef enum
+{
+	GNT_STYLE_SHADOW = 0,
+	GNT_STYLES
+} GntStyle;
+
 void gnt_style_read_configure_file(const char *filename);
 
+/* Returned strings are all lowercase */
+const char *gnt_style_get(GntStyle style);
+
+gboolean gnt_style_get_bool(GntStyle style, gboolean def);
+
+void gnt_init_styles();
+
+void gnt_uninit_styles();
+

Modified: branches/soc-2006-file-loggers/console/libgnt/gnttextview.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gnttextview.c	2006-08-09 04:22:08 UTC (rev 16676)
+++ branches/soc-2006-file-loggers/console/libgnt/gnttextview.c	2006-08-09 04:49:19 UTC (rev 16677)
@@ -93,6 +93,7 @@
 gnt_text_view_destroy(GntWidget *widget)
 {
 	GntTextView *view = GNT_TEXT_VIEW(widget);
+	view->list = g_list_first(view->list);
 	g_list_foreach(view->list, free_text_line, NULL);
 	g_list_free(view->list);
 }
@@ -182,19 +183,27 @@
 
 	view->list = g_list_first(view->list);
 
-	split = g_strsplit(text, "\n", 0);
+	split = g_strsplit(text, "\n", -1);
 	for (i = 0; split[i]; i++)
 	{
-		GntTextLine *line = view->list->data;
-		int len = g_utf8_strlen(split[i], -1);
+		GntTextLine *line;
 		char *iter = split[i];
 		int prev = 0;
 
+		if (i)
+		{
+			line = g_new0(GntTextLine, 1);
+			view->list = g_list_prepend(g_list_first(view->list), line);
+		}
+
+		line = view->list->data;
+
 		while (iter && *iter)
 		{
 			GntTextSegment *seg = g_new0(GntTextSegment, 1);
+			int len = g_utf8_offset_to_pointer(iter, widget->priv.width - line->length - 1) - iter;
 			seg->flags = fl;
-			seg->text = g_new0(char, len + 1);		/* XXX: MUST be improved */
+			seg->text = g_new0(char, len + 1);
 			g_utf8_strncpy(seg->text, iter, widget->priv.width - line->length - 1);
 			line->segments = g_list_append(line->segments, seg);
 
@@ -206,7 +215,6 @@
 				line = g_new0(GntTextLine, 1);
 				view->list = g_list_prepend(g_list_first(view->list), line);
 			}
-			/*len -= prev;*/
 		}
 	}
 
@@ -286,3 +294,24 @@
 		gnt_widget_draw(GNT_WIDGET(view));
 }
 
+int gnt_text_view_get_lines_below(GntTextView *view)
+{
+	int below = 0;
+	GList *list = view->list;
+	while ((list = list->prev))
+		++below;
+	return below;
+}
+
+int gnt_text_view_get_lines_above(GntTextView *view)
+{
+	int above = 0;
+	GList *list = view->list;
+	list = g_list_nth(view->list, GNT_WIDGET(view)->priv.height);
+	if (!list)
+		return 0;
+	while ((list = list->next))
+		++above;
+	return above;
+}
+

Modified: branches/soc-2006-file-loggers/console/libgnt/gnttextview.h
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gnttextview.h	2006-08-09 04:22:08 UTC (rev 16676)
+++ branches/soc-2006-file-loggers/console/libgnt/gnttextview.h	2006-08-09 04:49:19 UTC (rev 16677)
@@ -69,6 +69,10 @@
 
 void gnt_text_view_clear(GntTextView *view);
 
+int gnt_text_view_get_lines_below(GntTextView *view);
+
+int gnt_text_view_get_lines_above(GntTextView *view);
+
 G_END_DECLS
 
 #endif /* GNT_TEXT_VIEW_H */

Modified: branches/soc-2006-file-loggers/console/libgnt/gnttree.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gnttree.c	2006-08-09 04:22:08 UTC (rev 16676)
+++ branches/soc-2006-file-loggers/console/libgnt/gnttree.c	2006-08-09 04:49:19 UTC (rev 16677)
@@ -387,7 +387,7 @@
 static void
 tree_selection_changed(GntTree *tree, GntTreeRow *old, GntTreeRow *current)
 {
-	g_signal_emit(tree, signals[SIG_SELECTION_CHANGED], 0, old, current);
+	g_signal_emit(tree, signals[SIG_SELECTION_CHANGED], 0, old->key, current->key);
 }
 
 static GntTreeRow *

Modified: branches/soc-2006-file-loggers/console/libgnt/gnttree.h
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gnttree.h	2006-08-09 04:22:08 UTC (rev 16676)
+++ branches/soc-2006-file-loggers/console/libgnt/gnttree.h	2006-08-09 04:49:19 UTC (rev 16677)
@@ -78,6 +78,7 @@
 
 gpointer gnt_tree_get_selection_data(GntTree *tree);
 
+/* Returned string needs to be freed */
 char *gnt_tree_get_selection_text(GntTree *tree);
 
 GList *gnt_tree_get_selection_text_list(GntTree *tree);

Copied: branches/soc-2006-file-loggers/console/libgnt/gntutils.c (from rev 16676, trunk/console/libgnt/gntutils.c)
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntutils.c	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/libgnt/gntutils.c	2006-08-09 04:49:19 UTC (rev 16677)
@@ -0,0 +1,33 @@
+#include "gntutils.h"
+
+void gnt_util_get_text_bound(const char *text, int *width, int *height)
+{
+	const char *s = text, *last;
+	int count = 1, max = 0;
+	int len;
+
+	/* XXX: ew ... everyone look away */
+	last = s;
+	while (*s)
+	{
+		if (*s == '\n' || *s == '\r')
+		{
+			count++;
+			len = g_utf8_pointer_to_offset(last, s);
+			if (max < len)
+				max = len;
+			last = s + 1;
+		}
+		s++;
+	}
+
+	len = g_utf8_pointer_to_offset(last, s);
+	if (max < len)
+		max = len;
+
+	if (height)
+		*height = count;
+	if (width)
+		*width = max + (count > 1);
+}
+

Copied: branches/soc-2006-file-loggers/console/libgnt/gntutils.h (from rev 16676, trunk/console/libgnt/gntutils.h)
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntutils.h	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/libgnt/gntutils.h	2006-08-09 04:49:19 UTC (rev 16677)
@@ -0,0 +1,6 @@
+#include <glib.h>
+
+#include "gnt.h"
+#include "gntwidget.h"
+
+void gnt_util_get_text_bound(const char *text, int *width, int *height);

Modified: branches/soc-2006-file-loggers/console/libgnt/gntwidget.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntwidget.c	2006-08-09 04:22:08 UTC (rev 16676)
+++ branches/soc-2006-file-loggers/console/libgnt/gntwidget.c	2006-08-09 04:49:19 UTC (rev 16677)
@@ -1,6 +1,7 @@
 /* Stuff brutally ripped from Gflib */
 
 #include "gntwidget.h"
+#include "gntstyle.h"
 #include "gntmarshal.h"
 #include "gnt.h"
 
@@ -290,7 +291,7 @@
 	{
 		gboolean shadow = TRUE;
 
-		if (GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_NO_SHADOW))
+		if (!gnt_widget_has_shadow(widget))
 			shadow = FALSE;
 
 		widget->window = newwin(widget->priv.height + shadow, widget->priv.width + shadow,
@@ -325,7 +326,7 @@
 	wbkgdset(widget->window, '\0' | COLOR_PAIR(GNT_COLOR_NORMAL));
 #if 1
 	/* XXX: I have no clue why, but this seems to be necessary. */
-	if (!GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_NO_SHADOW))
+	if (gnt_widget_has_shadow(widget))
 		mvwvline(widget->window, 1, widget->priv.width, ' ', widget->priv.height);
 #endif
 	gnt_screen_release(widget);
@@ -361,7 +362,7 @@
 gnt_widget_get_size(GntWidget *wid, int *width, int *height)
 {
 	gboolean shadow = TRUE;
-	if (GNT_WIDGET_IS_FLAG_SET(wid, GNT_WIDGET_NO_SHADOW))
+	if (!gnt_widget_has_shadow(wid))
 		shadow = FALSE;
 
 	if (width)
@@ -376,7 +377,7 @@
 {
 	gboolean shadow = TRUE;
 
-	if (GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_NO_SHADOW))
+	if (!gnt_widget_has_shadow(widget))
 		shadow = FALSE;
 
 	wbkgd(widget->window, COLOR_PAIR(GNT_COLOR_NORMAL));
@@ -384,9 +385,21 @@
 
 	if (!(GNT_WIDGET_FLAGS(widget) & GNT_WIDGET_NO_BORDER))
 	{
-		WINDOW *tmp = derwin(widget->window, widget->priv.height, widget->priv.width, 0, 0);
-		box(tmp, 0, 0);
-		delwin(tmp);
+		/* - This is ugly. */
+		/* - What's your point? */
+		mvwvline(widget->window, 0, 0, ACS_VLINE | COLOR_PAIR(GNT_COLOR_NORMAL), widget->priv.height);
+		mvwvline(widget->window, 0, widget->priv.width - 1,
+				ACS_VLINE | COLOR_PAIR(GNT_COLOR_NORMAL), widget->priv.height);
+		mvwhline(widget->window, widget->priv.height - 1, 0,
+				ACS_HLINE | COLOR_PAIR(GNT_COLOR_NORMAL), widget->priv.width);
+		mvwhline(widget->window, 0, 0, ACS_HLINE | COLOR_PAIR(GNT_COLOR_NORMAL), widget->priv.width);
+		mvwaddch(widget->window, 0, 0, ACS_ULCORNER | COLOR_PAIR(GNT_COLOR_NORMAL));
+		mvwaddch(widget->window, 0, widget->priv.width - 1,
+				ACS_URCORNER | COLOR_PAIR(GNT_COLOR_NORMAL));
+		mvwaddch(widget->window, widget->priv.height - 1, 0,
+				ACS_LLCORNER | COLOR_PAIR(GNT_COLOR_NORMAL));
+		mvwaddch(widget->window, widget->priv.height - 1, widget->priv.width - 1,
+				ACS_LRCORNER | COLOR_PAIR(GNT_COLOR_NORMAL));
 	}
 
 	if (shadow)
@@ -402,7 +415,7 @@
 {
 	gboolean ret = TRUE;
 
-	if (!GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_NO_SHADOW))
+	if (gnt_widget_has_shadow(widget))
 	{
 		width--;
 		height--;
@@ -418,7 +431,7 @@
 		gboolean shadow = TRUE;
 		int oldw, oldh;
 
-		if (GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_NO_SHADOW))
+		if (!gnt_widget_has_shadow(widget))
 			shadow = FALSE;
 
 		oldw = widget->priv.width;
@@ -518,3 +531,9 @@
 		GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_INVISIBLE);
 }
 
+gboolean gnt_widget_has_shadow(GntWidget *widget)
+{
+	return (!GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_NO_SHADOW) &&
+			gnt_style_get_bool(GNT_STYLE_SHADOW, FALSE));
+}
+

Modified: branches/soc-2006-file-loggers/console/libgnt/gntwidget.h
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntwidget.h	2006-08-09 04:22:08 UTC (rev 16676)
+++ branches/soc-2006-file-loggers/console/libgnt/gntwidget.h	2006-08-09 04:49:19 UTC (rev 16677)
@@ -40,6 +40,7 @@
 	GNT_WIDGET_GROW_X         = 1 << 8,
 	GNT_WIDGET_GROW_Y         = 1 << 9,
 	GNT_WIDGET_INVISIBLE      = 1 << 10,
+	GNT_WIDGET_TRANSIENT      = 1 << 11,
 } GntWidgetFlags;
 
 /* XXX: I'll have to ask grim what he's using this for in guifications. */
@@ -129,6 +130,8 @@
 
 void gnt_widget_set_visible(GntWidget *widget, gboolean set);
 
+gboolean gnt_widget_has_shadow(GntWidget *widget);
+
 G_END_DECLS
 
 #endif /* GNT_WIDGET_H */

Modified: branches/soc-2006-file-loggers/console/libgnt/test/combo.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/test/combo.c	2006-08-09 04:22:08 UTC (rev 16676)
+++ branches/soc-2006-file-loggers/console/libgnt/test/combo.c	2006-08-09 04:49:19 UTC (rev 16677)
@@ -46,8 +46,13 @@
 	gnt_combo_box_add_data(GNT_COMBO_BOX(combo), "4", "4");
 	gnt_combo_box_add_data(GNT_COMBO_BOX(combo), "5", "5");
 	gnt_combo_box_add_data(GNT_COMBO_BOX(combo), "6", "6");
+	gnt_combo_box_add_data(GNT_COMBO_BOX(combo), "7", "7");
+	gnt_combo_box_add_data(GNT_COMBO_BOX(combo), "8", "8");
+	gnt_combo_box_add_data(GNT_COMBO_BOX(combo), "9", "9");
 
-	gnt_box_add_widget(GNT_BOX(hbox), gnt_label_new("Select"));
+	GntWidget *l = gnt_label_new("Select");
+	gnt_box_add_widget(GNT_BOX(hbox), l);
+	gnt_widget_set_size(l, 0, 1);
 	gnt_box_add_widget(GNT_BOX(hbox), combo);
 
 	gnt_box_add_widget(GNT_BOX(box), hbox);

Modified: branches/soc-2006-file-loggers/console/libgnt/test/multiwin.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/test/multiwin.c	2006-08-09 04:22:08 UTC (rev 16676)
+++ branches/soc-2006-file-loggers/console/libgnt/test/multiwin.c	2006-08-09 04:49:19 UTC (rev 16677)
@@ -27,6 +27,7 @@
 	gnt_widget_set_name(box2, "box2");
 
 	tree = gnt_tree_new_with_columns(3);
+	GNT_WIDGET_SET_FLAGS(tree, GNT_WIDGET_NO_BORDER);
 	gnt_tree_set_column_titles(GNT_TREE(tree), "12345678901234567890", "column 2", "column3");
 	gnt_tree_set_show_title(GNT_TREE(tree), TRUE);
 	gnt_widget_set_name(tree, "tree");

Modified: branches/soc-2006-file-loggers/console/libgnt/test/tv.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/test/tv.c	2006-08-09 04:22:08 UTC (rev 16676)
+++ branches/soc-2006-file-loggers/console/libgnt/test/tv.c	2006-08-09 04:49:19 UTC (rev 16677)
@@ -16,7 +16,8 @@
 				GNT_TEXT_FLAG_HIGHLIGHT);
 		gnt_text_view_next_line(GNT_TEXT_VIEW(view));
 		gnt_entry_clear(GNT_ENTRY(w));
-		gnt_text_view_scroll(GNT_TEXT_VIEW(view), 0);
+		if (gnt_text_view_get_lines_below(GNT_TEXT_VIEW(view)) <= 1)
+			gnt_text_view_scroll(GNT_TEXT_VIEW(view), 0);
 
 		return TRUE;
 	}


Property changes on: branches/soc-2006-file-loggers/doc
___________________________________________________________________
Name: svn:ignore
   - Makefile.in
Makefile
html
gaim.1
gaim-remote.1
   + Makefile.in
Makefile
html
gaim.1
gaim-remote.1
gntgaim.1


Modified: branches/soc-2006-file-loggers/doc/Makefile.am
===================================================================
--- branches/soc-2006-file-loggers/doc/Makefile.am	2006-08-09 04:22:08 UTC (rev 16676)
+++ branches/soc-2006-file-loggers/doc/Makefile.am	2006-08-09 04:49:19 UTC (rev 16677)
@@ -1,4 +1,4 @@
-man_MANS = gaim.1
+man_MANS = gaim.1 gntgaim.1
 
 EXTRA_DIST = \
 	C-HOWTO.dox \
@@ -15,6 +15,7 @@
 	dbus-server-signals.dox \
 	gaim.1.in \
 	gaims_funniest_home_convos.txt \
+	gntgaim.1.in \
 	gtkaccount-signals.dox \
 	gtkblist-signals.dox \
 	gtkconv-signals.dox \

Modified: branches/soc-2006-file-loggers/doc/gaim.1.in
===================================================================
--- branches/soc-2006-file-loggers/doc/gaim.1.in	2006-08-09 04:22:08 UTC (rev 16676)
+++ branches/soc-2006-file-loggers/doc/gaim.1.in	2006-08-09 04:49:19 UTC (rev 16677)
@@ -30,7 +30,7 @@
 .PP
 \fBgaim\fR is a GTK2-based Instant Messaging (IM) application.  It supports
 multiple protocols via modules, including AIM, ICQ, Yahoo!, MSN, Jabber,
-IRC, Napster, Gadu-Gadu and Zephyr.  It has many common features found in
+IRC, Gadu-Gadu and Zephyr.  It has many common features found in
 other clients, as well as many unique features.  Gaim is not endorsed by or
 affiliated with America Online, ICQ, Microsoft, or Yahoo.
 

Modified: branches/soc-2006-file-loggers/doc/gaims_funniest_home_convos.txt
===================================================================
--- branches/soc-2006-file-loggers/doc/gaims_funniest_home_convos.txt	2006-08-09 04:22:08 UTC (rev 16676)
+++ branches/soc-2006-file-loggers/doc/gaims_funniest_home_convos.txt	2006-08-09 04:49:19 UTC (rev 16677)
@@ -360,3 +360,16 @@
                  gaim becomes a text terminal
       [time passes ...]
 21:38 <An_Idiot>  I'm terribly conservative when it comes to security
+
+19:47 <someusr> hey
+19:48 <someusr> how do i set aim to block all users except those on my
+                buddy list?
+19:48 <someusr> don't tell me i have to log in with the regular AIM :(
+19:48 <Paco-Paco> I wouldn't tell you that, because it's wrong
+19:48 <Paco-Paco> how about you look in privacy
+19:49 <someusr> where?
+19:49 <someusr> i can't find it
+19:49 <SimGuy> in Privacy
+19:49 <someusr> OH!
+19:49 <someusr> haha
+19:49 <someusr> thanks!

Copied: branches/soc-2006-file-loggers/doc/gntgaim.1.in (from rev 16676, trunk/doc/gntgaim.1.in)
===================================================================
--- branches/soc-2006-file-loggers/doc/gntgaim.1.in	                        (rev 0)
+++ branches/soc-2006-file-loggers/doc/gntgaim.1.in	2006-08-09 04:49:19 UTC (rev 16677)
@@ -0,0 +1,177 @@
+.\" Copyright (c) 2006, Sadrul Habib Chowdhury <sadrul@...>
+.\"
+.\" This is free documentation; 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 (at your option) any later version.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public
+.\" License along with this manual; if not, write to the Free
+.\" Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
+.\" USA.
+.TH gntgaim 1
+.SH NAME
+GntGaim \- Console frontend for Instant Messaging client Gaim.
+.SH SYNOPSIS
+.TP 5
+\fBgntgaim \fI[options]\fR
+
+.SH DESCRIPTION
+.PP
+\fBgntgaim\fR is a console-based frontend for Instant Messaging (IM)
+application Gaim.  It supports multiple protocols via modules, including AIM,
+ICQ, Yahoo!, MSN, Jabber, IRC, Gadu-Gadu and Zephyr.  It has many
+common features found in other clients, as well as many unique features.  Gaim
+is not endorsed by or affiliated with America Online, ICQ, Microsoft, or Yahoo.
+
+.SH OPTIONS
+The following options are provided by \fBgntgaim\fR using the standard GNU
+command line syntax:
+.TP
+.B \-d, \-\-debug
+Print debugging messages to stdout.  These are the same debugging messages
+that are displayed in the \fBDebug\fR window.
+.TP
+.B \-c, \-\-config=\fIDIR\fB
+Use \fIDIR\fR as the directory for config files instead of \fI~/.gaim\fR.
+.TP
+.B \-h, \-\-help
+Print this help and exit.
+.TP
+.B \-n, \-\-nologin
+Don't automatically login when \fBgntgaim\fR starts.  Sets all accounts to
+Offline.
+.TP
+.B \-v, \-\-version
+Display the version information window.
+
+.SH GNT Shortcuts
+You can use the following shortcuts:
+.TP
+.B Alt \+ n
+Go to the next window.
+.TP
+.B Alt \+ p
+Go to the previous window.
+.TP
+.B Alt \+ w
+Show the list of windows. You can select and jump to any window from the list.
+.TP
+.B Alt \+ c
+Close the current window.
+.TP
+.B Alt \+ q
+Quit.
+.TP
+.B Alt \+ m
+Start moving a window. Press the cursor keys to move the window. When you are
+done, press \fBEnter\fR or \fBEscape\fR.
+.TP
+.B Alt \+ r
+Start resizing a window. Press the cursor keys to resize the window. When you
+are done, press \fBEnter\fR or \fBEscape\fR.
+
+.SH FILES
+\fI~/.gntrc\fR: configuration file for gnt applications.
+.br
+.TP
+A sample file looks like:
+.br
+[general]
+.br
+shadow = 0
+.br
+
+.br
+[colors]
+.br
+# The RGB values range in [0, 1000]
+.br
+black = 0; 0; 0
+.br
+red = 1000; 0; 0
+.br
+green = 0; 1000; 0
+.br
+blue = 250; 250; 700
+.br
+white = 1000; 1000; 1000
+.br
+gray = 700; 700; 700
+.br
+darkgray = 256; 256; 256
+.br
+
+.br
+[colorpairs]
+.br
+normal = white; black
+.br
+highlight = white; blue
+.br
+highlightd = black; gray
+.br
+shadow = black; darkgray
+.br
+title = white; blue
+.br
+titled = white; gray
+.br
+text = white; blue
+.br
+disabled = gray; black
+.br
+
+.SH BUGS
+Known bugs are listed at
+.br
+\fIhttp://sourceforge.net/tracker/?group_id=235&atid=100235\fR
+
+.SH PATCHES
+If you fix a bug in \fBgntgaim\fR (or otherwise enhance it), please submit a
+patch (using \fIcvs diff -up > my.diff\fR against the latest CVS version)
+at
+.br
+\fIhttp://sourceforge.net/tracker/?func=add&group_id=235&atid=300235\fR
+
+Before sending a bug report, please verify that you have the latest
+version of \fBgntgaim\fR.  Many bugs (major and minor) are fixed
+at each release, and if yours is out of date, the problem may already
+have been solved.
+
+.SH SEE ALSO
+\fIhttp://gaim.sourceforge.net/\fR
+.br
+\fIhttp://www.sourceforge.net/projects/gaim/\fR
+
+.SH LICENSE
+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
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but
+\fBWITHOUT ANY WARRANTY\fR; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+.SH AUTHORS
+Sadrul Habib Chowdhury <\fIsadrul@...>
+.br
+
+This manpage was written by Sadrul Habib Chowdhury <\fIsadrul@...>.
+

Modified: branches/soc-2006-file-loggers/gaim.spec.in
===================================================================
--- branches/soc-2006-file-loggers/gaim.spec.in	2006-08-09 04:22:08 UTC (rev 16676)
+++ branches/soc-2006-file-loggers/gaim.spec.in	2006-08-09 04:49:19 UTC (rev 16677)
@@ -112,7 +112,7 @@
 %description
 Gaim allows you to talk to anyone using a variety of messaging
 protocols, including AIM, ICQ, IRC, Yahoo!, Novell Groupwise, MSN
-Messenger, Jabber, Gadu-Gadu, Napster, Lotus Sametime and Zephyr.
+Messenger, Jabber, Gadu-Gadu, Lotus Sametime and Zephyr.
 These protocols are implemented using a modular, easy to use design.
 To use a protocol, just add an account using the account editor.
 

Modified: branches/soc-2006-file-loggers/pixmaps/status/default/Makefile.am
===================================================================
--- branches/soc-2006-file-loggers/pixmaps/status/default/Makefile.am	2006-08-09 04:22:08 UTC (rev 16676)
+++ branches/soc-2006-file-loggers/pixmaps/status/default/Makefile.am	2006-08-09 04:49:19 UTC (rev 16677)
@@ -26,7 +26,6 @@
 	male.png \
 	meanwhile.png \
 	msn.png \
-	napster.png \
 	notauthorized.png \
 	novell.png \
 	occupied.png \

Deleted: branches/soc-2006-file-loggers/pixmaps/status/default/napster.png
===================================================================
(Binary files differ)

Modified: branches/soc-2006-file-loggers/plugins/codeinline.c
===================================================================
--- branches/soc-2006-file-loggers/plugins/codeinline.c	2006-08-09 04:22:08 UTC (rev 16676)
+++ branches/soc-2006-file-loggers/plugins/codeinline.c	2006-08-09 04:49:19 UTC (rev 16677)
@@ -48,12 +48,12 @@
 
 static gboolean
 plugin_load(GaimPlugin *plugin)
-{       
+{
      void *handle = gaim_conversations_get_handle();
      plugin_handle = plugin;
-     gaim_signal_connect(handle, "writing-im-msg", plugin, 
+     gaim_signal_connect(handle, "writing-im-msg", plugin,
                 GAIM_CALLBACK(outgoing_msg_cb), NULL);
-     
+
      return TRUE;
 }
 


Property changes on: branches/soc-2006-file-loggers/plugins/codeinline.c
___________________________________________________________________
Name: svn:executable
   - *

Modified: branches/soc-2006-file-loggers/plugins/contact_priority.c
===================================================================
--- branches/soc-2006-file-loggers/plugins/contact_priority.c	2006-08-09 04:22:08 UTC (rev 16676)
+++ branches/soc-2006-file-loggers/plugins/contact_priority.c	2006-08-09 04:49:19 UTC (rev 16677)
@@ -99,12 +99,12 @@
 

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16738
Author:   roast
Date:     2006-08-13 10:38:25 -0700 (Sun, 13 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16738&view=rev

Log Message:
-----------
merged with svn trunk. 16676:16737.

Modified Paths:
--------------
    branches/soc-2006-file-loggers/configure.ac
    branches/soc-2006-file-loggers/console/gntblist.c
    branches/soc-2006-file-loggers/console/gntconv.c
    branches/soc-2006-file-loggers/console/gntprefs.c
    branches/soc-2006-file-loggers/console/gntrequest.c
    branches/soc-2006-file-loggers/console/libgnt/Makefile.am
    branches/soc-2006-file-loggers/console/libgnt/gntcombobox.c
    branches/soc-2006-file-loggers/console/libgnt/gntentry.c
    branches/soc-2006-file-loggers/console/libgnt/gntentry.h
    branches/soc-2006-file-loggers/console/libgnt/gntkeys.h
    branches/soc-2006-file-loggers/console/libgnt/gntmain.c
    branches/soc-2006-file-loggers/console/libgnt/gnttree.c
    branches/soc-2006-file-loggers/console/libgnt/gnttree.h
    branches/soc-2006-file-loggers/console/libgnt/gntutils.c
    branches/soc-2006-file-loggers/console/libgnt/gntwidget.c
    branches/soc-2006-file-loggers/console/libgnt/test/tv.c
    branches/soc-2006-file-loggers/gaim.apspec.in
    branches/soc-2006-file-loggers/plugins/ChangeLog.API
    branches/soc-2006-file-loggers/plugins/log_reader.c
    branches/soc-2006-file-loggers/po/ChangeLog
    branches/soc-2006-file-loggers/po/de.po
    branches/soc-2006-file-loggers/po/fi.po
    branches/soc-2006-file-loggers/po/gl.po
    branches/soc-2006-file-loggers/po/gu.po
    branches/soc-2006-file-loggers/po/it.po
    branches/soc-2006-file-loggers/po/sl.po
    branches/soc-2006-file-loggers/po/zh_TW.po
    branches/soc-2006-file-loggers/src/account.c
    branches/soc-2006-file-loggers/src/ft.c
    branches/soc-2006-file-loggers/src/gtkaccount.c
    branches/soc-2006-file-loggers/src/gtkblist.c
    branches/soc-2006-file-loggers/src/gtkdialogs.c
    branches/soc-2006-file-loggers/src/plugin.c
    branches/soc-2006-file-loggers/src/protocols/irc/irc.c
    branches/soc-2006-file-loggers/src/protocols/jabber/JEPS
    branches/soc-2006-file-loggers/src/protocols/jabber/buddy.c
    branches/soc-2006-file-loggers/src/protocols/jabber/jabber.c
    branches/soc-2006-file-loggers/src/protocols/jabber/si.c
    branches/soc-2006-file-loggers/src/protocols/msn/directconn.c
    branches/soc-2006-file-loggers/src/protocols/msn/directconn.h
    branches/soc-2006-file-loggers/src/protocols/msn/httpconn.c
    branches/soc-2006-file-loggers/src/protocols/msn/nexus.c
    branches/soc-2006-file-loggers/src/protocols/msn/servconn.c
    branches/soc-2006-file-loggers/src/protocols/msn/slp.c
    branches/soc-2006-file-loggers/src/protocols/oscar/family_icbm.c
    branches/soc-2006-file-loggers/src/protocols/oscar/family_oservice.c
    branches/soc-2006-file-loggers/src/protocols/oscar/oscar.c
    branches/soc-2006-file-loggers/src/protocols/oscar/peer.c
    branches/soc-2006-file-loggers/src/protocols/oscar/peer.h
    branches/soc-2006-file-loggers/src/protocols/oscar/peer_proxy.c
    branches/soc-2006-file-loggers/src/protocols/qq/qq_proxy.c
    branches/soc-2006-file-loggers/src/protocols/sametime/sametime.c
    branches/soc-2006-file-loggers/src/protocols/silc/silc.c
    branches/soc-2006-file-loggers/src/protocols/silc/util.c
    branches/soc-2006-file-loggers/src/protocols/simple/simple.c
    branches/soc-2006-file-loggers/src/protocols/simple/simple.h
    branches/soc-2006-file-loggers/src/protocols/simple/sipmsg.c
    branches/soc-2006-file-loggers/src/protocols/simple/sipmsg.h
    branches/soc-2006-file-loggers/src/protocols/yahoo/yahoo.c
    branches/soc-2006-file-loggers/src/protocols/yahoo/yahoo_filexfer.c
    branches/soc-2006-file-loggers/src/protocols/yahoo/yahoo_picture.c
    branches/soc-2006-file-loggers/src/protocols/yahoo/yahoochat.c
    branches/soc-2006-file-loggers/src/protocols/yahoo/ycht.c
    branches/soc-2006-file-loggers/src/proxy.c
    branches/soc-2006-file-loggers/src/proxy.h
    branches/soc-2006-file-loggers/src/request.c
    branches/soc-2006-file-loggers/src/request.h
    branches/soc-2006-file-loggers/src/sslconn.c
    branches/soc-2006-file-loggers/src/upnp.c
    branches/soc-2006-file-loggers/src/util.c
    branches/soc-2006-file-loggers/src/xmlnode.h

Added Paths:
-----------
    branches/soc-2006-file-loggers/console/libgnt/gntkeys.c
    branches/soc-2006-file-loggers/po/ne.po
Modified: branches/soc-2006-file-loggers/configure.ac
===================================================================
--- branches/soc-2006-file-loggers/configure.ac	2006-08-13 16:01:52 UTC (rev 16737)
+++ branches/soc-2006-file-loggers/configure.ac	2006-08-13 17:38:25 UTC (rev 16738)
@@ -46,7 +46,7 @@
 	;;
 esac
 
-ALL_LINGUAS="am az bg bn bs ca ca@... cs da de el en_AU en_CA en_GB es et eu fa fi fr gl gu he hi hu it ja ka ko ku lt mk my_MM nb nl nn pa pl pt_BR pt ro ru sk sl sq sr sr@... sv ta te th tr uk vi xh zh_CN zh_TW"
+ALL_LINGUAS="am az bg bn bs ca ca@... cs da de el en_AU en_CA en_GB es et eu fa fi fr gl gu he hi hu it ja ka ko ku lt mk my_MM nb ne nl nn pa pl pt_BR pt ro ru sk sl sq sr sr@... sv ta te th tr uk vi xh zh_CN zh_TW"
 AM_GLIB_GNU_GETTEXT
 
 dnl we don't use autobreak on cygwin!!
@@ -546,7 +546,6 @@
 
 if test "x$enable_debug" = "xyes" ; then
 	AC_DEFINE(DEBUG, 1, [Define if debugging is enabled.])
-	enable_fatal_asserts="yes"
 fi
 
 if test "x$enable_fatal_asserts" = "xyes" ; then
@@ -1822,9 +1821,10 @@
 echo
 echo Use XScreenSaver Extension.... : $enable_xss
 echo Use X Session Management...... : $enable_sm
-echo Use startup notification.......: $enable_startup_notification
+echo Use startup notification...... : $enable_startup_notification
 echo
 echo Print debugging messages...... : $enable_debug
+echo Assertions are fatal.......... : $enable_fatal_asserts
 echo
 eval eval echo Gaim will be installed in $bindir.
 if test "x$gaimpath" != "x" ; then

Modified: branches/soc-2006-file-loggers/console/gntblist.c
===================================================================
--- branches/soc-2006-file-loggers/console/gntblist.c	2006-08-13 16:01:52 UTC (rev 16737)
+++ branches/soc-2006-file-loggers/console/gntblist.c	2006-08-13 17:38:25 UTC (rev 16738)
@@ -1,5 +1,6 @@
 #include <account.h>
 #include <blist.h>
+#include <notify.h>
 #include <request.h>
 #include <savedstatuses.h>
 #include <server.h>
@@ -100,7 +101,6 @@
 	gnt_tree_remove(GNT_TREE(ggblist->tree), node);
 	node->ui_data = NULL;
 
-	/* XXX: Depending on the node, we may want to remove the group/contact node if necessary */
 	if (GAIM_BLIST_NODE_IS_BUDDY(node))
 	{
 		GaimGroup *group = gaim_buddy_get_group((GaimBuddy*)node);
@@ -141,6 +141,103 @@
 {
 }
 
+static void
+add_buddy_cb(void *data, GaimRequestFields *allfields)
+{
+	const char *username = gaim_request_fields_get_string(allfields, "screenname");
+	const char *alias = gaim_request_fields_get_string(allfields, "alias");
+	const char *group = gaim_request_fields_get_string(allfields, "group");
+	GaimAccount *account = gaim_request_fields_get_account(allfields, "account");
+	const char *error = NULL;
+	GaimGroup *grp;
+	GaimBuddy *buddy;
+
+	if (!username)
+		error = _("You must provide a screename for the buddy.");
+	else if (!group)
+		error = _("You must provide a group.");
+	else if (!account)
+		error = _("You must select an account.");
+
+	if (error)
+	{
+		gaim_notify_error(NULL, _("Error"), _("Error adding buddy"), error);
+		return;
+	}
+
+	grp = gaim_find_group(group);
+	if (!grp)
+	{
+		grp = gaim_group_new(group);
+		gaim_blist_add_group(grp, NULL);
+	}
+
+	buddy = gaim_buddy_new(account, username, alias);
+	gaim_blist_add_buddy(buddy, NULL, grp, NULL);
+	gaim_account_add_buddy(account, buddy);
+}
+
+static void
+gg_request_add_buddy(GaimAccount *account, const char *username, const char *grp, const char *alias)
+{
+	GaimRequestFields *fields = gaim_request_fields_new();
+	GaimRequestFieldGroup *group = gaim_request_field_group_new(NULL);
+	GaimRequestField *field;
+
+	gaim_request_fields_add_group(fields, group);
+
+	field = gaim_request_field_string_new("screenname", _("Screen Name"), username, FALSE);
+	gaim_request_field_group_add_field(group, field);
+
+	field = gaim_request_field_string_new("alias", _("Alias"), alias, FALSE);
+	gaim_request_field_group_add_field(group, field);
+
+	field = gaim_request_field_string_new("group", _("Group"), grp, FALSE);
+	gaim_request_field_group_add_field(group, field);
+
+	field = gaim_request_field_account_new("account", _("Account"), NULL);
+	gaim_request_field_account_set_show_all(field, FALSE);
+	if (account)
+		gaim_request_field_account_set_value(field, account);
+	gaim_request_field_group_add_field(group, field);
+
+	gaim_request_fields(NULL, _("Add Buddy"), NULL, _("Please enter buddy information."),
+			fields, _("Add"), G_CALLBACK(add_buddy_cb), _("Cancel"), NULL, NULL);
+}
+
+static void
+add_group_cb(gpointer null, const char *group)
+{
+	GaimGroup *grp;
+
+	if (!group || !*group)
+	{
+		gaim_notify_error(NULL, _("Error"), _("Error adding group"),
+				_("You must give a name for the group to add."));
+		return;
+	}
+
+	grp = gaim_find_group(group);
+	if (!grp)
+	{
+		grp = gaim_group_new(group);
+		gaim_blist_add_group(grp, NULL);
+	}
+	else
+	{
+		gaim_notify_error(NULL, _("Error"), _("Error adding group"),
+				_("A group with the name already exists."));
+	}
+}
+
+static void
+gg_request_add_group()
+{
+	gaim_request_input(NULL, _("Add Group"), NULL, _("Enter the name of the group"),
+			NULL, FALSE, FALSE, NULL,
+			_("Add"), G_CALLBACK(add_group_cb), _("Cancel"), NULL, NULL);
+}
+
 static GaimBlistUiOps blist_ui_ops =
 {
 	new_list,
@@ -150,9 +247,9 @@
 	node_remove,
 	NULL,
 	NULL,
+	.request_add_buddy = gg_request_add_buddy,
 	NULL,
-	NULL,
-	NULL
+	.request_add_group = gg_request_add_group
 };
 
 static gpointer
@@ -360,8 +457,24 @@
 }
 
 static void
+gg_add_buddy(GaimGroup *grp, GaimBlistNode *node)
+{
+	gaim_blist_request_add_buddy(NULL, NULL, grp->name, NULL);
+}
+
+static void
+gg_add_group(GaimGroup *grp, GaimBlistNode *node)
+{
+	gaim_blist_request_add_group();
+}
+
+static void
 create_group_menu(GntTree *tree, GaimGroup *group)
 {
+	add_custom_action(tree, _("Add Buddy"),
+			GAIM_CALLBACK(gg_add_buddy), group);
+	add_custom_action(tree, _("Add Group"),
+			GAIM_CALLBACK(gg_add_group), group);
 }
 
 static void
@@ -476,26 +589,91 @@
 	g_free(prompt);
 }
 
-/* XXX: This still doesn't do anything, because request doesn't have a ui yet */
+/* Xeroxed from gtkdialogs.c:gaim_gtkdialogs_remove_group_cb*/
 static void
+remove_group(GaimGroup *group)
+{
+	GaimBlistNode *cnode, *bnode;
+
+	cnode = ((GaimBlistNode*)group)->child;
+
+	while (cnode) {
+		if (GAIM_BLIST_NODE_IS_CONTACT(cnode)) {
+			bnode = cnode->child;
+			cnode = cnode->next;
+			while (bnode) {
+				GaimBuddy *buddy;
+				if (GAIM_BLIST_NODE_IS_BUDDY(bnode)) {
+					buddy = (GaimBuddy*)bnode;
+					bnode = bnode->next;
+					if (gaim_account_is_connected(buddy->account)) {
+						gaim_account_remove_buddy(buddy->account, buddy, group);
+						gaim_blist_remove_buddy(buddy);
+					}
+				} else {
+					bnode = bnode->next;
+				}
+			}
+		} else if (GAIM_BLIST_NODE_IS_CHAT(cnode)) {
+			GaimChat *chat = (GaimChat *)cnode;
+			cnode = cnode->next;
+			if (gaim_account_is_connected(chat->account))
+				gaim_blist_remove_chat(chat);
+		} else {
+			cnode = cnode->next;
+		}
+	}
+
+	gaim_blist_remove_group(group);
+}
+
+static void
+gg_blist_remove_node(GaimBlistNode *node)
+{
+	if (GAIM_BLIST_NODE_IS_BUDDY(node))
+	{
+		GaimBuddy *buddy = (GaimBuddy*)node;
+		GaimGroup *group = gaim_buddy_get_group(buddy);
+		gaim_account_remove_buddy(gaim_buddy_get_account(buddy), buddy, group);
+		gaim_blist_remove_buddy(buddy);
+	}
+	else if (GAIM_BLIST_NODE_IS_CHAT(node))
+	{
+		gaim_blist_remove_chat((GaimChat*)node);
+	}
+	else if (GAIM_BLIST_NODE_IS_GROUP(node))
+	{
+		remove_group((GaimGroup*)node);
+	}
+}
+
+static void
 gg_blist_remove_node_cb(GaimBlistNode *node, GaimBlistNode *null)
 {
-	void (*callback)(gpointer);
+	char *primary, *sec = NULL;
+	const char *name;
 
 	if (GAIM_BLIST_NODE_IS_BUDDY(node))
-		callback = (void(*)(gpointer))gaim_blist_remove_buddy;
+		name = gaim_buddy_get_name((GaimBuddy*)node);
 	else if (GAIM_BLIST_NODE_IS_CHAT(node))
-		callback = (void(*)(gpointer))gaim_blist_remove_chat;
+		name = gaim_chat_get_name((GaimChat*)node);
 	else if (GAIM_BLIST_NODE_IS_GROUP(node))
-		callback = (void(*)(gpointer))gaim_blist_remove_group;
+	{
+		name = ((GaimGroup*)node)->name;
+		sec = _("Removing this group will also remove all the buddies in the group");
+	}
+	else
+		return;
 
+	primary = g_strdup_printf(_("Are you sure you want to remove %s?"), name);
+
 	/* XXX: anything to do with the returned ui-handle? */
 	gaim_request_action(node, _("Confirm Remove"),
-			_("Are you sure you want to remove ..."), NULL,    /* XXX: tidy up */
+			primary, sec,
 			1, node, 2,
-			_("Remove"), callback,
-			_("No"), NULL);
-
+			_("Remove"), gg_blist_remove_node,
+			_("Cancel"), NULL);
+	g_free(primary);
 }
 
 static void
@@ -555,6 +733,7 @@
 			GAIM_CALLBACK(gg_blist_remove_node_cb), node);
 
 	window = gnt_vbox_new(FALSE);
+	GNT_WIDGET_SET_FLAGS(window, GNT_WIDGET_TRANSIENT);
 	gnt_box_set_toplevel(GNT_BOX(window), TRUE);
 	gnt_box_set_title(GNT_BOX(window), title);
 
@@ -634,6 +813,18 @@
 			g_free(br);
 		}
 
+		if (gaim_prefs_get_bool("/gaim/gnt/blist/idletime"))
+		{
+			GaimPresence *pre = gaim_buddy_get_presence(buddy);
+			if (gaim_presence_is_idle(pre))
+			{
+				time_t idle = gaim_presence_get_idle_time(pre);
+				char *st = gaim_str_seconds_to_string(time(NULL) - idle);
+				g_string_append_printf(str, _("\nIdle: %s"), st);
+				g_free(st);
+			}
+		}
+
 		title = g_strdup(gaim_buddy_get_name(buddy));
 	}
 	else if (GAIM_BLIST_NODE_IS_GROUP(node))

Modified: branches/soc-2006-file-loggers/console/gntconv.c
===================================================================
--- branches/soc-2006-file-loggers/console/gntconv.c	2006-08-13 16:01:52 UTC (rev 16737)
+++ branches/soc-2006-file-loggers/console/gntconv.c	2006-08-13 17:38:25 UTC (rev 16738)
@@ -123,6 +123,7 @@
 			}
 			g_free(escape);
 		}
+		gnt_entry_add_to_history(GNT_ENTRY(ggconv->entry), text);
 		gnt_entry_clear(GNT_ENTRY(ggconv->entry));
 		return TRUE;
 	}
@@ -198,8 +199,11 @@
 	ggc->entry = gnt_entry_new(NULL);
 	gnt_box_add_widget(GNT_BOX(ggc->window), ggc->entry);
 	gnt_widget_set_name(ggc->entry, "conversation-window-entry");
+	gnt_entry_set_history_length(GNT_ENTRY(ggc->entry), -1);
+	gnt_entry_set_word_suggest(GNT_ENTRY(ggc->entry), TRUE);
+	gnt_entry_set_always_suggest(GNT_ENTRY(ggc->entry), FALSE);
 
-	g_signal_connect(G_OBJECT(ggc->entry), "key_pressed", G_CALLBACK(entry_key_pressed), ggc);
+	g_signal_connect_after(G_OBJECT(ggc->entry), "key_pressed", G_CALLBACK(entry_key_pressed), ggc);
 	g_signal_connect(G_OBJECT(ggc->window), "destroy", G_CALLBACK(closing_window), ggc);
 
 	gnt_widget_set_position(ggc->window, gaim_prefs_get_int(PREF_ROOT "/position/x"),
@@ -229,6 +233,9 @@
 
 	g_return_if_fail(ggconv != NULL);
 
+	if (gaim_prefs_get_bool("/gaim/gnt/conversations/timestamps"))
+		gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(ggconv->tv),
+					gaim_utf8_strftime("(%H:%M:%S) ", localtime(&mtime)), GNT_TEXT_FLAG_DIM);
 	if (who && *who && (flags & (GAIM_MESSAGE_SEND | GAIM_MESSAGE_RECV)))
 	{
 		char * name = g_strdup_printf("%s: ", who);
@@ -312,6 +319,9 @@
 static void
 gg_chat_add_users(GaimConversation *conv, GList *users, gboolean new_arrivals)
 {
+	GGConv *ggc = conv->ui_data;
+	GntEntry *entry = GNT_ENTRY(ggc->entry);
+
 	if (!new_arrivals)
 	{
 		/* Print the list of users in the room */
@@ -332,25 +342,39 @@
 				GAIM_MESSAGE_SYSTEM, time(NULL));
 		g_string_free(string, TRUE);
 	}
-	/* XXX: Add the names for string completion */
+
+	for (; users; users = users->next)
+	{
+		GaimConvChatBuddy *cbuddy = users->data;
+		gnt_entry_add_suggest(entry, cbuddy->name);
+		gnt_entry_add_suggest(entry, cbuddy->alias);
+	}
 }
 
 static void
 gg_chat_rename_user(GaimConversation *conv, const char *old, const char *new_n, const char *new_a)
 {
 	/* XXX: Update the name for string completion */
+	GGConv *ggc = conv->ui_data;
+	GntEntry *entry = GNT_ENTRY(ggc->entry);
+	gnt_entry_remove_suggest(entry, old);
+	gnt_entry_add_suggest(entry, new_n);
+	gnt_entry_add_suggest(entry, new_a);
 }
 
 static void
 gg_chat_remove_user(GaimConversation *conv, GList *list)
 {
 	/* XXX: Remove the name from string completion */
+	GGConv *ggc = conv->ui_data;
+	GntEntry *entry = GNT_ENTRY(ggc->entry);
+	for (; list; list = list->next)
+		gnt_entry_remove_suggest(entry, list->data);
 }
 
 static void
 gg_chat_update_user(GaimConversation *conv, const char *user)
 {
-	/* XXX: This probably will not require updating the string completion  */
 }
 
 static GaimConversationUiOps conv_ui_ops = 

Modified: branches/soc-2006-file-loggers/console/gntprefs.c
===================================================================
--- branches/soc-2006-file-loggers/console/gntprefs.c	2006-08-13 16:01:52 UTC (rev 16737)
+++ branches/soc-2006-file-loggers/console/gntprefs.c	2006-08-13 17:38:25 UTC (rev 16738)
@@ -14,9 +14,12 @@
 	gaim_prefs_add_none("/gaim/gnt/plugins");
 	gaim_prefs_add_string_list("/gaim/gnt/plugins/loaded", NULL);
 
+	gaim_prefs_add_none("/gaim/gnt/blist");
+	gaim_prefs_add_bool("/gaim/gnt/blist/idletime", TRUE);
+	
 	gaim_prefs_add_none("/gaim/gnt/conversations");
 	gaim_prefs_add_bool("/gaim/gnt/conversations/timestamps", TRUE);
-	gaim_prefs_add_bool("/gaim/gnt/conversations/notify_typing", FALSE);
+	gaim_prefs_add_bool("/gaim/gnt/conversations/notify_typing", FALSE); /* XXX: Not functional yet */
 }
 
 typedef struct
@@ -93,6 +96,12 @@
 	return field;
 }
 
+static Prefs blist[] = 
+{
+	{GAIM_PREF_BOOLEAN, "/gaim/gnt/blist/idletime", _("Show Idle Time"), NULL},
+	{GAIM_PREF_NONE, NULL, NULL, NULL}
+};
+
 static Prefs convs[] = 
 {
 	{GAIM_PREF_BOOLEAN, "/gaim/gnt/conversations/timestamps", _("Show Timestamps"), NULL},
@@ -163,31 +172,32 @@
 	}
 }
 
-void gg_prefs_show_all()
+static void
+add_pref_group(GaimRequestFields *fields, const char *title, Prefs *prefs)
 {
-	GaimRequestFields *fields;
 	GaimRequestField *field;
 	GaimRequestFieldGroup *group;
 	int i;
 
-	fields = gaim_request_fields_new();
-
-	group = gaim_request_field_group_new(_("Conversations"));
+	group = gaim_request_field_group_new(title);
 	gaim_request_fields_add_group(fields, group);
-	for (i = 0; convs[i].pref; i++)
+	for (i = 0; prefs[i].pref; i++)
 	{
-		field = get_pref_field(convs + i);
+		field = get_pref_field(prefs + i);
 		gaim_request_field_group_add_field(group, field);
 	}
+}
 
-	group = gaim_request_field_group_new(_("Logging"));
-	gaim_request_fields_add_group(fields, group);
-	for (i = 0; logging[i].pref; i++)
-	{
-		field = get_pref_field(logging + i);
-		gaim_request_field_group_add_field(group, field);
-	}
+void gg_prefs_show_all()
+{
+	GaimRequestFields *fields;
 
+	fields = gaim_request_fields_new();
+
+	add_pref_group(fields, _("Buddy List"), blist);
+	add_pref_group(fields, _("Conversations"), convs);
+	add_pref_group(fields, _("Logging"), logging);
+
 	gaim_request_fields(NULL, _("Preferences"), NULL, NULL, fields,
 			_("Save"), G_CALLBACK(save_cb), _("Cancel"), NULL, NULL);
 }

Modified: branches/soc-2006-file-loggers/console/gntrequest.c
===================================================================
--- branches/soc-2006-file-loggers/console/gntrequest.c	2006-08-13 16:01:52 UTC (rev 16737)
+++ branches/soc-2006-file-loggers/console/gntrequest.c	2006-08-13 17:38:25 UTC (rev 16738)
@@ -182,7 +182,7 @@
 
 	window = setup_request_window(title, primary, secondary, GAIM_REQUEST_ACTION);
 
-	box = gnt_hbox_new(TRUE);
+	box = gnt_hbox_new(FALSE);
 	gnt_box_add_widget(GNT_BOX(window), box);
 	for (i = 0; i < actioncount; i++)
 	{
@@ -234,7 +234,8 @@
 			else if (type == GAIM_REQUEST_FIELD_STRING)
 			{
 				GntWidget *entry = field->ui_data;
-				gaim_request_field_string_set_value(field, gnt_entry_get_text(GNT_ENTRY(entry)));
+				const char *text = gnt_entry_get_text(GNT_ENTRY(entry));
+				gaim_request_field_string_set_value(field, (text && *text) ? text : NULL);
 			}
 			else if (type == GAIM_REQUEST_FIELD_INTEGER)
 			{
@@ -278,6 +279,9 @@
 			}
 			else if (type == GAIM_REQUEST_FIELD_ACCOUNT)
 			{
+				GntWidget *combo = field->ui_data;
+				GaimAccount *acc = gnt_combo_box_get_selected_data(GNT_COMBO_BOX(combo));
+				gaim_request_field_account_set_value(field, acc);
 			}
 		}
 	}
@@ -293,13 +297,13 @@
 
 static void *
 gg_request_fields(const char *title, const char *primary,
-		const char *secondary, GaimRequestFields *fields,
+		const char *secondary, GaimRequestFields *allfields,
 		const char *ok, GCallback ok_cb,
 		const char *cancel, GCallback cancel_cb,
 		void *userdata)
 {
 	GntWidget *window, *box;
-	GList *list;
+	GList *grlist;
 
 	window = setup_request_window(title, primary, secondary, GAIM_REQUEST_FIELDS);
 
@@ -309,27 +313,28 @@
 	box = gnt_vbox_new(FALSE);
 	gnt_box_set_pad(GNT_BOX(box), 0);
 	gnt_box_set_fill(GNT_BOX(box), TRUE);
-	for (list = gaim_request_fields_get_groups(fields); list; list = list->next)
+	for (grlist = gaim_request_fields_get_groups(allfields); grlist; grlist = grlist->next)
 	{
-		GaimRequestFieldGroup *group = list->data;
+		GaimRequestFieldGroup *group = grlist->data;
 		GList *fields = gaim_request_field_group_get_fields(group);
 		GntWidget *hbox;
-		
-		gnt_box_add_widget(GNT_BOX(box),
-				gnt_label_new_with_format(gaim_request_field_group_get_title(group),
-					GNT_TEXT_FLAG_BOLD));
+		const char *title = gaim_request_field_group_get_title(group);
 
+		if (title)
+			gnt_box_add_widget(GNT_BOX(box),
+					gnt_label_new_with_format(title, GNT_TEXT_FLAG_BOLD));
+
 		for (; fields ; fields = fields->next)
 		{
+			/* XXX: Break each of the fields into a separate function? */
 			GaimRequestField *field = fields->data;
 			GaimRequestFieldType type = gaim_request_field_get_type(field);
 			const char *label = gaim_request_field_get_label(field);
 				
-			hbox = gnt_hbox_new(FALSE);
-			gnt_box_set_pad(GNT_BOX(hbox), 0);
+			hbox = gnt_hbox_new(TRUE);   /* hrm */
 			gnt_box_add_widget(GNT_BOX(box), hbox);
 			
-			if (type != GAIM_REQUEST_FIELD_BOOLEAN)
+			if (type != GAIM_REQUEST_FIELD_BOOLEAN && label)
 			{
 				GntWidget *l = gnt_label_new(label);
 				gnt_widget_set_size(l, 0, 1);
@@ -417,12 +422,44 @@
 					}
 				}
 			}
-#if 0
 			else if (type == GAIM_REQUEST_FIELD_ACCOUNT)
 			{
-				/* XXX: remember to set the field->ui_data */
+				gboolean all;
+				GaimAccount *def;
+				GList *list;
+				GntWidget *combo = gnt_combo_box_new();
+				gnt_box_set_alignment(GNT_BOX(hbox), GNT_ALIGN_MID);
+				gnt_box_add_widget(GNT_BOX(hbox), combo);
+				field->ui_data = combo;
+
+				all = gaim_request_field_account_get_show_all(field);
+				def = gaim_request_field_account_get_default_value(field);
+
+				if (all)
+					list = gaim_accounts_get_all();
+				else
+					list = gaim_connections_get_all();
+
+				for (; list; list = list->next)
+				{
+					GaimAccount *account;
+					char *text;
+
+					if (all)
+						account = list->data;
+					else
+						account = gaim_connection_get_account(list->data);
+
+					text = g_strdup_printf("%s (%s)",
+							gaim_account_get_username(account),
+							gaim_account_get_protocol_name(account));
+					gnt_combo_box_add_data(GNT_COMBO_BOX(combo), account, text);
+					g_free(text);
+					if (account == def)
+						gnt_combo_box_set_selected(GNT_COMBO_BOX(combo), account);
+				}
+				gnt_widget_set_size(combo, 20, 3); /* ew */
 			}
-#endif
 			else
 			{
 				gnt_box_add_widget(GNT_BOX(hbox),
@@ -430,12 +467,12 @@
 							GNT_TEXT_FLAG_BOLD));
 			}
 		}
-		if (list->next)
+		if (grlist->next)
 			gnt_box_add_widget(GNT_BOX(box), gnt_hline_new());
 	}
 	gnt_box_add_widget(GNT_BOX(window), box);
 
-	box = setup_button_box(userdata, request_fields_cb, fields,
+	box = setup_button_box(userdata, request_fields_cb, allfields,
 			ok, ok_cb, cancel, cancel_cb, NULL);
 	gnt_box_add_widget(GNT_BOX(window), box);
 

Modified: branches/soc-2006-file-loggers/console/libgnt/Makefile.am
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/Makefile.am	2006-08-13 16:01:52 UTC (rev 16737)
+++ branches/soc-2006-file-loggers/console/libgnt/Makefile.am	2006-08-13 17:38:25 UTC (rev 16738)
@@ -11,6 +11,7 @@
 	gntcolors.c \
 	gntcombobox.c \
 	gntentry.c \
+	gntkeys.c \
 	gntlabel.c \
 	gntline.c \
 	gntmarshal.c \

Modified: branches/soc-2006-file-loggers/console/libgnt/gntcombobox.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntcombobox.c	2006-08-13 16:01:52 UTC (rev 16737)
+++ branches/soc-2006-file-loggers/console/libgnt/gntcombobox.c	2006-08-13 17:38:25 UTC (rev 16738)
@@ -74,8 +74,13 @@
 static void
 gnt_combo_box_size_request(GntWidget *widget)
 {
-	widget->priv.height = 3;   /* For now, a combobox will have border */
-	widget->priv.width = 15;
+	if (!GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_MAPPED))
+	{
+		GntWidget *dd = GNT_COMBO_BOX(widget)->dropdown;
+		gnt_widget_size_request(dd);
+		widget->priv.height = 3;   /* For now, a combobox will have border */
+		widget->priv.width = MIN(10, dd->priv.width + 4);
+	}
 }
 
 static void

Modified: branches/soc-2006-file-loggers/console/libgnt/gntentry.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntentry.c	2006-08-13 16:01:52 UTC (rev 16737)
+++ branches/soc-2006-file-loggers/console/libgnt/gntentry.c	2006-08-13 17:38:25 UTC (rev 16738)
@@ -1,7 +1,9 @@
 #include <ctype.h>
 #include <string.h>
 
+#include "gntbox.h"
 #include "gntentry.h"
+#include "gnttree.h"
 
 enum
 {
@@ -12,6 +14,92 @@
 static guint signals[SIGS] = { 0 };
 
 static void
+destroy_suggest(GntEntry *entry)
+{
+	if (entry->ddown)
+	{
+		gnt_widget_destroy(entry->ddown->parent);
+		entry->ddown = NULL;
+	}
+}
+
+static char *
+get_beginning_of_word(GntEntry *entry)
+{
+	char *s = entry->cursor;
+	while (s > entry->start)
+	{
+		char *t = g_utf8_find_prev_char(entry->start, s);
+		if ((*t < 'A' || *t > 'Z') && (*t < 'a' || *t > 'z'))
+			break;
+		s = t;
+	}
+	return s;
+}
+
+static gboolean
+show_suggest_dropdown(GntEntry *entry)
+{
+	char *suggest = NULL;
+	int len;
+	int offset = 0, x, y;
+	int count = 0;
+	GList *iter;
+
+	if (entry->word)
+	{
+		char *s = get_beginning_of_word(entry);
+		suggest = g_strndup(s, entry->cursor - s);
+		if (entry->scroll < s)
+			offset = g_utf8_pointer_to_offset(entry->scroll, s);
+	}
+	else
+		suggest = g_strdup(entry->start);
+	len = strlen(suggest);  /* Don't need to use the utf8-function here */
+	
+	if (entry->ddown == NULL)
+	{
+		GntWidget *box = gnt_vbox_new(FALSE);
+		entry->ddown = gnt_tree_new();
+		gnt_box_add_widget(GNT_BOX(box), entry->ddown);
+
+		GNT_WIDGET_SET_FLAGS(box, GNT_WIDGET_TRANSIENT);
+
+		gnt_widget_get_position(GNT_WIDGET(entry), &x, &y);
+		x += offset;
+		y++;
+		if (y + 10 >= getmaxy(stdscr))
+			y -= 11;
+		gnt_widget_set_position(box, x, y);
+		
+		gnt_widget_draw(box);
+	}
+	else
+		gnt_tree_remove_all(GNT_TREE(entry->ddown));
+
+	for (count = 0, iter = entry->suggests; iter; iter = iter->next)
+	{
+		const char *text = iter->data;
+		if (g_ascii_strncasecmp(suggest, text, len) == 0 && strlen(text) >= len)
+		{
+			gnt_tree_add_row_after(GNT_TREE(entry->ddown), (gpointer)text,
+					gnt_tree_create_row(GNT_TREE(entry->ddown), text),
+					NULL, NULL);
+			count++;
+		}
+	}
+	g_free(suggest);
+
+	if (count == 0)
+	{
+		destroy_suggest(entry);
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+static void
 gnt_entry_draw(GntWidget *widget)
 {
 	GntEntry *entry = GNT_ENTRY(widget);
@@ -80,6 +168,11 @@
 			memmove(entry->cursor, entry->cursor + len, entry->end - entry->cursor - len + 1);
 			entry->end -= len;
 			entry_redraw(widget);
+
+			if (entry->ddown)
+				show_suggest_dropdown(entry);
+
+			return TRUE;
 		}
 		else if (strcmp(text + 1, GNT_KEY_LEFT) == 0 && entry->cursor > entry->start)
 		{
@@ -87,6 +180,8 @@
 			if (entry->cursor < entry->scroll)
 				entry->scroll = entry->cursor;
 			entry_redraw(widget);
+
+			return TRUE;
 		}
 		else if (strcmp(text + 1, GNT_KEY_RIGHT) == 0 && entry->cursor < entry->end)
 		{
@@ -94,15 +189,89 @@
 			if (g_utf8_pointer_to_offset(entry->scroll, entry->cursor) >= widget->priv.width)
 				entry->scroll = g_utf8_find_next_char(entry->scroll, NULL);
 			entry_redraw(widget);
+
+			return TRUE;
 		}
+		else if (strcmp(text + 1, GNT_KEY_CTRL_DOWN) == 0 && entry->histlength)
+		{
+			if (entry->history->prev)
+			{
+				entry->history = entry->history->prev;
+				gnt_entry_set_text(entry, entry->history->data);
+				destroy_suggest(entry);
+
+				return TRUE;
+			}
+		}
+		else if (strcmp(text + 1, GNT_KEY_UP) == 0 ||
+				strcmp(text + 1, GNT_KEY_DOWN) == 0)
+		{
+			if (entry->ddown)
+			{
+				gnt_widget_key_pressed(entry->ddown, text);
+				return TRUE;
+			}
+		}
+		else if (strcmp(text + 1, GNT_KEY_CTRL_UP) == 0 && entry->histlength)
+		{
+			if (entry->history->next)
+			{
+				if (entry->history->prev == NULL)
+				{
+					/* Save the current contents */
+					char *text = g_strdup(gnt_entry_get_text(entry));
+					g_free(entry->history->data);
+					entry->history->data = text;
+				}
+
+				entry->history = entry->history->next;
+				gnt_entry_set_text(entry, entry->history->data);
+				destroy_suggest(entry);
+
+				return TRUE;
+			}
+		}
 		/* XXX: handle other keys, like home/end, and ctrl+ goodness */
-		else
-			return FALSE;
+		else if (text[1] == 0)
+		{
+			destroy_suggest(entry);
+		}
 
-		return TRUE;
+		return FALSE;
 	}
 	else
 	{
+		if (text[0] == '\t')
+		{
+			if (entry->ddown)
+				destroy_suggest(entry);
+			else if (entry->suggests)
+				return show_suggest_dropdown(entry);
+
+			return FALSE;
+		}
+		else if (text[0] == '\r' && entry->ddown)
+		{
+			char *text = g_strdup(gnt_tree_get_selection_data(GNT_TREE(entry->ddown)));
+			destroy_suggest(entry);
+			if (entry->word)
+			{
+				char *s = get_beginning_of_word(entry);
+				char *iter = text;
+				while (toupper(*s) == toupper(*iter))
+				{
+					*s++ = *iter++;
+				}
+				gnt_entry_key_pressed(widget, iter);
+			}
+			else
+			{
+				gnt_entry_set_text(entry, text);
+			}
+			g_free(text);
+			return TRUE;
+		}
+
 		if (!iscntrl(text[0]))
 		{
 			const char *str, *next;
@@ -143,6 +312,9 @@
 
 				while (g_utf8_pointer_to_offset(entry->scroll, entry->cursor) >= widget->priv.width)
 					entry->scroll = g_utf8_find_next_char(entry->scroll, NULL);
+
+				if (entry->ddown)
+					show_suggest_dropdown(entry);
 			}
 			entry_redraw(widget);
 			return TRUE;
@@ -161,6 +333,8 @@
 					entry->scroll = g_utf8_find_prev_char(entry->start, entry->scroll);
 
 				entry_redraw(widget);
+				if (entry->ddown)
+					show_suggest_dropdown(entry);
 				return TRUE;
 			}
 		}
@@ -174,9 +348,35 @@
 {
 	GntEntry *entry = GNT_ENTRY(widget);
 	g_free(entry->start);
+
+	if (entry->history)
+	{
+		entry->history = g_list_first(entry->history);
+		g_list_foreach(entry->history, (GFunc)g_free, NULL);
+		g_list_free(entry->history);
+	}
+
+	if (entry->suggests)
+	{
+		g_list_foreach(entry->suggests, (GFunc)g_free, NULL);
+		g_list_free(entry->suggests);
+	}
+
+	if (entry->ddown)
+	{
+		gnt_widget_destroy(entry->ddown->parent);
+	}
 }
 
 static void
+gnt_entry_lost_focus(GntWidget *widget)
+{
+	GntEntry *entry = GNT_ENTRY(widget);
+	destroy_suggest(entry);
+	entry_redraw(widget);
+}
+
+static void
 gnt_entry_class_init(GntEntryClass *klass)
 {
 	parent_class = GNT_WIDGET_CLASS(klass);
@@ -185,6 +385,7 @@
 	parent_class->map = gnt_entry_map;
 	parent_class->size_request = gnt_entry_size_request;
 	parent_class->key_pressed = gnt_entry_key_pressed;
+	parent_class->lost_focus = gnt_entry_lost_focus;
 
 	DEBUG;
 }
@@ -197,7 +398,14 @@
 
 	entry->flag = GNT_ENTRY_FLAG_ALL;
 	entry->max = 0;
+	
+	entry->histlength = 0;
+	entry->history = NULL;
 
+	entry->word = TRUE;
+	entry->always = FALSE;
+	entry->suggests = NULL;
+
 	GNT_WIDGET_SET_FLAGS(GNT_WIDGET(entry),
 			GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW | GNT_WIDGET_CAN_TAKE_FOCUS);
 	GNT_WIDGET_SET_FLAGS(GNT_WIDGET(entry), GNT_WIDGET_GROW_X);
@@ -302,6 +510,7 @@
 	gnt_entry_set_text(entry, NULL);
 	entry->scroll = entry->cursor = entry->end = entry->start;
 	entry_redraw(GNT_WIDGET(entry));
+	destroy_suggest(entry);
 }
 
 void gnt_entry_set_masked(GntEntry *entry, gboolean set)
@@ -309,3 +518,90 @@
 	entry->masked = set;
 }
 
+void gnt_entry_add_to_history(GntEntry *entry, const char *text)
+{
+	g_return_if_fail(entry->history != NULL);   /* Need to set_history_length first */
+
+	if (g_list_length(entry->history) >= entry->histlength)
+		return;
+
+	entry->history = g_list_first(entry->history);
+	g_free(entry->history->data);
+	entry->history->data = g_strdup(text);
+	entry->history = g_list_prepend(entry->history, NULL);
+}
+
+void gnt_entry_set_history_length(GntEntry *entry, int num)
+{
+	if (num == 0)
+	{
+		entry->histlength = num;
+		if (entry->history)
+		{
+			entry->history = g_list_first(entry->history);
+			g_list_foreach(entry->history, (GFunc)g_free, NULL);
+			g_list_free(entry->history);
+			entry->history = NULL;
+		}
+		return;
+	}
+
+	if (entry->histlength == 0)
+	{
+		entry->histlength = num;
+		entry->history = g_list_append(NULL, NULL);
+		return;
+	}
+
+	if (num > 0 && num < entry->histlength)
+	{
+		GList *first, *iter;
+		int index = 0;
+		for (first = entry->history, index = 0; first->prev; first = first->prev, index++);
+		while ((iter = g_list_nth(first, num)) != NULL)
+		{
+			g_free(iter->data);
+			first = g_list_delete_link(first, iter);
+		}
+		entry->histlength = num;
+		if (index >= num)
+			entry->history = g_list_last(first);
+		return;
+	}
+
+	entry->histlength = num;
+}
+
+void gnt_entry_set_word_suggest(GntEntry *entry, gboolean word)
+{
+	entry->word = word;
+}
+
+void gnt_entry_set_always_suggest(GntEntry *entry, gboolean always)
+{
+	entry->always = always;
+}
+
+void gnt_entry_add_suggest(GntEntry *entry, const char *text)
+{
+	GList *find;
+
+	if (!text || !*text)
+		return;
+	
+	find = g_list_find_custom(entry->suggests, text, (GCompareFunc)g_utf8_collate);
+	if (find)
+		return;
+	entry->suggests = g_list_append(entry->suggests, g_strdup(text));
+}
+
+void gnt_entry_remove_suggest(GntEntry *entry, const char *text)
+{
+	GList *find = g_list_find_custom(entry->suggests, text, (GCompareFunc)g_utf8_collate);
+	if (find)
+	{
+		g_free(find->data);
+		entry->suggests = g_list_delete_link(entry->suggests, find);
+	}
+}
+

Modified: branches/soc-2006-file-loggers/console/libgnt/gntentry.h
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntentry.h	2006-08-13 16:01:52 UTC (rev 16737)
+++ branches/soc-2006-file-loggers/console/libgnt/gntentry.h	2006-08-13 17:38:25 UTC (rev 16738)
@@ -50,6 +50,14 @@
 	
 	int max;        /* 0 means infinite */
 	gboolean masked;
+
+	GList *history; /* History of the strings. User can use this by pressing ctrl+up/down */
+	int histlength; /* How long can the history be? */
+
+	GList *suggests;    /* List of suggestions */
+	gboolean word;      /* Are the suggestions for only a word, or for the whole thing? */
+	gboolean always;    /* Should the list of suggestions show at all times, or only on tab-press? */
+	GntWidget *ddown;   /* The dropdown with the suggested list */
 };
 
 struct _GnEntryClass
@@ -70,7 +78,6 @@
 
 void gnt_entry_set_max(GntEntry *entry, int max);
 
-/* XXX: For now, call gnt_entry_clear before calling this */
 void gnt_entry_set_text(GntEntry *entry, const char *text);
 
 void gnt_entry_set_flag(GntEntry *entry, GntEntryFlag flag);
@@ -81,6 +88,18 @@
 
 void gnt_entry_set_masked(GntEntry *entry, gboolean set);
 
+void gnt_entry_add_to_history(GntEntry *entry, const char *text);
+
+void gnt_entry_set_history_length(GntEntry *entry, int num);
+
+void gnt_entry_set_word_suggest(GntEntry *entry, gboolean word);
+
+void gnt_entry_set_always_suggest(GntEntry *entry, gboolean always);
+
+void gnt_entry_add_suggest(GntEntry *entry, const char *text);
+
+void gnt_entry_remove_suggest(GntEntry *entry, const char *text);
+
 G_END_DECLS
 
 #endif /* GNT_ENTRY_H */

Copied: branches/soc-2006-file-loggers/console/libgnt/gntkeys.c (from rev 16737, trunk/console/libgnt/gntkeys.c)
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntkeys.c	                        (rev 0)
+++ branches/soc-2006-file-loggers/console/libgnt/gntkeys.c	2006-08-13 17:38:25 UTC (rev 16738)
@@ -0,0 +1,29 @@
+#include "gntkeys.h"
+
+#include <string.h>
+
+void gnt_keys_refine(char *text)
+{
+	if (text[0] == 27)
+	{
+		/* These are for urxvt */
+		if (strcmp(text + 1, "Oa") == 0)
+		{
+			strcpy(text + 1, GNT_KEY_CTRL_UP);
+		}
+		else if (strcmp(text + 1, "Ob") == 0)
+		{
+			strcpy(text + 1, GNT_KEY_CTRL_DOWN);
+		}
+	}
+	else if ((unsigned char)text[0] == 195)
+	{
+		/* These for xterm */
+		if (text[2] == 0)
+		{
+			text[0] = 27;
+			text[1] -= 64;
+		}
+	}
+}
+

Modified: branches/soc-2006-file-loggers/console/libgnt/gntkeys.h
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntkeys.h	2006-08-13 16:01:52 UTC (rev 16737)
+++ branches/soc-2006-file-loggers/console/libgnt/gntkeys.h	2006-08-13 17:38:25 UTC (rev 16738)
@@ -9,6 +9,11 @@
 #define GNT_KEY_UP     "[A"
 #define GNT_KEY_DOWN   "[B"
 
+#define GNT_KEY_CTRL_UP     "[1;5A"
+#define GNT_KEY_CTRL_DOWN   "[1;5B"
+#define GNT_KEY_CTRL_RIGHT  "[1;5C"
+#define GNT_KEY_CTRL_LEFT   "[1;5D"
+
 #define GNT_KEY_PGUP   "[5~"
 #define GNT_KEY_PGDOWN "[6~"
 
@@ -17,4 +22,9 @@
 #define GNT_KEY_BACKSPACE "\177"
 #define GNT_KEY_DEL    "[3~"
 
+/**
+ * This will do stuff with the terminal settings and stuff.
+ */
+void gnt_keys_refine(char *text);
+
 #endif

Modified: branches/soc-2006-file-loggers/console/libgnt/gntmain.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntmain.c	2006-08-13 16:01:52 UTC (rev 16737)
+++ branches/soc-2006-file-loggers/console/libgnt/gntmain.c	2006-08-13 17:38:25 UTC (rev 16738)
@@ -13,6 +13,11 @@
 #include <unistd.h>
 #include <string.h>
 
+/**
+ * Notes: Interesting functions to look at:
+ * 	scr_dump, scr_init, scr_restore: for workspaces
+ */
+
 static int lock_focus_list;
 static GList *focus_list;
 
@@ -52,6 +57,14 @@
 static void draw_taskbar();
 static void bring_on_top(GntWidget *widget);
 
+static gboolean
+update_screen(gpointer null)
+{
+	update_panels();
+	doupdate();
+	return TRUE;
+}
+
 void gnt_screen_take_focus(GntWidget *widget)
 {
 	GntWidget *w = NULL;
@@ -119,8 +132,7 @@
 		GntNode *nd = g_hash_table_lookup(nodes, window_list.window);
 		top_panel(nd->panel);
 	}
-	update_panels();
-	doupdate();
+	update_screen(NULL);
 	draw_taskbar();
 }
 
@@ -437,6 +449,8 @@
 		dump_screen();
 	}
 
+	gnt_keys_refine(buffer);
+
 	if (mode == GNT_KP_MODE_NORMAL)
 	{
 		if (focus_list)
@@ -499,6 +513,14 @@
 				{
 					shift_window(focus_list->data, 1);
 				}
+				else if (strcmp(buffer + 1, "l") == 0)
+				{
+					touchwin(stdscr);
+					touchwin(newscr);
+					wrefresh(newscr);
+					update_screen(NULL);
+					draw_taskbar();
+				}
 			}
 		}
 	}
@@ -557,8 +579,7 @@
 				GntNode *node = g_hash_table_lookup(nodes, widget);
 				gnt_widget_set_position(widget, x, y);
 				move_panel(node->panel, y, x);
-				update_panels();
-				doupdate();
+				update_screen(NULL);
 			}
 		}
 		else if (*buffer == '\r')
@@ -656,6 +677,10 @@
 		ascii_only = TRUE;
 
 	initscr();
+	typeahead(-1);
+	noecho();
+	curs_set(0);
+
 	gnt_init_colors();
 	gnt_init_styles();
 
@@ -671,7 +696,6 @@
 	nodes = g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL, free_node);
 
 	wbkgdset(stdscr, '\0' | COLOR_PAIR(GNT_COLOR_NORMAL));
-	noecho();
 	refresh();
 #if 0
 	mousemask(NCURSES_BUTTON_PRESSED | NCURSES_BUTTON_RELEASED | REPORT_MOUSE_POSITION, NULL);
@@ -729,8 +753,7 @@
 		}
 	}
 
-	update_panels();
-	doupdate();
+	update_screen(NULL);
 }
 
 void gnt_screen_release(GntWidget *widget)
@@ -750,8 +773,7 @@
 		gnt_tree_remove(GNT_TREE(window_list.tree), widget);
 	}
 
-	update_panels();
-	doupdate();
+	update_screen(NULL);
 }
 
 void gnt_screen_update(GntWidget *widget)
@@ -779,8 +801,7 @@
 		top_panel(nd->panel);
 	}
 
-	update_panels();
-	doupdate();
+	update_screen(NULL);
 }
 
 gboolean gnt_widget_has_focus(GntWidget *widget)
@@ -844,8 +865,7 @@
 		gnt_widget_draw(widget);
 		replace_panel(node->panel, widget->window);
 		show_panel(node->panel);
-		update_panels();
-		doupdate();
+		update_screen(NULL);
 	}
 }
 

Modified: branches/soc-2006-file-loggers/console/libgnt/gnttree.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gnttree.c	2006-08-13 16:01:52 UTC (rev 16737)
+++ branches/soc-2006-file-loggers/console/libgnt/gnttree.c	2006-08-13 17:38:25 UTC (rev 16738)
@@ -770,6 +770,15 @@
 	}
 }
 
+void gnt_tree_remove_all(GntTree *tree)
+{
+	tree->root = NULL;
+	g_hash_table_remove_all(tree->hash);
+	g_list_free(tree->list);
+	tree->list = NULL;
+	tree->current = tree->top = tree->bottom = NULL;
+}
+
 int gnt_tree_get_selection_visible_line(GntTree *tree)
 {
 	return get_distance(tree->top, tree->current) +

Modified: branches/soc-2006-file-loggers/console/libgnt/gnttree.h
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gnttree.h	2006-08-13 16:01:52 UTC (rev 16737)
+++ branches/soc-2006-file-loggers/console/libgnt/gnttree.h	2006-08-13 17:38:25 UTC (rev 16738)
@@ -85,6 +85,8 @@
 
 void gnt_tree_remove(GntTree *tree, gpointer key);
 
+void gnt_tree_remove_all(GntTree *tree);
+
 /* Returns the visible line number of the selected row */
 int gnt_tree_get_selection_visible_line(GntTree *tree);
 

Modified: branches/soc-2006-file-loggers/console/libgnt/gntutils.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntutils.c	2006-08-13 16:01:52 UTC (rev 16737)
+++ branches/soc-2006-file-loggers/console/libgnt/gntutils.c	2006-08-13 17:38:25 UTC (rev 16738)
@@ -8,23 +8,26 @@
 
 	/* XXX: ew ... everyone look away */
 	last = s;
-	while (*s)
+	if (s)
 	{
-		if (*s == '\n' || *s == '\r')
+		while (*s)
 		{
-			count++;
-			len = g_utf8_pointer_to_offset(last, s);
-			if (max < len)
-				max = len;
-			last = s + 1;
+			if (*s == '\n' || *s == '\r')
+			{
+				count++;
+				len = g_utf8_pointer_to_offset(last, s);
+				if (max < len)
+					max = len;
+				last = s + 1;
+			}
+			s++;
 		}
-		s++;
+
+		len = g_utf8_pointer_to_offset(last, s);
+		if (max < len)
+			max = len;
 	}
 
-	len = g_utf8_pointer_to_offset(last, s);
-	if (max < len)
-		max = len;
-
 	if (height)
 		*height = count;
 	if (width)

Modified: branches/soc-2006-file-loggers/console/libgnt/gntwidget.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/gntwidget.c	2006-08-13 16:01:52 UTC (rev 16737)
+++ branches/soc-2006-file-loggers/console/libgnt/gntwidget.c	2006-08-13 17:38:25 UTC (rev 16738)
@@ -80,6 +80,23 @@
 	return TRUE;
 }
 
+static gboolean
+gnt_boolean_handled_accumulator(GSignalInvocationHint *ihint,
+				  GValue                *return_accu,
+				  const GValue          *handler_return,
+				  gpointer               dummy)
+{
+	gboolean continue_emission;
+	gboolean signal_handled;
+
+	signal_handled = g_value_get_boolean (handler_return);
+	g_value_set_boolean (return_accu, signal_handled);
+	continue_emission = !signal_handled;
+
+	return continue_emission;
+}
+
+
 static void
 gnt_widget_class_init(GntWidgetClass *klass)
 {
@@ -194,7 +211,7 @@
 					 G_TYPE_FROM_CLASS(klass),
 					 G_SIGNAL_RUN_LAST,
 					 G_STRUCT_OFFSET(GntWidgetClass, key_pressed),
-					 NULL, NULL,
+					 gnt_boolean_handled_accumulator, NULL,
 					 gnt_closure_marshal_BOOLEAN__STRING,
 					 G_TYPE_BOOLEAN, 1, G_TYPE_STRING);
 	DEBUG;

Modified: branches/soc-2006-file-loggers/console/libgnt/test/tv.c
===================================================================
--- branches/soc-2006-file-loggers/console/libgnt/test/tv.c	2006-08-13 16:01:52 UTC (rev 16737)
+++ branches/soc-2006-file-loggers/console/libgnt/test/tv.c	2006-08-13 17:38:25 UTC (rev 16738)
@@ -14,19 +14,24 @@
 		gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(view),
 				gnt_entry_get_text(GNT_ENTRY(w)),
 				GNT_TEXT_FLAG_HIGHLIGHT);
+		gnt_entry_add_to_history(GNT_ENTRY(w), gnt_entry_get_text(GNT_ENTRY(w)));
 		gnt_text_view_next_line(GNT_TEXT_VIEW(view));
 		gnt_entry_clear(GNT_ENTRY(w));
 		if (gnt_text_view_get_lines_below(GNT_TEXT_VIEW(view)) <= 1)
 			gnt_text_view_scroll(GNT_TEXT_VIEW(view), 0);
+		gnt_entry_remove_suggest(GNT_ENTRY(w), "acb");
 
 		return TRUE;
 	}
 	else if (key[0] == 27)
 	{
-		if (strcmp(key+1, GNT_KEY_UP))
+		if (strcmp(key+1, GNT_KEY_UP) == 0)
+			gnt_text_view_scroll(GNT_TEXT_VIEW(view), -1);
+		else if (strcmp(key+1, GNT_KEY_DOWN) == 0)
 			gnt_text_view_scroll(GNT_TEXT_VIEW(view), 1);
-		else if (strcmp(key+1, GNT_KEY_DOWN))
-			gnt_text_view_scroll(GNT_TEXT_VIEW(view), -1);
+		else
+			return FALSE;
+		return TRUE;
 	}
 		
 	return FALSE;
@@ -53,6 +58,15 @@
 	gnt_widget_set_name(entry, "entry");
 	GNT_WIDGET_SET_FLAGS(entry, GNT_WIDGET_CAN_TAKE_FOCUS);
 
+	gnt_entry_set_word_suggest(GNT_ENTRY(entry), TRUE);
+	gnt_entry_set_always_suggest(GNT_ENTRY(entry), FALSE);
+	gnt_entry_add_suggest(GNT_ENTRY(entry), "a");
+	gnt_entry_add_suggest(GNT_ENTRY(entry), "ab");
+	gnt_entry_add_suggest(GNT_ENTRY(entry), "abc");
+	gnt_entry_add_suggest(GNT_ENTRY(entry), "abcd");
+	gnt_entry_add_suggest(GNT_ENTRY(entry), "abcde");
+	gnt_entry_add_suggest(GNT_ENTRY(entry), "acb");
+
 	view = gnt_text_view_new();
 	gnt_widget_set_name(view, "view");
 
@@ -65,7 +79,8 @@
 
 	gnt_widget_show(hbox);
 
-	g_signal_connect(G_OBJECT(entry), "key_pressed", G_CALLBACK(key_pressed), view);
+	gnt_entry_set_history_length(GNT_ENTRY(entry), -1);
+	g_signal_connect_after(G_OBJECT(entry), "key_pressed", G_CALLBACK(key_pressed), view);
 
 #ifdef STANDALONE
 	gnt_main();

Modified: branches/soc-2006-file-loggers/gaim.apspec.in
===================================================================
--- branches/soc-2006-file-loggers/gaim.apspec.in	2006-08-13 16:01:52 UTC (rev 16737)
+++ branches/soc-2006-file-loggers/gaim.apspec.in	2006-08-13 17:38:25 UTC (rev 16738)
@@ -15,7 +15,7 @@
 [Description]
 Gaim allows you to talk to anyone using a variety of messaging protocols,
 including AIM (Oscar and TOC), ICQ, IRC, Yahoo!, MSN Messenger, Jabber,
-Gadu-Gadu, Napster, and Zephyr. These protocols are implemented using a
+Gadu-Gadu, and Zephyr. These protocols are implemented using a
 modular, easy to use design. To use a protocol, just add an account using the
 account editor.
 

Modified: branches/soc-2006-file-loggers/plugins/ChangeLog.API
===================================================================
--- branches/soc-2006-file-loggers/plugins/ChangeLog.API	2006-08-13 16:01:52 UTC (rev 16737)
+++ branches/soc-2006-file-loggers/plugins/ChangeLog.API	2006-08-13 17:38:25 UTC (rev 16738)
@@ -114,6 +114,9 @@
 	* All network activity has been updated to use non-blocking sockets.
 	  This means that plugins must be updated to expect such a socket from
 	  gaim_proxy_connect() and gaim_network_listen*().
+	* gaim_proxy_connect(): changed to return NULL on error and a void *
+	  handle on success, and changed parameters.  It is now possible to
+	  cancel connection attempts.
 	* gaim_gtk_create_imhtml(): Added sw_ret() parameter
 	* gaim_account_get_log(): Added create parameter
 	* GAIM_CMD_P_VERYHIGH is now GAIM_CMD_P_VERY_HIGH

Modified: branches/soc-2006-file-loggers/plugins/log_reader.c
===================================================================
--- branches/soc-2006-file-loggers/plugins/log_reader.c	2006-08-13 16:01:52 UTC (rev 16737)
+++ branches/soc-2006-file-loggers/plugins/log_reader.c	2006-08-13 17:38:25 UTC (rev 16738)
@@ -796,6 +796,7 @@
 		time_t time_unix;
 		struct tm *tm_new;
 		char *timestamp;
+		char *tmp;
 		const char *style;
 
 		new_session_id = xmlnode_get_attrib(message, "SessionID");
@@ -906,7 +907,7 @@
 								!isalnum(*(from_name +
 								alias_length)));
 
-						to_name_matches = (gaim_str_has_prefix(
+						to_name_matches = to_name && (gaim_str_has_prefix(
 								to_name, alias) &&
 								!isalnum(*(to_name +
 								alias_length)));
@@ -988,16 +989,18 @@
 
 		style     = xmlnode_get_attrib(text_node, "Style");
 
+		tmp = xmlnode_get_data(text_node);
 		if (style && *style) {
 			text = g_string_append(text, "<span style=\"");
 			text = g_string_append(text, style);
 			text = g_string_append(text, "\">");
-			text = g_string_append(text, xmlnode_get_data(text_node));
+			text = g_string_append(text, tmp);
 			text = g_string_append(text, "</span>\n");
 		} else {
-			text = g_string_append(text, xmlnode_get_data(text_node));
+			text = g_string_append(text, tmp);
 			text = g_string_append(text, "\n");
 		}
+		g_free(tmp);
 	}
 
 	data->text = text;
@@ -1493,7 +1496,7 @@
 
 						g_string_append(formatted,
 							"<span style=\"color: #ff0000;\">");
-						
+
 						if (gaim_str_has_prefix(line,
 							"Your previous message has not been sent.  "
 							"Reason: Maximum length exceeded.")) {
@@ -1713,10 +1716,11 @@
 	char buffer[1024] = "";
 	DWORD size = (sizeof(buffer) - 1);
 	DWORD type;
+	gboolean found = FALSE;
 
 	path = NULL;
 	/* TODO: Test this after removing the trailing "\\". */
-	if(ERROR_SUCCESS == RegOpenKeyEx(HKEY_CLASSES_ROOT, "Trillian.SkinZip\\shell\\Add\\command\\", 
+	if(ERROR_SUCCESS == RegOpenKeyEx(HKEY_CLASSES_ROOT, "Trillian.SkinZip\\shell\\Add\\command\\",
 				0, KEY_QUERY_VALUE, &hKey)) {
 
 		if(ERROR_SUCCESS == RegQueryValueEx(hKey, "", NULL, &type, (LPBYTE)buffer, &size)) {
@@ -1751,20 +1755,18 @@
 
 	if (!path) {
 		char *folder = wgaim_get_special_folder(CSIDL_PROGRAM_FILES);
-		if (folder)
+		if (folder) {
 			path = g_build_filename(folder, "Trillian",
 					"users", "default", "talk.ini", NULL);
 			g_free(folder);
 		}
 	}
 
-	gboolean found = FALSE;
-
 	if (path) {
 		/* Read talk.ini file to find the log directory. */
 		GError *error = NULL;
 
-#if 0 && GTK_CHECK_VERSION(2,6,0) /* FIXME: Not tested yet. */
+#if 0 && GLIB_CHECK_VERSION(2,6,0) /* FIXME: Not tested yet. */
 		GKeyFile *key_file;
 
 		gaim_debug(GAIM_DEBUG_INFO, "Trillian talk.ini read",
@@ -1791,9 +1793,9 @@
 
 			g_key_file_free(key_file);
 		}
-#else /* !GTK_CHECK_VERSION(2,6,0) */
-		GError *error = NULL;
+#else /* !GLIB_CHECK_VERSION(2,6,0) */
 		gsize length;
+		gchar *contents = NULL;
 
 		gaim_debug(GAIM_DEBUG_INFO, "Trillian talk.ini read",
 					"Reading %s\n", path);

Modified: branches/soc-2006-file-loggers/po/ChangeLog
===================================================================
--- branches/soc-2006-file-loggers/po/ChangeLog	2006-08-13 16:01:52 UTC (rev 16737)
+++ branches/soc-2006-file-loggers/po/ChangeLog	2006-08-13 17:38:25 UTC (rev 16738)
@@ -23,13 +23,16 @@
 	* German translation updated (Bjoern Voigt)
 	* German win32 translation updated (Bjoern Voigt)
 	* Greek translation added (Bouklis Panos)
+	* Gujarati translation updated (Ankit Patel)
 	* Hebrew translation updated (Shalom Craimer)
 	* Hungarian translation updated (Gabor Kelemen)
+	* Italian translation updated (Claudio Satriano)
 	* Japanese translation updated (Takeshi Aihana)
 	* Kurdish translation added (Erdal Ronahi and Amed Ç. Jiyan)
 	* Kurdish win32 installer translation added (Erdal Ronahi)
 	* Lithuanian translation updated (Andrius Štikonas, Laurynas Biveinis)
 	* Lithuanian win32 translation added (Laurynas Biveinis)
+	* Nepali translation added (Shyam Krishna Bal)
 	* Persian translation added (Elnaz Sarbar, Meelad Zakaria)
 	* Polish translation updated (Emil Nowak)
 	* Portuguese translation updated (Duarte Henriques)

Modified: branches/soc-2006-file-loggers/po/de.po
===================================================================
--- branches/soc-2006-file-loggers/po/de.po	2006-08-13 16:01:52 UTC (rev 16737)
+++ branches/soc-2006-file-loggers/po/de.po	2006-08-13 17:38:25 UTC (rev 16738)
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: Gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-29 23:34+0200\n"
-"PO-Revision-Date: 2006-04-29 23:33+0200\n"
+"POT-Creation-Date: 2006-06-20 10:30+0200\n"
+"PO-Revision-Date: 2006-06-20 10:38+0200\n"
 "Last-Translator: Björn Voigt <bjoern@..."
 "Language-Team: de <de@..."
 "MIME-Version: 1.0\n"
@@ -196,7 +196,7 @@
 msgid "Right-click for more unread messages...\n"
 msgstr "Rechtsklicken für weitere ungelesene Nachrichten...\n"
 
-#: ../plugins/docklet/docklet.c:157 ../src/gtkblist.c:3230
+#: ../plugins/docklet/docklet.c:157 ../src/gtkblist.c:3246
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
@@ -208,10 +208,10 @@
 msgstr "Ändere Status"
 
 #: ../plugins/docklet/docklet.c:435 ../src/gtkstatusbox.c:673
-#: ../src/protocols/gg/gg.c:996 ../src/protocols/jabber/buddy.c:1104
+#: ../src/protocols/gg/gg.c:996 ../src/protocols/jabber/buddy.c:1363
 #: ../src/protocols/msn/state.c:29 ../src/protocols/msn/state.c:30
 #: ../src/protocols/msn/state.c:37 ../src/protocols/msn/state.c:38
-#: ../src/protocols/novell/novell.c:2845 ../src/protocols/yahoo/yahoo.c:2733
+#: ../src/protocols/novell/novell.c:2843 ../src/protocols/yahoo/yahoo.c:2731
 #: ../src/status.c:155
 msgid "Available"
 msgstr "Verfügbar"
@@ -222,25 +222,25 @@
 #: ../plugins/docklet/docklet.c:439 ../src/gtkprefs.c:1774
 #: ../src/gtkstatusbox.c:674 ../src/protocols/gg/gg.c:999
 #: ../src/protocols/irc/irc.c:520 ../src/protocols/irc/msgs.c:223
-#: ../src/protocols/jabber/buddy.c:1108 ../src/protocols/novell/novell.c:2848
-#: ../src/protocols/oscar/oscar.c:719 ../src/protocols/oscar/oscar.c:4391
-#: ../src/protocols/oscar/oscar.c:5434 ../src/protocols/silc/buddy.c:1469
-#: ../src/protocols/yahoo/yahoo.c:3187 ../src/protocols/yahoo/yahoo.c:3260
+#: ../src/protocols/jabber/buddy.c:1367 ../src/protocols/novell/novell.c:2846
+#: ../src/protocols/oscar/oscar.c:719 ../src/protocols/oscar/oscar.c:4397
+#: ../src/protocols/oscar/oscar.c:5440 ../src/protocols/silc/buddy.c:1469
+#: ../src/protocols/yahoo/yahoo.c:3185 ../src/protocols/yahoo/yahoo.c:3258
 #: ../src/status.c:158
 msgid "Away"
 msgstr "Abwesend"
 
 #: ../plugins/docklet/docklet.c:443 ../src/gtkstatusbox.c:675
-#: ../src/protocols/oscar/oscar.c:723 ../src/protocols/yahoo/yahoo.c:2727
+#: ../src/protocols/oscar/oscar.c:723 ../src/protocols/yahoo/yahoo.c:2725
 #: ../src/status.c:157
 msgid "Invisible"
 msgstr "Unsichtbar"
 
-#: ../plugins/docklet/docklet.c:447 ../src/gtkblist.c:2960
+#: ../plugins/docklet/docklet.c:447 ../src/gtkblist.c:2976
 #: ../src/gtkstatusbox.c:676 ../src/protocols/gg/gg.c:993
-#: ../src/protocols/jabber/buddy.c:1102 ../src/protocols/novell/novell.c:2857
-#: ../src/protocols/oscar/oscar.c:785 ../src/protocols/oscar/oscar.c:5406
-#: ../src/protocols/yahoo/yahoo.c:2731 ../src/status.c:154
+#: ../src/protocols/jabber/buddy.c:1361 ../src/protocols/novell/novell.c:2855
+#: ../src/protocols/oscar/oscar.c:785 ../src/protocols/oscar/oscar.c:5412
+#: ../src/protocols/yahoo/yahoo.c:2729 ../src/status.c:154
 msgid "Offline"
 msgstr "Offline"
 
@@ -256,7 +256,7 @@
 msgid "Show Buddy List"
 msgstr "Buddy-Liste anzeigen"
 
-#: ../plugins/docklet/docklet.c:489 ../src/gtkconv.c:5626
+#: ../plugins/docklet/docklet.c:489 ../src/gtkconv.c:5675
 msgid "Unread Messages"
 msgstr "Ungelesene Nachrichten"
 
@@ -296,7 +296,7 @@
 msgstr "_Sofortnachrichten:"
 
 #: ../plugins/docklet/docklet.c:684 ../plugins/docklet/docklet.c:692
-#: ../plugins/win32/winprefs/winprefs.c:424 ../src/gtkprefs.c:823
+#: ../plugins/win32/winprefs/winprefs.c:462 ../src/gtkprefs.c:823
 #: ../src/gtkprefs.c:1764 ../src/gtkprefs.c:1778
 msgid "Never"
 msgstr "Niemals"
@@ -307,7 +307,7 @@
 
 #: ../plugins/docklet/docklet.c:686 ../plugins/docklet/docklet.c:694
 #: ../plugins/timestamp_format.c:39 ../plugins/timestamp_format.c:48
-#: ../plugins/win32/winprefs/winprefs.c:425 ../src/gtkprefs.c:825
+#: ../plugins/win32/winprefs/winprefs.c:463 ../src/gtkprefs.c:825
 msgid "Always"
 msgstr "Immer"
 
@@ -617,7 +617,7 @@
 #. Business
 #: ../plugins/gevolution/add_buddy_dialog.c:131
 #: ../plugins/gevolution/assoc-buddy.c:119 ../src/gtkplugin.c:587
-#: ../src/gtkroomlist.c:604 ../src/protocols/jabber/jabber.c:755
+#: ../src/gtkroomlist.c:604 ../src/protocols/jabber/jabber.c:759
 #: ../src/protocols/msn/msn.c:1532 ../src/protocols/msn/msn.c:1585
 #: ../src/protocols/msn/msn.c:1606
 msgid "Name"
@@ -627,10 +627,10 @@
 msgid "Instant Messaging"
 msgstr "Sofortnachrichten"
 
-#: ../plugins/gevolution/add_buddy_dialog.c:442 ../src/gtkblist.c:4526
+#: ../plugins/gevolution/add_buddy_dialog.c:442 ../src/gtkblist.c:4532
 #: ../src/protocols/silc/buddy.c:736 ../src/protocols/silc/buddy.c:1030
 #: ../src/protocols/silc/buddy.c:1075 ../src/protocols/silc/buddy.c:1174
-#: ../src/protocols/yahoo/yahoo.c:2976
+#: ../src/protocols/yahoo/yahoo.c:2974
 msgid "Add Buddy"
 msgstr "Buddy hinzufügen"
 
@@ -644,14 +644,14 @@
 #. "Search"
 #: ../plugins/gevolution/add_buddy_dialog.c:468
 #: ../plugins/gevolution/assoc-buddy.c:353
-#: ../src/protocols/jabber/buddy.c:1460 ../src/protocols/oscar/oscar.c:6014
-#: ../src/protocols/sametime/sametime.c:5531
+#: ../src/protocols/jabber/buddy.c:1720 ../src/protocols/oscar/oscar.c:6020
+#: ../src/protocols/sametime/sametime.c:5529
 msgid "Search"
 msgstr "Suchen"
 
 #: ../plugins/gevolution/add_buddy_dialog.c:549
-#: ../plugins/gevolution/new_person_dialog.c:307 ../src/gtkblist.c:4610
-#: ../src/gtkblist.c:4974
+#: ../plugins/gevolution/new_person_dialog.c:307 ../src/gtkblist.c:4616
+#: ../src/gtkblist.c:4980
 msgid "Group:"
 msgstr "Gruppe:"
 
@@ -687,13 +687,13 @@
 msgstr "_Assoziiere den Buddy"
 
 #: ../plugins/gevolution/eds-utils.c:73 ../plugins/gevolution/eds-utils.c:86
-#: ../src/protocols/jabber/jabber.c:1122
+#: ../src/protocols/jabber/jabber.c:1125
 msgid "None"
 msgstr "Kein"
 
 #: ../plugins/gevolution/gevo-util.c:64 ../plugins/gevolution/gevolution.c:96
 #: ../src/blist.c:516 ../src/blist.c:1278 ../src/blist.c:1505
-#: ../src/gtkblist.c:4419 ../src/protocols/jabber/roster.c:65
+#: ../src/gtkblist.c:4425 ../src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "Buddys"
 
@@ -730,8 +730,8 @@
 "Wählen Sie alle Konten, zu denen Buddys automatisch hinzugefügt werden "
 "sollen."
 
-#: ../plugins/gevolution/gevolution.c:450 ../plugins/idle.c:150
-#: ../plugins/idle.c:186 ../src/gtknotify.c:399 ../src/gtkpounce.c:1262
+#: ../plugins/gevolution/gevolution.c:450 ../plugins/idle.c:153
+#: ../plugins/idle.c:189 ../src/gtknotify.c:399 ../src/gtkpounce.c:1255
 msgid "Account"
 msgstr "Konto"
 
@@ -768,7 +768,7 @@
 msgstr "Kontotyp:"
 
 #: ../plugins/gevolution/new_person_dialog.c:295 ../src/gtkaccount.c:784
-#: ../src/gtkblist.c:4572
+#: ../src/gtkblist.c:4578
 msgid "Screen name:"
 msgstr "Benutzername:"
 
@@ -870,50 +870,50 @@
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "Minimiert die Buddy-Liste und die Gesprächsfenster, wenn Sie weggehen."
 
-#: ../plugins/idle.c:155 ../plugins/idle.c:213
+#: ../plugins/idle.c:158 ../plugins/idle.c:216
 msgid "Minutes"
 msgstr "Minuten"
 
 #. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
 #. If that doesn't translate well into your language, drop the 's before translating.
-#: ../plugins/idle.c:162 ../plugins/idle.c:195 ../plugins/idle.c:220
-#: ../plugins/idle.c:312
+#: ../plugins/idle.c:165 ../plugins/idle.c:198 ../plugins/idle.c:223
+#: ../plugins/idle.c:315
 msgid "I'dle Mak'er"
 msgstr "Untätigkeitsmarker"
 
-#: ../plugins/idle.c:163 ../plugins/idle.c:252
+#: ../plugins/idle.c:166 ../plugins/idle.c:255
 msgid "Set Account Idle Time"
 msgstr "Setze Konto-Untätigkeitszeit"
 
-#: ../plugins/idle.c:166 ../plugins/idle.c:224
+#: ../plugins/idle.c:169 ../plugins/idle.c:227
 msgid "_Set"
 msgstr "_Setzen"
 
-#: ../plugins/idle.c:167 ../plugins/idle.c:200 ../plugins/idle.c:225
+#: ../plugins/idle.c:170 ../plugins/idle.c:203 ../plugins/idle.c:228
 msgid "_Cancel"
 msgstr "A_bbrechen"
 
-#: ../plugins/idle.c:180
+#: ../plugins/idle.c:183
 msgid "None of your accounts are idle."
 msgstr "Keine ihrer Konten sind untätig."
 
-#: ../plugins/idle.c:196 ../plugins/idle.c:256
+#: ../plugins/idle.c:199 ../plugins/idle.c:259
 msgid "Unset Account Idle Time"
 msgstr "Untätigkeitszeit zurücksetzen"
 
-#: ../plugins/idle.c:199
+#: ../plugins/idle.c:202
 msgid "_Unset"
 msgstr "Zurücksetze_n"
 
-#: ../plugins/idle.c:221 ../plugins/idle.c:260
+#: ../plugins/idle.c:224 ../plugins/idle.c:263
 msgid "Set Idle Time for All Accounts"
 msgstr "Untätigkeitszeit für alle Konten setzen"
 
-#: ../plugins/idle.c:265
+#: ../plugins/idle.c:268
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "Untätigkeitszeit für alle untätige Konten zurücksetzen"
 
-#: ../plugins/idle.c:314 ../plugins/idle.c:315
+#: ../plugins/idle.c:317 ../plugins/idle.c:318
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr ""
 "Erlaubt Ihnen manuell zu konfigurieren, wie lange Sie untätig sein wollen"
@@ -1661,7 +1661,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/timestamp.c:254
+#: ../plugins/timestamp.c:256
 msgid "Timestamp"
 msgstr "Zeitstempel"
 
@@ -1669,7 +1669,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/timestamp.c:257 ../plugins/timestamp.c:259
+#: ../plugins/timestamp.c:259 ../plugins/timestamp.c:261
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "Fügt iChat-ähnliche Zeitstempel alle N Minuten in die Gespräche ein."
 
@@ -1798,57 +1798,57 @@
 "\n"
 "* Hinweis: Dieses Plugin verlangt Win2000 oder höher."
 
-#: ../plugins/win32/winprefs/winprefs.c:397
+#: ../plugins/win32/winprefs/winprefs.c:434
 msgid "GTK+ Runtime Version"
 msgstr "GTK+ Runtime Version"
 
 #. Autostart
-#: ../plugins/win32/winprefs/winprefs.c:405
+#: ../plugins/win32/winprefs/winprefs.c:442
 msgid "Startup"
 msgstr "Start"
 
-#: ../plugins/win32/winprefs/winprefs.c:406
+#: ../plugins/win32/winprefs/winprefs.c:443
 msgid "_Start Gaim on Windows startup"
 msgstr "_Starte Gaim beim Windows-Start"
 
 #. Buddy List
-#: ../plugins/win32/winprefs/winprefs.c:417 ../src/gtkblist.c:3663
+#: ../plugins/win32/winprefs/winprefs.c:455 ../src/gtkblist.c:3672
 msgid "Buddy List"
 msgstr "Buddy-Liste"
 
-#: ../plugins/win32/winprefs/winprefs.c:418
+#: ../plugins/win32/winprefs/winprefs.c:456
 msgid "_Dockable Buddy List"
 msgstr "An_dockbare Buddy-Liste"
 
 #. Blist On Top
-#: ../plugins/win32/winprefs/winprefs.c:422
+#: ../plugins/win32/winprefs/winprefs.c:460
 msgid "_Keep Buddy List window on top:"
 msgstr "_Buddy-Listen-Fenster bleibt im Vordergrund:"
 
 #. XXX: Did this ever work?
-#: ../plugins/win32/winprefs/winprefs.c:427
+#: ../plugins/win32/winprefs/winprefs.c:465
 msgid "Only when docked"
 msgstr "Nur wenn angedockt"
 
 #. Conversations
-#: ../plugins/win32/winprefs/winprefs.c:431 ../src/gtkprefs.c:819
+#: ../plugins/win32/winprefs/winprefs.c:469 ../src/gtkprefs.c:819
 #: ../src/gtkprefs.c:1879
 msgid "Conversations"
 msgstr "Unterhaltungen"
 
-#: ../plugins/win32/winprefs/winprefs.c:432
+#: ../plugins/win32/winprefs/winprefs.c:470
 msgid "_Flash window when messages are received"
 msgstr "_Fenster blinkt, wenn Nachrichten empfangen werden"
 
-#: ../plugins/win32/winprefs/winprefs.c:456
+#: ../plugins/win32/winprefs/winprefs.c:494
 msgid "WinGaim Options"
 msgstr "WinGaim Optionen"
 
-#: ../plugins/win32/winprefs/winprefs.c:458
+#: ../plugins/win32/winprefs/winprefs.c:496
 msgid "Options specific to Windows Gaim."
 msgstr "Windows-Gaim-spezifische Optionen."
 
-#: ../plugins/win32/winprefs/winprefs.c:459
+#: ../plugins/win32/winprefs/winprefs.c:497
 msgid ""
 "Provides options specific to Windows Gaim, such as buddy list docking and "
 "conversation flashing."
@@ -1860,139 +1860,138 @@
 msgid "accounts"
 msgstr "Konten"
 
-#: ../src/account.c:923
+#: ../src/account.c:918
 msgid "Password is required to sign on."
 msgstr "Passwort wird für die Anmeldung benötigt."
 
-#: ../src/account.c:948
+#: ../src/account.c:943
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Geben Sie das Passwort für %s (%s) ein"
 
-#: ../src/account.c:955
+#: ../src/account.c:950
 msgid "Enter Password"
 msgstr "Geben Sie ein Passwort ein"
 
-#: ../src/account.c:960
+#: ../src/account.c:955
 msgid "Save password"
 msgstr "Passwort speichern"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../src/account.c:968 ../src/account.c:1139 ../src/gtkblist.c:3546
-#: ../src/gtkdialogs.c:602 ../src/gtkdialogs.c:739 ../src/gtkdialogs.c:803
+#: ../src/account.c:963 ../src/account.c:1134 ../src/gtkblist.c:3556
+#: ../src/gtkdialogs.c:613 ../src/gtkdialogs.c:750 ../src/gtkdialogs.c:824
 #: ../src/gtkrequest.c:269 ../src/protocols/gg/gg.c:497
 #: ../src/protocols/gg/gg.c:655 ../src/protocols/gg/gg.c:791
-#: ../src/protocols/jabber/jabber.c:1319 ../src/protocols/jabber/xdata.c:337
+#: ../src/protocols/jabber/jabber.c:1322 ../src/protocols/jabber/xdata.c:337
 #: ../src/protocols/msn/msn.c:250 ../src/protocols/msn/msn.c:265
 #: ../src/protocols/msn/msn.c:280 ../src/protocols/msn/msn.c:295
 #: ../src/protocols/oscar/oscar.c:1408 ../src/protocols/oscar/oscar.c:2167
-#: ../src/protocols/oscar/oscar.c:2260 ../src/protocols/oscar/oscar.c:5684
-#: ../src/protocols/oscar/oscar.c:5864 ../src/protocols/oscar/oscar.c:5889
-#: ../src/protocols/oscar/oscar.c:5945 ../src/protocols/silc/buddy.c:466
+#: ../src/protocols/oscar/oscar.c:2260 ../src/protocols/oscar/oscar.c:5690
+#: ../src/protocols/oscar/oscar.c:5870 ../src/protocols/oscar/oscar.c:5895
+#: ../src/protocols/oscar/oscar.c:5951 ../src/protocols/silc/buddy.c:466
 #: ../src/protocols/silc/buddy.c:1182 ../src/protocols/silc/chat.c:424
 #: ../src/protocols/silc/chat.c:462 ../src/protocols/silc/chat.c:725
 #: ../src/protocols/silc/ops.c:1297 ../src/protocols/silc/ops.c:1910
-#: ../src/protocols/silc/silc.c:753 ../src/protocols/yahoo/yahoo.c:3061
-#: ../src/protocols/yahoo/yahoo.c:3070 ../src/request.h:1344
+#: ../src/protocols/silc/silc.c:753 ../src/protocols/yahoo/yahoo.c:3059
+#: ../src/protocols/yahoo/yahoo.c:3068 ../src/request.h:1344
 msgid "OK"
 msgstr "OK"
 
-#: ../src/account.c:969 ../src/account.c:1140 ../src/account.c:1177
-#: ../src/gtkaccount.c:2182 ../src/gtkaccount.c:2649 ../src/gtkblist.c:5015
-#: ../src/gtkdialogs.c:603 ../src/gtkdialogs.c:740 ../src/gtkdialogs.c:804
-#: ../src/gtkdialogs.c:823 ../src/gtkdialogs.c:845 ../src/gtkdialogs.c:865
-#: ../src/gtkdialogs.c:909 ../src/gtkdialogs.c:964 ../src/gtkdialogs.c:1001
-#: ../src/gtkdialogs.c:1026 ../src/gtkimhtmltoolbar.c:419
-#: ../src/gtkplugin.c:296 ../src/gtkpounce.c:1095 ../src/gtkprivacy.c:568
+#: ../src/account.c:964 ../src/account.c:1135 ../src/account.c:1172
+#: ../src/gtkaccount.c:2182 ../src/gtkaccount.c:2649 ../src/gtkblist.c:5021
+#: ../src/gtkdialogs.c:614 ../src/gtkdialogs.c:751 ../src/gtkdialogs.c:825
+#: ../src/gtkdialogs.c:844 ../src/gtkdialogs.c:866 ../src/gtkdialogs.c:886
+#: ../src/gtkdialogs.c:930 ../src/gtkdialogs.c:985 ../src/gtkdialogs.c:1022
+#: ../src/gtkdialogs.c:1047 ../src/gtkimhtmltoolbar.c:419
+#: ../src/gtkplugin.c:296 ../src/gtkpounce.c:1088 ../src/gtkprivacy.c:568
 #: ../src/gtkprivacy.c:581 ../src/gtkprivacy.c:606 ../src/gtkprivacy.c:617
 #: ../src/gtkrequest.c:270 ../src/gtksavedstatuses.c:296
 #: ../src/protocols/gg/gg.c:498 ../src/protocols/gg/gg.c:656
 #: ../src/protocols/gg/gg.c:792 ../src/protocols/gg/gg.c:871
-#: ../src/protocols/jabber/buddy.c:576 ../src/protocols/jabber/buddy.c:1461
-#: ../src/protocols/jabber/buddy.c:1495 ../src/protocols/jabber/chat.c:780
-#: ../src/protocols/jabber/jabber.c:824 ../src/protocols/jabber/jabber.c:1320
+#: ../src/protocols/jabber/buddy.c:594 ../src/protocols/jabber/buddy.c:1721
+#: ../src/protocols/jabber/buddy.c:1755 ../src/protocols/jabber/chat.c:778
+#: ../src/protocols/jabber/jabber.c:828 ../src/protocols/jabber/jabber.c:1323
 #: ../src/protocols/jabber/xdata.c:338 ../src/protocols/msn/msn.c:251
 #: ../src/protocols/msn/msn.c:266 ../src/protocols/msn/msn.c:281
 #: ../src/protocols/msn/msn.c:296 ../src/protocols/msn/msn.c:313
 #: ../src/protocols/oscar/oscar.c:1409 ../src/protocols/oscar/oscar.c:2168
 #: ../src/protocols/oscar/oscar.c:2209 ../src/protocols/oscar/oscar.c:2261
-#: ../src/protocols/oscar/oscar.c:5685 ../src/protocols/oscar/oscar.c:5737
-#: ../src/protocols/oscar/oscar.c:5865 ../src/protocols/oscar/oscar.c:5890
-#: ../src/protocols/oscar/oscar.c:5946 ../src/protocols/oscar/oscar.c:6015
-#: ../src/protocols/oscar/peer.c:942 ../src/protocols/sametime/sametime.c:3375
-#: ../src/protocols/sametime/sametime.c:3460
-#: ../src/protocols/sametime/sametime.c:3630
-#: ../src/protocols/sametime/sametime.c:5319
-#: ../src/protocols/sametime/sametime.c:5408
-#: ../src/protocols/sametime/sametime.c:5532 ../src/protocols/silc/buddy.c:467
+#: ../src/protocols/oscar/oscar.c:5691 ../src/protocols/oscar/oscar.c:5743
+#: ../src/protocols/oscar/oscar.c:5871 ../src/protocols/oscar/oscar.c:5896
+#: ../src/protocols/oscar/oscar.c:5952 ../src/protocols/oscar/oscar.c:6021
+#: ../src/protocols/oscar/peer.c:942 ../src/protocols/sametime/sametime.c:3368
+#: ../src/protocols/sametime/sametime.c:3453
+#: ../src/protocols/sametime/sametime.c:3623
+#: ../src/protocols/sametime/sametime.c:5317
+#: ../src/protocols/sametime/sametime.c:5406
+#: ../src/protocols/sametime/sametime.c:5530 ../src/protocols/silc/buddy.c:467
 #: ../src/protocols/silc/buddy.c:1078 ../src/protocols/silc/buddy.c:1183
 #: ../src/protocols/silc/chat.c:597 ../src/protocols/silc/chat.c:726
 #: ../src/protocols/silc/ops.c:1911 ../src/protocols/silc/silc.c:754
-#: ../src/protocols/silc/silc.c:959 ../src/protocols/yahoo/yahoo.c:3062
-#: ../src/protocols/yahoo/yahoo.c:3071 ../src/request.h:1344
+#: ../src/protocols/silc/silc.c:959 ../src/protocols/yahoo/yahoo.c:3060
+#: ../src/protocols/yahoo/yahoo.c:3069 ../src/request.h:1344
 #: ../src/request.h:1354
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../src/account.c:994 ../src/connection.c:96
+#: ../src/account.c:989 ../src/connection.c:96
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Fehlendes Protokoll-Plugin für %s"
 
-#: ../src/account.c:996 ../src/connection.c:99 ../src/gtkblist.c:3538
-#: ../src/gtkblist.c:3544
+#: ../src/account.c:991 ../src/connection.c:99 ../src/gtkblist.c:3554
 msgid "Connection Error"
 msgstr "Verbindungsfehler"
 
-#: ../src/account.c:1076 ../src/protocols/gg/gg.c:696
-#: ../src/protocols/jabber/jabber.c:1272
+#: ../src/account.c:1071 ../src/protocols/gg/gg.c:696
+#: ../src/protocols/jabber/jabber.c:1275
 msgid "New passwords do not match."
 msgstr "Die neuen Passwörter stimmen nicht überein."
 
-#: ../src/account.c:1085
+#: ../src/account.c:1080
 msgid "Fill out all fields completely."
 msgstr "Bitte füllen Sie alle Felder aus."
 
-#: ../src/account.c:1108
+#: ../src/account.c:1103
 msgid "Original password"
 msgstr "Aktuelles Passwort"
 
-#: ../src/account.c:1115
+#: ../src/account.c:1110
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: ../src/account.c:1122
+#: ../src/account.c:1117
 msgid "New password (again)"
 msgstr "Neues Passwort (nochmal)"
 
-#: ../src/account.c:1128
+#: ../src/account.c:1123
 #, c-format
 msgid "Change password for %s"
 msgstr "Ändern des Passworts für %s"
 
-#: ../src/account.c:1136
+#: ../src/account.c:1131
 msgid "Please enter your current password and your new password."
 msgstr "Bitte geben Sie Ihr aktuelles und Ihr neues Passwort ein."
 
-#: ../src/account.c:1169
+#: ../src/account.c:1164
 #, c-format
 msgid "Change user information for %s"
 msgstr "Ändere die Benutzerinformation für %s"
 
-#: ../src/account.c:1172 ../src/protocols/toc/toc.c:1684
+#: ../src/account.c:1167 ../src/protocols/toc/toc.c:1684
 msgid "Set User Info"
 msgstr "Benutzer-Info setzen"
 
-#: ../src/account.c:1176 ../src/gtkdebug.c:684 ../src/gtkrequest.c:276
-#: ../src/protocols/jabber/buddy.c:575
+#: ../src/account.c:1171 ../src/gtkdebug.c:684 ../src/gtkrequest.c:276
+#: ../src/protocols/jabber/buddy.c:593
 msgid "Save"
 msgstr "Speichern"
 
-#: ../src/account.c:1679 ../src/gtkft.c:159 ../src/protocols/gg/gg.c:1002
-#: ../src/protocols/jabber/buddy.c:633 ../src/protocols/jabber/buddy.c:1098
-#: ../src/protocols/jabber/buddy.c:1115 ../src/protocols/novell/novell.c:2860
+#: ../src/account.c:1681 ../src/gtkft.c:159 ../src/protocols/gg/gg.c:1002
+#: ../src/protocols/jabber/buddy.c:636 ../src/protocols/jabber/buddy.c:1357
+#: ../src/protocols/jabber/buddy.c:1374 ../src/protocols/novell/novell.c:2858
 msgid "Unknown"
 msgstr "Unbekannt"
 
@@ -2040,49 +2039,49 @@
 msgid "+++ %s signed off"
 msgstr "+++ %s hat sich abgemeldet"
 
-#: ../src/conversation.c:161
+#: ../src/conversation.c:168
 msgid "Unable to send message: The message is too large."
 msgstr "Nachricht kann nicht gesendet werden: Sie ist zu groß."
 
-#: ../src/conversation.c:164 ../src/conversation.c:177
+#: ../src/conversation.c:171 ../src/conversation.c:184
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Kann die Nachricht an %s nicht senden."
 
-#: ../src/conversation.c:165
+#: ../src/conversation.c:172
 msgid "The message is too large."
 msgstr "Die Nachricht ist zu lang."
 
-#: ../src/conversation.c:174
+#: ../src/conversation.c:181
 msgid "Unable to send message."
 msgstr "Nachricht kann nicht gesendet werden."
 
-#: ../src/conversation.c:1515
+#: ../src/conversation.c:1510
 #, c-format
 msgid "%s entered the room."
 msgstr "%s hat den Raum betreten."
 
-#: ../src/conversation.c:1518
+#: ../src/conversation.c:1513
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] hat den Raum betreten."
 
-#: ../src/conversation.c:1625
+#: ../src/conversation.c:1620
 #, c-format
 msgid "You are now known as %s"
 msgstr "Sie heißen jetzt %s"
 
-#: ../src/conversation.c:1645
+#: ../src/conversation.c:1640
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s heißt jetzt %s"
 
-#: ../src/conversation.c:1718
+#: ../src/conversation.c:1713
 #, c-format
 msgid "%s left the room."
 msgstr "%s hat den Raum verlassen."
 
-#: ../src/conversation.c:1721
+#: ../src/conversation.c:1716
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s hat den Raum verlassen (%s)."
@@ -2091,7 +2090,7 @@
 msgid "No name"
 msgstr "Kein Name"
 
-#: ../src/ft.c:189 ../src/protocols/msn/msn.c:412
+#: ../src/ft.c:189 ../src/protocols/msn/msn.c:410
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -2158,60 +2157,60 @@
 "Remote-Computer: %s\n"
 "Remote-Port: %d"
 
-#: ../src/ft.c:391
+#: ../src/ft.c:392
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s bietet an, die Datei %s zu senden"
 
-#: ../src/ft.c:443
+#: ../src/ft.c:444
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s ist kein gültiger Dateiname.\n"
 
-#: ../src/ft.c:464
+#: ../src/ft.c:465
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Angebot zum Senden von %s an %s"
 
-#: ../src/ft.c:476
+#: ../src/ft.c:477
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Starte die Dateiübertragung von %s von %s"
 
-#: ../src/ft.c:630
+#: ../src/ft.c:631
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Übertragung der Datei %s ist komplett"
 
-#: ../src/ft.c:633
+#: ../src/ft.c:634
 msgid "File transfer complete"
 msgstr "Dateiübertragung ist komplett"
 
-#: ../src/ft.c:1028
+#: ../src/ft.c:1031
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Sie haben die Dateiübertragung von %s abgebrochen"
 
-#: ../src/ft.c:1033
+#: ../src/ft.c:1036
 msgid "File transfer cancelled"
 msgstr "Dateiübertragung wurde abgebrochen"
 
-#: ../src/ft.c:1091
+#: ../src/ft.c:1094
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s hat die Übertragung von %s abgebrochen"
 
-#: ../src/ft.c:1096
+#: ../src/ft.c:1099
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s hat die Datenübertragung abgebrochen"
 
-#: ../src/ft.c:1153
+#: ../src/ft.c:1156
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Dateiübertragung an %s wurde abgebrochen."
 
-#: ../src/ft.c:1155
+#: ../src/ft.c:1158
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Dateiübertragung von %s wurde abgebrochen."
@@ -2240,7 +2239,7 @@
 msgid "Password:"
 msgstr "Passwort:"
 
-#: ../src/gtkaccount.c:863 ../src/gtkblist.c:4593 ../src/gtkblist.c:4959
+#: ../src/gtkaccount.c:863 ../src/gtkblist.c:4599 ../src/gtkblist.c:4965
 msgid "Alias:"
 msgstr "Alias:"
 
@@ -2333,7 +2332,7 @@
 msgid "Add Account"
 msgstr "Konto hinzufügen"
 
-#: ../src/gtkaccount.c:1749 ../src/gtkblist.c:3547
+#: ../src/gtkaccount.c:1749 ../src/gtkblist.c:3557
 msgid "Modify Account"
 msgstr "Konto bearbeiten"
 
@@ -2346,7 +2345,7 @@
 msgstr "_Erweitert"
 
 #. Register button
-#: ../src/gtkaccount.c:1797 ../src/protocols/jabber/jabber.c:823
+#: ../src/gtkaccount.c:1797 ../src/protocols/jabber/jabber.c:827
 msgid "Register"
 msgstr "Anmelden"
 
@@ -2355,12 +2354,12 @@
 msgid "Are you sure you want to delete %s?"
 msgstr "Wollen Sie %s wirklich löschen?"
 
-#: ../src/gtkaccount.c:2181 ../src/gtkpounce.c:1094 ../src/gtkrequest.c:273
+#: ../src/gtkaccount.c:2181 ../src/gtkpounce.c:1087 ../src/gtkrequest.c:273
 #: ../src/gtksavedstatuses.c:295
 msgid "Delete"
 msgstr "Löschen"
 
-#: ../src/gtkaccount.c:2239 ../src/gtksavedstatuses.c:889
+#: ../src/gtkaccount.c:2239 ../src/gtksavedstatuses.c:893
 #: ../src/protocols/oscar/oscar.c:2823
 msgid "Screen Name"
 msgstr "Benutzername"
@@ -2378,18 +2377,18 @@
 msgid "Add buddy to your list?"
 msgstr "Benutzer zu Ihrer Buddy-Liste hinzufügen?"
 
-#: ../src/gtkaccount.c:2648 ../src/gtkblist.c:5014 ../src/gtkconv.c:1623
+#: ../src/gtkaccount.c:2648 ../src/gtkblist.c:5020 ../src/gtkconv.c:1621
 #: ../src/gtkrequest.c:274 ../src/protocols/gg/gg.c:870
 #: ../src/protocols/oscar/oscar.c:2453
-#: ../src/protocols/sametime/sametime.c:5407 ../src/protocols/silc/chat.c:596
+#: ../src/protocols/sametime/sametime.c:5405 ../src/protocols/silc/chat.c:596
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: ../src/gtkblist.c:664
+#: ../src/gtkblist.c:673
 msgid "Join a Chat"
 msgstr "Chat betreten"
 
-#: ../src/gtkblist.c:685
+#: ../src/gtkblist.c:694
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -2397,87 +2396,87 @@
 "Bitte geben Sie geeignete Informationen über den Chat ein, den Sie betreten "
 "wollen.\n"
 
-#: ../src/gtkblist.c:696 ../src/gtkpounce.c:527 ../src/gtkroomlist.c:377
+#: ../src/gtkblist.c:705 ../src/gtkpounce.c:523 ../src/gtkroomlist.c:377
 msgid "_Account:"
 msgstr "_Konto:"
 
-#: ../src/gtkblist.c:940
+#: ../src/gtkblist.c:949
 msgid "Get _Info"
 msgstr "_Info abrufen"
 
-#: ../src/gtkblist.c:943 ../src/gtkstock.c:141
+#: ../src/gtkblist.c:952 ../src/gtkstock.c:141
 msgid "I_M"
 msgstr "I_M"
 
-#: ../src/gtkblist.c:949
+#: ../src/gtkblist.c:958
 msgid "_Send File"
 msgstr "Datei ver_senden"
 
-#: ../src/gtkblist.c:956
+#: ../src/gtkblist.c:965
 msgid "Add Buddy _Pounce"
 msgstr "B_uddy-Alarm hinzufügen"
 
-#: ../src/gtkblist.c:960 ../src/gtkblist.c:964 ../src/gtkblist.c:1063
-#: ../src/gtkblist.c:1086
+#: ../src/gtkblist.c:969 ../src/gtkblist.c:973 ../src/gtkblist.c:1072
+#: ../src/gtkblist.c:1095
 msgid "View _Log"
 msgstr "Mi_tschnitt anzeigen"
 
-#: ../src/gtkblist.c:975
+#: ../src/gtkblist.c:984
 msgid "Alias..."
 msgstr "Alias..."
 
-#: ../src/gtkblist.c:978 ../src/gtkconv.c:1620 ../src/gtkrequest.c:275
+#: ../src/gtkblist.c:987 ../src/gtkconv.c:1618 ../src/gtkrequest.c:275
 msgid "Remove"
 msgstr "Entfernen"
 
-#: ../src/gtkblist.c:984 ../src/gtkblist.c:1071 ../src/gtkblist.c:1092
+#: ../src/gtkblist.c:993 ../src/gtkblist.c:1080 ../src/gtkblist.c:1101
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: ../src/gtkblist.c:986 ../src/gtkblist.c:1073 ../src/gtkblist.c:1094
+#: ../src/gtkblist.c:995 ../src/gtkblist.c:1082 ../src/gtkblist.c:1103
 msgid "_Remove"
 msgstr "_Entfernen"
 
-#: ../src/gtkblist.c:1034
+#: ../src/gtkblist.c:1043
 msgid "Add a _Buddy"
 msgstr "Buddy _hinzufügen"
 
-#: ../src/gtkblist.c:1036
+#: ../src/gtkblist.c:1045
 msgid "Add a C_hat"
 msgstr "C_hat hinzufügen"
 
-#: ../src/gtkblist.c:1039
+#: ../src/gtkblist.c:1048
 msgid "_Delete Group"
 msgstr "Gruppe _löschen"
 
-#: ../src/gtkblist.c:1041
+#: ../src/gtkblist.c:1050
 msgid "_Rename"
 msgstr "_Umbenennen"
 
 #. join button
-#: ../src/gtkblist.c:1059 ../src/gtkroomlist.c:285 ../src/gtkroomlist.c:441
+#: ../src/gtkblist.c:1068 ../src/gtkroomlist.c:285 ../src/gtkroomlist.c:441
 #: ../src/gtkstock.c:139
 msgid "_Join"
 msgstr "_Betreten"
 
-#: ../src/gtkblist.c:1061
+#: ../src/gtkblist.c:1070
 msgid "Auto-Join"
 msgstr "Automatisch beitreten"
 
-#: ../src/gtkblist.c:1099 ../src/gtkblist.c:1122
+#: ../src/gtkblist.c:1108 ../src/gtkblist.c:1131
 msgid "_Collapse"
 msgstr "_Zusammenklappen"
 
-#: ../src/gtkblist.c:1127
+#: ../src/gtkblist.c:1136
 msgid "_Expand"
 msgstr "A_usklappen"
 
-#: ../src/gtkblist.c:1373 ../src/gtkblist.c:1385 ../src/gtkblist.c:3808
-#: ../src/gtkblist.c:3818
+#: ../src/gtkblist.c:1382 ../src/gtkblist.c:1394 ../src/gtkblist.c:3817
+#: ../src/gtkblist.c:3827
 msgid "/Tools/Mute Sounds"
 msgstr "/Werkzeuge/Stummschalten"
 
-#: ../src/gtkblist.c:1845 ../src/gtkconv.c:4195 ../src/gtkpounce.c:426
+#: ../src/gtkblist.c:1859 ../src/gtkconv.c:4235 ../src/gtkpounce.c:422
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
@@ -2485,126 +2484,126 @@
 "kann, um diesen Buddy hinzuzufügen."
 
 #. Buddies menu
-#: ../src/gtkblist.c:2419
+#: ../src/gtkblist.c:2433
 msgid "/_Buddies"
 msgstr "/_Buddys"
 
-#: ../src/gtkblist.c:2420
+#: ../src/gtkblist.c:2434
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Buddys/_Neue Sofortnachricht..."
 
-#: ../src/gtkblist.c:2421
+#: ../src/gtkblist.c:2435
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Buddys/Einen _Chat betreten..."
 
-#: ../src/gtkblist.c:2422
+#: ../src/gtkblist.c:2436
 msgid "/Buddies/Get User _Info..."
 msgstr "/Buddys/B_enutzer-Info abrufen..."
 
-#: ../src/gtkblist.c:2423
+#: ../src/gtkblist.c:2437
 msgid "/Buddies/View User _Log..."
 msgstr "/Buddys/Benutzer-_Mitschnitt ansehen..."
 
-#: ../src/gtkblist.c:2425
+#: ../src/gtkblist.c:2439
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Buddys/Zeige _offline Buddys"
 
-#: ../src/gtkblist.c:2426
+#: ../src/gtkblist.c:2440
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Buddys/Zeige _leere Gruppen"
 
-#: ../src/gtkblist.c:2427
+#: ../src/gtkblist.c:2441
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/Buddys/Zeige Buddy-_Details"
 
-#: ../src/gtkblist.c:2428
+#: ../src/gtkblist.c:2442
 msgid "/Buddies/Show Idle _Times"
 msgstr "/Buddys/Zeige Untätigkeitszei_ten"
 
-#: ../src/gtkblist.c:2429
+#: ../src/gtkblist.c:2443
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Buddys/Buddys _sortieren"
 
-#: ../src/gtkblist.c:2431
+#: ../src/gtkblist.c:2445
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Buddys/B_uddy hinzufügen..."
 
-#: ../src/gtkblist.c:2432
+#: ../src/gtkblist.c:2446
 msgid "/Buddies/Add C_hat..."
 msgstr "/Buddys/C_hat hinzufügen..."
 
-#: ../src/gtkblist.c:2433
+#: ../src/gtkblist.c:2447
 msgid "/Buddies/Add _Group..."
 msgstr "/Buddys/_Gruppe hinzufügen..."
 
-#: ../src/gtkblist.c:2435
+#: ../src/gtkblist.c:2449
 msgid "/Buddies/_Quit"
 msgstr "/Buddys/_Beenden"
 
 #. Accounts menu
-#: ../src/gtkblist.c:2438
+#: ../src/gtkblist.c:2452
 msgid "/_Accounts"
 msgstr "/_Konten"
 
-#: ../src/gtkblist.c:2439 ../src/gtkblist.c:5591
+#: ../src/gtkblist.c:2453 ../src/gtkblist.c:5597
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Konten/Hinzufügen\\/Ändern"
 
 #. Tools
-#: ../src/gtkblist.c:2442
+#: ../src/gtkblist.c:2456
 msgid "/_Tools"
 msgstr "/_Werkzeuge"
 
-#: ../src/gtkblist.c:2443
+#: ../src/gtkblist.c:2457
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Werkzeuge/Buddy-_Alarm"
 
-#: ../src/gtkblist.c:2444
+#: ../src/gtkblist.c:2458
 msgid "/Tools/Plu_gins"
 msgstr "/Werkzeuge/Plu_gins"
 
-#: ../src/gtkblist.c:2445
+#: ../src/gtkblist.c:2459
 msgid "/Tools/Pr_eferences"
 msgstr "/Werkzeuge/_Einstellungen"
 
-#: ../src/gtkblist.c:2446
+#: ../src/gtkblist.c:2460
 msgid "/Tools/Pr_ivacy"
 msgstr "/Werkzeuge/Pri_vatsphäre"
 
-#: ../src/gtkblist.c:2448
+#: ../src/gtkblist.c:2462
 msgid "/Tools/_File Transfers"
 msgstr "/Werkzeuge/_Dateiübertragungen"
 
-#: ../src/gtkblist.c:2449
+#: ../src/gtkblist.c:2463
 msgid "/Tools/R_oom List"
 msgstr "/Werkzeuge/_Raumliste"
 
-#: ../src/gtkblist.c:2450
+#: ../src/gtkblist.c:2464
 msgid "/Tools/System _Log"
 msgstr "/Werkzeuge/_System-Mitschnitt"
 
-#: ../src/gtkblist.c:2452
+#: ../src/gtkblist.c:2466
 msgid "/Tools/Mute _Sounds"
 msgstr "/Werkzeuge/_Stummschalten"
 
 #. Help
-#: ../src/gtkblist.c:2455
+#: ../src/gtkblist.c:2469
 msgid "/_Help"
 msgstr "/_Hilfe"
 
-#: ../src/gtkblist.c:2456
+#: ../src/gtkblist.c:2470
 msgid "/Help/Online _Help"
 msgstr "/Hilfe/Online-_Hilfe"
 
-#: ../src/gtkblist.c:2457
+#: ../src/gtkblist.c:2471
 msgid "/Help/_Debug Window"
 msgstr "/Hilfe/_Debug-Fenster"
 
-#: ../src/gtkblist.c:2458
+#: ../src/gtkblist.c:2472
 msgid "/Help/_About"
 msgstr "/Hilfe/I_nfo"
 
-#: ../src/gtkblist.c:2490 ../src/gtkblist.c:2559
+#: ../src/gtkblist.c:2504 ../src/gtkblist.c:2573
 #, c-format
 msgid ""
 "\n"
@@ -2613,7 +2612,7 @@
 "\n"
 "<b>Konto:</b> %s"
 
-#: ../src/gtkblist.c:2571
+#: ../src/gtkblist.c:2585
 #, c-format
 msgid ""
 "\n"
@@ -2622,7 +2621,7 @@
 "\n"
 "<b>Buddy-Alias:</b> %s"
 
-#: ../src/gtkblist.c:2583
+#: ../src/gtkblist.c:2597
 #, c-format
 msgid ""
 "\n"
@@ -2631,7 +2630,7 @@
 "\n"
 "<b>Spitzname:</b> %s"
 
-#: ../src/gtkblist.c:2592
+#: ../src/gtkblist.c:2606
 #, c-format
 msgid ""
 "\n"
@@ -2640,7 +2639,7 @@
 "\n"
 "<b>Angemeldet:</b> %s"
 
-#: ../src/gtkblist.c:2603
+#: ../src/gtkblist.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -2649,7 +2648,7 @@
 "\n"
 "<b>Untätig:</b> %s"
 
-#: ../src/gtkblist.c:2638
+#: ../src/gtkblist.c:2652
 #, c-format
 msgid ""
 "\n"
@@ -2658,7 +2657,7 @@
 "\n"
 "<b>Zuletzt gesehen:</b> vor %s"
 
-#: ../src/gtkblist.c:2647
+#: ../src/gtkblist.c:2661
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2666,7 +2665,7 @@
 "\n"
 "<b>Status:</b> Offline"
 
-#: ../src/gtkblist.c:2658
+#: ../src/gtkblist.c:2672
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2674,7 +2673,7 @@
 "\n"
 "<b>Beschreibung:</b> Spooky"
 
-#: ../src/gtkblist.c:2660
+#: ../src/gtkblist.c:2674
 msgid ""
 "\n"
 "<b>Status:</b> Awesome"
@@ -2682,7 +2681,7 @@
 "\n"
 "<b>Status:</b> großartig"
 
-#: ../src/gtkblist.c:2662
+#: ../src/gtkblist.c:2676
 msgid ""
 "\n"
 "<b>Status:</b> Rockin'"
@@ -2690,119 +2689,120 @@
 "\n"
 "<b>Status:</b> Rockin'"
 
-#: ../src/gtkblist.c:2951
+#: ../src/gtkblist.c:2967
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Untätig %dh %02dm"
 
-#: ../src/gtkblist.c:2953
+#: ../src/gtkblist.c:2969
 #, c-format
 msgid "Idle %dm"
 msgstr "Untätig %dm"
 
 #. Idle stuff
-#: ../src/gtkblist.c:2956 ../src/gtkprefs.c:1760
-#: ../src/protocols/bonjour/bonjour.c:333 ../src/protocols/msn/msn.c:552
-#: ../src/protocols/msn/state.c:32 ../src/protocols/novell/novell.c:2854
-#: ../src/protocols/oscar/oscar.c:2844 ../src/protocols/yahoo/yahoo.c:2729
+#: ../src/gtkblist.c:2972 ../src/gtkprefs.c:1760
+#: ../src/protocols/bonjour/bonjour.c:333 ../src/protocols/jabber/buddy.c:641
+#: ../src/protocols/jabber/buddy.c:672 ../src/protocols/msn/msn.c:550
+#: ../src/protocols/msn/state.c:32 ../src/protocols/novell/novell.c:2852
+#: ../src/protocols/oscar/oscar.c:2844 ../src/protocols/yahoo/yahoo.c:2727
 #: ../src/protocols/yahoo/yahoo_profile.c:691
 msgid "Idle"
 msgstr "Untätig"
 
-#: ../src/gtkblist.c:3088
+#: ../src/gtkblist.c:3104
 msgid "/Buddies/New Instant Message..."
 msgstr "/Buddys/_Neue Sofortnachricht..."
 
-#: ../src/gtkblist.c:3089 ../src/gtkblist.c:3122
+#: ../src/gtkblist.c:3105 ../src/gtkblist.c:3138
 msgid "/Buddies/Join a Chat..."
 msgstr "/Buddys/Chat betreten..."
 
-#: ../src/gtkblist.c:3090
+#: ../src/gtkblist.c:3106
 msgid "/Buddies/Get User Info..."
 msgstr "/Buddys/B_enutzer-Info abrufen..."
 
-#: ../src/gtkblist.c:3091
+#: ../src/gtkblist.c:3107
 msgid "/Buddies/Add Buddy..."
 msgstr "/Buddys/B_uddy hinzufügen..."
 
-#: ../src/gtkblist.c:3092 ../src/gtkblist.c:3125
+#: ../src/gtkblist.c:3108 ../src/gtkblist.c:3141
 msgid "/Buddies/Add Chat..."
 msgstr "/Buddys/C_hat hinzufügen..."
 
-#: ../src/gtkblist.c:3093
+#: ../src/gtkblist.c:3109
 msgid "/Buddies/Add Group..."
 msgstr "/Buddys/Gruppe hinzufügen..."
 
-#: ../src/gtkblist.c:3128
+#: ../src/gtkblist.c:3144
 msgid "/Tools/Buddy Pounces"
 msgstr "/Werkzeuge/Buddy-Alarm"
 
-#: ../src/gtkblist.c:3131
+#: ../src/gtkblist.c:3147
 msgid "/Tools/Privacy"
 msgstr "/Werkzeuge/Privatsphäre"
 
-#: ../src/gtkblist.c:3134
+#: ../src/gtkblist.c:3150
 msgid "/Tools/Room List"
 msgstr "/Werkzeuge/Raumliste"
 
-#: ../src/gtkblist.c:3328
+#: ../src/gtkblist.c:3344
 msgid "Manually"
 msgstr "Manuell"
 
-#: ../src/gtkblist.c:3330
+#: ../src/gtkblist.c:3346
 msgid "Alphabetically"
 msgstr "Alphabetisch"
 
-#: ../src/gtkblist.c:3331
+#: ../src/gtkblist.c:3347
 msgid "By status"
 msgstr "Nach Status"
 
-#: ../src/gtkblist.c:3332
+#: ../src/gtkblist.c:3348
 msgid "By log size"
 msgstr "Nach Größe der Logs"
 
-#: ../src/gtkblist.c:3532 ../src/gtkconn.c:196
+#: ../src/gtkblist.c:3549 ../src/gtkconn.c:184
 #, c-format
 msgid "%s disconnected"
 msgstr "%s abgemeldet"
 
-#: ../src/gtkblist.c:3548 ../src/protocols/sametime/sametime.c:3629
+#: ../src/gtkblist.c:3558 ../src/protocols/sametime/sametime.c:3622
 msgid "Connect"
 msgstr "Verbinden"
 
-#: ../src/gtkblist.c:3548
+#: ../src/gtkblist.c:3558
 msgid "Re-enable Account"
 msgstr "Konten reaktivieren"
 
-#: ../src/gtkblist.c:3570
+#: ../src/gtkblist.c:3579
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s abgemeldet: %s</span>"
 
-#: ../src/gtkblist.c:3697
+#: ../src/gtkblist.c:3706
 msgid "/Accounts"
 msgstr "/Konten"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../src/gtkblist.c:3802
+#: ../src/gtkblist.c:3811
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Buddys/Zeige Offline Buddys"
 
-#: ../src/gtkblist.c:3805
+#: ../src/gtkblist.c:3814
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Buddys/Zeige leere Gruppen"
 
-#: ../src/gtkblist.c:3811
+#: ../src/gtkblist.c:3820
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Buddys/Zeige Buddy-Details"
 
-#: ../src/gtkblist.c:3814
+#: ../src/gtkblist.c:3823
 msgid "/Buddies/Show Idle Times"
 msgstr "/Buddys/Zeige Untätigkeitszeiten"
 
-#: ../src/gtkblist.c:4550
+#: ../src/gtkblist.c:4556
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
@@ -2814,25 +2814,25 @@
 "immer es möglich ist.\n"
 
 #. Set up stuff for the account box
-#: ../src/gtkblist.c:4620 ../src/gtkblist.c:4939
+#: ../src/gtkblist.c:4626 ../src/gtkblist.c:4945
 msgid "Account:"
 msgstr "Konto:"
 
-#: ../src/gtkblist.c:4872
+#: ../src/gtkblist.c:4878
 msgid "This protocol does not support chat rooms."
 msgstr "Dieses Protokoll unterstützt keine Chaträume."
 
-#: ../src/gtkblist.c:4888
+#: ../src/gtkblist.c:4894
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "Sie sind derzeit mit keinem Chat-fähigen Protokoll angemeldet."
 
-#: ../src/gtkblist.c:4905
+#: ../src/gtkblist.c:4911
 msgid "Add Chat"
 msgstr "Chat hinzufügen"
 
-#: ../src/gtkblist.c:4929
+#: ../src/gtkblist.c:4935
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2840,40 +2840,40 @@
 "Bitte geben Sie einen Alias und geeignete Informationen über den Chat ein, "
 "den Sie in Ihre Buddy-Liste aufnehmen wollen.\n"
 
-#: ../src/gtkblist.c:5011 ../src/protocols/sametime/sametime.c:5318
-#: ../src/protocols/sametime/sametime.c:5405
+#: ../src/gtkblist.c:5017 ../src/protocols/sametime/sametime.c:5316
+#: ../src/protocols/sametime/sametime.c:5403
 msgid "Add Group"
 msgstr "Gruppe hinzufügen"
 
-#: ../src/gtkblist.c:5012
+#: ../src/gtkblist.c:5018
 msgid "Please enter the name of the group to be added."
 msgstr "Bitte geben Sie den Namen der Gruppe ein, die hinzugefügt werden soll."
 
-#: ../src/gtkblist.c:5631
+#: ../src/gtkblist.c:5637
 msgid "_Edit Account"
 msgstr "Konto _bearbeiten"
 
-#: ../src/gtkblist.c:5664 ../src/gtkblist.c:5670
+#: ../src/gtkblist.c:5670 ../src/gtkblist.c:5676 ../src/gtkconv.c:2747
 msgid "No actions available"
 msgstr "Keine Aktionen verfügbar"
 
-#: ../src/gtkblist.c:5678
+#: ../src/gtkblist.c:5684
 msgid "_Disable"
 msgstr "_Deaktivieren"
 
-#: ../src/gtkblist.c:5690
+#: ../src/gtkblist.c:5696
 msgid "Enable Account"
 msgstr "Konten aktivieren"
 
-#: ../src/gtkblist.c:5743
+#: ../src/gtkblist.c:5749
 msgid "/Tools"
 msgstr "/Werkzeuge"
 
-#: ../src/gtkblist.c:5829
+#: ../src/gtkblist.c:5835
 msgid "/Buddies/Sort Buddies"
 msgstr "/Buddys/Buddys _sortieren"
 
-#: ../src/gtkconn.c:197
+#: ../src/gtkconn.c:185
 #, c-format
 msgid ""
 "%s was disconnected due to an error: %s\n"
@@ -2901,48 +2901,48 @@
 "zu erhalten.\n"
 "Die folgenden Kommandos sind in diesem Kontext verfügbar:\n"
 
-#: ../src/gtkconv.c:482
+#: ../src/gtkconv.c:478
 msgid "No such command."
 msgstr "Es gibt kein solches Kommando."
 
-#: ../src/gtkconv.c:489
+#: ../src/gtkconv.c:485
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Syntaxfehler:  Sie übergaben dem Kommando eine falsche Anzahl von Argumenten."
 
-#: ../src/gtkconv.c:494
+#: ../src/gtkconv.c:490
 msgid "Your command failed for an unknown reason."
 msgstr "Ihre Kommando scheiterte aus einem unbekannten Grund."
 
-#: ../src/gtkconv.c:501
+#: ../src/gtkconv.c:497
 msgid "That command only works in chats, not IMs."
 msgstr "Dieses Kommando funktioniert nur in Chats, nicht bei IMs."
 
-#: ../src/gtkconv.c:504
+#: ../src/gtkconv.c:500
 msgid "That command only works in IMs, not chats."
 msgstr "Dieses Kommando funktioniert nur bei IMs, nicht bei Chats."
 
-#: ../src/gtkconv.c:508
+#: ../src/gtkconv.c:504
 msgid "That command doesn't work on this protocol."
 msgstr "Dieses Kommando funktioniert nicht in diesem Protokoll."
 
-#: ../src/gtkconv.c:742 ../src/gtkconv.c:768
+#: ../src/gtkconv.c:739 ../src/gtkconv.c:765
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Der Buddy hat nicht das gleiche Protokoll wie dieser Chat."
 
-#: ../src/gtkconv.c:762
+#: ../src/gtkconv.c:759
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "Sie sind im Moment nicht mit einem Konto angemeldet, welches benutzt werden "
 "kann, um diesen Buddy einzuladen."
 
-#: ../src/gtkconv.c:815
+#: ../src/gtkconv.c:812
 msgid "Invite Buddy Into Chat Room"
 msgstr "Buddy in einen Chatraum einladen"
 
 #. Put our happy label in it.
-#: ../src/gtkconv.c:845
+#: ../src/gtkconv.c:842
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2950,318 +2950,330 @@
 "Bitte geben Sie den Benutzernamen der Person ein, die Sie einladen möchten "
 "zusammen mit einer optionalen Einladungsnachricht."
 
-#: ../src/gtkconv.c:866
+#: ../src/gtkconv.c:863
 msgid "_Buddy:"
 msgstr "_Buddy:"
 
-#: ../src/gtkconv.c:886 ../src/gtksavedstatuses.c:1107
-#: ../src/gtksavedstatuses.c:1443
+#: ../src/gtkconv.c:883 ../src/gtksavedstatuses.c:1111
+#: ../src/gtksavedstatuses.c:1447
 msgid "_Message:"
 msgstr "_Nachricht:"
 
-#: ../src/gtkconv.c:943 ../src/gtkconv.c:2378 ../src/gtkdebug.c:217
+#: ../src/gtkconv.c:940 ../src/gtkconv.c:2364 ../src/gtkdebug.c:217
 #: ../src/gtkft.c:490
 msgid "Unable to open file."
 msgstr "Konnte die Datei nicht öffnen."
 
-#: ../src/gtkconv.c:949
+#: ../src/gtkconv.c:946
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Unterhaltung mit %s</h1>\n"
 
-#: ../src/gtkconv.c:973
+#: ../src/gtkconv.c:970
 msgid "Save Conversation"
 msgstr "Unterhaltung speichern"
 
-#: ../src/gtkconv.c:1094 ../src/gtkdebug.c:165 ../src/gtkdebug.c:678
+#: ../src/gtkconv.c:1091 ../src/gtkdebug.c:165 ../src/gtkdebug.c:678
 msgid "Find"
 msgstr "Suchen"
 
-#: ../src/gtkconv.c:1120 ../src/gtkdebug.c:193
+#: ../src/gtkconv.c:1117 ../src/gtkdebug.c:193
 msgid "_Search for:"
 msgstr "_Suche nach:"
 
-#: ../src/gtkconv.c:1291
+#: ../src/gtkconv.c:1288
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 "Mitschnitt gestartet. Zukünftige Nachrichten dieser Unterhaltung werden "
 "mitgeschnitten."
 
-#: ../src/gtkconv.c:1299
+#: ../src/gtkconv.c:1296
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 "Mitschnitt angehalten. Zukünftige Nachrichten dieser Unterhaltung werden "
 "nicht mitgeschnitten."
 
-#: ../src/gtkconv.c:1560
+#: ../src/gtkconv.c:1558
 msgid "IM"
 msgstr "Nachricht"
 
-#: ../src/gtkconv.c:1571 ../src/protocols/oscar/oscar.c:640
+#: ../src/gtkconv.c:1569 ../src/protocols/oscar/oscar.c:640
 msgid "Send File"
 msgstr "Datei versenden"
 
-#: ../src/gtkconv.c:1586
+#: ../src/gtkconv.c:1584
 msgid "Un-Ignore"
 msgstr "Nicht Ignorieren"
 
-#: ../src/gtkconv.c:1589
+#: ../src/gtkconv.c:1587
 msgid "Ignore"
 msgstr "Ignorieren"
 
-#: ../src/gtkconv.c:1599
+#: ../src/gtkconv.c:1597
 msgid "Info"
 msgstr "Info"
 
-#: ../src/gtkconv.c:1609
+#: ../src/gtkconv.c:1607
 msgid "Get Away Message"
 msgstr "Neue Abwesenheitsnachricht abholen"
 
-#: ../src/gtkconv.c:1632
+#: ../src/gtkconv.c:1630
 msgid "Last said"
 msgstr "Zuletzt gesagt"
 
-#: ../src/gtkconv.c:2386
+#: ../src/gtkconv.c:2372
 msgid "Unable to save icon file to disk."
 msgstr "Kann Icon-Datei nicht auf die Festplatte speichern."
 
-#: ../src/gtkconv.c:2410
+#: ../src/gtkconv.c:2396
 msgid "Save Icon"
 msgstr "Icon speichern"
 
-#: ../src/gtkconv.c:2459
+#: ../src/gtkconv.c:2445
 msgid "Animate"
 msgstr "Animieren"
 
-#: ../src/gtkconv.c:2464
+#: ../src/gtkconv.c:2450
 msgid "Hide Icon"
 msgstr "Icon verbergen"
 
-#: ../src/gtkconv.c:2470
+#: ../src/gtkconv.c:2456
 msgid "Save Icon As..."
 msgstr "Icon speichern unter..."
 
 #. Conversation menu
-#: ../src/gtkconv.c:2611
+#: ../src/gtkconv.c:2596
 msgid "/_Conversation"
 msgstr "/_Unterhaltung"
 
-#: ../src/gtkconv.c:2613
+#: ../src/gtkconv.c:2598
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Unterhaltung/_Neue Sofortnachricht..."
 
-#: ../src/gtkconv.c:2618
+#: ../src/gtkconv.c:2603
 msgid "/Conversation/_Find..."
 msgstr "/Unterhaltung/_Finden..."
 
-#: ../src/gtkconv.c:2620
+#: ../src/gtkconv.c:2605
 msgid "/Conversation/View _Log"
 msgstr "/Unterhaltung/Betrachte _Mitschnitt"
 
-#: ../src/gtkconv.c:2621
+#: ../src/gtkconv.c:2606
 msgid "/Conversation/_Save As..."
 msgstr "/Unterhaltung/_Speichern als..."
 
-#: ../src/gtkconv.c:2623
+#: ../src/gtkconv.c:2608
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Unterhaltung/_Leeren"
 
-#: ../src/gtkconv.c:2627
+#: ../src/gtkconv.c:2612
 msgid "/Conversation/Se_nd File..."
 msgstr "/Unterhaltung/Datei _senden..."
 
-#: ../src/gtkconv.c:2628
+#: ../src/gtkconv.c:2613
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Unterhaltung/Buddy-Alar_m hinzufügen..."
 
-#: ../src/gtkconv.c:2630
+#: ../src/gtkconv.c:2615
 msgid "/Conversation/_Get Info"
 msgstr "/Unterhaltung/B_enutzer-Info abrufen"
 
-#: ../src/gtkconv.c:2632
+#: ../src/gtkconv.c:2617
 msgid "/Conversation/In_vite..."
 msgstr "/Unterhaltung/_Einladen..."
 
-#: ../src/gtkconv.c:2637
+#: ../src/gtkconv.c:2619
+msgid "/Conversation/M_ore"
+msgstr "/Unterhaltung/M_ehr"
+
+#: ../src/gtkconv.c:2623
 msgid "/Conversation/Al_ias..."
 msgstr "/Unterhaltung/Al_ias..."
 
-#: ../src/gtkconv.c:2639
+#: ../src/gtkconv.c:2625
 msgid "/Conversation/_Block..."
 msgstr "/Unterhaltung/_Blockieren..."
 
-#: ../src/gtkconv.c:2641
+#: ../src/gtkconv.c:2627
 msgid "/Conversation/_Add..."
 msgstr "/Unterhaltung/_Hinzufügen..."
 
-#: ../src/gtkconv.c:2643
+#: ../src/gtkconv.c:2629
 msgid "/Conversation/_Remove..."
 msgstr "/Unterhaltung/_Entfernen..."
 
-#: ../src/gtkconv.c:2648
+#: ../src/gtkconv.c:2634
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Unterhaltung/Füge Lin_k ein..."
 
-#: ../src/gtkconv.c:2650
+#: ../src/gtkconv.c:2636
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Unterhaltung/Füge Bil_d ein ..."
 
-#: ../src/gtkconv.c:2655
+#: ../src/gtkconv.c:2641
 msgid "/Conversation/_Close"
 msgstr "/Unterhaltung/S_chließen"
 
 #. Options
-#: ../src/gtkconv.c:2659
+#: ../src/gtkconv.c:2645
 msgid "/_Options"
 msgstr "/_Optionen"
 
-#: ../src/gtkconv.c:2660
+#: ../src/gtkconv.c:2646
 msgid "/Options/Enable _Logging"
 msgstr "/Optionen/Schalte _Mitschnitt ein"
 
-#: ../src/gtkconv.c:2661
+#: ../src/gtkconv.c:2647
 msgid "/Options/Enable _Sounds"
 msgstr "/Optionen/Schalte _Klänge ein"
 
-#: ../src/gtkconv.c:2662
+#: ../src/gtkconv.c:2648
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Optionen/Buddy-_Icon anzeigen"
 
-#: ../src/gtkconv.c:2664
+#: ../src/gtkconv.c:2650
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Optionen/Zeige _Werkzeugleisten für Formatierung"
 
-#: ../src/gtkconv.c:2665
+#: ../src/gtkconv.c:2651
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Optionen/Zeige Zeitste_mpel"
 
-#: ../src/gtkconv.c:2757
+#: ../src/gtkconv.c:2726
+msgid "/Conversation/More"
+msgstr "/Unterhaltung/Mehr"
+
+#: ../src/gtkconv.c:2764 ../src/gtkconv.c:2791
+msgid "/Conversation"
+msgstr "/Unterhaltung"
+
+#: ../src/gtkconv.c:2801
 msgid "/Conversation/View Log"
 msgstr "/Unterhaltung/Betrachte Mitschnitt"
 
-#: ../src/gtkconv.c:2763
+#: ../src/gtkconv.c:2807
 msgid "/Conversation/Send File..."
 msgstr "/Unterhaltung/Datei senden ..."
 
-#: ../src/gtkconv.c:2767
+#: ../src/gtkconv.c:2811
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Unterhaltung/Buddy-Alarm hinzufügen..."
 
-#: ../src/gtkconv.c:2773
+#: ../src/gtkconv.c:2817
 msgid "/Conversation/Get Info"
 msgstr "/Unterhaltung/Info abrufen"
 
-#: ../src/gtkconv.c:2777
+#: ../src/gtkconv.c:2821
 msgid "/Conversation/Invite..."
 msgstr "/Unterhaltung/Einladen ..."
 
-#: ../src/gtkconv.c:2783
+#: ../src/gtkconv.c:2827
 msgid "/Conversation/Alias..."
 msgstr "/Unterhaltung/Alias..."
 
-#: ../src/gtkconv.c:2787
+#: ../src/gtkconv.c:2831
 msgid "/Conversation/Block..."
 msgstr "/Unterhaltung/Blockieren..."
 
-#: ../src/gtkconv.c:2791
+#: ../src/gtkconv.c:2835
 msgid "/Conversation/Add..."
 msgstr "/Unterhaltung/Hinzufügen..."
 
-#: ../src/gtkconv.c:2795
+#: ../src/gtkconv.c:2839
 msgid "/Conversation/Remove..."
 msgstr "/Unterhaltung/Entfernen..."
 
-#: ../src/gtkconv.c:2801
+#: ../src/gtkconv.c:2845
 msgid "/Conversation/Insert Link..."
 msgstr "/Unterhaltung/Füge Link ein..."
 
-#: ../src/gtkconv.c:2805
+#: ../src/gtkconv.c:2849
 msgid "/Conversation/Insert Image..."
 msgstr "/Unterhaltung/Füge Bild ein ..."
 
-#: ../src/gtkconv.c:2811
+#: ../src/gtkconv.c:2855
 msgid "/Options/Enable Logging"
 msgstr "/Optionen/Schalte Mitschnitt ein"
 
-#: ../src/gtkconv.c:2814
+#: ../src/gtkconv.c:2858
 msgid "/Options/Enable Sounds"
 msgstr "/Optionen/Schalte Klänge ein"
 
-#: ../src/gtkconv.c:2827
+#: ../src/gtkconv.c:2871
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Optionen/Zeige Werkzeugleisten für Formatierung"
 
-#: ../src/gtkconv.c:2830
+#: ../src/gtkconv.c:2874
 msgid "/Options/Show Timestamps"
 msgstr "/Optionen/Zeige Zeitstempel"
 
-#: ../src/gtkconv.c:2833
+#: ../src/gtkconv.c:2877
 msgid "/Options/Show Buddy Icon"
 msgstr "/Optionen/Zeige Buddy-Icon"
 
-#: ../src/gtkconv.c:2913
+#: ../src/gtkconv.c:2953
 msgid "User is typing..."
 msgstr "Benutzer tippt gerade..."
 
-#: ../src/gtkconv.c:2916
+#: ../src/gtkconv.c:2956
 msgid "User has typed something and stopped"
 msgstr "Benutzer hat etwas getippt und wartet nun"
 
 #. Build the Send To menu
-#: ../src/gtkconv.c:3099
+#: ../src/gtkconv.c:3139
 msgid "_Send To"
 msgstr "_Senden an"
 
-#: ../src/gtkconv.c:3751
+#: ../src/gtkconv.c:3791
 msgid "_Send"
 msgstr "Ab_schicken"
 
-#: ../src/gtkconv.c:3806 ../src/protocols/sametime/sametime.c:3571
+#: ../src/gtkconv.c:3846 ../src/protocols/sametime/sametime.c:3564
 msgid "Topic:"
 msgstr "Thema:"
 
 #. Setup the label telling how many people are in the room.
-#: ../src/gtkconv.c:3858
+#: ../src/gtkconv.c:3898
 msgid "0 people in room"
 msgstr "0 Personen im Raum"
 
-#: ../src/gtkconv.c:3937
+#: ../src/gtkconv.c:3977
 msgid "IM the user"
 msgstr "Benutzer eine IM schicken"
 
-#: ../src/gtkconv.c:3950
+#: ../src/gtkconv.c:3990
 msgid "Ignore the user"
 msgstr "Benutzer ignorieren"
 
-#: ../src/gtkconv.c:3962
+#: ../src/gtkconv.c:4002
 msgid "Get the user's information"
 msgstr "Information zum Benutzer abrufen"
 
-#: ../src/gtkconv.c:4944 ../src/gtkconv.c:5053
+#: ../src/gtkconv.c:4993 ../src/gtkconv.c:5102
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d Person im Raum"
 msgstr[1] "%d Personen im Raum"
 
-#: ../src/gtkconv.c:5610 ../src/gtkstatusbox.c:366
+#: ../src/gtkconv.c:5659 ../src/gtkstatusbox.c:366
 msgid "Typing"
 msgstr "Tippt gerade"
 
-#: ../src/gtkconv.c:5616
+#: ../src/gtkconv.c:5665
 msgid "Stopped Typing"
 msgstr "Tippen gestoppt"
 
-#: ../src/gtkconv.c:5621
+#: ../src/gtkconv.c:5670
 msgid "Nick Said"
 msgstr "Spitzname gesagt"
 
-#: ../src/gtkconv.c:5631
+#: ../src/gtkconv.c:5680
 msgid "New Event"
 msgstr "Neue Ereignisse"
 
-#: ../src/gtkconv.c:6521
+#: ../src/gtkconv.c:6570
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -3269,13 +3281,13 @@
 "say &lt;Nachricht&gt;:  Sendet eine Nachricht genau so, als wenn Sie die "
 "Nachricht ohne ein Kommando absenden."
 
-#: ../src/gtkconv.c:6524
+#: ../src/gtkconv.c:6573
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;Aktion&gt;:  Sende eine IRC-ähnliche Aktion an einen Buddy oder einen "
 "Chat."
 
-#: ../src/gtkconv.c:6527
+#: ../src/gtkconv.c:6576
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -3283,60 +3295,60 @@
 "debug &lt;Option&gt;:  Verschiedene Debugging-Informationen zur aktuellen "
 "Unterhaltung senden."
 
-#: ../src/gtkconv.c:6530
+#: ../src/gtkconv.c:6579
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Leert das Gesprächsfenster."
 
-#: ../src/gtkconv.c:6533
+#: ../src/gtkconv.c:6582
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;Kommando&gt;:  Hilfe zu einem bestimmten Kommando."
 
-#: ../src/gtkconv.c:6692
+#: ../src/gtkconv.c:6741
 msgid "Confirm close"
 msgstr "Schließen bestätigen"
 
-#: ../src/gtkconv.c:6724
+#: ../src/gtkconv.c:6773
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr ""
 "Sie haben ungelesene Nachrichten. Wollen Sie das Fenster wirklich schließen?"
 
-#: ../src/gtkconv.c:7246
+#: ../src/gtkconv.c:7295
 msgid "Close other tabs"
 msgstr "Andere Reiter schließen"
 
-#: ../src/gtkconv.c:7252
+#: ../src/gtkconv.c:7301
 msgid "Close all tabs"
 msgstr "Alle Reiter schließen"
 
-#: ../src/gtkconv.c:7260
+#: ../src/gtkconv.c:7309
 msgid "Detach this tab"
 msgstr "Diesen Reiter ablösen"
 
-#: ../src/gtkconv.c:7266
+#: ../src/gtkconv.c:7315
 msgid "Close this tab"
 msgstr "Diesen Reiter schließen"
 
-#: ../src/gtkconv.c:7526
+#: ../src/gtkconv.c:7575
 msgid "Close conversation"
 msgstr "Unterhaltung schließen"
 
-#: ../src/gtkconv.c:7990
+#: ../src/gtkconv.c:8039

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.