ayttm-commits — cvs commitlog list

[Ayttm-commits] CVS: ayttm/modules/yahoo2 yahoo.c,1.112,1.113

[Siddhesh P. <sid...@us...>]

Update of /cvsroot/ayttm/ayttm/modules/yahoo2
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv26523/modules/yahoo2

Modified Files:
	yahoo.c 
Log Message:

 * YMSG: Fixed memory leak
 * YMSG: Fixed conferencing to work with YMSG16
 * YMSG: Prettier messages
 * CORE: Fixed case where preferred account for a room would be reset when a 
 chat room is cloned out of it


Index: yahoo.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/yahoo2/yahoo.c,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- yahoo.c	28 Aug 2009 13:46:55 -0000	1.112
+++ yahoo.c	29 Aug 2009 19:26:40 -0000	1.113
@@ -1218,9 +1218,6 @@
 /*	char buff[1024];*/
 	YList * l;
 
-	if(!strcmp(who, ylad->act_id))
-		return;
-
 	chat_room = find_chat_room_by_id(room);
 
 	if(!chat_room)
@@ -1234,6 +1231,12 @@
 /*	snprintf(buff, sizeof(buff), _("%s has joined the conference."), who);
 	eb_chat_room_show_message(chat_room, _("Yahoo! Messenger"), buff);*/
 
+	/* I don't want myself in the members list */
+	if(!strcmp(who, ylad->act_id)) {
+		ycrd->connected = TRUE;
+		return;
+	}
+
 	for(l = ycrd->members; l; l=l->next) {
 		char * handle = l->data;
 		if(!strcmp(handle, who))
@@ -1276,9 +1279,12 @@
 static void ext_yahoo_conf_userdecline(int id, const char*me, const char *who, 
 				       const char *room, const char *msg)
 {
+	char buff[1024];
+	YList *l = NULL;
 	eb_local_account *ela = yahoo_find_local_account_by_id(id);
 	eb_yahoo_local_account_data * ylad = ela->protocol_local_account_data;
-	char buff[1024];
+	eb_chat_room *chat_room = find_chat_room_by_id(room);
+	eb_yahoo_chat_room_data *ycrd = chat_room->protocol_local_chat_room_data;
 
 	if(!strcmp(ylad->act_id, who))
 		return;
@@ -1286,6 +1292,17 @@
 	snprintf(buff, sizeof(buff), _("The yahoo user %s declined your invitation to join conference %s, with the message: %s"),
 			who, room, msg);
 
+	for(l = ycrd->members; l; l=l->next) {
+		char * handle = l->data;
+		if(!strcmp(handle, who)) {
+			YList *yl = (YList *)l;
+			ycrd->members = y_list_remove_link(ycrd->members, l);
+			FREE(handle);
+			FREE(yl);
+			break;
+		}
+	}
+
 	ay_do_warning( _("Yahoo Error"), buff );
 }
 
@@ -1508,6 +1525,7 @@
 {
 	eb_yahoo_chat_room_data *ycrd;
 	eb_yahoo_local_account_data *ylad;
+	YList *l = NULL;
 
 	if(!room) {
 		WARNING(("room is null"));
@@ -1517,6 +1535,18 @@
 	ycrd = room->protocol_local_chat_room_data;
 	ylad = room->local_user->protocol_local_account_data;
 	yahoo_conference_logoff(ycrd->id, ylad->act_id, ycrd->members, ycrd->room);
+
+	for(l = ycrd->members; l;) {
+		FREE(l->data);
+		YList *yl = l;
+		l=l->next;
+		ycrd->members = y_list_remove(ycrd->members, yl);
+	}
+
+	free(ycrd->host);
+	free(ycrd->room);
+
+	free(ycrd);
 }
 
 static void eb_yahoo_send_invite(eb_local_account * ela, eb_chat_room * ecr, char *who, const char *message)
@@ -1524,6 +1554,8 @@
 	eb_yahoo_chat_room_data *ycrd;
 	eb_yahoo_local_account_data *ylad;
 
+	LOG(("Sending Invite to %s\n", who));
+
 	if(!who || !*who) {
 		WARNING(("no one to invite"));
 		return;
@@ -1534,14 +1566,13 @@
 
 	if(!message || !*message)
 		message = _("Join my conference");
-	if(ycrd->members->next)		/* already someone in here */
-		yahoo_conference_addinvite(ylad->id, ylad->act_id, who, ycrd->room, ycrd->members, message);
-	else {				/* first time */
-		YList * members = NULL;
-		members = y_list_append(members, who);
-		yahoo_conference_invite(ylad->id, ylad->act_id, members, ycrd->room, message);
-		y_list_free(members);
-	}
+
+	/* Wait till we logon to the conference. This has potential to explode :( */
+	while(!ycrd->connected)
+		gtk_main_iteration();
+
+	yahoo_conference_addinvite(ylad->id, ylad->act_id, who, ycrd->room, ycrd->members, message);
+	ycrd->members = y_list_append(ycrd->members, strdup(who));
 }
 
 static eb_chat_room *eb_yahoo_make_chat_room(char *name, eb_local_account * ela, int is_public)
@@ -1549,7 +1580,6 @@
 	eb_chat_room *ecr = g_new0(eb_chat_room, 1);
 	eb_yahoo_chat_room_data *ycrd = g_new0(eb_yahoo_chat_room_data, 1);
 	eb_yahoo_local_account_data *ylad;
-	YList *members = NULL;
 
 	if(!ela) {
 		WARNING(("ela is null"));
@@ -1558,8 +1588,6 @@
 
 	ylad = ela->protocol_local_account_data;
 
-	members = y_list_append(members, g_strdup(ylad->act_id));
-
 	if(name && *name)
 		strcpy(ecr->room_name, name);
 	else
@@ -1574,11 +1602,12 @@
 	ycrd->id = ylad->id;
 	ycrd->host = g_strdup(ylad->act_id);
 	ycrd->room = g_strdup(ecr->room_name);
-	ycrd->members = members;
+	ycrd->members = NULL;
 	ycrd->connected = FALSE;
 	
+	yahoo_conference_logon(ycrd->id, ylad->act_id, ycrd->members, ycrd->room);
+
 	eb_join_chat_room(ecr, TRUE);
-	eb_chat_room_buddy_arrive(ecr, ela->alias, ylad->act_id);
 	return ecr;
 }
 /*
@@ -2088,13 +2117,14 @@
 	struct yahoo_authorize_data *ay = g_new0(struct yahoo_authorize_data, 1);
 	eb_local_account * ela = yahoo_find_local_account_by_id(id);
 
-	snprintf(buff, sizeof(buff), _("%s, the yahoo user %s has added you to their contact list"), (myid?myid:ela->handle), who);
+	snprintf(buff, sizeof(buff), _("%s, the yahoo user \n\n<b>%s</b>\n\nhas added you to their contact list"), 
+			(myid?myid:ela->handle), who);
 	if(msg) {
-		strcat(buff, _(" with the following message:\n"));
+		strcat(buff, _(" with the following message:\n\n<i>"));
 		strcat(buff, msg);
-		strcat(buff, "\n");
+		strcat(buff, "</i>\n\n");
 	} else {
-		strcat(buff, ".  ");
+		strcat(buff, ".\n\n");
 	}
 	strcat(buff, _("Do you want to allow this?"));
 

[Ayttm-commits] CVS: ayttm/src chat_room.c,1.78,1.79

[Siddhesh P. <sid...@us...>]

Update of /cvsroot/ayttm/ayttm/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv26523/src

Modified Files:
	chat_room.c 
Log Message:

 * YMSG: Fixed memory leak
 * YMSG: Fixed conferencing to work with YMSG16
 * YMSG: Prettier messages
 * CORE: Fixed case where preferred account for a room would be reset when a 
 chat room is cloned out of it


Index: chat_room.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/chat_room.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- chat_room.c	26 Aug 2009 09:26:14 -0000	1.78
+++ chat_room.c	29 Aug 2009 19:26:40 -0000	1.79
@@ -106,6 +106,8 @@
 {
 	LList *history = NULL;
 
+	eb_debug(DBG_CORE, "Freeing chat room %p\n");
+
 	if (!chat_room)
 		return;
 
@@ -527,7 +529,9 @@
 		third = find_account_by_handle(acc, ecr->local_user->service_id);
 		if (third) {
 			chat_window_to_chat_room(ecr, third, gtk_entry_get_text(GTK_ENTRY(ecr->invite_message)));
+			/* Why do we do this? It breaks stuff 
 			ecr->preferred = NULL;
+			 */
 		}
 	} else {
 		acc = strstr(invited, "(")+1;

[Ayttm-commits] CVS: ayttm/modules/yahoo2 yahoo.c,1.111,1.112

[Piotr S. <ps...@us...>]

Update of /cvsroot/ayttm/ayttm/modules/yahoo2
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv19519

Modified Files:
	yahoo.c 
Log Message:
Fixed error introduced in previous commit

Index: yahoo.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/yahoo2/yahoo.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- yahoo.c	28 Aug 2009 11:31:49 -0000	1.111
+++ yahoo.c	28 Aug 2009 13:46:55 -0000	1.112
@@ -722,7 +722,7 @@
 
 	if(msg) {
 		yad->status_message = g_new(char, strlen(msg) + 1);
-		g_strcpy(yad->status_message, msg);
+		strcpy(yad->status_message, msg);
 	}
 
 	if (stat != old_state || msg)

[Ayttm-commits] CVS: ayttm ChangeLog, 1.809, 1.810 configure.ac, 1.626, 1.627

[Piotr S. <ps...@us...>]

Update of /cvsroot/ayttm/ayttm
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv11162

Modified Files:
	ChangeLog configure.ac 
Log Message:
 * New state and status handling method
 * Yahoo: make use of get_status_pixbuf()

Index: ChangeLog
===================================================================
RCS file: /cvsroot/ayttm/ayttm/ChangeLog,v
retrieving revision 1.809
retrieving revision 1.810
diff -u -r1.809 -r1.810
--- ChangeLog	26 Aug 2009 16:25:55 -0000	1.809
+++ ChangeLog	28 Aug 2009 11:36:24 -0000	1.810
@@ -1,3 +1,9 @@
+* Fri Aug 28 2009 11:30 UTC [pstef]   0.5.0-135
+- ChangeLog, configure.ac, src/account.h, src/contact.h, src/service.h,
+src/status.c, src/util.c, modules/jabber/jabber.c, modules/yahoo2/yahoo.c:
+ * New state and status handling method
+ * Yahoo: make use of get_status_pixbuf()
+
 * Wed Aug 26 2009 16:25 UTC [siddheshp]   0.5.0-134
 - ChangeLog, configure.ac, modules/importers/import_everybuddy.c,
 modules/yahoo2/yahoo.c, modules/yahoo2/libyahoo2/libyahoo2.c, po/POTFILES.in,

Index: configure.ac
===================================================================
RCS file: /cvsroot/ayttm/ayttm/configure.ac,v
retrieving revision 1.626
retrieving revision 1.627
diff -u -r1.626 -r1.627
--- configure.ac	26 Aug 2009 16:25:55 -0000	1.626
+++ configure.ac	28 Aug 2009 11:36:24 -0000	1.627
@@ -5,7 +5,7 @@
 AC_PREREQ(2.53)
 AC_CONFIG_SRCDIR(src/main.c)
 AM_INIT_AUTOMAKE([1.6 dist-bzip2 dist-zip])
-RELEASE=134
+RELEASE=135
 
 # This is to check modules/core binary compat
 # Bump it up when necessary only (query_callbacks change, struct change etc)

[Ayttm-commits] CVS: ayttm/modules/yahoo2 yahoo.c,1.110,1.111

[Piotr S. <ps...@us...>]

Update of /cvsroot/ayttm/ayttm/modules/yahoo2
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv10424

Modified Files:
	yahoo.c 
Log Message:
Yahoo: make use of get_status_pixbuf()

Index: yahoo.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/yahoo2/yahoo.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- yahoo.c	26 Aug 2009 16:25:56 -0000	1.110
+++ yahoo.c	28 Aug 2009 11:31:49 -0000	1.111
@@ -701,6 +701,7 @@
 	eb_account *ea;
 	eb_yahoo_account_data *yad;
 	eb_local_account *ela = yahoo_find_local_account_by_id(id);
+	int old_state;
 	
 	ea = find_account_with_ela(who, ela);
 	if(!ea) {
@@ -710,21 +711,22 @@
 
 	yad = ea->protocol_account_data;
 	FREE(yad->status_message);
+	old_state = yad->status;
 	yad->status = stat;
 	yad->away = away;
 
-	if(stat == YAHOO_STATUS_OFFLINE) {
-		buddy_logoff(ea);
-	} else {
+	if (stat != YAHOO_STATUS_OFFLINE && old_state == YAHOO_STATUS_OFFLINE)
 		buddy_login(ea);
-	}
+	else if (stat == YAHOO_STATUS_OFFLINE && old_state != YAHOO_STATUS_OFFLINE)
+		buddy_logoff(ea);
 
 	if(msg) {
 		yad->status_message = g_new(char, strlen(msg) + 1);
-		strcpy(yad->status_message, msg);
+		g_strcpy(yad->status_message, msg);
 	}
 
-	buddy_update_status_and_log(ea);
+	if (stat != old_state || msg)
+		buddy_update_status_and_log(ea);
 }
 
 struct act_identity {
@@ -2952,13 +2954,40 @@
 	return ea;
 }
 
+static GdkPixbuf *yahoo_icon_online = NULL;
+static GdkPixbuf *yahoo_icon_away = NULL;
+static GdkPixbuf *yahoo_icon_sms = NULL;
+
+void eb_yahoo_init_pixbufs()
+{
+	yahoo_icon_online = gdk_pixbuf_new_from_xpm_data((const char **)yahoo_online_xpm);
+	yahoo_icon_away = gdk_pixbuf_new_from_xpm_data((const char **)yahoo_away_xpm);
+	yahoo_icon_sms = gdk_pixbuf_new_from_xpm_data((const char **)yahoo_sms_xpm);
+}
+
+static const void **eb_yahoo_get_status_pixbuf(eb_account *ea)
+{
+	eb_yahoo_account_data *yad = ea->protocol_account_data;
+
+	if (yad->away < 0)
+		WARNING(("%s->away is %d", ea->handle, yad->away));
+
+	if (!yahoo_icon_online)
+		eb_yahoo_init_pixbufs();
+
+	/* Don't translate this string */
+	if (yad->status_message && !strcmp(yad->status_message, "I'm on SMS"))
+		return (void *)yahoo_icon_sms;
+	else if (yad->away)
+		return (void *)yahoo_icon_away;
+	else
+		return (void *)yahoo_icon_online;
+}
+
 static const char **eb_yahoo_get_status_pixmap(eb_account * ea)
 {
 	eb_yahoo_account_data *yad;
 
-	/*if (!pixmaps)
-		eb_yahoo_init_pixmaps();*/
-
 	yad = ea->protocol_account_data;
 
 	if(yad->away < 0)
@@ -3657,6 +3686,7 @@
 
 	sc->get_status_string 		= eb_yahoo_get_status_string;
 	sc->get_status_pixmap 		= eb_yahoo_get_status_pixmap;
+	sc->get_status_pixbuf 		= eb_yahoo_get_status_pixbuf;
 
 	sc->set_idle 			= eb_yahoo_set_idle;
 	sc->set_away 			= eb_yahoo_set_away;

[Ayttm-commits] CVS: ayttm/src account.h, 1.12, 1.13 contact.h, 1.4, 1.5 service.h, 1.13, 1.14 status.c, 1.88, 1.89 util.c, 1.64, 1.65

[Piotr S. <ps...@us...>]

Update of /cvsroot/ayttm/ayttm/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv10186/src

Modified Files:
	account.h contact.h service.h status.c util.c 
Log Message:
New state and status handling method

Index: account.h
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/account.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- account.h	21 Aug 2009 00:01:46 -0000	1.12
+++ account.h	28 Aug 2009 11:30:34 -0000	1.13
@@ -81,7 +81,6 @@
 	int status_handler;
 	struct _info_window *infowindow;
  	int priority;
-	char *state;
 } eb_account;
 
 const char *decode_password(const char *pass_in, int enc_type);

Index: contact.h
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/contact.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- contact.h	3 Aug 2007 20:38:41 -0000	1.4
+++ contact.h	28 Aug 2009 11:30:34 -0000	1.5
@@ -57,9 +57,6 @@
 	void * status; /* GtkWidget */
 	void * label; /* GtkWidget */
 	int icon_handler;
-	
-	char *last_status;
-	time_t last_status_change;
 };
 
 

