Mercurial > pidgin

changeset 15542:5ec72809228b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '4af83de031df5affbcf7e43099e6223f252d3deb' and '6bfd7f3f9bd034def884bed56ff76598fbdabf12'
author Mark Doliner <mark@kingant.net>
date Sun, 04 Feb 2007 08:48:08 +0000
parents 16845e318249 (current diff) 7ae72b7c02b1 (diff)
children cb6bb41291c8
files
diffstat 13 files changed, 81 insertions(+), 56 deletions(-) [+]
line wrap: on
line diff
--- a/COPYRIGHT	Sun Feb 04 08:25:43 2007 +0000
+++ b/COPYRIGHT	Sun Feb 04 08:48:08 2007 +0000
@@ -1,9 +1,10 @@
 Gaim
-Copyright (C) 1998-2006 by the following:
+Copyright (C) 1998-2007 by the following:
 
 If you have contributed to Gaim, you deserve to be on this list.
 Contact us (see: AUTHORS) and we'll add you.
 
+Saleem Abdulrasool
 Dave Ahlswede
 Manuel Amador
 Matt Amato
@@ -243,6 +244,7 @@
 Havoc Pennington
 Ted Percival
 Eduardo Pérez
+Celso Pinto
 Joao Luís Marques Pinto
 Aleksander Piotrowski
 Julien Pivotto
--- a/NEWS	Sun Feb 04 08:25:43 2007 +0000
+++ b/NEWS	Sun Feb 04 08:48:08 2007 +0000
@@ -10,7 +10,9 @@
 
 	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
--- a/configure.ac	Sun Feb 04 08:25:43 2007 +0000
+++ b/configure.ac	Sun Feb 04 08:48:08 2007 +0000
@@ -1026,7 +1026,7 @@
 dnl #######################################################################
 dnl # Check for Mono support
 dnl #######################################################################
-AC_ARG_ENABLE(mono, [AC_HELP_STRING([--enable-mono], [compile with Mono runtime support])], , enable_mono=no)
+AC_ARG_ENABLE(mono, [AC_HELP_STRING([--enable-mono], [compile with Mono runtime support (experimental)])], , enable_mono=no)
 if test x"$enable_mono" = x"yes" ; then
 	AC_MSG_CHECKING(for Mono compile flags)
 	MONO_CFLAGS=`pkg-config --cflags mono 2> /dev/null`
--- a/gaim.spec.in	Sun Feb 04 08:25:43 2007 +0000
+++ b/gaim.spec.in	Sun Feb 04 08:48:08 2007 +0000
@@ -29,8 +29,6 @@
 # Generic build requirements
 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 >= 0.10}
 %{!?_without_gtkspell:BuildRequires: gtkspell-devel}
 %{?_with_howl:BuildRequires: howl-devel}
 %{?_with_meanwhile:BuildRequires: meanwhile-devel}
@@ -40,6 +38,16 @@
 %{?_with_tcl:BuildRequires: tcl, tk, /usr/include/tcl.h}
 %{!?_without_text:BuildRequires: ncurses-devel}
 
+%if "%{_vendor}" == "suse"
+# For SuSE:
+BuildRequires: gnutls-devel
+%{?_with_dbus:BuildRequires: dbus-1-devel >= 0.35}
+%{!?_without_gstreamer:BuildRequires: gstreamer010-devel >= 0.10}
+%else
+%{?_with_dbus:BuildRequires: dbus-devel >= 0.35}
+%{!?_without_gstreamer:BuildRequires: gstreamer-devel >= 0.10}
+%endif
+
 # Mandrake 10.1 and lower || Mandrake 10.2 (and higher?)
 %if "%{_vendor}" == "MandrakeSoft" || "%{_vendor}" == "Mandrakesoft" || "%{_vendor}" == "Mandriva"
 # For Mandrake/Mandriva:
@@ -48,10 +56,7 @@
 %else
 # For SuSE, Red Hat, Fedora and others:
 BuildRequires: gtk2-devel
-%if "%{_vendor}" == "suse"
-# For SuSE:
-BuildRequires: gnutls-devel
-%else
+%if "%{_vendor}" != "suse"
 # For Red Hat, Fedora and others:
 # let's assume RH & FC1 are the only brain-dead distros missing the
 # perl-XML-Parser dependency on intltool and that other RH/FC releases
