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

[Gaim-commits] SF.net SVN: gaim: [17550] trunk/gtk/plugins/gevolution/gevolution.c

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

Revision: 17550
          http://svn.sourceforge.net/gaim/?rev=17550&view=rev
Author:   deryni9
Date:     2006-10-19 15:17:30 -0700 (Thu, 19 Oct 2006)

Log Message:
-----------
Fix a leak, patch by Henning Nor?\195?\169n (1580758).

Modified Paths:
--------------
    trunk/gtk/plugins/gevolution/gevolution.c

Modified: trunk/gtk/plugins/gevolution/gevolution.c
===================================================================
--- trunk/gtk/plugins/gevolution/gevolution.c	2006-10-19 22:02:25 UTC (rev 17549)
+++ trunk/gtk/plugins/gevolution/gevolution.c	2006-10-19 22:17:30 UTC (rev 17550)
@@ -79,7 +79,7 @@
 	{
 		GaimConnection *gc = (GaimConnection *)l->data;
 		GaimAccount *account = gaim_connection_get_account(gc);
-		char *me = g_strdup(gaim_normalize(account, gaim_account_get_username(account)));
+		char *me;
 
 		if (strcmp(gaim_account_get_protocol_id(account), prpl_id))
 			continue;
@@ -87,6 +87,7 @@
 		if (!gaim_account_get_bool(account, "gevo-autoadd", FALSE))
 			continue;
 
+		me = g_strdup(gaim_normalize(account, gaim_account_get_username(account)));
 		for (l2 = ims; l2 != NULL; l2 = l2->next)
 		{
 			if (gaim_find_buddy(account, l2->data) != 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: [17549] trunk/gtk/gtkstatusbox.c

[<sa...@us...>]

Revision: 17549
          http://svn.sourceforge.net/gaim/?rev=17549&view=rev
Author:   sadrul
Date:     2006-10-19 15:02:25 -0700 (Thu, 19 Oct 2006)

Log Message:
-----------
Fix bug #1580569

Modified Paths:
--------------
    trunk/gtk/gtkstatusbox.c

Modified: trunk/gtk/gtkstatusbox.c
===================================================================
--- trunk/gtk/gtkstatusbox.c	2006-10-19 14:05:30 UTC (rev 17548)
+++ trunk/gtk/gtkstatusbox.c	2006-10-19 22:02:25 UTC (rev 17549)
@@ -1231,19 +1231,19 @@
 		}
 		gtk_gaim_status_box_set_buddy_icon(box, filename);
 	}
-
-	box->buddy_icon_sel = NULL;
 }
 
 static void
 icon_choose_cb(const char *filename, gpointer data)
 {
 	GtkGaimStatusBox *box = data;
-	if (box->account == NULL)
+	if (box->account == NULL && filename)
 		/* The pref-connect callback does the actual work */
 		gaim_prefs_set_string("/gaim/gtk/accounts/buddyicon", filename);
 	else
 		buddy_icon_set_cb(filename, data);
+
+	box->buddy_icon_sel = NULL;
 }
 
 static void


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

[Gaim-commits] SF.net SVN: gaim: [17548] trunk/configure.ac

[<dat...@us...>]

Revision: 17548
          http://svn.sourceforge.net/gaim/?rev=17548&view=rev
Author:   datallah
Date:     2006-10-19 07:05:30 -0700 (Thu, 19 Oct 2006)

Log Message:
-----------
eperez noticed that I missed this

Modified Paths:
--------------
    trunk/configure.ac

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-10-19 06:51:22 UTC (rev 17547)
+++ trunk/configure.ac	2006-10-19 14:05:30 UTC (rev 17548)
@@ -1874,7 +1874,6 @@
 		   gtk/pixmaps/status/default/Makefile
 		   gtk/plugins/Makefile
 		   gtk/plugins/cap/Makefile
-		   gtk/plugins/docklet/Makefile
 		   gtk/plugins/gestures/Makefile
 		   gtk/plugins/gevolution/Makefile
 		   gtk/plugins/musicmessaging/Makefile


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

[Gaim-commits] SF.net SVN: gaim: [17547] trunk/console/plugins/gnthistory.c

[<sa...@us...>]

Revision: 17547
          http://svn.sourceforge.net/gaim/?rev=17547&view=rev
Author:   sadrul
Date:     2006-10-18 23:51:22 -0700 (Wed, 18 Oct 2006)

Log Message:
-----------
Do not include what you do not use.

Modified Paths:
--------------
    trunk/console/plugins/gnthistory.c