Index: service.h
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/service.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- service.h	21 Aug 2009 00:01:46 -0000	1.13
+++ service.h	28 Aug 2009 11:30:34 -0000	1.14
@@ -126,10 +126,7 @@
 	  are not available, this should return the empty string */
 
 	char *(*get_status_string)(eb_account * account);
-
-	/*This returns the string representing the status,
-	  this will get used on the Contact List, if statuses
-	  are not available, this should return the empty string */
+	char *(*get_state_string)(eb_account * account);
 
 	const char **(*get_status_pixmap)(eb_account * account);
 	const void **(*get_status_pixbuf)(eb_account *account);

Index: status.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/status.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- status.c	21 Aug 2009 00:25:47 -0000	1.88
+++ status.c	28 Aug 2009 11:30:34 -0000	1.89
@@ -998,27 +998,35 @@
 
 void buddy_update_icon(eb_account *ea)
 {
-	/* update the icon if another timeout isn't about to change it */
-	if (ea->icon_handler != -1 || !(RUN_SERVICE(ea)))
+	if (!(RUN_SERVICE(ea)))
 		return;
 
-	if (RUN_SERVICE(ea)->get_status_pixbuf)
-		ea->pix = RUN_SERVICE(ea)->get_status_pixbuf(ea);
-	else if (RUN_SERVICE(ea)->get_status_pixmap) {
-		GdkPixbuf *tmp = gdk_pixbuf_new_from_xpm_data(
-			(const char **)RUN_SERVICE(ea)->get_status_pixmap(ea));
-		ea->pix = tmp;
+	if (ea->icon_handler == -1) {
+		if (RUN_SERVICE(ea)->get_status_pixbuf)
+			ea->pix = RUN_SERVICE(ea)->get_status_pixbuf(ea);
+		else if (RUN_SERVICE(ea)->get_status_pixmap) {
+			GdkPixbuf *tmp = gdk_pixbuf_new_from_xpm_data(
+				(const char **)RUN_SERVICE(ea)->get_status_pixmap(ea));
+			ea->pix = tmp;
+		}
+		else
+			ea->pix = iconblank_pb;
+
+		gtk_tree_store_set(
+				contact_list_store, ea->list_item,
+				MAIN_VIEW_ICON, ea->pix,
+				MAIN_VIEW_LABEL, ea->handle,
+				MAIN_VIEW_STATUS, ea->status,
+				MAIN_VIEW_STATUS_TIP, ea->tiptext,
+				-1);
 	}
 	else
-		ea->pix = iconblank_pb;
-	
-	gtk_tree_store_set(
-			contact_list_store, ea->list_item,
-			MAIN_VIEW_ICON, ea->pix,
-			MAIN_VIEW_LABEL, ea->handle,
-			MAIN_VIEW_STATUS, ea->status,
-			MAIN_VIEW_STATUS_TIP, ea->tiptext,
-			-1);
+		gtk_tree_store_set(
+				contact_list_store, ea->list_item,
+				MAIN_VIEW_LABEL, ea->handle,
+				MAIN_VIEW_STATUS, ea->status,
+				MAIN_VIEW_STATUS_TIP, ea->tiptext,
+				-1);
 }
 
 /* General purpose update Contact List */
@@ -1159,65 +1167,6 @@
 			-1);
 }
 
-static void set_status_label(eb_account *ea, int update_contact)
-{
-	gchar *status;
-	gchar *tmp;
-	gchar *c;
-
-	status = (RUN_SERVICE(ea)->get_status_string)
-		? RUN_SERVICE(ea)->get_status_string(ea)
-		: NULL;
-
-	c = (status && status[0])
-		? g_strdup_printf("(%s)", status)
-		: g_strdup("");
-
-	for (tmp = c; *tmp; tmp++)
-		if (isspace(*tmp))
-			*tmp = ' ';
-
-	if (ea->status) {
-		eb_debug(DBG_CORE, "%s [%s|%s]\n", ea->account_contact->nick, ea->status, c);
-		if (strcmp(ea->status, c)) {
-			char buff[1024];
-			g_snprintf(
-					buff, 1024, _("%s is now %s"),
-					ea->account_contact->nick, (c && c[0]) ? c : "Online");
-			update_status_message(buff);
-		}
-		g_free(ea->status);
-	}
-
-	ea->tiptext = ea->status = strdup(c);
-
-	if (update_contact) {
-		struct tm *mytime;
-		gchar buff[128];
-		struct contact *ac = ea->account_contact;
-
-		g_free(ac->status);
-		ac->status = g_strdup(c);
-
-		if (ac->last_status && strcmp(c, ac->last_status)) {
-			time(&ac->last_status_change);
-			g_free(ac->last_status);
-			ac->last_status = g_strdup(c);
-		}
-
-		if (ac->last_status_change) {
-			mytime = localtime(&ac->last_status_change);
-			strftime(buff, 128, "%H:%M (%b %d)", mytime);
-			g_free(c);
-			c = g_markup_escape_text(status, -1);
-			ea->tiptext = g_strdup_printf(
-					_("%s\n<span size=\'small\'>Since %s</span>"),
-					(c && c[0]) ? c : "Online", buff);
-		}
-	}
-	g_free(c);
-}
-
 /* makes an account visible on the buddy list, making the contact visible
    if necessary */
 void add_account_line(eb_account *ea)
@@ -1443,9 +1392,6 @@
 {
 	eb_account *ea = NULL;
 	LList *l;
-	int width, height;
-	int width2, height2;
-	int width3, height3;
 
 	/* find the account who's status information should be reflected in
 	   the contact line (preferably the default protocol account, but
@@ -1468,8 +1414,7 @@
 	if (!ea)
 		return;
 
-	set_status_label(ea, TRUE);
-
+	ec->status = ea->status;
 	ec->label = ec->nick;
 
 	/* set the icon if there isn't another timeout about to alter the icon */
@@ -1492,20 +1437,27 @@
 				MAIN_VIEW_STATUS_TIP, ea->tiptext,
 				-1);
 	}
