pidgin-commits — DO NOT USE. See https://pidgin.im/cgi-bin/mailman/listinfo/commits

[Gaim-commits] SF.net SVN: gaim: [16895] trunk/console/gntblist.c

[<ebl...@us...>]

Revision: 16895
Author:   eblanton
Date:     2006-08-19 19:13:05 -0700 (Sat, 19 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16895&view=rev

Log Message:
-----------
Make the gntgaim blist a touch more friendly for 80x24 terminals, by
reducing its default height to 18 and removing a hrule.

Modified Paths:
--------------
    trunk/console/gntblist.c
Modified: trunk/console/gntblist.c
===================================================================
--- trunk/console/gntblist.c	2006-08-19 23:51:43 UTC (rev 16894)
+++ trunk/console/gntblist.c	2006-08-20 02:13:05 UTC (rev 16895)
@@ -1092,7 +1092,7 @@
 	gaim_prefs_add_none(PREF_ROOT);
 	gaim_prefs_add_none(PREF_ROOT "/size");
 	gaim_prefs_add_int(PREF_ROOT "/size/width", 20);
-	gaim_prefs_add_int(PREF_ROOT "/size/height", 20);
+	gaim_prefs_add_int(PREF_ROOT "/size/height", 18);
 	gaim_prefs_add_none(PREF_ROOT "/position");
 	gaim_prefs_add_int(PREF_ROOT "/position/x", 0);
 	gaim_prefs_add_int(PREF_ROOT "/position/y", 0);
@@ -1295,8 +1295,6 @@
 
 	gnt_box_add_widget(GNT_BOX(ggblist->window), ggblist->tree);
 
-	gnt_box_add_widget(GNT_BOX(ggblist->window), gnt_hline_new());
-
 	ggblist->status = gnt_combo_box_new();
 	gnt_box_add_widget(GNT_BOX(ggblist->window), ggblist->status);
 	ggblist->statustext = gnt_entry_new(NULL);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [16894] trunk/console/libgnt

[<sa...@us...>]

Revision: 16894
Author:   sadrul
Date:     2006-08-19 16:51:43 -0700 (Sat, 19 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16894&view=rev

Log Message:
-----------
Keybindings for GntEntry.

Modified Paths:
--------------
    trunk/console/libgnt/gntentry.c
    trunk/console/libgnt/gntkeys.h
Modified: trunk/console/libgnt/gntentry.c
===================================================================
--- trunk/console/libgnt/gntentry.c	2006-08-19 21:41:25 UTC (rev 16893)
+++ trunk/console/libgnt/gntentry.c	2006-08-19 23:51:43 UTC (rev 16894)
@@ -156,6 +156,83 @@
 	gnt_widget_queue_update(widget);
 }
 
+static void
+move_back(GntEntry *entry)
+{
+	if (entry->cursor <= entry->start)
+		return;
+	entry->cursor = g_utf8_find_prev_char(entry->start, entry->cursor);
+	if (entry->cursor < entry->scroll)
+		entry->scroll = entry->cursor;
+	entry_redraw(GNT_WIDGET(entry));
+}
+
+static void
+move_forward(GntEntry *entry)
+{
+	if (entry->cursor >= entry->end)
+		return;
+	entry->cursor = g_utf8_find_next_char(entry->cursor, NULL);
+	if (g_utf8_pointer_to_offset(entry->scroll, entry->cursor) >= GNT_WIDGET(entry)->priv.width)
+		entry->scroll = g_utf8_find_next_char(entry->scroll, NULL);
+	entry_redraw(GNT_WIDGET(entry));
+}
+
+static void
+backspace(GntEntry *entry)
+{
+	int len;
+
+	if (entry->cursor <= entry->start)
+		return;
+	
+	len = entry->cursor - g_utf8_find_prev_char(entry->start, entry->cursor);
+	entry->cursor -= len;
+	memmove(entry->cursor, entry->cursor + len, entry->end - entry->cursor);
+	entry->end -= len;
+
+	if (entry->scroll > entry->start)
+		entry->scroll = g_utf8_find_prev_char(entry->start, entry->scroll);
+
+	entry_redraw(GNT_WIDGET(entry));
+	if (entry->ddown)
+		show_suggest_dropdown(entry);
+}
+
+static void
+delkey(GntEntry *entry)
+{
+	int len;
+
+	if (entry->cursor >= entry->end)
+		return;
+	
+	len = g_utf8_find_next_char(entry->cursor, NULL) - entry->cursor;
+	memmove(entry->cursor, entry->cursor + len, entry->end - entry->cursor - len + 1);
+	entry->end -= len;
+	entry_redraw(GNT_WIDGET(entry));
+
+	if (entry->ddown)
+		show_suggest_dropdown(entry);
+}
+
+static void
+move_start(GntEntry *entry)
+{
+	entry->scroll = entry->cursor = entry->start;
+	entry_redraw(GNT_WIDGET(entry));
+}
+
+static void
+move_end(GntEntry *entry)
+{
+	entry->cursor = entry->end;
+	/* This should be better than this */
+	while (g_utf8_pointer_to_offset(entry->scroll, entry->cursor) >= GNT_WIDGET(entry)->priv.width)
+		entry->scroll = g_utf8_find_next_char(entry->scroll, NULL);
+	entry_redraw(GNT_WIDGET(entry));
+}
+
 static gboolean
 gnt_entry_key_pressed(GntWidget *widget, const char *text)
 {
@@ -165,32 +242,17 @@
 	{
 		if (strcmp(text + 1, GNT_KEY_DEL) == 0 && entry->cursor < entry->end)
 		{
-			int len = g_utf8_find_next_char(entry->cursor, NULL) - entry->cursor;
-			memmove(entry->cursor, entry->cursor + len, entry->end - entry->cursor - len + 1);
-			entry->end -= len;
-			entry_redraw(widget);
-
-			if (entry->ddown)
-				show_suggest_dropdown(entry);
-
+			delkey(entry);
 			return TRUE;
 		}
-		else if (strcmp(text + 1, GNT_KEY_LEFT) == 0 && entry->cursor > entry->start)
+		else if (strcmp(text + 1, GNT_KEY_LEFT) == 0)
 		{
-			entry->cursor = g_utf8_find_prev_char(entry->start, entry->cursor);
-			if (entry->cursor < entry->scroll)
-				entry->scroll = entry->cursor;
-			entry_redraw(widget);
-
+			move_back(entry);
 			return TRUE;
 		}
-		else if (strcmp(text + 1, GNT_KEY_RIGHT) == 0 && entry->cursor < entry->end)
+		else if (strcmp(text + 1, GNT_KEY_RIGHT) == 0)
 		{
-			entry->cursor = g_utf8_find_next_char(entry->cursor, NULL);
-			if (g_utf8_pointer_to_offset(entry->scroll, entry->cursor) >= widget->priv.width)
-				entry->scroll = g_utf8_find_next_char(entry->scroll, NULL);
-			entry_redraw(widget);
-
+			move_forward(entry);
 			return TRUE;
 		}
 		else if (strcmp(text + 1, GNT_KEY_CTRL_DOWN) == 0 && entry->histlength)
@@ -322,22 +384,57 @@
 		}
 		else
 		{
-			/* Backspace is here */
 			if (strcmp(text, GNT_KEY_BACKSPACE) == 0 && entry->cursor > entry->start)
 			{
-				int len = entry->cursor - g_utf8_find_prev_char(entry->start, entry->cursor);
-				entry->cursor -= len;
-				memmove(entry->cursor, entry->cursor + len, entry->end - entry->cursor);
-				entry->end -= len;
-
-				if (entry->scroll > entry->start)
-					entry->scroll = g_utf8_find_prev_char(entry->start, entry->scroll);
-
+				backspace(entry);
+				return TRUE;
+			}
+			else if (strcmp(text, GNT_KEY_CTRL_A) == 0)
+			{
+				move_start(entry);
+				return TRUE;
+			}
+			else if (strcmp(text, GNT_KEY_CTRL_B) == 0)
+			{
+				move_back(entry);
+				return TRUE;
+			}
+			else if (strcmp(text, GNT_KEY_CTRL_D) == 0)
+			{
+				delkey(entry);
+				return TRUE;
+			}
+			else if (strcmp(text, GNT_KEY_CTRL_E) == 0)
+			{
+				move_end(entry);
+				return TRUE;
+			}
+			else if (strcmp(text, GNT_KEY_CTRL_F) == 0)
+			{
+				move_forward(entry);
+				return TRUE;
+			}
+			else if (strcmp(text, GNT_KEY_CTRL_H) == 0)
+			{
+				backspace(entry);
+				return TRUE;
+			}
+			else if (strcmp(text, GNT_KEY_CTRL_K) == 0)
+			{
+				entry->end = entry->cursor;
+				memset(entry->end, '\0', entry->buffer - (entry->end - entry->start));
 				entry_redraw(widget);
-				if (entry->ddown)
-					show_suggest_dropdown(entry);
 				return TRUE;
 			}
+			else if (strcmp(text, GNT_KEY_CTRL_U) == 0)
+			{
+				memmove(entry->start, entry->cursor, entry->end - entry->cursor);
+				entry->end -= (entry->cursor - entry->start);
+				entry->cursor = entry->scroll = entry->start;
+				memset(entry->end, '\0', entry->buffer - (entry->end - entry->start));
+				entry_redraw(widget);
+				return TRUE;
+			}
 		}
 	}
 

Modified: trunk/console/libgnt/gntkeys.h
===================================================================
--- trunk/console/libgnt/gntkeys.h	2006-08-19 21:41:25 UTC (rev 16893)
+++ trunk/console/libgnt/gntkeys.h	2006-08-19 23:51:43 UTC (rev 16894)
@@ -22,6 +22,29 @@
 #define GNT_KEY_BACKSPACE "\177"
 #define GNT_KEY_DEL    "[3~"
 
+#define GNT_KEY_CTRL_A     "\001"
+#define GNT_KEY_CTRL_B     "\002"
+#define GNT_KEY_CTRL_D     "\004"
+#define GNT_KEY_CTRL_E     "\005"
+#define GNT_KEY_CTRL_F     "\006"
+#define GNT_KEY_CTRL_G     "\007"
+#define GNT_KEY_CTRL_H     "\010"
+#define GNT_KEY_CTRL_I     "\011"
+#define GNT_KEY_CTRL_J     "\012"
+#define GNT_KEY_CTRL_K     "\013"
+#define GNT_KEY_CTRL_L     "\014"
+#define GNT_KEY_CTRL_M     "\012"
+#define GNT_KEY_CTRL_N     "\016"
+#define GNT_KEY_CTRL_O     "\017"
+#define GNT_KEY_CTRL_P     "\020"
+#define GNT_KEY_CTRL_R     "\022"
+#define GNT_KEY_CTRL_T     "\024"
+#define GNT_KEY_CTRL_U     "\025"
+#define GNT_KEY_CTRL_V     "\026"
+#define GNT_KEY_CTRL_W     "\027"
+#define GNT_KEY_CTRL_X     "\030"
+#define GNT_KEY_CTRL_Y     "\031"
+
 /**
  * This will do stuff with the terminal settings and stuff.
  */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [16893] trunk/libgaim/privacy.c

[<the...@us...>]

Revision: 16893
Author:   thekingant
Date:     2006-08-19 14:41:25 -0700 (Sat, 19 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16893&view=rev

Log Message:
-----------
Eradicate two compile warnings

Modified Paths:
--------------
    trunk/libgaim/privacy.c
Modified: trunk/libgaim/privacy.c
===================================================================
--- trunk/libgaim/privacy.c	2006-08-19 20:52:43 UTC (rev 16892)
+++ trunk/libgaim/privacy.c	2006-08-19 21:41:25 UTC (rev 16893)
@@ -76,7 +76,7 @@
 						   gboolean local_only)
 {
 	GSList *l;
-	char *name;
+	const char *name;
 	GaimBuddy *buddy;
 
 	g_return_val_if_fail(account != NULL, FALSE);
@@ -158,20 +158,21 @@
 						 gboolean local_only)
 {
 	GSList *l;
+	const char *normalized;
 	char *name;
 	GaimBuddy *buddy;
 
 	g_return_val_if_fail(account != NULL, FALSE);
 	g_return_val_if_fail(who     != NULL, FALSE);
 
-	name = gaim_normalize(account, who);
+	normalized = gaim_normalize(account, who);
 
 	for (l = account->deny; l != NULL; l = l->next) {
-		if (!gaim_utf8_strcasecmp(name, (char *)l->data))
+		if (!gaim_utf8_strcasecmp(normalized, (char *)l->data))
 			break;
 	}
 
-	buddy = gaim_find_buddy(account, name);
+	buddy = gaim_find_buddy(account, normalized);
 
 	if (l == NULL)
 		return FALSE;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [16892] tags/v2_0_0beta3_1/

[<the...@us...>]

Revision: 16892
Author:   thekingant
Date:     2006-08-19 13:52:43 -0700 (Sat, 19 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16892&view=rev

Log Message:
-----------
Tagging Gaim release 2.0.0beta3.1

Added Paths:
-----------
    tags/v2_0_0beta3_1/
Copied: tags/v2_0_0beta3_1 (from rev 16891, branches/v2_0_0beta3_1)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [16891] branches/v2_0_0beta3_1/gaim/gaim.spec.in

[<the...@us...>]

Revision: 16891
Author:   thekingant
Date:     2006-08-19 13:49:38 -0700 (Sat, 19 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16891&view=rev

Log Message:
-----------
This check failed when using a beta number with a decimal point

Modified Paths:
--------------
    branches/v2_0_0beta3_1/gaim/gaim.spec.in
Modified: branches/v2_0_0beta3_1/gaim/gaim.spec.in
===================================================================
--- branches/v2_0_0beta3_1/gaim/gaim.spec.in	2006-08-19 20:31:34 UTC (rev 16890)
+++ branches/v2_0_0beta3_1/gaim/gaim.spec.in	2006-08-19 20:49:38 UTC (rev 16891)
@@ -8,7 +8,7 @@
 #       way to comment it out is to replace the % with #
 %define beta 3.1
 
-%if 0%{?beta}
+%if "0%{?beta}" != "0"
 %define gaimver %(echo "@VERSION@"|sed -e 's/cvs//; s/beta.*//')
 %else
 %define gaimver @VERSION@


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [16890] branches/v2_0_0beta3_1/gaim/src

[<the...@us...>]

Revision: 16890
Author:   thekingant
Date:     2006-08-19 13:31:34 -0700 (Sat, 19 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16890&view=rev

Log Message:
-----------
Backport SVN revision 16445 from HEAD to v2_0_0beta3_1
Original commit message:

Fix a crash bug on some systems (mostly amd64) caused by using a va_list
twice.  My bad!  Thanks to Kevin Stange and Vincent Ho for noticing this
and suggesting the cause.  Vincent's IRC handle reminds me of a Harvey
Danger song.

ViewCVS Links:
-------------
    http://svn.sourceforge.net/gaim/?rev=16445&view=rev

Modified Paths:
--------------
    branches/v2_0_0beta3_1/gaim/src/debug.c
    branches/v2_0_0beta3_1/gaim/src/debug.h
    branches/v2_0_0beta3_1/gaim/src/gtkdebug.c
Modified: branches/v2_0_0beta3_1/gaim/src/debug.c
===================================================================
--- branches/v2_0_0beta3_1/gaim/src/debug.c	2006-08-19 20:02:26 UTC (rev 16889)
+++ branches/v2_0_0beta3_1/gaim/src/debug.c	2006-08-19 20:31:34 UTC (rev 16890)
@@ -46,15 +46,21 @@
 				 const char *format, va_list args)
 {
 	GaimDebugUiOps *ops;
+	char *arg_s = NULL;
 
 	g_return_if_fail(level != GAIM_DEBUG_ALL);
 	g_return_if_fail(format != NULL);
 
+	ops = gaim_debug_get_ui_ops();
+
+	if (!debug_enabled && ((ops == NULL) || (ops->print == NULL)))
+		return;
+
+	arg_s = g_strdup_vprintf(format, args);
+
 	if (debug_enabled) {
-		gchar *arg_s, *ts_s;
+		gchar *ts_s;
 
-		arg_s = g_strdup_vprintf(format, args);
-
 		if ((category != NULL) &&
 			(gaim_prefs_exists("/core/debug/timestamps")) &&
 			(gaim_prefs_get_bool("/core/debug/timestamps"))) {
@@ -72,14 +78,13 @@
 		else
 			g_print("%s%s: %s", ts_s, category, arg_s);
 
-		g_free(arg_s);
 		g_free(ts_s);
 	}
 
-	ops = gaim_debug_get_ui_ops();
+	if (ops != NULL && ops->print != NULL)
+		ops->print(level, category, arg_s);
 
-	if (ops != NULL && ops->print != NULL)
-		ops->print(level, category, format, args);
+	g_free(arg_s);
 }
 
 void

Modified: branches/v2_0_0beta3_1/gaim/src/debug.h
===================================================================
--- branches/v2_0_0beta3_1/gaim/src/debug.h	2006-08-19 20:02:26 UTC (rev 16889)
+++ branches/v2_0_0beta3_1/gaim/src/debug.h	2006-08-19 20:31:34 UTC (rev 16890)
@@ -48,7 +48,7 @@
 typedef struct
 {
 	void (*print)(GaimDebugLevel level, const char *category,
-				  const char *format, va_list args);
+				  const char *arg_s);
 } GaimDebugUiOps;
 
 #ifdef __cplusplus

Modified: branches/v2_0_0beta3_1/gaim/src/gtkdebug.c
===================================================================
--- branches/v2_0_0beta3_1/gaim/src/gtkdebug.c	2006-08-19 20:02:26 UTC (rev 16889)
+++ branches/v2_0_0beta3_1/gaim/src/gtkdebug.c	2006-08-19 20:31:34 UTC (rev 16890)
@@ -931,13 +931,13 @@
 
 static void
 gaim_gtk_debug_print(GaimDebugLevel level, const char *category,
-					 const char *format, va_list args)
+					 const char *arg_s)
 {
 #ifdef HAVE_REGEX_H
 	GtkTreeIter iter;
 #endif /* HAVE_REGEX_H */
 	gboolean timestamps;
-	gchar *arg_s, *ts_s;
+	gchar *ts_s;
 	gchar *esc_s, *cat_s, *tmp, *s;
 
 	if (!gaim_prefs_get_bool("/gaim/gtk/debug/enabled") ||
@@ -948,8 +948,6 @@
 
 	timestamps = gaim_prefs_get_bool("/core/debug/timestamps");
 
-	arg_s = g_strdup_vprintf(format, args);
-
 	/*
 	 * For some reason we only print the timestamp if category is
 	 * not NULL.  Why the hell do we do that?  --Mark
@@ -971,8 +969,6 @@
 
 	esc_s = g_markup_escape_text(arg_s, -1);
 
-	g_free(arg_s);
-
 	s = g_strdup_printf("<font color=\"%s\">%s%s%s</font>",
 						debug_fg_colors[level], ts_s, cat_s, esc_s);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [16889] trunk/configure.ac

[<sa...@us...>]

Revision: 16889
Author:   sadrul
Date:     2006-08-19 13:02:26 -0700 (Sat, 19 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16889&view=rev

Log Message:
-----------
These needs to be here.

Modified Paths:
--------------
    trunk/configure.ac
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-08-19 17:11:39 UTC (rev 16888)
+++ trunk/configure.ac	2006-08-19 20:02:26 UTC (rev 16889)
@@ -1854,6 +1854,8 @@
 		   libgaim/protocols/yahoo/Makefile
 		   libgaim/protocols/zephyr/Makefile
 		   console/Makefile
+		   console/libgnt/Makefile
+		   console/libgnt/gnt.pc
 		   console/plugins/Makefile
 		   po/Makefile.in
 		   gaim.pc


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [16888] trunk/console/libgnt

[<sa...@us...>]

Revision: 16888
Author:   sadrul
Date:     2006-08-19 10:11:39 -0700 (Sat, 19 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16888&view=rev

Log Message:
-----------
GKeyFile is in glib-2.6 and above.

Modified Paths:
--------------
    trunk/console/libgnt/gntcolors.c
    trunk/console/libgnt/gntcolors.h
    trunk/console/libgnt/gntstyle.c
Modified: trunk/console/libgnt/gntcolors.c
===================================================================
--- trunk/console/libgnt/gntcolors.c	2006-08-19 16:48:46 UTC (rev 16887)
+++ trunk/console/libgnt/gntcolors.c	2006-08-19 17:11:39 UTC (rev 16888)
@@ -106,6 +106,7 @@
 	return color;
 }
 
+#if GLIB_CHECK_VERSION(2,6,0)
 void gnt_colors_parse(GKeyFile *kfile)
 {
 	GError *error = NULL;
@@ -202,3 +203,4 @@
 	g_strfreev(keys);
 }
 
+#endif  /* GKeyFile */

Modified: trunk/console/libgnt/gntcolors.h
===================================================================
--- trunk/console/libgnt/gntcolors.h	2006-08-19 16:48:46 UTC (rev 16887)
+++ trunk/console/libgnt/gntcolors.h	2006-08-19 17:11:39 UTC (rev 16888)
@@ -36,8 +36,10 @@
 
 void gnt_uninit_colors();
 
+#if GLIB_CHECK_VERSION(2,6,0)
 void gnt_colors_parse(GKeyFile *kfile);
 
 void gnt_color_pairs_parse(GKeyFile *kfile);
+#endif
 
 #endif

Modified: trunk/console/libgnt/gntstyle.c
===================================================================
--- trunk/console/libgnt/gntstyle.c	2006-08-19 16:48:46 UTC (rev 16887)
+++ trunk/console/libgnt/gntstyle.c	2006-08-19 17:11:39 UTC (rev 16888)
@@ -41,6 +41,7 @@
 	return bool_styles[style];
 }
 
+#if GLIB_CHECK_VERSION(2,6,0)
 static void
 read_general_style(GKeyFile *kfile)
 {
@@ -70,6 +71,7 @@
 		}
 	}
 }
+#endif
 
 void gnt_style_read_configure_file(const char *filename)
 {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [16887] branches/soc-2006-msnp13/src/protocols/msn

[<may...@us...>]

Revision: 16887
Author:   mayuan2006
Date:     2006-08-19 09:48:46 -0700 (Sat, 19 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16887&view=rev

Log Message:
-----------
work correct with yahoo

Modified Paths:
--------------
    branches/soc-2006-msnp13/src/protocols/msn/notification.c
    branches/soc-2006-msnp13/src/protocols/msn/soap.c
Modified: branches/soc-2006-msnp13/src/protocols/msn/notification.c
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/notification.c	2006-08-19 16:41:40 UTC (rev 16886)
+++ branches/soc-2006-msnp13/src/protocols/msn/notification.c	2006-08-19 16:48:46 UTC (rev 16887)
@@ -416,10 +416,11 @@
 	cmdproc = session->notification->cmdproc;
 	g_return_if_fail(msg     != NULL);
 	payload = msn_message_gen_payload(msg, &payload_len);
-	gaim_debug_info("MaYuan","send UUM,payload{%s}\n",payload);
+	gaim_debug_info("MaYuan","send UUM,payload{%s},strlen:%d,len:%d\n",
+		payload,strlen(payload),payload_len);
 	type = msg->type;
-	trans = msn_transaction_new(cmdproc, "UUM","%s 32 %d %d",msg->remote_user,type,strlen(payload));
-	msn_transaction_set_payload(trans, payload, strlen(payload));
+	trans = msn_transaction_new(cmdproc, "UUM","%s 32 %d %d",msg->remote_user,type,payload_len);
+	msn_transaction_set_payload(trans, payload, payload_len);
 	msn_cmdproc_send_trans(cmdproc, trans);
 }
 

Modified: branches/soc-2006-msnp13/src/protocols/msn/soap.c
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/soap.c	2006-08-19 16:41:40 UTC (rev 16886)
+++ branches/soc-2006-msnp13/src/protocols/msn/soap.c	2006-08-19 16:48:46 UTC (rev 16887)
@@ -356,7 +356,7 @@
 //			msn_soap_close(soapconn);
 #endif
 			/*Process the next queued SOAP request*/
-			msn_soap_post_head_request(soapconn);
+//			msn_soap_post_head_request(soapconn);
 	}
 	return;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [16886] trunk/console/libgnt/gntmain.c

[<sa...@us...>]

Revision: 16886
Author:   sadrul
Date:     2006-08-19 09:41:40 -0700 (Sat, 19 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16886&view=rev

Log Message:
-----------
Use STDIN_FILENO instead of 0 (does anyone know if they are different in some place?)

Modified Paths:
--------------
    trunk/console/libgnt/gntmain.c
Modified: trunk/console/libgnt/gntmain.c
===================================================================
--- trunk/console/libgnt/gntmain.c	2006-08-19 16:13:55 UTC (rev 16885)
+++ trunk/console/libgnt/gntmain.c	2006-08-19 16:41:40 UTC (rev 16886)
@@ -437,7 +437,7 @@
 	gboolean ret = FALSE;
 	static GntKeyPressMode mode = GNT_KP_MODE_NORMAL;
 
-	int rd = read(0, buffer, sizeof(buffer) - 1);
+	int rd = read(STDIN_FILENO, buffer, sizeof(buffer) - 1);
 	if (rd < 0)
 	{
 		endwin();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [16885] branches/soc-2006-msnp13/src/protocols/msn

[<may...@us...>]

Revision: 16885
Author:   mayuan2006
Date:     2006-08-19 09:13:55 -0700 (Sat, 19 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16885&view=rev

Log Message:
-----------
middle stage of debugging multiple-SOAP request
read 0 from soap Reply

comitted by MaYuan<may...@gm...>

Modified Paths:
--------------
    branches/soc-2006-msnp13/src/protocols/msn/contact.c
    branches/soc-2006-msnp13/src/protocols/msn/msg.c
    branches/soc-2006-msnp13/src/protocols/msn/nexus.c
    branches/soc-2006-msnp13/src/protocols/msn/oim.c
    branches/soc-2006-msnp13/src/protocols/msn/soap.c
    branches/soc-2006-msnp13/src/protocols/msn/switchboard.c
    branches/soc-2006-msnp13/src/protocols/msn/userlist.c
Modified: branches/soc-2006-msnp13/src/protocols/msn/contact.c
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/contact.c	2006-08-19 14:12:41 UTC (rev 16884)
+++ branches/soc-2006-msnp13/src/protocols/msn/contact.c	2006-08-19 16:13:55 UTC (rev 16885)
@@ -206,7 +206,7 @@
 
 	gaim_debug_info("MaYuan","finish contact written\n");
 	soapconn->read_cb = msn_get_contact_list_cb;
-	msn_soap_read_cb(data,source,cond);
+//	msn_soap_read_cb(data,source,cond);
 }
 
 void
@@ -343,7 +343,7 @@
 
 		displayName = xmlnode_get_child(contactInfo,"displayName");
 		if(displayName == NULL)
-			Name = "";
+			Name = passport;
 		else
 			Name =xmlnode_get_data(displayName);	
 
@@ -430,7 +430,7 @@
 
 	gaim_debug_info("MaYuan","finish contact written\n");
 	soapconn->read_cb = msn_get_address_cb;
-	msn_soap_read_cb(data,source,cond);
+//	msn_soap_read_cb(data,source,cond);
 }
 
 /*get the address book*/
@@ -462,7 +462,7 @@
 
 	gaim_debug_info("MaYuan","finish unblock written\n");
 	soapconn->read_cb = msn_add_contact_read_cb;
-	msn_soap_read_cb(data,source,cond);
+//	msn_soap_read_cb(data,source,cond);
 }
 
 /*add a Contact */
@@ -511,7 +511,7 @@
 
 	gaim_debug_info("MaYuan","delete contact written\n");
 	soapconn->read_cb = msn_delete_contact_read_cb;
-	msn_soap_read_cb(data,source,cond);
+//	msn_soap_read_cb(data,source,cond);
 }
 
 /*delete a Contact*/
@@ -550,7 +550,7 @@
 
 	gaim_debug_info("MaYuan","finish unblock written\n");
 	soapconn->read_cb = msn_block_read_cb;
-	msn_soap_read_cb(data,source,cond);
+//	msn_soap_read_cb(data,source,cond);
 }
 
 /*block a Contact*/