Modified: trunk/console/plugins/gnthistory.c
===================================================================
--- trunk/console/plugins/gnthistory.c	2006-10-19 06:16:14 UTC (rev 17546)
+++ trunk/console/plugins/gnthistory.c	2006-10-19 06:51:22 UTC (rev 17547)
@@ -34,8 +34,6 @@
 
 #include "gntplugin.h"
 
-#include <gnttextview.h>
-
 #define HISTORY_PLUGIN_ID "gnt-history"
 
 #define HISTORY_SIZE (4 * 1024)


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

[Gaim-commits] SF.net SVN: gaim: [17546] trunk/configure.ac

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

Revision: 17546
          http://svn.sourceforge.net/gaim/?rev=17546&view=rev
Author:   deryni9
Date:     2006-10-18 23:16:14 -0700 (Wed, 18 Oct 2006)

Log Message:
-----------
<SimGuy> deryni: the change to the summary output to fix the spelling of
"services" makes the DBUS line's ':' not line up with the rest of them :)
<SimGuy> deryni: in other words, a single dot needs removal :)
<deryni> SimGuy: Bah, thanks.
<SimGuy> deryni: you can thank open_source_nut... I wouldn't have been
checking my own configure output otherwise :P

Modified Paths:
--------------
    trunk/configure.ac

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-10-19 05:56:00 UTC (rev 17545)
+++ trunk/configure.ac	2006-10-19 06:16:14 UTC (rev 17546)
@@ -1930,7 +1930,7 @@
 echo Build with GStreamer support.. : $enable_gst
 echo Build with DBUS support....... : $enable_dbus
 if test "x$enable_dbus" = "xyes" ; then
-	eval eval echo DBUS services directory........ : $DBUS_SERVICES_DIR
+	eval eval echo DBUS services directory....... : $DBUS_SERVICES_DIR
 fi
 echo SSL Library/Libraries......... : $msg_ssl
 echo Build with Cyrus SASL support. : $enable_cyrus_sasl


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

[Gaim-commits] SF.net SVN: gaim: [17545] trunk/libgaim/blist.c

[<sa...@us...>]

Revision: 17545
          http://svn.sourceforge.net/gaim/?rev=17545&view=rev
Author:   sadrul
Date:     2006-10-18 22:56:00 -0700 (Wed, 18 Oct 2006)

Log Message:
-----------
Patch #1580124 from Richard Nelson (wabz): There's no need to update a contact
if it doesn't have any child.

Modified Paths:
--------------
    trunk/libgaim/blist.c

Modified: trunk/libgaim/blist.c
===================================================================
--- trunk/libgaim/blist.c	2006-10-19 03:23:01 UTC (rev 17544)
+++ trunk/libgaim/blist.c	2006-10-19 05:56:00 UTC (rev 17545)
@@ -1808,7 +1808,7 @@
 	gaim_blist_schedule_save();
 
 	/* Re-sort the contact */
