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

[Gaim-commits] SF.net SVN: gaim: [18167] web/htdocs/news.txt

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

Revision: 18167
          http://svn.sourceforge.net/gaim/?rev=18167&view=rev
Author:   thekingant
Date:     2007-01-19 08:47:29 -0800 (Fri, 19 Jan 2007)

Log Message:
-----------
Update the timestizamp

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

Modified: web/htdocs/news.txt
===================================================================
--- web/htdocs/news.txt	2007-01-19 07:07:02 UTC (rev 18166)
+++ web/htdocs/news.txt	2007-01-19 16:47:29 UTC (rev 18167)
@@ -1,6 +1,6 @@
 2.0.0beta6
-January 19th, 2006 - 10:13AM PST
-Greetings Earth people.  We have watched your planet from afar for 17 years.  And much like the Magicicada of your planet, we have emerged to make lots of loud noises.  Also, we heard that <a href="http://sourceforge.net/project/showfiles.php?group_id=235&package_id=253&release_id=479631">Gaim 2.0.0 beta 6 has been released</a> and we wanted to let everyone know.
+January 19th, 2006 - 8:46AM PST
+Greetings Earth people.  We have watched your planet from afar for 17 years.  And much like the Magicicada of your planet, we have emerged to make lots of loud noises.  Also, we heard that <a href="http://sourceforge.net/project/showfiles.php?group_id=235&package_id=253&release_id=479631">Gaim 2.0.0 beta 6 has been released</a> and we wanted to let everyone know.  We consider this release to be reasonably stable.  With a little luck dragon, 2.0.0 final is just around the corner.
 #
 2.0.0beta5
 November 10th, 2006 - 8:27AM PST


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

[Gaim-commits] SF.net SVN: gaim: [18166] web/htdocs/news.txt

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

Revision: 18166
          http://svn.sourceforge.net/gaim/?rev=18166&view=rev
Author:   thekingant
Date:     2007-01-18 23:07:02 -0800 (Thu, 18 Jan 2007)

Log Message:
-----------
Them things are creepy

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

Modified: web/htdocs/news.txt
===================================================================
--- web/htdocs/news.txt	2007-01-19 04:25:47 UTC (rev 18165)
+++ web/htdocs/news.txt	2007-01-19 07:07:02 UTC (rev 18166)
@@ -1,3 +1,7 @@
+2.0.0beta6
+January 19th, 2006 - 10:13AM PST
+Greetings Earth people.  We have watched your planet from afar for 17 years.  And much like the Magicicada of your planet, we have emerged to make lots of loud noises.  Also, we heard that <a href="http://sourceforge.net/project/showfiles.php?group_id=235&package_id=253&release_id=479631">Gaim 2.0.0 beta 6 has been released</a> and we wanted to let everyone know.
+#
 2.0.0beta5
 November 10th, 2006 - 8:27AM PST
 Annyong!  We fixed a bunch of buglets from the last beta.  We recommend this release to anyone using the earlier betas, and to anyone having problems with a Gaim 1.x.x release.  You can <a href="http://sourceforge.net/project/showfiles.php?group_id=235&package_id=253&release_id=462444">download packages from here</a>.


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

[Gaim-commits] SF.net SVN: gaim: [18165] tags/v2_0_0beta6/

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

Revision: 18165
          http://svn.sourceforge.net/gaim/?rev=18165&view=rev
Author:   thekingant
Date:     2007-01-18 20:25:47 -0800 (Thu, 18 Jan 2007)

Log Message:
-----------
Tagging Gaim release 2.0.0beta6

Added Paths:
-----------
    tags/v2_0_0beta6/

Copied: tags/v2_0_0beta6 (from rev 18164, 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: [18164] trunk/NEWS

[<ev...@us...>]

Revision: 18164
          http://svn.sourceforge.net/gaim/?rev=18164&view=rev
Author:   evands
Date:     2007-01-18 20:14:46 -0800 (Thu, 18 Jan 2007)

Log Message:
-----------
I see that my text editor's replacement of tabs with spaces ended poorly.  I'll try not to make that mistake again :)

Modified Paths:
--------------
    trunk/NEWS

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2007-01-19 04:13:59 UTC (rev 18163)
+++ trunk/NEWS	2007-01-19 04:14:46 UTC (rev 18164)
@@ -10,7 +10,7 @@
 
 	Gary: Long time no news.  My silence will end soon ;)
 
-    Evan: My first news! I knocked out a nice collection of crashes, thanks in part to my ever-patient Adium beta testers. Gaim 2.0.0 is going to be delicious. :)
+	Evan: My first news! I knocked out a nice collection of crashes, thanks in part to my ever-patient Adium beta testers. Gaim 2.0.0 is going to be delicious. :)
 
 2.0.0beta5 (11/9/2006):
 	Sean: Another release in our endless stream in betas. This one's


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

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

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

Revision: 18163
          http://svn.sourceforge.net/gaim/?rev=18163&view=rev
Author:   thekingant
Date:     2007-01-18 20:13:59 -0800 (Thu, 18 Jan 2007)

Log Message:
-----------
Include oscarcommon.h in the tarball

Include symlinks in the RPMs (liboscar.so and liboscar.so.1)

Modified Paths:
--------------
    trunk/gaim.spec.in
    trunk/libgaim/protocols/oscar/Makefile.am

Modified: trunk/gaim.spec.in
===================================================================
--- trunk/gaim.spec.in	2007-01-19 04:13:23 UTC (rev 18162)
+++ trunk/gaim.spec.in	2007-01-19 04:13:59 UTC (rev 18163)
@@ -244,7 +244,7 @@
 
 %find_lang %{name}
 