--- a/libpurple/plugins/mono/GetBuddyBack.cs	Sun Feb 04 08:25:43 2007 +0000
+++ b/libpurple/plugins/mono/GetBuddyBack.cs	Sun Feb 04 08:48:08 2007 +0000
@@ -1,7 +1,14 @@
 using Gaim;
 
-public class GetBuddyBack : GaimPlugin
+public class GetBuddyBack : Plugin
 {
+	private static PluginInfo info = new PluginInfo("C# Get Buddy Back", "0.1", "Prints when a Buddy returns", "Longer Description", "Eoin Coffey", "urled");
+
+	public GetBuddyBack()
+		: base (info)
+	{
+	}
+
 	public void HandleSig(object[] args)
 	{
 		Buddy buddy = (Buddy)args[0];
@@ -24,9 +31,4 @@
 	public override void Destroy()
 	{
 	}
-	
-	public override GaimPluginInfo Info()
-	{
-		return new GaimPluginInfo("C# Get Buddy Back", "0.1", "Prints when a Buddy returns", "Longer Description", "Eoin Coffey", "urled");
-	}
 }
--- a/libpurple/plugins/mono/MPlugin.cs	Sun Feb 04 08:25:43 2007 +0000
+++ b/libpurple/plugins/mono/MPlugin.cs	Sun Feb 04 08:48:08 2007 +0000
@@ -1,7 +1,14 @@
 using Gaim;
 
-public class MPlugin : GaimPlugin
+public class MPlugin : Plugin
 {
+	private static PluginInfo info = new PluginInfo("C# Plugin", "0.1", "Test C# Plugin", "Longer Description", "Eoin Coffey", "urled");
+
+	public MPlugin()
+		: base(info)
+	{
+	}
+
 	public void HandleSig(object[] args)
 	{
 		Buddy buddy = (Buddy)args[0];
@@ -28,9 +35,4 @@
 	{
 		Debug.debug(Debug.INFO, "mplug", "destroying...\n");
 	}
-	
-	public override GaimPluginInfo Info()
-	{
-		return new GaimPluginInfo("C# Plugin", "0.1", "Test C# Plugin", "Longer Description", "Eoin Coffey", "urled");
-	}
 }
--- a/libpurple/protocols/jabber/message.c	Sun Feb 04 08:25:43 2007 +0000
+++ b/libpurple/protocols/jabber/message.c	Sun Feb 04 08:48:08 2007 +0000
@@ -217,14 +217,12 @@
 	if(!jid)
 		return;
 
-	components = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
+	components = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, g_free);
 
-	g_hash_table_replace(components, g_strdup("room"), g_strdup(jid->node));
-	g_hash_table_replace(components, g_strdup("server"), g_strdup(jid->domain));
-	g_hash_table_replace(components, g_strdup("handle"),
-			g_strdup(jm->js->user->node));
-	g_hash_table_replace(components, g_strdup("password"),
-			g_strdup(jm->password));
+	g_hash_table_replace(components, "room", g_strdup(jid->node));
+	g_hash_table_replace(components, "server", g_strdup(jid->domain));
+	g_hash_table_replace(components, "handle", g_strdup(jm->js->user->node));
+	g_hash_table_replace(components, "password", g_strdup(jm->password));
 
 	jabber_id_free(jid);
 	serv_got_chat_invite(jm->js->gc, jm->to, jm->from, jm->body, components);
--- a/libpurple/protocols/oscar/misc.c	Sun Feb 04 08:25:43 2007 +0000
+++ b/libpurple/protocols/oscar/misc.c	Sun Feb 04 08:48:08 2007 +0000
@@ -70,7 +70,10 @@
 	aim_snacid_t snacid;
 
 	if (!longdata)
-		return aim_genericreq_n(od, conn, family, subtype);
+	{
+		aim_genericreq_n(od, conn, family, subtype);
+		return;
+	}
 
 	frame = flap_frame_new(od, 0x02, 10+4);
 
@@ -89,7 +92,10 @@
 	aim_snacid_t snacid;
 
 	if (!shortdata)
-		return aim_genericreq_n(od, conn, family, subtype);
+	{
+		aim_genericreq_n(od, conn, family, subtype);
+		return;
+	}
 
 	frame = flap_frame_new(od, 0x02, 10+2);
 
--- a/pidgin/gaimcombobox.c	Sun Feb 04 08:25:43 2007 +0000
+++ b/pidgin/gaimcombobox.c	Sun Feb 04 08:48:08 2007 +0000
@@ -21,9 +21,10 @@
 #include <config.h>
 */
 #include <gtk/gtkversion.h>
-#if !GTK_CHECK_VERSION(2,4,0)
+#if !GTK_CHECK_VERSION(2,6,0)
 #include "gaimcombobox.h"
 
+#if !GTK_CHECK_VERSION(2,4,0)
 #include <gtk/gtkarrow.h>
 #include <gtk/gtkbindings.h>
 #include "gtkcelllayout.h"
@@ -3557,21 +3558,6 @@
     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)