-	if (contact->priority == buddy) {
+	if (cnode->child && contact->priority == buddy) {
 		gaim_contact_invalidate_priority_buddy(contact);
 		if (ops && ops->update)
 			ops->update(gaimbuddylist, cnode);


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

[Gaim-commits] SF.net SVN: gaim: [17544] trunk/libgaim/network.c

[<dat...@us...>]

Revision: 17544
          http://svn.sourceforge.net/gaim/?rev=17544&view=rev
Author:   datallah
Date:     2006-10-18 20:23:01 -0700 (Wed, 18 Oct 2006)

Log Message:
-----------
Robustify the wingaim network managers stuff.
Apparently if people disable certain windows services the networks lookup fails and the "wait for changes" function returns immediately.
This will make wingaim not go ape when this is the case.

Modified Paths:
--------------
    trunk/libgaim/network.c

Modified: trunk/libgaim/network.c
===================================================================
--- trunk/libgaim/network.c	2006-10-19 03:14:51 UTC (rev 17543)
+++ trunk/libgaim/network.c	2006-10-19 03:23:01 UTC (rev 17544)
@@ -377,7 +377,7 @@
 }
 
 #ifdef _WIN32
-static guint
+static gint
 wgaim_get_connected_network_count(void)
 {
 	guint net_cnt = 0;
@@ -397,7 +397,7 @@
 		gaim_debug_warning("network", "Couldn't look up connected networks. %s (%d).\n", msg, errorid);
 		g_free(msg);
 
-		net_cnt = 1; /* Assume something is connected */
+		return -1;
 	} else {
 		char buf[1024];
 		WSAQUERYSET *res = (LPWSAQUERYSET) buf;
@@ -418,11 +418,14 @@
 
 static gboolean wgaim_network_change_thread_cb(gpointer data)
 {
-	guint new_count;
+	gint new_count;
 	GaimConnectionUiOps *ui_ops = gaim_connections_get_ui_ops();
 
 	new_count = wgaim_get_connected_network_count();
 
+	if (new_count < 0)
+		return FALSE;
+
 	gaim_debug_info("network", "Received Network Change Notification. Current network count is %d, previous count was %d.\n", new_count, current_network_count);
 
 	if (new_count > 0) {
@@ -440,6 +443,7 @@
 {
 	HANDLE h;
 	WSAQUERYSET qs;
+	time_t last_trigger = time(NULL);
 
 	int WSAAPI (*MyWSANSPIoctl) (
 	HANDLE hLookup, DWORD dwControlCode, LPVOID lpvInBuffer,
@@ -463,12 +467,20 @@
 
 		retval = WSALookupServiceBegin(&qs, LUP_RETURN_ALL, &h);
 
+		/* Make sure at least 30 seconds have elapsed since the last
+		 * notification so we don't peg the cpu if this keeps changing. */
+		if ((time(NULL) - last_trigger) < 30)
+			Sleep(30000);
+
+		last_trigger = time(NULL);
+
 		/* This will block until there is a network change */
 		retval = MyWSANSPIoctl(h, SIO_NSP_NOTIFY_CHANGE, NULL, 0, NULL, 0, &retLen, NULL);
 
 		retval = WSALookupServiceEnd(h);
 
 		g_idle_add(wgaim_network_change_thread_cb, NULL);
+
 	}
 }
 #endif
@@ -534,9 +546,17 @@
 {
 #ifdef _WIN32
 	GError *err = NULL;
-	current_network_count = wgaim_get_connected_network_count();
-	if (!g_thread_create(wgaim_network_change_thread, NULL, FALSE, &err))
-		gaim_debug_error("network", "Couldn't create Network Monitor thread: %s\n", err ? err->message : "");
+	gint cnt = wgaim_get_connected_network_count();
+
+	if (cnt < 0) /* Assume there is a network */
+		current_network_count = 1;
+	/* Don't listen for network changes if we can't tell anyway */
+	else
+	{
+		current_network_count = cnt;
+		if (!g_thread_create(wgaim_network_change_thread, NULL, FALSE, &err))
+			gaim_debug_error("network", "Couldn't create Network Monitor thread: %s\n", err ? err->message : "");
+	}
 #endif
 
 	gaim_prefs_add_none  ("/core/network");


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

[Gaim-commits] SF.net SVN: gaim: [17543] trunk/gtk/sounds/Makefile.am

[<dat...@us...>]

Revision: 17543
          http://svn.sourceforge.net/gaim/?rev=17543&view=rev
Author:   datallah
Date:     2006-10-18 20:14:51 -0700 (Wed, 18 Oct 2006)

Log Message:
-----------
Don't install Makefile.mingw. Ari Pollak noticed this.

Modified Paths:
--------------
    trunk/gtk/sounds/Makefile.am

Modified: trunk/gtk/sounds/Makefile.am
===================================================================
--- trunk/gtk/sounds/Makefile.am	2006-10-19 02:37:24 UTC (rev 17542)
+++ trunk/gtk/sounds/Makefile.am	2006-10-19 03:14:51 UTC (rev 17543)
@@ -1,10 +1,10 @@
 EXTRA_DIST = \
-		Makefile.mingw \
+		Makefile.mingw
+
+soundsdir =	$(datadir)/sounds/gaim
+sounds_DATA =	\
 		alert.wav \
 		login.wav \
 		logout.wav \
 		receive.wav \
 		send.wav
-
-soundsdir =	$(datadir)/sounds/gaim
-sounds_DATA =	$(EXTRA_DIST)


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

[Gaim-commits] SF.net SVN: gaim: [17542] trunk/configure.ac

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

Revision: 17542
          http://svn.sourceforge.net/gaim/?rev=17542&view=rev
Author:   deryni9
Date:     2006-10-18 19:37:24 -0700 (Wed, 18 Oct 2006)

Log Message:
-----------
Bj?\195?\182rn Voigt noticed this typo.

Modified Paths:
--------------
    trunk/configure.ac

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-10-19 01:58:21 UTC (rev 17541)
+++ trunk/configure.ac	2006-10-19 02:37:24 UTC (rev 17542)
@@ -1930,7 +1930,7 @@
 echo Build with GStreamer support.. : $enable_gst
 echo Build with DBUS support....... : $enable_dbus
 if test "x$enable_dbus" = "xyes" ; then
-	eval eval echo DBUS servies directory........ : $DBUS_SERVICES_DIR
+	eval eval echo DBUS services directory........ : $DBUS_SERVICES_DIR
 fi
 echo SSL Library/Libraries......... : $msg_ssl
 echo Build with Cyrus SASL support. : $enable_cyrus_sasl


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

[Gaim-commits] SF.net SVN: gaim: [17541] trunk/libgaim/network.c

[<dat...@us...>]

Revision: 17541
          http://svn.sourceforge.net/gaim/?rev=17541&view=rev
Author:   datallah
Date:     2006-10-18 18:58:21 -0700 (Wed, 18 Oct 2006)

Log Message:
-----------
I suck.

Modified Paths:
--------------
    trunk/libgaim/network.c

Modified: trunk/libgaim/network.c
===================================================================
--- trunk/libgaim/network.c	2006-10-19 01:56:40 UTC (rev 17540)
+++ trunk/libgaim/network.c	2006-10-19 01:58:21 UTC (rev 17541)
@@ -489,7 +489,7 @@
 		}
 		if (libnm_retval == LIBNM_ACTIVE_NETWORK_CONNECTION)	return TRUE;
 	}
-#elif define _WIN32
+#elif defined _WIN32
 	return (current_network_count > 0);
 #endif
 	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: [17540] trunk/libgaim/network.c

[<dat...@us...>]

Revision: 17540
          http://svn.sourceforge.net/gaim/?rev=17540&view=rev
Author:   datallah
Date:     2006-10-18 18:56:40 -0700 (Wed, 18 Oct 2006)

Log Message:
-----------
Various fixes for wingaim network manager stuff.
When unable to look up network connections, assume that there is one.
Fix error handling.
Remove note about using WSANSPIoctl directly - it isn't supported on w2k anyway.
Fix compile warning

Modified Paths:
--------------
    trunk/libgaim/network.c

Modified: trunk/libgaim/network.c
===================================================================
--- trunk/libgaim/network.c	2006-10-19 00:03:10 UTC (rev 17539)
+++ trunk/libgaim/network.c	2006-10-19 01:56:40 UTC (rev 17540)
@@ -392,9 +392,12 @@
 
 	retval = WSALookupServiceBegin(&qs, LUP_RETURN_ALL, &h);
 	if (retval != ERROR_SUCCESS) {
-		gchar *msg = g_win32_error_message(retval);
-		gaim_debug_warning("network", "Couldn't look up connected networks. %s (%lu).\n", msg, retval);
+		int errorid = WSAGetLastError();
+		gchar *msg = g_win32_error_message(errorid);
+		gaim_debug_warning("network", "Couldn't look up connected networks. %s (%d).\n", msg, errorid);
 		g_free(msg);
+
+		net_cnt = 1; /* Assume something is connected */
 	} else {
 		char buf[1024];
 		WSAQUERYSET *res = (LPWSAQUERYSET) buf;
@@ -461,10 +464,7 @@
 		retval = WSALookupServiceBegin(&qs, LUP_RETURN_ALL, &h);
 
 		/* This will block until there is a network change */
-		/* This is missing from the MinGW libws2_32.a as of version 3.7.
-		 * When this patch: http://sourceforge.net/tracker/index.php?func=detail&aid=1576083&group_id=2435&atid=302435 gets into a release, we can call this directly
-		 * retval = WSANSPIoctl(h, SIO_NSP_NOTIFY_CHANGE, NULL, 0, NULL, 0, &retLen, NULL);*/
-		 retval = MyWSANSPIoctl(h, SIO_NSP_NOTIFY_CHANGE, NULL, 0, NULL, 0, &retLen, NULL);
+		retval = MyWSANSPIoctl(h, SIO_NSP_NOTIFY_CHANGE, NULL, 0, NULL, 0, &retLen, NULL);
 
 		retval = WSALookupServiceEnd(h);
 
@@ -489,7 +489,7 @@
 		}
 		if (libnm_retval == LIBNM_ACTIVE_NETWORK_CONNECTION)	return TRUE;
 	}
-#elif _WIN32
+#elif define _WIN32
 	return (current_network_count > 0);
 #endif
 	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: [17539] web/htdocs/news.txt

[<sea...@us...>]

Revision: 17539
          http://svn.sourceforge.net/gaim/?rev=17539&view=rev
Author:   seanegan
Date:     2006-10-18 17:03:10 -0700 (Wed, 18 Oct 2006)

Log Message:
-----------
News

Modified Paths:
--------------
    web/htdocs/news.txt

Modified: web/htdocs/news.txt
===================================================================
--- web/htdocs/news.txt	2006-10-18 23:41:57 UTC (rev 17538)
+++ web/htdocs/news.txt	2006-10-19 00:03:10 UTC (rev 17539)
@@ -1,3 +1,7 @@
+2.0.0beta4
+October 18th, 2006 - 4:06 PDT
+Hey, party people. Today we put out Gaim 2.0.0beta4. This one has a whole slew of cool new changes. I've written about some of them at the new <a href="http://gaim.sf.net/planet">Planet Gaim</a> I announced in the previous post. All sorts of packages can be found <a href='http://sourceforge.net/project/showfiles.php?group_id=235&package_id=253&release_id=456679'>here</a>. Enjoy!
+#
 Planet Gaim
 September 26th, 2006 - 1:33PM PDT
 Since we've started going longer periods of time without releasing, as we finsh up 2.0.0, people have been wondering how we're progressing. To answer these questions, I've started a development blog. I've encouraged other Gaim developers to do the same and have set up <a href='http://gaim.sf.net/planet'>Planet Gaim</a> to aggregate everyone's development updates on a single page.


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

[Gaim-commits] SF.net SVN: gaim: [17538] trunk/console/libgnt/Makefile.am

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

Revision: 17538
          http://svn.sourceforge.net/gaim/?rev=17538&view=rev
Author:   eblanton
Date:     2006-10-18 16:41:57 -0700 (Wed, 18 Oct 2006)

Log Message:
-----------
-Wall should be set by configure.ac iff CC=gcc

Modified Paths:
--------------
    trunk/console/libgnt/Makefile.am

Modified: trunk/console/libgnt/Makefile.am
===================================================================
--- trunk/console/libgnt/Makefile.am	2006-10-18 22:27:30 UTC (rev 17537)
+++ trunk/console/libgnt/Makefile.am	2006-10-18 23:41:57 UTC (rev 17538)
@@ -60,5 +60,4 @@
 
 AM_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
-	$(GNT_CFLAGS) \
-	-Wall
+	$(GNT_CFLAGS)


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

[Gaim-commits] SF.net SVN: gaim: [17537] trunk/gtk/plugins

[<dat...@us...>]

Revision: 17537
          http://svn.sourceforge.net/gaim/?rev=17537&view=rev
Author:   datallah
Date:     2006-10-18 15:27:30 -0700 (Wed, 18 Oct 2006)

Log Message:
-----------
This doesn't need to be around anymore.

Modified Paths:
--------------
    trunk/gtk/plugins/Makefile.am

Removed Paths:
-------------
    trunk/gtk/plugins/docklet/

Modified: trunk/gtk/plugins/Makefile.am
===================================================================
--- trunk/gtk/plugins/Makefile.am	2006-10-18 21:59:46 UTC (rev 17536)
+++ trunk/gtk/plugins/Makefile.am	2006-10-18 22:27:30 UTC (rev 17537)
@@ -1,4 +1,4 @@
-DIST_SUBDIRS = cap docklet gestures gevolution musicmessaging perl ticker
+DIST_SUBDIRS = cap gestures gevolution musicmessaging perl ticker
 
 if BUILD_GEVOLUTION
 GEVOLUTION_DIR = gevolution
@@ -18,7 +18,6 @@
 
 SUBDIRS = \
 	$(CAP_DIR) \
-	docklet \
 	gestures \
 	$(GEVOLUTION_DIR) \
 	$(MUSICMESSAGING_DIR) \


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

[Gaim-commits] SF.net SVN: gaim: [17536] web/htdocs/win32/index.php

[<dat...@us...>]

Revision: 17536
          http://svn.sourceforge.net/gaim/?rev=17536&view=rev
Author:   datallah
Date:     2006-10-18 14:59:46 -0700 (Wed, 18 Oct 2006)

Log Message:
-----------
Update portable executable for core/ui split

Modified Paths:
--------------
    web/htdocs/win32/index.php

Modified: web/htdocs/win32/index.php
===================================================================
--- web/htdocs/win32/index.php	2006-10-18 21:47:29 UTC (rev 17535)
+++ web/htdocs/win32/index.php	2006-10-18 21:59:46 UTC (rev 17536)
@@ -170,7 +170,7 @@
       <li>Create a <code>U:\Programs\Gaim\plugins</code> directory and copy the contents of the installed <code>Gaim\plugins</code> directory into it excluding <code>perl.dll</code>, <code>tcl.dll</code>.</li>
       <li>If you want to use a language other than en_US, create a <code>U:\Programs\Gaim\locale</code> directory and copy any language directories that you want from your installed <code>Gaim\locale</code> directory.</li>
       <li>Copy the contents of your root installed Gaim directory except <code>gaim.exe</code>, <code>gaim-uninst.exe</code>, and if you don't want spell-checking support, <code>libgtkspell.dll</code>.</li>
-      <li>Download <a href="gaim-portable.exe">gaim-portable.exe</a> and put it in <code>U:\Programs\Gaim</code>. The file uses the same source as the standard <code>gaim.exe</code> from versions 2.0.0 and newer, the difference being that when it was compiled <code>PORTABLE</code> was defined which causes some of the initialization to be done differently.</li>
+      <li>Download <a href="gaim-portable.exe">gaim-portable.exe</a> (use <a href="gaim-portable.exe.pre200b4">this version</a> for versions of gaim older than 2.0.0beta4) and put it in <code>U:\Programs\Gaim</code>. The file uses the same source as the standard <code>gaim.exe</code> from versions 2.0.0 and newer, the difference being that when it was compiled <code>PORTABLE</code> was defined which causes some of the initialization to be done differently.</li>
     </ul>
   </li>
   <li>In the same spirit, create a minimal GTK+ runtime installation from your GTK+ installation.


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

[Gaim-commits] SF.net SVN: gaim: [17535] trunk/configure.ac

[<dat...@us...>]

Revision: 17535
          http://svn.sourceforge.net/gaim/?rev=17535&view=rev
Author:   datallah
Date:     2006-10-18 14:47:29 -0700 (Wed, 18 Oct 2006)

Log Message:
-----------
Go back to dev version

Modified Paths:
--------------
    trunk/configure.ac

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-10-18 21:43:54 UTC (rev 17534)
+++ trunk/configure.ac	2006-10-18 21:47:29 UTC (rev 17535)
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([gaim], [2.0.0beta4], [gai...@li...])
+AC_INIT([gaim], [2.0.0dev], [gai...@li...])
 AC_CANONICAL_SYSTEM
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)


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

[Gaim-commits] SF.net SVN: gaim: [17534] web/htdocs/win32/index.php

[<dat...@us...>]

Revision: 17534
          http://svn.sourceforge.net/gaim/?rev=17534&view=rev
Author:   datallah
Date:     2006-10-18 14:43:54 -0700 (Wed, 18 Oct 2006)

Log Message:
-----------
Update faq for beta4 release changes

Modified Paths:
--------------
    web/htdocs/win32/index.php

Modified: web/htdocs/win32/index.php
===================================================================
--- web/htdocs/win32/index.php	2006-10-18 20:00:50 UTC (rev 17533)
+++ web/htdocs/win32/index.php	2006-10-18 21:43:54 UTC (rev 17534)
@@ -32,10 +32,6 @@
 <h2 id="faq">Windows Gaim FAQ</h2>
 <ul>
 <li>
-<b>What happened to the Gaim systray icon?</b> - As of 0.65 systray functionality has moved into the docklet plugin, labeled "System Tray Icon" in Gaim's plugins section (under Preferences).  You will need to load this plugin for the systray features to work. 
-</li>
-
-<li>
 <b>How does Win Gaim determine which language to use?</b> - For the user who installed Win Gaim, the language selected during installation will be the default.  This can be overridden by setting the <code>GAIMLANG</code> (as of v1.1.0) environmental variable (for example <code>GAIMLANG=de</code>).  If both of these methods fail, Win Gaim will fall back to the default Windows user locale setting.
 </li>
 
@@ -84,7 +80,7 @@
 </li>
 
 <li>
-<b>Why do I get a &quot;No disk in drive&quot; (or similar) message?</b> - There is a bug in one of the components of the GTK+ runtime (gettext).  As a result, this component attempts to locate a configuration file on the I: drive.  If you have an I: drive and it is a removable media drive such as a ZIP drive, CD/DVD-ROM drive, or flash card reader, you will see the an error message stating that there is no disk in the drive or asking you to insert a disk into the drive.  If you can change your drive letters so that you have no I: (possible on Windows 2000 or XP), unplug the device if it is a USB device, or insert a disk or card into the drive before starting Gaim, this should silence the message.  We hope to have a fixed GTK+ runtime soon.  This error message can safely be ignored without any ill effects.
+<b>Why do I get a &quot;No disk in drive&quot; (or similar) message?</b> - **This has been fixed in the GTK+ 2.10.6 installer.** There is a bug in one of the components of the GTK+ runtime (gettext).  As a result, this component attempts to locate a configuration file on the I: drive.  If you have an I: drive and it is a removable media drive such as a ZIP drive, CD/DVD-ROM drive, or flash card reader, you will see the an error message stating that there is no disk in the drive or asking you to insert a disk into the drive.  If you can change your drive letters so that you have no I: (possible on Windows 2000 or XP), unplug the device if it is a USB device, or insert a disk or card into the drive before starting Gaim, this should silence the message.  We hope to have a fixed GTK+ runtime soon.  This error message can safely be ignored without any ill effects.
 </li>
 
 </ul>
@@ -109,7 +105,7 @@
 </li>
 
 <li>
-<b>GTK+ 2.8.x Unable to connect</b> - It is not currently possible to use any version of WinGaim with any 2.8.x version of GTK+.  Attempting to do so will result in an inability to connect and/or frequent disconnections.  The issue is specifically in Glib 2.8.x.  For those interested in the technical details, the GIOChannel implementation has been rewritten and appears to have some quirks - see the following <a href="http://bugzilla.gnome.org/show_bug.cgi?id=324234">bugzilla entry</a>.
+<b>GTK+ 2.8.x Unable to connect</b> - Versions of WinGaim prior to 2.0.0beta4 do not work with GTK+ 2.8.0 or newer.  The symptoms are an inability to connect and/or frequent disconnections.  The issue is specifically in Glib 2.8.x.  For those interested in the technical details, the GIOChannel implementation has been rewritten and appears to have some quirks - see the following <a href="http://bugzilla.gnome.org/show_bug.cgi?id=324234">bugzilla entry</a>.  To avoid this problem, use WinGaim 2.0.0beta4 or newer, or stick with GTK+ 2.6.10.
 </li>
 
 <li>


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

[Gaim-commits] SF.net SVN: gaim: [17533] trunk/doc/gaims_funniest_home_convos.txt

[<lsc...@us...>]

Revision: 17533
          http://svn.sourceforge.net/gaim/?rev=17533&view=rev
Author:   lschiere
Date:     2006-10-18 13:00:50 -0700 (Wed, 18 Oct 2006)

Log Message:
-----------
(15:59:45) seanegan: alright, distchecking again.
(15:59:46) LSchiere: I'm preserving this one for antiquity

Modified Paths:
--------------
    trunk/doc/gaims_funniest_home_convos.txt

Modified: trunk/doc/gaims_funniest_home_convos.txt
===================================================================
--- trunk/doc/gaims_funniest_home_convos.txt	2006-10-18 19:36:36 UTC (rev 17532)
+++ trunk/doc/gaims_funniest_home_convos.txt	2006-10-18 20:00:50 UTC (rev 17533)
@@ -424,3 +424,18 @@
 14:59 <itchypants> seanegan, ah okay thanks
 15:00 <seanegan> no problem
 
+(15:57:11) sadrul: the files (at least a couple) in the tar.bz2 are different
+(15:57:23) datallah: right.. that is the problem - the code in svn is fine
+(15:57:31) seanegan: oh, what the hell?
+(15:57:41) seanegan: don't tell me I make dist'ed the wrong tree
+(15:57:46) LSchiere: how does the code in svn differ except in gaim's
+funniest and the spec.in?
+(15:57:50) LSchiere: seanegan: sounds like it
+(15:57:53) datallah: you are such a screw up!
+(15:58:12) seanegan: I sure am
+(15:58:32) seanegan: Ugh!
+(15:58:37) datallah: you must have been distracted by um... plugins
+(15:58:45) seanegan: Don't I test these things?
+(15:58:51) LSchiere: you test things?
+(15:59:06) SimGuy: seanegan: by experience, I think we've determined you do
+not :)


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