-
-	width = contact_list->allocation.width;
-	height = contact_list->allocation.height;
-
-	if (GTK_WIDGET_VISIBLE(GTK_SCROLLED_WINDOW(contact_window)->vscrollbar)) {
-		width3 = GTK_SCROLLED_WINDOW(contact_window)->vscrollbar->allocation.width;
-		height3 = GTK_SCROLLED_WINDOW(contact_window)->vscrollbar->allocation.height;
-	}
-	else {
-		width3 = 0;
-		height3 = 0;
-	}
+	else
+		gtk_tree_store_set(
+			contact_list_store, ec->list_item,
+			MAIN_VIEW_LABEL, ec->label,
+			MAIN_VIEW_STATUS, ec->status,
+			MAIN_VIEW_STATUS_TIP, ea->tiptext,
+			-1);
 
 	if (!iGetLocalPref("do_noautoresize")) {
+		int width = contact_list->allocation.width;
+		int width2, height2;
+		int width3, height3;
+
+		if (GTK_WIDGET_VISIBLE(GTK_SCROLLED_WINDOW(contact_window)->vscrollbar)) {
+			width3 = GTK_SCROLLED_WINDOW(contact_window)->vscrollbar->allocation.width;
+			height3 = GTK_SCROLLED_WINDOW(contact_window)->vscrollbar->allocation.height;
+		}
+		else {
+			width3 = 0;
+			height3 = 0;
+		}
 		width2 = contact_window->allocation.width;
 		height2 = contact_window->allocation.height;
 
@@ -1522,32 +1474,70 @@
 {
 	eb_log_status_changed(ea, RUN_SERVICE(ea)->get_status_string(ea));
 	buddy_update_status(ea);
-
-	if (!ea->account_contact->last_status)
-		ea->account_contact->last_status = strdup("dummy");
 }
 
 /* update the status info(pixmap and state) of an account */
 void buddy_update_status(eb_account *ea)
 {
-	char *c, *tmp;
+	gchar *status, *state, *tmp, *c, buff[128], msgbuff[1024];
+	struct tm *mytime;
+	time_t last_status_change;
 
 	if (!ea || !ea->list_item)
 		return;
 
-	tmp = g_strndup(RUN_SERVICE(ea)->get_status_string(ea), 20);
+	state = (RUN_SERVICE(ea)->get_state_string)
+		? RUN_SERVICE(ea)->get_state_string(ea)
+		: NULL;
+
+	status = (RUN_SERVICE(ea)->get_status_string)
+		? RUN_SERVICE(ea)->get_status_string(ea)
+		: NULL;
 
-	if (strlen(tmp))
-		c = g_strdup_printf("(%s)", tmp);
-	else
-		c = g_strdup("");
+	c = (status && status[0])
+		? g_strdup_printf("(%s)", status)
+		: g_strdup("");
 
-	set_status_label(ea, FALSE);
-	eb_update_status(ea, c);
+	for (tmp = c; *tmp; tmp++)
+		if (isspace(*tmp))
+			*tmp = ' ';
 
+	eb_debug(DBG_CORE, "%s [%s|%s]\n", ea->handle, ea->status, c);
+
+	memset(msgbuff, 0, 1024);
+	g_strlcat(msgbuff, ea->handle, 1024);
+	g_strlcat(msgbuff, " is now ", 1024);
+	if (state)
+		g_strlcat(msgbuff, state, 1024);
+	if (state && status && status[0])
+		g_strlcat(msgbuff, ": ", 1024);
+	if (status && status[0])
+		g_strlcat(msgbuff, status, 1024);
+	else if (!state)
+		g_strlcat(msgbuff, "Online", 1024);
+	update_status_message(msgbuff);
+
+	g_free(ea->status);
+	ea->status = strdup(c);
+
+	time(&last_status_change);
+	mytime = localtime(&last_status_change);
+	strftime(buff, 128, "%H:%M (%b %d)", mytime);
 	g_free(c);
-	g_free(tmp);
+	c = g_markup_escape_text(status, -1);
+	g_free(ea->tiptext);
+	ea->tiptext = g_strdup_printf(
+			_("%s\n%s\n<span size=\'small\'>Since %s</span>"),
+			(state && state[0]) ? state : "",
+			(c && c[0]) ? c : "",
+			buff);
+
+	eb_update_status(ea, state);
 
+	g_free(c);
+
+ 	/* if there is only one account(this one) logged in under the
+ 	   parent contact, we must login the contact also */
 	buddy_update_icon(ea);
 
 	/* since the contact's status info might be a copy of this
@@ -1613,8 +1603,6 @@
 /* function called when a contact logs in */
 static void contact_login(struct contact *ec)
 {
-	char buff[1024];
-
 	ec->group->contacts_online++;
 
 	/* display the "open door" icon */
@@ -1639,9 +1627,7 @@
 	}
 
 	eb_chat_window_do_timestamp(ec, 1);
-	g_snprintf(buff, 1024, _("%s is now Online"), ec->nick);
 	update_window_title(ec);
-	update_status_message(buff);
 
 	gtk_tree_store_set(
 			contact_list_store, ec->list_item,
@@ -1653,8 +1639,6 @@
 /* function called when a contact logs off */
 static void contact_logoff(struct contact *ec)
 {
-	char buff[1024];
-
 	/* display the "closed door" icon */
 	ec->pix = iconlogoff_pb;
 	ec->group->contacts_online--;
@@ -1680,9 +1664,8 @@
 	do_trigger_offline(ec);
 
 	eb_chat_window_do_timestamp(ec, 0);
-	g_snprintf(buff, 1024, _("%s is now Offline"), ec->nick);
 	update_window_title(ec);
-	update_status_message(buff);
+
 	gtk_tree_store_set(
 			contact_list_store, ec->list_item,
 			MAIN_VIEW_ICON, ec->pix,
@@ -1702,9 +1685,6 @@
 	ea->account_contact->online++;
 	ea->online = TRUE;
 
-	if (!ea->account_contact->last_status)
-		ea->account_contact->last_status = strdup("dummy");
-
 	if (iGetLocalPref("do_ignore_unknown")
 	&&  !strcmp(_("Unknown"), ea->account_contact->group->name))
 		return;
@@ -1725,8 +1705,6 @@
 	if (ea->account_contact->online == 1)
 		contact_login(ea->account_contact);
 
-	buddy_update_status_and_log(ea);
-
 	gtk_tree_store_set(
 			contact_list_store, ea->list_item,
 			MAIN_VIEW_ICON, ea->pix,
@@ -1745,9 +1723,6 @@
 	ea->account_contact->online--;
 	ea->online = FALSE;
 
-	if (!ea->account_contact->last_status)
-		ea->account_contact->last_status = strdup("dummy");
-
 	if (iGetLocalPref("do_ignore_unknown")
 	&&  !strcmp(_("Unknown"), ea->account_contact->group->name))
 		return;

Index: util.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/util.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- util.c	13 Aug 2009 20:20:42 -0000	1.64
+++ util.c	28 Aug 2009 11:30:34 -0000	1.65
@@ -1796,8 +1796,6 @@
 					"   status %p\n"
 					"   label %p\n"
 					"   icon_handler %d\n"
-					"   last_status %s\n"
-					"   last_status_change %ld\n"
 					"   accounts %p%s\n",
 					ct,
 					ct->nick,
@@ -1820,8 +1818,6 @@
 					ct->status,
 					ct->label,
 					ct->icon_handler,
-					ct->last_status,
-					ct->last_status_change,
 					ct->accounts,
 					ct->accounts?":":"");
 			for (a = ct->accounts; a; a = a->next) {

[Ayttm-commits] CVS: ayttm/modules/jabber jabber.c,1.55,1.56

[Piotr S. <ps...@us...>]

Update of /cvsroot/ayttm/ayttm/modules/jabber
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv10186/modules/jabber

Modified Files:
	jabber.c 
Log Message:
New state and status handling method

Index: jabber.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/jabber/jabber.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- jabber.c	21 Aug 2009 00:03:42 -0000	1.55
+++ jabber.c	28 Aug 2009 11:30:33 -0000	1.56
@@ -707,6 +707,15 @@
 	return jad->description ? jad->description : jabber_state_strings[0];
 }
 
+static char *eb_jabber_get_state_string(eb_account *account)
+{
+	eb_jabber_account_data *jad = account->protocol_account_data;
+
+	return (jad->status == JABBER_ONLINE)
+		? "Online"
+		: jabber_state_strings[jad->status];
+}
+
 static void eb_jabber_set_idle( eb_local_account * account, int idle )
 {
 	if ((idle == 0) && eb_jabber_get_current_state(account) == JABBER_AWAY)
@@ -918,6 +927,7 @@
 	sc->del_user = eb_jabber_del_user;
 	sc->new_account = eb_jabber_new_account;
 	sc->get_status_string = eb_jabber_get_status_string;
+	sc->get_state_string = eb_jabber_get_state_string;
 	sc->get_status_pixmap = eb_jabber_get_status_pixmap;
 	sc->get_status_pixbuf = eb_jabber_get_status_pixbuf;
 	sc->set_idle = eb_jabber_set_idle;
@@ -1173,24 +1183,21 @@
 
 	jad->JConn = jb->JConn;
 
-	if (jb->status != status) {
-		ea->state = jabber_state_strings[jb->status];
+	if (jb->status != status)
 		update = 1;
-	}
 
 	if ((!old_desc && jb->description && jb->description[0])
 	||  (old_desc && !jb->description && old_desc[0])
-	||  (old_desc && jb->description && strcmp(old_desc, jb->description))) {
+	||  (old_desc && jb->description && strcmp(old_desc, jb->description)))
 
-		eb_debug(DBG_JBR, "[%s|%s]\n", old_desc, jb->description);
 		update = 1;
-	}
 
 	if (jb->status != JABBER_OFFLINE && status == JABBER_OFFLINE)
 		buddy_login(ea);
 	else if (jb->status == JABBER_OFFLINE && status != JABBER_OFFLINE)
 		buddy_logoff(ea);	
-	else if (update)
+
+	if (update)
 		buddy_update_status_and_log(ea);
 
 	g_free(old_desc);

[Ayttm-commits] CVS: ayttm/modules/importers import_everybuddy.c, 1.13, 1.14

[Siddhesh P. <sid...@us...>]

Update of /cvsroot/ayttm/ayttm/modules/importers
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv27447/modules/importers

Modified Files:
	import_everybuddy.c 
Log Message:

 * YMSG: Removed obsolete yahoo_refresh. Added a probable quirk to the buddy
 add logic. It's still not convincing though. Still seems to work erratically.
 * CORE: Replaced a lot of xpms with stock icons -- reduced bin size and
 they're prettier!
 * CORE: Removed obsolete src/gtk/message_windows.c



Index: import_everybuddy.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/importers/import_everybuddy.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- import_everybuddy.c	27 Jul 2009 16:42:03 -0000	1.13
+++ import_everybuddy.c	26 Aug 2009 16:25:56 -0000	1.14
@@ -25,6 +25,8 @@
 #include <string.h>
 #include <errno.h>
 
+#include <gtk/gtk.h>
+
 #ifdef __MINGW32__
 #define __IN_PLUGIN__ 1
 #endif
@@ -35,10 +37,6 @@
 #include "plugin_api.h"
 #include "messages.h"
 
-#include "gtk/gtkutils.h"
-
-#include "pixmaps/ok.xpm"
-#include "pixmaps/cancel.xpm"
 
 /*************************************************************************************
  *                             Begin Module Code
@@ -256,8 +254,8 @@
 		awaybutton      = gtk_check_button_new_with_label(
 					_("Import away messages"));
 		
-		okbutton = gtkut_create_icon_button(_("OK"), ok_xpm, window);
-		cancelbutton = gtkut_create_icon_button(_("Cancel"), cancel_xpm, window);
+		okbutton = gtk_button_new_from_stock(GTK_STOCK_OK);
+		cancelbutton = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
 
 		hbox = gtk_hbox_new(FALSE, 5);
 		gtk_box_pack_start(GTK_BOX(hbox), okbutton, FALSE, FALSE, 2);

[Ayttm-commits] CVS: ayttm/src Makefile.am, 1.45, 1.46 action.c, 1.20, 1.21 add_contact_window.c, 1.20, 1.21 away_window.c, 1.12, 1.13 edit_account_window.c, 1.15, 1.16 edit_contact_window.c, 1.9, 1.10 edit_group_window.c, 1.5, 1.6 edit_list_window.c, 1.6, 1.7 edit_local_accounts.c, 1.31, 1.32 flash_window_title.c, 1.3, 1.4 info_window.c, 1.4, 1.5 trigger.c, 1.8, 1.9

[Siddhesh P. <sid...@us...>]

Update of /cvsroot/ayttm/ayttm/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv27447/src

Modified Files:
	Makefile.am action.c add_contact_window.c away_window.c 
	edit_account_window.c edit_contact_window.c 
	edit_group_window.c edit_list_window.c edit_local_accounts.c 
	flash_window_title.c info_window.c trigger.c 
Log Message:

 * YMSG: Removed obsolete yahoo_refresh. Added a probable quirk to the buddy
 add logic. It's still not convincing though. Still seems to work erratically.
 * CORE: Replaced a lot of xpms with stock icons -- reduced bin size and
 they're prettier!
 * CORE: Removed obsolete src/gtk/message_windows.c



Index: Makefile.am
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/Makefile.am,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- Makefile.am	19 Aug 2009 04:07:04 -0000	1.45
+++ Makefile.am	26 Aug 2009 16:25:56 -0000	1.46
@@ -36,7 +36,7 @@
 	image_window.h action.h about.h messages.h \
 	edit_local_accounts.h  platform_defs.h edit_list_window.h \
 	ui_about_window.h ui_file_selection_dlg.h ui_log_window.h \
-	ui_message_windows.h ui_prefs_window.h \
+	ui_prefs_window.h \
 	charconv.h ayttm_tray.h auto_complete.h
 
 AM_CFLAGS = $(EB_CFLAGS) -I$(top_srcdir) -I$(top_srcdir)/libproxy \

Index: action.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/action.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- action.c	3 May 2003 13:40:13 -0000	1.20
+++ action.c	26 Aug 2009 16:25:56 -0000	1.21
@@ -36,8 +36,6 @@
 #include "messages.h"
 #include "edit_list_window.h"
 
-#include "gtk/gtkutils.h"
-
 
 static void action_do_action(char * value, void * data)
 {

Index: add_contact_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/add_contact_window.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- add_contact_window.c	3 Aug 2007 20:38:40 -0000	1.20
+++ add_contact_window.c	26 Aug 2009 16:25:56 -0000	1.21
@@ -31,12 +31,8 @@
 #include "add_contact_window.h"
 #include "messages.h"
 
-#include "gtk/gtkutils.h"
 #include <gdk/gdkkeysyms.h>
 
-#include "pixmaps/tb_preferences.xpm"
-#include "pixmaps/cancel.xpm"
-
 /*
 * This is the GUI that gets created when you click on the "Add" button
 * on the edit contacts tab, this is to add a new contact to your contact
@@ -54,11 +50,6 @@
 
 #define COMBO_TEXT(x) gtk_combo_box_get_active_text(GTK_COMBO_BOX(x))
 
-static void destroy(GtkWidget *widget, gpointer data)
-{
-	window_open = 0;
-}
-
 static gint strcasecmp_glist(gconstpointer a, gconstpointer b)
 {
 	return strcasecmp((const char *)a, (const char *)b);
@@ -209,7 +200,7 @@
 	g_signal_handlers_disconnect_by_func(contact_name, G_CALLBACK(con_modified), NULL);
 }
 
-static void add_button_callback(GtkButton *button, gpointer userdata)
+static void add_button_callback(void)
 {
 	grouplist *gl;
 	struct contact *con;
@@ -281,7 +272,6 @@
 	add_account(con->nick, ea);
 /*	update_contact_list ();
 	write_contact_list(); */
-	gtk_widget_destroy(add_contact_window);
 }
 
 /*
@@ -293,16 +283,14 @@
 static void show_add_defined_contact_window(struct contact *cont, grouplist *grp, struct contact *con)
 {
 	GtkWidget *hbox;
-	GtkWidget *hbox2;
 	GtkWidget *vbox;
 	GtkWidget *label;
 	guint label_key;
-	GtkWidget *button;
 	GtkWidget *table;
 	GtkWidget *frame;
-	GtkAccelGroup *accel_group;
 	GList *list;
 	GList *gwalker = NULL;
+	GtkWidget *dialog_content_area;
 
 	LList *walk;
 
@@ -314,14 +302,6 @@
 		return;
 	}
 
-	accel_group = gtk_accel_group_new();
-
-	add_contact_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-	gtk_window_set_transient_for(GTK_WINDOW(add_contact_window), GTK_WINDOW(statuswindow));
-	gtk_window_set_position(GTK_WINDOW(add_contact_window), GTK_WIN_POS_MOUSE);
-	gtk_widget_realize(add_contact_window);
-	gtk_container_set_border_width(GTK_CONTAINER(add_contact_window), 5);      
-
 	table = gtk_table_new(4, 2, FALSE);
 	gtk_table_set_row_spacings(GTK_TABLE(table), 5);
 	gtk_table_set_row_spacings(GTK_TABLE(table), 5);
@@ -344,8 +324,6 @@
 
 	gtk_table_attach(GTK_TABLE(table), account_name, 1, 2, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
 	gtk_widget_show(account_name);
-	gtk_widget_add_accelerator(account_name, "grab_focus", accel_group,
-			label_key, GDK_MOD1_MASK, (GtkAccelFlags)0);
 
 	/*Section for declaring the protocol & local account*/
       
@@ -375,8 +353,6 @@
 
 	gtk_table_attach(GTK_TABLE(table), service_list, 1, 2, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
 	gtk_widget_show(service_list);
-	gtk_widget_add_accelerator(service_list, "grab_focus", accel_group,
-			label_key, GDK_MOD1_MASK, (GtkAccelFlags)0);
 
 	/*Section for Contact Name*/
 
@@ -406,9 +382,6 @@
 	contact_input_handler = g_signal_connect(contact_name, "changed", G_CALLBACK(con_modified), NULL);
 	gtk_table_attach(GTK_TABLE(table), contact_name, 1, 2, 2, 3, GTK_FILL, GTK_FILL, 0, 0);
 	gtk_widget_show(contact_name);
-	gtk_widget_add_accelerator(contact_name, "grab_focus", accel_group,
-			label_key, GDK_MOD1_MASK, (GtkAccelFlags)0);
-
 
 	/*Section for Group declaration*/
 
@@ -441,9 +414,6 @@
 	g_signal_connect(group_name, "changed", G_CALLBACK(dif_group), NULL);
 	gtk_table_attach(GTK_TABLE(table), group_name, 1, 2, 3, 4, GTK_FILL, GTK_FILL, 0, 0);
 	gtk_widget_show(group_name);
-	gtk_widget_add_accelerator(group_name, "grab_focus", accel_group,
-			label_key, GDK_MOD1_MASK, (GtkAccelFlags)0);
-
 
 	/*Lets create a frame to put all of this in*/
 
@@ -451,65 +421,39 @@
 	gtk_frame_set_label(GTK_FRAME(frame), _("Add Contact"));
 
 	gtk_container_add(GTK_CONTAINER(frame), table);
-	gtk_widget_show(table);
-
-	gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0);
-	gtk_widget_show(frame);
-
-	hbox = gtk_hbox_new(FALSE, 5);
-	hbox2 = gtk_hbox_new(TRUE, 5);
-
-	gtk_widget_set_size_request(hbox2, 200,25);
-
-	/*Add/Save Button*/
-	button = gtkut_create_icon_button( _("Add"), tb_preferences_xpm, add_contact_window );
-	g_signal_connect(button, "clicked", G_CALLBACK(add_button_callback), NULL);
-
-	gtk_box_pack_start(GTK_BOX(hbox2), button, TRUE, TRUE, 0);
-	gtk_widget_show(button);
-	gtk_widget_add_accelerator(button, "clicked", accel_group,
-			GDK_Return, 0, GTK_ACCEL_VISIBLE);
-	gtk_widget_add_accelerator(button, "clicked", accel_group,
-			GDK_KP_Enter, 0, GTK_ACCEL_VISIBLE);
 
-	/*Cancel Button*/
-	button = gtkut_create_icon_button( _("Cancel"), cancel_xpm, add_contact_window );
+	add_contact_window = gtk_dialog_new_with_buttons(
+							_("Ayttm - Add Contact"),
+							GTK_WINDOW(statuswindow),
+							GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+							GTK_STOCK_ADD,
+							GTK_RESPONSE_ACCEPT,
+							GTK_STOCK_CANCEL,
+							GTK_RESPONSE_REJECT,
+							NULL
+							);
+
+	gtk_dialog_set_default_response(GTK_DIALOG(add_contact_window), GTK_RESPONSE_ACCEPT);
+
+#ifdef HAVE_GTK_2_14
+        dialog_content_area = gtk_dialog_get_content_area(GTK_DIALOG(add_contact_window));
+#else
+	dialog_content_area = GTK_DIALOG(add_contact_window)->vbox;
+#endif
 
-	g_signal_connect_swapped(button, "clicked",
-			G_CALLBACK(gtk_widget_destroy),	add_contact_window);
- 	gtk_widget_show(hbox);     
-	gtk_widget_add_accelerator(button, "clicked", accel_group,
-			GDK_Escape, 0, GTK_ACCEL_VISIBLE);
+	gtk_box_pack_start(GTK_BOX(dialog_content_area), frame, TRUE, TRUE, 5);
 
-	gtk_box_pack_start(GTK_BOX(hbox2), button, TRUE, TRUE, 0);
-	gtk_widget_show(button);
-
-	/*Buttons End*/
-
-	hbox = gtk_hbox_new(FALSE, 0);
-	table = gtk_table_new(1, 1, FALSE);
-
-	gtk_box_pack_end(GTK_BOX(hbox),hbox2, FALSE, FALSE, 0);
-	gtk_widget_show(hbox2);      
-
-	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
-	gtk_widget_show(hbox);
-
-	gtk_table_attach(GTK_TABLE(table), vbox, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
-	gtk_widget_show(vbox);
-
-	gtk_container_add(GTK_CONTAINER(add_contact_window), table);
-	gtk_widget_show(table);
-
-	gtk_window_set_title(GTK_WINDOW(add_contact_window), _("Ayttm - Add Contact"));
 	gtk_widget_grab_focus(account_name);
 	
-	gtk_window_add_accel_group(GTK_WINDOW(add_contact_window), accel_group);
-	gtk_widget_show(add_contact_window);
+	gtk_widget_show_all(add_contact_window);
+	window_open = 1;
 
-	g_signal_connect(add_contact_window, "destroy", G_CALLBACK(destroy), NULL);
+	if(GTK_RESPONSE_ACCEPT == gtk_dialog_run(GTK_DIALOG(add_contact_window)))
+		add_button_callback();
 
-	window_open = 1;
+	gtk_widget_destroy(add_contact_window);
+
+	window_open = 0;
 }
 
 void show_add_contact_window()

Index: away_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/away_window.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- away_window.c	3 Aug 2007 20:38:40 -0000	1.12
+++ away_window.c	26 Aug 2009 16:25:56 -0000	1.13
@@ -38,8 +38,6 @@
 #include "messages.h"
 #include "dialog.h"
 
-#include "gtk/gtkutils.h"
-
 #ifndef MIN
 #define MIN(x, y)	((x)<(y)?(x):(y))
 #endif

Index: edit_account_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/edit_account_window.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- edit_account_window.c	3 Aug 2007 20:38:41 -0000	1.15
+++ edit_account_window.c	26 Aug 2009 16:25:56 -0000	1.16
@@ -33,10 +33,6 @@
 #include "messages.h"
 #include "service.h"
 #include "chat_window.h"
-#include "gtk/gtkutils.h"
-
-#include "pixmaps/tb_preferences.xpm"
-#include "pixmaps/cancel.xpm"
 
 
 static gint window_open = 0;
@@ -48,12 +44,7 @@
 
 #define COMBO_TEXT(x) gtk_entry_get_text(GTK_ENTRY(GTK_BIN(x)->child))
 
-static void destroy(GtkWidget *widget, gpointer data)
-{
-	window_open = 0;
-}
-
-static void ok_callback(GtkWidget *widget, gpointer data)
+static void ok_callback(void)
 {
 	grouplist *gl;
 	struct contact *con;
@@ -162,31 +153,23 @@
 				account->handle);
 }
 
-static void draw_edit_account_window(eb_account *ea, char *window_title, char *frame_title, char *add_label)
+static void draw_edit_account_window(eb_account *ea, char *window_title, char *frame_title, gboolean add)
 {
 	gchar buff[1024];
 	static GtkWidget *frame;
+	GtkWidget *dialog_content_area;
 	char *cur_la = NULL;
 	account = ea;
 
 	if(!window_open) {
 		GtkWidget *vbox = NULL;
 		GtkWidget *hbox = NULL;
-		GtkWidget *hbox2 = NULL;
 		GtkWidget *label = NULL;
-		GtkWidget *button = NULL;
 		GtkWidget *table = NULL;
-		GtkWidget *separator = NULL;
 		GList *list = NULL;
 		LList *walk = NULL;
 		GList *gwalker;
 		
-		edit_account_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-		gtk_window_set_transient_for(GTK_WINDOW(edit_account_window), GTK_WINDOW(statuswindow));
-		gtk_window_set_position(GTK_WINDOW(edit_account_window), GTK_WIN_POS_MOUSE);
-		gtk_widget_realize(edit_account_window);
-		gtk_container_set_border_width(GTK_CONTAINER(edit_account_window), 5);
-
 		table = gtk_table_new(3, 2, FALSE);
 		gtk_table_set_row_spacings(GTK_TABLE(table), 5);
 		gtk_table_set_row_spacings(GTK_TABLE(table), 5);
@@ -268,53 +251,27 @@
 		gtk_container_add(GTK_CONTAINER(frame), table);
 		gtk_widget_show(table);
 
-		gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0);
-		gtk_widget_show(frame);
-
-		hbox = gtk_hbox_new(FALSE, 5);
-		hbox2 = gtk_hbox_new(TRUE, 5);
-		gtk_widget_set_size_request(hbox2, 200,25 );
-
-		/*Lets try adding a seperator*/
-
-		separator = gtk_hseparator_new();
-		gtk_box_pack_start(GTK_BOX(vbox), separator, FALSE, FALSE, 5);
-		gtk_widget_show(separator);
-
-		/*Add Button*/
-
-		button = gtkut_create_icon_button( add_label, tb_preferences_xpm, edit_account_window );
-		
-		g_signal_connect(button, "clicked", G_CALLBACK(ok_callback), NULL);
-
-		gtk_box_pack_start(GTK_BOX(hbox2), button, TRUE, TRUE, 0);
-		gtk_widget_show(button);
-
-		/*Cancel Button*/
+		edit_account_window = gtk_dialog_new_with_buttons(
+								"Ayttm",
+								GTK_WINDOW(statuswindow),
+								GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+								add?GTK_STOCK_ADD:GTK_STOCK_SAVE,
+								GTK_RESPONSE_ACCEPT,
+								GTK_STOCK_CANCEL,
+								GTK_RESPONSE_REJECT,
+								NULL
+								);
+
+		gtk_dialog_set_default_response(GTK_DIALOG(edit_account_window), GTK_RESPONSE_ACCEPT);
+
+#ifdef HAVE_GTK_2_14
+	        dialog_content_area = gtk_dialog_get_content_area(GTK_DIALOG(edit_account_window));
+#else
+		dialog_content_area = GTK_DIALOG(edit_account_window)->vbox;
+#endif
 
-		button = gtkut_create_icon_button( _("Cancel"), cancel_xpm, edit_account_window );
-		
-		g_signal_connect_swapped(button, "clicked", G_CALLBACK(gtk_widget_destroy),
-				edit_account_window);
-
-		gtk_box_pack_start(GTK_BOX(hbox2), button, TRUE, TRUE, 0);
-		gtk_widget_show(button);
-
-		/*Buttons End*/
-
-		hbox = gtk_hbox_new(FALSE, 0);
-
-		gtk_box_pack_end(GTK_BOX(hbox), hbox2, FALSE, FALSE, 0);
-		gtk_widget_show(hbox2);
-
-		gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
-		gtk_widget_show(hbox);
-
-		gtk_widget_show(vbox);
-
-		gtk_container_add(GTK_CONTAINER (edit_account_window), vbox);
-
-		g_signal_connect(edit_account_window, "destroy", G_CALLBACK(destroy), NULL);
+		gtk_box_pack_start(GTK_BOX(dialog_content_area), frame, TRUE, TRUE, 5);
+		window_open = 1;
 	}
 
 	if(account->account_contact) {
@@ -346,14 +303,19 @@
 	g_snprintf(buff,1024,_("%s - Account edition"), account->handle);
 	gtk_window_set_title(GTK_WINDOW(edit_account_window), buff ); 
 	
-	gtk_widget_show(edit_account_window);
+	gtk_widget_show_all(edit_account_window);
+
+	if(GTK_RESPONSE_ACCEPT == gtk_dialog_run(GTK_DIALOG(edit_account_window)))
+		ok_callback();
+
+	gtk_widget_destroy(edit_account_window);
+	window_open = 0;
 
-	window_open = 1;
 }
 
 void add_unknown_account_window_new(eb_account *ea)
 {
-	draw_edit_account_window(ea, _("Add %s to Contact List"), _("Add Unknown Contact"), _("Add"));
+	draw_edit_account_window(ea, _("Add %s to Contact List"), _("Add Unknown Contact"), TRUE);
 }
 
 void edit_account_window_new(eb_account *ea)
@@ -361,6 +323,6 @@
 	if(!strcmp(ea->account_contact->group->name, _("Unknown")))
 		add_unknown_account_window_new(ea);
 	else
-		draw_edit_account_window(ea, _("Edit %s"), _("Edit Account"), _("Save"));
+		draw_edit_account_window(ea, _("Edit %s"), _("Edit Account"), FALSE);
 }
 

Index: edit_contact_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/edit_contact_window.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- edit_contact_window.c	3 Aug 2007 20:38:41 -0000	1.9
+++ edit_contact_window.c	26 Aug 2009 16:25:56 -0000	1.10
@@ -30,27 +30,19 @@
 #include "status.h"
 #include "util.h"
 
-#include "gtk/gtkutils.h"
 #include <gdk/gdkkeysyms.h>
+#include <gtk/gtk.h>
 
-#include "pixmaps/tb_edit.xpm"
-#include "pixmaps/cancel.xpm"
 
 extern GtkWidget * statuswindow;
 
 static gint window_open = 0;
-static struct contact * my_contact = NULL;
 static GtkWidget * edit_contact_window = NULL;
 static GtkWidget * nick = NULL;
 static GtkWidget * service_list = NULL;
 static GtkWidget * group_list = NULL;
 
-static void destroy( GtkWidget *widget, gpointer data )
-{
-    window_open = 0;
-}
-
-static void ok_callback( GtkWidget * widget, gpointer data )
+static void ok_callback( struct contact *my_contact )
 {
 	gint service_id = get_service_id( gtk_combo_box_get_active_text(GTK_COMBO_BOX(service_list)) );
 	grouplist *g = my_contact->group;
@@ -74,27 +66,15 @@
 {
 	gchar buff[1024];
 	if( !window_open ) {
-		GtkWidget * vbox = gtk_vbox_new( FALSE, 5 );
 		GtkWidget * hbox = gtk_hbox_new( FALSE, 0 );
-		GtkWidget * hbox2;
-		GtkWidget * button;
 		GtkWidget * label;
 		guint label_key;
 		GtkWidget * frame;
 		GtkWidget * table;
-		GtkWidget * separator;
-		GtkAccelGroup *accel_group;
 		GList * list;
 		GList *gwalker;
+		GtkWidget *dialog_content_area = NULL;
 
-		accel_group = gtk_accel_group_new();
-
-		edit_contact_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-		gtk_window_set_transient_for(GTK_WINDOW(edit_contact_window), GTK_WINDOW(statuswindow));
-		gtk_window_set_position(GTK_WINDOW(edit_contact_window), GTK_WIN_POS_MOUSE);
-		gtk_widget_realize(edit_contact_window);
-		gtk_container_set_border_width(GTK_CONTAINER(edit_contact_window), 5);
-		
 		table = gtk_table_new(3, 2, FALSE);
 		gtk_table_set_row_spacings(GTK_TABLE(table), 5);
 		gtk_table_set_row_spacings(GTK_TABLE(table), 5);
@@ -116,9 +96,6 @@
 		
 		gtk_entry_set_text(GTK_ENTRY(nick), c->nick );
 		gtk_widget_show(nick);
-		gtk_widget_add_accelerator(nick, "grab_focus", accel_group,
-				label_key, GDK_MOD1_MASK, (GtkAccelFlags)0);
-		
 		hbox = gtk_hbox_new( FALSE, 0 );
 
 		/* Group */
@@ -146,8 +123,6 @@
 		gtk_widget_show(group_list);
 		gtk_entry_set_text(GTK_ENTRY(GTK_BIN(group_list)->child), 
 				c->group->name);
-		gtk_widget_add_accelerator(group_list, "grab_focus", accel_group,
-				label_key, GDK_MOD1_MASK, (GtkAccelFlags)0);
 
 		hbox = gtk_hbox_new(FALSE, 0);
 
@@ -161,7 +136,6 @@
 				0, 0);
 		gtk_widget_show(hbox);
 
-		
 		{
 			LList *l, *l2;
 			int i, def=0;
@@ -181,8 +155,6 @@
 		gtk_table_attach(GTK_TABLE(table), service_list, 1, 2, 2, 3,
 				GTK_FILL, GTK_FILL, 0, 0);
 		gtk_widget_show(service_list);
-		gtk_widget_add_accelerator(service_list, "grab_focus", accel_group,
-				label_key, GDK_MOD1_MASK, (GtkAccelFlags)0);
 		
 		frame = gtk_frame_new(NULL);
 
@@ -190,65 +162,30 @@
 		gtk_frame_set_label(GTK_FRAME(frame), buff);
 
 		gtk_container_add(GTK_CONTAINER(frame), table);
-		gtk_widget_show(table);
 
-		gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0);
-		gtk_widget_show(frame);
-
-		separator = gtk_hseparator_new();
-		gtk_box_pack_start(GTK_BOX(vbox), separator, FALSE, FALSE, 5);
-		gtk_widget_show(separator);
-
-		hbox = gtk_hbox_new(FALSE, 5);
-		hbox2 = gtk_hbox_new(TRUE, 5);
-		gtk_widget_set_size_request(hbox2, 200,25 );
-		
-		/*Ok Button*/
-   
-		button = gtkut_create_icon_button( _("Save"), tb_edit_xpm, edit_contact_window );
-
-		g_signal_connect(button, "clicked", G_CALLBACK(ok_callback), NULL );
-
-		gtk_box_pack_start(GTK_BOX(hbox2), button, TRUE, TRUE, 0);
-		gtk_widget_show(button);
-		gtk_widget_add_accelerator(button, "clicked", accel_group,
-				GDK_Return, 0, GTK_ACCEL_VISIBLE);
-		gtk_widget_add_accelerator(button, "clicked", accel_group,
-				GDK_KP_Enter, 0, GTK_ACCEL_VISIBLE);
-		
-		/*Cancel Button*/
-      
-		button = gtkut_create_icon_button( _("Cancel"), cancel_xpm, edit_contact_window );
+		edit_contact_window = gtk_dialog_new_with_buttons(
+								"Ayttm",
+								GTK_WINDOW(statuswindow),
+								GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+								GTK_STOCK_SAVE,
+								GTK_RESPONSE_ACCEPT,
+								GTK_STOCK_CANCEL,
+								GTK_RESPONSE_REJECT,
+								NULL
+								);
+
+		gtk_dialog_set_default_response(GTK_DIALOG(edit_contact_window), GTK_RESPONSE_ACCEPT);
+
+#ifdef HAVE_GTK_2_14
+	        dialog_content_area = gtk_dialog_get_content_area(GTK_DIALOG(edit_contact_window));
+#else
+		dialog_content_area = GTK_DIALOG(edit_contact_window)->vbox;
+#endif
 
-		g_signal_connect_swapped(button, "clicked",
-				G_CALLBACK(gtk_widget_destroy),edit_contact_window);
+		gtk_box_pack_start(GTK_BOX(dialog_content_area), frame, TRUE, TRUE, 5);
+		gtk_widget_show_all(edit_contact_window);
 
-		gtk_box_pack_start(GTK_BOX(hbox2), button, TRUE, TRUE, 0);
-		gtk_widget_show(button);
-		gtk_widget_add_accelerator(button, "clicked", accel_group,
-				GDK_Escape, 0, GTK_ACCEL_VISIBLE);
-		
-		/*Buttons End*/
-		
-		hbox = gtk_hbox_new(FALSE, 5);
-		
-		gtk_box_pack_end(GTK_BOX(hbox), hbox2, FALSE, FALSE, 0 );
-		gtk_widget_show(hbox2);
-		
-		gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
-		gtk_widget_show(hbox);
-		
-		table = gtk_table_new(1, 1, FALSE);
-		gtk_table_attach(GTK_TABLE(table), vbox, 0, 1, 0, 1,
-				GTK_FILL, GTK_FILL, 0, 0);
-		gtk_widget_show(vbox);
-		
-		gtk_container_add(GTK_CONTAINER(edit_contact_window), table);
-		gtk_widget_show(table);
-		
-		g_signal_connect(edit_contact_window, "destroy", G_CALLBACK(destroy), NULL );
-		gtk_window_add_accel_group(GTK_WINDOW(edit_contact_window), accel_group);
-		gtk_widget_show(edit_contact_window);
+		window_open = 1;
 	}
 	
 	g_snprintf(buff,1024,_("%s - Edit Contact"), c->nick);
@@ -267,8 +204,11 @@
 		gtk_combo_box_set_active(GTK_COMBO_BOX(service_list), def);
 	}
 
-	g_signal_connect(edit_contact_window, "destroy", G_CALLBACK(destroy), NULL );
-	my_contact = c;
-	window_open = 1;
+	if(GTK_RESPONSE_ACCEPT == gtk_dialog_run(GTK_DIALOG(edit_contact_window)))
+		ok_callback(c);
+
+	gtk_widget_destroy(edit_contact_window);
+	window_open = 0;
 }
-			
+
+

Index: edit_group_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/edit_group_window.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- edit_group_window.c	3 Aug 2007 20:38:41 -0000	1.5
+++ edit_group_window.c	26 Aug 2009 16:25:56 -0000	1.6
@@ -24,43 +24,29 @@
 
 #include "intl.h"
 #include <string.h>
+#include <gtk/gtk.h>
 
 #include "status.h"
 #include "util.h"
 
-#include "gtk/gtkutils.h"
-
-#include "pixmaps/tb_edit.xpm"
-#include "pixmaps/cancel.xpm"
 
 extern GtkWidget * statuswindow;
 
 static gint window_open = 0;
 static GtkWidget * edit_group_window;
 static GtkWidget * group_name;
-static grouplist * current_group;
 
-static void destroy( GtkWidget *widget, gpointer data)
-{
-	window_open = 0;
-}
 
-static void ok_callback( GtkWidget * widget, gpointer data)
+static void ok_callback(grouplist *current_group)
 {
 	if (group_name == NULL || gtk_entry_get_text(GTK_ENTRY(group_name)) == NULL
-	||  strlen(gtk_entry_get_text(GTK_ENTRY(group_name))) == 0)
+			||  strlen(gtk_entry_get_text(GTK_ENTRY(group_name))) == 0)
 		return;
-	if (current_group) { /*edit*/
+
+	if (current_group)
 		rename_group(current_group, gtk_entry_get_text(GTK_ENTRY(group_name)));
-	} else { /*add*/
+	else
 		add_group(gtk_entry_get_text(GTK_ENTRY(group_name)));
-	}
-	gtk_widget_destroy(edit_group_window);
-}
-
-static void cancel_callback( GtkWidget * widget, gpointer data)
-{
-	gtk_widget_destroy(edit_group_window);
 }
 
 void edit_group_window_new( grouplist * g)
