[Pkg-privacy-commits] [pidgin-otr] 21/255: * otr-plugin.c: Track the gaim-2 API changes.

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch experimental
in repository pidgin-otr.

commit 928079d9c92e5eea96c1148b471edc75d3a4d102
Author: cypherpunk <cypherpunk>
Date:   Fri Jan 20 15:22:06 2006 +0000

    	* otr-plugin.c: Track the gaim-2 API changes.
---
 ChangeLog    | 4 ++++
 otr-plugin.c | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 084aab4..de2d29c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-20
+
+	* otr-plugin.c: Track the gaim-2 API changes.
+
 2005-12-18
 
 	* gtk-dialog.c:
diff --git a/otr-plugin.c b/otr-plugin.c
index 4c34962..ceec0fc 100644
--- a/otr-plugin.c
+++ b/otr-plugin.c
@@ -423,7 +423,11 @@ static void otr_options_cb(GaimBlistNode *node, gpointer user_data)
 
 static void supply_extended_menu(GaimBlistNode *node, GList **menu)
 {
+#if GAIM_MAJOR_VERSION < 2
     GaimBlistNodeAction *act;
+#else
+    GaimMenuAction *act;
+#endif
     GaimBuddy *buddy;
     GaimAccount *acct;
     const char *proto;
@@ -440,7 +444,8 @@ static void supply_extended_menu(GaimBlistNode *node, GList **menu)
 #if GAIM_MAJOR_VERSION < 2
     act = gaim_blist_node_action_new("OTR Settings", otr_options_cb, NULL);
 #else
-    act = gaim_blist_node_action_new("OTR Settings", otr_options_cb, NULL, NULL);
+    act = gaim_menu_action_new("OTR Settings", (GaimCallback)otr_options_cb,
+	    NULL, NULL);
 #endif
     *menu = g_list_append(*menu, act);
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/pidgin-otr.git