-find $RPM_BUILD_ROOT%{_libdir}/gaim -type f -print | \
+find $RPM_BUILD_ROOT%{_libdir}/gaim -xtype f -print | \
         sed "s@^$RPM_BUILD_ROOT@@g" | \
         grep -v /gntgf.so | \
         grep -v /gnthistory.so | \

Modified: trunk/libgaim/protocols/oscar/Makefile.am
===================================================================
--- trunk/libgaim/protocols/oscar/Makefile.am	2007-01-19 04:13:23 UTC (rev 18162)
+++ trunk/libgaim/protocols/oscar/Makefile.am	2007-01-19 04:13:59 UTC (rev 18163)
@@ -34,6 +34,7 @@
 	oft.c               \
 	oscar.c             \
 	oscar.h             \
+	oscarcommon.h       \
 	oscar_data.c        \
 	peer.c              \
 	peer.h              \


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

[Gaim-commits] SF.net SVN: gaim: [18162] trunk/NEWS

[<ev...@us...>]

Revision: 18162
          http://svn.sourceforge.net/gaim/?rev=18162&view=rev
Author:   evands
Date:     2007-01-18 20:13:23 -0800 (Thu, 18 Jan 2007)

Log Message:
-----------
Joining the NEWS party

Modified Paths:
--------------
    trunk/NEWS

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2007-01-19 04:05:27 UTC (rev 18161)
+++ trunk/NEWS	2007-01-19 04:13:23 UTC (rev 18162)
@@ -10,6 +10,8 @@
 
 	Gary: Long time no news.  My silence will end soon ;)
 
+    Evan: My first news! I knocked out a nice collection of crashes, thanks in part to my ever-patient Adium beta testers. Gaim 2.0.0 is going to be delicious. :)
+
 2.0.0beta5 (11/9/2006):
 	Sean: Another release in our endless stream in betas. This one's
 	pretty awesome; and it fixes major bugs introduced in previous


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

[Gaim-commits] SF.net SVN: gaim: [18161] trunk/NEWS

[<amc...@us...>]

Revision: 18161
          http://svn.sourceforge.net/gaim/?rev=18161&view=rev
Author:   amc_grim
Date:     2007-01-18 20:05:27 -0800 (Thu, 18 Jan 2007)

Log Message:
-----------
Newsination

Modified Paths:
--------------
    trunk/NEWS

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2007-01-19 03:31:04 UTC (rev 18160)
+++ trunk/NEWS	2007-01-19 04:05:27 UTC (rev 18161)
@@ -8,6 +8,8 @@
 
 	Nathan: Beta6 rocks.  That is all.
 
+	Gary: Long time no news.  My silence will end soon ;)
+
 2.0.0beta5 (11/9/2006):
 	Sean: Another release in our endless stream in betas. This one's
 	pretty awesome; and it fixes major bugs introduced in previous


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

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

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

Revision: 18160
          http://svn.sourceforge.net/gaim/?rev=18160&view=rev
Author:   thekingant
Date:     2007-01-18 19:31:04 -0800 (Thu, 18 Jan 2007)

Log Message:
-----------
Getting ready for beta 6

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

Modified: trunk/gaim.spec.in
===================================================================
--- trunk/gaim.spec.in	2007-01-19 01:57:56 UTC (rev 18159)
+++ trunk/gaim.spec.in	2007-01-19 03:31:04 UTC (rev 18160)
@@ -6,7 +6,7 @@
 # When not doing betas comment this out
 # NOTE: %defines in spec files are evaluated in comments so the correct
 #       way to comment it out is to replace the % with #
-#%define beta 6
+%define beta 6
 
 %if 0%{?beta}
 %define gaimver %(echo "@VERSION@"|sed -e 's/dev//; s/beta.*//')


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

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

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

Revision: 18159
          http://svn.sourceforge.net/gaim/?rev=18159&view=rev
Author:   seanegan
Date:     2007-01-18 17:57:56 -0800 (Thu, 18 Jan 2007)

Log Message:
-----------
How's this, Mark?

Modified Paths:
--------------
    trunk/gtk/gaimcombobox.c
    trunk/gtk/gaimcombobox.h

Modified: trunk/gtk/gaimcombobox.c
===================================================================
--- trunk/gtk/gaimcombobox.c	2007-01-18 20:19:41 UTC (rev 18158)
+++ trunk/gtk/gaimcombobox.c	2007-01-19 01:57:56 UTC (rev 18159)
@@ -3557,7 +3557,21 @@
     gtk_list_store_remove (store, &iter);
 }
 
+static gchar *
+gtk_combo_box_get_active_text (GtkComboBox *combo_box)
+{
+  GtkTreeIter iter;
+  gchar *text = NULL;
 
+  g_return_val_if_fail (GTK_IS_LIST_STORE (combo_box->priv->model), NULL);
+
+  if (gtk_combo_box_get_active_iter (combo_box, &iter))
+    gtk_tree_model_get (combo_box->priv->model, &iter, 
+    			0, &text, -1);
+  return text;
+}
+
+
 static gboolean
 gtk_combo_box_mnemonic_activate (GtkWidget *widget,
 				 gboolean   group_cycling)

Modified: trunk/gtk/gaimcombobox.h
===================================================================
--- trunk/gtk/gaimcombobox.h	2007-01-18 20:19:41 UTC (rev 18158)
+++ trunk/gtk/gaimcombobox.h	2007-01-19 01:57:56 UTC (rev 18159)
@@ -98,6 +98,7 @@
                                               const gchar     *text);
 void          gtk_combo_box_remove_text      (GtkComboBox     *combo_box,
                                               gint             position);
