pidgin-commits — DO NOT USE. See https://pidgin.im/cgi-bin/mailman/listinfo/commits

[Gaim-commits] SF.net SVN: gaim: [16293] branches/v2_0_0/src

[<rl...@us...>]

Revision: 16293
Author:   rlaager
Date:     2006-06-19 10:52:52 -0700 (Mon, 19 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16293&view=rev

Log Message:
-----------
Merging the GAIM_CMD_P_VERYHIGH -> GAIM_CMD_P_VERY_HIGH change

Modified Paths:
--------------
    branches/v2_0_0/plugins/ChangeLog.API
    branches/v2_0_0/src/cmds.h
Modified: branches/v2_0_0/plugins/ChangeLog.API
===================================================================
--- branches/v2_0_0/plugins/ChangeLog.API	2006-06-19 17:49:43 UTC (rev 16292)
+++ branches/v2_0_0/plugins/ChangeLog.API	2006-06-19 17:52:52 UTC (rev 16293)
@@ -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

Modified: branches/v2_0_0/src/cmds.h
===================================================================
--- branches/v2_0_0/src/cmds.h	2006-06-19 17:49:43 UTC (rev 16292)
+++ branches/v2_0_0/src/cmds.h	2006-06-19 17:52:52 UTC (rev 16293)
@@ -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


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

[Gaim-commits] SF.net SVN: gaim: [16292] trunk/plugins/ChangeLog.API

[<rl...@us...>]

Revision: 16292
Author:   rlaager
Date:     2006-06-19 10:49:43 -0700 (Mon, 19 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16292&view=rev

Log Message:
-----------
API ChangeLog note for the GAIM_CMD_P_VERYHIGH -> GAIM_CMD_P_VERY_HIGH change

Modified Paths:
--------------
    trunk/plugins/ChangeLog.API
Modified: trunk/plugins/ChangeLog.API
===================================================================
--- trunk/plugins/ChangeLog.API	2006-06-19 14:17:34 UTC (rev 16291)
+++ trunk/plugins/ChangeLog.API	2006-06-19 17:49:43 UTC (rev 16292)
@@ -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


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

[Gaim-commits] SF.net SVN: gaim: [16291] trunk/src/cmds.h

[<de...@us...>]

Revision: 16291
Author:   deryni9
Date:     2006-06-19 07:17:34 -0700 (Mon, 19 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16291&view=rev

Log Message:
-----------
Nothing to see here, GAIM_CMD_P_VERY_LOW and GAIM_CMD_P_VERYHIGH just struck
me wrong, so now it is GAIM_CMD_P_VERY_HIGH to match.
Also fix a couple typos in the documentation for gaim_cmd_register.

Modified Paths:
--------------
    trunk/src/cmds.h
Modified: trunk/src/cmds.h
===================================================================
--- trunk/src/cmds.h	2006-06-19 07:56:40 UTC (rev 16290)
+++ trunk/src/cmds.h	2006-06-19 14:17:34 UTC (rev 16291)
@@ -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


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

[Gaim-commits] SF.net SVN: gaim: [16290] branches/v2_0_0

[<rl...@us...>]

Revision: 16290
Author:   rlaager
Date:     2006-06-19 00:56:40 -0700 (Mon, 19 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16290&view=rev

Log Message:
-----------
Merge today's changes (through 16287) to HEAD to the 2.0.0 branch.

Modified Paths:
--------------
    branches/v2_0_0/COPYRIGHT
    branches/v2_0_0/plugins/ChangeLog.API
    branches/v2_0_0/plugins/idle.c
    branches/v2_0_0/plugins/perl/common/Account.xs
    branches/v2_0_0/plugins/perl/common/Conversation.xs
    branches/v2_0_0/src/conversation.c
    branches/v2_0_0/src/conversation.h
    branches/v2_0_0/src/ft.c
    branches/v2_0_0/src/gtkblist.c
    branches/v2_0_0/src/gtkconv.c
    branches/v2_0_0/src/gtkconv.h
    branches/v2_0_0/src/gtkmain.c
    branches/v2_0_0/src/util.c
    branches/v2_0_0/src/xmlnode.c
Modified: branches/v2_0_0/COPYRIGHT
===================================================================
--- branches/v2_0_0/COPYRIGHT	2006-06-19 06:39:11 UTC (rev 16289)
+++ branches/v2_0_0/COPYRIGHT	2006-06-19 07:56:40 UTC (rev 16290)
@@ -51,6 +51,7 @@
 Christophe Chapuis
 Ka-Hing Cheung
 Sadrul Habib Chowdhury
+Brian Chu
 Arturo Cisneros, Jr.
 Vincas Ciziunas
 Jonathan Clark

Modified: branches/v2_0_0/plugins/ChangeLog.API
===================================================================
--- branches/v2_0_0/plugins/ChangeLog.API	2006-06-19 06:39:11 UTC (rev 16289)
+++ branches/v2_0_0/plugins/ChangeLog.API	2006-06-19 07:56:40 UTC (rev 16290)
@@ -173,6 +173,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/v2_0_0/plugins/idle.c
===================================================================
--- branches/v2_0_0/plugins/idle.c	2006-06-19 06:39:11 UTC (rev 16289)
+++ branches/v2_0_0/plugins/idle.c	2006-06-19 07:56:40 UTC (rev 16290)
@@ -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/v2_0_0/plugins/perl/common/Account.xs
===================================================================
--- branches/v2_0_0/plugins/perl/common/Account.xs	2006-06-19 06:39:11 UTC (rev 16289)
+++ branches/v2_0_0/plugins/perl/common/Account.xs	2006-06-19 07:56:40 UTC (rev 16290)
@@ -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/v2_0_0/plugins/perl/common/Conversation.xs
===================================================================
--- branches/v2_0_0/plugins/perl/common/Conversation.xs	2006-06-19 06:39:11 UTC (rev 16289)
+++ branches/v2_0_0/plugins/perl/common/Conversation.xs	2006-06-19 07:56:40 UTC (rev 16290)
@@ -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
 

Modified: branches/v2_0_0/src/conversation.c
===================================================================
--- branches/v2_0_0/src/conversation.c	2006-06-19 06:39:11 UTC (rev 16289)
+++ branches/v2_0_0/src/conversation.c	2006-06-19 07:56:40 UTC (rev 16290)
@@ -263,7 +263,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,17 +418,6 @@
 	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);
@@ -708,14 +696,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)
 {

Modified: branches/v2_0_0/src/conversation.h
===================================================================
--- branches/v2_0_0/src/conversation.h	2006-06-19 06:39:11 UTC (rev 16289)
+++ branches/v2_0_0/src/conversation.h	2006-06-19 07:56:40 UTC (rev 16290)
@@ -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.

Modified: branches/v2_0_0/src/ft.c
===================================================================
--- branches/v2_0_0/src/ft.c	2006-06-19 06:39:11 UTC (rev 16289)
+++ branches/v2_0_0/src/ft.c	2006-06-19 07:56:40 UTC (rev 16290)
@@ -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/v2_0_0/src/gtkblist.c
===================================================================
--- branches/v2_0_0/src/gtkblist.c	2006-06-19 06:39:11 UTC (rev 16289)
+++ branches/v2_0_0/src/gtkblist.c	2006-06-19 07:56:40 UTC (rev 16290)
@@ -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/v2_0_0/src/gtkconv.c
===================================================================
--- branches/v2_0_0/src/gtkconv.c	2006-06-19 06:39:11 UTC (rev 16289)
+++ branches/v2_0_0/src/gtkconv.c	2006-06-19 07:56:40 UTC (rev 16290)
@@ -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 {
@@ -4347,6 +4342,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 +4511,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/v2_0_0/src/gtkconv.h
===================================================================
--- branches/v2_0_0/src/gtkconv.h	2006-06-19 06:39:11 UTC (rev 16289)
+++ branches/v2_0_0/src/gtkconv.h	2006-06-19 07:56:40 UTC (rev 16290)
@@ -114,6 +114,7 @@
 {
 	GaimConversation *active_conv;
 	GList *convs;
+	GList *send_history;
 
 	GaimGtkWindow *win;
 

Modified: branches/v2_0_0/src/gtkmain.c
===================================================================
--- branches/v2_0_0/src/gtkmain.c	2006-06-19 06:39:11 UTC (rev 16289)
+++ branches/v2_0_0/src/gtkmain.c	2006-06-19 07:56:40 UTC (rev 16290)
@@ -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/v2_0_0/src/util.c
===================================================================
--- branches/v2_0_0/src/util.c	2006-06-19 06:39:11 UTC (rev 16289)
+++ branches/v2_0_0/src/util.c	2006-06-19 07:56:40 UTC (rev 16290)
@@ -1342,7 +1342,7 @@
 								face = g_string_append_c(face, *q);
 								q++;
 							}
-							g_string_append_printf(style, "font-family: %s; ", face->str);
+							g_string_append_printf(style, "font-family: %s; ", g_strstrip(face->str));
 							g_string_free(face, TRUE);
 							p = q;
 						} else if(!g_ascii_strncasecmp(p, "size=", strlen("size="))) {
@@ -1392,7 +1392,7 @@
 					pt->dest_tag = "span";
 					tags = g_list_prepend(tags, pt);
 					if(style->len)
-						g_string_append_printf(xhtml, "<span style='%s'>", style->str);
+						g_string_append_printf(xhtml, "<span style='%s'>", g_strstrip(style->str));
 					else
 						pt->ignore = TRUE;
 					g_string_free(style, TRUE);
@@ -1412,7 +1412,7 @@
 								color = g_string_append_c(color, *q);
 								q++;
 							}
-							g_string_append_printf(xhtml, "<span style='background: %s;'>", color->str);
+							g_string_append_printf(xhtml, "<span style='background: %s;'>", g_strstrip(color->str));
 							g_string_free(color, TRUE);
 							if ((c = strchr(c, '>')) != NULL)
 								c++;

Modified: branches/v2_0_0/src/xmlnode.c
===================================================================
--- branches/v2_0_0/src/xmlnode.c	2006-06-19 06:39:11 UTC (rev 16289)
+++ branches/v2_0_0/src/xmlnode.c	2006-06-19 07:56:40 UTC (rev 16290)
@@ -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.

[Gaim-commits] SF.net SVN: gaim: [16289] branches/v2_0_0/src/protocols/irc/cmds.c

[<the...@us...>]

Revision: 16289
Author:   thekingant
Date:     2006-06-18 23:39:11 -0700 (Sun, 18 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16289&view=rev

Log Message:
-----------
When the /quit command is used on IRC, we disconnect the account.
This avoids having Gaim think the server kicked us offline.  And
it avoids Gaim auto-reconnecting.

Modified Paths:
--------------
    branches/v2_0_0/src/protocols/irc/cmds.c
Modified: branches/v2_0_0/src/protocols/irc/cmds.c
===================================================================
--- branches/v2_0_0/src/protocols/irc/cmds.c	2006-06-19 06:38:12 UTC (rev 16288)
+++ branches/v2_0_0/src/protocols/irc/cmds.c	2006-06-19 06:39:11 UTC (rev 16289)
@@ -372,6 +372,8 @@
 		g_free(buf);
 
 		irc->quitting = TRUE;
+
+		gaim_account_set_status(irc->account, "offline", TRUE, NULL);
 	}
 
 	return 0;


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

[Gaim-commits] SF.net SVN: gaim: [16288] branches/v2_0_0/src/gtksavedstatuses.c

[<the...@us...>]

Revision: 16288
Author:   thekingant
Date:     2006-06-18 23:38:12 -0700 (Sun, 18 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16288&view=rev

Log Message:
-----------
Fix a bug interalia just pointed out in #gaim.  Unchecking a
substatus in the saved status editor would not actually
get rid of that substatus.

Modified Paths:
--------------
    branches/v2_0_0/src/gtksavedstatuses.c
Modified: branches/v2_0_0/src/gtksavedstatuses.c
===================================================================
--- branches/v2_0_0/src/gtksavedstatuses.c	2006-06-19 06:31:11 UTC (rev 16287)
+++ branches/v2_0_0/src/gtksavedstatuses.c	2006-06-19 06:38:12 UTC (rev 16288)
@@ -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));


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

[Gaim-commits] SF.net SVN: gaim: [16287] trunk/src

[<rl...@us...>]

Revision: 16287
Author:   rlaager
Date:     2006-06-18 23:31:11 -0700 (Sun, 18 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16287&view=rev

Log Message:
-----------
SF Patch #1503847 from Sadrul

"This patch "contactizes" the send history in a
conversation, ie. with this patch you can get the
previously sent messages by pressing ctrl+up/down after
switching the account during a contactized conversation."

Modified Paths:
--------------
    trunk/plugins/ChangeLog.API
    trunk/plugins/perl/common/Conversation.xs
    trunk/src/conversation.c
    trunk/src/conversation.h
    trunk/src/gtkconv.c
    trunk/src/gtkconv.h
Modified: trunk/plugins/ChangeLog.API
===================================================================
--- trunk/plugins/ChangeLog.API	2006-06-19 06:27:18 UTC (rev 16286)
+++ trunk/plugins/ChangeLog.API	2006-06-19 06:31:11 UTC (rev 16287)
@@ -173,6 +173,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: trunk/plugins/perl/common/Conversation.xs
===================================================================
--- trunk/plugins/perl/common/Conversation.xs	2006-06-19 06:27:18 UTC (rev 16286)
+++ trunk/plugins/perl/common/Conversation.xs	2006-06-19 06:31:11 UTC (rev 16287)
@@ -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
 

Modified: trunk/src/conversation.c
===================================================================
--- trunk/src/conversation.c	2006-06-19 06:27:18 UTC (rev 16286)
+++ trunk/src/conversation.c	2006-06-19 06:31:11 UTC (rev 16287)
@@ -263,7 +263,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,17 +418,6 @@
 	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);
@@ -708,14 +696,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)
 {

Modified: trunk/src/conversation.h
===================================================================
--- trunk/src/conversation.h	2006-06-19 06:27:18 UTC (rev 16286)
+++ trunk/src/conversation.h	2006-06-19 06:31:11 UTC (rev 16287)
@@ -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.

Modified: trunk/src/gtkconv.c
===================================================================
--- trunk/src/gtkconv.c	2006-06-19 06:27:18 UTC (rev 16286)
+++ trunk/src/gtkconv.c	2006-06-19 06:31:11 UTC (rev 16287)
@@ -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 {
@@ -4347,6 +4342,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 +4511,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: trunk/src/gtkconv.h
===================================================================
--- trunk/src/gtkconv.h	2006-06-19 06:27:18 UTC (rev 16286)
+++ trunk/src/gtkconv.h	2006-06-19 06:31:11 UTC (rev 16287)
@@ -114,6 +114,7 @@
 {
 	GaimConversation *active_conv;
 	GList *convs;
+	GList *send_history;
 
 	GaimGtkWindow *win;
 


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

[Gaim-commits] SF.net SVN: gaim: [16286] trunk/src/protocols/irc/cmds.c

[<the...@us...>]

Revision: 16286
Author:   thekingant
Date:     2006-06-18 23:27:18 -0700 (Sun, 18 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16286&view=rev

Log Message:
-----------
When the /quit command is used on IRC, we disconnect the account.
This avoids having Gaim think the server kicked us offline.  And
it avoids Gaim auto-reconnecting.

Modified Paths:
--------------
    trunk/src/protocols/irc/cmds.c
Modified: trunk/src/protocols/irc/cmds.c
===================================================================
--- trunk/src/protocols/irc/cmds.c	2006-06-19 06:23:20 UTC (rev 16285)
+++ trunk/src/protocols/irc/cmds.c	2006-06-19 06:27:18 UTC (rev 16286)
@@ -372,6 +372,8 @@
 		g_free(buf);
 
 		irc->quitting = TRUE;
+
+		gaim_account_set_status(irc->account, "offline", TRUE, NULL);
 	}
 
 	return 0;


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

[Gaim-commits] SF.net SVN: gaim: [16285] trunk/src/ft.c

[<rl...@us...>]

Revision: 16285
Author:   rlaager
Date:     2006-06-18 23:23:20 -0700 (Sun, 18 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16285&view=rev

Log Message:
-----------
Fix a case of a file transfer "system message" notification where we were not looking up an alias like everywhere else in this file.

Modified Paths:
--------------
    trunk/src/ft.c
Modified: trunk/src/ft.c
===================================================================
--- trunk/src/ft.c	2006-06-19 06:22:26 UTC (rev 16284)
+++ trunk/src/ft.c	2006-06-19 06:23:20 UTC (rev 16285)
@@ -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 */


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

[Gaim-commits] SF.net SVN: gaim: [16284] trunk/src/gtksavedstatuses.c

[<the...@us...>]

Revision: 16284
Author:   thekingant
Date:     2006-06-18 23:22:26 -0700 (Sun, 18 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16284&view=rev

Log Message:
-----------
Fix a bug interalia just pointed out in #gaim.  Unchecking a
substatus in the saved status editor would not actually
get rid of that substatus.

Modified Paths:
--------------
    trunk/src/gtksavedstatuses.c
Modified: trunk/src/gtksavedstatuses.c
===================================================================
--- trunk/src/gtksavedstatuses.c	2006-06-19 05:57:11 UTC (rev 16283)
+++ trunk/src/gtksavedstatuses.c	2006-06-19 06:22:26 UTC (rev 16284)
@@ -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));


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

[Gaim-commits] SF.net SVN: gaim: [16283] trunk

[<rl...@us...>]

Revision: 16283
Author:   rlaager
Date:     2006-06-18 22:57:11 -0700 (Sun, 18 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16283&view=rev

Log Message:
-----------
SF Patch #1500688 from Brian Chu (roast)

He already committed this to his soc-2006-file-loggers branch.

Here's the patch description:

In util.c, gaim_markup_html_to_xhtml() doesn't trim
spaces of parsed background colors, parsed font names,
or the end result for styles (which inserted spaces for
the purpose of many span.style attributes).

For example, things like this get written to the log:

<span style='font-size: small; '>

Things like the following this _can_ written to the log
given a tag like this:

<font face=" Comic Sans MS ">
<span style='font-family: Comic Sans MS
; '>

Same for: <body bgcolor=" Red ">
<span style='background: Red ;'>

Modified Paths:
--------------
    trunk/COPYRIGHT
    trunk/src/util.c
Modified: trunk/COPYRIGHT
===================================================================
--- trunk/COPYRIGHT	2006-06-19 05:39:30 UTC (rev 16282)
+++ trunk/COPYRIGHT	2006-06-19 05:57:11 UTC (rev 16283)
@@ -51,6 +51,7 @@
 Christophe Chapuis
 Ka-Hing Cheung
 Sadrul Habib Chowdhury
+Brian Chu
 Arturo Cisneros, Jr.
 Vincas Ciziunas
 Jonathan Clark

Modified: trunk/src/util.c
===================================================================
--- trunk/src/util.c	2006-06-19 05:39:30 UTC (rev 16282)
+++ trunk/src/util.c	2006-06-19 05:57:11 UTC (rev 16283)
@@ -1342,7 +1342,7 @@
 								face = g_string_append_c(face, *q);
 								q++;
 							}
-							g_string_append_printf(style, "font-family: %s; ", face->str);
+							g_string_append_printf(style, "font-family: %s; ", g_strstrip(face->str));
 							g_string_free(face, TRUE);
 							p = q;
 						} else if(!g_ascii_strncasecmp(p, "size=", strlen("size="))) {
@@ -1392,7 +1392,7 @@
 					pt->dest_tag = "span";
 					tags = g_list_prepend(tags, pt);
 					if(style->len)
-						g_string_append_printf(xhtml, "<span style='%s'>", style->str);
+						g_string_append_printf(xhtml, "<span style='%s'>", g_strstrip(style->str));
 					else
 						pt->ignore = TRUE;
 					g_string_free(style, TRUE);
@@ -1412,7 +1412,7 @@
 								color = g_string_append_c(color, *q);
 								q++;
 							}
-							g_string_append_printf(xhtml, "<span style='background: %s;'>", color->str);
+							g_string_append_printf(xhtml, "<span style='background: %s;'>", g_strstrip(color->str));
 							g_string_free(color, TRUE);
 							if ((c = strchr(c, '>')) != NULL)
 								c++;


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

[Gaim-commits] SF.net SVN: gaim: [16282] trunk/src

[<rl...@us...>]

Revision: 16282
Author:   rlaager
Date:     2006-06-18 22:39:30 -0700 (Sun, 18 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16282&view=rev

Log Message:
-----------
SF Patch #1502594 from Yosef Radchenko

"Patches three instances of memory leaks with gaim_accounts_get_all_active"

Modified Paths:
--------------
    trunk/plugins/idle.c
    trunk/plugins/perl/common/Account.xs
    trunk/src/gtkmain.c
Modified: trunk/plugins/idle.c
===================================================================
--- trunk/plugins/idle.c	2006-06-19 05:17:54 UTC (rev 16281)
+++ trunk/plugins/idle.c	2006-06-19 05:39:30 UTC (rev 16282)
@@ -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: trunk/plugins/perl/common/Account.xs
===================================================================
--- trunk/plugins/perl/common/Account.xs	2006-06-19 05:17:54 UTC (rev 16281)
+++ trunk/plugins/perl/common/Account.xs	2006-06-19 05:39:30 UTC (rev 16282)
@@ -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: trunk/src/gtkmain.c
===================================================================
--- trunk/src/gtkmain.c	2006-06-19 05:17:54 UTC (rev 16281)
+++ trunk/src/gtkmain.c	2006-06-19 05:39:30 UTC (rev 16282)
@@ -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();


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

[Gaim-commits] SF.net SVN: gaim: [16281] trunk/src/gtkblist.c

[<rl...@us...>]

Revision: 16281
Author:   rlaager
Date:     2006-06-18 22:17:54 -0700 (Sun, 18 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16281&view=rev

Log Message:
-----------
SF Patch #1500640 from bsponline
Fixes SF Bug #1493888

The bug description is:

"These are the steps you need to take to reproduce the
 bug in beta3:
 1. expand a contact.
 2. re-arrange the protocol order for the contact.
 3. do NOT collapse the contact.
 4. hover over another contact.

 The other contact will auto-expand too, which it should
 not."

Modified Paths:
--------------
    trunk/src/gtkblist.c
Modified: trunk/src/gtkblist.c
===================================================================
--- trunk/src/gtkblist.c	2006-06-19 04:49:12 UTC (rev 16280)
+++ trunk/src/gtkblist.c	2006-06-19 05:17:54 UTC (rev 16281)
@@ -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;


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

[Gaim-commits] SF.net SVN: gaim: [16280] trunk/src/xmlnode.c

[<rl...@us...>]

Revision: 16280
Author:   rlaager
Date:     2006-06-18 21:49:12 -0700 (Sun, 18 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16280&view=rev

Log Message:
-----------
Kill this warning when using libxml:
	xmlnode.c:560: warning: unused variable ?\226?\128?\152context?\226?\128?\153

Modified Paths:
--------------
    trunk/src/xmlnode.c
Modified: trunk/src/xmlnode.c
===================================================================
--- trunk/src/xmlnode.c	2006-06-19 04:48:50 UTC (rev 16279)
+++ trunk/src/xmlnode.c	2006-06-19 04:49:12 UTC (rev 16280)
@@ -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.

[Gaim-commits] SF.net SVN: gaim: [16279] trunk/src/gtkstatusbox.c

[<rl...@us...>]

Revision: 16279
Author:   rlaager
Date:     2006-06-18 21:48:50 -0700 (Sun, 18 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16279&view=rev

Log Message:
-----------
SF Patch #1508370 from Sadrul

"I had overlooked the changes that were necessary to
 behave properly when Escape is pressed in the
 per-account status selectors. This patch amends that."

Modified Paths:
--------------
    trunk/src/gtkstatusbox.c
Modified: trunk/src/gtkstatusbox.c
===================================================================
--- trunk/src/gtkstatusbox.c	2006-06-18 22:46:32 UTC (rev 16278)
+++ trunk/src/gtkstatusbox.c	2006-06-19 04:48:50 UTC (rev 16279)
@@ -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;
 	}
 	


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

[Gaim-commits] SF.net SVN: gaim: [16278] branches/soc-2006-file-loggers/src/log.c

[<ro...@us...>]

Revision: 16278
Author:   roast
Date:     2006-06-18 15:46:32 -0700 (Sun, 18 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16278&view=rev

Log Message:
-----------
logging now truncates and writes logfiles; added code to eliminate collisions.

Modified Paths:
--------------
    branches/soc-2006-file-loggers/src/log.c
Modified: branches/soc-2006-file-loggers/src/log.c
===================================================================
--- branches/soc-2006-file-loggers/src/log.c	2006-06-18 20:21:42 UTC (rev 16277)
+++ branches/soc-2006-file-loggers/src/log.c	2006-06-18 22:46:32 UTC (rev 16278)
@@ -687,13 +687,37 @@
 					   date, tz, ext ? ext : "");
 
 		path = g_build_filename(dir, filename, NULL);
-		g_free(tz);
-		g_free(dir);
 		g_free(filename);
 
+		/* since we're truncating now, test if file exists. if so, append ".[a-z]" to filename and stop */
+		if (g_file_test(path, G_FILE_TEST_EXISTS)) {
+			char suffixchar = 'a';
+			
+			do {
+				g_free(path);
+				filename = g_strdup_printf("%s_%s%s.%c%s",
+							   gaim_escape_filename(gaim_normalize(log->account, log->name)),
+							   date, tz, suffixchar, ext ? ext : "");
+				path = g_build_filename(dir, filename, NULL);
+				g_free(filename);
+
+				suffixchar++;
+			} while (g_file_test(path, G_FILE_TEST_EXISTS) && suffixchar <= 'z');
+
+			if (suffixchar == 'z' && g_file_test(path, G_FILE_TEST_EXISTS)) {
+				/* we have a collision problem. not logging, and complain. */
+				gaim_conversation_write(log->conv, NULL, _("Logging of this conversation failed."),
+										GAIM_MESSAGE_ERROR, time(NULL));
+				g_free(tz);
+				g_free(dir);
+				g_free(path);
+				return;
+			}
+		}
+
 		log->logger_data = data = g_slice_new0(GaimLogCommonLoggerData);
 
-		data->file = g_fopen(path, "a");
+		data->file = g_fopen(path, "w+");
 		if (data->file == NULL)
 		{
 			gaim_debug(GAIM_DEBUG_ERROR, "log",
@@ -702,6 +726,8 @@
 			if (log->conv != NULL)
 				gaim_conversation_write(log->conv, NULL, _("Logging of this conversation failed."),
 										GAIM_MESSAGE_ERROR, time(NULL));
+			g_free(tz);
+			g_free(dir);
 			g_free(path);
 			return;
 		}


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

[Gaim-commits] SF.net SVN: gaim: [16277] branches/soc-2006-file-loggers/src/log.c

[<ro...@us...>]

Revision: 16277
Author:   roast
Date:     2006-06-18 13:21:42 -0700 (Sun, 18 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16277&view=rev

Log Message:
-----------
GaimLogCommonData.path gets set in gaim_log_common_writer now; last commit put it in the wrong place

Modified Paths:
--------------
    branches/soc-2006-file-loggers/src/log.c
Modified: branches/soc-2006-file-loggers/src/log.c
===================================================================
--- branches/soc-2006-file-loggers/src/log.c	2006-06-18 20:19:51 UTC (rev 16276)
+++ branches/soc-2006-file-loggers/src/log.c	2006-06-18 20:21:42 UTC (rev 16277)
@@ -702,10 +702,11 @@
 			if (log->conv != NULL)
 				gaim_conversation_write(log->conv, NULL, _("Logging of this conversation failed."),
 										GAIM_MESSAGE_ERROR, time(NULL));
-			data->path = g_strndup(path, strlen(path));
 			g_free(path);
 			return;
 		}
+
+		data->path = g_strndup(path, strlen(path));
 		g_free(path);
 	}
 }


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

[Gaim-commits] SF.net SVN: gaim: [16276] branches/soc-2006-file-loggers/src/log.c

[<ro...@us...>]

Revision: 16276
Author:   roast
Date:     2006-06-18 13:19:51 -0700 (Sun, 18 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16276&view=rev

Log Message:
-----------
GaimLogCommonData.path gets set in gaim_log_common_writer now

Modified Paths:
--------------
    branches/soc-2006-file-loggers/src/log.c
Modified: branches/soc-2006-file-loggers/src/log.c
===================================================================
--- branches/soc-2006-file-loggers/src/log.c	2006-06-18 20:12:53 UTC (rev 16275)
+++ branches/soc-2006-file-loggers/src/log.c	2006-06-18 20:19:51 UTC (rev 16276)
@@ -702,7 +702,7 @@
 			if (log->conv != NULL)
 				gaim_conversation_write(log->conv, NULL, _("Logging of this conversation failed."),
 										GAIM_MESSAGE_ERROR, time(NULL));
-
+			data->path = g_strndup(path, strlen(path));
 			g_free(path);
 			return;
 		}


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

[Gaim-commits] SF.net SVN: gaim: [16275] branches/soc-2006-file-loggers/src/log.c

[<ro...@us...>]

Revision: 16275
Author:   roast
Date:     2006-06-18 13:12:53 -0700 (Sun, 18 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16275&view=rev

Log Message:
-----------
xml logger flushes a well-formed xml file

Modified Paths:
--------------
    branches/soc-2006-file-loggers/src/log.c
Modified: branches/soc-2006-file-loggers/src/log.c
===================================================================
--- branches/soc-2006-file-loggers/src/log.c	2006-06-18 02:03:08 UTC (rev 16274)
+++ branches/soc-2006-file-loggers/src/log.c	2006-06-18 20:12:53 UTC (rev 16275)
@@ -1056,11 +1056,21 @@
 	}
 
 	g_free(msg_fixed);
-	fflush(data->file);
 
-	// TODO: haven't written end of file and seeked back
-	// TODO: this is to keep a valid XML document out of the user space buffer
+	// append suffix to file and seek back to keep a valid XML document out of the user space buffer
+	{
+		int tail = 0;
+		const char *date = gaim_utf8_strftime("%F %T%z", localtime(NULL));
 
+		tail += fprintf(data->file, "\t<event time=\"%s\" type=\"logEnd\" />\n", date);
+		tail += fprintf(data->file, "</chat>\n");
+
+		if (fseek(data->file, -1*tail, SEEK_CUR) != 0) {
+			gaim_debug_error("log", "Could not seek backwards in logfile.");
+		}
+	}
+
+	fflush(data->file);
 	return written;
 }
 


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

[Gaim-commits] SF.net SVN: gaim: [16273] trunk/src/gaim_buffer.c

[<ebl...@us...>]

Revision: 16273
Author:   eblanton
Date:     2006-06-17 16:22:30 -0700 (Sat, 17 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16273&view=rev

Log Message:
-----------
This fixes a crash when gaim_circ_buffer_destroy is called with a NULL
circular buffer.  I'm using g_return_if_fail so it still reports a
warning, because it is possible that the circumstance in question
shouldn't even come up.  If that isn't the case, we can make it fail
silently.

Modified Paths:
--------------
    trunk/src/gaim_buffer.c
Modified: trunk/src/gaim_buffer.c
===================================================================
--- trunk/src/gaim_buffer.c	2006-06-17 02:11:13 UTC (rev 16272)
+++ trunk/src/gaim_buffer.c	2006-06-17 23:22:30 UTC (rev 16273)
@@ -34,6 +34,7 @@
 }
 
 void gaim_circ_buffer_destroy(GaimCircBuffer *buf) {
+	g_return_if_fail(buf);
 	g_free(buf->buffer);
 	g_free(buf);
 }


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

[Gaim-commits] SF.net SVN: gaim: [16272] branches/soc-2006-file-loggers

[<ro...@us...>]

Revision: 16272
Author:   roast
Date:     2006-06-16 19:11:13 -0700 (Fri, 16 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16272&view=rev

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

Modified Paths:
--------------
    branches/soc-2006-file-loggers/Makefile.mingw
    branches/soc-2006-file-loggers/config.h.mingw
    branches/soc-2006-file-loggers/configure.ac
    branches/soc-2006-file-loggers/gaim-installer.nsi
    branches/soc-2006-file-loggers/pixmaps/smileys/THEMES-HOWTO
    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_glib.c
    branches/soc-2006-file-loggers/plugins/tcl/tcl_signals.c
    branches/soc-2006-file-loggers/src/Makefile.am
    branches/soc-2006-file-loggers/src/Makefile.mingw
    branches/soc-2006-file-loggers/src/gtkblist.c
    branches/soc-2006-file-loggers/src/gtkdialogs.c
    branches/soc-2006-file-loggers/src/gtkutils.h
    branches/soc-2006-file-loggers/src/protocols/jabber/Makefile.am
    branches/soc-2006-file-loggers/src/protocols/jabber/Makefile.mingw
    branches/soc-2006-file-loggers/src/protocols/jabber/auth.c
    branches/soc-2006-file-loggers/src/protocols/jabber/buddy.c
    branches/soc-2006-file-loggers/src/protocols/jabber/chat.c
    branches/soc-2006-file-loggers/src/protocols/jabber/disco.c
    branches/soc-2006-file-loggers/src/protocols/jabber/iq.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/jabber/oob.c
    branches/soc-2006-file-loggers/src/protocols/jabber/parser.c
    branches/soc-2006-file-loggers/src/protocols/jabber/presence.c
    branches/soc-2006-file-loggers/src/protocols/jabber/roster.c
    branches/soc-2006-file-loggers/src/protocols/jabber/si.c
    branches/soc-2006-file-loggers/src/protocols/jabber/xdata.c
    branches/soc-2006-file-loggers/src/protocols/msn/userlist.c
    branches/soc-2006-file-loggers/src/protocols/oscar/oscar.c
    branches/soc-2006-file-loggers/src/protocols/yahoo/yahoo_packet.c
    branches/soc-2006-file-loggers/src/xmlnode.c
    branches/soc-2006-file-loggers/src/xmlnode.h
Modified: branches/soc-2006-file-loggers/Makefile.mingw
===================================================================
--- branches/soc-2006-file-loggers/Makefile.mingw	2006-06-17 01:33:09 UTC (rev 16271)
+++ branches/soc-2006-file-loggers/Makefile.mingw	2006-06-17 02:11:13 UTC (rev 16272)
@@ -12,6 +12,7 @@
 GAIM_SOUNDS = ./sounds
 GAIM_INSTALL_DIR = ./win32-install-dir
 GTKSPELL_TOP = ../win32-dev/gtkspell-2.0.6/gtkspell
+LIBXML2_DIR = ../win32-dev/libxml2
 IDLETRACK_TOP = $(GAIM_SRC)/win32/IdleTracker
 GTKRC_TOP = ../win32-dev/gtkrc
 OSCAR = $(GAIM_PROTOS)/oscar
@@ -33,7 +34,8 @@
 VERSION := $(shell cat ./VERSION)
 
 NEEDED_DLLS =		$(GTKSPELL_TOP)/libgtkspell.dll \
-			$(IDLETRACK_TOP)/idletrack.dll
+			$(IDLETRACK_TOP)/idletrack.dll \
+			$(LIBXML2_DIR)/bin/libxml2.dll
 
 SOUNDS =		$(GAIM_SOUNDS)/alert.wav \
 			$(GAIM_SOUNDS)/login.wav \

Modified: branches/soc-2006-file-loggers/config.h.mingw
===================================================================
--- branches/soc-2006-file-loggers/config.h.mingw	2006-06-17 01:33:09 UTC (rev 16271)
+++ branches/soc-2006-file-loggers/config.h.mingw	2006-06-17 02:11:13 UTC (rev 16272)
@@ -635,6 +635,8 @@
    <inttypes.h> don't define. */
 /* #undef uintmax_t */
 
+#define HAVE_LIBXML 1
+
 /*
  * Following are added for Win32 version of Gaim
  */

Modified: branches/soc-2006-file-loggers/configure.ac
===================================================================
--- branches/soc-2006-file-loggers/configure.ac	2006-06-17 01:33:09 UTC (rev 16271)
+++ branches/soc-2006-file-loggers/configure.ac	2006-06-17 02:11:13 UTC (rev 16272)
@@ -171,6 +171,18 @@
   AC_DEFINE(USE_GSTREAMER, 1, [Use GStreamer for making sounds])
 fi
 
+dnl #################
+dnl # LibXML2
+dnl #################
+enable_libxml2=yes
+PKG_CHECK_MODULES(LIBXML, libxml-2.0, ,enable_libxml2=no)
+AC_SUBST(LIBXML_CFLAGS)
+AC_SUBST(LIBXML_LIBS)
+AC_ARG_ENABLE(libxml,[  --disable-libxml     compile without libxml2 support],enable_libxml2=no)
+if test "x$enable_libxml2" = "xyes"; then
+	AC_DEFINE(HAVE_LIBXML, 1, [Use libxml2 for xml parsing])
+fi
+
 dnl #######################################################################
 dnl # Check for Meanwhile headers (for Sametime)
 dnl #######################################################################
@@ -306,8 +318,8 @@
 dnl #######################################################################
 dnl # Check for Gadu-Gadu client includes and libraries
 dnl #######################################################################
-AC_ARG_WITH(gadu-includes, [AC_HELP_STRING([--with-gadu-includes=DIR], [compile the GaduGadu plugin against includes in DIR])], [ac_gadu_includes="$withval"], [ac_gadu_includes="no"])
-AC_ARG_WITH(gadu-libs, [AC_HELP_STRING([--with-gadu-libs=DIR], [compile the GaduGadu plugin against the libs in DIR])], [ac_gadu_libs="$withval"], [ac_gadu_libs="no"])
+AC_ARG_WITH(gadu-includes, [AC_HELP_STRING([--with-gadu-includes=DIR], [compile the Gadu-Gadu plugin against includes in DIR])], [ac_gadu_includes="$withval"], [ac_gadu_includes="no"])
+AC_ARG_WITH(gadu-libs, [AC_HELP_STRING([--with-gadu-libs=DIR], [compile the Gadu-Gadu plugin against the libs in DIR])], [ac_gadu_libs="$withval"], [ac_gadu_libs="no"])
 GADU_CFLAGS=""
 GADU_LIBS=""
 if test -n "$with_gadu_includes" || test -n "$with_gadu_libs"; then
@@ -1060,7 +1072,7 @@
 dnl These two are inverses of each other <-- stolen from evolution!
 
 AC_ARG_ENABLE(gnutls,
-	[  --enable-gnutls=[yes,no]  attempt to use GNUTLS for SSL support (preferred) [default=yes]],
+	[  --enable-gnutls=[yes,no]  attempt to use GnuTLS for SSL support (preferred) [default=yes]],
 	[enable_gnutls="$enableval"],
 	[enable_gnutls="yes"])
 
@@ -1072,14 +1084,14 @@
 msg_ssl="None (MSN will not work without SSL!)"
 
 dnl #
-dnl # Check for GNUTLS if it's specified.
+dnl # Check for GnuTLS if it's specified.
 dnl #
 if test "x$enable_gnutls" != "xno"; then
 	enable_gnutls="no"
 	prefix=`eval echo $prefix`
 
 	AC_ARG_WITH(gnutls-includes,
-		[  --with-gnutls-includes=PREFIX   location of GNUTLS includes.],
+		[  --with-gnutls-includes=PREFIX   location of GnuTLS includes.],
 		[ with_gnutls_includes="$withval" ],
 		[ with_gnutls_includes="$prefix/include" ])
 
@@ -1088,7 +1100,7 @@
 	if test "x$with_gnutls_includes" != "xno"; then
 		CPPFLAGS_save="$CPPFLAGS"
 
-		AC_MSG_CHECKING(for GNUTLS includes)
+		AC_MSG_CHECKING(for GnuTLS includes)
 		AC_MSG_RESULT("")
 
 		CPPFLAGS="$CPPFLAGS -I$with_gnutls_includes"
@@ -1104,12 +1116,12 @@
 			GNUTLS_CFLAGS=""
 		fi
 	else
-		AC_MSG_CHECKING(for GNUTLS includes)
+		AC_MSG_CHECKING(for GnuTLS includes)
 		AC_MSG_RESULT(no)
 	fi
 
 	AC_ARG_WITH(gnutls-libs,
-		[  --with-gnutls-libs=PREFIX       location of GNUTLS libraries.],
+		[  --with-gnutls-libs=PREFIX       location of GnuTLS libraries.],
 		[ with_gnutls_libs="$withval" ])
 
 	if test "x$with_gnutls_libs"     != "xno" -a \
@@ -1122,7 +1134,7 @@
 			*) with_gnutls_libs="-L$with_gnutls_libs" ;;
 		esac
 
-		AC_CACHE_CHECK([for GNUTLS libraries], gnutls_libs,
+		AC_CACHE_CHECK([for GnuTLS libraries], gnutls_libs,
 		[
 			LDFLAGS="$LDFLAGS $with_gnutls_libs -lgnutls -lgcrypt"
 			AC_TRY_LINK_FUNC(gnutls_init, gnutls_libs="yes", gnutls_libs="no")
@@ -1130,9 +1142,9 @@
 		])
 
 		if test "x$gnutls_libs" != "xno"; then
-			AC_DEFINE(HAVE_GNUTLS, 1, [Define if you have GNUTLS])
+			AC_DEFINE(HAVE_GNUTLS, 1, [Define if you have GnuTLS])
 			AC_DEFINE(HAVE_SSL)
-			msg_gnutls="GNUTLS"
+			msg_gnutls="GnuTLS"
 			GNUTLS_LIBS="$with_gnutls_libs -lgnutls -lgcrypt"
 
 			enable_gnutls="yes"
@@ -1141,7 +1153,7 @@
 			GNUTLS_LIBS=""
 		fi
 	else
-		AC_MSG_CHECKING(for GNUTLS libraries)
+		AC_MSG_CHECKING(for GnuTLS libraries)
 		AC_MSG_RESULT(no)
 	fi
 else
@@ -1156,7 +1168,7 @@
 
 
 dnl #
-dnl # Check for NSS if it's specified, or if GNUTLS checks failed.
+dnl # Check for NSS if it's specified, or if GnuTLS checks failed.
 dnl #
 if test "x$enable_nss" != "xno"; then
 
@@ -1785,6 +1797,7 @@
 eval echo DBUS servies directory........ : $DBUS_SERVICES_DIR
 fi
 echo Build with Cyrus SASL support. : $enable_cyrus_sasl
+echo Build with libxml2 support.... : $enable_libxml2
 echo Has you....................... : yes
 echo
 echo

Modified: branches/soc-2006-file-loggers/gaim-installer.nsi
===================================================================
--- branches/soc-2006-file-loggers/gaim-installer.nsi	2006-06-17 01:33:09 UTC (rev 16271)
+++ branches/soc-2006-file-loggers/gaim-installer.nsi	2006-06-17 02:11:13 UTC (rev 16272)
@@ -744,6 +744,7 @@
     Delete "$INSTDIR\idletrack.dll"
     Delete "$INSTDIR\libgtkspell.dll"
     Delete "$INSTDIR\libmeanwhile-1.dll"
+    Delete "$INSTDIR\libxml2.dll"
     Delete "$INSTDIR\nspr4.dll"
     Delete "$INSTDIR\nss3.dll"
     Delete "$INSTDIR\nssckbi.dll"

Modified: branches/soc-2006-file-loggers/pixmaps/smileys/THEMES-HOWTO
===================================================================
--- branches/soc-2006-file-loggers/pixmaps/smileys/THEMES-HOWTO	2006-06-17 01:33:09 UTC (rev 16271)
+++ branches/soc-2006-file-loggers/pixmaps/smileys/THEMES-HOWTO	2006-06-17 02:11:13 UTC (rev 16272)
@@ -4,10 +4,8 @@
 
 Version 0.60 of Gaim brings up all themable smileys.  In the preferences dialog, a user can choose from a selection of looks his smileys will take.  This guide is to serve as a reference to those interested in creating third-party smiley themes.  
 
-(SME: I'm doing this at 6:30AM; I'm tired, but I can't sleep.  Someone make sure I fix this up to make sure it all makes sense when I'm not tired anymore.  Right now it's mostly just unassembled thoughts)
+Your theme should be contained in a single directory.  This directory will be installed in the Gaim smiley theme directory ($HOME/.gaim/smileys/).  This directory will contain a file called `theme' that specifies the theme metadata and image files that are used by the theme.  The format of the `theme' file is as follows.
 
-Your theme should be contained in a single directory.  This directory will be installed in the Gaim smiley theme directory (SME: There should probably be a $HOME/.gaim/smileys/ that the theme could go in too.).  This directory will contain a file called `theme' that specifies the theme and image (SME: And possibly sound) files that are used by the theme.  The format of the `theme' file is as follows.
-
 The beginning of the file contains some metainformation about the theme in the format
 
 Key=Value
@@ -19,10 +17,16 @@
 Author - The author's name
 
 Following this meta-information are "sml" groups.  A "sml" group is a group of smileys that will be shown together.  For example, each protocol has its own "sml" group (MSN, Yahoo, Gadu-Gadu, etc.).  The name of the group is surrounded in square brackets, and each line beneath it (until the next sml group or the end of the file) defines a smiley.
-Each line of the group starts with a filename of the icon (SME: Or sound?) followed by a space-delimited list of the characters that represent it. 
+Each line of the group starts with a filename of the icon followed by a space-delimited list of the characters that represent it. 
 
 Example:
 [AIM/ICQ]
 smiley.png  :) :-)
 
 In the smiley selector UI, each icon will only be shown once, and the first string representing it will be used.  To keep a smiley out of the selector altogether, make the first two characters of the line "! " followed by the filename and emoticons.
+
+As of 2.0.0beta2, spaces and backslashes in the "list of characters" (see above) must be escaped by prepending them with a backslash.  For example, to define a smiley that is represented by ":-/" and ":-\", use:
+
+[AIM/ICQ]
+think.png	:-/	:-\\
+

Modified: branches/soc-2006-file-loggers/plugins/tcl/Makefile.am
===================================================================
--- branches/soc-2006-file-loggers/plugins/tcl/Makefile.am	2006-06-17 01:33:09 UTC (rev 16271)
+++ branches/soc-2006-file-loggers/plugins/tcl/Makefile.am	2006-06-17 02:11:13 UTC (rev 16272)
@@ -4,7 +4,8 @@
 
 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_la_SOURCES = tcl.c tcl_glib.c tcl_glib.h tcl_cmds.c tcl_signals.c tcl_gaim.h \
+                 tcl_ref.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-17 01:33:09 UTC (rev 16271)
+++ branches/soc-2006-file-loggers/plugins/tcl/Makefile.mingw	2006-06-17 02:11:13 UTC (rev 16272)
@@ -63,6 +63,7 @@
 C_SRC =			tcl.c \
 			tcl_cmds.c \
 			tcl_glib.c \
+			tcl_ref.c \
 			tcl_signals.c
 
 

Modified: branches/soc-2006-file-loggers/plugins/tcl/tcl.c
===================================================================
--- branches/soc-2006-file-loggers/plugins/tcl/tcl.c	2006-06-17 01:33:09 UTC (rev 16271)
+++ branches/soc-2006-file-loggers/plugins/tcl/tcl.c	2006-06-17 02:11:13 UTC (rev 16272)
@@ -50,6 +50,15 @@
 	Tcl_Interp *interp;
 };
 
+GaimStringref *GaimTclRefAccount;
+GaimStringref *GaimTclRefConnection;
+GaimStringref *GaimTclRefConversation;
+GaimStringref *GaimTclRefPointer;
+GaimStringref *GaimTclRefPresence;
+GaimStringref *GaimTclRefStatus;
+GaimStringref *GaimTclRefStatusAttr;
+GaimStringref *GaimTclRefStatusType;
+
 static GHashTable *tcl_plugins = NULL;
 
 GaimPlugin *_tcl_plugin;
@@ -123,8 +132,12 @@
 	Tcl_CreateObjCommand(interp, "::gaim::debug", tcl_cmd_debug, (ClientData)NULL, NULL);
 	Tcl_CreateObjCommand(interp, "::gaim::notify", tcl_cmd_notify, (ClientData)NULL, NULL);
 	Tcl_CreateObjCommand(interp, "::gaim::prefs", tcl_cmd_prefs, (ClientData)NULL, NULL);
+	Tcl_CreateObjCommand(interp, "::gaim::presence", tcl_cmd_presence, (ClientData)NULL, NULL);
 	Tcl_CreateObjCommand(interp, "::gaim::send_im", tcl_cmd_send_im, (ClientData)NULL, NULL);
 	Tcl_CreateObjCommand(interp, "::gaim::signal", tcl_cmd_signal, (ClientData)NULL, NULL);
+	Tcl_CreateObjCommand(interp, "::gaim::status", tcl_cmd_status, (ClientData)NULL, NULL);
+	Tcl_CreateObjCommand(interp, "::gaim::status_attr", tcl_cmd_status_attr, (ClientData)NULL, NULL);
+	Tcl_CreateObjCommand(interp, "::gaim::status_type", tcl_cmd_status_type, (ClientData)NULL, NULL);
 	Tcl_CreateObjCommand(interp, "::gaim::unload", tcl_cmd_unload, (ClientData)NULL, NULL);
 
 	return 0;
@@ -329,6 +342,17 @@
 		return FALSE;
 	tcl_glib_init();
 	tcl_signal_init();
+	gaim_tcl_ref_init();
+
+	GaimTclRefAccount = gaim_stringref_new("Account");
+	GaimTclRefConnection = gaim_stringref_new("Connection");
+	GaimTclRefConversation = gaim_stringref_new("Conversation");
+	GaimTclRefPointer = gaim_stringref_new("Pointer");
+	GaimTclRefPresence = gaim_stringref_new("Presence");
+	GaimTclRefStatus = gaim_stringref_new("Status");
+	GaimTclRefStatusAttr = gaim_stringref_new("StatusAttr");
+	GaimTclRefStatusType = gaim_stringref_new("StatusType");
+
 	tcl_plugins = g_hash_table_new(g_direct_hash, g_direct_equal);
 
 #ifdef HAVE_TK
@@ -343,6 +367,15 @@
 	g_hash_table_destroy(tcl_plugins);
 	tcl_plugins = NULL;
 
+	gaim_stringref_unref(GaimTclRefAccount);
+	gaim_stringref_unref(GaimTclRefConnection);
+	gaim_stringref_unref(GaimTclRefConversation);
+	gaim_stringref_unref(GaimTclRefPointer);
+	gaim_stringref_unref(GaimTclRefPresence);
+	gaim_stringref_unref(GaimTclRefStatus);
+	gaim_stringref_unref(GaimTclRefStatusAttr);
+	gaim_stringref_unref(GaimTclRefStatusType);
+
 	return TRUE;
 }
 

Modified: branches/soc-2006-file-loggers/plugins/tcl/tcl_cmds.c
===================================================================
--- branches/soc-2006-file-loggers/plugins/tcl/tcl_cmds.c	2006-06-17 01:33:09 UTC (rev 16271)
+++ branches/soc-2006-file-loggers/plugins/tcl/tcl_cmds.c	2006-06-17 02:11:13 UTC (rev 16272)
@@ -35,61 +35,91 @@
 
 #include "tcl_gaim.h"
 
-static gboolean tcl_validate_account(GaimAccount *account, Tcl_Interp *interp);
-static gboolean tcl_validate_conversation(GaimConversation *convo, Tcl_Interp *interp);
-static gboolean tcl_validate_gc(GaimConnection *gc);
+static GaimAccount *tcl_validate_account(Tcl_Obj *obj, Tcl_Interp *interp);
+static GaimConversation *tcl_validate_conversation(Tcl_Obj *obj, Tcl_Interp *interp);
+static GaimConnection *tcl_validate_gc(Tcl_Obj *obj, Tcl_Interp *interp);
 
-static gboolean tcl_validate_account(GaimAccount *account, Tcl_Interp *interp)
+static GaimAccount *tcl_validate_account(Tcl_Obj *obj, Tcl_Interp *interp)
 {
+	GaimAccount *account;
 	GList *cur;
+
+	account = gaim_tcl_ref_get(interp, obj, GaimTclRefAccount);
+
+	if (account == NULL)
+		return NULL;
+
 	for (cur = gaim_accounts_get_all(); cur != NULL; cur = g_list_next(cur)) {
 		if (account == cur->data)
-			return TRUE;
+			return account;
 	}
 	if (interp != NULL)
 		Tcl_SetStringObj(Tcl_GetObjResult(interp), "invalid account", -1);
-	return FALSE;
+	return NULL;
 }
 
-static gboolean tcl_validate_conversation(GaimConversation *convo, Tcl_Interp *interp)
+static GaimConversation *tcl_validate_conversation(Tcl_Obj *obj, Tcl_Interp *interp)
 {
+	GaimConversation *convo;
 	GList *cur;
 
+	convo = gaim_tcl_ref_get(interp, obj, GaimTclRefConversation);
+
+	if (convo == NULL)
+		return NULL;
+
 	for (cur = gaim_get_conversations(); cur != NULL; cur = g_list_next(cur)) {
 		if (convo == cur->data)
-			return TRUE;
+			return convo;
 	}
 	if (interp != NULL)
 		Tcl_SetStringObj(Tcl_GetObjResult(interp), "invalid account", -1);
-	return FALSE;
+	return NULL;
 }
 
-static gboolean tcl_validate_gc(GaimConnection *gc)
+static GaimConnection *tcl_validate_gc(Tcl_Obj *obj, Tcl_Interp *interp)
 {
+	GaimConnection *gc;
 	GList *cur;
+
+	gc = gaim_tcl_ref_get(interp, obj, GaimTclRefConnection);
+
+	if (gc == NULL)
+		return NULL;
+
 	for (cur = gaim_connections_get_all(); cur != NULL; cur = g_list_next(cur)) {
 		if (gc == cur->data)
-			return TRUE;
+			return gc;
 	}
-	return FALSE;
+	return NULL;
 }
 
 int tcl_cmd_account(ClientData unused, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
 	Tcl_Obj *result = Tcl_GetObjResult(interp), *list, *elem;
-	const char *cmds[] = { "alias", "connect", "connection", "disconnect", "find",
-			 "handle", "isconnected", "list",
-			 "protocol", "username", NULL };
-	enum { CMD_ACCOUNT_ALIAS, CMD_ACCOUNT_CONNECT, CMD_ACCOUNT_CONNECTION,
-	       CMD_ACCOUNT_DISCONNECT, CMD_ACCOUNT_FIND, CMD_ACCOUNT_HANDLE,
-	       CMD_ACCOUNT_ISCONNECTED, CMD_ACCOUNT_LIST,
-	       CMD_ACCOUNT_PROTOCOL, CMD_ACCOUNT_USERNAME } cmd;
+	const char *cmds[] = { "alias", "connect", "connection", "disconnect",
+	                       "enabled", "find", "handle", "isconnected",
+	                       "list", "presence", "protocol", "status",
+	                       "status_type", "status_types", "username",
+	                       NULL };
+	enum { CMD_ACCOUNT_ALIAS,
+	       CMD_ACCOUNT_CONNECT, CMD_ACCOUNT_CONNECTION,
+	       CMD_ACCOUNT_DISCONNECT, CMD_ACCOUNT_ENABLED, CMD_ACCOUNT_FIND,
+	       CMD_ACCOUNT_HANDLE, CMD_ACCOUNT_ISCONNECTED, CMD_ACCOUNT_LIST,
+	       CMD_ACCOUNT_PRESENCE, CMD_ACCOUNT_PROTOCOL, CMD_ACCOUNT_STATUS,
+	       CMD_ACCOUNT_STATUS_TYPE, CMD_ACCOUNT_STATUS_TYPES,
+	       CMD_ACCOUNT_USERNAME } cmd;
 	const char *listopts[] = { "-all", "-online", NULL };
 	enum { CMD_ACCOUNTLIST_ALL, CMD_ACCOUNTLIST_ONLINE } listopt;
 	const char *alias;
-	GList *cur;
+	const GList *cur;
 	GaimAccount *account;
+	GaimStatus *status;
+	GaimStatusType *status_type;
+	GaimValue *value;
+	char *attr_id;
 	int error;
+	int b, i;
 
 	if (objc < 2) {
 		Tcl_WrongNumArgs(interp, 1, objv, "subcommand ?args?");
@@ -105,8 +135,7 @@
 			Tcl_WrongNumArgs(interp, 2, objv, "account");
 			return TCL_ERROR;
 		}
-		error = Tcl_GetIntFromObj(interp, objv[2], (int *)&account);
-		if (error || !tcl_validate_account(account, interp))
+		if ((account = tcl_validate_account(objv[2], interp)) == NULL)
 			return TCL_ERROR;
 		alias = gaim_account_get_alias(account);
 		Tcl_SetStringObj(result, alias ? (char *)alias : "", -1);
@@ -116,40 +145,61 @@
 			Tcl_WrongNumArgs(interp, 2, objv, "account");
 			return TCL_ERROR;
 		}
-		error = Tcl_GetIntFromObj(interp, objv[2], (int *)&account);
-		if (error || !tcl_validate_account(account, interp))
+		if ((account = tcl_validate_account(objv[2], interp)) == NULL)
 			return TCL_ERROR;
 		if (!gaim_account_is_connected(account))
 			gaim_account_connect(account);
-		Tcl_SetIntObj(result, (int)gaim_account_get_connection(account));
+		Tcl_SetObjResult(interp,
+		                 gaim_tcl_ref_new(GaimTclRefConnection,
+		                                  gaim_account_get_connection(account)));
 		break;
 	case CMD_ACCOUNT_CONNECTION:
 		if (objc != 3) {
 			Tcl_WrongNumArgs(interp, 2, objv, "account");
 			return TCL_ERROR;
 		}
-		error = Tcl_GetIntFromObj(interp, objv[2], (int *)&account);
-		if (error || !tcl_validate_account(account, interp))
+
+		if ((account = tcl_validate_account(objv[2], interp)) == NULL)
 			return TCL_ERROR;
-		Tcl_SetIntObj(result, (int)gaim_account_get_connection(account));
+		Tcl_SetObjResult(interp,
+		                 gaim_tcl_ref_new(GaimTclRefConnection,
+		                                  gaim_account_get_connection(account)));
 		break;
 	case CMD_ACCOUNT_DISCONNECT:
 		if (objc != 3) {
 			Tcl_WrongNumArgs(interp, 2, objv, "account");
 			return TCL_ERROR;
 		}
-		error = Tcl_GetIntFromObj(interp, objv[2], (int *)&account);
-		if (error || !tcl_validate_account(account, interp))
+		if ((account = tcl_validate_account(objv[2], interp)) == NULL)
 			return TCL_ERROR;
 		gaim_account_disconnect(account);
 		break;
+	case CMD_ACCOUNT_ENABLED:
+		if (objc != 3 && objc != 4) {
+			Tcl_WrongNumArgs(interp, 2, objv, "account ?enabled?");
+			return TCL_ERROR;
+		}
+		if ((account = tcl_validate_account(objv[2], interp)) == NULL)
+			return TCL_ERROR;
+		if (objc == 3) {
+			Tcl_SetBooleanObj(result,
+					  gaim_account_get_enabled(account,
+								   gaim_core_get_ui()));
+		} else {
+			if ((error = Tcl_GetBooleanFromObj(interp, objv[3], &b)) != TCL_OK)
+				return TCL_ERROR;
+			gaim_account_set_enabled(account, gaim_core_get_ui(), b);
+		}
+		break;
 	case CMD_ACCOUNT_FIND:
 		if (objc != 4) {
 			Tcl_WrongNumArgs(interp, 2, objv, "username protocol");
 			return TCL_ERROR;
 		}
-		Tcl_SetIntObj(result, (int)gaim_accounts_find(Tcl_GetString(objv[2]),
-									   Tcl_GetString(objv[3])));
+		account = gaim_accounts_find(Tcl_GetString(objv[2]),
+		                             Tcl_GetString(objv[3]));
+		Tcl_SetObjResult(interp,
+		                 gaim_tcl_ref_new(GaimTclRefAccount, account));
 		break;
 	case CMD_ACCOUNT_HANDLE:
 		if (objc != 2) {
@@ -163,8 +213,7 @@
 			Tcl_WrongNumArgs(interp, 2, objv, "account");
 			return TCL_ERROR;
 		}
-		error = Tcl_GetIntFromObj(interp, objv[2], (int *)&account);
-		if (error || !tcl_validate_account(account, interp))
+		if ((account = tcl_validate_account(objv[2], interp)) == NULL)
 			return TCL_ERROR;
 		Tcl_SetBooleanObj(result, gaim_account_is_connected(account));
 		break;
@@ -183,28 +232,140 @@
 			account = cur->data;
 			if (listopt == CMD_ACCOUNTLIST_ONLINE && !gaim_account_is_connected(account))
 				continue;
-			elem = Tcl_NewIntObj((int)account);
+			elem = gaim_tcl_ref_new(GaimTclRefAccount, account);
 			Tcl_ListObjAppendElement(interp, list, elem);
 		}
 		Tcl_SetObjResult(interp, list);
 		break;
+	case CMD_ACCOUNT_PRESENCE:
+		if (objc != 3) {
+			Tcl_WrongNumArgs(interp, 2, objv, "account");
+			return TCL_ERROR;
+		}
+		if ((account = tcl_validate_account(objv[2], interp)) == NULL)
+			return TCL_ERROR;
+		Tcl_SetObjResult(interp, gaim_tcl_ref_new(GaimTclRefPresence,
+							  gaim_account_get_presence(account)));
+		break;
 	case CMD_ACCOUNT_PROTOCOL:
 		if (objc != 3) {
 			Tcl_WrongNumArgs(interp, 2, objv, "account");
 			return TCL_ERROR;
 		}
-		error = Tcl_GetIntFromObj(interp, objv[2], (int *)&account);
-		if (error || !tcl_validate_account(account, interp))
+		if ((account = tcl_validate_account(objv[2], interp)) == NULL)
 			return TCL_ERROR;
 		Tcl_SetStringObj(result, (char *)gaim_account_get_protocol_id(account), -1);
 		break;
+	case CMD_ACCOUNT_STATUS:
+		if (objc < 3) {
+			Tcl_WrongNumArgs(interp, 2, objv, "account ?status_id name value ...?");
+			return TCL_ERROR;
+		}
+		if ((account = tcl_validate_account(objv[2], interp)) == NULL)
+			return TCL_ERROR;
+		if (objc == 3) {
+			Tcl_SetObjResult(interp,
+					 gaim_tcl_ref_new(GaimTclRefStatus,
+							  gaim_account_get_active_status(account)));
+		} else {
+			GList *l = NULL;
+			if (objc % 2) {
+				Tcl_SetStringObj(result, "name without value setting status", -1);
+				return TCL_ERROR;
+			}
+			status = gaim_account_get_status(account, Tcl_GetString(objv[3]));
+			if (status == NULL) {
+				Tcl_SetStringObj(result, "invalid status for account", -1);
+				return TCL_ERROR;
+			}
+			for (i = 4; i < objc; i += 2) {
+				attr_id = Tcl_GetString(objv[i]);
+				value = gaim_status_get_attr_value(status, attr_id);
+				if (value == NULL) {
+					Tcl_SetStringObj(result, "invalid attribute for account", -1);
+					return TCL_ERROR;
+				}
+				switch (gaim_value_get_type(value)) {
+				case GAIM_TYPE_BOOLEAN:
+					error = Tcl_GetBooleanFromObj(interp, objv[i + 1], &b);
+					if (error != TCL_OK)
+						return error;
+					l = g_list_append(l, attr_id);
+					l = g_list_append(l, GINT_TO_POINTER(b));
+					break;
+				case GAIM_TYPE_INT:
+					error = Tcl_GetIntFromObj(interp, objv[i + 1], &b);
+					if (error != TCL_OK)
+						return error;
+					l = g_list_append(l, attr_id);
+					l = g_list_append(l, GINT_TO_POINTER(b));
+					break;
+				case GAIM_TYPE_STRING:
+					l = g_list_append(l, attr_id);
+					l = g_list_append(l, Tcl_GetString(objv[i + 1]));
+					break;
+				default:
+					Tcl_SetStringObj(result, "unknown GaimValue type", -1);
+					return TCL_ERROR;
+				}
+			}
+			gaim_account_set_status_list(account, Tcl_GetString(objv[3]), TRUE, l);
+			g_list_free(l);
+		}
+		break;
+	case CMD_ACCOUNT_STATUS_TYPE:
+		if (objc != 4 && objc != 5) {
+			Tcl_WrongNumArgs(interp, 2, objv, "account ?statustype? ?-primitive primitive?");
+			return TCL_ERROR;
+		}
+		if ((account = tcl_validate_account(objv[2], interp)) == NULL)
+			return TCL_ERROR;
+		if (objc == 4) {
+			status_type = gaim_account_get_status_type(account,
+								   Tcl_GetString(objv[3]));
+		} else {
+			GaimStatusPrimitive primitive;
+			if (strcmp(Tcl_GetString(objv[3]), "-primitive")) {
+				Tcl_SetStringObj(result, "bad option \"", -1);
+				Tcl_AppendObjToObj(result, objv[3]);
+				Tcl_AppendToObj(result,
+						"\": should be -primitive", -1);
+				return TCL_ERROR;
+			}
+			primitive = gaim_primitive_get_type_from_id(Tcl_GetString(objv[4]));
+			status_type = gaim_account_get_status_type_with_primitive(account,
+										  primitive);
+		}
+		if (status_type == NULL) {
+			Tcl_SetStringObj(result, "status type not found", -1);
+			return TCL_ERROR;
+		}
+		Tcl_SetObjResult(interp,
+				 gaim_tcl_ref_new(GaimTclRefStatusType,
+						  status_type));
+		break;
+	case CMD_ACCOUNT_STATUS_TYPES:
+		if (objc != 3) {
+			Tcl_WrongNumArgs(interp, 2, objv, "account");
+			return TCL_ERROR;
+		}
+		if ((account = tcl_validate_account(objv[2], interp)) == NULL)
+			return TCL_ERROR;
+		list = Tcl_NewListObj(0, NULL);
+		for (cur = gaim_account_get_status_types(account); cur != NULL;
+		     cur = g_list_next(cur)) {
+			Tcl_ListObjAppendElement(interp, list,
+						 gaim_tcl_ref_new(GaimTclRefStatusType,
+								  cur->data));
+		}
+		Tcl_SetObjResult(interp, list);
+		break;
 	case CMD_ACCOUNT_USERNAME:
 		if (objc != 3) {
 			Tcl_WrongNumArgs(interp, 2, objv, "account");
 			return TCL_ERROR;
 		}
-		error = Tcl_GetIntFromObj(interp, objv[2], (int *)&account);
-		if (error || !tcl_validate_account(account, interp))
+		if ((account = tcl_validate_account(objv[2], interp)) == NULL)
 			return TCL_ERROR;
 		Tcl_SetStringObj(result, (char *)gaim_account_get_username(account), -1);
 		break;
@@ -227,10 +388,8 @@
 
 	type = Tcl_GetString(elems[0]);
 	name = Tcl_GetString(elems[1]);
-	if (Tcl_GetIntFromObj(interp, elems[2], (int *)&account) != TCL_OK)
+	if ((account = tcl_validate_account(elems[2], interp)) == NULL)
 		return NULL;
-	if (!tcl_validate_account(account, interp))
-		return NULL;
 
 	if (!strcmp(type, "buddy")) {
 		node = (GaimBlistNode *)gaim_find_buddy(account, name);
@@ -301,15 +460,11 @@
 				Tcl_SetStringObj(result, "invalid buddy", -1);
 				return TCL_ERROR;
 			}
-			if ((error = Tcl_GetIntFromObj(interp, elems[2], (int *)&account)) != TCL_OK)
+			if ((account = tcl_validate_account(elems[2], interp)) == NULL)
 				return TCL_ERROR;
-			if (!tcl_validate_account(account, interp))
-				return TCL_ERROR;
 			serv_get_info(gaim_account_get_connection(account), Tcl_GetString(elems[1]));
 		} else {
-			if ((error = Tcl_GetIntFromObj(interp, objv[2], (int *)&account)) != TCL_OK)
-				return error;
-			if (!tcl_validate_account(account, interp))
+			if ((account = tcl_validate_account(objv[2], interp)) == NULL)
 				return TCL_ERROR;
 			serv_get_info(gaim_account_get_connection(account), Tcl_GetString(objv[3]));
 		}