@@ -73,80 +59,48 @@
 		name = "";
 	if ( !window_open )
 	{
-		GtkWidget * vbox = gtk_vbox_new( FALSE, 5 );
 		GtkWidget * hbox = gtk_hbox_new( FALSE, 5 );
-		GtkWidget * hbox2;
 		GtkWidget * label;
-		GtkWidget * button;
 		GtkWidget * frame;
-		GtkWidget * separator;
-		
-		edit_group_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-		gtk_window_set_transient_for(GTK_WINDOW(edit_group_window), GTK_WINDOW(statuswindow));
-		gtk_window_set_position(GTK_WINDOW(edit_group_window), GTK_WIN_POS_MOUSE);
-		gtk_widget_realize(edit_group_window);
-		gtk_container_set_border_width(GTK_CONTAINER(edit_group_window), 5);
+		GtkWidget *dialog_content_area;
 		
 		label = gtk_label_new(_("Group Name:"));
 		gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
-		gtk_widget_show(label);
 
 		group_name = gtk_entry_new();
 		gtk_box_pack_start(GTK_BOX(hbox), group_name, TRUE, TRUE, 5);
 		gtk_entry_set_text(GTK_ENTRY(group_name), name);
-		gtk_widget_show(group_name);
 
 		frame = gtk_frame_new(NULL);
 
 		g_snprintf(buff,1024,_("%s group%s%s"), g?_("Edit"):_("Add"), g?" ":"", name);
 		
 		gtk_frame_set_label(GTK_FRAME(frame), buff);
+		gtk_container_add(GTK_CONTAINER(frame), hbox);
 
-		hbox2=gtk_vbox_new(FALSE,5);
-		gtk_box_pack_start(GTK_BOX(hbox2),hbox,TRUE,TRUE,5);
-		gtk_container_add(GTK_CONTAINER(frame), hbox2);
-		gtk_widget_show(hbox);
-		gtk_widget_show(hbox2);
-		
-		gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 5);
-		gtk_widget_show(frame);
-
-		separator = gtk_hseparator_new();
-		gtk_box_pack_start(GTK_BOX(vbox), separator, FALSE, FALSE, 5);
-		gtk_widget_show(separator);
+		edit_group_window = gtk_dialog_new_with_buttons(
+								"Ayttm",
+								GTK_WINDOW(statuswindow),
+								GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+								g?GTK_STOCK_SAVE:GTK_STOCK_ADD,
+								GTK_RESPONSE_ACCEPT,
+								GTK_STOCK_CANCEL,
+								GTK_RESPONSE_REJECT,
+								NULL
+								);
+
+		gtk_dialog_set_default_response(GTK_DIALOG(edit_group_window), GTK_RESPONSE_ACCEPT);
+
+#ifdef HAVE_GTK_2_14
+	        dialog_content_area = gtk_dialog_get_content_area(GTK_DIALOG(edit_group_window));
+#else
+		dialog_content_area = GTK_DIALOG(edit_group_window)->vbox;
+#endif
 