+gchar        *gtk_combo_box_get_active_text  (GtkComboBox     *combo_box);
 
 /* programmatic control */
 void          gtk_combo_box_popup            (GtkComboBox     *combo_box);


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

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

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

Revision: 18158
          http://svn.sourceforge.net/gaim/?rev=18158&view=rev
Author:   seanegan
Date:     2007-01-18 12:19:41 -0800 (Thu, 18 Jan 2007)

Log Message:
-----------
Make xmppconsole compile on GTK 2.0

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

Modified: trunk/gtk/plugins/xmppconsole.c
===================================================================
--- trunk/gtk/plugins/xmppconsole.c	2007-01-18 17:57:46 UTC (rev 18157)
+++ trunk/gtk/plugins/xmppconsole.c	2007-01-18 20:19:41 UTC (rev 18158)
@@ -26,6 +26,9 @@
 #include "xmlnode.h"
 
 #include "gtkimhtml.h"
+#if !GTK_CHECK_VERSION(2,4,0)
+#include "gaimcombobox.h"
+#endif
 
 typedef struct {
 	GaimConnection *gc;
@@ -726,8 +729,10 @@
 	GtkWidget *label;
 	GtkTextBuffer *buffer;
 	GtkWidget *toolbar;
+	GList *connections;
+#if GTK_CHECK_VERSION(2,4,0)
 	GtkToolItem *button;
-	GList *connections;
+#endif
 
 	if (console) {
 		gtk_window_present(GTK_WINDOW(console->window));
@@ -776,18 +781,33 @@
 	gtk_container_add(GTK_CONTAINER(sw), console->imhtml);
 	
 	toolbar = gtk_toolbar_new();
+#if GTK_CHECK_VERSION(2,4,0)	
 	button = gtk_tool_button_new(NULL, "<iq/>");
 	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(iq_clicked_cb), NULL);
 	gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(button));
+#else
+	gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), "<iq/>", 
+			           _("Insert an <iq/> stanza."), "foo", NULL, GTK_SIGNAL_FUNC(iq_clicked_cb), NULL);
+#endif
 
+#if GTK_CHECK_VERSION(2,4,0)	
 	button = gtk_tool_button_new(NULL, "<presence/>");
 	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(presence_clicked_cb), NULL);
 	gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(button));
+#else
+	gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), "<presence/>", 
+			           _("Insert a <presence/> stanza."), NULL, gtk_label_new(NULL), GTK_SIGNAL_FUNC(presence_clicked_cb), NULL);
+#endif
 
+#if GTK_CHECK_VERSION(2,4,0)
 	button = gtk_tool_button_new(NULL, "<message/>");
 	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(message_clicked_cb), NULL);
 	gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(button));
-
+#else
+	gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), "<message/>", 
+			           _("Insert a <message/> stanza."), "foo", gtk_label_new(NULL), GTK_SIGNAL_FUNC(message_clicked_cb), NULL);
+#endif
+	
 	gtk_box_pack_start(GTK_BOX(vbox), toolbar, FALSE, FALSE, 0);
 	
 	sw = gtk_scrolled_window_new(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: [18157] trunk/libgaim/protocols/sametime/sametime.c

[<tal...@us...>]

Revision: 18157
          http://svn.sourceforge.net/gaim/?rev=18157&view=rev
Author:   taliesein
Date:     2007-01-18 09:57:46 -0800 (Thu, 18 Jan 2007)

Log Message:
-----------
for bug 1638609, disconnect the signal when the account goes offline

Modified Paths:
--------------
    trunk/libgaim/protocols/sametime/sametime.c

Modified: trunk/libgaim/protocols/sametime/sametime.c
===================================================================
--- trunk/libgaim/protocols/sametime/sametime.c	2007-01-18 17:41:47 UTC (rev 18156)
+++ trunk/libgaim/protocols/sametime/sametime.c	2007-01-18 17:57:46 UTC (rev 18157)
@@ -1470,19 +1470,25 @@
   
   /* start watching for new conversations */
   gaim_signal_connect(gaim_conversations_get_handle(),
-		      "conversation-created", pd->gc,
+		      "conversation-created", pd,
 		      GAIM_CALLBACK(conversation_created_cb), pd);
 
   /* watch for group extended menu items */
   gaim_signal_connect(gaim_blist_get_handle(),
-		      "blist-node-extended-menu", pd->gc,
+		      "blist-node-extended-menu", pd,
 		      GAIM_CALLBACK(blist_node_menu_cb), pd);
-
+  
   /* use our services to do neat things */
   services_starting(pd);
 }
 
 