[Gaim-commits] SF.net SVN: gaim: [17532] trunk/gaim.spec.in

[<nos...@us...>]

Revision: 17532
          http://svn.sourceforge.net/gaim/?rev=17532&view=rev
Author:   nosnilmot
Date:     2006-10-18 12:36:36 -0700 (Wed, 18 Oct 2006)

Log Message:
-----------
libxml2-devel is compulsory now

Modified Paths:
--------------
    trunk/gaim.spec.in

Modified: trunk/gaim.spec.in
===================================================================
--- trunk/gaim.spec.in	2006-10-18 19:03:10 UTC (rev 17531)
+++ trunk/gaim.spec.in	2006-10-18 19:36:36 UTC (rev 17532)
@@ -27,7 +27,7 @@
 BuildRoot:  %{_tmppath}/%{name}-%{version}-root
 
 # Generic build requirements
-BuildRequires: libtool, pkgconfig, intltool, gettext
+BuildRequires: libtool, pkgconfig, intltool, gettext, libxml2-devel
 %{?_with_avahi:BuildRequires: avahi-compat-howl-devel}
 %{?_with_dbus:BuildRequires: dbus-devel >= 0.35}
 %{!?_without_gstreamer:BuildRequires: gstreamer-devel}


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

[Gaim-commits] SF.net SVN: gaim: [17531] trunk/doc/gaims_funniest_home_convos.txt

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