@@ -351,7 +506,7 @@
 						tclbud = Tcl_NewListObj(0, NULL);
 						Tcl_ListObjAppendElement(interp, tclbud, Tcl_NewStringObj("buddy", -1));
 						Tcl_ListObjAppendElement(interp, tclbud, Tcl_NewStringObj(bud->name, -1));
-						Tcl_ListObjAppendElement(interp, tclbud, Tcl_NewIntObj((int)bud->account));
+						Tcl_ListObjAppendElement(interp, tclbud, gaim_tcl_ref_new(GaimTclRefAccount, bud->account));
 						Tcl_ListObjAppendElement(interp, tclcontactlist, tclbud);
 					}
 					if (count) {
@@ -368,7 +523,7 @@
 					tclbud = Tcl_NewListObj(0, NULL);
 					Tcl_ListObjAppendElement(interp, tclbud, Tcl_NewStringObj("chat", -1));
 					Tcl_ListObjAppendElement(interp, tclbud, Tcl_NewStringObj(cnode->alias, -1));
-					Tcl_ListObjAppendElement(interp, tclbud, Tcl_NewIntObj((int)cnode->account));
+					Tcl_ListObjAppendElement(interp, tclbud, gaim_tcl_ref_new(GaimTclRefAccount, cnode->account));
 					Tcl_ListObjAppendElement(interp, tclgrouplist, tclbud);
 					break;
 				default:
@@ -409,23 +564,19 @@
 			Tcl_WrongNumArgs(interp, 2, objv, "gc");
 			return TCL_ERROR;
 		}