@@ -3745,3 +3731,19 @@
     }
 }
 #endif /* Gtk 2.4 */
+
+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 (gtk_combo_box_get_model(combo_box), &iter, 
+    			0, &text, -1);
+  return text;
+}
+
+#endif
--- a/pidgin/gaimcombobox.h	Sun Feb 04 08:25:43 2007 +0000
+++ b/pidgin/gaimcombobox.h	Sun Feb 04 08:48:08 2007 +0000
@@ -17,6 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef __GAIM_COMBO_BOX_H__
+#define __GAIM_COMBO_BOX_H__
+
 #ifndef __GTK_COMBO_BOX_H__
 #define __GTK_COMBO_BOX_H__
 
@@ -98,8 +101,6 @@
                                               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);
 void          gtk_combo_box_popdown          (GtkComboBox     *combo_box);
@@ -107,3 +108,7 @@
 G_END_DECLS
 
 #endif /* __GTK_COMBO_BOX_H__ */
+
+gchar        *gtk_combo_box_get_active_text  (GtkComboBox     *combo_box);
+
+#endif /* __GAIM_COMBOX_BOX_H__ */
--- a/pidgin/pidgin.h	Sun Feb 04 08:25:43 2007 +0000
+++ b/pidgin/pidgin.h	Sun Feb 04 08:48:08 2007 +0000
@@ -55,24 +55,24 @@
  */
 /** @cond */
 #if (!GTK_CHECK_VERSION(2,4,0))
-#define GTK_WRAP_WORD_CHAR GTK_WRAP_WORD
-#include "gtkexpander.h"
+# define GTK_WRAP_WORD_CHAR GTK_WRAP_WORD
+# include "gtkexpander.h"
 #endif
 /** @endcond */
 
 /*
  * We include the sources for GtkComboBox and GtkCellView because
- * they don't exist in older version of Gtk+, and we use them
+ * they don't exist in older versions of GTK+, and we use them
  * in a few places.
  */
 #if !GTK_CHECK_VERSION(2,6,0)
 #   include "gtkcellview.h"
 #   include "gtkcellviewmenuitem.h"
+#   include "gaimcombobox.h"
 #   if !GTK_CHECK_VERSION(2,4,0)
 #       include "gtkcelllayout.h"
-#       include "gaimcombobox.h"
-#   endif /* Gtk 2.4 */
-#endif /* Gtk 2.6 */
+#   endif /* Less than GTK+ 2.4 */
+#endif /* Less than GTK+ 2.6 */
 
 /*
  * Spacings between components, as defined by the
--- a/pidgin/plugins/perl/common/GtkSession.xs	Sun Feb 04 08:25:43 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkSession.xs	Sun Feb 04 08:48:08 2007 +0000
@@ -4,10 +4,10 @@
 PROTOTYPES: ENABLE
 
 void
-gaim_gtk_session_init(argv0, previous_id, config_dir)
+pidgin_session_init(argv0, previous_id, config_dir)
 	gchar * argv0
 	gchar * previous_id
 	gchar * config_dir
 
 void
-gaim_gtk_session_end()
+pidgin_session_end()
--- a/po/POTFILES.in	Sun Feb 04 08:25:43 2007 +0000
+++ b/po/POTFILES.in	Sun Feb 04 08:48:08 2007 +0000
@@ -83,6 +83,7 @@
 pidgin/plugins/ticker/ticker.c
 pidgin/plugins/timestamp.c
 pidgin/plugins/timestamp_format.c
+pidgin/plugins/xmppconsole.c
 pidgin/plugins/win32/transparency/win2ktrans.c
 pidgin/plugins/win32/winprefs/winprefs.c
 libpurple/account.c