Revision: 17531
          http://svn.sourceforge.net/gaim/?rev=17531&view=rev
Author:   eblanton
Date:     2006-10-18 12:03:10 -0700 (Wed, 18 Oct 2006)

Log Message:
-----------
so classic

Modified Paths:
--------------
    trunk/doc/gaims_funniest_home_convos.txt

Modified: trunk/doc/gaims_funniest_home_convos.txt
===================================================================
--- trunk/doc/gaims_funniest_home_convos.txt	2006-10-18 18:36:18 UTC (rev 17530)
+++ trunk/doc/gaims_funniest_home_convos.txt	2006-10-18 19:03:10 UTC (rev 17531)
@@ -416,3 +416,11 @@
 (13:57:36) l33t_h4x0r left the room ("Leaving").
 (13:58:58) LSchiere: *amused* that's the first time in a while that the requester has *agreed* that there is no legit reason to want the feature
 (13:59:19) Err: he was not the sharpest knife in the drawer
+
+14:57 <itchypants> [blah blah blah simple question]
+      [other traffic]
+14:57 <itchypants> [retransmit simple question]
+14:59 <seanegan> itchypants: you need to chill the hell out
+14:59 <itchypants> seanegan, ah okay thanks
+15:00 <seanegan> no problem
+


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

[Gaim-commits] SF.net SVN: gaim: [17530] tags/v2_0_0beta4/trunk/