-		error = Tcl_GetIntFromObj(interp, objv[2], (int *)&gc);
-		if (error || !tcl_validate_gc(gc)) {
-			Tcl_SetStringObj(result, "invalid gc", -1);
+		if ((gc = tcl_validate_gc(objv[2], interp)) == NULL)
 			return TCL_ERROR;
-		}
-		Tcl_SetIntObj(result, (int)gaim_connection_get_account(gc));
+		Tcl_SetObjResult(interp,
+		                 gaim_tcl_ref_new(GaimTclRefAccount,
+		                                  gaim_connection_get_account(gc)));
 		break;
 	case CMD_CONN_DISPLAYNAME:
 		if (objc != 3) {
 			Tcl_WrongNumArgs(interp, 2, objv, "gc");
 			return TCL_ERROR;
 		}
-		error = Tcl_GetIntFromObj(interp, objv[2], (int *)&gc);
-		if (error || !tcl_validate_gc(gc)) {
-			Tcl_SetStringObj(result, "invalid gc", -1);
+		if ((gc = tcl_validate_gc(objv[2], interp)) == NULL)
 			return TCL_ERROR;
-		}
 		Tcl_SetStringObj(result, (char *)gaim_connection_get_display_name(gc), -1);
 		break;
 	case CMD_CONN_HANDLE:
