adium-1.4 3045:4aaa72b6565d: libpurple.framework im.pidgin.adium...
commits at adium.im
commits at adium.im
Mon Sep 20 03:29:18 UTC 2010
details: http://hg.adium.im/adium-1.4/rev/4aaa72b6565d
revision: 3045:4aaa72b6565d
author: Evan Schoenberg
date: Sun Sep 19 22:28:22 2010 -0500
libpurple.framework im.pidgin.adium.1-4 @ f60a4d47fcae2dbbb90b7941acdf05525698690c and supporting frameworks, which fixes #14153 (pluck of 9bb423c075e503083363981f5e96b3ad800182fd to allow Google Talk accounts which use non-gmail/googlemail.com usernames to connect)
diffs (494 lines):
diff -r 7cce8380a017 -r 4aaa72b6565d Frameworks/libglib.framework/Versions/2.0.0/Headers/gobject/gmarshal.h
--- a/Frameworks/libglib.framework/Versions/2.0.0/Headers/gobject/gmarshal.h Sun Sep 19 22:25:53 2010 -0500
+++ b/Frameworks/libglib.framework/Versions/2.0.0/Headers/gobject/gmarshal.h Sun Sep 19 22:28:22 2010 -0500
@@ -3,7 +3,7 @@
G_BEGIN_DECLS
-/* VOID:VOID (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:26) */
+/* VOID:VOID (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:26) */
extern void g_cclosure_marshal_VOID__VOID (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -11,7 +11,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:BOOLEAN (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:27) */
+/* VOID:BOOLEAN (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:27) */
extern void g_cclosure_marshal_VOID__BOOLEAN (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -19,7 +19,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:CHAR (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:28) */
+/* VOID:CHAR (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:28) */
extern void g_cclosure_marshal_VOID__CHAR (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -27,7 +27,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:UCHAR (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:29) */
+/* VOID:UCHAR (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:29) */
extern void g_cclosure_marshal_VOID__UCHAR (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -35,7 +35,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:INT (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:30) */
+/* VOID:INT (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:30) */
extern void g_cclosure_marshal_VOID__INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -43,7 +43,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:UINT (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:31) */
+/* VOID:UINT (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:31) */
extern void g_cclosure_marshal_VOID__UINT (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -51,7 +51,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:LONG (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:32) */
+/* VOID:LONG (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:32) */
extern void g_cclosure_marshal_VOID__LONG (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -59,7 +59,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:ULONG (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:33) */
+/* VOID:ULONG (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:33) */
extern void g_cclosure_marshal_VOID__ULONG (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -67,7 +67,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:ENUM (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:34) */
+/* VOID:ENUM (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:34) */
extern void g_cclosure_marshal_VOID__ENUM (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -75,7 +75,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:FLAGS (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:35) */
+/* VOID:FLAGS (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:35) */
extern void g_cclosure_marshal_VOID__FLAGS (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -83,7 +83,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:FLOAT (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:36) */
+/* VOID:FLOAT (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:36) */
extern void g_cclosure_marshal_VOID__FLOAT (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -91,7 +91,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:DOUBLE (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:37) */
+/* VOID:DOUBLE (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:37) */
extern void g_cclosure_marshal_VOID__DOUBLE (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -99,7 +99,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:STRING (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:38) */
+/* VOID:STRING (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:38) */
extern void g_cclosure_marshal_VOID__STRING (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -107,7 +107,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:PARAM (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:39) */
+/* VOID:PARAM (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:39) */
extern void g_cclosure_marshal_VOID__PARAM (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -115,7 +115,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:BOXED (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:40) */
+/* VOID:BOXED (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:40) */
extern void g_cclosure_marshal_VOID__BOXED (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -123,7 +123,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:POINTER (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:41) */
+/* VOID:POINTER (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:41) */
extern void g_cclosure_marshal_VOID__POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -131,7 +131,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:OBJECT (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:42) */
+/* VOID:OBJECT (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:42) */
extern void g_cclosure_marshal_VOID__OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -139,7 +139,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:UINT,POINTER (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:45) */
+/* VOID:UINT,POINTER (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:45) */
extern void g_cclosure_marshal_VOID__UINT_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -147,7 +147,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* BOOL:FLAGS (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:46) */
+/* BOOL:FLAGS (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:46) */
extern void g_cclosure_marshal_BOOLEAN__FLAGS (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -156,7 +156,7 @@
gpointer marshal_data);
#define g_cclosure_marshal_BOOL__FLAGS g_cclosure_marshal_BOOLEAN__FLAGS
-/* STRING:OBJECT,POINTER (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:47) */
+/* STRING:OBJECT,POINTER (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:47) */
extern void g_cclosure_marshal_STRING__OBJECT_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
diff -r 7cce8380a017 -r 4aaa72b6565d Frameworks/libglib.framework/Versions/2.0.0/libglib
Binary file Frameworks/libglib.framework/Versions/2.0.0/libglib has changed
diff -r 7cce8380a017 -r 4aaa72b6565d Frameworks/libgmodule.framework/Versions/2.0.0/libgmodule
Binary file Frameworks/libgmodule.framework/Versions/2.0.0/libgmodule has changed
diff -r 7cce8380a017 -r 4aaa72b6565d Frameworks/libgobject.framework/Versions/2.0.0/Headers/gmarshal.h
--- a/Frameworks/libgobject.framework/Versions/2.0.0/Headers/gmarshal.h Sun Sep 19 22:25:53 2010 -0500
+++ b/Frameworks/libgobject.framework/Versions/2.0.0/Headers/gmarshal.h Sun Sep 19 22:28:22 2010 -0500
@@ -3,7 +3,7 @@
G_BEGIN_DECLS
-/* VOID:VOID (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:26) */
+/* VOID:VOID (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:26) */
extern void g_cclosure_marshal_VOID__VOID (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -11,7 +11,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:BOOLEAN (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:27) */
+/* VOID:BOOLEAN (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:27) */
extern void g_cclosure_marshal_VOID__BOOLEAN (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -19,7 +19,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:CHAR (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:28) */
+/* VOID:CHAR (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:28) */
extern void g_cclosure_marshal_VOID__CHAR (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -27,7 +27,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:UCHAR (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:29) */
+/* VOID:UCHAR (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:29) */
extern void g_cclosure_marshal_VOID__UCHAR (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -35,7 +35,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:INT (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:30) */
+/* VOID:INT (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:30) */
extern void g_cclosure_marshal_VOID__INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -43,7 +43,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:UINT (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:31) */
+/* VOID:UINT (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:31) */
extern void g_cclosure_marshal_VOID__UINT (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -51,7 +51,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:LONG (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:32) */
+/* VOID:LONG (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:32) */
extern void g_cclosure_marshal_VOID__LONG (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -59,7 +59,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:ULONG (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:33) */
+/* VOID:ULONG (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:33) */
extern void g_cclosure_marshal_VOID__ULONG (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -67,7 +67,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:ENUM (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:34) */
+/* VOID:ENUM (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:34) */
extern void g_cclosure_marshal_VOID__ENUM (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -75,7 +75,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:FLAGS (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:35) */
+/* VOID:FLAGS (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:35) */
extern void g_cclosure_marshal_VOID__FLAGS (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -83,7 +83,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:FLOAT (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:36) */
+/* VOID:FLOAT (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:36) */
extern void g_cclosure_marshal_VOID__FLOAT (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -91,7 +91,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:DOUBLE (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:37) */
+/* VOID:DOUBLE (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:37) */
extern void g_cclosure_marshal_VOID__DOUBLE (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -99,7 +99,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:STRING (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:38) */
+/* VOID:STRING (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:38) */
extern void g_cclosure_marshal_VOID__STRING (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -107,7 +107,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:PARAM (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:39) */
+/* VOID:PARAM (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:39) */
extern void g_cclosure_marshal_VOID__PARAM (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -115,7 +115,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:BOXED (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:40) */
+/* VOID:BOXED (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:40) */
extern void g_cclosure_marshal_VOID__BOXED (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -123,7 +123,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:POINTER (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:41) */
+/* VOID:POINTER (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:41) */
extern void g_cclosure_marshal_VOID__POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -131,7 +131,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:OBJECT (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:42) */
+/* VOID:OBJECT (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:42) */
extern void g_cclosure_marshal_VOID__OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -139,7 +139,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:UINT,POINTER (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:45) */
+/* VOID:UINT,POINTER (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:45) */
extern void g_cclosure_marshal_VOID__UINT_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -147,7 +147,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* BOOL:FLAGS (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:46) */
+/* BOOL:FLAGS (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:46) */
extern void g_cclosure_marshal_BOOLEAN__FLAGS (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -156,7 +156,7 @@
gpointer marshal_data);
#define g_cclosure_marshal_BOOL__FLAGS g_cclosure_marshal_BOOLEAN__FLAGS
-/* STRING:OBJECT,POINTER (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:47) */
+/* STRING:OBJECT,POINTER (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:47) */
extern void g_cclosure_marshal_STRING__OBJECT_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
diff -r 7cce8380a017 -r 4aaa72b6565d Frameworks/libgobject.framework/Versions/2.0.0/libgobject
Binary file Frameworks/libgobject.framework/Versions/2.0.0/libgobject has changed
diff -r 7cce8380a017 -r 4aaa72b6565d Frameworks/libgthread.framework/Versions/2.0.0/libgthread
Binary file Frameworks/libgthread.framework/Versions/2.0.0/libgthread has changed
diff -r 7cce8380a017 -r 4aaa72b6565d Frameworks/libintl.framework/Versions/8/libintl
Binary file Frameworks/libintl.framework/Versions/8/libintl has changed
diff -r 7cce8380a017 -r 4aaa72b6565d Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-enum-types.h
--- a/Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-enum-types.h Sun Sep 19 22:25:53 2010 -0500
+++ b/Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-enum-types.h Sun Sep 19 22:28:22 2010 -0500
@@ -12,11 +12,11 @@
G_BEGIN_DECLS
-/* enumerations from "/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/json-glib-0.9.2/json-glib/json-parser.h" */
+/* enumerations from "/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/json-glib-0.9.2/json-glib/json-parser.h" */
GType json_parser_error_get_type (void) G_GNUC_CONST;
#define JSON_TYPE_PARSER_ERROR (json_parser_error_get_type())
-/* enumerations from "/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/json-glib-0.9.2/json-glib/json-types.h" */
+/* enumerations from "/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/json-glib-0.9.2/json-glib/json-types.h" */
GType json_node_type_get_type (void) G_GNUC_CONST;
#define JSON_TYPE_NODE_TYPE (json_node_type_get_type())
diff -r 7cce8380a017 -r 4aaa72b6565d Frameworks/libjson-glib.framework/Versions/1.0.0/libjson-glib
Binary file Frameworks/libjson-glib.framework/Versions/1.0.0/libjson-glib has changed
diff -r 7cce8380a017 -r 4aaa72b6565d Frameworks/libmeanwhile.framework/Versions/1/libmeanwhile
Binary file Frameworks/libmeanwhile.framework/Versions/1/libmeanwhile has changed
diff -r 7cce8380a017 -r 4aaa72b6565d Frameworks/libpurple.framework/Versions/0/Headers/marshallers.h
--- a/Frameworks/libpurple.framework/Versions/0/Headers/marshallers.h Sun Sep 19 22:25:53 2010 -0500
+++ b/Frameworks/libpurple.framework/Versions/0/Headers/marshallers.h Sun Sep 19 22:28:22 2010 -0500
@@ -6,7 +6,7 @@
G_BEGIN_DECLS
-/* VOID:POINTER,POINTER,OBJECT (/Users/wixardy/dev/pidgin/1.4/libpurple/marshallers.list:1) */
+/* VOID:POINTER,POINTER,OBJECT (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:1) */
extern void purple_smarshal_VOID__POINTER_POINTER_OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -14,7 +14,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* BOOLEAN:OBJECT,POINTER,STRING (/Users/wixardy/dev/pidgin/1.4/libpurple/marshallers.list:2) */
+/* BOOLEAN:OBJECT,POINTER,STRING (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:2) */
extern void purple_smarshal_BOOLEAN__OBJECT_POINTER_STRING (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -22,7 +22,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:STRING,STRING (/Users/wixardy/dev/pidgin/1.4/libpurple/marshallers.list:3) */
+/* VOID:STRING,STRING (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:3) */
extern void purple_smarshal_VOID__STRING_STRING (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -30,7 +30,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:STRING,STRING,DOUBLE (/Users/wixardy/dev/pidgin/1.4/libpurple/marshallers.list:4) */
+/* VOID:STRING,STRING,DOUBLE (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:4) */
extern void purple_smarshal_VOID__STRING_STRING_DOUBLE (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -38,7 +38,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:ENUM,STRING,STRING (/Users/wixardy/dev/pidgin/1.4/libpurple/marshallers.list:5) */
+/* VOID:ENUM,STRING,STRING (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:5) */
extern void purple_smarshal_VOID__ENUM_STRING_STRING (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -46,7 +46,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:ENUM,STRING,STRING,BOOLEAN (/Users/wixardy/dev/pidgin/1.4/libpurple/marshallers.list:6) */
+/* VOID:ENUM,STRING,STRING,BOOLEAN (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:6) */
extern void purple_smarshal_VOID__ENUM_STRING_STRING_BOOLEAN (GClosure *closure,
GValue *return_value,
guint n_param_values,
diff -r 7cce8380a017 -r 4aaa72b6565d Frameworks/libpurple.framework/Versions/0/Headers/session.h
--- a/Frameworks/libpurple.framework/Versions/0/Headers/session.h Sun Sep 19 22:25:53 2010 -0500
+++ b/Frameworks/libpurple.framework/Versions/0/Headers/session.h Sun Sep 19 22:28:22 2010 -0500
@@ -59,6 +59,8 @@
#define MSN_LOGIN_STEPS MSN_LOGIN_STEP_END
+#define MSN_LOGIN_FQY_TIMEOUT 30
+
#include "group.h"
#include "httpconn.h"
#include "nexus.h"
@@ -83,6 +85,7 @@
gboolean connected;
gboolean logged_in; /**< A temporal flag to ignore local buddy list adds. */
int adl_fqy; /**< A count of ADL/FQY so status is only changed once. */
+ guint login_timeout; /**< Timeout to force status change if ADL/FQY fail. */
gboolean destroying; /**< A flag that states if the session is being destroyed. */
gboolean http_method;
@@ -213,7 +216,16 @@
const char *info);
/**
- * Sets the current step in the login proccess.
+ * Starts a timeout to initiate finishing login. Sometimes the server ignores
+ * our FQY requests, so this forces ourselves online eventually.
+ *
+ * @param session The MSN session.
+ */
+void
+msn_session_activate_login_timeout(MsnSession *session);
+
+/**
+ * Sets the current step in the login process.
*
* @param session The MSN session.
* @param step The current step.
diff -r 7cce8380a017 -r 4aaa72b6565d Frameworks/libpurple.framework/Versions/0/libpurple
Binary file Frameworks/libpurple.framework/Versions/0/libpurple has changed
More information about the commits
mailing list