@@ -586,7 +586,7 @@
 
 	gaim_debug_info("MaYuan","finish unblock written\n");
 	soapconn->read_cb = msn_unblock_read_cb;
-	msn_soap_read_cb(data,source,cond);
+//	msn_soap_read_cb(data,source,cond);
 }
 
 /*unblock a contact*/
@@ -623,7 +623,7 @@
 
 	gaim_debug_info("MaYuan","finish Group written\n");
 	soapconn->read_cb = msn_gleams_read_cb;
-	msn_soap_read_cb(data,source,cond);
+//	msn_soap_read_cb(data,source,cond);
 }
 
 /*get the gleams info*/
@@ -658,7 +658,7 @@
 
 	gaim_debug_info("MaYuan","finish Group written\n");
 	soapconn->read_cb = msn_group_read_cb;
-	msn_soap_read_cb(data,source,cond);
+//	msn_soap_read_cb(data,source,cond);
 }
 
 /*add group*/

Modified: branches/soc-2006-msnp13/src/protocols/msn/msg.c
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/msg.c	2006-08-19 14:12:41 UTC (rev 16884)
+++ branches/soc-2006-msnp13/src/protocols/msn/msg.c	2006-08-19 16:13:55 UTC (rev 16885)
@@ -121,7 +121,7 @@
 	char *message_cr;
 
 	msg = msn_message_new(MSN_MSG_TEXT);