@@ -442,7 +593,7 @@
 		}
 		list = Tcl_NewListObj(0, NULL);
 		for (cur = gaim_connections_get_all(); cur != NULL; cur = g_list_next(cur)) {
-			elem = Tcl_NewIntObj((int)cur->data);
+			elem = gaim_tcl_ref_new(GaimTclRefConnection, cur->data);
 			Tcl_ListObjAppendElement(interp, list, elem);
 		}
 		Tcl_SetObjResult(interp, list);
@@ -483,15 +634,12 @@
 			return TCL_ERROR;
 		}
 		account = NULL;
-		if ((error = Tcl_GetIntFromObj(interp, objv[2],
-					       (int *)&account)) != TCL_OK)
-			return error;
-		if (!tcl_validate_account(account, interp))
+		if ((account = tcl_validate_account(objv[2], interp)) == NULL)
 			return TCL_ERROR;
 		convo = gaim_find_conversation_with_account(GAIM_CONV_TYPE_ANY,
 							    Tcl_GetString(objv[3]),
 							    account);
-		Tcl_SetIntObj(result, (int)convo);
+		Tcl_SetObjResult(interp, gaim_tcl_ref_new(GaimTclRefConversation, convo));
 		break;
 	case CMD_CONV_HANDLE:
 		if (objc != 2) {
@@ -503,7 +651,7 @@
 	case CMD_CONV_LIST:
 		list = Tcl_NewListObj(0, NULL);
 		for (cur = gaim_get_conversations(); cur != NULL; cur = g_list_next(cur)) {
-			elem = Tcl_NewIntObj((int)cur->data);
+			elem = gaim_tcl_ref_new(GaimTclRefConversation, cur->data);
 			Tcl_ListObjAppendElement(interp, list, elem);
 		}
 		Tcl_SetObjResult(interp, list);
@@ -538,24 +686,20 @@
 			Tcl_WrongNumArgs(interp, 2, objv, "?options? account name");
 			return TCL_ERROR;
 		}