-		hbox = gtk_hbox_new(TRUE, 5);
+		gtk_box_pack_start(GTK_BOX(dialog_content_area), frame, TRUE, TRUE, 5);
+		gtk_widget_show_all(edit_group_window);
 
-		/*Ok Button*/
-		hbox2=gtk_hbox_new(FALSE,5);
-		button = gtkut_create_icon_button( g?_("Save"):_("Add"), tb_edit_xpm, edit_group_window );
-
-		g_signal_connect(button, "clicked",G_CALLBACK(ok_callback), NULL );
-
-		gtk_box_pack_start(GTK_BOX(hbox2), button, TRUE, TRUE, 0);
-		gtk_widget_show(button);
-		
-		/*Cancel Button*/
-      
-		button = gtkut_create_icon_button( _("Cancel"), cancel_xpm, edit_group_window );
-
-		g_signal_connect_swapped (button, "clicked", G_CALLBACK(cancel_callback), NULL);
-
-		gtk_box_pack_start(GTK_BOX(hbox2), button, TRUE, TRUE, 0);
-		gtk_widget_show(button);
-		
-		hbox = gtk_hbox_new(FALSE, 5);
-		
-		gtk_box_pack_end(GTK_BOX(hbox), hbox2, FALSE, FALSE, 0 );
-		gtk_widget_show(hbox);
-		gtk_widget_show(hbox2);
-		
-		gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 5);
-		gtk_container_add(GTK_CONTAINER(edit_group_window), vbox);
-		gtk_widget_show(vbox);
-		
-		g_signal_connect( edit_group_window, "destroy", G_CALLBACK(destroy), NULL);
-		gtk_widget_show(edit_group_window);
+		window_open = 1;
 	}
 
 	gtk_entry_set_text(GTK_ENTRY(group_name), name);
@@ -154,12 +108,16 @@
 		g_snprintf(buff, 1024, _("Edit Properties for %s"), name);
 	else
 		g_snprintf(buff, 1024, _("Add group"));
+
 	gtk_window_set_title(GTK_WINDOW(edit_group_window), buff);
-	g_signal_connect(edit_group_window, "destroy", G_CALLBACK(destroy), NULL);
 
-	current_group = g;
-	window_open = 1;
 	gtk_widget_grab_focus(group_name);
-	
+
+	if(GTK_RESPONSE_ACCEPT == gtk_dialog_run(GTK_DIALOG(edit_group_window)))
+		ok_callback(g);
+
+	gtk_widget_destroy(edit_group_window);
+	window_open = 0;
 }
 
+

Index: edit_list_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/edit_list_window.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- edit_list_window.c	3 Aug 2007 20:38:41 -0000	1.6
+++ edit_list_window.c	26 Aug 2009 16:25:56 -0000	1.7
@@ -36,11 +36,6 @@
 #include "service.h"
 #include "messages.h"
 
-#include "gtk/gtkutils.h"
-
-#include "pixmaps/ok.xpm"
-#include "pixmaps/cancel.xpm"
-
 #ifndef MIN
 #define MIN(x, y)	((x)<(y)?(x):(y))
 #endif
@@ -228,6 +223,7 @@
 	int event_time, button;
 	GtkWidget *menu = gtk_menu_new();
 	GtkTreeSelection *selection = gtk_tree_view_get_selection(tree_view);
+	GtkWidget *menubutton;
 
 	if(event) {
 		GtkTreePath *path;
@@ -247,9 +243,11 @@
 		button = 0;
 		event_time = gtk_get_current_event_time();
 	}
-	
-	gtkut_create_menu_button (GTK_MENU(menu), _("Delete"),
-		G_CALLBACK(delete_data_cb), NULL);
+
+	menubutton = gtk_menu_item_new_with_label( _("Delete") );
+	g_signal_connect( menubutton, "activate", G_CALLBACK(delete_data_cb), NULL);
+	gtk_menu_shell_append( GTK_MENU_SHELL(menu), menubutton );
+	gtk_widget_show( menubutton );
 
 	gtk_menu_popup(GTK_MENU(menu), NULL, NULL, set_popup_menu_position, event,
 			button, event_time );
@@ -638,11 +636,12 @@
 
 		hbox2 = gtk_hbox_new(TRUE, 5);
 
-		gtk_widget_set_size_request(hbox2, 200, 25);
+		gtk_widget_set_size_request(hbox2, 200, 40);
 
 		/* put in the pixmap and label for the 'OK' button */
 
-		button = gtkut_create_icon_button( ok_button_label, ok_xpm, window ); 
+		button = gtk_button_new_from_stock(GTK_STOCK_OK); 
+		gtk_button_set_label(GTK_BUTTON(button), ok_button_label); 
 
 		g_signal_connect(button, "clicked", G_CALLBACK(ok_callback), NULL);
 
@@ -651,7 +650,7 @@
 
 		/* now start on the cancel button */
 
-		button = gtkut_create_icon_button( _("Cancel"), cancel_xpm, window );
+		button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
 
 		g_signal_connect(button, "clicked", G_CALLBACK(cancel_callback), NULL);
 
@@ -678,3 +677,5 @@
 	g_signal_connect(window, "destroy", G_CALLBACK(destroy), NULL);
 	data_open = 1; 
 }
+
+

Index: edit_local_accounts.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/edit_local_accounts.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- edit_local_accounts.c	13 Feb 2009 14:38:10 -0000	1.31
+++ edit_local_accounts.c	26 Aug 2009 16:25:56 -0000	1.32
@@ -38,15 +38,6 @@
 #include "dialog.h"
 #include "add_contact_window.h"
 #include "mem_util.h"
-#include "gtk/gtkutils.h"
-
-#include "pixmaps/ok.xpm"
-#include "pixmaps/cancel.xpm"
-#include "pixmaps/tb_trash.xpm"
-#include "pixmaps/tb_edit.xpm"
-#include "pixmaps/tb_preferences.xpm"
-
-#include "pixmaps/help.xpm"
 
 
 enum {
@@ -593,7 +584,6 @@
 	GtkWidget *button_box;
 	GtkWidget *label;
 	guint label_key;
-	GtkWidget *iconwid;
 	GtkWidget *toolbar;
 	GtkToolItem *toolitem;
 	GtkToolItem *tool_sep;
@@ -601,8 +591,6 @@
 	LList *list;
 	LList *l;
 
-	GdkPixbuf *icon;
-
 	GtkAccelGroup *accel_group;
 	GtkCellRenderer *renderer;
 	GtkTreeViewColumn *column;
@@ -749,11 +737,8 @@
 
 	/*Add Button */
 
-#define TOOLBAR_APPEND(titem,in_xpm,label,tip,callback,cb_data) { \
-	icon = gdk_pixbuf_new_from_xpm_data((const char **) in_xpm); \
-	iconwid = gtk_image_new_from_pixbuf(icon); \
-	gtk_widget_show(iconwid); \
-	titem = gtk_tool_button_new(iconwid, label); \
+#define TOOLBAR_APPEND(titem,stock,tip,callback,cb_data) { \
+	titem = gtk_tool_button_new_from_stock(stock); \
 	gtk_tool_item_set_tooltip_text(titem, tip); \
 	g_signal_connect(titem, "clicked", G_CALLBACK(callback), cb_data); \
 	gtk_widget_show(GTK_WIDGET(titem)); \
@@ -768,24 +753,24 @@
 	gtk_toolbar_insert(GTK_TOOLBAR(toolbar), tool_sep, -1); \
 }
 
-	TOOLBAR_APPEND(toolitem, help_xpm, _("Help"), _("Help"), help_callback, NULL);
+	TOOLBAR_APPEND(toolitem, GTK_STOCK_HELP, _("Help"), help_callback, NULL);
 
 	TOOLBAR_APPEND_SEPARATOR(TRUE);
 