-//	msn_message_set_attr(msg, "User-Agent", "Gaim/" VERSION);
+	msn_message_set_attr(msg, "User-Agent", "Gaim/" VERSION);
 	msn_message_set_content_type(msg, "text/plain");
 	msn_message_set_charset(msg, "UTF-8");
 	msn_message_set_flag(msg, 'A');

Modified: branches/soc-2006-msnp13/src/protocols/msn/nexus.c
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/nexus.c	2006-08-19 14:12:41 UTC (rev 16884)
+++ branches/soc-2006-msnp13/src/protocols/msn/nexus.c	2006-08-19 16:13:55 UTC (rev 16885)
@@ -151,7 +151,7 @@
 	MsnSoapConn * soapconn = data;	
 
 	soapconn->read_cb = nexus_login_read_cb;
-	msn_soap_read_cb(data,source,cond);
+//	msn_soap_read_cb(data,source,cond);
 }
 
 

Modified: branches/soc-2006-msnp13/src/protocols/msn/oim.c
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/oim.c	2006-08-19 14:12:41 UTC (rev 16884)
+++ branches/soc-2006-msnp13/src/protocols/msn/oim.c	2006-08-19 16:13:55 UTC (rev 16885)
@@ -104,7 +104,7 @@
 	MsnSoapConn * soapconn = data;	
 
 	soapconn->read_cb = msn_oim_send_read_cb;
-	msn_soap_read_cb(data,source,cond);
+//	msn_soap_read_cb(data,source,cond);
 }
 
 /*pose single message to oim server*/
@@ -204,7 +204,7 @@
 	MsnSoapConn * soapconn = data;	
 
 	soapconn->read_cb = msn_oim_get_read_cb;
-	msn_soap_read_cb(data,source,cond);
+//	msn_soap_read_cb(data,source,cond);
 }
 
 /*parse the oim XML data*/

Modified: branches/soc-2006-msnp13/src/protocols/msn/soap.c
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/soap.c	2006-08-19 14:12:41 UTC (rev 16884)
+++ branches/soc-2006-msnp13/src/protocols/msn/soap.c	2006-08-19 16:13:55 UTC (rev 16885)
@@ -352,17 +352,11 @@
 			}
 			/*clear the read buffer*/
 			msn_soap_free_read_buf(soapconn);
-
+#if 1
+//			msn_soap_close(soapconn);
+#endif
 			/*Process the next queued SOAP request*/
 			msn_soap_post_head_request(soapconn);
-
-#if 0
-	/*remove the read handler*/
-	gaim_input_remove(soapconn->input_handler);
-	soapconn->input_handler = -1;
-	//	gaim_ssl_close(soapconn->gsc);
-	//	soapconn->gsc = NULL;
-#endif
 	}
 	return;
 }
@@ -437,6 +431,8 @@
 	if(soapconn->written_cb != NULL){
 		soapconn->written_cb(soapconn, source, 0);
 	}
+	/*maybe we need to read the input?*/
+	msn_soap_read_cb(soapconn,source,0);
 }
 
 /*write the buffer to SOAP connection*/