[<sea...@us...>]

Revision: 17530
          http://svn.sourceforge.net/gaim/?rev=17530&view=rev
Author:   seanegan
Date:     2006-10-18 11:36:18 -0700 (Wed, 18 Oct 2006)

Log Message:
-----------
kill this

Removed Paths:
-------------
    tags/v2_0_0beta4/trunk/


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

[Gaim-commits] SF.net SVN: gaim: [17529] tags/v2_0_0beta4/trunk/

[<sea...@us...>]

Revision: 17529
          http://svn.sourceforge.net/gaim/?rev=17529&view=rev
Author:   seanegan
Date:     2006-10-18 11:28:03 -0700 (Wed, 18 Oct 2006)

Log Message:
-----------
tag

Added Paths:
-----------
    tags/v2_0_0beta4/trunk/

Copied: tags/v2_0_0beta4/trunk (from rev 17528, trunk)


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

[Gaim-commits] SF.net SVN: gaim: [17528] tags/v2_0_0beta4/

[<sea...@us...>]

Revision: 17528
          http://svn.sourceforge.net/gaim/?rev=17528&view=rev
Author:   seanegan
Date:     2006-10-18 11:27:03 -0700 (Wed, 18 Oct 2006)

Log Message:
-----------
tag for 2.0.0beta4