-	TOOLBAR_APPEND(toolitem, tb_preferences_xpm, _("Add"), _("Add Account"), add_callback, NULL);
+	TOOLBAR_APPEND(toolitem, GTK_STOCK_ADD, _("Add Account"), add_callback, NULL);
 
 	TOOLBAR_APPEND_SEPARATOR(FALSE);
 
 	/*Delete Button */
 
-	TOOLBAR_APPEND(del_button, tb_trash_xpm, _("Delete"), _("Delete Account"), remove_callback, NULL);
+	TOOLBAR_APPEND(del_button, GTK_STOCK_DELETE, _("Delete Account"), remove_callback, NULL);
 	
 	gtk_widget_set_sensitive(GTK_WIDGET(del_button), FALSE);
 	TOOLBAR_APPEND_SEPARATOR(FALSE);
 
 	/* Modify Button */
 
-	TOOLBAR_APPEND(mod_button, tb_edit_xpm, _("Modify"), _("Modify Account"), modify_callback, NULL);
+	TOOLBAR_APPEND(mod_button, GTK_STOCK_EDIT, _("Modify Account"), modify_callback, NULL);
 	
 	gtk_widget_set_sensitive(GTK_WIDGET(mod_button), FALSE);
 
@@ -793,13 +778,13 @@
 
 	/*Okay Button */
 
-	TOOLBAR_APPEND(toolitem, ok_xpm, _("Ok"), _("Ok"), ok_callback, NULL);
+	TOOLBAR_APPEND(toolitem, GTK_STOCK_OK, _("Ok"), ok_callback, NULL);
 	
 	TOOLBAR_APPEND_SEPARATOR(FALSE);
 
 	/*Cancel Button */
 
-	TOOLBAR_APPEND(toolitem, cancel_xpm, _("Cancel"), _("Cancel"), cancel_callback, NULL);
+	TOOLBAR_APPEND(toolitem, GTK_STOCK_CANCEL, _("Cancel"), cancel_callback, NULL);
 
 #undef TOOLBAR_APPEND_SEPARATOR
 #undef TOOLBAR_APPEND

Index: flash_window_title.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/flash_window_title.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- flash_window_title.c	4 Jun 2003 16:25:01 -0000	1.3
+++ flash_window_title.c	26 Aug 2009 16:25:56 -0000	1.4
@@ -5,7 +5,6 @@
 }
 #else
 #include "plugin_api.h"
-#include "gtk/gtkutils.h"
 #include <gdk/gdkwin32.h>
 
 void flash_title_stop(GdkWindow *window)

Index: info_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/info_window.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- info_window.c	2 Aug 2008 06:13:14 -0000	1.4
+++ info_window.c	26 Aug 2009 16:25:56 -0000	1.5
@@ -36,9 +36,6 @@
 #include "dialog.h"
 
 #include "gtk/html_text_buffer.h"
-#include "gtk/gtkutils.h"
-
-#include "pixmaps/cancel.xpm"
 
 
 static void iw_destroy_event(GtkWidget *widget, gpointer data)
@@ -69,16 +66,11 @@
 {
 	GtkWidget *vbox;
         GtkWidget *hbox;
-        GtkWidget *buttonbox;
-        GtkWidget *label;
 	GtkWidget *ok_button;
-        GtkWidget *iconwid;
-	GdkPixbuf *icon;
 	info_window * iw;
 
         vbox = gtk_vbox_new(FALSE,0);
         hbox = gtk_hbox_new(FALSE,0);
-        buttonbox = gtk_hbox_new(FALSE,0);
 
 	iw = malloc(sizeof(info_window));
         iw->info_type = -1;
@@ -109,25 +101,15 @@
 
         g_signal_connect(iw->window, "destroy", G_CALLBACK(iw_destroy_event), iw);
 
-        icon = gdk_pixbuf_new_from_xpm_data( (const char **) cancel_xpm);
-	iconwid = gtk_image_new_from_pixbuf(icon);
-	gtk_widget_show(iconwid);
+	ok_button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
 
-        ok_button = gtk_button_new ();
         g_signal_connect(ok_button, "clicked", G_CALLBACK(iw_close_win), iw);
 
-        gtk_box_pack_start (GTK_BOX (buttonbox), iconwid,TRUE,TRUE,0);
-        label = gtk_label_new(_("Close"));
-        gtk_box_pack_start (GTK_BOX (buttonbox), label,TRUE,TRUE,5);
-        gtk_widget_show(buttonbox);
-        gtk_container_add(GTK_CONTAINER(ok_button), buttonbox);
- 
         gtk_box_pack_start(GTK_BOX(hbox), ok_button, TRUE,FALSE, 0);
         gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE,FALSE, 5);
 
 	gtk_container_add(GTK_CONTAINER(iw->window), vbox);
         gtk_widget_show(iw->info);
-        gtk_widget_show(label);
         gtk_widget_show(ok_button);
         gtk_widget_show(hbox);
  

Index: trigger.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/trigger.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- trigger.c	3 Aug 2007 20:38:41 -0000	1.8
+++ trigger.c	26 Aug 2009 16:25:56 -0000	1.9
@@ -35,10 +35,8 @@
 #include "util.h"
 #include "globals.h"
 #include "file_select.h"
-#include "ui_message_windows.h"
 #include "messages.h"
 
-#include "gtk/gtkutils.h"
 
 #include "pixmaps/tb_preferences.xpm"
 #include "pixmaps/cancel.xpm"

[Ayttm-commits] CVS: ayttm ChangeLog, 1.808, 1.809 configure.ac, 1.625, 1.626

[Siddhesh P. <sid...@us...>]

Update of /cvsroot/ayttm/ayttm
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv27447

Modified Files:
	ChangeLog configure.ac 
Log Message:

 * YMSG: Removed obsolete yahoo_refresh. Added a probable quirk to the buddy
 add logic. It's still not convincing though. Still seems to work erratically.
 * CORE: Replaced a lot of xpms with stock icons -- reduced bin size and
 they're prettier!
 * CORE: Removed obsolete src/gtk/message_windows.c



Index: ChangeLog
===================================================================
RCS file: /cvsroot/ayttm/ayttm/ChangeLog,v
retrieving revision 1.808
retrieving revision 1.809
diff -u -r1.808 -r1.809
--- ChangeLog	26 Aug 2009 09:30:36 -0000	1.808
+++ ChangeLog	26 Aug 2009 16:25:55 -0000	1.809
@@ -1,3 +1,16 @@
+* Wed Aug 26 2009 16:25 UTC [siddheshp]   0.5.0-134
+- ChangeLog, configure.ac, modules/importers/import_everybuddy.c,
+modules/yahoo2/yahoo.c, modules/yahoo2/libyahoo2/libyahoo2.c, po/POTFILES.in,
+src/Makefile.am, src/action.c, src/add_contact_window.c, src/away_window.c,
+src/edit_account_window.c, src/edit_contact_window.c, src/edit_group_window.c,
+src/edit_list_window.c, src/edit_local_accounts.c, src/flash_window_title.c,
+src/info_window.c, src/trigger.c:
+ * YMSG: Removed obsolete yahoo_refresh. Added a probable quirk to the buddy
+ add logic. It's still not convincing though. Still seems to work erratically.
+ * CORE: Replaced a lot of xpms with stock icons -- reduced bin size and
+ they're prettier!
+ * CORE: Removed obsolete src/gtk/message_windows.c
+
 * Wed Aug 26 2009 09:26 UTC [pstef]   0.5.0-133
 - ChangeLog, configure.ac, modules/aycryption/aycryption.c, src/chat_room.c,
 src/chat_window.c, src/crash.c, src/gtk/gtkspell.c, src/gtk/prefs_window.C

Index: configure.ac
===================================================================
RCS file: /cvsroot/ayttm/ayttm/configure.ac,v
retrieving revision 1.625
retrieving revision 1.626
diff -u -r1.625 -r1.626
--- configure.ac	26 Aug 2009 09:26:13 -0000	1.625
+++ configure.ac	26 Aug 2009 16:25:55 -0000	1.626
@@ -5,7 +5,7 @@
 AC_PREREQ(2.53)
 AC_CONFIG_SRCDIR(src/main.c)
 AM_INIT_AUTOMAKE([1.6 dist-bzip2 dist-zip])
-RELEASE=133
+RELEASE=134
 
 # This is to check modules/core binary compat
 # Bump it up when necessary only (query_callbacks change, struct change etc)

[Ayttm-commits] CVS: ayttm/modules/yahoo2/libyahoo2 libyahoo2.c, 1.53, 1.54

[Siddhesh P. <sid...@us...>]

Update of /cvsroot/ayttm/ayttm/modules/yahoo2/libyahoo2
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv27447/modules/yahoo2/libyahoo2

Modified Files:
	libyahoo2.c 
Log Message:

 * YMSG: Removed obsolete yahoo_refresh. Added a probable quirk to the buddy
 add logic. It's still not convincing though. Still seems to work erratically.
 * CORE: Replaced a lot of xpms with stock icons -- reduced bin size and
 they're prettier!
 * CORE: Removed obsolete src/gtk/message_windows.c



Index: libyahoo2.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/yahoo2/libyahoo2/libyahoo2.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- libyahoo2.c	20 Aug 2009 12:49:36 -0000	1.53
+++ libyahoo2.c	26 Aug 2009 16:25:56 -0000	1.54
@@ -1804,9 +1804,6 @@
 	char *who = NULL;
 	char *msg = NULL;
 	int online = -1;
-	int away = 0;
-	int idle = 0;
-	int mobile = 0;
 
 	YList *l;
 
@@ -1901,8 +1898,6 @@
 			status = strtol(pair->value, NULL, 10);
 	}
 
-	yahoo_dump_unhandled(pkt);
-
 	if(!who)
 		return;
 	if(!where)
@@ -1915,7 +1910,13 @@
 
 	yd->buddies = y_list_append(yd->buddies, bud);
 
-/*	YAHOO_CALLBACK(ext_yahoo_status_changed)(yd->client_id, who, status, NULL, (status==YAHOO_STATUS_AVAILABLE?0:1)); */
+	/* A non-zero status (i've seen 2) seems to mean the buddy is already 
+	 * added and is online */
+	if(status) {
+		LOG(("Setting online see packet for info"));
+		yahoo_dump_unhandled(pkt);
+		YAHOO_CALLBACK(ext_yahoo_status_changed)(yd->client_id, who, YAHOO_STATUS_AVAILABLE, NULL, 0, 0, 0);
+	}
 }
 
 static void yahoo_process_buddydel(struct yahoo_input_data *yid, struct yahoo_packet *pkt)

[Ayttm-commits] CVS: ayttm/src/gtk message_windows.c,1.2,NONE

[Siddhesh P. <sid...@us...>]

Update of /cvsroot/ayttm/ayttm/src/gtk
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv27447/src/gtk

Removed Files:
	message_windows.c 
Log Message:

 * YMSG: Removed obsolete yahoo_refresh. Added a probable quirk to the buddy
 add logic. It's still not convincing though. Still seems to work erratically.
 * CORE: Replaced a lot of xpms with stock icons -- reduced bin size and
 they're prettier!
 * CORE: Removed obsolete src/gtk/message_windows.c



--- message_windows.c DELETED ---

[Ayttm-commits] CVS: ayttm/modules/yahoo2 yahoo.c,1.109,1.110

[Siddhesh P. <sid...@us...>]

Update of /cvsroot/ayttm/ayttm/modules/yahoo2
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv27447/modules/yahoo2

Modified Files:
	yahoo.c 
Log Message:

 * YMSG: Removed obsolete yahoo_refresh. Added a probable quirk to the buddy
 add logic. It's still not convincing though. Still seems to work erratically.
 * CORE: Replaced a lot of xpms with stock icons -- reduced bin size and
 they're prettier!
 * CORE: Removed obsolete src/gtk/message_windows.c



Index: yahoo.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/yahoo2/yahoo.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- yahoo.c	18 Aug 2009 12:25:29 -0000	1.109
+++ yahoo.c	26 Aug 2009 16:25:56 -0000	1.110
@@ -2796,7 +2796,7 @@
 		yahoo_add_buddy(ylad->id, ea->handle, ea->account_contact->group->name, NULL);
 		eb_yahoo_set_buddy_nick(ylad, &b, ea->account_contact->nick);
 	}
-	yahoo_refresh(ylad->id);
+	/* yahoo_refresh(ylad->id);*/
 }
 
 static void eb_yahoo_del_user(eb_account * ea)

[Ayttm-commits] CVS: ayttm/po POTFILES.in,1.17,1.18

[Siddhesh P. <sid...@us...>]

Update of /cvsroot/ayttm/ayttm/po
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv27447/po

Modified Files:
	POTFILES.in 
Log Message:

 * YMSG: Removed obsolete yahoo_refresh. Added a probable quirk to the buddy
 add logic. It's still not convincing though. Still seems to work erratically.
 * CORE: Replaced a lot of xpms with stock icons -- reduced bin size and
 they're prettier!
 * CORE: Removed obsolete src/gtk/message_windows.c



Index: POTFILES.in
===================================================================
RCS file: /cvsroot/ayttm/ayttm/po/POTFILES.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- POTFILES.in	19 Aug 2009 12:08:21 -0000	1.17
+++ POTFILES.in	26 Aug 2009 16:25:56 -0000	1.18
@@ -34,7 +34,6 @@
 src/gtk/about_window.c
 src/gtk/gtkspell.c
 src/gtk/log_window.C
-src/gtk/message_windows.c
 src/gtk/prefs_window.C
 src/image_window.c
 src/info_window.c

[Ayttm-commits] CVS: ayttm ChangeLog,1.807,1.808

[Piotr S. <ps...@us...>]

Update of /cvsroot/ayttm/ayttm
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9376

Modified Files:
	ChangeLog 
Log Message:
Fixed recent entry

Index: ChangeLog
===================================================================
RCS file: /cvsroot/ayttm/ayttm/ChangeLog,v
retrieving revision 1.807
retrieving revision 1.808
diff -u -r1.807 -r1.808
--- ChangeLog	26 Aug 2009 09:26:13 -0000	1.807
+++ ChangeLog	26 Aug 2009 09:30:36 -0000	1.808
@@ -1,4 +1,4 @@
-* Wed Aug 26 2009  UTC [pstef]   0.5.0-133
+* Wed Aug 26 2009 09:26 UTC [pstef]   0.5.0-133
 - ChangeLog, configure.ac, modules/aycryption/aycryption.c, src/chat_room.c,
 src/chat_window.c, src/crash.c, src/gtk/gtkspell.c, src/gtk/prefs_window.C
 src/prefs.c, src/prefs.h, src/spellcheck.C:

[Ayttm-commits] CVS: ayttm/src/gtk gtkspell.c, 1.7, 1.8 prefs_window.C, 1.53, 1.54