+static void session_stopping(struct mwGaimPluginData *pd) {
+  /* stop watching the signals from session_started */
+  gaim_signals_disconnect_by_handle(pd);
+}
+
+
 static void mw_session_stateChange(struct mwSession *session,
 				   enum mwSessionState state,
 				   gpointer info) {
@@ -1541,6 +1547,9 @@
     break;
 
   case mwSession_STOPPING:
+
+    session_stopping(pd);
+
     if(GPOINTER_TO_UINT(info) & ERR_FAILURE) {
       char *err = mwError(GPOINTER_TO_UINT(info));
       gaim_connection_error(gc, err);


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

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

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

Revision: 18156
          http://svn.sourceforge.net/gaim/?rev=18156&view=rev
Author:   datallah
Date:     2007-01-18 09:41:47 -0800 (Thu, 18 Jan 2007)

Log Message:
-----------
Have the wingaim installer read the GTK version to be installed from the installer "source" instead of maintaining the version in the installer script and having to update it.

Modified Paths:
--------------
    trunk/Makefile.mingw
    trunk/gaim-installer.nsi

Modified: trunk/Makefile.mingw
===================================================================
--- trunk/Makefile.mingw	2007-01-18 13:30:17 UTC (rev 18155)
+++ trunk/Makefile.mingw	2007-01-18 17:41:47 UTC (rev 18156)
@@ -31,6 +31,11 @@
     exit; \
 }' VERSION)
 
+GTK_INSTALL_VERSION = $(shell \
+  source ../gtk_installer/version.sh; \
+  echo $$gtk_version \
+)
+
 # Any *.dll or *.exe files included in win32-install-dir that we don't compile
 # should be included in this list so they don't get stripped
 NON_GAIM_DLLS = \
@@ -70,13 +75,13 @@
 	 -not \( -false $(NON_GAIM_DLLS_FIND_EXP) \) -exec strip --strip-unneeded {} ';'
 
 installer: create_release_install_dir
-	$(MAKENSIS) /V3 /DGAIM_VERSION="$(GAIM_VERSION)" /DGAIM_PRODUCT_VERSION="$(GAIM_PRODUCT_VERSION)" /DWITH_GTK /DGAIM_INSTALL_DIR="$(GAIM_INSTALL_DIR).release" gaim-installer.nsi
+	$(MAKENSIS) /V3 /DGAIM_VERSION="$(GAIM_VERSION)" /DGAIM_PRODUCT_VERSION="$(GAIM_PRODUCT_VERSION)" /DWITH_GTK /DGAIM_INSTALL_DIR="$(GAIM_INSTALL_DIR).release" /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" gaim-installer.nsi
 
 installer_nogtk: create_release_install_dir
-	$(MAKENSIS) /V3 /DGAIM_VERSION="$(GAIM_VERSION)" /DGAIM_PRODUCT_VERSION="$(GAIM_PRODUCT_VERSION)" /DGAIM_INSTALL_DIR="$(GAIM_INSTALL_DIR).release" gaim-installer.nsi
+	$(MAKENSIS) /V3 /DGAIM_VERSION="$(GAIM_VERSION)" /DGAIM_PRODUCT_VERSION="$(GAIM_PRODUCT_VERSION)" /DGAIM_INSTALL_DIR="$(GAIM_INSTALL_DIR).release" /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" gaim-installer.nsi
 
 installer_debug: install
-	$(MAKENSIS) /V3 /DGAIM_VERSION="$(GAIM_VERSION)" /DGAIM_PRODUCT_VERSION="$(GAIM_PRODUCT_VERSION)" /DGAIM_INSTALL_DIR="$(GAIM_INSTALL_DIR)" /DDEBUG gaim-installer.nsi
+	$(MAKENSIS) /V3 /DGAIM_VERSION="$(GAIM_VERSION)" /DGAIM_PRODUCT_VERSION="$(GAIM_PRODUCT_VERSION)" /DGAIM_INSTALL_DIR="$(GAIM_INSTALL_DIR)" /DDEBUG /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" gaim-installer.nsi
 
 installers: installer installer_nogtk installer_debug
 

Modified: trunk/gaim-installer.nsi
===================================================================
--- trunk/gaim-installer.nsi	2007-01-18 13:30:17 UTC (rev 18155)
+++ trunk/gaim-installer.nsi	2007-01-18 17:41:47 UTC (rev 18156)
@@ -64,7 +64,6 @@
 !define GAIM_UNINST_EXE				"gaim-uninst.exe"
 
 !define GTK_MIN_VERSION				"2.6.10"
-!define GTK_INSTALL_VERSION			"2.10.6"
 !define GTK_REG_KEY				"SOFTWARE\GTK\2.0"
 !define PERL_REG_KEY				"SOFTWARE\Perl"
 !define PERL_DLL				"perl58.dll"


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

[Gaim-commits] SF.net SVN: gaim: [18155] trunk/NEWS

[<fac...@us...>]

Revision: 18155
          http://svn.sourceforge.net/gaim/?rev=18155&view=rev
Author:   faceprint
Date:     2007-01-18 05:30:17 -0800 (Thu, 18 Jan 2007)

Log Message:
-----------
newsination

Modified Paths:
--------------
    trunk/NEWS

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2007-01-18 07:19:51 UTC (rev 18154)
+++ trunk/NEWS	2007-01-18 13:30:17 UTC (rev 18155)
@@ -6,6 +6,8 @@
 	changes, some Google Talk features, a bunch new plugins, and other
 	goodness.
 
+	Nathan: Beta6 rocks.  That is all.
+
 2.0.0beta5 (11/9/2006):
 	Sean: Another release in our endless stream in betas. This one's
 	pretty awesome; and it fixes major bugs introduced in previous


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

[Gaim-commits] SF.net SVN: gaim: [18154] trunk/gtk/gtksavedstatuses.c

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

Revision: 18154
          http://svn.sourceforge.net/gaim/?rev=18154&view=rev
Author:   thekingant
Date:     2007-01-17 23:19:51 -0800 (Wed, 17 Jan 2007)

Log Message:
-----------
Compile warning fix.  Also testing gai...@li...
is back up.  I don't think it is.

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

Modified: trunk/gtk/gtksavedstatuses.c
===================================================================
--- trunk/gtk/gtksavedstatuses.c	2007-01-18 05:07:46 UTC (rev 18153)
+++ trunk/gtk/gtksavedstatuses.c	2007-01-18 07:19:51 UTC (rev 18154)
@@ -325,7 +325,8 @@
 	g_list_free(sel_paths);
 
 	if (g_list_length(sel_titles) == 1)
-		title = g_strdup_printf(_("Are you sure you want to delete %s?"), sel_titles->data);
+		title = g_strdup_printf(_("Are you sure you want to delete %s?"),
+				(const gchar *)sel_titles->data);
 	else
 		title = g_strdup(_("Are you sure you want to delete the selected saved statuses?"));
 


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

[Gaim-commits] SF.net SVN: gaim: [18069] trunk/libgaim/protocols/oscar/family_oservice.c

[<ev...@us...>]

Revision: 18069
          http://svn.sourceforge.net/gaim/?rev=18069&view=rev
Author:   evands
Date:     2007-01-03 12:52:40 -0800 (Wed, 03 Jan 2007)

Log Message:
-----------
Patch from Graham Booker which prevents the following crash:
Thread 0 Crashed: 
0 Libgaim 0x0fbbbe3a flap_connection_send + 17 (flap_connection.c:977) 
1 Libgaim 0x0fbb2c04 aim_srv_setidle + 61 (family_oservice.c:588) 
2 Libgaim 0x0fb1470e set_account_unidle + 122 (idle.c:93) 
3 Libgaim 0x0fafd75c gaim_signal_emit_vargs + 234 (signals.c:485) 
4 Libgaim 0x0fafd7c4 gaim_signal_emit + 90 (signals.c:435) 
5 Libgaim 0x0fb1da57 gaim_connection_destroy + 186 (connection.c:180) 
6 Libgaim 0x0fb2cb46 gaim_account_disconnect + 119 (account.c:1017) 
7 Libgaim 0x0fb1d3ee gaim_connection_disconnect_cb + 37 (connection.c:425) 

Modified Paths:
--------------
    trunk/libgaim/protocols/oscar/family_oservice.c

Modified: trunk/libgaim/protocols/oscar/family_oservice.c
===================================================================
--- trunk/libgaim/protocols/oscar/family_oservice.c	2007-01-03 19:43:33 UTC (rev 18068)
+++ trunk/libgaim/protocols/oscar/family_oservice.c	2007-01-03 20:52:40 UTC (rev 18069)
@@ -105,6 +105,8 @@
 	FlapConnection *conn;
 
 	conn = flap_connection_findbygroup(od, SNAC_FAMILY_BOS);
+	if(!conn)
+		return;
 
 	aim_genericreq_s(od, conn, 0x0001, 0x0004, &serviceid);
 }