-		if ((error = Tcl_GetIntFromObj(interp, objv[argsused++], (int *)&account)) != TCL_OK)
-			return error;
-		if (!tcl_validate_account(account, interp))
+		if ((account = tcl_validate_account(objv[argsused++], interp)) == NULL)
 			return TCL_ERROR;
 		convo = gaim_conversation_new(type, account, Tcl_GetString(objv[argsused]));
-		Tcl_SetIntObj(result, (int)convo);
+		Tcl_SetObjResult(interp, gaim_tcl_ref_new(GaimTclRefConversation, convo));
 		break;
 	case CMD_CONV_WRITE:
 		if (objc != 6) {
 			Tcl_WrongNumArgs(interp, 2, objv, "conversation style from what");
 			return TCL_ERROR;
 		}
-		if ((error = Tcl_GetIntFromObj(interp, objv[2], (int *)&convo)) != TCL_OK)
-			return error;
+		if ((convo = tcl_validate_conversation(objv[2], interp)) == NULL)
+			return TCL_ERROR;
 		if ((error = Tcl_GetIndexFromObj(interp, objv[3], styles, "style", 0, (int *)&style)) != TCL_OK)
 			return error;
-		if (!tcl_validate_conversation(convo, interp))
-			return TCL_ERROR;
 		from = Tcl_GetString(objv[4]);
 		what = Tcl_GetString(objv[5]);
 		
@@ -799,25 +943,224 @@
 	return TCL_OK;
 }
 
