gaim-bnet-commits — gaim-bnet CVS Commits

[gaim-bnet-commits] gaim-bnet/src bnet.c,1.40,1.41

[Don S. <ri...@us...>]

Update of /cvsroot/gaim-bnet/gaim-bnet/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17158/src

Modified Files:
	bnet.c 
Log Message:
use GaimMenuAction, needs testing

Index: bnet.c
===================================================================
RCS file: /cvsroot/gaim-bnet/gaim-bnet/src/bnet.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** bnet.c	23 Dec 2005 19:15:05 -0000	1.40
--- bnet.c	8 Feb 2006 22:24:41 -0000	1.41
***************
*** 124,128 ****
  static GList *blist_node_menu(GaimBlistNode *node) {
  
! 	GaimBlistNodeAction *act;
  	GList *m = NULL;
  
--- 124,128 ----
  static GList *blist_node_menu(GaimBlistNode *node) {
  
! 	GaimMenuAction *act;
  	GList *m = NULL;
  
***************
*** 130,151 ****
  		return NULL;
  
! 	act = gaim_blist_node_action_new(_("StarCraft Stats"),
! 					bnet_user_stats, "STAR", NULL);
  	m = g_list_append(m, act);
  
! 	act = gaim_blist_node_action_new(_("StarCraft Broodwar Stats"),
! 					bnet_user_stats, "SEXP", NULL);
  	m = g_list_append(m, act);
  
! 	act = gaim_blist_node_action_new(_("WarCraft II Battle.net Edition Stats"),
! 					bnet_user_stats, "W2BN", NULL);
  	m = g_list_append(m, act);
  
! 	act = gaim_blist_node_action_new(_("WarCraft III Stats"),
! 					bnet_user_stats, "WAR3", NULL);
  	m = g_list_append(m, act);
  
! 	act = gaim_blist_node_action_new(_("WarCraft III The Frozen Throne Stats"),
! 					bnet_user_stats, "W3XP", NULL);
  	m = g_list_append(m, act);
  
--- 130,151 ----
  		return NULL;
  
! 	act = gaim_menu_action_new(_("StarCraft Stats"),
! 					GAIM_CALLBACK(bnet_user_stats), "STAR", NULL);
  	m = g_list_append(m, act);
  
! 	act = gaim_menu_action_new(_("StarCraft Broodwar Stats"),
! 					GAIM_CALLBACK(bnet_user_stats), "SEXP", NULL);
  	m = g_list_append(m, act);
  
! 	act = gaim_menu_action_new(_("WarCraft II Battle.net Edition Stats"),
! 					GAIM_CALLBACK(bnet_user_stats), "W2BN", NULL);
  	m = g_list_append(m, act);
  
! 	act = gaim_menu_action_new(_("WarCraft III Stats"),
! 					GAIM_CALLBACK(bnet_user_stats), "WAR3", NULL);
  	m = g_list_append(m, act);
  
! 	act = gaim_menu_action_new(_("WarCraft III The Frozen Throne Stats"),
! 					GAIM_CALLBACK(bnet_user_stats), "W3XP", NULL);
  	m = g_list_append(m, act);
  

[gaim-bnet-commits] gaim-bnet configure.ac,1.10,1.11

[Don S. <ri...@us...>]

Update of /cvsroot/gaim-bnet/gaim-bnet
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12437

Modified Files:
	configure.ac 
Log Message:
Updating VERSION here

Index: configure.ac
===================================================================
RCS file: /cvsroot/gaim-bnet/gaim-bnet/configure.ac,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** configure.ac	21 Mar 2005 01:39:50 -0000	1.10
--- configure.ac	2 Jan 2006 05:55:07 -0000	1.11
***************
*** 4,8 ****
  #
  
! AC_INIT([gaim-bnet], [0.1.1], [gai...@li...])
  AC_CANONICAL_SYSTEM
  AM_CONFIG_HEADER(pre_config.h)
--- 4,8 ----
  #
  
! AC_INIT([gaim-bnet], [1.0.0cvs], [gai...@li...])
  AC_CANONICAL_SYSTEM
  AM_CONFIG_HEADER(pre_config.h)

[gaim-bnet-commits] gaim-bnet/src bnet.c,1.39,1.40 buddy.c,1.18,1.19 buddy.h,1.11,1.12 chat.c,1.7,1.8 chat.h,1.3,1.4 proto.c,1.27,1.28

[Don S. <ri...@us...>]

Update of /cvsroot/gaim-bnet/gaim-bnet/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23701/src

Modified Files:
	bnet.c buddy.c buddy.h chat.c chat.h proto.c 
Log Message:
Changes for gaim 2.0 API, still need to actually test running.  It compiles and loads now, anyhow.

Index: buddy.h
===================================================================
RCS file: /cvsroot/gaim-bnet/gaim-bnet/src/buddy.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** buddy.h	2 Mar 2005 22:39:47 -0000	1.11
--- buddy.h	23 Dec 2005 19:15:05 -0000	1.12
***************
*** 69,73 ****
  BNetBuddy *bnet_buddy_hard_lookup(BNetConn *conn, const gchar *name);
  void bnet_buddy_remove(GaimConnection *gc, GaimBuddy *buddy, GaimGroup *group);
! void bnet_buddy_emblems(GaimBuddy *buddy, char **se, char **sw, char **nw, char **ne);
  gchar *bnet_buddy_tooltip_text(GaimBuddy *b);
  void bnet_buddy_set_info(BNetBuddy *b, const gchar *game, const gchar *location);
--- 69,73 ----
  BNetBuddy *bnet_buddy_hard_lookup(BNetConn *conn, const gchar *name);
  void bnet_buddy_remove(GaimConnection *gc, GaimBuddy *buddy, GaimGroup *group);
! void bnet_buddy_emblems(GaimBuddy *buddy, const char **se, const char **sw, const char **nw, const char **ne);
  gchar *bnet_buddy_tooltip_text(GaimBuddy *b);
  void bnet_buddy_set_info(BNetBuddy *b, const gchar *game, const gchar *location);

Index: chat.h
===================================================================
RCS file: /cvsroot/gaim-bnet/gaim-bnet/src/chat.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** chat.h	26 Sep 2005 09:23:56 -0000	1.3
--- chat.h	23 Dec 2005 19:15:05 -0000	1.4
***************
*** 29,37 ****
  
  void bnet_register_commands();
! gint bnet_chat_send_im(GaimConnection *gc, const gchar *who, const gchar *what, GaimConvImFlags imflags);
  GList *bnet_chat_info(GaimConnection *gc);
  void bnet_chat_join(GaimConnection *gc, GHashTable *data);
  void bnet_chat_leave(GaimConnection *gc, int id);
! int bnet_chat_send(GaimConnection *gc, int id, const char *what);
  
  
--- 29,37 ----
  
  void bnet_register_commands();
! gint bnet_chat_send_im(GaimConnection *gc, const gchar *who, const gchar *what, GaimMessageFlags flags);
  GList *bnet_chat_info(GaimConnection *gc);
  void bnet_chat_join(GaimConnection *gc, GHashTable *data);
  void bnet_chat_leave(GaimConnection *gc, int id);
! int bnet_chat_send(GaimConnection *gc, int id, const char *what, GaimMessageFlags flags);
  
  

Index: chat.c
===================================================================
RCS file: /cvsroot/gaim-bnet/gaim-bnet/src/chat.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** chat.c	26 Sep 2005 09:23:56 -0000	1.7
--- chat.c	23 Dec 2005 19:15:05 -0000	1.8
***************
*** 153,157 ****
  gint
  bnet_chat_send_im(GaimConnection *gc, const gchar *who, const gchar *what,
! 				  GaimConvImFlags imflags) {
  	BNetConn *conn;
  
--- 153,157 ----
  gint
  bnet_chat_send_im(GaimConnection *gc, const gchar *who, const gchar *what,
! 				  GaimMessageFlags flags) {
  	BNetConn *conn;
  
***************
*** 203,207 ****
  		serv_got_joined_chat(gc, ++conn->chan_id, chan);
  
! 		convo = gaim_find_conversation_with_account(conn->chan, conn->account);
  		g_return_if_fail(convo);
  
--- 203,207 ----
  		serv_got_joined_chat(gc, ++conn->chan_id, chan);
  
! 		convo = gaim_find_conversation_with_account(GAIM_CONV_TYPE_CHAT, conn->chan, conn->account);
  		g_return_if_fail(convo);
  
***************
*** 209,213 ****
  	}
  	else {
! 		convo = gaim_find_conversation_with_account(conn->chan, conn->account);
  
  		if (convo) {
--- 209,213 ----
  	}
  	else {
! 		convo = gaim_find_conversation_with_account(GAIM_CONV_TYPE_CHAT, conn->chan, conn->account);
  
  		if (convo) {
***************
*** 229,233 ****
  
  int
! bnet_chat_send(GaimConnection *gc, int id, const char *what) {
  	BNetConn *conn;
  	GaimConversation *convo;
--- 229,233 ----
  
  int
! bnet_chat_send(GaimConnection *gc, int id, const char *what, GaimMessageFlags flags) {
  	BNetConn *conn;
  	GaimConversation *convo;

Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim-bnet/gaim-bnet/src/buddy.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** buddy.c	2 Mar 2005 22:39:47 -0000	1.18
--- buddy.c	23 Dec 2005 19:15:05 -0000	1.19
***************
*** 233,237 ****
  
  void
! bnet_buddy_emblems(GaimBuddy *b, char **se, char **sw, char **nw, char **ne) {
  	BNetConn *conn;
  	BNetBuddy *bb;
--- 233,237 ----
  
  void
! bnet_buddy_emblems(GaimBuddy *b, const char **se, const char **sw, const char **nw, const char **ne) {
  	BNetConn *conn;
  	BNetBuddy *bb;
***************
*** 246,250 ****
  		emblems[i++] = "notauthorized";
  	} else {
! 		if (b->present == GAIM_BUDDY_OFFLINE) {
  			emblems[i++] = "offline";
  		} else {
--- 246,251 ----
  		emblems[i++] = "notauthorized";
  	} else {
! 		//if (b->present == GAIM_BUDDY_OFFLINE) {
! 		if (!GAIM_BUDDY_IS_ONLINE(b)) {
  			emblems[i++] = "offline";
  		} else {
***************
*** 270,273 ****
--- 271,275 ----
  
  	if ((bb = g_hash_table_lookup(conn->buddies, norm))) {
+ 		/*
  		switch (b->present) {
  		case GAIM_BUDDY_SIGNING_OFF:
***************
*** 294,297 ****
--- 296,315 ----
  			break;
  		}
+ 		*/
+ 		
+ 		if (GAIM_BUDDY_IS_ONLINE(b)) {
+ 			g_string_append_printf(ret,
+ 				"\n<b>%s</b>: %s", _("Status"), _("Online"));
+ 
+ 			if (bb->game)
+ 				g_string_append_printf(ret,
+ 					"\n<b>%s:</b> %s", _("Game"), bb->game);
+ 			if (bb->location)
+ 				g_string_append_printf(ret,
+ 					"\n<b>%s:</b> %s", _("Location"), bb->location);
+ 		} else {
+ 			g_string_append_printf(ret,
+ 				"\n<b>%s</b>: %s", _("Status"), _("Offline"));
+ 		}
  	} else {
  		g_string_append_printf(ret,

Index: bnet.c
===================================================================
RCS file: /cvsroot/gaim-bnet/gaim-bnet/src/bnet.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** bnet.c	26 Sep 2005 09:23:56 -0000	1.39
--- bnet.c	23 Dec 2005 19:15:05 -0000	1.40
***************
*** 131,151 ****
  
  	act = gaim_blist_node_action_new(_("StarCraft Stats"),
! 									bnet_user_stats, "STAR");
  	m = g_list_append(m, act);
  
  	act = gaim_blist_node_action_new(_("StarCraft Broodwar Stats"),
! 									bnet_user_stats, "SEXP");
  	m = g_list_append(m, act);
  
  	act = gaim_blist_node_action_new(_("WarCraft II Battle.net Edition Stats"),
! 									bnet_user_stats, "W2BN");
  	m = g_list_append(m, act);
  
  	act = gaim_blist_node_action_new(_("WarCraft III Stats"),
! 									bnet_user_stats, "WAR3");
  	m = g_list_append(m, act);
  
  	act = gaim_blist_node_action_new(_("WarCraft III The Frozen Throne Stats"),
! 									bnet_user_stats, "W3XP");
  	m = g_list_append(m, act);
  
--- 131,151 ----
  
  	act = gaim_blist_node_action_new(_("StarCraft Stats"),
! 					bnet_user_stats, "STAR", NULL);
  	m = g_list_append(m, act);
  
  	act = gaim_blist_node_action_new(_("StarCraft Broodwar Stats"),
! 					bnet_user_stats, "SEXP", NULL);
  	m = g_list_append(m, act);
  
  	act = gaim_blist_node_action_new(_("WarCraft II Battle.net Edition Stats"),
! 					bnet_user_stats, "W2BN", NULL);
  	m = g_list_append(m, act);
  
  	act = gaim_blist_node_action_new(_("WarCraft III Stats"),
! 					bnet_user_stats, "WAR3", NULL);
  	m = g_list_append(m, act);
  
  	act = gaim_blist_node_action_new(_("WarCraft III The Frozen Throne Stats"),
! 					bnet_user_stats, "W3XP", NULL);
  	m = g_list_append(m, act);
  
***************
*** 153,160 ****
  }
  
! static GList *bnet_away_states(GaimConnection *gc) {
! 	return g_list_append(NULL, (gpointer)GAIM_AWAY_CUSTOM);
! }
! 
  static void bnet_set_away(GaimConnection *gc, const char *state, const char *msg) {
  	BNetConn *conn = BNET_CONN(gc->proto_data);
--- 153,157 ----
  }
  
! /*
  static void bnet_set_away(GaimConnection *gc, const char *state, const char *msg) {
  	BNetConn *conn = BNET_CONN(gc->proto_data);
***************
*** 171,174 ****
--- 168,172 ----
  		bnet_conn_send(conn, "/away\n");
  }
+ */
  
  
***************
*** 208,270 ****
  }
  
  static GaimPluginProtocolInfo prpl_info = {
! 	OPT_PROTO_PASSWORD_OPTIONAL,	/* options					*/
! 	NULL,							/* user_splits				*/
! 	NULL,							/* protocol_options			*/
! 	NO_BUDDY_ICONS,					/* icon_spec				*/
! 	bnet_icon,						/* list_icon				*/
! 	bnet_buddy_emblems,				/* list_emblems				*/
! 	NULL,							/* status_text				*/
! 	bnet_buddy_tooltip_text,		/* tooltip_text				*/
! 	bnet_away_states,				/* away_states				*/
! 	blist_node_menu,				/* blist_node_menu			*/
! 	bnet_chat_info,					/* chat_info				*/
! 	NULL,							/* chat_info_defaults		*/
! 	bnet_conn_login,				/* login					*/
! 	bnet_conn_close,				/* close					*/
! 	bnet_chat_send_im,				/* send_im					*/
! 	NULL,							/* set_info					*/
! 	NULL,							/* send_typing				*/
! 	bnet_user_info,					/* get_info					*/
! 	bnet_set_away,					/* set_away					*/
! 	NULL,							/* set_idle					*/
! 	NULL,							/* change_password			*/
! 	bnet_buddy_add,					/* add_buddy				*/
! 	NULL,							/* add_buddies				*/
! 	bnet_buddy_remove,				/* remove_buddy				*/
! 	NULL,							/* remove_buddies			*/
! 	NULL,							/* add_permit				*/
! 	bnet_user_squelch,				/* add_deny					*/
! 	NULL,							/* rem_permit				*/
! 	bnet_user_unsquelch,			/* rem_deny					*/
! 	bnet_set_permit_deny,			/* set_permit_deny			*/
! 	NULL,							/* warn						*/
! 	bnet_chat_join,					/* join_chat				*/
! 	NULL,							/* reject_chat				*/
! 	NULL,							/* get_chat_name			*/
! 	NULL,							/* chat_invite				*/
! 	bnet_chat_leave,				/* chat_leave				*/
! 	NULL,							/* chat_whisper				*/
! 	bnet_chat_send,					/* chat_send				*/
! 	NULL,							/* keepalive				*/
! 	NULL,							/* register_user			*/
! 	NULL,							/* get_cb_info				*/
! 	NULL,							/* get_cb_away				*/
! 	NULL,							/* alias_buddy				*/
! 	NULL,							/* group_buddy				*/
! 	NULL,							/* rename_group				*/
! 	NULL,							/* buddy_free				*/
! 	NULL,							/* convo_closed				*/
! 	NULL,							/* normalize				*/
! 	NULL,							/* set_buddy_icon			*/
! 	NULL,							/* remove_group				*/
! 	NULL,							/* get_cb_real_name			*/
! 	NULL,							/* set_chat_topic			*/
! 	NULL,							/* find_blist_chat			*/
! 	NULL,							/* roomlist_get_list		*/
! 	NULL,							/* roomlist_cancel			*/
! 	NULL,							/* roomlist_expand_category	*/
! 	NULL,							/* can_receive_file			*/
! 	NULL							/* send_file				*/
  };
  
--- 206,321 ----
  }
  
+ 
+ static GList *bnet_status_types(GaimAccount *account) {
+ 	GaimStatusType *status;
+ 	GList *types = NULL;
+ 
+ 	status = gaim_status_type_new_full(GAIM_STATUS_OFFLINE,
+ 					NULL, NULL, FALSE, TRUE, FALSE);
+ 	types = g_list_append(types, status);
+ 
+ 	status = gaim_status_type_new_full(GAIM_STATUS_AVAILABLE,
+ 					NULL, NULL, FALSE, TRUE, FALSE);
+ 	types = g_list_append(types, status);
+ 
+ 	status = gaim_status_type_new_with_attrs(
+ 			GAIM_STATUS_AWAY, NULL, NULL, TRUE, TRUE, FALSE,
+ 			"message", _("Message"), gaim_value_new(GAIM_TYPE_STRING),
+ 			NULL);
+ 	types = g_list_append(types, status);
+ 
+ 	return types;
+ }
+ 
+ 
+ static void bnet_set_status(GaimAccount *account, GaimStatus *status) {
+ 	GaimConnection *gc = gaim_account_get_connection(account);
+ 
+ 	//BNetConn *conn = BNET_CONN(gc->proto_data);
+ 	BNetConn *conn = NULL;
+ 	const char *args[1];
+ 	const char *status_id = gaim_status_get_id(status);
+ 
+ 	if (gc)
+ 		conn = BNET_CONN(gc->proto_data);
+ 
+ 	if (!gaim_status_is_active(status))
+ 		return;
+ 
+ 	args[0] = NULL;
+ 
+ 	if (!strcmp(status_id, "away")) {
+                 args[0] = gaim_status_get_attr_string(status, "message");
+                 if ((args[0] == NULL) || (*args[0] == '\0'))
+                         args[0] = _("Away");
+                 //irc_cmd_away(irc, "away", NULL, args);
+ 		bnet_conn_send(conn, "/away %s\n", args[0]);
+         } else if (!strcmp(status_id, "available")) {
+                 //irc_cmd_away(irc, "back", NULL, args);
+ 		bnet_conn_send(conn, "/away\n");
+         }
+ 
+ }
+ 
+ 
+ 
  static GaimPluginProtocolInfo prpl_info = {
! 	OPT_PROTO_PASSWORD_OPTIONAL,	/* options */
! 	NULL,				/* user_splits */
! 	NULL,				/* protocol_options */
! 	NO_BUDDY_ICONS,			/* icon_spec */
! 	bnet_icon,			/* list_icon */
! 	bnet_buddy_emblems,		/* list_emblems	*/
! 	NULL,				/* status_text */
! 	bnet_buddy_tooltip_text,	/* tooltip_text */
! 	bnet_status_types,		/* status_types */
! 	blist_node_menu,		/* blist_node_menu */
! 	bnet_chat_info,			/* chat_info */
! 	NULL,				/* chat_info_defaults */
! 	bnet_conn_login,		/* login */
! 	bnet_conn_close,		/* close */
! 	bnet_chat_send_im,		/* send_im */
! 	NULL,				/* set_info */
! 	NULL,				/* send_typing */
! 	bnet_user_info,			/* get_info */
! 	bnet_set_status,		/* set_status */
! 	NULL,				/* set_idle */
! 	NULL,				/* change_password */
! 	bnet_buddy_add,			/* add_buddy */
! 	NULL,				/* add_buddies */
! 	bnet_buddy_remove,		/* remove_buddy */
! 	NULL,				/* remove_buddies */
! 	NULL,				/* add_permit */
! 	bnet_user_squelch,		/* add_deny */
! 	NULL,				/* rem_permit */
! 	bnet_user_unsquelch,		/* rem_deny */
! 	bnet_set_permit_deny,		/* set_permit_deny */
! 	bnet_chat_join,			/* join_chat */
! 	NULL,				/* reject_chat */
! 	NULL,				/* get_chat_name */
! 	NULL,				/* chat_invite */
! 	bnet_chat_leave,		/* chat_leave */
! 	NULL,				/* chat_whisper */
! 	bnet_chat_send,			/* chat_send */
! 	NULL,				/* keepalive */
! 	NULL,				/* register_user */
! 	NULL,				/* get_cb_info */
! 	NULL,				/* get_cb_away */
! 	NULL,				/* alias_buddy */
! 	NULL,				/* group_buddy */
! 	NULL,				/* rename_group */
! 	NULL,				/* buddy_free */
! 	NULL,				/* convo_closed */
! 	NULL,				/* normalize */
! 	NULL,				/* set_buddy_icon */
! 	NULL,				/* remove_group */
! 	NULL,				/* get_cb_real_name */
! 	NULL,				/* set_chat_topic */
! 	NULL,				/* find_blist_chat */
! 	NULL,				/* roomlist_get_list */
! 	NULL,				/* roomlist_cancel */
! 	NULL,				/* roomlist_expand_category */
! 	NULL,				/* can_receive_file */
! 	NULL				/* send_file */
  };
  
***************
*** 273,299 ****
  	GAIM_MAJOR_VERSION,
  	GAIM_MINOR_VERSION,
! 	GAIM_PLUGIN_PROTOCOL,			/* type				*/
! 	NULL,							/* ui_requirement	*/
! 	0,								/* flags			*/
! 	NULL,							/* dependencies		*/
! 	GAIM_PRIORITY_DEFAULT,			/* priority			*/
! 	"prpl-bnet",					/* id				*/
! 	NULL,							/* name				*/
  #ifdef _WIN32
! 	BN_VERSION,						/* version			*/
  #else
! 	VERSION,						/* version			*/
  #endif
! 	NULL,							/* summary			*/
! 	NULL,							/* description		*/
! 	"Gary Kramlich, Don Seiler, Dario Zilocchi, Daniel Atallah",	/* author			*/
! 	BNET_WEBSITE,					/* homepage			*/
! 	NULL,							/* load				*/
! 	NULL,							/* unload			*/
! 	NULL,							/* destroy			*/
! 	NULL,							/* ui_info			*/
! 	&prpl_info,						/* extra_info		*/
! 	NULL,							/* prefs_info		*/
! 	bnet_actions					/* actions			*/
  };
  
--- 324,350 ----
  	GAIM_MAJOR_VERSION,
  	GAIM_MINOR_VERSION,
! 	GAIM_PLUGIN_PROTOCOL,		/* type */
! 	NULL,				/* ui_requirement */
! 	0,				/* flags */
! 	NULL,				/* dependencies */
! 	GAIM_PRIORITY_DEFAULT,		/* priority */
! 	"prpl-bnet",			/* id */
! 	NULL,				/* name */
  #ifdef _WIN32
! 	BN_VERSION,			/* version */
  #else
! 	VERSION,			/* version */
  #endif
! 	NULL,				/* summary */
! 	NULL,				/* description */
! 	"Gary Kramlich, Don Seiler, Dario Zilocchi, Daniel Atallah",	/* author */
! 	BNET_WEBSITE,			/* homepage */
! 	NULL,				/* load	 */
! 	NULL,				/* unload */
! 	NULL,				/* destroy */
! 	NULL,				/* ui_info */
! 	&prpl_info,			/* extra_info */
! 	NULL,				/* prefs_info */
! 	bnet_actions			/* actions */
  };
  

Index: proto.c
===================================================================
RCS file: /cvsroot/gaim-bnet/gaim-bnet/src/proto.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** proto.c	26 Sep 2005 09:23:56 -0000	1.27
--- proto.c	23 Dec 2005 19:15:05 -0000	1.28
***************
*** 34,37 ****
--- 34,38 ----
  #include "proto.h"
  #include "buddy.h"
+ #include <connection.h>
  
  #define IS_NUM(c) ((c) >= '0' && (c) <= '9')
***************
*** 167,171 ****
  
  	gc = gaim_account_get_connection(conn->account);
! 	serv_got_update(gc, nick, TRUE, 0, 0, 0, 0);
  
  	bnet_conn_send(conn, "/where %s\n", nick);
--- 168,173 ----
  
  	gc = gaim_account_get_connection(conn->account);
! 	//serv_got_update(gc, nick, TRUE, 0, 0, 0, 0);
! 	gaim_prpl_got_user_status(gaim_connection_get_account(gc), nick, "available", NULL);
  
  	bnet_conn_send(conn, "/where %s\n", nick);
***************
*** 198,202 ****
  
  	gc = gaim_account_get_connection(conn->account);
! 	serv_got_update(gc, nick, FALSE, 0, 0, 0, 0);
  }
  
--- 200,205 ----
  
  	gc = gaim_account_get_connection(conn->account);
! 	//serv_got_update(gc, nick, FALSE, 0, 0, 0, 0);
! 	gaim_prpl_got_user_status(gaim_connection_get_account(gc), nick, "offline", NULL);
  }
  
***************
*** 249,253 ****
  
  	gc = gaim_account_get_connection(conn->account);
! 	serv_got_update(gc, nick, online, 0, 0, 0, 0);
  
  	return FALSE;
--- 252,261 ----
  
  	gc = gaim_account_get_connection(conn->account);
! 	//serv_got_update(gc, nick, online, 0, 0, 0, 0);
! 	if (online) {
! 		gaim_prpl_got_user_status(conn->account, nick, "available", NULL);
! 	} else {
! 		gaim_prpl_got_user_status(conn->account, nick, "offline", NULL);
! 	}
  
  	return FALSE;
***************
*** 360,364 ****
  	 */
  	gc = gaim_account_get_connection(conn->account);
! 	serv_got_update(gc, nick, TRUE, 0, 0, 0, 0);
  
  	norm = gaim_normalize(conn->account, nick);
--- 368,373 ----
  	 */
  	gc = gaim_account_get_connection(conn->account);
! 	//serv_got_update(gc, nick, TRUE, 0, 0, 0, 0);
! 	gaim_prpl_got_user_status(conn->account, nick, "available", NULL);
  
  	norm = gaim_normalize(conn->account, nick);
***************
*** 575,579 ****
  	}
  
! 	convo = gaim_find_conversation_with_account(conn->chan, conn->account);
  	if (convo) {
  		gaim_conv_chat_add_user(GAIM_CONV_CHAT(convo),
--- 584,588 ----
  	}
  
! 	convo = gaim_find_conversation_with_account(GAIM_CONV_TYPE_CHAT, conn->chan, conn->account);
  	if (convo) {
  		gaim_conv_chat_add_user(GAIM_CONV_CHAT(convo),
***************
*** 605,609 ****
  	g_hash_table_remove(conn->users, norm);
  
! 	convo = gaim_find_conversation_with_account(conn->chan, conn->account);
  	if (convo) {
  		if (gaim_conv_chat_find_user(GAIM_CONV_CHAT(convo), nick))
--- 614,618 ----
  	g_hash_table_remove(conn->users, norm);
  
! 	convo = gaim_find_conversation_with_account(GAIM_CONV_TYPE_CHAT, conn->chan, conn->account);
  	if (convo) {
  		if (gaim_conv_chat_find_user(GAIM_CONV_CHAT(convo), nick))
***************
*** 654,658 ****
  	GaimConversation *convo;
  
! 	convo = gaim_find_conversation_with_account(conn->chan, conn->account);
  	if (convo) {
  		gaim_conv_chat_write(GAIM_CONV_CHAT(convo), nick, msg, 0, time(0));
--- 663,667 ----
  	GaimConversation *convo;
  
! 	convo = gaim_find_conversation_with_account(GAIM_CONV_TYPE_CHAT, conn->chan, conn->account);
  	if (convo) {
  		gaim_conv_chat_write(GAIM_CONV_CHAT(convo), nick, msg, 0, time(0));
***************
*** 678,682 ****
  	g_hash_table_foreach_remove(conn->users, bnet_hash_destroy_all, NULL);
  
! 	convo = gaim_find_conversation_with_account(chan, conn->account);
  	if (convo) {
  		/* Use the old window */
--- 687,691 ----
  	g_hash_table_foreach_remove(conn->users, bnet_hash_destroy_all, NULL);
  
! 	convo = gaim_find_conversation_with_account(GAIM_CONV_TYPE_CHAT, chan, conn->account);
  	if (convo) {
  		/* Use the old window */
***************
*** 733,737 ****
  		GaimConversation *conv;
  
! 		conv = gaim_find_conversation_with_account(conn->chan, conn->account);
  		if (conv) {
  			gaim_conv_chat_write(GAIM_CONV_CHAT(conv), "",
--- 742,746 ----
  		GaimConversation *conv;
  
! 		conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_CHAT, conn->chan, conn->account);
  		if (conv) {
  			gaim_conv_chat_write(GAIM_CONV_CHAT(conv), "",
***************
*** 768,772 ****
  		GaimConversation *conv;
  
! 		conv = gaim_find_conversation_with_account(conn->chan, conn->account);
  		if (conv) {
  			gaim_conv_chat_write(GAIM_CONV_CHAT(conv), "", error,
--- 777,781 ----
  		GaimConversation *conv;
  
! 		conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_CHAT, conn->chan, conn->account);
  		if (conv) {
  			gaim_conv_chat_write(GAIM_CONV_CHAT(conv), "", error,
***************
*** 795,799 ****
  	buf = g_strdup_printf("/me %s", msg);
  
! 	convo = gaim_find_conversation_with_account(conn->chan, conn->account);
  	if (convo) {
  		gaim_conv_chat_write(GAIM_CONV_CHAT(convo), nick, buf, 0, time(0));
--- 804,808 ----
  	buf = g_strdup_printf("/me %s", msg);
  
! 	convo = gaim_find_conversation_with_account(GAIM_CONV_TYPE_CHAT, conn->chan, conn->account);
  	if (convo) {
  		gaim_conv_chat_write(GAIM_CONV_CHAT(convo), nick, buf, 0, time(0));

[gaim-bnet-commits] gaim-bnet ChangeLog,1.11,1.12 VERSION,1.4,1.5

[Don S. <ri...@us...>]

Update of /cvsroot/gaim-bnet/gaim-bnet
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23701

Modified Files:
	ChangeLog VERSION 
Log Message:
Changes for gaim 2.0 API, still need to actually test running.  It compiles and loads now, anyhow.

Index: VERSION
===================================================================
RCS file: /cvsroot/gaim-bnet/gaim-bnet/VERSION,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** VERSION	4 Mar 2005 20:51:12 -0000	1.4
--- VERSION	23 Dec 2005 19:15:05 -0000	1.5
***************
*** 1 ****
! 0.1.1
--- 1 ----
! 1.0.0cvs

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim-bnet/gaim-bnet/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ChangeLog	4 Mar 2005 20:51:12 -0000	1.11
--- ChangeLog	23 Dec 2005 19:15:05 -0000	1.12
***************
*** 2,5 ****
--- 2,10 ----
  $Id$
  
+ *gaim-bnet-1.0.0cvs
+ 
+ 	New Features:
+ 	* Changes for gaim 2.0 API
+ 
  *gaim-bnet-0.1.1 (4 Mar 2005)
  

[gaim-bnet-commits] gaim-bnet/src bnet.c,1.38,1.39 bnet.h,1.12,1.13 chat.c,1.6,1.7 chat.h,1.2,1.3 proto.c,1.26,1.27 proto.h,1.8,1.9

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

Update of /cvsroot/gaim-bnet/gaim-bnet/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2641

Modified Files:
	bnet.c bnet.h chat.c chat.h proto.c proto.h 
Log Message:
Implemented Feature Requests #1185004 - Slash Commands
+ error/info messages are shown in chat windows (if any)


Index: chat.h
===================================================================
RCS file: /cvsroot/gaim-bnet/gaim-bnet/src/chat.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** chat.h	9 Jan 2005 03:35:24 -0000	1.2
--- chat.h	26 Sep 2005 09:23:56 -0000	1.3
***************
*** 28,31 ****
--- 28,32 ----
  #endif /* __cplusplus */
  
+ void bnet_register_commands();
  gint bnet_chat_send_im(GaimConnection *gc, const gchar *who, const gchar *what, GaimConvImFlags imflags);
  GList *bnet_chat_info(GaimConnection *gc);

Index: chat.c
===================================================================
RCS file: /cvsroot/gaim-bnet/gaim-bnet/src/chat.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** chat.c	18 Feb 2005 09:46:46 -0000	1.6
--- chat.c	26 Sep 2005 09:23:56 -0000	1.7
***************
*** 26,29 ****
--- 26,143 ----
  #include "intl.h"
  
+ /******************************************************************************
+  * Commands callbacks
+  *****************************************************************************/
+ typedef GaimCmdRet (*BNetCmdCallback)(GaimConversation *conv, const gchar *cmd,
+ 	gchar **args, gchar **error, void *data);
+ typedef struct _bnet_command BNetCmdInfo;
+ 
+ static GaimCmdRet bnet_cmd_stats(GaimConversation *conv, const gchar *cmd,
+ 	gchar **args, gchar **error, void *data);
+ static GaimCmdRet bnet_cmd_time(GaimConversation *conv, const gchar *cmd,
+ 	gchar **args, gchar **error, void *data);
+ static GaimCmdRet bnet_cmd_whois(GaimConversation *conv, const gchar *cmd,
+ 	gchar **args, gchar **error, void *data);
+ 
+ static struct _bnet_command {
+ 	gchar *name;
+ 	gchar *format;
+ 	BNetCmdCallback cb;
+ 	gchar *help;
+ } _bnet_cmds[] = {
+ 	{ "stats",	"ww",	bnet_cmd_stats,		N_("Retrieve info about an user stats") },
+ 	{ "time",	"",		bnet_cmd_time,		N_("Get server time") },
+ 	{ "whois",	"w",	bnet_cmd_whois,		N_("Whois an user") },
+ 	{ NULL, NULL, NULL }
+ };
+ 
+ static GaimCmdRet
+ bnet_cmd_stats(GaimConversation *conv, const gchar *cmd,
+ 	gchar **args, gchar **error, void *data) {
+ 	GaimConnection *gc;
+ 	BNetConn *conn;
+ 
+ 	gaim_debug_info("bnet", "bnet_cmd_stats\n");
+ 
+ 	gc = gaim_conversation_get_gc(conv);
+ 	if (!gc)
+ 		return GAIM_CMD_RET_FAILED;
+ 
+ 	conn = BNET_CONN(gc->proto_data);
+ 
+ 	if (args[0] && args[1] && !args[2]) {
+ 		bnet_conn_send(conn, "/stats %s %s\n", args[0], args[1]);
+ 		return GAIM_CMD_RET_OK;
+ 	}
+ 	else
+ 		return GAIM_CMD_RET_FAILED;
+ }
+ 
+ static GaimCmdRet
+ bnet_cmd_time(GaimConversation *conv, const gchar *cmd,
+ 	gchar **args, gchar **error, void *data) {
+ 	GaimConnection *gc;
+ 	BNetConn *conn;
+ 
+ 	gaim_debug_info("bnet", "bnet_cmd_time\n");
+ 
+ 	gc = gaim_conversation_get_gc(conv);
+ 	if (!gc)
+ 		return GAIM_CMD_RET_FAILED;
+ 
+ 	conn = BNET_CONN(gc->proto_data);
+ 
+ 	if (!args[0]) {
+ 		bnet_conn_send(conn, "/time\n");
+ 		return GAIM_CMD_RET_OK;
+ 	}
+ 	else
+ 		return GAIM_CMD_RET_FAILED;
+ 
+ 	return GAIM_CMD_RET_OK;
+ }
+ 
+ static GaimCmdRet
+ bnet_cmd_whois(GaimConversation *conv, const gchar *cmd,
+ 	gchar **args, gchar **error, void *data) {
+ 	GaimConnection *gc;
+ 	BNetConn *conn;
+ 
+ 	gaim_debug_info("bnet", "bnet_cmd_whois\n");
+ 
+ 	gc = gaim_conversation_get_gc(conv);
+ 	if (!gc)
+ 		return GAIM_CMD_RET_FAILED;
+ 
+ 	conn = BNET_CONN(gc->proto_data);
+ 
+ 	if (args[0] && !args[1]) {
+ 		bnet_conn_send(conn, "/whois %s\n", args[0]);
+ 		return GAIM_CMD_RET_OK;
+ 	}
+ 	else
+ 		return GAIM_CMD_RET_FAILED;
+ 
+ 	return GAIM_CMD_RET_OK;
+ }
+ 
+ void
+ bnet_register_commands() {
+ 	GaimCmdFlag f;
+ 	BNetCmdInfo *cmd;
+ 	gint i;
+ 
+ 	f = GAIM_CMD_FLAG_CHAT | GAIM_CMD_FLAG_IM | GAIM_CMD_FLAG_PRPL_ONLY
+ 	    | GAIM_CMD_FLAG_ALLOW_WRONG_ARGS;
+ 
+ 	for (i=0, cmd=_bnet_cmds; cmd->name; cmd++) {
+ 		gaim_cmd_register(cmd->name, cmd->format, GAIM_CMD_P_PRPL, f, "prpl-bnet",
+ 			cmd->cb, _(cmd->help), NULL);
+ 	}
+ }
+ 
+ /******************************************************************************
+  * Raw Procedures
+  *****************************************************************************/
  void
  bnet_hash_join_all(gpointer key, gpointer value, gpointer user_data) {
***************
*** 34,37 ****
--- 148,154 ----
  }
  
+ /******************************************************************************
+  * Raw Procedures
+  *****************************************************************************/
  gint
  bnet_chat_send_im(GaimConnection *gc, const gchar *who, const gchar *what,

Index: bnet.c
===================================================================
RCS file: /cvsroot/gaim-bnet/gaim-bnet/src/bnet.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** bnet.c	18 Feb 2005 09:46:46 -0000	1.38
--- bnet.c	26 Sep 2005 09:23:56 -0000	1.39
***************
*** 341,344 ****
--- 341,346 ----
  	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);*/
  
+ 	bnet_register_commands();
+ 
  	_bnet_plugin = plugin;
  };

Index: proto.h
===================================================================
RCS file: /cvsroot/gaim-bnet/gaim-bnet/src/proto.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** proto.h	27 Jan 2005 21:26:41 -0000	1.8
--- proto.h	26 Sep 2005 09:23:56 -0000	1.9
***************
*** 49,53 ****
  };
  
! typedef void (*BNetInfoProcFunc)(BNetConn *, GList *args);
  
  struct _BNetInfoProcInfo {
--- 49,53 ----
  };
  
! typedef gboolean (*BNetInfoProcFunc)(BNetConn *, GList *args);
  
  struct _BNetInfoProcInfo {

Index: bnet.h
===================================================================
RCS file: /cvsroot/gaim-bnet/gaim-bnet/src/bnet.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** bnet.h	2 Mar 2005 22:39:47 -0000	1.12
--- bnet.h	26 Sep 2005 09:23:56 -0000	1.13
***************
*** 52,55 ****
--- 52,56 ----
  #include <debug.h>
  #include <blist.h>
+ #include <cmds.h>
  #include <util.h>
  #include <gaim.h>

Index: proto.c
===================================================================
RCS file: /cvsroot/gaim-bnet/gaim-bnet/src/proto.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** proto.c	3 Mar 2005 12:29:11 -0000	1.26
--- proto.c	26 Sep 2005 09:23:56 -0000	1.27
***************
*** 212,216 ****
   * Info Processing
   *****************************************************************************/
! static void
  bnet_proto_info_welcome(BNetConn *conn, GList *args) {
  	gaim_debug_info("bnet", "bnet_proto_info_welcome\n");
--- 212,216 ----
   * Info Processing
   *****************************************************************************/
! static gboolean
  bnet_proto_info_welcome(BNetConn *conn, GList *args) {
  	gaim_debug_info("bnet", "bnet_proto_info_welcome\n");
***************
*** 221,227 ****
  		conn->timer = gaim_timeout_add(BNET_FRIENDLIST_TIMEOUT,
  			bnet_timeout_get_friendlist, conn);
  }
  
! static void
  bnet_proto_info_fl(BNetConn *conn, gboolean online, gchar *const *info) {
  	GaimConnection *gc;
--- 221,234 ----
  		conn->timer = gaim_timeout_add(BNET_FRIENDLIST_TIMEOUT,
  			bnet_timeout_get_friendlist, conn);
+ 
+ 	return TRUE;
  }
  
! static gboolean
! bnet_proto_info_ignore(BNetConn *conn, GList *args) {
! 	return FALSE;
! }
! 
! static gboolean
  bnet_proto_info_fl(BNetConn *conn, gboolean online, gchar *const *info) {
  	GaimConnection *gc;
***************
*** 236,240 ****
  
  	b = bnet_buddy_hard_lookup(conn, nick);
! 	g_return_if_fail(b);
  
  	sscanf(n, "%u", &b->fl_position);
--- 243,247 ----
  
  	b = bnet_buddy_hard_lookup(conn, nick);
! 	g_return_val_if_fail(b, FALSE);
  
  	sscanf(n, "%u", &b->fl_position);
***************
*** 243,249 ****
  	gc = gaim_account_get_connection(conn->account);
  	serv_got_update(gc, nick, online, 0, 0, 0, 0);
  }
  
! static void
  bnet_proto_info_fl_online(BNetConn *conn, GList *args) {
  	GList *w = args;
--- 250,258 ----
  	gc = gaim_account_get_connection(conn->account);
  	serv_got_update(gc, nick, online, 0, 0, 0, 0);
+ 
+ 	return FALSE;
  }
  
! static gboolean
  bnet_proto_info_fl_online(BNetConn *conn, GList *args) {
  	GList *w = args;
***************
*** 261,267 ****
  
  	bnet_proto_info_fl(conn, TRUE, info);
  }
  
! static void
  bnet_proto_info_fl_offline(BNetConn *conn, GList *args) {
  	GList *w = args;
--- 270,278 ----
  
  	bnet_proto_info_fl(conn, TRUE, info);
+ 
+ 	return FALSE;
  }
  
! static gboolean
  bnet_proto_info_fl_offline(BNetConn *conn, GList *args) {
  	GList *w = args;
***************
*** 275,281 ****
  
  	bnet_proto_info_fl(conn, FALSE, info);
  }
  
! static void
  bnet_proto_info_fl_end(BNetConn *conn, GList *args) {
  	gaim_debug_info("bnet", "bnet_proto_info_fl_end\n");
--- 286,294 ----
  
  	bnet_proto_info_fl(conn, FALSE, info);
+ 
+ 	return FALSE;
  }
  
! static gboolean
  bnet_proto_info_fl_end(BNetConn *conn, GList *args) {
  	gaim_debug_info("bnet", "bnet_proto_info_fl_end\n");
***************
*** 285,291 ****
  	 */
  	conn->fl_listing = FALSE;
  }
  
! static void
  bnet_proto_info_fl_added(BNetConn *conn, GList *args) {
  	GList *w = args;
--- 298,306 ----
  	 */
  	conn->fl_listing = FALSE;
+ 
+ 	return FALSE;
  }
  
! static gboolean
  bnet_proto_info_fl_added(BNetConn *conn, GList *args) {
  	GList *w = args;
***************
*** 299,308 ****
  
  	b = bnet_buddy_hard_lookup(conn, nick);
! 	g_return_if_fail(b);
  
  	bnet_conn_send(conn, "/where %s\n", nick);
  }
  
! static void
  bnet_proto_info_fl_removed(BNetConn *conn, GList *args) {
  	GList *w = args;
--- 314,325 ----
  
  	b = bnet_buddy_hard_lookup(conn, nick);
! 	g_return_val_if_fail(b, FALSE);
  
  	bnet_conn_send(conn, "/where %s\n", nick);
+ 
+ 	return FALSE;
  }
  
! static gboolean
  bnet_proto_info_fl_removed(BNetConn *conn, GList *args) {
  	GList *w = args;
***************
*** 316,325 ****
  
  	b = bnet_buddy_lookup(conn, nick);
! 	g_return_if_fail(b);
  
  	bnet_buddies_remove(conn->buddies, b);
  }
  
! static void
  bnet_proto_info_where(BNetConn *conn, GList *args) {
  	GaimConnection *gc;
--- 333,344 ----
  
  	b = bnet_buddy_lookup(conn, nick);
! 	g_return_val_if_fail(b, FALSE);
  
  	bnet_buddies_remove(conn->buddies, b);
+ 
+ 	return FALSE;
  }
  
! static gboolean
  bnet_proto_info_where(BNetConn *conn, GList *args) {
  	GaimConnection *gc;
***************
*** 365,372 ****
  		g_free(conn->vw_nick);
  		conn->vw_nick = 0;
  	}
  }
  
! static void
  bnet_proto_info_whoami(BNetConn *conn, GList *args) {
  	GList *w = args;
--- 384,395 ----
  		g_free(conn->vw_nick);
  		conn->vw_nick = 0;
+ 	} else {
+ 		return TRUE;
  	}
+ 
+ 	return FALSE;
  }
  
! static gboolean
  bnet_proto_info_whoami(BNetConn *conn, GList *args) {
  	GList *w = args;
***************
*** 386,393 ****
  	}
  
! 	conn->fl_listing = FALSE;
  }
  
! static void
  bnet_proto_info_record_bg(BNetConn *conn, GList *args) {
  	gchar *nick;
--- 409,423 ----
  	}
  
! 	if (conn->fl_listing) {
! 		conn->fl_listing = FALSE;
! 	}
! 	else {
! 		return TRUE;
! 	}
! 
! 	return FALSE;
  }
  
! static gboolean
  bnet_proto_info_record_bg(BNetConn *conn, GList *args) {
  	gchar *nick;
***************
*** 401,407 ****
  
  	conn->last_stat.nick = g_strdup(nick);
  }
  
! static void
  bnet_proto_info_record_n(BNetConn *conn, GList *args) {
  	BNetGameStat *stat;
--- 431,439 ----
  
  	conn->last_stat.nick = g_strdup(nick);
+ 
+ 	return FALSE;
  }
  
! static gboolean
  bnet_proto_info_record_n(BNetConn *conn, GList *args) {
  	BNetGameStat *stat;
***************
*** 414,420 ****
  	stat = &conn->last_stat.normal;
  	bnet_stat_resolve(stat, msg);
  }
  
! static void
  bnet_proto_info_record_l(BNetConn *conn, GList *args) {
  	BNetGameStat *normal;
--- 446,454 ----
  	stat = &conn->last_stat.normal;
  	bnet_stat_resolve(stat, msg);
+ 
+ 	return FALSE;
  }
  
! static gboolean
  bnet_proto_info_record_l(BNetConn *conn, GList *args) {
  	BNetGameStat *normal;
***************
*** 456,463 ****
--- 490,500 ----
  
  	g_free(notice);
+ 
+ 	return FALSE;
  }
  
  static BNetInfoProcInfo ipi[] = {
  	{ "Welcome to Battle.net!",							bnet_proto_info_welcome },
+ 	{ "Your friends are:",								bnet_proto_info_ignore },
  	{ "$x: $x, (mutual) using $x in the channel $x.",	bnet_proto_info_fl_online },
  	{ "$x: $x, using $x in the channel $x.",			bnet_proto_info_fl_online },
***************
*** 484,488 ****
   * Error Processing
   *****************************************************************************/
! static void
  bnet_proto_error_not_logged(BNetConn *conn, GList *args) {
  	gaim_debug_info("bnet", "bnet_proto_info_welcome\n");
--- 521,525 ----
   * Error Processing
   *****************************************************************************/
! static gboolean
  bnet_proto_error_not_logged(BNetConn *conn, GList *args) {
  	gaim_debug_info("bnet", "bnet_proto_info_welcome\n");
***************
*** 502,506 ****
--- 539,547 ----
  		g_free(conn->vw_nick);
  		conn->vw_nick = 0;
+ 	} else {
+ 		return TRUE;
  	}
+ 
+ 	return FALSE;
  }
  
***************
*** 671,674 ****
--- 712,716 ----
  	GList *w_args;
  	gint i;
+ 	gboolean verb = FALSE;
  
  	gaim_debug_info("bnet", "INFO %s\n", args[0]);
***************
*** 677,681 ****
  		if (bnet_proto_model_compare(conn, ipi[i].model, (const gchar**)info,
  				&w_args)) {
! 			ipi[i].func(conn, w_args);
  
  			if (w_args) {
--- 719,723 ----
  		if (bnet_proto_model_compare(conn, ipi[i].model, (const gchar**)info,
  				&w_args)) {
! 			verb = ipi[i].func(conn, w_args);
  
  			if (w_args) {
***************
*** 687,690 ****
--- 729,742 ----
  		}
  	}
+ 
+ 	if (i == PROTO_INFO_MSGS_N || verb) {
+ 		GaimConversation *conv;
+ 
+ 		conv = gaim_find_conversation_with_account(conn->chan, conn->account);
+ 		if (conv) {
+ 			gaim_conv_chat_write(GAIM_CONV_CHAT(conv), "",
+ 				args[0], GAIM_MESSAGE_SYSTEM, time(0));
+ 		}
+ 	}
  }
  
***************
*** 695,698 ****
--- 747,751 ----
  	GList *w_args;
  	gint i;
+ 	gboolean verb = FALSE;
  
  	gaim_debug_info("bnet", "ERROR %s\n", error);
***************
*** 701,705 ****
  		if (bnet_proto_model_compare(conn, epi[i].model, (const gchar**)info,
  				&w_args)) {
! 			epi[i].func(conn, w_args);
  
  			if (w_args) {
--- 754,758 ----
  		if (bnet_proto_model_compare(conn, epi[i].model, (const gchar**)info,
  				&w_args)) {
! 			verb = epi[i].func(conn, w_args);
  
  			if (w_args) {
***************
*** 711,714 ****
--- 764,777 ----
  		}
  	}
+ 
+ 	if (i == PROTO_ERROR_MSGS_N || verb) {
+ 		GaimConversation *conv;
+ 
+ 		conv = gaim_find_conversation_with_account(conn->chan, conn->account);
+ 		if (conv) {
+ 			gaim_conv_chat_write(GAIM_CONV_CHAT(conv), "", error,
+ 				GAIM_MESSAGE_SYSTEM, time(0));
+ 		}
+ 	}
  }
  

[gaim-bnet-commits] htdocs header.php,1.5,1.6

[Don S. <ri...@us...>]

Update of /cvsroot/gaim-bnet/htdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15543

Modified Files:
	header.php 
Log Message:
Use smaller image for sf.net logo

Index: header.php
===================================================================
RCS file: /cvsroot/gaim-bnet/htdocs/header.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** header.php	3 Feb 2005 18:14:52 -0000	1.5
--- header.php	18 May 2005 19:53:25 -0000	1.6
***************
*** 28,32 ****
  <a href="http://sourceforge.net/donate/index.php?group_id=<?php echo $groupid ?>"><img src="http://sourceforge.net/images/project-support.jpg" alt="Support this project" border="0"/></a>
  &nbsp;
! <A href="http://sourceforge.net/projects/<?php echo $sfname ?>/"> <IMG src="http://sourceforge.net/sflogo.php?group_id=<?php echo $groupid ?>&amp;type=2" border="0" alt="SourceForge.net Logo"></A></td></tr>
  </table>
  
--- 28,32 ----
  <a href="http://sourceforge.net/donate/index.php?group_id=<?php echo $groupid ?>"><img src="http://sourceforge.net/images/project-support.jpg" alt="Support this project" border="0"/></a>
  &nbsp;
! <A href="http://sourceforge.net/projects/<?php echo $sfname ?>/"> <IMG src="http://sourceforge.net/sflogo.php?group_id=<?php echo $groupid ?>&amp;type=1" border="0" alt="SourceForge.net Logo"></A></td></tr>
  </table>
  

[gaim-bnet-commits] gaim-bnet gaim-bnet-installer.nsi,1.1,1.2

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

Update of /cvsroot/gaim-bnet/gaim-bnet
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10605

Modified Files:
	gaim-bnet-installer.nsi 
Log Message:
Use the gaim-plugin.nsh functions for checking gaim version.

Index: gaim-bnet-installer.nsi
===================================================================
RCS file: /cvsroot/gaim-bnet/gaim-bnet/gaim-bnet-installer.nsi,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** gaim-bnet-installer.nsi	7 Feb 2005 15:50:26 -0000	1.1
--- gaim-bnet-installer.nsi	11 Apr 2005 21:32:55 -0000	1.2
***************
*** 29,32 ****
--- 29,36 ----
  !include "nsis\translations\english.nsh"
  
+ ;-------------------------------
+ ; Gaim Plugin installer helper stuff
+ !addincludedir "..\..\src\win32\nsis"
+ !include "gaim-plugin.nsh"
  
  ; Modern UI Configuration
***************
*** 57,61 ****
  ; MUI Config
  
! !define MUI_CUSTOMFUNCTION_GUIINIT checkGaimVersion
  !define MUI_ABORTWARNING
  !define MUI_UNINSTALLER
--- 61,65 ----
  ; MUI Config
  
! !define MUI_CUSTOMFUNCTION_GUIINIT bnet_checkGaimVersion
  !define MUI_ABORTWARNING
  !define MUI_UNINSTALLER
***************
*** 245,314 ****
  FunctionEnd
  
! Function checkGaimVersion
    Push $R0
-   Push $R1
-   Push $R2
  
!   ClearErrors
!   ReadRegStr $R0 HKLM "SOFTWARE\gaim" "version"
!   IfErrors readHKCUGaimVersion compareVersion
! 
!   readHKCUGaimVersion:
!   ReadRegStr $R0 HKCU "SOFTWARE\gaim" "version"
!   IfErrors noGaimInstallFound compareVersion
  
!   noGaimInstallFound:
      MessageBox MB_OK|MB_ICONSTOP "$(NO_GAIM_VERSION)"
      Quit
  
!   compareVersion:
!   StrCmp $R0 ${GAIM_VERSION} GaimVersionOK
!     ; Versions are in the form of X.Y.Z
!     ; If X is different, then we shouldn't install
!     Push $R0
!     Call GetMajorVersion
!     IfErrors BadVersion
!     Pop $R2
!     Push ${GAIM_VERSION}
!     Call GetMajorVersion
!     IfErrors noGaimInstallFound
!     Pop $R1
!     ;Check that both version's X is the same
!     IntCmp $R1 $R2 GaimVersionOK
!     BadVersion:
!     MessageBox MB_OK|MB_ICONSTOP "$(BAD_GAIM_VERSION_1) $R0 $(BAD_GAIM_VERSION_2)"
!     Quit
!   GaimVersionOK:
!   Pop $R2
!   Pop $R1
    Pop $R0
  FunctionEnd
  
- ; Extract the part of a string prior to "." (or the whole string if there is no ".")
- ; If no "." was found, the ErrorFlag will be set
- Function GetMajorVersion
-     ClearErrors
-     Pop $0
-     StrCpy $1 "0"
- 
-     startGetMajorVersionLoop:
-     ;avoid an infinite loop, if we have gotten the whole initial string, exit the loop and set the error flag
-     StrCmp $2 $0 GetMajorVersionSetErrorFlag
-     IntOp $1 $1 + 1
-     ;Append the next character in $0 to $2
-     StrCpy $2 $0 $1
-     ;store the next character in $3
-     StrCpy $3 $0 1 $1
-     ;if the next character is ".", $2 will contain the string prior to "."
-     StrCmp $3 "." endGetMajorVersion startGetMajorVersionLoop
- 
-     GetMajorVersionSetErrorFlag:
-     SetErrors
- 
-     endGetMajorVersion:
- 
-     Push $2
- FunctionEnd
- 
  Function CheckUserInstallRights
          ClearErrors
--- 249,273 ----
  FunctionEnd
  
! Function bnet_checkGaimVersion
    Push $R0
  
!   Push ${GAIM_VERSION}
!   Call CheckGaimVersion
!   Pop $R0
  
!   StrCmp $R0 ${GAIM_VERSION_OK} bnet_checkGaimVersion_OK
!   StrCmp $R0 ${GAIM_VERSION_INCOMPATIBLE} +1 +6
!     Call GetGaimVersion
!     IfErrors +3
!     Pop $R0
!     MessageBox MB_OK|MB_ICONSTOP "$(BAD_GAIM_VERSION_1) $R0 $(BAD_GAIM_VERSION_2)"
!     goto +2
      MessageBox MB_OK|MB_ICONSTOP "$(NO_GAIM_VERSION)"
      Quit
  
!   bnet_checkGaimVersion_OK:
    Pop $R0
  FunctionEnd
  
  Function CheckUserInstallRights
          ClearErrors

[gaim-bnet-commits] gaim-bnet configure.ac,1.9,1.10

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

Update of /cvsroot/gaim-bnet/gaim-bnet
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6263

Modified Files:
	configure.ac 
Log Message:
Adding the gaim skeleton file to our cvs..


Index: configure.ac
===================================================================
RCS file: /cvsroot/gaim-bnet/gaim-bnet/configure.ac,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** configure.ac	20 Mar 2005 23:32:14 -0000	1.9
--- configure.ac	21 Mar 2005 01:39:50 -0000	1.10
***************
*** 128,131 ****
--- 128,134 ----
  		   autopackage/Makefile
  		   autopackage/gaim-bnet.apspec
+ 		   autopackage/skeletons/Makefile
+ 		   autopackage/skeletons/@gaim.sourceforge.net/Makefile
+ 		   autopackage/skeletons/@gaim.sourceforge.net/gaim/Makefile
  		   doc/Makefile
  		   intl/Makefile

[gaim-bnet-commits] gaim-bnet/autopackage/skeletons/@gaim.sourceforge.net .cvsignore,NONE,1.1 Makefile.am,NONE,1.1

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

Update of /cvsroot/gaim-bnet/gaim-bnet/autopackage/skeletons/@gaim.sourceforge.net
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6263/autopackage/skeletons/@gaim.sourceforge.net

Added Files:
	.cvsignore Makefile.am 
Log Message:
Adding the gaim skeleton file to our cvs..


--- NEW FILE: .cvsignore ---
Makefile
Makefile.in

--- NEW FILE: Makefile.am ---
SUBDIRS=\
	gaim

[gaim-bnet-commits] gaim-bnet/autopackage/skeletons/@gaim.sourceforge.net/gaim .cvsignore,NONE,1.1 Makefile.am,NONE,1.1 skeleton.1,NONE,1.1

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

Update of /cvsroot/gaim-bnet/gaim-bnet/autopackage/skeletons/@gaim.sourceforge.net/gaim
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6263/autopackage/skeletons/@gaim.sourceforge.net/gaim

Added Files:
	.cvsignore Makefile.am skeleton.1 
Log Message:
Adding the gaim skeleton file to our cvs..


--- NEW FILE: skeleton.1 ---
# -*- shell-script-mode -*-

[Meta]
RootName: @gaim.sourceforge.net/gaim
DisplayName: Gaim Internet Messenger
ShortName: gaim
Skeleton-Author: Timothy Ringenbach <ma...@us...>
Skeleton-Version: 1

[Notes] 
This is for the gaim binary, not libgaim. Plugins would
use this skeleton. Gaim's version numbers are also the
interface version, since 1.0.0
Don't use this skeleton with earlier versions of Gaim,
you probably don't want to be building plugins against
a pre 1.0.0 version of Gaim anyway.

[Test]
gaim_prefix=`getPackagePrefix gaim`
if [ -e "$gaim_prefix" ]; then
  INTERFACE_VERSIONS=`"$gaim_prefix"/bin/gaim --version | sed "s/Gaim //g"`
  SOFTWARE_VERSIONS="$INTERFACE_VERSIONS"
fi
unset gaim_prefix


--- NEW FILE: .cvsignore ---
Makefile
Makefile.in

--- NEW FILE: Makefile.am ---
EXTRA_DIST=\
	skeleton.1

[gaim-bnet-commits] gaim-bnet/autopackage/skeletons .cvsignore,NONE,1.1 Makefile.am,NONE,1.1

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

Update of /cvsroot/gaim-bnet/gaim-bnet/autopackage/skeletons
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6263/autopackage/skeletons

Added Files:
	.cvsignore Makefile.am 
Log Message:
Adding the gaim skeleton file to our cvs..


--- NEW FILE: .cvsignore ---
Makefile
Makefile.in

--- NEW FILE: Makefile.am ---
SUBDIRS=\
	@gaim.sourceforge.net

[gaim-bnet-commits] gaim-bnet/autopackage Makefile.am,1.1,1.2

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

Update of /cvsroot/gaim-bnet/gaim-bnet/autopackage
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6263/autopackage

Modified Files:
	Makefile.am 
Log Message:
Adding the gaim skeleton file to our cvs..


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gaim-bnet/gaim-bnet/autopackage/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.am	20 Mar 2005 23:32:15 -0000	1.1
--- Makefile.am	21 Mar 2005 01:39:50 -0000	1.2
***************
*** 1,2 ****
--- 1,5 ----
+ SUBDIRS= \
+ 	skeletons
+ 
  EXTRA_DIST= \
  	gaim-bnet.aspec.in

[gaim-bnet-commits] gaim-bnet/autopackage/skeletons/@gaim.sourceforge.net/gaim - New directory

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

Update of /cvsroot/gaim-bnet/gaim-bnet/autopackage/skeletons/@gaim.sourceforge.net/gaim
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31052/gaim

Log Message:
Directory /cvsroot/gaim-bnet/gaim-bnet/autopackage/skeletons/@gaim.sourceforge.net/gaim added to the repository

[gaim-bnet-commits] gaim-bnet/autopackage/skeletons/@gaim.sourceforge.net - New directory

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

Update of /cvsroot/gaim-bnet/gaim-bnet/autopackage/skeletons/@gaim.sourceforge.net
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30818/@gaim.sourceforge.net

Log Message:
Directory /cvsroot/gaim-bnet/gaim-bnet/autopackage/skeletons/@gaim.sourceforge.net added to the repository

[gaim-bnet-commits] gaim-bnet/autopackage/skeletons - New directory

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

Update of /cvsroot/gaim-bnet/gaim-bnet/autopackage/skeletons
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30374/skeletons

Log Message:
Directory /cvsroot/gaim-bnet/gaim-bnet/autopackage/skeletons added to the repository

[gaim-bnet-commits] gaim-bnet/autopackage .cvsignore,NONE,1.1

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

Update of /cvsroot/gaim-bnet/gaim-bnet/autopackage
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19105

Added Files:
	.cvsignore 
Log Message:
Ignore tweaks


--- NEW FILE: .cvsignore ---
Makefile
Makefile.in
gaim-bnet.apspec

[gaim-bnet-commits] gaim-bnet configure.ac,1.8,1.9

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

Update of /cvsroot/gaim-bnet/gaim-bnet
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17713

Modified Files:
	configure.ac 
Log Message:
Made sure we linked against glib
Also, the start of the autopackage stuff, this is going to need tweaking yet..


Index: configure.ac
===================================================================
RCS file: /cvsroot/gaim-bnet/gaim-bnet/configure.ac,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** configure.ac	4 Mar 2005 20:51:12 -0000	1.8
--- configure.ac	20 Mar 2005 23:32:14 -0000	1.9
***************
*** 126,129 ****
--- 126,131 ----
  AC_OUTPUT([Makefile
  		   VERSION
+ 		   autopackage/Makefile
+ 		   autopackage/gaim-bnet.apspec
  		   doc/Makefile
  		   intl/Makefile

[gaim-bnet-commits] gaim-bnet/src Makefile.am,1.7,1.8

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

Update of /cvsroot/gaim-bnet/gaim-bnet/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17713/src

Modified Files:
	Makefile.am 
Log Message:
Made sure we linked against glib
Also, the start of the autopackage stuff, this is going to need tweaking yet..


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gaim-bnet/gaim-bnet/src/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Makefile.am	8 Jan 2005 11:13:03 -0000	1.7
--- Makefile.am	20 Mar 2005 23:32:16 -0000	1.8
***************
*** 11,14 ****
--- 11,17 ----
  libbnet_la_LDFLAGS = -module -avoid-version
  
+ libbnet_la_LIBADD = \
+ 	$(GLIB_LIBS)
+ 
  if PLUGINS
  

[gaim-bnet-commits] gaim-bnet/autopackage Makefile.am,NONE,1.1 gaim-bnet.apspec.in,NONE,1.1

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

Update of /cvsroot/gaim-bnet/gaim-bnet/autopackage
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17713/autopackage

Added Files:
	Makefile.am gaim-bnet.apspec.in 
Log Message:
Made sure we linked against glib
Also, the start of the autopackage stuff, this is going to need tweaking yet..


--- NEW FILE: Makefile.am ---
EXTRA_DIST= \
	gaim-bnet.aspec.in

--- NEW FILE: gaim-bnet.apspec.in ---
# -*-shell-script-*-

[Meta]
RootName: @gaim-bnet.sourceforge.net/gaim-bnet:$SOFTWAREVERSION
DisplayName: Gaim Battle.Net Protocol Plugin
ShortName: gaim-bnet
Maintainer: The Bnet Developers
URL: http://gaim-bnet.sf.net
Packager: Gary Kramlich <amc...@us...>
Summary: Battle.net Protocol Plugin
SoftwareVersion: @VERSION@
AutopackageTarget: 1.0

# Only uncomment InterfaceVersion if your package exposes interfaces to other software,
# for instance if it includes DSOs or python/perl modules. See the developer guide for more info,
# or ask on autopackage-dev if you don't understand interface versioning in autopackage.
#
# InterfaceVersion: 0.0

[Description]
Allows Gaim to send messages over Battle.net

[BuildPrepare]
prepareBuild

[BuildUnprepare]
unprepareBuild

[Imports]
find -name '*.la' | xargs rm
echo '*' | import

[Prepare]
# Dependency checking
require @gaim.sourceforge.net/gaim 1.0
#require @gtk.org/glib 2.0 # there's not actually a glib skeleton yet, but we don't really need one here as long as it's glib 2.0 we depend on and not anything later

[Install]
# Put your installation script here
prefix_local=`getPackagePrefix gaim`
# if write access then install to modified PREFIX otherwise make a symlink in ~/.gaim
if haveWriteAccess "$prefix_local"; then
 PREFIX="$prefix_local"
else
 make_link=1
fi 

copyFiles ./lib/gaim "$PREFIX/lib"
copyFiles ./share/pixmaps "$PREFIX/share"
#installLocale ./share/locale

if [[ "$make_link" == "1" ]] && [[ `id -u` != "0" ]]; then
 linkFile "$PREFIX/lib/gaim/libbnet.so" "~/.gaim/plugins/libbnet.so"
fi
unset make_link
unset prefix_local

[Uninstall]
# Usually just the following line is enough to uninstall everything
uninstallFromLog

[gaim-bnet-commits] gaim-bnet/autopackage - New directory

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

Update of /cvsroot/gaim-bnet/gaim-bnet/autopackage
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1850/autopackage

Log Message:
Directory /cvsroot/gaim-bnet/gaim-bnet/autopackage added to the repository

[gaim-bnet-commits] gaim-bnet ChangeLog,1.10,1.11 VERSION,1.3,1.4 configure.ac,1.7,1.8

[Don S. <ri...@us...>]

Update of /cvsroot/gaim-bnet/gaim-bnet
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11488

Modified Files:
	ChangeLog VERSION configure.ac 
Log Message:
Releasing 0.1.1

Index: configure.ac
===================================================================
RCS file: /cvsroot/gaim-bnet/gaim-bnet/configure.ac,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** configure.ac	18 Feb 2005 16:40:16 -0000	1.7
--- configure.ac	4 Mar 2005 20:51:12 -0000	1.8
***************
*** 4,8 ****
  #
  
! AC_INIT([gaim-bnet], [0.1.1cvs], [gai...@li...])
  AC_CANONICAL_SYSTEM
  AM_CONFIG_HEADER(pre_config.h)
--- 4,8 ----
  #
  
! AC_INIT([gaim-bnet], [0.1.1], [gai...@li...])
  AC_CANONICAL_SYSTEM
  AM_CONFIG_HEADER(pre_config.h)

Index: VERSION
===================================================================
RCS file: /cvsroot/gaim-bnet/gaim-bnet/VERSION,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** VERSION	18 Feb 2005 16:40:16 -0000	1.3
--- VERSION	4 Mar 2005 20:51:12 -0000	1.4
***************
*** 1 ****
! 0.1.1cvs
--- 1 ----
! 0.1.1

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim-bnet/gaim-bnet/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ChangeLog	4 Mar 2005 15:19:25 -0000	1.10
--- ChangeLog	4 Mar 2005 20:51:12 -0000	1.11
***************
*** 2,7 ****
  $Id$
  
! *gaim-bnet-0.1.1cvs
! 	
  	New Features:
  	* Added experimental support to PvPGN servers (added info welcome end
--- 2,7 ----
  $Id$
  
! *gaim-bnet-0.1.1 (4 Mar 2005)
! 
  	New Features:
  	* Added experimental support to PvPGN servers (added info welcome end

[gaim-bnet-commits] gaim-bnet ChangeLog,1.9,1.10

[Don S. <ri...@us...>]

Update of /cvsroot/gaim-bnet/gaim-bnet
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6922

Modified Files:
	ChangeLog 
Log Message:
Correcting evew's English

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim-bnet/gaim-bnet/ChangeLog,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ChangeLog	3 Mar 2005 18:51:38 -0000	1.9
--- ChangeLog	4 Mar 2005 15:19:25 -0000	1.10
***************
*** 5,9 ****
  	
  	New Features:
! 	* Added sperimental support to PvPGN servers (added info welcome end
  	  fl_end hooks). (evew)
  	* Added polling request of friends list to reach updates also from
--- 5,9 ----
  	
  	New Features:
! 	* Added experimental support to PvPGN servers (added info welcome end
  	  fl_end hooks). (evew)
  	* Added polling request of friends list to reach updates also from
***************
*** 15,19 ****
  	  sent twice during the first login attempt (this was the problem!
  	  so we can finally check for one attempt only :). (evew)
! 	* Rewrited code about buddy add/remove/update events. (evew)
  	* Fixed a bug about chat windows, where the old ones weren't handled
  	  properly. (evew)
--- 15,19 ----
  	  sent twice during the first login attempt (this was the problem!
  	  so we can finally check for one attempt only :). (evew)
! 	* Rewrote code about buddy add/remove/update events. (evew)
  	* Fixed a bug about chat windows, where the old ones weren't handled
  	  properly. (evew)

[gaim-bnet-commits] gaim-bnet ChangeLog,1.8,1.9

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

Update of /cvsroot/gaim-bnet/gaim-bnet
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7308

Modified Files:
	ChangeLog 
Log Message:
Added "New Features" line in last cvs log


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim-bnet/gaim-bnet/ChangeLog,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ChangeLog	3 Mar 2005 12:29:34 -0000	1.8
--- ChangeLog	3 Mar 2005 18:51:38 -0000	1.9
***************
*** 3,16 ****
  
  *gaim-bnet-0.1.1cvs
! 
! 	Bug Fixes:
  	* Added sperimental support to PvPGN servers (added info welcome end
  	  fl_end hooks). (evew)
  	* Fixed a line inside bnet_conn_login_cb who causes the username to be
  	  sent twice during the first login attempt (this was the problem!
  	  so we can finally check for one attempt only :). (evew)
- 	* Added polling request of friends list to reach updates also from
- 	  not-mutual users (or users who send whisp messages in a language
- 	  different from english). (evew)
  	* Rewrited code about buddy add/remove/update events. (evew)
  	* Fixed a bug about chat windows, where the old ones weren't handled
--- 3,18 ----
  
  *gaim-bnet-0.1.1cvs
! 	
! 	New Features:
  	* Added sperimental support to PvPGN servers (added info welcome end
  	  fl_end hooks). (evew)
+ 	* Added polling request of friends list to reach updates also from
+ 	  not-mutual users or users who send whisp messages in a language
+ 	  different from english). (evew)
+ 	
+ 	Bug Fixes:
  	* Fixed a line inside bnet_conn_login_cb who causes the username to be
  	  sent twice during the first login attempt (this was the problem!
  	  so we can finally check for one attempt only :). (evew)
  	* Rewrited code about buddy add/remove/update events. (evew)
  	* Fixed a bug about chat windows, where the old ones weren't handled

[gaim-bnet-commits] gaim-bnet ChangeLog,1.7,1.8

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

Update of /cvsroot/gaim-bnet/gaim-bnet
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27987

Modified Files:
	ChangeLog 
Log Message:
Update.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim-bnet/gaim-bnet/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ChangeLog	2 Mar 2005 22:39:47 -0000	1.7
--- ChangeLog	3 Mar 2005 12:29:34 -0000	1.8
***************
*** 5,8 ****
--- 5,13 ----
  
  	Bug Fixes:
+ 	* Added sperimental support to PvPGN servers (added info welcome end
+ 	  fl_end hooks). (evew)
+ 	* Fixed a line inside bnet_conn_login_cb who causes the username to be
+ 	  sent twice during the first login attempt (this was the problem!
+ 	  so we can finally check for one attempt only :). (evew)
  	* Added polling request of friends list to reach updates also from
  	  not-mutual users (or users who send whisp messages in a language

[gaim-bnet-commits] gaim-bnet/src conn.c,1.13,1.14 conn.h,1.10,1.11 proto.c,1.25,1.26

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

Update of /cvsroot/gaim-bnet/gaim-bnet/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27707

Modified Files:
	conn.c conn.h proto.c 
Log Message:
Added PvPGN support and fixed a bug during login.
See ChangeLog for details.


Index: proto.c
===================================================================
RCS file: /cvsroot/gaim-bnet/gaim-bnet/src/proto.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** proto.c	2 Mar 2005 22:39:47 -0000	1.25
--- proto.c	3 Mar 2005 12:29:11 -0000	1.26
***************
*** 278,281 ****
--- 278,291 ----
  
  static void
+ bnet_proto_info_fl_end(BNetConn *conn, GList *args) {
+ 	gaim_debug_info("bnet", "bnet_proto_info_fl_end\n");
+ 
+ 	/* With PvPGN servers we can simply use this message, instead of waiting
+ 	 * a whoami reply (who seems to be buggy, using "" inside themselves)
+ 	 */
+ 	conn->fl_listing = FALSE;
+ }
+ 
+ static void
  bnet_proto_info_fl_added(BNetConn *conn, GList *args) {
  	GList *w = args;
***************
*** 462,466 ****
  	{ "$x's record:",									bnet_proto_info_record_bg },
  	{ "Normal games: $x",								bnet_proto_info_record_n },
! 	{ "Ladder games: $x",								bnet_proto_info_record_l }
  };
  
--- 472,480 ----
  	{ "$x's record:",									bnet_proto_info_record_bg },
  	{ "Normal games: $x",								bnet_proto_info_record_n },
! 	{ "Ladder games: $x",								bnet_proto_info_record_l },
! 
! 	/* support for PvPGN servers */
! 	{ "Hello $x, welcome to a PvPGN Server!",			bnet_proto_info_welcome },
! 	{ "End of Friends List",							bnet_proto_info_fl_end },
  };
  

Index: conn.c
===================================================================
RCS file: /cvsroot/gaim-bnet/gaim-bnet/src/conn.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** conn.c	2 Mar 2005 22:39:47 -0000	1.13
--- conn.c	3 Mar 2005 12:29:11 -0000	1.14
***************
*** 147,150 ****
--- 147,151 ----
  bnet_conn_parse_msg(BNetConn *conn, const gchar *msg) {
  	GaimConnection *gc;
+ 	const gchar *p;
  
  	gc = gaim_account_get_connection(conn->account);
***************
*** 154,158 ****
  			break;
  		case BNET_CS_USER:
! 			if (!strcmp(msg, "Username: ")) {
  				bnet_conn_send(conn, "%s\n", conn->user);
  				bnet_conn_update_progress(conn, BNET_CS_PASS);
--- 155,160 ----
  			break;
  		case BNET_CS_USER:
! 			p = msg+strlen(msg)-10;
! 			if (p >= msg && !strcmp(p, "Username: ")) {
  				bnet_conn_send(conn, "%s\n", conn->user);
  				bnet_conn_update_progress(conn, BNET_CS_PASS);
***************
*** 161,165 ****
  			break;
  		case BNET_CS_PASS:
! 			if (!strcmp(msg, "Password: ")) {
  				bnet_conn_send(conn, "%s\n", conn->pass);
  				bnet_conn_update_progress(conn, BNET_CS_VRFY);
--- 163,168 ----
  			break;
  		case BNET_CS_PASS:
! 			p = msg+strlen(msg)-10;
! 			if (p >= msg && !strcmp(p, "Password: ")) {
  				bnet_conn_send(conn, "%s\n", conn->pass);
  				bnet_conn_update_progress(conn, BNET_CS_VRFY);
***************
*** 168,185 ****
  			break;
  		case BNET_CS_VRFY:
! 			conn->vrfy_attempts++;
! 
! 			if (!strstr(msg, "incorrect")) {
  				bnet_conn_update_progress(conn, BNET_CS_CONN);
  				gaim_connection_set_state(gc, GAIM_CONNECTED);
  
  				bnet_conn_request_friends_list(conn);
- 			} else {
- 				if (conn->vrfy_attempts > 1)
- 					/* We must stop to try... our user/pass are not valid
- 					 */
- 					gaim_connection_error(gc, _("Invalid user/pass"));
- 
- 				bnet_conn_update_progress(conn, BNET_CS_USER);
  			}
  
--- 171,181 ----
  			break;
  		case BNET_CS_VRFY:
! 			if (!strcmp(msg, "Login failed.") || strstr(msg, "incorrect")) {
! 				gaim_connection_error(gc, _("Invalid user/pass"));
! 			} else {
  				bnet_conn_update_progress(conn, BNET_CS_CONN);
  				gaim_connection_set_state(gc, GAIM_CONNECTED);
  
  				bnet_conn_request_friends_list(conn);
  			}
  
***************
*** 277,281 ****
  							  gc);
  
! 	bnet_conn_send(conn, "\003\004%s", conn->user);
  	bnet_conn_update_progress(conn, BNET_CS_USER);
  }
--- 273,277 ----
  							  gc);
  
! 	bnet_conn_send(conn, "\003\004");
  	bnet_conn_update_progress(conn, BNET_CS_USER);
  }

Index: conn.h
===================================================================
RCS file: /cvsroot/gaim-bnet/gaim-bnet/src/conn.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** conn.h	2 Mar 2005 22:39:47 -0000	1.10
--- conn.h	3 Mar 2005 12:29:11 -0000	1.11
***************
*** 50,54 ****
  
  	BNetConnState state;
- 	guint vrfy_attempts;
  
  	gint fd;
--- 50,53 ----