@@ -584,6 +586,9 @@
 	FlapConnection *conn;
 
 	conn = flap_connection_findbygroup(od, SNAC_FAMILY_BOS);
+	if(!conn)
+		return;
+	
 	aim_genericreq_l(od, conn, 0x0001, 0x0011, &idletime);
 }
 


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

[Gaim-commits] SF.net SVN: gaim: [18068] trunk/libgaim/protocols/oscar/AUTHORS

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

Revision: 18068
          http://svn.sourceforge.net/gaim/?rev=18068&view=rev
Author:   thekingant
Date:     2007-01-03 11:43:33 -0800 (Wed, 03 Jan 2007)

Log Message:
-----------
This guy sent us an email on December 25th, 2006 and said he
contributed some stuff for getting libgaim to be portable between
Unix and Windows.  Adam corroborated that, but we're not sure
if the stuff he contributed is still around, or if it's been
rewritten, etc.  So I'm going to add his name in, just in case.

Modified Paths:
--------------
    trunk/libgaim/protocols/oscar/AUTHORS

Modified: trunk/libgaim/protocols/oscar/AUTHORS
===================================================================
--- trunk/libgaim/protocols/oscar/AUTHORS	2007-01-03 14:02:44 UTC (rev 18067)
+++ trunk/libgaim/protocols/oscar/AUTHORS	2007-01-03 19:43:33 UTC (rev 18068)
@@ -21,6 +21,10 @@
 E: josh a.t joshisanerd d.o.t com
 D: OFT/ODC (not quite finished yet..), random little things, Munger-At-Large, compile-time warnings.
 
+N: Daniel M. Pomerantz
+H: dmprantz
+D: Made initial versions cross platform
+
 N: Daniel Reed
 T: 1998-2001
 H: n, linuxkitty


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

[Gaim-commits] SF.net SVN: gaim: [18067] trunk/libgaim/protocols/oscar/oft.c

[<ev...@us...>]

Revision: 18067
          http://svn.sourceforge.net/gaim/?rev=18067&view=rev
Author:   evands
Date:     2007-01-03 06:02:44 -0800 (Wed, 03 Jan 2007)

Log Message:
-----------
Patch from Graham Booker which fixes a crash after a successful OSCAR file transfer. gaim_xfer_end() is called by ft.c's transfer_cb() when the transfer completes so does not need to be called here; peer_connection_schedule_destroy() should be called instead.

Modified Paths:
--------------
    trunk/libgaim/protocols/oscar/oft.c

Modified: trunk/libgaim/protocols/oscar/oft.c
===================================================================
--- trunk/libgaim/protocols/oscar/oft.c	2007-01-03 02:07:05 UTC (rev 18066)
+++ trunk/libgaim/protocols/oscar/oft.c	2007-01-03 14:02:44 UTC (rev 18067)
@@ -382,7 +382,8 @@
 	conn->watcher_incoming = 0;
 	conn->xfer->fd = conn->fd;
 	conn->fd = -1;