+int tcl_cmd_presence(ClientData unused, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+{
+	const char *cmds[] = { "account", "active_status", "available",
+			       "chat_user", "context", "conversation", "idle",
+			       "login", "online", "status", "statuses", NULL };
+	enum { CMD_PRESENCE_ACCOUNT, CMD_PRESENCE_ACTIVE_STATUS,
+	       CMD_PRESENCE_AVAILABLE, CMD_PRESENCE_CHAT_USER,
+	       CMD_PRESENCE_CONTEXT, CMD_PRESENCE_CONVERSATION,
+	       CMD_PRESENCE_IDLE, CMD_PRESENCE_LOGIN, CMD_PRESENCE_ONLINE,
+	       CMD_PRESENCE_STATUS, CMD_PRESENCE_STATUSES } cmd;
+	Tcl_Obj *result = Tcl_GetObjResult(interp);
+	Tcl_Obj *list, *elem;
+	GaimPresence *presence;
+	const GList *cur;
+	int error, idle, idle_time, login_time;
+
+	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_PRESENCE_ACCOUNT:
+		if (objc != 3) {
+			Tcl_WrongNumArgs(interp, 2, objv, "presence");
+			return TCL_ERROR;
+		}
+		if ((presence = gaim_tcl_ref_get(interp, objv[2], GaimTclRefPresence)) == NULL)
+			return TCL_ERROR;
+		Tcl_SetObjResult(interp, gaim_tcl_ref_new(GaimTclRefAccount,
+		                                          gaim_presence_get_account(presence)));
+		break;
+	case CMD_PRESENCE_ACTIVE_STATUS:
+		if (objc != 3 && objc != 4 && objc != 5) {
+			Tcl_WrongNumArgs(interp, 2, objv, "presence [?status_id? | ?-primitive primitive?]");
+			return TCL_ERROR;
+		}
+		if ((presence = gaim_tcl_ref_get(interp, objv[2], GaimTclRefPresence)) == NULL)
+			return TCL_ERROR;
+		if (objc == 3) {
+			Tcl_SetObjResult(interp,
+					 gaim_tcl_ref_new(GaimTclRefStatus,
+							  gaim_presence_get_active_status(presence)));
+		} else if (objc == 4) {
+			Tcl_SetBooleanObj(result,
+					  gaim_presence_is_status_active(presence,
+									 Tcl_GetString(objv[3])));
+		} else {
+			GaimStatusPrimitive primitive;
+			if (strcmp(Tcl_GetString(objv[3]), "-primitive")) {
+				Tcl_SetStringObj(result, "bad option \"", -1);
+				Tcl_AppendObjToObj(result, objv[3]);
+				Tcl_AppendToObj(result,
+						"\": should be -primitive", -1);
+				return TCL_ERROR;
+			}
+			primitive = gaim_primitive_get_type_from_id(Tcl_GetString(objv[4]));
+			if (primitive == GAIM_STATUS_UNSET) {
+				Tcl_SetStringObj(result, "invalid primitive ", -1);
+				Tcl_AppendObjToObj(result, objv[4]);
+				return TCL_ERROR;
+			}
+			Tcl_SetBooleanObj(result, gaim_presence_is_status_primitive_active(presence, primitive));
+			break;
+		}
+		break;
+	case CMD_PRESENCE_AVAILABLE:
+		if (objc != 3) {
+			Tcl_WrongNumArgs(interp, 2, objv, "presence");
+			return TCL_ERROR;
+		}
+		if ((presence = gaim_tcl_ref_get(interp, objv[2], GaimTclRefPresence)) == NULL)
+			return TCL_ERROR;
+		Tcl_SetBooleanObj(result, gaim_presence_is_available(presence));
+		break;
+	case CMD_PRESENCE_CHAT_USER:
+		if (objc != 3) {
+			Tcl_WrongNumArgs(interp, 2, objv, "presence");
+			return TCL_ERROR;
+		}
+		if ((presence = gaim_tcl_ref_get(interp, objv[2], GaimTclRefPresence)) == NULL)
+			return TCL_ERROR;
+		Tcl_SetStringObj(result, gaim_presence_get_chat_user(presence), -1);
+		break;
+	case CMD_PRESENCE_CONTEXT:
+		if (objc != 3) {
+			Tcl_WrongNumArgs(interp, 2, objv, "presence");
+			return TCL_ERROR;
+		}
+		if ((presence = gaim_tcl_ref_get(interp, objv[2], GaimTclRefPresence)) == NULL)
+			return TCL_ERROR;
+		switch (gaim_presence_get_context(presence)) {
+		case GAIM_PRESENCE_CONTEXT_UNSET:
+			Tcl_SetStringObj(result, "unset", -1);
+			break;
+		case GAIM_PRESENCE_CONTEXT_ACCOUNT:
+			Tcl_SetStringObj(result, "account", -1);
+			break;
+		case GAIM_PRESENCE_CONTEXT_CONV:
+			Tcl_SetStringObj(result, "conversation", -1);
+			break;
+		case GAIM_PRESENCE_CONTEXT_BUDDY:
+			Tcl_SetStringObj(result, "buddy", -1);
+			break;
+		}
+		break;
+	case CMD_PRESENCE_CONVERSATION:
+		if (objc != 3) {
+			Tcl_WrongNumArgs(interp, 2, objv, "presence");
+			return TCL_ERROR;
+		}
+		if ((presence = gaim_tcl_ref_get(interp, objv[2], GaimTclRefPresence)) == NULL)
+			return TCL_ERROR;
+		Tcl_SetObjResult(interp, gaim_tcl_ref_new(GaimTclRefConversation,
+		                                          gaim_presence_get_conversation(presence)));
+		break;
+	case CMD_PRESENCE_IDLE:
+		if (objc < 3 || objc > 5) {
+			Tcl_WrongNumArgs(interp, 2, objv, "presence ?idle? ?time?");
+			return TCL_ERROR;
+		}
+		if ((presence = gaim_tcl_ref_get(interp, objv[2], GaimTclRefPresence)) == NULL)
+			return TCL_ERROR;
+		if (objc == 3) {
+			if (gaim_presence_is_idle(presence)) {
+				idle_time = gaim_presence_get_idle_time (presence);
+				Tcl_SetIntObj(result, idle_time);
+			} else {
+				result = Tcl_NewListObj(0, NULL);
+				Tcl_SetObjResult(interp, result);
+			}
+			break;
+		}
+		if ((error = Tcl_GetBooleanFromObj(interp, objv[3], &idle)) != TCL_OK)
+			return TCL_ERROR;
+		if (objc == 4) {
+			gaim_presence_set_idle(presence, idle, time(NULL));
+		} else if (objc == 5) {
+			if ((error = Tcl_GetIntFromObj(interp,
+		                                       objv[4],
+		                                       &idle_time)) != TCL_OK)
+				return TCL_ERROR;
+			gaim_presence_set_idle(presence, idle, idle_time);
+		}
+		break;
+	case CMD_PRESENCE_LOGIN:
+		if (objc != 3 && objc != 4) {
+			Tcl_WrongNumArgs(interp, 2, objv, "presence ?time?");
+			return TCL_ERROR;
+		}
+		if ((presence = gaim_tcl_ref_get(interp, objv[2], GaimTclRefPresence)) == NULL)
+			return TCL_ERROR;
+		if (objc == 3) {
+			Tcl_SetIntObj(result, gaim_presence_get_login_time(presence));
+		} else {
+			if ((error == Tcl_GetIntFromObj(interp,
+			                                objv[3],
+			                                &login_time)) != TCL_OK)
+				return TCL_ERROR;
+			gaim_presence_set_login_time(presence, login_time);
+		}
+		break;
+	case CMD_PRESENCE_ONLINE:
+		if (objc != 3) {
+			Tcl_WrongNumArgs(interp, 2, objv, "presence");
+			return TCL_ERROR;
+		}
+		if ((presence = gaim_tcl_ref_get(interp, objv[2], GaimTclRefPresence)) == NULL)
+			return TCL_ERROR;
+		Tcl_SetBooleanObj(result, gaim_presence_is_online(presence));
+		break;
+	case CMD_PRESENCE_STATUS:
+		if (objc != 4) {
+			Tcl_WrongNumArgs(interp, 2, objv, "presence status_id");
+			return TCL_ERROR;
+		}
+		if ((presence = gaim_tcl_ref_get(interp, objv[2], GaimTclRefPresence)) == NULL)
+			return TCL_ERROR;
+		Tcl_SetObjResult(interp,
+		                 gaim_tcl_ref_new(GaimTclRefStatus,
+		                                  gaim_presence_get_status(presence,
+		                                                           Tcl_GetString(objv[3]))));
+		break;
+	case CMD_PRESENCE_STATUSES:
+		if (objc != 3) {
+			Tcl_WrongNumArgs(interp, 2, objv, "presence");
+			return TCL_ERROR;
+		}
+		if ((presence = gaim_tcl_ref_get(interp, objv[2], GaimTclRefPresence)) == NULL)
+			return TCL_ERROR;
+		list = Tcl_NewListObj(0, NULL);
+		for (cur = gaim_presence_get_statuses(presence); cur != NULL;
+		     cur = g_list_next(cur)) {
+			elem = gaim_tcl_ref_new(GaimTclRefStatus, cur->data);
+			Tcl_ListObjAppendElement(interp, list, elem);
+		}
+		Tcl_SetObjResult(interp, list);
+		break;
+	}
+
+	return TCL_OK;
+}
+
 int tcl_cmd_send_im(ClientData unused, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
 	GaimConnection *gc;
 	char *who, *text;
-	int error;
-	Tcl_Obj *result;
 
 	if (objc != 4) {
 		Tcl_WrongNumArgs(interp, 1, objv, "gc who text");
 		return TCL_ERROR;
 	}
 
-	if ((error = Tcl_GetIntFromObj(interp, objv[1], (int *)&gc)) != TCL_OK)
-		return error;
-	if (!tcl_validate_gc(gc)) {
-		result = Tcl_GetObjResult(interp);
-		Tcl_SetStringObj(result, "invalid gc", -1);
+	if ((gc = tcl_validate_gc(objv[1], interp)) == NULL)
 		return TCL_ERROR;
-	}
 
 	who = Tcl_GetString(objv[2]);
 	text = Tcl_GetString(objv[3]);
@@ -856,6 +1199,7 @@
 			return error;
 		}
 		handler->signal = objv[3];
+		Tcl_IncrRefCount(handler->signal);
 		handler->args = objv[4];
 		handler->proc = objv[5];
 		handler->interp = interp;
@@ -868,7 +1212,7 @@
 		break;
 	case CMD_SIGNAL_DISCONNECT:
 		if (objc != 4) {
-			Tcl_WrongNumArgs(interp, 2, objv, "signal");
+			Tcl_WrongNumArgs(interp, 2, objv, "instance signal");
 			return TCL_ERROR;
 		}
 		if ((error = Tcl_GetIntFromObj(interp, objv[2], (int *)&instance)) != TCL_OK)
@@ -880,6 +1224,265 @@
 	return TCL_OK;
 }
 
