pidgin: 69e8be0f: disapproval of revision '52c0efb045580da...

[evands at pidgin.im]

-----------------------------------------------------------------
Revision: 69e8be0fb082209074a78effd111c372b9de6603
Ancestor: 52c0efb045580dac7b6f5e40c91002e917e0cae3
Author: evands at pidgin.im
Date: 2008-04-29T03:47:25
Date: 2008-04-29T03:56:43
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/69e8be0fb082209074a78effd111c372b9de6603

Modified files:
        ChangeLog.API configure.ac libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/presence.c libpurple/server.c
        libpurple/server.h

ChangeLog: 

disapproval of revision '52c0efb045580dac7b6f5e40c91002e917e0cae3'
-------------- next part --------------
============================================================
--- ChangeLog.API	82e09660214f06e9a811c1bab8edf31e3beb1d3f
+++ ChangeLog.API	995229847d848306797e89cc9a4592828277c8d7
@@ -1,9 +1,9 @@ Pidgin and Finch: The Pimpin' Penguin IM
 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:
============================================================
--- configure.ac	e5ea03929a6d8a2cec9bca46d60a3ec34d42448a
+++ configure.ac	3b26612e7eafb66176ebfdaf09f681359fdfca4a
@@ -43,19 +43,19 @@ AC_PREREQ([2.50])
 #
 # 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])
============================================================
--- libpurple/protocols/jabber/chat.c	0aadd2a92f2f7471d50b36a3165971c86b044b63
+++ libpurple/protocols/jabber/chat.c	90097e85bdd98211f5ca7fbddc868421ef38586e
@@ -230,7 +230,7 @@ void jabber_chat_join(PurpleConnection *
 		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 @@ void jabber_chat_join(PurpleConnection *
 		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 @@ void jabber_chat_join(PurpleConnection *
 		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;
============================================================
--- libpurple/protocols/jabber/presence.c	094c611574b77d442a9b97d28ca549f39020882e
+++ libpurple/protocols/jabber/presence.c	b89e6907bcb37fac8a1c33283a14bc5e0d13aabb
@@ -575,7 +575,7 @@ void jabber_presence_parse(JabberStream 
 					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);
============================================================
--- libpurple/server.c	cfad78cf203a79f1a25987a813c811ebd198c2db
+++ libpurple/server.c	8722e6ec363280c9b4b9f071e20fac61f97fa8d0
@@ -967,7 +967,7 @@ void serv_got_chat_left(PurpleConnection
 	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);
============================================================
--- libpurple/server.h	4928a407fd71581673c26469eb9ef0f71ae9c546
+++ libpurple/server.h	ecf4a59541e6dd4dd85c1ec0f75e413f627b7279
@@ -173,7 +173,7 @@ PurpleConversation *serv_got_joined_chat
  * @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,