-	gaim_xfer_end(conn->xfer);
+	conn->disconnect_reason = OSCAR_DISCONNECT_DONE;
+	peer_connection_schedule_destroy(conn, conn->disconnect_reason, 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: [18066] trunk/gtk/gtkthemes.c

[<fac...@us...>]

Revision: 18066
          http://svn.sourceforge.net/gaim/?rev=18066&view=rev
Author:   faceprint
Date:     2007-01-02 18:07:05 -0800 (Tue, 02 Jan 2007)

Log Message:
-----------
fix 1576566

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

Modified: trunk/gtk/gtkthemes.c
===================================================================
--- trunk/gtk/gtkthemes.c	2007-01-02 15:04:45 UTC (rev 18065)
+++ trunk/gtk/gtkthemes.c	2007-01-03 02:07:05 UTC (rev 18066)
@@ -119,9 +119,13 @@
 				theme->list = child;
 			list = child;
 		} else if (!g_ascii_strncasecmp(i, "Name=", strlen("Name="))) {
+			int len;
 			g_free(theme->name);
 			theme->name = g_strdup(i+ strlen("Name="));
-			theme->name[strlen(theme->name)-1] = 0;
+			len = strlen(theme->name);
+			theme->name[len-1] = 0;
+			if(len > 2 && theme->name[len-2] == '\r')
+				theme->name[len-2] = 0;
 		} else if (!g_ascii_strncasecmp(i, "Description=", strlen("Description="))) {
 			g_free(theme->desc);
 			theme->desc = g_strdup(i + strlen("Description="));


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

[Gaim-commits] SF.net SVN: gaim: [18065] trunk/po/POTFILES.in

[<fac...@us...>]

Revision: 18065
          http://svn.sourceforge.net/gaim/?rev=18065&view=rev
Author:   faceprint
Date:     2007-01-02 07:04:45 -0800 (Tue, 02 Jan 2007)

Log Message:
-----------
this doesn't seem to exist anymore

Modified Paths:
--------------
    trunk/po/POTFILES.in

Modified: trunk/po/POTFILES.in
===================================================================
--- trunk/po/POTFILES.in	2006-12-30 18:43:57 UTC (rev 18064)
+++ trunk/po/POTFILES.in	2007-01-02 15:04:45 UTC (rev 18065)
@@ -23,7 +23,6 @@
 console/libgnt/gntlabel.c
 console/libgnt/gntline.c
 console/libgnt/gntmain.c
-console/libgnt/gntmarshal.c
 console/libgnt/gntstyle.c
 console/libgnt/gnttextview.c
 console/libgnt/gnttree.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: [18064] trunk/gtk/gtkplugin.c

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

Revision: 18064
          http://svn.sourceforge.net/gaim/?rev=18064&view=rev
Author:   sadrul
Date:     2006-12-30 10:43:57 -0800 (Sat, 30 Dec 2006)

Log Message:
-----------
Load new non-native plugins when opening the plugins dialog.

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

Modified: trunk/gtk/gtkplugin.c
===================================================================
--- trunk/gtk/gtkplugin.c	2006-12-27 15:01:39 UTC (rev 18063)
+++ trunk/gtk/gtkplugin.c	2006-12-30 18:43:57 UTC (rev 18064)
@@ -129,10 +129,15 @@
 		char *desc;
 		plug = probes->data;
 
-		if (plug->info->type != GAIM_PLUGIN_STANDARD ||
-			(plug->info->flags & GAIM_PLUGIN_FLAG_INVISIBLE))
-		{
+		if (plug->info->type == GAIM_PLUGIN_LOADER) {
+			GList *cur;
+			for (cur = GAIM_PLUGIN_LOADER_INFO(plug)->exts; cur != NULL;
+					 cur = cur->next)
+				gaim_plugins_probe(cur->data);
 			continue;
+		} else if (plug->info->type != GAIM_PLUGIN_STANDARD ||
+			(plug->info->flags & GAIM_PLUGIN_FLAG_INVISIBLE)) {
+			continue;
 		}
 
 		gtk_list_store_append (ls, &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: [18063] trunk/gtk/gtkstatusbox.c

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

Revision: 18063
          http://svn.sourceforge.net/gaim/?rev=18063&view=rev
Author:   sadrul
Date:     2006-12-27 07:01:39 -0800 (Wed, 27 Dec 2006)

Log Message:
-----------
Make sure the selected item in the dropdown also has the keyboard focus.

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

Modified: trunk/gtk/gtkstatusbox.c
===================================================================
--- trunk/gtk/gtkstatusbox.c	2006-12-27 13:34:33 UTC (rev 18062)
+++ trunk/gtk/gtkstatusbox.c	2006-12-27 15:01:39 UTC (rev 18063)
@@ -1309,8 +1309,7 @@
 
 	if (box->active_row) {
 		GtkTreePath *path = gtk_tree_row_reference_get_path(box->active_row);
-		GtkTreeSelection *sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (box->tree_view));
-		gtk_tree_selection_select_path(sel, path);
+		gtk_tree_view_set_cursor(GTK_TREE_VIEW(box->tree_view), path, NULL, FALSE);
 		gtk_tree_path_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: [18062] trunk/libgaim/protocols/qq/qq_proxy.c

[<mar...@us...>]

Revision: 18062
          http://svn.sourceforge.net/gaim/?rev=18062&view=rev
Author:   markhuetsch
Date:     2006-12-27 05:34:33 -0800 (Wed, 27 Dec 2006)

Log Message:
-----------
Fix a crash. If we are redirected and then disconnected before _qq_got_login() gets called, we'd be trying to free already freed memory.

Modified Paths:
--------------
    trunk/libgaim/protocols/qq/qq_proxy.c

Modified: trunk/libgaim/protocols/qq/qq_proxy.c
===================================================================
--- trunk/libgaim/protocols/qq/qq_proxy.c	2006-12-27 13:27:55 UTC (rev 18061)
+++ trunk/libgaim/protocols/qq/qq_proxy.c	2006-12-27 13:34:33 UTC (rev 18062)
@@ -156,7 +156,6 @@
 	qd->logged_in = FALSE;
 	qd->channel = 1;
 	qd->uid = strtol(gaim_account_get_username(gaim_connection_get_account(gc)), NULL, 10);
-	qd->before_login_packets = g_queue_new();
 
 	/* now generate md5 processed passwd */
 	passwd = gaim_account_get_password(gaim_connection_get_account(gc));
@@ -432,6 +431,7 @@
 		gboolean use_tcp, gboolean is_redirect)
 {
 	GaimConnection *gc;
+	qq_data *qd;
 
 	g_return_val_if_fail(host != NULL, -1);
 	g_return_val_if_fail(port > 0, -1);
@@ -442,6 +442,9 @@
 	if (is_redirect)
 		_qq_common_clean(gc);
 
+	qd = (qq_data *) gc->proto_data;
+	qd->before_login_packets = g_queue_new();
+
 	return _proxy_connect_full(account, host, port, _qq_got_login, gc, use_tcp);
 }
 


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

[Gaim-commits] SF.net SVN: gaim: [18061] trunk/libgaim/protocols/qq/sendqueue.c

[<mar...@us...>]

Revision: 18061
          http://svn.sourceforge.net/gaim/?rev=18061&view=rev
Author:   markhuetsch
Date:     2006-12-27 05:27:55 -0800 (Wed, 27 Dec 2006)

Log Message:
-----------
Don't prompt user about dropped packets, just keep resending them.

Modified Paths:
--------------
    trunk/libgaim/protocols/qq/sendqueue.c

Modified: trunk/libgaim/protocols/qq/sendqueue.c
===================================================================
--- trunk/libgaim/protocols/qq/sendqueue.c	2006-12-27 10:30:02 UTC (rev 18060)
+++ trunk/libgaim/protocols/qq/sendqueue.c	2006-12-27 13:27:55 UTC (rev 18061)
@@ -78,68 +78,8 @@
 	gaim_debug(GAIM_DEBUG_INFO, "QQ", "%d packets in sendqueue are freed!\n", i);
 }
 
-/* packet lost, agree to send again.
- * it is removed only when ack-ed by server */
-static void _qq_send_again(gc_and_packet *gp)
-{
-	GaimConnection *gc;
-	qq_data *qd;
-	qq_sendpacket *packet;
-	GList *list;
-
-	g_return_if_fail(gp != NULL && gp->gc != NULL && gp->packet != NULL);
-	g_return_if_fail(gp->gc->proto_data != NULL);
-
-	gc = gp->gc;
-	packet = gp->packet;
-	qd = (qq_data *) gc->proto_data;
-
-	list = g_list_find(qd->sendqueue, packet);
-	if (list != NULL) {
-		packet->resend_times = 0;
-		packet->sendtime = time(NULL);
-		qq_proxy_write(qd, packet->buf, packet->len);
-	}
-	g_free(gp);
-}
-
-/* packet lost, do not send again */
-static void _qq_send_cancel(gc_and_packet *gp)
-{
-	GaimConnection *gc;
-	qq_data *qd;
-	qq_sendpacket *packet;
-	GList *list;
-
-	g_return_if_fail(gp != NULL && gp->gc != NULL && gp->packet != NULL);
-	g_return_if_fail(gp->gc->proto_data != NULL);
-
-	gc = gp->gc;
-	packet = gp->packet;
-	qd = (qq_data *) gc->proto_data;
-
-	list = g_list_find(qd->sendqueue, packet);
-	if (list != NULL)
-		qq_sendqueue_remove(qd, packet->send_seq);
-
-	g_free(gp);
-}
-
-static void _notify_packets_lost(GaimConnection *gc, const gchar *msg, qq_sendpacket *p)
-{
-	gc_and_packet *gp;
-
-	gp = g_new0(gc_and_packet, 1);
-	gp->gc = gc;
-	gp->packet = p;
-	gaim_request_action
-		(gc, NULL, _("Communication timed out"), msg,
-		0, gp, 2, _("Try again"), G_CALLBACK(_qq_send_again),
-		_("Cancel"), G_CALLBACK(_qq_send_cancel));
-	/* keep in sendqueue doing nothing until we hear back from the user */
-	p->resend_times++;
-}
-
+/* TODO drop get buddy list if we don't know about any buddies...
+ * I think the server won't ACK a get buddies request if we have none */
 gboolean qq_sendqueue_timeout_callback(gpointer data)
 {
 	GaimConnection *gc;
@@ -173,60 +113,28 @@
 	list = qd->sendqueue;
 	while (list != NULL) {
 		p = (qq_sendpacket *) list->data;
-		if (p->resend_times >= QQ_RESEND_MAX) {
-			if (p->resend_times == QQ_RESEND_MAX) {	/* reach max */
-				switch (p->cmd) {
-				case QQ_CMD_KEEP_ALIVE:
-					if (qd->logged_in) {
-						gaim_debug(GAIM_DEBUG_ERROR, "QQ", "Connection lost!\n");
-						gaim_connection_error(gc, _("Connection lost"));
-						qd->logged_in = FALSE;
-					}
-					p->resend_times = -1;
-					break;
-				case QQ_CMD_LOGIN:
-				case QQ_CMD_REQUEST_LOGIN_TOKEN:
-					if (!qd->logged_in)	/* cancel logging progress */
-						gaim_connection_error(gc, _("Login failed, no reply"));
-					p->resend_times = -1;
-					break;
-				case QQ_CMD_UPDATE_INFO:
-					_notify_packets_lost(gc, 
-						_("Your attempt to update your info has timed out. Send the information again?"), p);
-					break;
-				case QQ_CMD_GET_USER_INFO:
-					_notify_packets_lost(gc, 
-						_("Your attempt to view a user's info has timed out. Try again?"), p);
-					break;
-				case QQ_CMD_ADD_FRIEND_WO_AUTH:
-					_notify_packets_lost(gc, 
-						_("Your attempt to add a buddy has timed out. Try again?"), p);
-					break;
-				case QQ_CMD_DEL_FRIEND:
-					_notify_packets_lost(gc, 
-						_("Your attempt to remove a buddy has timed out. Try again?"), p);
-					break;
-				case QQ_CMD_BUDDY_AUTH:
-					_notify_packets_lost(gc, 
-						_("Your attempt to add a buddy has timed out. Try again?"), p);
-					break;
-				case QQ_CMD_CHANGE_ONLINE_STATUS:
-					_notify_packets_lost(gc, 
-						_("Your attempt to change your online status has timed out. Send the information again?"), p);
-					break;
-				case QQ_CMD_SEND_IM:
-					_notify_packets_lost(gc, 
-						_("Your attempt to send an IM has timed out. Send it again?"), p);
-					break;
-				case QQ_CMD_REQUEST_KEY:
-					_notify_packets_lost(gc, 
-						_("Your request for a file transfer key has timed out. Request it again?"), p);
-					break;
-				default:{
-					p->resend_times = -1;	/* it will be removed next time */
-					gaim_debug(GAIM_DEBUG_ERROR, "QQ", "%s packet lost!\n", qq_get_cmd_desc(p->cmd));
-					}
+		if (p->resend_times == QQ_RESEND_MAX) {	/* reach max */
+			switch (p->cmd) {
+			case QQ_CMD_KEEP_ALIVE:
+				if (qd->logged_in) {
+					gaim_debug(GAIM_DEBUG_ERROR, "QQ", "Connection lost!\n");
+					gaim_connection_error(gc, _("Connection lost"));
+					qd->logged_in = FALSE;
 				}
+				p->resend_times = -1;
+				break;
+			case QQ_CMD_LOGIN:
+			case QQ_CMD_REQUEST_LOGIN_TOKEN:
+				if (!qd->logged_in)	/* cancel login progress */
+					gaim_connection_error(gc, _("Login failed, no reply"));
+				p->resend_times = -1;
+				break;
+			default:{
+				gaim_debug(GAIM_DEBUG_WARNING, "QQ", 
+					"%s packet sent %d times but not acked. Resetting sendqueue life\n", 
+					qq_get_cmd_desc(p->cmd), QQ_RESEND_MAX);
+				}
+				p->resend_times = 0;
 			}
 		} else {	/* resend_times < QQ_RESEND_MAX, so sent it again */
 			wait_time = (gint) (QQ_SENDQUEUE_TIMEOUT / 1000);


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

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

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

Revision: 18060
          http://svn.sourceforge.net/gaim/?rev=18060&view=rev
Author:   sadrul
Date:     2006-12-27 02:30:02 -0800 (Wed, 27 Dec 2006)

Log Message:
-----------
Thanks to EvilDennisR for finding this.

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

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-12-26 20:40:05 UTC (rev 18059)
+++ trunk/configure.ac	2006-12-27 10:30:02 UTC (rev 18060)
@@ -393,7 +393,7 @@
 					# error get_wch not found!
 					#endif
 				], [
-					dir=location
+					dir=$location
 					if test x"$dir" != x"." ; then
 						GNT_CFLAGS="-I$dir/"
 					else


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

[Gaim-commits] SF.net SVN: gaim: [18059] trunk/gtk/gtkimhtml.c

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

Revision: 18059
          http://svn.sourceforge.net/gaim/?rev=18059&view=rev
Author:   sadrul
Date:     2006-12-26 12:40:05 -0800 (Tue, 26 Dec 2006)

Log Message:
-----------
Fix bug #1622466 ("Don't substitute smileys in URIs") by disabling smileys for
links. This is going to cause smileys to be disabled for stuff like
"<a href='abc'>check this out ;)</a>" too. Do people use links/smileys like
this a lot? If they do, this probably needs to be reverted.

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

Modified: trunk/gtk/gtkimhtml.c
===================================================================
--- trunk/gtk/gtkimhtml.c	2006-12-26 19:22:03 UTC (rev 18058)
+++ trunk/gtk/gtkimhtml.c	2006-12-26 20:40:05 UTC (rev 18059)
@@ -2966,7 +2966,8 @@
 			c += tlen;
 			pos += tlen;
 			g_free(tag); /* This was allocated back in VALID_TAG() */
-		} else if (gtk_imhtml_is_smiley(imhtml, fonts, c, &smilelen)) {
+		} else if (imhtml->edit.link == NULL &&
+				gtk_imhtml_is_smiley(imhtml, fonts, c, &smilelen)) {
 			GtkIMHtmlFontDetail *fd;
 
 			gchar *sml = NULL;


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