@@ -495,6 +491,8 @@
 void
 msn_soap_post_head_request(MsnSoapConn *soapconn)
 {
+	g_return_if_fail(soapconn->soap_queue != NULL);
+
 	if(!g_queue_is_empty(soapconn->soap_queue)){
 		MsnSoapReq *request;
 		if((request = g_queue_pop_head(soapconn->soap_queue)) != NULL){

Modified: branches/soc-2006-msnp13/src/protocols/msn/switchboard.c
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/switchboard.c	2006-08-19 14:12:41 UTC (rev 16884)
+++ branches/soc-2006-msnp13/src/protocols/msn/switchboard.c	2006-08-19 16:13:55 UTC (rev 16885)
@@ -707,8 +707,8 @@
 
 	process_queue(swboard);
 
-//	if (!session->http_method)
-//		send_clientcaps(swboard);
+	if (!session->http_method)
+		send_clientcaps(swboard);
 
 	if (swboard->closed)
 		msn_switchboard_close(swboard);

Modified: branches/soc-2006-msnp13/src/protocols/msn/userlist.c
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/userlist.c	2006-08-19 14:12:41 UTC (rev 16884)
+++ branches/soc-2006-msnp13/src/protocols/msn/userlist.c	2006-08-19 16:13:55 UTC (rev 16885)
@@ -458,6 +458,7 @@
 		user = msn_user_new(userlist, passport, userName);
 		msn_userlist_add_user(userlist, user);
 	}
+	msn_user_set_store_name(user, userName);
 	return user;
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [16884] branches/soc-2006-msnp13/src/protocols/msn

[<may...@us...>]

Revision: 16884
Author:   mayuan2006
Date:     2006-08-19 07:12:41 -0700 (Sat, 19 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16884&view=rev

Log Message:
-----------
chat function ok
debugging the multiple soap request in one ssl connection
not stable.

comitted by MaYuan<may...@gm...>

Modified Paths:
--------------
    branches/soc-2006-msnp13/src/protocols/msn/README
    branches/soc-2006-msnp13/src/protocols/msn/msg.c
    branches/soc-2006-msnp13/src/protocols/msn/oim.c
    branches/soc-2006-msnp13/src/protocols/msn/oim.h
    branches/soc-2006-msnp13/src/protocols/msn/soap.c
    branches/soc-2006-msnp13/src/protocols/msn/soap.h
    branches/soc-2006-msnp13/src/protocols/msn/transaction.c
Modified: branches/soc-2006-msnp13/src/protocols/msn/README
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/README	2006-08-19 13:44:47 UTC (rev 16883)
+++ branches/soc-2006-msnp13/src/protocols/msn/README	2006-08-19 14:12:41 UTC (rev 16884)
@@ -37,3 +37,11 @@
 
 4. Reference
 The very useful sites of MSN Protocol:
+MSNpiki site:
+reverse engineer of MSN Protocol.up to dated.
+http://msnpiki.msnfanatic.com/index.php/MSN_Protocol_Version_13
+
+hypothetic site:
+old MSN Protocol Introduction,but very useful for basic idea of MSN protocol
+http://www.hypothetic.org/docs/msn/index.php
+

Modified: branches/soc-2006-msnp13/src/protocols/msn/msg.c
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/msg.c	2006-08-19 13:44:47 UTC (rev 16883)
+++ branches/soc-2006-msnp13/src/protocols/msn/msg.c	2006-08-19 14:12:41 UTC (rev 16884)
@@ -23,6 +23,7 @@
  */
 #include "msn.h"
 #include "msg.h"
+#define MSN_DEBUG_MSG
 
 MsnMessage *
 msn_message_new(MsnMsgType type)
@@ -123,12 +124,12 @@
 //	msn_message_set_attr(msg, "User-Agent", "Gaim/" VERSION);
 	msn_message_set_content_type(msg, "text/plain");
 	msn_message_set_charset(msg, "UTF-8");
-	msn_message_set_flag(msg, 'N');
+	msn_message_set_flag(msg, 'A');
 	msn_message_set_attr(msg, "X-MMS-IM-Format",
 						 "FN=MS%20Sans%20Serif; EF=; CO=0; CS=86;PF=0");
 
 	message_cr = gaim_str_add_cr(message);
-	msn_message_set_bin_data(msg, message_cr, strlen(message_cr)+1);
+	msn_message_set_bin_data(msg, message_cr, strlen(message_cr));
 	g_free(message_cr);
 
 	return msg;
@@ -514,14 +515,11 @@
 	if (msg->body != NULL)
 		g_free(msg->body);
 
-	if (data != NULL && len > 0)
-	{
+	if (data != NULL && len > 0){
 		msg->body = g_malloc0(len + 1);
 		memcpy(msg->body, data, len);
 		msg->body_len = len;
-	}
-	else
-	{
+	}else{
 		msg->body = NULL;
 		msg->body_len = 0;
 	}

Modified: branches/soc-2006-msnp13/src/protocols/msn/oim.c
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/oim.c	2006-08-19 13:44:47 UTC (rev 16883)
+++ branches/soc-2006-msnp13/src/protocols/msn/oim.c	2006-08-19 14:12:41 UTC (rev 16884)
@@ -238,8 +238,6 @@
 	const char *soap_body,*t,*p;
 
 	gaim_debug_info("MaYuan","Get single OIM Message\n");
-	oim->retrieveconn->login_path = g_strdup(MSN_OIM_RETRIEVE__URL);
-	oim->retrieveconn->soap_action = g_strdup(MSN_OIM_GET_SOAP_ACTION);
 	t = oim->session->passport_info.t;
 	p = oim->session->passport_info.p;
 
@@ -248,8 +246,8 @@
 					p,
 					msgid
 					);
-	soap_request = msn_soap_request_new(MSN_OIM_SEND_HOST,
-					MSN_OIM_SEND_URL,MSN_OIM_SEND_SOAP_ACTION,
+	soap_request = msn_soap_request_new(MSN_OIM_RETRIEVE_HOST,
+					MSN_OIM_RETRIEVE_URL,MSN_OIM_GET_SOAP_ACTION,
 					soap_body,
 					msn_oim_get_read_cb,
 					msn_oim_get_written_cb);
@@ -261,22 +259,17 @@
 msn_oim_retrieve_connect_init(MsnSoapConn *soapconn)
 {
 	gaim_debug_info("MaYuan","msn_oim_connect...\n");
-
-	if(msn_soap_connected(soapconn) == -1){
-		msn_soap_init(soapconn,MSN_OIM_RETRIEVE_HOST,1,
+	msn_soap_init(soapconn,MSN_OIM_RETRIEVE_HOST,1,
 					msn_oim_get_connect_cb,
 					msn_oim_get_error_cb);
-	}
 }
 
 void msn_oim_send_connect_init(MsnSoapConn *sendconn)
 {
 	gaim_debug_info("MaYuan","msn oim send connect init...\n");
-	if(msn_soap_connected(sendconn) == -1){
-		msn_soap_init(sendconn,MSN_OIM_SEND_HOST,1,
+	msn_soap_init(sendconn,MSN_OIM_SEND_HOST,1,
 					msn_oim_send_connect_cb,
 					msn_oim_send_error_cb);
-	}
 }
 
 /*endof oim.c*/

Modified: branches/soc-2006-msnp13/src/protocols/msn/oim.h
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/oim.h	2006-08-19 13:44:47 UTC (rev 16883)
+++ branches/soc-2006-msnp13/src/protocols/msn/oim.h	2006-08-19 14:12:41 UTC (rev 16884)
@@ -26,7 +26,7 @@
 #define _MSN_OIM_H_
 
 #define MSN_OIM_RETRIEVE_HOST	"rsi.hotmail.com"
-#define MSN_OIM_RETRIEVE__URL	"/rsi/rsi.asmx"
+#define MSN_OIM_RETRIEVE_URL	"/rsi/rsi.asmx"
 #define MSN_OIM_GET_SOAP_ACTION	"http://www.hotmail.msn.com/ws/2004/09/oim/rsi/GetMessage"
 #define MSN_OIM_DEL_SOAP_ACTION	"http://www.hotmail.msn.com/ws/2004/09/oim/rsi/DeleteMessages"
 

Modified: branches/soc-2006-msnp13/src/protocols/msn/soap.c
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/soap.c	2006-08-19 13:44:47 UTC (rev 16883)
+++ branches/soc-2006-msnp13/src/protocols/msn/soap.c	2006-08-19 14:12:41 UTC (rev 16884)
@@ -119,6 +119,7 @@
 				soapconn);
 	}else{
 	}
+	msn_soap_set_process_step(soapconn,MSN_SOAP_CONNECTING);
 }
 
 /*close the soap connection*/
@@ -185,14 +186,16 @@
 static gssize
 msn_soap_read(MsnSoapConn *soapconn)
 {
-	gssize len;
+	gssize len,requested_len;
 	gssize total_len = 0;
 	char temp_buf[MSN_SOAP_READ_BUFF_SIZE];
 
+//	requested_len = (soapconn->need_to_read > 0) ? soapconn->need_to_read : MSN_SOAP_READ_BUFF_SIZE;
+	requested_len = MSN_SOAP_READ_BUFF_SIZE;
 	if(soapconn->ssl_conn){
-		len = gaim_ssl_read(soapconn->gsc, temp_buf,MSN_SOAP_READ_BUFF_SIZE);
+		len = gaim_ssl_read(soapconn->gsc, temp_buf,requested_len);
 	}else{
-		len = read(soapconn->fd, temp_buf,MSN_SOAP_READ_BUFF_SIZE);
+		len = read(soapconn->fd, temp_buf,requested_len);
 	}
 	if(len >0){
 		total_len += len;
@@ -330,7 +333,9 @@
 			soapconn->body_len	= atoi(body_len);
 			gaim_debug_misc("MaYuan","SOAP Read length :%d,body len:%d\n",soapconn->read_len,soapconn->body_len);
 
+			soapconn->need_to_read = (body_start - soapconn->read_buf +soapconn->body_len) - soapconn->read_len;
 			if(soapconn->read_len < body_start - soapconn->read_buf + soapconn->body_len){
+//			if(soapconn->need_to_read >0){
 				return;
 			}
 			g_free(body_len);
@@ -370,6 +375,7 @@
 	}
 	soapconn->read_buf = NULL;
 	soapconn->read_len = 0;
+	soapconn->need_to_read = 0;
 }
 
 void
@@ -506,7 +512,7 @@
 				MsnSoapConnectInitFunction msn_soap_init_func)
 {
 	g_queue_push_tail(soapconn->soap_queue, request);
-	if(!msn_soap_connected(soapconn)){
+	if(!msn_soap_connected(soapconn)&&(soapconn->step == MSN_SOAP_UNCONNECTED)){
 		/*not connected?connect it first*/
 		gaim_debug_info("Ma Yuan","soap is not connected!\n");
 		msn_soap_init_func(soapconn);

Modified: branches/soc-2006-msnp13/src/protocols/msn/soap.h
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/soap.h	2006-08-19 13:44:47 UTC (rev 16883)
+++ branches/soc-2006-msnp13/src/protocols/msn/soap.h	2006-08-19 14:12:41 UTC (rev 16884)
@@ -31,6 +31,7 @@
 typedef enum
 {
 	MSN_SOAP_UNCONNECTED,
+	MSN_SOAP_CONNECTING,
 	MSN_SOAP_CONNECTED,
 	MSN_SOAP_PROCESSING,
 	MSN_SOAP_CONNECTED_IDLE
@@ -95,6 +96,7 @@
 	/*read buffer*/
 	char *read_buf;
 	gsize read_len;
+	gsize need_to_read;
 	GaimInputFunction read_cb;
 
 	/*HTTP reply body part*/

Modified: branches/soc-2006-msnp13/src/protocols/msn/transaction.c
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/transaction.c	2006-08-19 13:44:47 UTC (rev 16883)
+++ branches/soc-2006-msnp13/src/protocols/msn/transaction.c	2006-08-19 14:12:41 UTC (rev 16884)
@@ -205,8 +205,7 @@
 void
 msn_transaction_set_timeout_cb(MsnTransaction *trans, MsnTimeoutCb cb)
 {
-	if (trans->timer)
-	{
+	if (trans->timer){
 		gaim_debug_error("msn", "This shouldn't be happening\n");
 		gaim_timeout_remove(trans->timer);
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [16883] trunk/console/libgnt/gnttree.c

[<sa...@us...>]

Revision: 16883
Author:   sadrul
Date:     2006-08-19 06:44:47 -0700 (Sat, 19 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16883&view=rev

Log Message:
-----------
g_hash_table_remove_all is introduced in glib-2.12

Modified Paths:
--------------
    trunk/console/libgnt/gnttree.c
Modified: trunk/console/libgnt/gnttree.c
===================================================================
--- trunk/console/libgnt/gnttree.c	2006-08-19 11:46:33 UTC (rev 16882)
+++ trunk/console/libgnt/gnttree.c	2006-08-19 13:44:47 UTC (rev 16883)
@@ -889,10 +889,16 @@
 	}
 }
 
+static gboolean
+return_true(gpointer key, gpointer data, gpointer null)
+{
+	return TRUE;
+}
+
 void gnt_tree_remove_all(GntTree *tree)
 {
 	tree->root = NULL;
-	g_hash_table_remove_all(tree->hash);
+	g_hash_table_foreach_remove(tree->hash, (GHRFunc)return_true, NULL);
 	g_list_free(tree->list);
 	tree->list = NULL;
 	tree->current = tree->top = tree->bottom = NULL;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [16882] branches/soc-2006-msnp13/src/protocols/msn

[<may...@us...>]

Revision: 16882
Author:   mayuan2006
Date:     2006-08-19 04:46:33 -0700 (Sat, 19 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16882&view=rev

Log Message:
-----------
a version can work with windows
Not stable

Modified Paths:
--------------
    branches/soc-2006-msnp13/src/protocols/msn/contact.c
    branches/soc-2006-msnp13/src/protocols/msn/msg.c
    branches/soc-2006-msnp13/src/protocols/msn/nexus.c
    branches/soc-2006-msnp13/src/protocols/msn/nexus.h
    branches/soc-2006-msnp13/src/protocols/msn/notification.c
    branches/soc-2006-msnp13/src/protocols/msn/soap.c
    branches/soc-2006-msnp13/src/protocols/msn/switchboard.c
Modified: branches/soc-2006-msnp13/src/protocols/msn/contact.c
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/contact.c	2006-08-19 08:15:19 UTC (rev 16881)
+++ branches/soc-2006-msnp13/src/protocols/msn/contact.c	2006-08-19 11:46:33 UTC (rev 16882)
@@ -326,6 +326,9 @@
 			for(contactEmailNode = xmlnode_get_child(emailsNode,"ContactEmail");contactEmailNode;
 					contactEmailNode = xmlnode_get_next_twin(contactEmailNode) ){
 				messengerEnabledNode = xmlnode_get_child(contactEmailNode,"isMessengerEnabled");
+				if(messengerEnabledNode == NULL){
+					break;
+				}
 				msnEnabled = xmlnode_get_data(messengerEnabledNode);
 				if(!strcmp(msnEnabled,"true")){
 					emailNode = xmlnode_get_child(contactEmailNode,"email");
@@ -339,7 +342,10 @@
 		}
 
 		displayName = xmlnode_get_child(contactInfo,"displayName");
-		Name =xmlnode_get_data(displayName);
+		if(displayName == NULL)
+			Name = "";
+		else
+			Name =xmlnode_get_data(displayName);	
 
 		gaim_debug_misc("contact","name:%s,Id:{%s},display:{%s}\n",
 						passport,

Modified: branches/soc-2006-msnp13/src/protocols/msn/msg.c
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/msg.c	2006-08-19 08:15:19 UTC (rev 16881)
+++ branches/soc-2006-msnp13/src/protocols/msn/msg.c	2006-08-19 11:46:33 UTC (rev 16882)
@@ -104,8 +104,7 @@
 	gaim_debug_info("msn", "message unref (%p)[%d]\n", msg, msg->ref_count);
 #endif
 
-	if (msg->ref_count == 0)
-	{
+	if (msg->ref_count == 0){
 		msn_message_destroy(msg);
 
 		return NULL;
@@ -121,15 +120,15 @@
 	char *message_cr;
 
 	msg = msn_message_new(MSN_MSG_TEXT);
-	msn_message_set_attr(msg, "User-Agent", "Gaim/" VERSION);
+//	msn_message_set_attr(msg, "User-Agent", "Gaim/" VERSION);
 	msn_message_set_content_type(msg, "text/plain");
 	msn_message_set_charset(msg, "UTF-8");
-	msn_message_set_flag(msg, 'A');
+	msn_message_set_flag(msg, 'N');
 	msn_message_set_attr(msg, "X-MMS-IM-Format",
-						 "FN=MS%20Sans%20Serif; EF=; CO=0; PF=0");
+						 "FN=MS%20Sans%20Serif; EF=; CO=0; CS=86;PF=0");
 
 	message_cr = gaim_str_add_cr(message);
-	msn_message_set_bin_data(msg, message_cr, strlen(message_cr));
+	msn_message_set_bin_data(msg, message_cr, strlen(message_cr)+1);
 	g_free(message_cr);
 
 	return msg;
@@ -471,7 +470,7 @@
 		{
 			memcpy(n, body, body_len);
 			n += body_len;
-			n = "\0";
+//			n = '\0';
 		}
 	}
 

Modified: branches/soc-2006-msnp13/src/protocols/msn/nexus.c
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/nexus.c	2006-08-19 08:15:19 UTC (rev 16881)
+++ branches/soc-2006-msnp13/src/protocols/msn/nexus.c	2006-08-19 11:46:33 UTC (rev 16882)
@@ -163,6 +163,7 @@
 	MsnSoapConn *soapconn;
 	MsnNexus * nexus;
 	MsnSession *session;
+	char *ru,*lc,*id,*tw,*ct,*kpp,*kv,*ver,*rn,*tpf;
 	char *username, *password;
 	char *request_str, *head, *tail,*challenge_str;
 
@@ -183,19 +184,31 @@
 	username = g_strdup(gaim_account_get_username(session->account));
 	password = g_strdup(gaim_connection_get_password(session->account->gc));
 
+	lc =	(char *)g_hash_table_lookup(nexus->challenge_data, "lc");
+	id =	(char *)g_hash_table_lookup(nexus->challenge_data, "id");
+	tw =	(char *)g_hash_table_lookup(nexus->challenge_data, "tw");
+	ru =	(char *)g_hash_table_lookup(nexus->challenge_data, "ru");
+	ct =	(char *)g_hash_table_lookup(nexus->challenge_data, "ct");
+	kpp=	(char *)g_hash_table_lookup(nexus->challenge_data, "kpp");
+	kv =	(char *)g_hash_table_lookup(nexus->challenge_data, "kv");
+	ver= (char *)g_hash_table_lookup(nexus->challenge_data, "ver");
+	rn = (char *)g_hash_table_lookup(nexus->challenge_data, "rn");
+	tpf=	(char *)g_hash_table_lookup(nexus->challenge_data, "tpf");
+
+	if(!(lc && id && tw && ru && ct && kpp && kv && ver && tpf)){
+		gaim_debug_error("MaYuan","WLM Authenticate Key Error!\n");
+		msn_session_set_error(session, MSN_ERROR_AUTH, _("Windows Live ID authentication Failed"));
+		g_free(username);
+		g_free(password);
+		gaim_ssl_close(gsc);
+		msn_nexus_destroy(nexus);
+		session->nexus = NULL;
+		return;
+	}
+
 	challenge_str = g_strdup_printf(
-		"lc=%s&id=%s&tw=%s&fs=%s&ru=%s&ct=%s&kpp=%s&kv=%s&ver=%s&rn=%s&tpf=%s\r\n",
-		(char *)g_hash_table_lookup(nexus->challenge_data, "lc"),
-		(char *)g_hash_table_lookup(nexus->challenge_data, "id"),
-		(char *)g_hash_table_lookup(nexus->challenge_data, "tw"),
-		(char *)g_hash_table_lookup(nexus->challenge_data, "fs"),
-		(char *)g_hash_table_lookup(nexus->challenge_data, "ru"),
-		(char *)g_hash_table_lookup(nexus->challenge_data, "ct"),
-		(char *)g_hash_table_lookup(nexus->challenge_data, "kpp"),
-		(char *)g_hash_table_lookup(nexus->challenge_data, "kv"),
-		(char *)g_hash_table_lookup(nexus->challenge_data, "ver"),
-		(char *)g_hash_table_lookup(nexus->challenge_data, "rn"),
-		(char *)g_hash_table_lookup(nexus->challenge_data, "tpf")
+		"lc=%s&id=%s&tw=%s&fs=1&ru=%s&ct=%s&kpp=%s&kv=%s&ver=%s&rn=%s&tpf=%s\r\n",
+		lc,id,tw,ru,ct,kpp,kv,ver,rn,tpf
 		);
 
 	/*build the SOAP windows Live ID XML body */

Modified: branches/soc-2006-msnp13/src/protocols/msn/nexus.h
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/nexus.h	2006-08-19 08:15:19 UTC (rev 16881)
+++ branches/soc-2006-msnp13/src/protocols/msn/nexus.h	2006-08-19 11:46:33 UTC (rev 16882)
@@ -77,7 +77,8 @@
 struct _MsnNexus
 {
 	MsnSession *session;
-	MsnSoapConn *soapconn;	
+	MsnSoapConn *soapconn;
+	char * challenge_data_str;
 	GHashTable *challenge_data;
 };
 

Modified: branches/soc-2006-msnp13/src/protocols/msn/notification.c
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/notification.c	2006-08-19 08:15:19 UTC (rev 16881)
+++ branches/soc-2006-msnp13/src/protocols/msn/notification.c	2006-08-19 11:46:33 UTC (rev 16882)
@@ -248,15 +248,16 @@
 		session->nexus = msn_nexus_new(session);
 
 		/* Parse the challenge data. */
-
+		session->nexus->challenge_data_str = g_strdup(cmd->params[3]);
 		elems = g_strsplit(cmd->params[3], ",", 0);
 
 		for (cur = elems; *cur != NULL; cur++){
 			tokens = g_strsplit(*cur, "=", 2);
-//			gaim_debug_info("MaYuan","challenge %p,key:%s,value:%s\n",
-//								session->nexus->challenge_data,tokens[0],tokens[1]);
-			if(tokens[0]&&tokens[1])
+			if(tokens[0]&&tokens[1]){
+				gaim_debug_info("MaYuan","challenge %p,key:%s,value:%s\n",
+									session->nexus->challenge_data,tokens[0],tokens[1]);
 				g_hash_table_insert(session->nexus->challenge_data, tokens[0], tokens[1]);
+			}
 			/* Don't free each of the tokens, only the array. */
 			g_free(tokens);
 		}

Modified: branches/soc-2006-msnp13/src/protocols/msn/soap.c
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/soap.c	2006-08-19 08:15:19 UTC (rev 16881)
+++ branches/soc-2006-msnp13/src/protocols/msn/soap.c	2006-08-19 11:46:33 UTC (rev 16882)
@@ -101,10 +101,12 @@
 				GaimSslInputFunction	connect_cb,
 				GaimSslErrorFunction	error_cb)
 {
+	gaim_debug_info("MaYuan","msn_soap_init...\n");
 	soapconn->login_host = g_strdup(host);
 	soapconn->ssl_conn = ssl;
 	soapconn->connect_cb = connect_cb;
 	soapconn->error_cb = error_cb;
+	gaim_debug_info("MaYuan","msn_soap_init...done\n");
 }
 
 /*connect the soap connection*/
@@ -343,14 +345,13 @@
 			if(soapconn->read_cb != NULL){
 				soapconn->read_cb(soapconn,source,0);
 			}
+			/*clear the read buffer*/
+			msn_soap_free_read_buf(soapconn);
 
 			/*Process the next queued SOAP request*/
 			msn_soap_post_head_request(soapconn);
 
 #if 0
-	/*clear the read buffer*/
-	msn_soap_free_read_buf(soapconn);
-
 	/*remove the read handler*/
 	gaim_input_remove(soapconn->input_handler);
 	soapconn->input_handler = -1;

Modified: branches/soc-2006-msnp13/src/protocols/msn/switchboard.c
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/switchboard.c	2006-08-19 08:15:19 UTC (rev 16881)
+++ branches/soc-2006-msnp13/src/protocols/msn/switchboard.c	2006-08-19 11:46:33 UTC (rev 16882)
@@ -530,6 +530,7 @@
 	payload = msn_message_gen_payload(msg, &payload_len);
 
 #ifdef MSN_DEBUG_SB
+	gaim_debug_info("MaYuan","SB length:{%d}",payload_len);
 	msn_message_show_readable(msg, "SB SEND", FALSE);
 #endif
 
@@ -706,8 +707,8 @@
 
 	process_queue(swboard);
 
-	if (!session->http_method)
-		send_clientcaps(swboard);
+//	if (!session->http_method)
+//		send_clientcaps(swboard);
 
 	if (swboard->closed)
 		msn_switchboard_close(swboard);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [16881] trunk/configure.ac

[<the...@us...>]

Revision: 16881
Author:   thekingant
Date:     2006-08-19 01:15:19 -0700 (Sat, 19 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16881&view=rev

Log Message:
-----------
* Change our "GTK UI Library?" line that is printed at the end
  of ./configure to say yes or no instead of GTK+ 2.x or None
* If --disable-gntgaim then show "no" next to the "Console UI?"
  line that is printed at the end of ./configure
* Use AC_HELP_STRING for some of the ./configure --help strings
  so that they're lined up correctly automatically

Modified Paths:
--------------
    trunk/configure.ac
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-08-19 08:02:43 UTC (rev 16880)
+++ trunk/configure.ac	2006-08-19 08:15:19 UTC (rev 16881)
@@ -189,7 +189,7 @@
 		  ])
 AC_SUBST(LIBXML_CFLAGS)
 AC_SUBST(LIBXML_LIBS)
-AC_ARG_ENABLE(libxml,[  --disable-libxml     compile without libxml2 support],enable_libxml2=no)
+AC_ARG_ENABLE(libxml, [AC_HELP_STRING([--disable-libxml], [compile without libxml2 support])],enable_libxml2=no)
 if test "x$enable_libxml2" = "xyes"; then
 	AC_DEFINE(HAVE_LIBXML, 1, [Use libxml2 for xml parsing])
 fi
@@ -396,7 +396,7 @@
 
 AC_ARG_ENABLE(distrib,,,enable_distrib=no)
 AM_CONDITIONAL(DISTRIB, test "x$enable_distrib" = "xyes")
-AC_ARG_ENABLE(prpls,   [  --disable-prpls         don't build dynamic protocol plugins],,enable_prpls=yes)
+AC_ARG_ENABLE(prpls, [AC_HELP_STRING([--disable-prpls], [don't build dynamic protocol plugins])], , enable_prpls=yes)
 DYNAMIC_PRPLS=all
 AC_ARG_WITH(static-prpls, [AC_HELP_STRING([--with-static-prpls], [Link to certain protocols statically])], [STATIC_PRPLS=`echo $withval | $sedpath 's/,/ /g'`], [STATIC_PRPLS=""])
 if test "x$STATIC_PRPLS" != "x" -a "x$DYNAMIC_PRPLS" = "xall"; then
@@ -518,17 +518,17 @@
 AM_CONDITIONAL(DYNAMIC_YAHOO, test "x$dynamic_yahoo" = "xyes")
 AM_CONDITIONAL(DYNAMIC_ZEPHYR, test "x$dynamic_zephyr" = "xyes")
 
-AC_ARG_ENABLE(mono,    [  --enable-mono           compile with Mono runtime support],,enable_mono=no)
-AC_ARG_ENABLE(plugins, [  --disable-plugins       compile without plugin support],,enable_plugins=yes)
-AC_ARG_ENABLE(perl,    [  --disable-perl          compile without perl scripting],,enable_perl=yes)
-AC_ARG_ENABLE(tcl,     [  --disable-tcl           compile without Tcl scripting],,enable_tcl=yes)
+AC_ARG_ENABLE(mono, [AC_HELP_STRING([--enable-mono], [compile with Mono runtime support])], , enable_mono=no)
+AC_ARG_ENABLE(plugins, [AC_HELP_STRING([--disable-plugins], [compile without plugin support])], , enable_plugins=yes)
+AC_ARG_ENABLE(perl, [AC_HELP_STRING([--disable-perl], [compile without perl scripting])], , enable_perl=yes)
+AC_ARG_ENABLE(tcl, [AC_HELP_STRING([--disable-tcl], [compile without Tcl scripting])], , enable_tcl=yes)
 AC_ARG_WITH(tclconfig, [  --with-tclconfig=DIR    directory containing tclConfig.sh])
 AC_ARG_ENABLE(tk,      [  --disable-tk            compile without Tcl support for Tk],,enable_tk=yes)
 AC_ARG_WITH(tkconfig,  [  --with-tkconfig=DIR     directory containing tkConfig.sh])
 AC_ARG_ENABLE(gtkspell, [  --disable-gtkspell      compile without GtkSpell automatic spell checking],,enable_gtkspell=yes)
 AC_ARG_ENABLE(debug,   [  --enable-debug          compile with debugging support],,enable_debug=no)
-AC_ARG_ENABLE(gtkgaim, [  --disable-gtkgaim      compile without GtkGaim client],,enable_gtk=yes)
-AC_ARG_ENABLE(gntgaim, [  --disable-gntgaim      compile without GntGaim console client],,enable_gnt=yes)
+AC_ARG_ENABLE(gtkgaim, [AC_HELP_STRING([--disable-gtkgaim], [compile without GtkGaim client])], , enable_gtk=yes)
+AC_ARG_ENABLE(gntgaim, [AC_HELP_STRING([--disable-gntgaim], [compile without GntGaim console client])], , enable_gnt=yes)
 AC_ARG_ENABLE(fatal-asserts,   [  --enable-fatal-asserts  make assertions fatal (useful for debugging)],,enable_fatal_asserts=no)
 dnl We know Gaim won't compile with deprecated APIs disabled.
 dnl We have no desire to support two different versions of the
@@ -809,8 +809,10 @@
 dnl # GNT Gaim
 dnl #######################################################################
 if test "x$enable_gnt" = "xyes"; then
-AC_CHECK_LIB(ncursesw, initscr, , [enable_gnt=no])
-AC_CHECK_LIB(panelw, update_panels, , [enable_gnt=no])
+	AC_CHECK_LIB(ncursesw, initscr, , [enable_gnt=no])
+	AC_CHECK_LIB(panelw, update_panels, , [enable_gnt=no])
+else
+	enable_gnt=no
 fi
 AM_CONDITIONAL(ENABLE_GNT, test "x$enable_gnt" = "xyes")
 
@@ -1866,11 +1868,7 @@
 echo Protocols to link statically.. : $STATIC_PRPLS
 echo Protocols to build dynamically : $DYNAMIC_PRPLS
 echo
-if test "x$enable_gtk" = "xyes" ; then
-echo GTK UI Library................ : GTK+ 2.x
-else
-echo GTK UI Library................ : None
-fi
+echo Build with GTK+ 2.x UI........ : $enable_gtk
 echo Build with GNT Console UI..... : $enable_gnt
 echo SSL Library/Libraries......... : $msg_ssl
 echo


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [16880] trunk

[<sa...@us...>]

Revision: 16880
Author:   sadrul
Date:     2006-08-19 01:02:43 -0700 (Sat, 19 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16880&view=rev

Log Message:
-----------
The show must go on, without gntgaim if need be.

Modified Paths:
--------------
    trunk/configure.ac
    trunk/console/Makefile.am
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-08-19 07:55:17 UTC (rev 16879)
+++ trunk/configure.ac	2006-08-19 08:02:43 UTC (rev 16880)
@@ -808,6 +808,10 @@
 dnl #######################################################################
 dnl # GNT Gaim
 dnl #######################################################################
+if test "x$enable_gnt" = "xyes"; then
+AC_CHECK_LIB(ncursesw, initscr, , [enable_gnt=no])
+AC_CHECK_LIB(panelw, update_panels, , [enable_gnt=no])
+fi
 AM_CONDITIONAL(ENABLE_GNT, test "x$enable_gnt" = "xyes")
 
 dnl #######################################################################

Modified: trunk/console/Makefile.am
===================================================================
--- trunk/console/Makefile.am	2006-08-19 07:55:17 UTC (rev 16879)
+++ trunk/console/Makefile.am	2006-08-19 08:02:43 UTC (rev 16880)
@@ -1,6 +1,7 @@
-#libgnt currently needs to have autogen run for there to be a Makefile...
-# SUBDIRS = libgnt
+if ENABLE_GNT
 
+SUBDIRS = libgnt
+
 bin_PROGRAMS = gntgaim
 
 gntgaim_SOURCES = \
@@ -63,3 +64,4 @@
 	$(GLIB_CFLAGS) \
 	$(DBUS_CFLAGS) \
 	$(LIBXML_CFLAGS) 
+endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [16879] trunk/doc/ChangeLog.API

[<the...@us...>]

Revision: 16879
Author:   thekingant
Date:     2006-08-19 00:55:17 -0700 (Sat, 19 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16879&view=rev

Log Message:
-----------
Callback doesn't need to be capitalized

Modified Paths:
--------------
    trunk/doc/ChangeLog.API
Modified: trunk/doc/ChangeLog.API
===================================================================
--- trunk/doc/ChangeLog.API	2006-08-19 07:26:04 UTC (rev 16878)
+++ trunk/doc/ChangeLog.API	2006-08-19 07:55:17 UTC (rev 16879)
@@ -90,7 +90,7 @@
 	* gaim_pounce_new(): Added option argument for pounce options
 	* gaim_network_listen() and gaim_network_listen_range(): Added
 	  socket_type parameter to allow creation of UDP listening. Modified
-	  to be asynchronous with a Callback to allow for UPnP operation.
+	  to be asynchronous with a callback to allow for UPnP operation.
 	* GaimPrefCallback: val is now a gconstpointer instead of a gpointer
 	* gtk_imhtml_get_current_format(): the arguments are now set to TRUE or
 	  FALSE.  Previously they were set to TRUE or left alone.  Also, you


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [16878] trunk/plugins/

[<the...@us...>]

Revision: 16878
Author:   thekingant
Date:     2006-08-19 00:26:04 -0700 (Sat, 19 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16878&view=rev

Log Message:
-----------
We don't need this directory any more, do we?

Removed Paths:
-------------
    trunk/plugins/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [16877] trunk/configure.ac

[<the...@us...>]

Revision: 16877
Author:   thekingant
Date:     2006-08-19 00:16:27 -0700 (Sat, 19 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16877&view=rev

Log Message:
-----------
There was an extra line in here?

Modified Paths:
--------------
    trunk/configure.ac
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-08-19 07:02:12 UTC (rev 16876)
+++ trunk/configure.ac	2006-08-19 07:16:27 UTC (rev 16877)
@@ -1885,7 +1885,6 @@
 echo Build with libxml2 support.... : $enable_libxml2
 echo Has you....................... : yes
 echo
-echo
 echo Use kerberos 4 with zephyr.... : $kerberos
 echo Use external libzephyr........ : $zephyr
 echo


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [16876] branches/soc-2006-msnp13/src/protocols/msn

[<may...@us...>]

Revision: 16876
Author:   mayuan2006
Date:     2006-08-19 00:02:12 -0700 (Sat, 19 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16876&view=rev

Log Message:
-----------
add some comments

committed by MaYuan<may...@gm...>

Modified Paths:
--------------
    branches/soc-2006-msnp13/src/protocols/msn/soap.c
    branches/soc-2006-msnp13/src/protocols/msn/switchboard.c
Modified: branches/soc-2006-msnp13/src/protocols/msn/soap.c
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/soap.c	2006-08-19 06:45:42 UTC (rev 16875)
+++ branches/soc-2006-msnp13/src/protocols/msn/soap.c	2006-08-19 07:02:12 UTC (rev 16876)
@@ -26,6 +26,7 @@
 #include "msn.h"
 #include "soap.h"
 
+/*setup the soap process step*/
 void
 msn_soap_set_process_step(MsnSoapConn *soapconn, MsnSoapStep step)
 {
@@ -483,6 +484,7 @@
 	g_free(request);
 }
 
+/*post the soap request queue's head request*/
 void
 msn_soap_post_head_request(MsnSoapConn *soapconn)
 {
@@ -495,6 +497,9 @@
 	msn_soap_set_process_step(soapconn,MSN_SOAP_CONNECTED_IDLE);
 }
 
+/*post the soap request ,
+ * if not connected, Connected first.
+ */
 void
 msn_soap_post(MsnSoapConn *soapconn,MsnSoapReq *request,
 				MsnSoapConnectInitFunction msn_soap_init_func)

Modified: branches/soc-2006-msnp13/src/protocols/msn/switchboard.c
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/switchboard.c	2006-08-19 06:45:42 UTC (rev 16875)
+++ branches/soc-2006-msnp13/src/protocols/msn/switchboard.c	2006-08-19 07:02:12 UTC (rev 16876)
@@ -984,16 +984,13 @@
 	swboard = cmdproc->data;
 	g_return_if_fail(swboard != NULL);
 
-	if (msn_switchboard_is_invited(swboard))
-	{
+	if (msn_switchboard_is_invited(swboard)){
 		swboard->empty = FALSE;
 
 		msn_cmdproc_send(cmdproc, "ANS", "%s %s %s",
 						 gaim_account_get_username(account),
 						 swboard->auth_key, swboard->session_id);
-	}
-	else
-	{
+	}else{
 		msn_cmdproc_send(cmdproc, "USR", "%s %s",
 						 gaim_account_get_username(account),
 						 swboard->auth_key);
@@ -1132,6 +1129,7 @@
 		/* The conversation window was closed. */
 		return;
 
+	gaim_debug_info("MaYuan","Switchboard:auth:{%s} socket:{%s}\n",cmd->params[4],cmd->params[2]);
 	msn_switchboard_set_auth_key(swboard, cmd->params[4]);
 
 	msn_parse_socket(cmd->params[2], &host, &port);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [16875] trunk/console/libgnt/gntmain.c

[<sa...@us...>]

Revision: 16875
Author:   sadrul
Date:     2006-08-18 23:45:42 -0700 (Fri, 18 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16875&view=rev

Log Message:
-----------
some tweakings.

Modified Paths:
--------------
    trunk/console/libgnt/gntmain.c
Modified: trunk/console/libgnt/gntmain.c
===================================================================
--- trunk/console/libgnt/gntmain.c	2006-08-19 06:02:26 UTC (rev 16874)
+++ trunk/console/libgnt/gntmain.c	2006-08-19 06:45:42 UTC (rev 16875)
@@ -663,21 +663,26 @@
 {
 	static GIOChannel *channel = NULL;
 	char *filename;
-	
+	int result;
+	const char *locale;
+
 	if (channel)
 		return;
 	
-	channel = g_io_channel_unix_new(0);
+	channel = g_io_channel_unix_new(STDIN_FILENO);
 
 	g_io_channel_set_encoding(channel, NULL, NULL);
 	g_io_channel_set_buffered(channel, FALSE);
 	g_io_channel_set_flags(channel, G_IO_FLAG_NONBLOCK, NULL );
 
-	int result = g_io_add_watch(channel, 
-					(G_IO_IN | G_IO_HUP | G_IO_ERR),
-					io_invoke, NULL);
-	const char *locale = setlocale(LC_ALL, "");
+	result = g_io_add_watch_full(channel,  G_PRIORITY_HIGH,
+					(G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_PRI | G_IO_NVAL),
+					io_invoke, NULL, NULL);
+	
+	locale = setlocale(LC_ALL, "");
 
+	g_io_channel_unref(channel);
+
 	if (locale && (strstr(locale, "UTF") || strstr(locale, "utf")))
 		ascii_only = FALSE;
 	else


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [16874] trunk/console/libgnt/test/Makefile

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

Revision: 16874
Author:   evands
Date:     2006-08-18 23:02:26 -0700 (Fri, 18 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16874&view=rev

Log Message:
-----------
Updated makefile for the keys test program

Modified Paths:
--------------
    trunk/console/libgnt/test/Makefile
Modified: trunk/console/libgnt/test/Makefile
===================================================================
--- trunk/console/libgnt/test/Makefile	2006-08-19 05:52:13 UTC (rev 16873)
+++ trunk/console/libgnt/test/Makefile	2006-08-19 06:02:26 UTC (rev 16874)
@@ -2,7 +2,7 @@
 CFLAGS=`pkg-config --cflags gobject-2.0 gmodule-2.0` -g -I../ -DSTANDALONE
 LDFLAGS=`pkg-config --libs gobject-2.0 gmodule-2.0 gnt` -pg
 
-EXAMPLES=combo focus tv multiwin
+EXAMPLES=combo focus tv multiwin keys
 
 all:
 	make examples


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [16873] branches/soc-2006-msnp13/src/protocols/msn

[<may...@us...>]

Revision: 16873
Author:   mayuan2006
Date:     2006-08-18 22:52:13 -0700 (Fri, 18 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16873&view=rev

Log Message:
-----------
change the SOAP process Framework
a initial version,can work now 

committed by Ma Yuan<may...@gm...>

Modified Paths:
--------------
    branches/soc-2006-msnp13/src/protocols/msn/contact.c
    branches/soc-2006-msnp13/src/protocols/msn/nexus.c
    branches/soc-2006-msnp13/src/protocols/msn/notification.c
    branches/soc-2006-msnp13/src/protocols/msn/oim.c
    branches/soc-2006-msnp13/src/protocols/msn/soap.c
    branches/soc-2006-msnp13/src/protocols/msn/soap.h
Modified: branches/soc-2006-msnp13/src/protocols/msn/contact.c
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/contact.c	2006-08-19 05:44:40 UTC (rev 16872)
+++ branches/soc-2006-msnp13/src/protocols/msn/contact.c	2006-08-19 05:52:13 UTC (rev 16873)
@@ -30,6 +30,8 @@
 #include "xmlnode.h"
 #include "group.h"
 
+void msn_contact_connect_init(MsnSoapConn *soapconn);
+
 /*new a contact*/
 MsnContact *
 msn_contact_new(MsnSession *session)
@@ -80,7 +82,7 @@
 	g_return_if_fail(session != NULL);
 
 	/*login ok!We can retrieve the contact list*/
-	msn_get_contact_list(contact);
+//	msn_get_contact_list(contact);
 }
 
 /*get MSN member role utility*/
@@ -212,12 +214,13 @@
 {
 	MsnSoapReq *soap_request;
 
+	gaim_debug_info("MaYuan","Getting Contact List...\n");
 	soap_request = msn_soap_request_new(MSN_CONTACT_SERVER,
 					MSN_GET_CONTACT_POST_URL,MSN_GET_CONTACT_SOAP_ACTION,
 					MSN_GET_CONTACT_TEMPLATE,
 					msn_get_contact_list_cb,
 					msn_get_contact_written_cb);
-	msn_soap_post(contact->soapconn,soap_request);
+	msn_soap_post(contact->soapconn,soap_request,msn_contact_connect_init);
 }
 
 static void
@@ -437,7 +440,7 @@
 					MSN_GET_ADDRESS_TEMPLATE,
 					msn_get_address_cb,
 					msn_address_written_cb);
-	msn_soap_post(contact->soapconn,soap_request);
+	msn_soap_post(contact->soapconn,soap_request,msn_contact_connect_init);
 }
 
 static void
@@ -483,7 +486,7 @@
 					body,
 					msn_add_contact_read_cb,
 					msn_add_contact_written_cb);
-	msn_soap_post(contact->soapconn,soap_request);
+	msn_soap_post(contact->soapconn,soap_request,msn_contact_connect_init);
 
 	g_free(soap_action);
 	g_free(body);
@@ -523,7 +526,7 @@
 					body,
 					msn_delete_contact_read_cb,
 					msn_delete_contact_written_cb);
-	msn_soap_post(contact->soapconn,soap_request);
+	msn_soap_post(contact->soapconn,soap_request,msn_contact_connect_init);
 
 	g_free(body);
 }
@@ -559,7 +562,7 @@
 					body,
 					msn_block_read_cb,
 					msn_block_written_cb);
-	msn_soap_post(contact->soapconn,soap_request);
+	msn_soap_post(contact->soapconn,soap_request,msn_contact_connect_init);
 
 	g_free(body);
 }
@@ -596,7 +599,7 @@
 					body,
 					msn_unblock_read_cb,
 					msn_unblock_written_cb);
-	msn_soap_post(contact->soapconn,soap_request);
+	msn_soap_post(contact->soapconn,soap_request,msn_contact_connect_init);
 
 	g_free(body);
 }
@@ -630,7 +633,7 @@
 					MSN_GLEAMS_TEMPLATE,
 					msn_gleams_read_cb,
 					msn_gleams_written_cb);
-	msn_soap_post(contact->soapconn,soap_request);
+	msn_soap_post(contact->soapconn,soap_request,msn_contact_connect_init);
 }
 
 /***************************************************************
@@ -670,7 +673,7 @@
 					body,
 					msn_group_read_cb,
 					msn_group_written_cb);
-	msn_soap_post(contact->soapconn,soap_request);
+	msn_soap_post(contact->soapconn,soap_request,msn_contact_connect_init);
 }
 
 /*delete a group*/
@@ -691,18 +694,18 @@
 					body,
 					msn_group_read_cb,
 					msn_group_written_cb);
-	msn_soap_post(contact->soapconn,soap_request);
+	msn_soap_post(contact->soapconn,soap_request,msn_contact_connect_init);
 
 	g_free(body);
 }
 
 void
-msn_contact_connect(MsnContact *contact)
+msn_contact_connect_init(MsnSoapConn *soapconn)
 {
 	/*  Authenticate via Windows Live ID. */
 	gaim_debug_info("MaYuan","msn_contact_connect...\n");
 
-	msn_soap_init(contact->soapconn,MSN_CONTACT_SERVER,1,
+	msn_soap_init(soapconn,MSN_CONTACT_SERVER,1,
 					msn_contact_login_connect_cb,
 					msn_contact_login_error_cb);
 }

Modified: branches/soc-2006-msnp13/src/protocols/msn/nexus.c
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/nexus.c	2006-08-19 05:44:40 UTC (rev 16872)
+++ branches/soc-2006-msnp13/src/protocols/msn/nexus.c	2006-08-19 05:52:13 UTC (rev 16873)
@@ -182,7 +182,6 @@
 	/*prepare the Windows Live ID authentication token*/
 	username = g_strdup(gaim_account_get_username(session->account));
 	password = g_strdup(gaim_connection_get_password(session->account->gc));
-//		g_strdup(gaim_url_encode(gaim_connection_get_password(session->account->gc)));
 
 	challenge_str = g_strdup_printf(
 		"lc=%s&amp;id=%s&amp;tw=%s&amp;fs=%s&amp;ru=%s&amp;ct=%s&amp;kpp=%s&amp;kv=%s&amp;ver=%s&amp;rn=%s&amp;tpf=%s\r\n",
@@ -235,7 +234,7 @@
 {
 	/*  Authenticate via Windows Live ID. */
 	gaim_debug_info("MaYuan","msn_nexus_connect...\n");
-
 	msn_soap_init(nexus->soapconn,MSN_TWN_SERVER,1,nexus_login_connect_cb,nexus_login_error_cb);
+	msn_soap_connect(nexus->soapconn);
 }
 

Modified: branches/soc-2006-msnp13/src/protocols/msn/notification.c
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/notification.c	2006-08-19 05:44:40 UTC (rev 16872)
+++ branches/soc-2006-msnp13/src/protocols/msn/notification.c	2006-08-19 05:52:13 UTC (rev 16873)
@@ -1470,7 +1470,8 @@
 
 	/*starting retrieve the contact list*/
 	session->contact = msn_contact_new(session);
-	msn_contact_connect(session->contact);
+	msn_get_contact_list(session->contact);
+//	msn_contact_connect(session->contact);
 }
 
 static void

Modified: branches/soc-2006-msnp13/src/protocols/msn/oim.c
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/oim.c	2006-08-19 05:44:40 UTC (rev 16872)
+++ branches/soc-2006-msnp13/src/protocols/msn/oim.c	2006-08-19 05:52:13 UTC (rev 16873)
@@ -29,6 +29,8 @@
 
 /*Local Function Prototype*/
 static void msn_oim_post_single_get_msg(MsnOim *oim,const char *msgid);
+void msn_oim_retrieve_connect_init(MsnSoapConn *soapconn);
+void msn_oim_send_connect_init(MsnSoapConn *soapconn);
 
 /*new a OIM object*/
 MsnOim *
@@ -134,7 +136,7 @@
 					soap_body,
 					msn_oim_send_read_cb,
 					msn_oim_send_written_cb);
-	msn_soap_post(oim->sendconn,soap_request);
+	msn_soap_post(oim->sendconn,soap_request,msn_oim_send_connect_init);
 }
 
 void msn_oim_send_msg(MsnOim *oim,char *msg)
@@ -180,8 +182,6 @@
 	g_return_if_fail(session != NULL);
 
 	gaim_debug_info("MaYuan","oim get SOAP Server connected!\n");
-	/*call to get the message*/
-	msn_oim_get_msg(oim);
 }
 
 static void
@@ -193,9 +193,9 @@
 
 	gaim_debug_info("MaYuan","OIM get read buffer:{%s}\n",soapconn->body);
 
+	/*we need to process the read message!*/
 	/*get next single Offline Message*/
-	oim->oim_list = g_list_remove(oim->oim_list, oim->oim_list->data);
-//	msn_oim_get_msg(oim);
+//	oim->oim_list = g_list_remove(oim->oim_list, oim->oim_list->data);
 }
 
 static void
@@ -228,13 +228,8 @@
 		gaim_debug_info("MaYuan","E:{%s},I:{%s},rTime:{%s}\n",passport,msgid,rTime);
 //		msn_session_report_user(oim->session,passport,"hello");
 		oim->oim_list = g_list_append(oim->oim_list,msgid);
+		msn_oim_post_single_get_msg(oim,msgid);
 	}
-	if(msn_soap_connected(oim->retrieveconn) == -1){
-		gaim_debug_info("MaYuan","retreive OIM server not connected! We need to connect it first\n");
-		msn_oim_connect(oim);
-		return;
-	}
-	msn_oim_get_msg(oim);
 }
 
 static void msn_oim_post_single_get_msg(MsnOim *oim,const char *msgid)
@@ -258,37 +253,30 @@
 					soap_body,
 					msn_oim_get_read_cb,
 					msn_oim_get_written_cb);
-	msn_soap_post(oim->retrieveconn,soap_request);
+	msn_soap_post(oim->retrieveconn,soap_request,msn_oim_retrieve_connect_init);
 }
 
-/*MSN OIM get SOAP request*/
-void msn_oim_get_msg(MsnOim *oim)
-{
-	gaim_debug_info("MaYuan","Get OIM with SOAP \n");
-//	gaim_debug_info("MaYuan","oim->oim_list:%p,data:%s \n",oim->oim_list,oim->oim_list->data);
-	if(oim->oim_list !=NULL){
-		msn_oim_post_single_get_msg(oim,oim->oim_list->data);
-	}
-}
-
-/*msn oim server connect*/
+/*msn oim retrieve server connect init */
 void
-msn_oim_connect(MsnOim *oim)
+msn_oim_retrieve_connect_init(MsnSoapConn *soapconn)
 {
 	gaim_debug_info("MaYuan","msn_oim_connect...\n");
 
-	if(msn_soap_connected(oim->retrieveconn) == -1){
-		msn_soap_init(oim->retrieveconn,MSN_OIM_RETRIEVE_HOST,1,
+	if(msn_soap_connected(soapconn) == -1){
+		msn_soap_init(soapconn,MSN_OIM_RETRIEVE_HOST,1,
 					msn_oim_get_connect_cb,
 					msn_oim_get_error_cb);
 	}
-#if 0
-	if(msn_soap_connected(oim->sendconn) == -1){
-		msn_soap_init(oim->sendconn,MSN_OIM_SEND_HOST,1,
+}
+
+void msn_oim_send_connect_init(MsnSoapConn *sendconn)
+{
+	gaim_debug_info("MaYuan","msn oim send connect init...\n");
+	if(msn_soap_connected(sendconn) == -1){
+		msn_soap_init(sendconn,MSN_OIM_SEND_HOST,1,
 					msn_oim_send_connect_cb,
 					msn_oim_send_error_cb);
 	}
-#endif
 }
 
 /*endof oim.c*/

Modified: branches/soc-2006-msnp13/src/protocols/msn/soap.c
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/soap.c	2006-08-19 05:44:40 UTC (rev 16872)
+++ branches/soc-2006-msnp13/src/protocols/msn/soap.c	2006-08-19 05:52:13 UTC (rev 16873)
@@ -26,6 +26,12 @@
 #include "msn.h"
 #include "soap.h"
 
+void
+msn_soap_set_process_step(MsnSoapConn *soapconn, MsnSoapStep step)
+{
+	soapconn->step = step;
+}
+
 //msn_soap_new(MsnSession *session,gpointer data,int sslconn)
 /*new a soap connection*/
 MsnSoapConn *
@@ -42,6 +48,7 @@
 	soapconn->input_handler = -1;
 	soapconn->output_handler = -1;
 
+	msn_soap_set_process_step(soapconn,MSN_SOAP_UNCONNECTED);
 	soapconn->soap_queue = g_queue_new();
 	return soapconn;
 }
@@ -68,6 +75,7 @@
 		soapconn->connect_cb(data,gsc,cond);
 	}
 
+	msn_soap_set_process_step(soapconn,MSN_SOAP_CONNECTED);
 	/*we do the SOAP request here*/
 	msn_soap_post_head_request(soapconn);
 }
@@ -83,6 +91,7 @@
 	if(soapconn->error_cb != NULL){
 		soapconn->error_cb(gsc,error,data);
 	}
+	msn_soap_set_process_step(soapconn, MSN_SOAP_UNCONNECTED);
 }
 
 /*init the soap connection*/
@@ -97,6 +106,7 @@
 	soapconn->error_cb = error_cb;
 }
 
+/*connect the soap connection*/
 void
 msn_soap_connect(MsnSoapConn *soapconn)
 {
@@ -108,6 +118,7 @@
 	}
 }
 
+/*close the soap connection*/
 void
 msn_soap_close(MsnSoapConn *soapconn)
 {
@@ -118,6 +129,7 @@
 		}
 	}else{
 	}
+	msn_soap_set_process_step(soapconn,MSN_SOAP_UNCONNECTED);
 }
 
 /*destroy the soap connection*/
@@ -146,6 +158,7 @@
 	/*close ssl connection*/
 	msn_soap_close(soapconn);
 
+	/*process the unhandled soap request*/
 	while ((request = g_queue_pop_head(soapconn->soap_queue)) != NULL){
 		msn_soap_request_free(request);
 	}
@@ -154,15 +167,15 @@
 }
 
 /*check the soap is connected?
- * if connected return 0
+ * if connected return 1
  */
 int
 msn_soap_connected(MsnSoapConn *soapconn)
 {
 	if(soapconn->ssl_conn){
-		return (soapconn->gsc == NULL? -1 : 0);
+		return (soapconn->gsc == NULL? 0 : 1);
 	}
-	return(soapconn->fd>0? 0 : -1);
+	return(soapconn->fd>0? 1 : 0);
 }
 
 /*read and append the content to the buffer*/
@@ -475,26 +488,33 @@
 {
 	if(!g_queue_is_empty(soapconn->soap_queue)){
 		MsnSoapReq *request;
-	
 		if((request = g_queue_pop_head(soapconn->soap_queue)) != NULL){
 			msn_soap_post_request(soapconn,request);
 		}
 	}
+	msn_soap_set_process_step(soapconn,MSN_SOAP_CONNECTED_IDLE);
 }
 
 void
-msn_soap_post(MsnSoapConn *soapconn,MsnSoapReq *request)
+msn_soap_post(MsnSoapConn *soapconn,MsnSoapReq *request,
+				MsnSoapConnectInitFunction msn_soap_init_func)
 {
 	g_queue_push_tail(soapconn->soap_queue, request);
 	if(!msn_soap_connected(soapconn)){
 		/*not connected?connect it first*/
+		gaim_debug_info("Ma Yuan","soap is not connected!\n");
+		msn_soap_init_func(soapconn);
 		msn_soap_connect(soapconn);
 		return;
 	}
+	gaim_debug_info("Ma Yuan","soap  connected!\n");
 	/*if connected, what we only needed to do is to queue the request, 
 	 * when SOAP request in the queue processed done, will do this command.
 	 * we just waiting...
 	 */
+	if(soapconn->step == MSN_SOAP_CONNECTED_IDLE){
+		msn_soap_post_head_request(soapconn);
+	}
 }
 
 /*Post the soap request action*/
@@ -505,6 +525,7 @@
 	char * request_str = NULL;
 
 	gaim_debug_info("MaYuan","msn_soap_post()...\n");
+	msn_soap_set_process_step(soapconn,MSN_SOAP_PROCESSING);
 	soap_head = g_strdup_printf(
 					"POST %s HTTP/1.1\r\n"
 					"SOAPAction: %s\r\n"

Modified: branches/soc-2006-msnp13/src/protocols/msn/soap.h
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/soap.h	2006-08-19 05:44:40 UTC (rev 16872)
+++ branches/soc-2006-msnp13/src/protocols/msn/soap.h	2006-08-19 05:52:13 UTC (rev 16873)
@@ -28,12 +28,22 @@
 
 #define MSN_SOAP_READ_BUFF_SIZE		8192
 
+typedef enum
+{
+	MSN_SOAP_UNCONNECTED,
+	MSN_SOAP_CONNECTED,
+	MSN_SOAP_PROCESSING,
+	MSN_SOAP_CONNECTED_IDLE
+}MsnSoapStep;
+
 /*MSN SoapRequest structure*/
 typedef struct _MsnSoapReq MsnSoapReq;
 
 /*MSN Https connection structure*/
 typedef struct _MsnSoapConn MsnSoapConn;
 
+typedef void (*MsnSoapConnectInitFunction)(MsnSoapConn *);
+
 struct _MsnSoapReq{
 	/*request sequence*/
 	int	 id;
@@ -56,6 +66,7 @@
 	char *login_path;
 	char *soap_action;
 
+	MsnSoapStep step;
 	/*ssl connection?*/
 	guint	ssl_conn;
 	/*normal connection*/
@@ -109,10 +120,11 @@
 
 /*init a soap conneciton */
 void msn_soap_init(MsnSoapConn *soapconn,char * host,int ssl,GaimSslInputFunction connect_cb,GaimSslErrorFunction error_cb);
+void msn_soap_connect(MsnSoapConn *soapconn);
 
 /*write to soap*/
 void msn_soap_write(MsnSoapConn * soapconn, char *write_buf, GaimInputFunction written_cb);
-void msn_soap_post(MsnSoapConn *soapconn,MsnSoapReq *request);
+void msn_soap_post(MsnSoapConn *soapconn,MsnSoapReq *request,MsnSoapConnectInitFunction msn_soap_init_func);
 
 void  msn_soap_free_read_buf(MsnSoapConn *soapconn);
 void msn_soap_free_write_buf(MsnSoapConn *soapconn);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [16872] trunk/console/libgnt/test/keys.c

[<sa...@us...>]

Revision: 16872
Author:   sadrul
Date:     2006-08-18 22:44:40 -0700 (Fri, 18 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16872&view=rev

Log Message:
-----------
Test program to detect keycodes.

Added Paths:
-----------
    trunk/console/libgnt/test/keys.c
Added: trunk/console/libgnt/test/keys.c
===================================================================
--- trunk/console/libgnt/test/keys.c	                        (rev 0)
+++ trunk/console/libgnt/test/keys.c	2006-08-19 05:44:40 UTC (rev 16872)
@@ -0,0 +1,42 @@
+#include <gnt.h>
+#include <gntbox.h>
+#include <gntentry.h>
+#include <gntlabel.h>
+
+static gboolean
+print_keycode(GntEntry *entry, const char *text, gpointer null)
+{
+	char *s = g_strdup_printf("%s ", text);
+	gnt_entry_set_text(entry, s);
+	g_free(s);
+	if (text[0] == 27)
+		return FALSE;
+	else
+		return TRUE;
+}
+
+int main()
+{
+	GntWidget *window, *entry;
+
+	gnt_init();
+
+	freopen(".error", "w", stderr);
+
+	window = gnt_hbox_new(FALSE);
+	gnt_box_set_toplevel(GNT_BOX(window), TRUE);
+
+	gnt_box_add_widget(GNT_BOX(window), gnt_label_new("Press any key: "));
+
+	entry = gnt_entry_new(NULL);
+	gnt_box_add_widget(GNT_BOX(window), entry);
+	g_signal_connect(G_OBJECT(entry), "key_pressed", G_CALLBACK(print_keycode), NULL);
+
+	gnt_widget_set_position(window, getmaxx(stdscr) / 2 - 12, getmaxy(stdscr) / 2 - 3);
+	gnt_widget_show(window);
+
+	gnt_main();
+	gnt_quit();
+	return 0;
+}
+


Property changes on: trunk/console/libgnt/test/keys.c
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [16871] trunk/configure.ac

[<may...@us...>]

Revision: 16871
Author:   mayuan2006
Date:     2006-08-18 20:46:26 -0700 (Fri, 18 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16871&view=rev

Log Message:
-----------
change the configure.ac to avoid autogen error
committed by Ma Yuan<may...@gm...>

Modified Paths:
--------------
    trunk/configure.ac
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-08-19 03:38:23 UTC (rev 16870)
+++ trunk/configure.ac	2006-08-19 03:46:26 UTC (rev 16871)
@@ -639,6 +639,7 @@
     [
         AC_SUBST(GLIB_CFLAGS)
         AC_SUBST(GLIB_LIBS)
+	    echo "GLib 2.0 check OK!"
     ],
     [
         AC_MSG_ERROR([
@@ -654,6 +655,7 @@
        [
            AC_SUBST(GTK_CFLAGS)
            AC_SUBST(GTK_LIBS)
+		   echo "GTK+ 2.0 check OK!"
        ],
        [
            AC_MSG_ERROR([


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.