+int tcl_cmd_status(ClientData unused, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+{
+	const char *cmds[] = { "attr", "type", NULL };
+	enum { CMD_STATUS_ATTR, CMD_STATUS_TYPE } cmd;
+	Tcl_Obj *result = Tcl_GetObjResult(interp);
+	GaimStatus *status;
+	GaimStatusType *status_type;
+	GaimValue *value;
+	const char *attr;
+	int error, v;
+
+	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_STATUS_ATTR:
+		if (objc != 4 && objc != 5) {
+			Tcl_WrongNumArgs(interp, 2, objv, "status attr_id ?value?");
+			return TCL_ERROR;
+		}
+		if ((status = gaim_tcl_ref_get(interp, objv[2], GaimTclRefStatus)) == NULL)
+			return TCL_ERROR;
+		attr = Tcl_GetString(objv[3]);
+		value = gaim_status_get_attr_value(status, attr);
+		if (value == NULL) {
+			Tcl_SetStringObj(result, "no such attribute", -1);
+			return TCL_ERROR;
+		}
+		switch (gaim_value_get_type(value)) {
+		case GAIM_TYPE_BOOLEAN:
+			if (objc == 4) {
+				Tcl_SetBooleanObj(result, gaim_value_get_boolean(value));
+			} else {
+				if ((error = Tcl_GetBooleanFromObj(interp, objv[4], &v)) != TCL_OK)
+					return error;
+				gaim_status_set_attr_boolean(status, attr, v);
+			}
+			break;
+		case GAIM_TYPE_INT:
+			if (objc == 4) {
+				Tcl_SetIntObj(result, gaim_value_get_int(value));
+			} else {
+				if ((error = Tcl_GetIntFromObj(interp, objv[4], &v)) != TCL_OK)
+					return error;
+				gaim_status_set_attr_int(status, attr, v );
+			}
+			break;
+		case GAIM_TYPE_STRING:
+			if (objc == 4)
+				Tcl_SetStringObj(result, gaim_value_get_string(value), -1);
+			else
+				gaim_status_set_attr_string(status, attr, Tcl_GetString(objv[4]));
+			break;
+		default:
+			Tcl_SetStringObj(result, "attribute has unknown type", -1);
+			return TCL_ERROR;
+		}
+		break;
+	case CMD_STATUS_TYPE:
+		if (objc != 3) {
+			Tcl_WrongNumArgs(interp, 2, objv, "status");
+			return TCL_ERROR;
+		}
+		if ((status = gaim_tcl_ref_get(interp, objv[2], GaimTclRefStatus)) == NULL)
+			return TCL_ERROR;
+		status_type = gaim_status_get_type(status);
+		Tcl_SetObjResult(interp, gaim_tcl_ref_new(GaimTclRefStatusType,
+		                                          status_type));
+		break;
+	}
+
+	return TCL_OK;
+}
+
+int tcl_cmd_status_attr(ClientData unused, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+{
+	const char *cmds[] = { "id", "name", NULL };
+	enum { CMD_STATUS_ATTR_ID, CMD_STATUS_ATTR_NAME } cmd;
+	Tcl_Obj *result = Tcl_GetObjResult(interp);
+	GaimStatusAttr *attr;
+	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_STATUS_ATTR_ID:
+		if (objc != 3) {
+			Tcl_WrongNumArgs(interp, 2, objv, "attr");
+			return TCL_ERROR;
+		}
+		if ((attr = gaim_tcl_ref_get(interp, objv[2], GaimTclRefStatusAttr)) == NULL)
+			return TCL_ERROR;
+		Tcl_SetStringObj(result, gaim_status_attr_get_id(attr), -1);
+		break;
+	case CMD_STATUS_ATTR_NAME:
+		if (objc != 3) {
+			Tcl_WrongNumArgs(interp, 2, objv, "attr");
+			return TCL_ERROR;
+		}
+		if ((attr = gaim_tcl_ref_get(interp, objv[2], GaimTclRefStatusAttr)) == NULL)
+			return TCL_ERROR;
+		Tcl_SetStringObj(result, gaim_status_attr_get_name(attr), -1);
+		break;
+	}
+
+	return TCL_OK;
+}
+
+int tcl_cmd_status_type(ClientData unused, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+{
+	const char *cmds[] = { "attr", "attrs", "available", "exclusive", "id",
+	                       "independent", "name", "primary_attr",
+	                       "primitive", "saveable", "user_settable",
+	                       NULL };
+	enum { CMD_STATUS_TYPE_ATTR, CMD_STATUS_TYPE_ATTRS,
+	       CMD_STATUS_TYPE_AVAILABLE, CMD_STATUS_TYPE_EXCLUSIVE,
+	       CMD_STATUS_TYPE_ID, CMD_STATUS_TYPE_INDEPENDENT,
+	       CMD_STATUS_TYPE_NAME, CMD_STATUS_TYPE_PRIMARY_ATTR,
+	       CMD_STATUS_TYPE_PRIMITIVE, CMD_STATUS_TYPE_SAVEABLE,
+	       CMD_STATUS_TYPE_USER_SETTABLE } cmd;
+	Tcl_Obj *result = Tcl_GetObjResult(interp);
+	GaimStatusType *status_type;
+	Tcl_Obj *list, *elem;
+	const GList *cur;
+	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_STATUS_TYPE_AVAILABLE:
+		if (objc != 3) {
+			Tcl_WrongNumArgs(interp, 2, objv, "statustype");
+			return TCL_ERROR;
+		}
+		if ((status_type = gaim_tcl_ref_get(interp, objv[2], GaimTclRefStatusType)) == NULL)
+			return TCL_ERROR;
+		Tcl_SetBooleanObj(result, gaim_status_type_is_available(status_type));
+		break;
+	case CMD_STATUS_TYPE_ATTR:
+		if (objc != 4) {
+			Tcl_WrongNumArgs(interp, 2, objv, "statustype attr");
+			return TCL_ERROR;
+		}
+		if ((status_type = gaim_tcl_ref_get(interp, objv[2], GaimTclRefStatusType)) == NULL)
+			return TCL_ERROR;
+		Tcl_SetObjResult(interp,
+				 gaim_tcl_ref_new(GaimTclRefStatusAttr,
+						  gaim_status_type_get_attr(status_type,
+									    Tcl_GetStringFromObj(objv[3], NULL))));
+		break;
+	case CMD_STATUS_TYPE_ATTRS:
+		if (objc != 3) {
+			Tcl_WrongNumArgs(interp, 2, objv, "statustype");
+			return TCL_ERROR;
+		}
+		if ((status_type = gaim_tcl_ref_get(interp, objv[2], GaimTclRefStatusType)) == NULL)
+			return TCL_ERROR;
+		list = Tcl_NewListObj(0, NULL);
+		for (cur = gaim_status_type_get_attrs(status_type);
+		     cur != NULL; cur = g_list_next(cur)) {
+			elem = gaim_tcl_ref_new(GaimTclRefStatusAttr, cur->data);
+			Tcl_ListObjAppendElement(interp, list, elem);
+		}
+		Tcl_SetObjResult(interp, list);
+		break;
+	case CMD_STATUS_TYPE_EXCLUSIVE:
+		if (objc != 3) {
+			Tcl_WrongNumArgs(interp, 2, objv, "statustype");
+			return TCL_ERROR;
+		}
+		if ((status_type = gaim_tcl_ref_get(interp, objv[2], GaimTclRefStatusType)) == NULL)
+			return TCL_ERROR;
+		Tcl_SetBooleanObj(result, gaim_status_type_is_exclusive(status_type));
+		break;
+	case CMD_STATUS_TYPE_ID:
+		if (objc != 3) {
+			Tcl_WrongNumArgs(interp, 2, objv, "statustype");
+			return TCL_ERROR;
+		}
+		if ((status_type = gaim_tcl_ref_get(interp, objv[2], GaimTclRefStatusType)) == NULL)
+			return TCL_ERROR;
+		Tcl_SetStringObj(result, gaim_status_type_get_id(status_type), -1);
+		break;
+	case CMD_STATUS_TYPE_INDEPENDENT:
+		if (objc != 3) {
+			Tcl_WrongNumArgs(interp, 2, objv, "statustype");
+			return TCL_ERROR;
+		}
+		if ((status_type = gaim_tcl_ref_get(interp, objv[2], GaimTclRefStatusType)) == NULL)
+			return TCL_ERROR;
+		Tcl_SetBooleanObj(result, gaim_status_type_is_independent(status_type));
+		break;
+	case CMD_STATUS_TYPE_NAME:
+		if (objc != 3) {
+			Tcl_WrongNumArgs(interp, 2, objv, "statustype");
+			return TCL_ERROR;
+		}
+		if ((status_type = gaim_tcl_ref_get(interp, objv[2], GaimTclRefStatusType)) == NULL)
+			return TCL_ERROR;
+		Tcl_SetStringObj(result, gaim_status_type_get_name(status_type), -1);
+		break;
+	case CMD_STATUS_TYPE_PRIMITIVE:
+		if (objc != 3) {
+			Tcl_WrongNumArgs(interp, 2, objv, "statustype");
+			return TCL_ERROR;
+		}
+		if ((status_type = gaim_tcl_ref_get(interp, objv[2], GaimTclRefStatusType)) == NULL)
+			return TCL_ERROR;
+		Tcl_SetStringObj(result, gaim_primitive_get_id_from_type(gaim_status_type_get_primitive(status_type)), -1);
+		break;
+	case CMD_STATUS_TYPE_PRIMARY_ATTR:
+		if (objc != 3) {
+			Tcl_WrongNumArgs(interp, 2, objv, "statustype");
+			return TCL_ERROR;
+		}
+		if ((status_type = gaim_tcl_ref_get(interp, objv[2], GaimTclRefStatusType)) == NULL)
+			return TCL_ERROR;
+		Tcl_SetStringObj(result, gaim_status_type_get_primary_attr(status_type), -1);
+		break;
+	case CMD_STATUS_TYPE_SAVEABLE:
+		if (objc != 3) {
+			Tcl_WrongNumArgs(interp, 2, objv, "statustype");
+			return TCL_ERROR;
+		}
+		if ((status_type = gaim_tcl_ref_get(interp, objv[2], GaimTclRefStatusType)) == NULL)
+			return TCL_ERROR;
+		Tcl_SetBooleanObj(result, gaim_status_type_is_saveable(status_type));
+		break;
+	case CMD_STATUS_TYPE_USER_SETTABLE:
+		if (objc != 3) {
+			Tcl_WrongNumArgs(interp, 2, objv, "statustype");
+			return TCL_ERROR;
+		}
+		if ((status_type = gaim_tcl_ref_get(interp, objv[2], GaimTclRefStatusType)) == NULL)
+			return TCL_ERROR;
+		Tcl_SetBooleanObj(result, gaim_status_type_is_user_settable(status_type));
+		break;
+	}
+
+	return TCL_OK;
+}
+
 static gboolean unload_self(gpointer data)
 {
 	GaimPlugin *plugin = data;

Modified: branches/soc-2006-file-loggers/plugins/tcl/tcl_gaim.h
===================================================================
--- branches/soc-2006-file-loggers/plugins/tcl/tcl_gaim.h	2006-06-17 01:33:09 UTC (rev 16271)
+++ branches/soc-2006-file-loggers/plugins/tcl/tcl_gaim.h	2006-06-17 02:11:13 UTC (rev 16272)
@@ -28,6 +28,7 @@
 #include "internal.h"
 #include "plugin.h"
 #include "value.h"
+#include "stringref.h"
 
 struct tcl_signal_handler {
 	Tcl_Obj *signal;
@@ -46,6 +47,16 @@
 
 extern GaimPlugin *_tcl_plugin;
 
+/* Capitalized this way because these are "types" */
+extern GaimStringref *GaimTclRefAccount;
+extern GaimStringref *GaimTclRefConnection;
+extern GaimStringref *GaimTclRefConversation;
+extern GaimStringref *GaimTclRefPointer;
+extern GaimStringref *GaimTclRefPresence;
+extern GaimStringref *GaimTclRefStatus;
+extern GaimStringref *GaimTclRefStatusAttr;
+extern GaimStringref *GaimTclRefStatusType;
+
 GaimPlugin *tcl_interp_get_plugin(Tcl_Interp *interp);
 
 void tcl_signal_init(void);
@@ -54,6 +65,10 @@
 gboolean tcl_signal_connect(struct tcl_signal_handler *handler);
 void tcl_signal_disconnect(void *instance, const char *signal, 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);
+
 Tcl_ObjCmdProc tcl_cmd_account;
 Tcl_ObjCmdProc tcl_cmd_signal_connect;
 Tcl_ObjCmdProc tcl_cmd_buddy;
@@ -63,8 +78,12 @@
 Tcl_ObjCmdProc tcl_cmd_debug;
 Tcl_ObjCmdProc tcl_cmd_notify;
 Tcl_ObjCmdProc tcl_cmd_prefs;
+Tcl_ObjCmdProc tcl_cmd_presence;
 Tcl_ObjCmdProc tcl_cmd_send_im;
 Tcl_ObjCmdProc tcl_cmd_signal;
+Tcl_ObjCmdProc tcl_cmd_status;
+Tcl_ObjCmdProc tcl_cmd_status_attr;
+Tcl_ObjCmdProc tcl_cmd_status_type;
 Tcl_ObjCmdProc tcl_cmd_unload;
 
 #endif /* _GAIM_TCL_GAIM_H_ */

Modified: branches/soc-2006-file-loggers/plugins/tcl/tcl_glib.c
===================================================================
--- branches/soc-2006-file-loggers/plugins/tcl/tcl_glib.c	2006-06-17 01:33:09 UTC (rev 16271)
+++ branches/soc-2006-file-loggers/plugins/tcl/tcl_glib.c	2006-06-17 02:11:13 UTC (rev 16272)
@@ -1,7 +1,7 @@
 /*
  * Tcl/Glib glue
  *
- * Copyright (C) 2003, 2004 Ethan Blanton <ebl...@cs...>
+ * Copyright (C) 2003, 2004, 2006 Ethan Blanton <ebl...@cs...>
  *
  * This file is dual-licensed under the two sets of terms below.  You may
  * use, redistribute, or modify it pursuant to either the set of conditions
@@ -157,8 +157,8 @@
 	GIOChannel *channel;
 	GIOCondition cond = 0;
 
-	if (g_hash_table_lookup(tcl_file_handlers, (gpointer)fd))
-		tcl_delete_file_handler(fd);
+	if (g_hash_table_lookup(tcl_file_handlers, GINT_TO_POINTER(fd)))
+            tcl_delete_file_handler(fd);
 	
 	if (mask & TCL_READABLE)
 		cond |= G_IO_IN;
@@ -176,7 +176,7 @@
 	tfh->source = g_io_add_watch_full(channel, G_PRIORITY_DEFAULT, cond, tcl_file_callback, tfh, g_free);
 	g_io_channel_unref(channel);
 
-	g_hash_table_insert(tcl_file_handlers, (gpointer)fd, tfh);
+	g_hash_table_insert(tcl_file_handlers, GINT_TO_POINTER(fd), tfh);
 
 	Tcl_ServiceAll();
 }
@@ -189,7 +189,7 @@
 		return;
 
 	g_source_remove(tfh->source);
-	g_hash_table_remove(tcl_file_handlers, (gpointer)fd);
+	g_hash_table_remove(tcl_file_handlers, GINT_TO_POINTER(fd));
 
 	Tcl_ServiceAll();
 }
@@ -241,7 +241,7 @@
 		return 0;
 	}
 
-	tfh = g_hash_table_lookup(tcl_file_handlers, (gpointer)fev->fd);
+	tfh = g_hash_table_lookup(tcl_file_handlers, GINT_TO_POINTER(fev->fd));
 	if (tfh == NULL)
 		return 1;
 

Modified: branches/soc-2006-file-loggers/plugins/tcl/tcl_signals.c
===================================================================
--- branches/soc-2006-file-loggers/plugins/tcl/tcl_signals.c	2006-06-17 01:33:09 UTC (rev 16271)
+++ branches/soc-2006-file-loggers/plugins/tcl/tcl_signals.c	2006-06-17 02:11:13 UTC (rev 16272)
@@ -48,7 +48,8 @@
 		return;
 
 	Tcl_DecrRefCount(handler->signal);
-	Tcl_DecrRefCount(handler->namespace);
+	if (handler->namespace)
+		Tcl_DecrRefCount(handler->namespace);
 	g_free(handler);
 }
 
@@ -86,7 +87,6 @@
 				       (void *)handler))
 		return FALSE;
 
-	Tcl_IncrRefCount(handler->signal);
 	handler->namespace = new_cb_namespace ();
 	Tcl_IncrRefCount(handler->namespace);
 	proc = g_string_new("");
@@ -134,6 +134,22 @@
 		tcl_callbacks = g_list_remove_all(tcl_callbacks, NULL);
 }
 
+static GaimStringref *ref_type(GaimSubType type)
+{
+	switch (type) {
+	case GAIM_SUBTYPE_ACCOUNT:
+		return GaimTclRefAccount;
+	case GAIM_SUBTYPE_CONNECTION:
+		return GaimTclRefConnection;
+	case GAIM_SUBTYPE_CONVERSATION:
+		return GaimTclRefConversation;
+	case GAIM_SUBTYPE_STATUS:
+		return GaimTclRefStatus;
+	default:
+		return NULL;
+	}
+}
+
 static void *tcl_signal_callback(va_list args, struct tcl_signal_handler *handler)
 {
 	GString *name, *val;
@@ -170,14 +186,9 @@
 		case GAIM_TYPE_OBJECT:
 		case GAIM_TYPE_BOXED:
 			/* These are all "pointer" types to us */
-			if (gaim_value_is_outgoing(handler->argtypes[i])) {
-				vals[i] = va_arg(args, void **);
-				Tcl_LinkVar(handler->interp, name->str,
-					    vals[i], TCL_LINK_INT);
-				arg = Tcl_NewStringObj(name->str, -1);
-			} else {
-				arg = Tcl_NewIntObj((int)va_arg(args, void *));
-			}
+			if (gaim_value_is_outgoing(handler->argtypes[i]))
+				gaim_debug_error("tcl", "pointer types do not currently support outgoing arguments\n");
+			arg = gaim_tcl_ref_new(GaimTclRefPointer, va_arg(args, void *));
 			break;
 		case GAIM_TYPE_BOOLEAN:
 			if (gaim_value_is_outgoing(handler->argtypes[i])) {
@@ -258,6 +269,11 @@
 			case GAIM_SUBTYPE_ACCOUNT:
 			case GAIM_SUBTYPE_CONNECTION:
 			case GAIM_SUBTYPE_CONVERSATION:
+			case GAIM_SUBTYPE_STATUS:
+				if (gaim_value_is_outgoing(handler->argtypes[i]))
+					gaim_debug_error("tcl", "pointer subtypes do not currently support outgoing arguments\n");
+				arg = gaim_tcl_ref_new(ref_type(gaim_value_get_subtype(handler->argtypes[i])), va_arg(args, void *));
+				break;
 			case GAIM_SUBTYPE_PLUGIN:
 			case GAIM_SUBTYPE_XFER:
 				/* pointers again */
@@ -281,24 +297,40 @@
 					node = va_arg(args, GaimBlistNode *);
 				switch (node->type) {
 				case GAIM_BLIST_GROUP_NODE:
-					g_string_printf(val, "group {%s}", ((GaimGroup *)node)->name);
+					arg = Tcl_NewListObj(0, NULL);
+					Tcl_ListObjAppendElement(handler->interp, arg,
+								 Tcl_NewStringObj("group", -1));
+					Tcl_ListObjAppendElement(handler->interp, arg,
+								 Tcl_NewStringObj(((GaimGroup *)node)->name, -1));
 					break;
 				case GAIM_BLIST_CONTACT_NODE:
 					/* g_string_printf(val, "contact {%s}", Contact Name? ); */
+					arg = Tcl_NewStringObj("contact", -1);
 					break;
 				case GAIM_BLIST_BUDDY_NODE:
-					g_string_printf(val, "buddy {%s} %lu", ((GaimBuddy *)node)->name,
-							(unsigned long)((GaimBuddy *)node)->account);
+					arg = Tcl_NewListObj(0, NULL);
+					Tcl_ListObjAppendElement(handler->interp, arg,
+								 Tcl_NewStringObj("buddy", -1));
+					Tcl_ListObjAppendElement(handler->interp, arg,
+								 Tcl_NewStringObj(((GaimBuddy *)node)->name, -1));
+					Tcl_ListObjAppendElement(handler->interp, arg,
+								 gaim_tcl_ref_new(GaimTclRefAccount,
+										  ((GaimBuddy *)node)->account));
 					break;
 				case GAIM_BLIST_CHAT_NODE:
-					g_string_printf(val, "chat {%s} %lu", ((GaimChat *)node)->alias,
-							(unsigned long)((GaimChat *)node)->account);
+					arg = Tcl_NewListObj(0, NULL);
+					Tcl_ListObjAppendElement(handler->interp, arg,
+								 Tcl_NewStringObj("chat", -1));
+					Tcl_ListObjAppendElement(handler->interp, arg,
+								 Tcl_NewStringObj(((GaimChat *)node)->alias, -1));
+					Tcl_ListObjAppendElement(handler->interp, arg,
+								 gaim_tcl_ref_new(GaimTclRefAccount,
+										  ((GaimChat *)node)->account));
 					break;
 				case GAIM_BLIST_OTHER_NODE:
-					g_string_printf(val, "other");
+					arg = Tcl_NewStringObj("other", -1);
 					break;
 				}
-				arg = Tcl_NewStringObj(val->str, -1);
 				break;
 			}
 		}
@@ -329,8 +361,10 @@
 	for (i = 0; i < handler->nargs; i++) {
 		g_string_printf(name, "%s::arg%d",
 				Tcl_GetString(handler->namespace), i);
-		if (gaim_value_is_outgoing(handler->argtypes[i]))
+		if (gaim_value_is_outgoing(handler->argtypes[i])
+		    && gaim_value_get_type(handler->argtypes[i]) != GAIM_TYPE_SUBTYPE)
 			Tcl_UnlinkVar(handler->interp, name->str);
+
 		/* We basically only have to deal with strings on the
 		 * way out */
 		switch (gaim_value_get_type(handler->argtypes[i])) {

Modified: branches/soc-2006-file-loggers/src/Makefile.am
===================================================================
--- branches/soc-2006-file-loggers/src/Makefile.am	2006-06-17 01:33:09 UTC (rev 16271)
+++ branches/soc-2006-file-loggers/src/Makefile.am	2006-06-17 02:11:13 UTC (rev 16272)
@@ -347,7 +347,8 @@
 	$(SM_LIBS) \
 	$(INTLLIBS) \
 	$(GTKSPELL_LIBS) \
-	$(STARTUP_NOTIFICATION_LIBS) 
+	$(STARTUP_NOTIFICATION_LIBS) \
+	$(LIBXML_LIBS)
 
 AM_CPPFLAGS = \
 	-DBR_PTHREADS=0 \
@@ -361,4 +362,5 @@
 	$(GTK_CFLAGS) \
 	$(DBUS_CFLAGS) \
 	$(GTKSPELL_CFLAGS) \
-	$(STARTUP_NOTIFICATION_CFLAGS)
+	$(STARTUP_NOTIFICATION_CFLAGS) \
+	$(LIBXML_CFLAGS)

Modified: branches/soc-2006-file-loggers/src/Makefile.mingw
===================================================================
--- branches/soc-2006-file-loggers/src/Makefile.mingw	2006-06-17 01:33:09 UTC (rev 16271)
+++ branches/soc-2006-file-loggers/sr...
 
[truncated message content]

[Gaim-commits] SF.net SVN: gaim: [16271] trunk/src/protocols/msn

[<the...@us...>]

Revision: 16271
Author:   thekingant
Date:     2006-06-16 18:33:09 -0700 (Fri, 16 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16271&view=rev

Log Message:
-----------
Some comment changes

Modified Paths:
--------------
    trunk/src/protocols/msn/userlist.c
    trunk/src/protocols/oscar/oscar.c
    trunk/src/protocols/yahoo/yahoo_packet.c
Modified: trunk/src/protocols/msn/userlist.c
===================================================================
--- trunk/src/protocols/msn/userlist.c	2006-06-16 16:17:20 UTC (rev 16270)
+++ trunk/src/protocols/msn/userlist.c	2006-06-17 01:33:09 UTC (rev 16271)
@@ -292,6 +292,11 @@
  
 		if (!(user->list_op & (MSN_LIST_AL_OP | MSN_LIST_BL_OP)))
 		{
+			/*
+			 * TODO: The friendly name was NULL for me when I
+			 *       looked at this.  Maybe we should use the store
+			 *       name instead? --KingAnt
+			 */
 			got_new_entry(gc, passport, friendly);
 		}
 	}
@@ -413,7 +418,12 @@
 	if (list_op & MSN_LIST_RL_OP)
 	{
 		/* These are users who have us on their buddy list. */
-		/* TODO: what does store name is when this happens? */
+		/*
+		 * TODO: What is store name set to when this happens?
+		 *       For one of my accounts "som...@ho..."
+		 *       the store name was "something."  Maybe we
+		 *       should use the friendly name, instead? --KingAnt
+		 */
 
 		if (!(list_op & (MSN_LIST_AL_OP | MSN_LIST_BL_OP)))
 		{

Modified: trunk/src/protocols/oscar/oscar.c
===================================================================
--- trunk/src/protocols/oscar/oscar.c	2006-06-16 16:17:20 UTC (rev 16270)
+++ trunk/src/protocols/oscar/oscar.c	2006-06-17 01:33:09 UTC (rev 16271)
@@ -1903,6 +1903,7 @@
 			file = g_fopen(iconfile, "rb");
 			if (file) {
 				/* XXX - Use g_file_get_contents() */
+				/* g_file_get_contents(iconfile, &data, &len, NULL); */
 				int len = fread(buf, 1, st.st_size, file);
 				gaim_debug_info("oscar",
 						   "Sending buddy icon to %s (%d bytes, "

Modified: trunk/src/protocols/yahoo/yahoo_packet.c
===================================================================
--- trunk/src/protocols/yahoo/yahoo_packet.c	2006-06-16 16:17:20 UTC (rev 16270)
+++ trunk/src/protocols/yahoo/yahoo_packet.c	2006-06-17 01:33:09 UTC (rev 16271)
@@ -116,7 +116,7 @@
 
 		struct yahoo_pair *pair = g_new0(struct yahoo_pair, 1);
 
-		/* this is weird, and in one of the chat packets, and causes us
+		/* this is weird, and in one of the chat packets, and causes us to
 		 * think all the values are keys and all the keys are values after
 		 * this point if we don't handle it */
 		if (data[pos] == '\0') {


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

[Gaim-commits] SF.net SVN: gaim: [16270] trunk/plugins/tcl/tcl_cmds.c

[<ebl...@us...>]

Revision: 16270
Author:   eblanton
Date:     2006-06-16 09:17:20 -0700 (Fri, 16 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16270&view=rev

Log Message:
-----------
Allow account status to be set (since setting status attrs does nothing)

Modified Paths:
--------------
    trunk/plugins/tcl/tcl_cmds.c
Modified: trunk/plugins/tcl/tcl_cmds.c
===================================================================
--- trunk/plugins/tcl/tcl_cmds.c	2006-06-16 03:49:14 UTC (rev 16269)
+++ trunk/plugins/tcl/tcl_cmds.c	2006-06-16 16:17:20 UTC (rev 16270)
@@ -97,26 +97,29 @@
 int tcl_cmd_account(ClientData unused, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
 	Tcl_Obj *result = Tcl_GetObjResult(interp), *list, *elem;
-	const char *cmds[] = { "active_status", "alias", "connect",
-	                       "connection", "disconnect", "enabled", "find",
-	                       "handle", "isconnected", "list", "presence",
-	                       "protocol", "status_type", "status_types",
-	                       "username", NULL };
-	enum { CMD_ACCOUNT_ACTIVE_STATUS, CMD_ACCOUNT_ALIAS,
+	const char *cmds[] = { "alias", "connect", "connection", "disconnect",
+	                       "enabled", "find", "handle", "isconnected",
+	                       "list", "presence", "protocol", "status",
+	                       "status_type", "status_types", "username",
+	                       NULL };
+	enum { CMD_ACCOUNT_ALIAS,
 	       CMD_ACCOUNT_CONNECT, CMD_ACCOUNT_CONNECTION,
 	       CMD_ACCOUNT_DISCONNECT, CMD_ACCOUNT_ENABLED, CMD_ACCOUNT_FIND,
 	       CMD_ACCOUNT_HANDLE, CMD_ACCOUNT_ISCONNECTED, CMD_ACCOUNT_LIST,
-	       CMD_ACCOUNT_PRESENCE,
-	       CMD_ACCOUNT_PROTOCOL, CMD_ACCOUNT_STATUS_TYPE,
-	       CMD_ACCOUNT_STATUS_TYPES, CMD_ACCOUNT_USERNAME } cmd;
+	       CMD_ACCOUNT_PRESENCE, CMD_ACCOUNT_PROTOCOL, CMD_ACCOUNT_STATUS,
+	       CMD_ACCOUNT_STATUS_TYPE, CMD_ACCOUNT_STATUS_TYPES,
+	       CMD_ACCOUNT_USERNAME } cmd;
 	const char *listopts[] = { "-all", "-online", NULL };
 	enum { CMD_ACCOUNTLIST_ALL, CMD_ACCOUNTLIST_ONLINE } listopt;
 	const char *alias;
 	const GList *cur;
 	GaimAccount *account;
+	GaimStatus *status;
 	GaimStatusType *status_type;
+	GaimValue *value;
+	char *attr_id;
 	int error;
-	int b;
+	int b, i;
 
 	if (objc < 2) {
 		Tcl_WrongNumArgs(interp, 1, objv, "subcommand ?args?");
@@ -127,17 +130,6 @@
 		return error;
 
 	switch (cmd) {
-	case CMD_ACCOUNT_ACTIVE_STATUS:
-		if (objc != 3) {
-			Tcl_WrongNumArgs(interp, 2, objv, "account");
-			return TCL_ERROR;
-		}
-		if ((account = tcl_validate_account(objv[2], interp)) == NULL)
-			return TCL_ERROR;
-		Tcl_SetObjResult(interp,
-		                 gaim_tcl_ref_new(GaimTclRefStatus,
-		                                  gaim_account_get_active_status(account)));
-		break;
 	case CMD_ACCOUNT_ALIAS:
 		if (objc != 3) {
 			Tcl_WrongNumArgs(interp, 2, objv, "account");
@@ -264,6 +256,63 @@
 			return TCL_ERROR;
 		Tcl_SetStringObj(result, (char *)gaim_account_get_protocol_id(account), -1);
 		break;
+	case CMD_ACCOUNT_STATUS:
+		if (objc < 3) {
+			Tcl_WrongNumArgs(interp, 2, objv, "account ?status_id name value ...?");
+			return TCL_ERROR;
+		}
+		if ((account = tcl_validate_account(objv[2], interp)) == NULL)
+			return TCL_ERROR;
+		if (objc == 3) {
+			Tcl_SetObjResult(interp,
+					 gaim_tcl_ref_new(GaimTclRefStatus,
+							  gaim_account_get_active_status(account)));
+		} else {
+			GList *l = NULL;
+			if (objc % 2) {
+				Tcl_SetStringObj(result, "name without value setting status", -1);
+				return TCL_ERROR;
+			}
+			status = gaim_account_get_status(account, Tcl_GetString(objv[3]));
+			if (status == NULL) {
+				Tcl_SetStringObj(result, "invalid status for account", -1);
+				return TCL_ERROR;
+			}
+			for (i = 4; i < objc; i += 2) {
+				attr_id = Tcl_GetString(objv[i]);
+				value = gaim_status_get_attr_value(status, attr_id);
+				if (value == NULL) {
+					Tcl_SetStringObj(result, "invalid attribute for account", -1);
+					return TCL_ERROR;
+				}
+				switch (gaim_value_get_type(value)) {
+				case GAIM_TYPE_BOOLEAN:
+					error = Tcl_GetBooleanFromObj(interp, objv[i + 1], &b);
+					if (error != TCL_OK)
+						return error;
+					l = g_list_append(l, attr_id);
+					l = g_list_append(l, GINT_TO_POINTER(b));
+					break;
+				case GAIM_TYPE_INT:
+					error = Tcl_GetIntFromObj(interp, objv[i + 1], &b);
+					if (error != TCL_OK)
+						return error;
+					l = g_list_append(l, attr_id);
+					l = g_list_append(l, GINT_TO_POINTER(b));
+					break;
+				case GAIM_TYPE_STRING:
+					l = g_list_append(l, attr_id);
+					l = g_list_append(l, Tcl_GetString(objv[i + 1]));
+					break;
+				default:
+					Tcl_SetStringObj(result, "unknown GaimValue type", -1);
+					return TCL_ERROR;
+				}
+			}
+			gaim_account_set_status_list(account, Tcl_GetString(objv[3]), TRUE, l);
+			g_list_free(l);
+		}
+		break;
 	case CMD_ACCOUNT_STATUS_TYPE:
 		if (objc != 4 && objc != 5) {
 			Tcl_WrongNumArgs(interp, 2, objv, "account ?statustype? ?-primitive primitive?");
@@ -1177,7 +1226,7 @@
 
 int tcl_cmd_status(ClientData unused, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
-	const char *cmds[] = { "attr", "type" };
+	const char *cmds[] = { "attr", "type", NULL };
 	enum { CMD_STATUS_ATTR, CMD_STATUS_TYPE } cmd;
 	Tcl_Obj *result = Tcl_GetObjResult(interp);
 	GaimStatus *status;


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

[Gaim-commits] SF.net SVN: gaim: [16269] trunk/plugins/tcl

[<ebl...@us...>]

Revision: 16269
Author:   eblanton
Date:     2006-06-15 20:49:14 -0700 (Thu, 15 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16269&view=rev

Log Message:
-----------
Fix some spacing bugs and a stupid copy-and-paste error

Modified Paths:
--------------
    trunk/plugins/tcl/tcl.c
    trunk/plugins/tcl/tcl_ref.c
Modified: trunk/plugins/tcl/tcl.c
===================================================================
--- trunk/plugins/tcl/tcl.c	2006-06-16 03:42:34 UTC (rev 16268)
+++ trunk/plugins/tcl/tcl.c	2006-06-16 03:49:14 UTC (rev 16269)
@@ -135,8 +135,8 @@
 	Tcl_CreateObjCommand(interp, "::gaim::presence", tcl_cmd_presence, (ClientData)NULL, NULL);
 	Tcl_CreateObjCommand(interp, "::gaim::send_im", tcl_cmd_send_im, (ClientData)NULL, NULL);
 	Tcl_CreateObjCommand(interp, "::gaim::signal", tcl_cmd_signal, (ClientData)NULL, NULL);
-	Tcl_CreateObjCommand(interp, "::gaim::status", tcl_cmd_status_type, (ClientData)NULL, NULL);
-	Tcl_CreateObjCommand(interp, "::gaim::status_attr", tcl_cmd_status_type, (ClientData)NULL, NULL);
+	Tcl_CreateObjCommand(interp, "::gaim::status", tcl_cmd_status, (ClientData)NULL, NULL);
+	Tcl_CreateObjCommand(interp, "::gaim::status_attr", tcl_cmd_status_attr, (ClientData)NULL, NULL);
 	Tcl_CreateObjCommand(interp, "::gaim::status_type", tcl_cmd_status_type, (ClientData)NULL, NULL);
 	Tcl_CreateObjCommand(interp, "::gaim::unload", tcl_cmd_unload, (ClientData)NULL, NULL);
 

Modified: trunk/plugins/tcl/tcl_ref.c
===================================================================
--- trunk/plugins/tcl/tcl_ref.c	2006-06-16 03:42:34 UTC (rev 16268)
+++ trunk/plugins/tcl/tcl_ref.c	2006-06-16 03:49:14 UTC (rev 16269)
@@ -60,7 +60,7 @@
 		if (interp) {
 			Tcl_Obj *error = Tcl_NewStringObj("Bad Gaim reference type: expected ", -1);
 			Tcl_AppendToObj(error, gaim_stringref_value(type), -1);
-			Tcl_AppendToObj(error, "but got ", -1);
+			Tcl_AppendToObj(error, " but got ", -1);
 			Tcl_AppendToObj(error, gaim_stringref_value(OBJ_REF_TYPE(obj)), -1);
 			Tcl_SetObjResult(interp, error);
 		}


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

[Gaim-commits] SF.net SVN: gaim: [16268] trunk/plugins/tcl

[<ebl...@us...>]

Revision: 16268
Author:   eblanton
Date:     2006-06-15 20:42:34 -0700 (Thu, 15 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16268&view=rev

Log Message:
-----------
Shut up a useless warning, fix a return bug, and allow setting of status attrs

Modified Paths:
--------------
    trunk/plugins/tcl/tcl_cmds.c
    trunk/plugins/tcl/tcl_gaim.h
Modified: trunk/plugins/tcl/tcl_cmds.c
===================================================================
--- trunk/plugins/tcl/tcl_cmds.c	2006-06-16 03:24:46 UTC (rev 16267)
+++ trunk/plugins/tcl/tcl_cmds.c	2006-06-16 03:42:34 UTC (rev 16268)
@@ -252,7 +252,7 @@
 		}
 		if ((account = tcl_validate_account(objv[2], interp)) == NULL)
 			return TCL_ERROR;
-		Tcl_SetObjResult(result, gaim_tcl_ref_new(GaimTclRefPresence,
+		Tcl_SetObjResult(interp, gaim_tcl_ref_new(GaimTclRefPresence,
 							  gaim_account_get_presence(account)));
 		break;
 	case CMD_ACCOUNT_PROTOCOL:
@@ -1183,7 +1183,8 @@
 	GaimStatus *status;
 	GaimStatusType *status_type;
 	GaimValue *value;
-	int error;
+	const char *attr;
+	int error, v;
 
 	if (objc < 2) {
 		Tcl_WrongNumArgs(interp, 1, objv, "subcommand ?args?");
@@ -1195,26 +1196,42 @@
 
 	switch (cmd) {
 	case CMD_STATUS_ATTR:
-		if (objc != 4) {
-			Tcl_WrongNumArgs(interp, 2, objv, "status attr_id");
+		if (objc != 4 && objc != 5) {
+			Tcl_WrongNumArgs(interp, 2, objv, "status attr_id ?value?");
 			return TCL_ERROR;
 		}
 		if ((status = gaim_tcl_ref_get(interp, objv[2], GaimTclRefStatus)) == NULL)
 			return TCL_ERROR;
-		value = gaim_status_get_attr_value(status, Tcl_GetString(objv[3]));
+		attr = Tcl_GetString(objv[3]);
+		value = gaim_status_get_attr_value(status, attr);
 		if (value == NULL) {
 			Tcl_SetStringObj(result, "no such attribute", -1);
 			return TCL_ERROR;
 		}
 		switch (gaim_value_get_type(value)) {
 		case GAIM_TYPE_BOOLEAN:
-			Tcl_SetBooleanObj(result, gaim_value_get_boolean(value));
+			if (objc == 4) {
+				Tcl_SetBooleanObj(result, gaim_value_get_boolean(value));
+			} else {
+				if ((error = Tcl_GetBooleanFromObj(interp, objv[4], &v)) != TCL_OK)
+					return error;
+				gaim_status_set_attr_boolean(status, attr, v);
+			}
 			break;
 		case GAIM_TYPE_INT:
-			Tcl_SetIntObj(result, gaim_value_get_int(value));
+			if (objc == 4) {
+				Tcl_SetIntObj(result, gaim_value_get_int(value));
+			} else {
+				if ((error = Tcl_GetIntFromObj(interp, objv[4], &v)) != TCL_OK)
+					return error;
+				gaim_status_set_attr_int(status, attr, v );
+			}
 			break;
 		case GAIM_TYPE_STRING:
-			Tcl_SetStringObj(result, gaim_value_get_string(value), -1);
+			if (objc == 4)
+				Tcl_SetStringObj(result, gaim_value_get_string(value), -1);
+			else
+				gaim_status_set_attr_string(status, attr, Tcl_GetString(objv[4]));
 			break;
 		default:
 			Tcl_SetStringObj(result, "attribute has unknown type", -1);

Modified: trunk/plugins/tcl/tcl_gaim.h
===================================================================
--- trunk/plugins/tcl/tcl_gaim.h	2006-06-16 03:24:46 UTC (rev 16267)
+++ trunk/plugins/tcl/tcl_gaim.h	2006-06-16 03:42:34 UTC (rev 16268)
@@ -65,7 +65,7 @@
 gboolean tcl_signal_connect(struct tcl_signal_handler *handler);
 void tcl_signal_disconnect(void *instance, const char *signal, Tcl_Interp *interp);
 
-void gaim_tcl_ref_init();
+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);
 


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