# HG changeset patch
# User Evan Schoenberg <evan.s@dreskin.net>
# Date 1209440845 0
# Node ID b30516259a8a7f056c929769abce3d7939826a11
# Parent  f1a4ad1526a268d181970e23c7456218f2363358
disapproval of revision '52c0efb045580dac7b6f5e40c91002e917e0cae3'

diff -r f1a4ad1526a2 -r b30516259a8a ChangeLog.API
--- a/ChangeLog.API	Tue Apr 29 02:58:23 2008 +0000
+++ b/ChangeLog.API	Tue Apr 29 03:47:25 2008 +0000
@@ -1,9 +1,9 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.5.0:
+version 2.x.x:
     libpurple:
         Added:
-        * purple_serv_got_join_chat_failed
+        * serv_got_join_chat_failed
         * chat-join-failed signal (see conversation-signals.dox)
 	perl:
 		Added:
diff -r f1a4ad1526a2 -r b30516259a8a configure.ac
--- a/configure.ac	Tue Apr 29 02:58:23 2008 +0000
+++ b/configure.ac	Tue Apr 29 03:47:25 2008 +0000
@@ -43,19 +43,19 @@
 #
 # Make sure to update finch/libgnt/configure.ac with libgnt version changes.
 #
-m4_define([purple_lt_current], [5])
+m4_define([purple_lt_current], [4])
 m4_define([purple_major_version], [2])
-m4_define([purple_minor_version], [5])
-m4_define([purple_micro_version], [0])
+m4_define([purple_minor_version], [4])
+m4_define([purple_micro_version], [2])
 m4_define([purple_version_suffix], [devel])
 m4_define([purple_version],
           [purple_major_version.purple_minor_version.purple_micro_version])
 m4_define([purple_display_version], purple_version[]m4_ifdef([purple_version_suffix],[purple_version_suffix]))
 
-m4_define([gnt_lt_current], [5])
+m4_define([gnt_lt_current], [4])
 m4_define([gnt_major_version], [2])
-m4_define([gnt_minor_version], [5])
-m4_define([gnt_micro_version], [0])
+m4_define([gnt_minor_version], [4])
+m4_define([gnt_micro_version], [2])
 m4_define([gnt_version_suffix], [devel])
 m4_define([gnt_version],
           [gnt_major_version.gnt_minor_version.gnt_micro_version])
diff -r f1a4ad1526a2 -r b30516259a8a libpurple/protocols/jabber/chat.c
--- a/libpurple/protocols/jabber/chat.c	Tue Apr 29 02:58:23 2008 +0000
+++ b/libpurple/protocols/jabber/chat.c	Tue Apr 29 03:47:25 2008 +0000
@@ -230,7 +230,7 @@
 		char *buf = g_strdup_printf(_("%s is not a valid room name"), room);
 		purple_notify_error(gc, _("Invalid Room Name"), _("Invalid Room Name"),
 				buf);
-		purple_serv_got_join_chat_failed(gc, room_jid);
+		serv_got_join_chat_failed(gc, room_jid);
 		g_free(room_jid);
 		g_free(buf);
 		return;
@@ -238,7 +238,7 @@
 		char *buf = g_strdup_printf(_("%s is not a valid server name"), server);
 		purple_notify_error(gc, _("Invalid Server Name"),
 				_("Invalid Server Name"), buf);
-		purple_serv_got_join_chat_failed(gc, room_jid);
+		serv_got_join_chat_failed(gc, room_jid);
 		g_free(room_jid);
 		g_free(buf);
 		return;
@@ -246,7 +246,7 @@
 		char *buf = g_strdup_printf(_("%s is not a valid room handle"), handle);
 		purple_notify_error(gc, _("Invalid Room Handle"),
 				_("Invalid Room Handle"), buf);
-		purple_serv_got_join_chat_failed(gc, room_jid);
+		serv_got_join_chat_failed(gc, room_jid);
 		g_free(buf);
 		g_free(room_jid);
 		return;
diff -r f1a4ad1526a2 -r b30516259a8a libpurple/protocols/jabber/presence.c
--- a/libpurple/protocols/jabber/presence.c	Tue Apr 29 02:58:23 2008 +0000
+++ b/libpurple/protocols/jabber/presence.c	Tue Apr 29 03:47:25 2008 +0000
@@ -575,7 +575,7 @@
 					serv_got_chat_left(js->gc, chat->id);
 			} else {
 				title = g_strdup_printf(_("Error joining chat %s"), from);
-				purple_serv_got_join_chat_failed(js->gc, room_jid);
+				serv_got_join_chat_failed(js->gc, room_jid);
 			}
 			purple_notify_error(js->gc, title, title, msg);
 			g_free(title);
diff -r f1a4ad1526a2 -r b30516259a8a libpurple/server.c
--- a/libpurple/server.c	Tue Apr 29 02:58:23 2008 +0000
+++ b/libpurple/server.c	Tue Apr 29 03:47:25 2008 +0000
@@ -967,7 +967,7 @@
 	purple_signal_emit(purple_conversations_get_handle(), "chat-left", conv);
 }
 
-void purple_serv_got_join_chat_failed(PurpleConnection *gc, const char *name)
+void serv_got_join_chat_failed(PurpleConnection *gc, const char *name)
 {
 	purple_signal_emit(purple_conversations_get_handle(), "chat-join-failed",
 					gc, name);
diff -r f1a4ad1526a2 -r b30516259a8a libpurple/server.h
--- a/libpurple/server.h	Tue Apr 29 02:58:23 2008 +0000
+++ b/libpurple/server.h	Tue Apr 29 03:47:25 2008 +0000
@@ -173,7 +173,7 @@
  * @param gc      The connection on which chat joining failed
  * @param name    The name of the chat which we did not join
  */
-void purple_serv_got_join_chat_failed(PurpleConnection *gc, const char *name);
+void serv_got_join_chat_failed(PurpleConnection *gc, const char *name);
 	
 void serv_got_chat_left(PurpleConnection *g, int id);
 void serv_got_chat_in(PurpleConnection *g, int id, const char *who,