[Piotr S. <ps...@us...>]

Update of /cvsroot/ayttm/ayttm/src/gtk
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv8990/src/gtk

Modified Files:
	gtkspell.c prefs_window.C 
Log Message:
 * Aspell takes place of pspell. This fixes #2830610
 * Call gpgme_check_version() before using gpgme_new(). Fixes #2831024

Index: gtkspell.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/gtk/gtkspell.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gtkspell.c	3 Aug 2007 20:38:42 -0000	1.7
+++ gtkspell.c	26 Aug 2009 09:26:14 -0000	1.8
@@ -1,6 +1,7 @@
 /* gtkspell - a spell-checking addon for GtkText
  * Copyright (c) 2000 Evan Martin.
  * Modified to use pspell by Philip S Tellis 2003/04/28
+ * Modified to use aspell by pigiron 2009/07/31
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Index: prefs_window.C
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/gtk/prefs_window.C,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- prefs_window.C	13 Aug 2009 20:20:42 -0000	1.53
+++ prefs_window.C	26 Aug 2009 09:26:14 -0000	1.54
@@ -45,7 +45,7 @@
 
 #include "gtkutils.h"
 
-#ifdef HAVE_LIBPSPELL
+#ifdef HAVE_LIBASPELL
 #include "spellcheck.h"
 #endif
 
@@ -1218,7 +1218,7 @@
 	GtkWidget *label = NULL;
 	GtkWidget *button = NULL;
 	
-#ifdef HAVE_LIBPSPELL
+#ifdef HAVE_LIBASPELL
 	hbox = gtk_hbox_new( FALSE, 0 );
 	gtk_widget_show( hbox );
 	
@@ -1313,7 +1313,7 @@
 	if ( ptr != NULL )
 		strncpy(m_prefs.font_face, ptr, MAX_PREF_LEN );
 		
-#ifdef HAVE_LIBPSPELL
+#ifdef HAVE_LIBASPELL
 	bool	needs_reload = false;
 	
 	if ( m_prefs.do_spell_checking )
@@ -1334,7 +1334,7 @@
 // SetActiveWidgets
 void	ay_chat_panel::SetActiveWidgets( void )
 {
-#ifdef HAVE_LIBPSPELL
+#ifdef HAVE_LIBASPELL
 	gtk_widget_set_sensitive( m_dictionary_entry, m_prefs.do_spell_checking );
 #endif
 }

[Ayttm-commits] CVS: ayttm/src chat_room.c, 1.77, 1.78 chat_window.c, 1.89, 1.90 crash.c, 1.12, 1.13 prefs.c, 1.42, 1.43 prefs.h, 1.20, 1.21 spellcheck.C, 1.6, 1.7

[Piotr S. <ps...@us...>]

Update of /cvsroot/ayttm/ayttm/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv8990/src

Modified Files:
	chat_room.c chat_window.c crash.c prefs.c prefs.h spellcheck.C 
Log Message:
 * Aspell takes place of pspell. This fixes #2830610
 * Call gpgme_check_version() before using gpgme_new(). Fixes #2831024

Index: chat_room.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/chat_room.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- chat_room.c	16 Aug 2009 21:08:29 -0000	1.77
+++ chat_room.c	26 Aug 2009 09:26:14 -0000	1.78
@@ -47,7 +47,7 @@
 #include "gtk/html_text_buffer.h"
 #include "gtk/gtkutils.h"
 
-#ifdef HAVE_LIBPSPELL
+#ifdef HAVE_LIBASPELL
 #include "gtk/gtkspell.h"
 #endif
 
@@ -1645,7 +1645,7 @@
 	gtk_text_view_set_editable(GTK_TEXT_VIEW(chat_room->entry), TRUE);
 	gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(chat_room->entry), GTK_WRAP_WORD_CHAR);
 
-#ifdef HAVE_LIBPSPELL
+#ifdef HAVE_LIBASPELL
 	if (iGetLocalPref("do_spell_checking"))
 		gtkspell_attach(GTK_TEXT_VIEW(chat_room->entry));
 #endif

Index: chat_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/chat_window.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- chat_window.c	16 Aug 2009 21:08:29 -0000	1.89
+++ chat_window.c	26 Aug 2009 09:26:14 -0000	1.90
@@ -62,7 +62,7 @@
 #include "gtk/html_text_buffer.h"
 #include "gtk/gtkutils.h"
 
-#ifdef HAVE_LIBPSPELL
+#ifdef HAVE_LIBASPELL
 #include "gtk/gtkspell.h"
 #endif
 
@@ -2123,7 +2123,7 @@
 	gtk_text_view_set_editable(GTK_TEXT_VIEW(cw->entry), TRUE);
 	gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(cw->entry), GTK_WRAP_WORD_CHAR);
 
-#ifdef HAVE_LIBPSPELL
+#ifdef HAVE_LIBASPELL
 	if (iGetLocalPref("do_spell_checking"))
 		gtkspell_attach(GTK_TEXT_VIEW(cw->entry));
 #endif

Index: crash.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/crash.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- crash.c	3 Aug 2007 20:38:41 -0000	1.12
+++ crash.c	26 Aug 2009 09:26:14 -0000	1.13
@@ -449,8 +449,8 @@
 #ifdef HAVE_ICONV
 		   " iconv"
 #endif
-#ifdef HAVE_LIBPSPELL
-		   " pspell"
+#ifdef HAVE_LIBASPELL
+		   " aspell"
 #endif
 	"");
 }

Index: prefs.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/prefs.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- prefs.c	13 Aug 2009 20:20:42 -0000	1.42
+++ prefs.c	26 Aug 2009 09:26:14 -0000	1.43
@@ -960,7 +960,7 @@
 	fprintf( fp, "do_smiley=%d\n", iGetLocalPref("do_smiley" ) );
 	fprintf( fp, "FontFace=%s\n", cGetLocalPref("FontFace") );
 	fprintf( fp, "encodings=%s\n", cGetLocalPref("encodings") );
-#ifdef HAVE_LIBPSPELL
+#ifdef HAVE_LIBASPELL
     fprintf( fp, "do_spell_checking=%d\n", iGetLocalPref("do_spell_checking") );
 	fprintf( fp, "spell_dictionary=%s\n", cGetLocalPref("spell_dictionary") );
 #endif
@@ -1055,7 +1055,7 @@
 	prefs->chat.do_auto_complete      = iGetLocalPref("do_auto_complete");
 	strncpy( prefs->chat.font_face, cGetLocalPref("FontFace"), MAX_PREF_LEN );
 
-#ifdef HAVE_LIBPSPELL
+#ifdef HAVE_LIBASPELL
 	prefs->chat.do_spell_checking     = iGetLocalPref("do_spell_checking");
 	strncpy( prefs->chat.spell_dictionary, cGetLocalPref("spell_dictionary"), MAX_PREF_LEN );
 #endif
@@ -1217,7 +1217,7 @@
 	iSetLocalPref( "do_auto_complete", inPrefs->chat.do_auto_complete );
 	cSetLocalPref( "FontFace", inPrefs->chat.font_face );
 	
-#ifdef HAVE_LIBPSPELL
+#ifdef HAVE_LIBASPELL
 	iSetLocalPref( "do_spell_checking", inPrefs->chat.do_spell_checking );
 	cSetLocalPref( "spell_dictionary", inPrefs->chat.spell_dictionary );
 #endif

Index: prefs.h
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/prefs.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- prefs.h	10 Aug 2008 15:08:57 -0000	1.20
+++ prefs.h	26 Aug 2009 09:26:14 -0000	1.21
@@ -75,7 +75,7 @@
 		int		do_auto_complete;
 		char	font_face[MAX_PREF_LEN];
 		
-		#ifdef HAVE_LIBPSPELL
+		#ifdef HAVE_LIBASPELL
 			int		do_spell_checking;
 			char	spell_dictionary[MAX_PREF_LEN];
 		#endif

Index: spellcheck.C
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/spellcheck.C,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- spellcheck.C	7 Jan 2004 05:28:44 -0000	1.6
+++ spellcheck.C	26 Aug 2009 09:26:14 -0000	1.7
@@ -26,10 +26,10 @@
 #include "spellcheck.h"
 #include <stddef.h>
 
-#ifdef HAVE_LIBPSPELL
+#ifdef HAVE_LIBASPELL
 
 #define USE_ORIGINAL_MANAGER_FUNCS
-#include <pspell/pspell.h>
+#include <aspell.h>
 #undef USE_ORIGINAL_MANAGER_FUNCS
 #include <stdlib.h>
 #include <string.h>
@@ -38,10 +38,10 @@
 #include "debug.h"
 
 class AySpellChecker {
-	PspellConfig *spell_config;
-	PspellCanHaveError * possible_err;
-	PspellManager * spell_checker;
-	const char * language;
+	AspellConfig *spell_config;
+	AspellCanHaveError *possible_err;
+	AspellSpeller *spell_checker;
+	const char *language;
 
 	public:
 
@@ -81,26 +81,26 @@
 
 AySpellChecker::AySpellChecker()
 {
-	spell_config = new_pspell_config();
+	spell_config = new_aspell_config();
 	reload();
 }
 
 void AySpellChecker::reload()
 {
 	if(!spell_config)
-		spell_config = new_pspell_config();
+		spell_config = new_aspell_config();
 
 	language = get_language();
-	pspell_config_replace(spell_config, "language-tag", language);
-	possible_err = new_pspell_manager(spell_config);
-	spell_checker=NULL;
-	if(pspell_error_number(possible_err) != 0) {
-		delete_pspell_config(spell_config);
-		eb_debug(DBG_CORE, "%s", pspell_error_message(possible_err));
-		spell_config=NULL;
-	} else {
-		spell_checker = to_pspell_manager(possible_err);
+	aspell_config_replace(spell_config, "lang", language);
+	possible_err = new_aspell_speller(spell_config);
+	spell_checker = NULL;
+	if (aspell_error_number(possible_err)) {
+		delete_aspell_config(spell_config);
+		eb_debug(DBG_CORE, "%s", aspell_error_message(possible_err));
+		spell_config = NULL;
 	}
+	else
+		spell_checker = to_aspell_speller(possible_err);
 }
 
 int AySpellChecker::check(const char * word)
@@ -108,7 +108,7 @@
 	if(!word || !spell_checker)
 		return 1;
 	else
-		return pspell_manager_check(spell_checker, word);
+		return aspell_speller_check(spell_checker, word, -1);
 }
 
 LList * AySpellChecker::suggest(const char * word)
@@ -119,11 +119,11 @@
 	LList * words = NULL;
 	const char *w;
 
-	const PspellWordList * suggestions = pspell_manager_suggest(spell_checker, word);
-	PspellStringEmulation * elements = pspell_word_list_elements(suggestions);
-	while( (w = pspell_string_emulation_next(elements)) != NULL)
+	const AspellWordList *suggestions = aspell_speller_suggest(spell_checker, word, -1);
+	AspellStringEnumeration *elements = aspell_word_list_elements(suggestions);
+	while ((w = aspell_string_enumeration_next(elements)))
 		words = l_list_append(words, strdup(w));
-	delete_pspell_string_emulation(elements);
+	delete_aspell_string_enumeration(elements);
 
 	return words;
 }
@@ -131,9 +131,9 @@
 AySpellChecker::~AySpellChecker()
 {
 	if(spell_checker)
-		delete_pspell_manager(spell_checker);
+		delete_aspell_speller(spell_checker);
 	if(spell_config)
-		delete_pspell_config(spell_config);
+		delete_aspell_config(spell_config);
 }
 
 

[Ayttm-commits] CVS: ayttm ChangeLog, 1.806, 1.807 configure.ac, 1.624, 1.625

[Piotr S. <ps...@us...>]

Update of /cvsroot/ayttm/ayttm
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv8990

Modified Files:
	ChangeLog configure.ac 
Log Message:
 * Aspell takes place of pspell. This fixes #2830610
 * Call gpgme_check_version() before using gpgme_new(). Fixes #2831024

Index: ChangeLog
===================================================================
RCS file: /cvsroot/ayttm/ayttm/ChangeLog,v
retrieving revision 1.806
retrieving revision 1.807
diff -u -r1.806 -r1.807
--- ChangeLog	24 Aug 2009 13:09:42 -0000	1.806
+++ ChangeLog	26 Aug 2009 09:26:13 -0000	1.807
@@ -1,3 +1,10 @@
+* Wed Aug 26 2009  UTC [pstef]   0.5.0-133
+- ChangeLog, configure.ac, modules/aycryption/aycryption.c, src/chat_room.c,
+src/chat_window.c, src/crash.c, src/gtk/gtkspell.c, src/gtk/prefs_window.C
+src/prefs.c, src/prefs.h, src/spellcheck.C:
+ * Aspell takes place of pspell. This fixes #2830610
+ * Call gpgme_check_version() before using gpgme_new(). Fixes #2831024
+
 * Mon Aug 24 2009 13:06 UTC [siddheshp]   0.5.0-132
 - ChangeLog, configure.ac, src/gtk/gtk_tree_view_tooltip.c,
 src/gtk/gtk_tree_view_tooltip.h:

Index: configure.ac
===================================================================
RCS file: /cvsroot/ayttm/ayttm/configure.ac,v
retrieving revision 1.624
retrieving revision 1.625
diff -u -r1.624 -r1.625
--- configure.ac	24 Aug 2009 12:12:11 -0000	1.624
+++ configure.ac	26 Aug 2009 09:26:13 -0000	1.625
@@ -5,7 +5,7 @@
 AC_PREREQ(2.53)
 AC_CONFIG_SRCDIR(src/main.c)
 AM_INIT_AUTOMAKE([1.6 dist-bzip2 dist-zip])
-RELEASE=131
+RELEASE=133
 
 # This is to check modules/core binary compat
 # Bump it up when necessary only (query_callbacks change, struct change etc)
@@ -106,14 +106,8 @@
 AC_CHECK_HEADERS([alloca.h argz.h arpa/inet.h malloc.h netdb.h netinet/in.h paths.h sgtty.h stddef.h sys/file.h sys/ioctl.h sys/param.h sys/poll.h sys/socket.h sys/time.h syslog.h termios.h utmp.h getopt.h])
 AC_CHECK_HEADERS([sys/utsname.h])
 
-#Checking for pspell
-AC_CHECK_HEADER([pspell/pspell.h], [have_pspell_header=yes], [have_pspell_header=no])
-AC_CHECK_LIB([pspell], [pspell_manager_check], [have_pspell=yes], [have_pspell=no])
-AC_CHECK_LIB([pspell], [aspell_speller_check], [have_aspell=yes], [have_aspell=no])
-
-if test "$have_pspell_header" = "no" || test "$have_aspell" = "no" && test "$have_pspell" = "no"; then
-	AC_MSG_WARN([PSpell not found. Ayttm will be built without spell check.])
-fi
+#Checking for aspell
+AC_CHECK_LIB([aspell], [aspell_speller_check])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_TYPE_PID_T

[Ayttm-commits] CVS: ayttm/modules/aycryption aycryption.c, 1.25, 1.26

[Piotr S. <ps...@us...>]

Update of /cvsroot/ayttm/ayttm/modules/aycryption
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv8990/modules/aycryption

Modified Files:
	aycryption.c 
Log Message:
 * Aspell takes place of pspell. This fixes #2830610
 * Call gpgme_check_version() before using gpgme_new(). Fixes #2831024

Index: aycryption.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/aycryption/aycryption.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- aycryption.c	19 Aug 2009 04:07:04 -0000	1.25
+++ aycryption.c	26 Aug 2009 09:26:14 -0000	1.26
@@ -109,6 +109,8 @@
 
 static int aycryption_init()
 {
+	gpgme_check_version(NULL);
+
 	input_list *il = g_new0(input_list, 1);
 	plugin_info.prefs = il;
 

[Ayttm-commits] CVS: ayttm/src/gtk gtk_tree_view_tooltip.c, 1.6, 1.7 gtk_tree_view_tooltip.h, 1.3, 1.4

[Siddhesh P. <sid...@us...>]

Update of /cvsroot/ayttm/ayttm/src/gtk
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23762/src/gtk

Modified Files:
	gtk_tree_view_tooltip.c gtk_tree_view_tooltip.h 
Log Message:

Memory leak fix -- take 2


Index: gtk_tree_view_tooltip.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/gtk/gtk_tree_view_tooltip.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gtk_tree_view_tooltip.c	24 Aug 2009 13:15:06 -0000	1.6
+++ gtk_tree_view_tooltip.c	24 Aug 2009 13:19:43 -0000	1.7
@@ -55,6 +55,7 @@
 
 	if(tooltip->source) {
 		g_source_remove(tooltip->source);
+		g_free(tooltip->data);
 		tooltip->source = 0;
 	}
 
@@ -224,6 +225,8 @@
 		cdata->tooltip = tooltip;
 		cdata->x = x;
 		cdata->y = y;
+
+		tooltip->data = cdata;
 		
 		tooltip->source = g_timeout_add(1000, tooltip_show_tip, cdata);
 		return;

Index: gtk_tree_view_tooltip.h
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/gtk/gtk_tree_view_tooltip.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gtk_tree_view_tooltip.h	24 Aug 2009 13:09:43 -0000	1.3
+++ gtk_tree_view_tooltip.h	24 Aug 2009 13:19:43 -0000	1.4
@@ -60,7 +60,9 @@
 	gint title_column;
 	gint tiptext_column;
 	gboolean enable_tips;
+
 	gint source;
+	gpointer data;
 };
 
 struct _GtkTreeViewTooltipClass

[Ayttm-commits] CVS: ayttm/src/gtk gtk_tree_view_tooltip.c, 1.5, 1.6

[Siddhesh P. <sid...@us...>]

Update of /cvsroot/ayttm/ayttm/src/gtk
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23385/src/gtk

Modified Files:
	gtk_tree_view_tooltip.c 
Log Message:

 Fixed memory leak that I just introduced


Index: gtk_tree_view_tooltip.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/gtk/gtk_tree_view_tooltip.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gtk_tree_view_tooltip.c	24 Aug 2009 13:09:43 -0000	1.5
+++ gtk_tree_view_tooltip.c	24 Aug 2009 13:15:06 -0000	1.6
@@ -86,6 +86,8 @@
 	int x = data->x;
 	int y = data->y;
 
+	g_free(data);
+
 	/* We don't need to re-create it if it already exists, just update it in that case */
 	if(!tooltip->window) {
 		hbox = gtk_hbox_new(FALSE, 0);

[Ayttm-commits] CVS: ayttm/src/gtk gtk_tree_view_tooltip.c, 1.4, 1.5 gtk_tree_view_tooltip.h, 1.2, 1.3

[Siddhesh P. <sid...@us...>]

Update of /cvsroot/ayttm/ayttm/src/gtk
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv22365/src/gtk

Modified Files:
	gtk_tree_view_tooltip.c gtk_tree_view_tooltip.h 
Log Message:

 * CORE: Added a delay to the status window tooltip popup


Index: gtk_tree_view_tooltip.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/gtk/gtk_tree_view_tooltip.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gtk_tree_view_tooltip.c	21 Oct 2007 05:37:46 -0000	1.4
+++ gtk_tree_view_tooltip.c	24 Aug 2009 13:09:43 -0000	1.5
@@ -41,6 +41,7 @@
 	tooltip->icon_column		= -1;
 	tooltip->title_column		= -1;
 	tooltip->tiptext_column		= -1;
+	tooltip->source			=  0;
 
 	tooltip->treeview	= NULL;
 	tooltip->active_path	= NULL;
@@ -52,6 +53,11 @@
 {
 	g_return_if_fail(tooltip!=NULL);
 
+	if(tooltip->source) {
+		g_source_remove(tooltip->source);
+		tooltip->source = 0;
+	}
+
 	if(tooltip->window && GTK_WIDGET_VISIBLE(tooltip->window))
 		gtk_widget_destroy(tooltip->window);
 
@@ -64,11 +70,21 @@
 }
 
 /* Shows the tooltip window */
-void tooltip_show_tip(GtkTreeViewTooltip *tooltip, int x, int y)
+typedef struct {
+	GtkTreeViewTooltip *tooltip;
+	int x;
+	int y;
+} CoordData;
+
+static gboolean tooltip_show_tip(void *d)
 {
 	GtkWidget *hbox = NULL;
 	GtkWidget *vbox = NULL;
 	GtkWidget *iconwid = NULL;
+	CoordData *data = d;
+	GtkTreeViewTooltip *tooltip = data->tooltip;
+	int x = data->x;
+	int y = data->y;
 
 	/* We don't need to re-create it if it already exists, just update it in that case */
 	if(!tooltip->window) {
@@ -98,6 +114,10 @@
 	gtk_window_move(GTK_WINDOW(tooltip->window), x, y);
 
 	gtk_widget_show(tooltip->window);
+
+	tooltip->source = 0;
+
+	return FALSE;
 }
 
 /* All the funny stuff happens here... showing and hiding of the tooltip and all that */
@@ -109,6 +129,14 @@
 		return;
 	
 	switch(event->type) {
+	case GDK_LEAVE_NOTIFY:
+	case GDK_BUTTON_PRESS:
+	case GDK_BUTTON_RELEASE:
+	case GDK_PROXIMITY_IN:
+	case GDK_SCROLL:
+	case GDK_DRAG_MOTION:
+		gtk_tree_view_tooltip_reset(tooltip);
+		return;
 	case GDK_MOTION_NOTIFY:
 	{	
 		GtkTreePath *path;
@@ -118,6 +146,7 @@
 		GdkRectangle rect;
 		int x, y, wx, wy;
 		gboolean tips_enabled;
+		CoordData *cdata = NULL;
 		
 		GtkTreeIter iter;
 		GtkTreeModel *model = gtk_tree_view_get_model(treeview);
@@ -133,12 +162,14 @@
 		}
 		
 		/* Have we moved on to the next row? */
-		if(tooltip->window && tooltip->active_path &&
+		if(tooltip->active_path &&
 		   !gtk_tree_path_compare(tooltip->active_path, path))
 		{
 			return;
 		}
 		
+		gtk_tree_view_tooltip_reset(tooltip);
+
 		gtk_tree_path_free(tooltip->active_path);
 		tooltip->active_path = gtk_tree_path_copy(path);
 		gtk_tree_path_free(path);
@@ -148,10 +179,8 @@
 			gtk_tree_model_get(model, &iter,
 					   tooltip->tip_flag_column, &tips_enabled, -1);
 			
-			if(!tips_enabled) {
-				gtk_tree_view_tooltip_reset(tooltip);
+			if(!tips_enabled)
 				return;
-			}
 		}
 		if(tooltip->icon_column!=-1) {
 			gtk_tree_model_get(model, &iter,
@@ -188,17 +217,15 @@
 		
 		y = eventmotion->y_root + rect.height - eventmotion->y + rect.y;
 		x = eventmotion->x_root - eventmotion->x + rect.width/2;
+
+		cdata = g_new0(CoordData, 1);
+		cdata->tooltip = tooltip;
+		cdata->x = x;
+		cdata->y = y;
 		
-		tooltip_show_tip(tooltip, x, y);
+		tooltip->source = g_timeout_add(1000, tooltip_show_tip, cdata);
 		return;
 	}
-	case GDK_LEAVE_NOTIFY:
-	case GDK_BUTTON_PRESS:
-	case GDK_BUTTON_RELEASE:
-	case GDK_PROXIMITY_IN:
-	case GDK_SCROLL:
-		gtk_tree_view_tooltip_reset(tooltip);
-		return;
 
 	default:
 		return;

Index: gtk_tree_view_tooltip.h
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/gtk/gtk_tree_view_tooltip.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gtk_tree_view_tooltip.h	3 Aug 2007 20:38:42 -0000	1.2
+++ gtk_tree_view_tooltip.h	24 Aug 2009 13:09:43 -0000	1.3
@@ -60,6 +60,7 @@
 	gint title_column;
 	gint tiptext_column;
 	gboolean enable_tips;
+	gint source;
 };
 
 struct _GtkTreeViewTooltipClass

[Ayttm-commits] CVS: ayttm ChangeLog,1.805,1.806

[Siddhesh P. <sid...@us...>]

Update of /cvsroot/ayttm/ayttm
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv22365

Modified Files:
	ChangeLog 
Log Message:

 * CORE: Added a delay to the status window tooltip popup


Index: ChangeLog
===================================================================
RCS file: /cvsroot/ayttm/ayttm/ChangeLog,v
retrieving revision 1.805
retrieving revision 1.806
diff -u -r1.805 -r1.806
--- ChangeLog	24 Aug 2009 12:12:10 -0000	1.805
+++ ChangeLog	24 Aug 2009 13:09:42 -0000	1.806
@@ -1,3 +1,8 @@
+* Mon Aug 24 2009 13:06 UTC [siddheshp]   0.5.0-132
+- ChangeLog, configure.ac, src/gtk/gtk_tree_view_tooltip.c,
+src/gtk/gtk_tree_view_tooltip.h:
+ * CORE: Added a delay to the status window tooltip popup
+
 * Mon Aug 24 2009 12:10 UTC [siddheshp]   0.5.0-131
 - ChangeLog, configure.ac, modules/msn2/libmsn2/msn-account.h,
 modules/msn2/libmsn2/msn-commands.c, modules/msn2/libmsn2/msn-connection.c,

[Ayttm-commits] CVS: ayttm ChangeLog, 1.804, 1.805 configure.ac, 1.623, 1.624

[Siddhesh P. <sid...@us...>]

Update of /cvsroot/ayttm/ayttm
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv18991

Modified Files:
	ChangeLog configure.ac 
Log Message:

MSN: Added copyright/license information in sources


Index: ChangeLog
===================================================================
RCS file: /cvsroot/ayttm/ayttm/ChangeLog,v
retrieving revision 1.804
retrieving revision 1.805
diff -u -r1.804 -r1.805
--- ChangeLog	21 Aug 2009 07:35:59 -0000	1.804
+++ ChangeLog	24 Aug 2009 12:12:10 -0000	1.805
@@ -1,3 +1,18 @@
+* Mon Aug 24 2009 12:10 UTC [siddheshp]   0.5.0-131
+- ChangeLog, configure.ac, modules/msn2/libmsn2/msn-account.h,
+modules/msn2/libmsn2/msn-commands.c, modules/msn2/libmsn2/msn-connection.c,
+modules/msn2/libmsn2/msn-connection.h, modules/msn2/libmsn2/msn-contacts.c,
+modules/msn2/libmsn2/msn-contacts.h, modules/msn2/libmsn2/msn-errors.c,
+modules/msn2/libmsn2/msn-errors.h, modules/msn2/libmsn2/msn-ext.h,
+modules/msn2/libmsn2/msn-http.c, modules/msn2/libmsn2/msn-http.h,
+modules/msn2/libmsn2/msn-login.c, modules/msn2/libmsn2/msn-login.h,
+modules/msn2/libmsn2/msn-message.c, modules/msn2/libmsn2/msn-message.h,
+modules/msn2/libmsn2/msn-sb.c, modules/msn2/libmsn2/msn-sb.h,
+modules/msn2/libmsn2/msn-soap.c, modules/msn2/libmsn2/msn-soap.h,
+modules/msn2/libmsn2/msn-util.c, modules/msn2/libmsn2/msn-util.h,
+modules/msn2/libmsn2/msn.c, modules/msn2/libmsn2/msn.h:
+ * MSN: Added copyright/license information in sources
+
 * Fri Aug 21 2009 07:35 UTC [siddheshp]   0.5.0-130
 - ChangeLog, configure.ac, modules/jabber/libEBjabber.c, src/about.c:
  * CORE: Actually show Piotr's name in the about box

Index: configure.ac
===================================================================
RCS file: /cvsroot/ayttm/ayttm/configure.ac,v
retrieving revision 1.623
retrieving revision 1.624
diff -u -r1.623 -r1.624
--- configure.ac	21 Aug 2009 07:35:59 -0000	1.623
+++ configure.ac	24 Aug 2009 12:12:11 -0000	1.624
@@ -5,7 +5,7 @@
 AC_PREREQ(2.53)
 AC_CONFIG_SRCDIR(src/main.c)
 AM_INIT_AUTOMAKE([1.6 dist-bzip2 dist-zip])
-RELEASE=130
+RELEASE=131
 
 # This is to check modules/core binary compat
 # Bump it up when necessary only (query_callbacks change, struct change etc)

[Ayttm-commits] CVS: ayttm/src about.c,1.8,1.9

[Siddhesh P. <sid...@us...>]

Update of /cvsroot/ayttm/ayttm/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv17073/src

Modified Files:
	about.c 
Log Message:

 * CORE: Actually show Piotr's name in the about box
 * JAB: Keep conn as non-null to allow underlying connection to be freed
 * JAB: No need to abort if conn is NULL, only register your protest in the 
 debug messages.


Index: about.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/about.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- about.c	17 Aug 2009 13:55:14 -0000	1.8
+++ about.c	21 Aug 2009 07:35:59 -0000	1.9
@@ -31,7 +31,7 @@
 
 /* Ayttm developers */
 
-#define	AYTTM_TEAM_SIZE	(6)
+#define	AYTTM_TEAM_SIZE	(7)
 
 static tDeveloperInfo sAyttmDevTeam[AYTTM_TEAM_SIZE] =
 {