Added Paths:
-----------
    tags/v2_0_0beta4/

Copied: tags/v2_0_0beta4 (from rev 17527, trunk)


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

[Gaim-commits] SF.net SVN: gaim: [17527] trunk/Makefile.am

[<lsc...@us...>]

Revision: 17527
          http://svn.sourceforge.net/gaim/?rev=17527&view=rev
Author:   lschiere
Date:     2006-10-18 10:34:56 -0700 (Wed, 18 Oct 2006)

Log Message:
-----------
This worked when it was CLEANFILES, but I think they should only be removed on distclean, not clean?  so I changed it as per nosnilmot's comment.

Modified Paths:
--------------
    trunk/Makefile.am

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2006-10-18 17:06:42 UTC (rev 17526)
+++ trunk/Makefile.am	2006-10-18 17:34:56 UTC (rev 17527)
@@ -75,3 +75,5 @@
 distuninstallcheck_listfiles = \
 	find . -type f -print | grep -v perl | grep -v Gaim.3pm
 
+DISTCLEANFILES= gaim.desktop libgaim/gconf/gaim.schemas intltool-extract \
+			intltool-merge intltool-update


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

[Gaim-commits] SF.net SVN: gaim: [17526] trunk/libgaim/gconf/Makefile.am

[<nos...@us...>]

Revision: 17526
          http://svn.sourceforge.net/gaim/?rev=17526&view=rev
Author:   nosnilmot
Date:     2006-10-18 10:06:42 -0700 (Wed, 18 Oct 2006)

Log Message:
-----------
Hopefully fix the latest make distcheck error Luke came across

Modified Paths:
--------------
    trunk/libgaim/gconf/Makefile.am

Modified: trunk/libgaim/gconf/Makefile.am
===================================================================
--- trunk/libgaim/gconf/Makefile.am	2006-10-18 16:42:53 UTC (rev 17525)
+++ trunk/libgaim/gconf/Makefile.am	2006-10-18 17:06:42 UTC (rev 17526)
@@ -8,7 +8,7 @@
 
 if GCONF_SCHEMAS_INSTALL
 install-data-local:
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
+	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA)
 else
 install-data-local:
 endif


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