adium-1.4 2941:adae872b44bd: Fixed a missing bracket causing a b...
commits at adium.im
commits at adium.im
Wed May 12 13:00:22 UTC 2010
details: http://hg.adium.im/adium-1.4/rev/adae872b44bd
revision: 2941:adae872b44bd
author: Alan Humpherys
date: Thu Apr 29 09:08:02 2010 -0600
Fixed a missing bracket causing a build error.
Subject: adium-1.4 2942:07080b15053d: Fixed the easy part of 13870 by removing tr.im from the list of URL shorteners...
details: http://hg.adium.im/adium-1.4/rev/07080b15053d
revision: 2942:07080b15053d
author: Alan Humpherys
date: Wed May 12 06:54:16 2010 -0600
Fixed the easy part of 13870 by removing tr.im from the list of URL shorteners...
Still todo, removing it from the 2 places where adium uses tr.im as the url shortener for internal purposes.
Subject: adium-1.4 2943:f435795af2dd: Merge
details: http://hg.adium.im/adium-1.4/rev/f435795af2dd
revision: 2943:f435795af2dd
author: alangh
date: Wed May 12 06:57:21 2010 -0600
Merge
Subject: adium-1.4 2944:6748e5dd6ce5: merge
details: http://hg.adium.im/adium-1.4/rev/6748e5dd6ce5
revision: 2944:6748e5dd6ce5
author: alangh
date: Wed May 12 06:59:21 2010 -0600
merge
diffs (truncated from 91166 to 1000 lines):
diff -r acdf1d72ebcb -r 6748e5dd6ce5 Frameworks/Adium Framework/Resources/Authorize.tiff
Binary file Frameworks/Adium Framework/Resources/Authorize.tiff has changed
diff -r acdf1d72ebcb -r 6748e5dd6ce5 Frameworks/Adium Framework/Resources/Deny.tiff
Binary file Frameworks/Adium Framework/Resources/Deny.tiff has changed
diff -r acdf1d72ebcb -r 6748e5dd6ce5 Frameworks/Adium Framework/Resources/Ignore.tiff
Binary file Frameworks/Adium Framework/Resources/Ignore.tiff has changed
diff -r acdf1d72ebcb -r 6748e5dd6ce5 Frameworks/libglib.framework/Versions/2.0.0/Headers/gobject/gmarshal.h
--- a/Frameworks/libglib.framework/Versions/2.0.0/Headers/gobject/gmarshal.h Tue Apr 27 11:09:33 2010 -0500
+++ b/Frameworks/libglib.framework/Versions/2.0.0/Headers/gobject/gmarshal.h Wed May 12 06:59:21 2010 -0600
@@ -3,7 +3,7 @@
G_BEGIN_DECLS
-/* VOID:VOID (/Users/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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 acdf1d72ebcb -r 6748e5dd6ce5 Frameworks/libglib.framework/Versions/2.0.0/Resources/Info.plist
Binary file Frameworks/libglib.framework/Versions/2.0.0/Resources/Info.plist has changed
diff -r acdf1d72ebcb -r 6748e5dd6ce5 Frameworks/libglib.framework/Versions/2.0.0/libglib
Binary file Frameworks/libglib.framework/Versions/2.0.0/libglib has changed
diff -r acdf1d72ebcb -r 6748e5dd6ce5 Frameworks/libgmodule.framework/Versions/2.0.0/Resources/Info.plist
Binary file Frameworks/libgmodule.framework/Versions/2.0.0/Resources/Info.plist has changed
diff -r acdf1d72ebcb -r 6748e5dd6ce5 Frameworks/libgmodule.framework/Versions/2.0.0/libgmodule
Binary file Frameworks/libgmodule.framework/Versions/2.0.0/libgmodule has changed
diff -r acdf1d72ebcb -r 6748e5dd6ce5 Frameworks/libgobject.framework/Versions/2.0.0/Headers/gmarshal.h
--- a/Frameworks/libgobject.framework/Versions/2.0.0/Headers/gmarshal.h Tue Apr 27 11:09:33 2010 -0500
+++ b/Frameworks/libgobject.framework/Versions/2.0.0/Headers/gmarshal.h Wed May 12 06:59:21 2010 -0600
@@ -3,7 +3,7 @@
G_BEGIN_DECLS
-/* VOID:VOID (/Users/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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 acdf1d72ebcb -r 6748e5dd6ce5 Frameworks/libgobject.framework/Versions/2.0.0/Resources/Info.plist
Binary file Frameworks/libgobject.framework/Versions/2.0.0/Resources/Info.plist has changed
diff -r acdf1d72ebcb -r 6748e5dd6ce5 Frameworks/libgobject.framework/Versions/2.0.0/libgobject
Binary file Frameworks/libgobject.framework/Versions/2.0.0/libgobject has changed
diff -r acdf1d72ebcb -r 6748e5dd6ce5 Frameworks/libgthread.framework/Versions/2.0.0/Resources/Info.plist
Binary file Frameworks/libgthread.framework/Versions/2.0.0/Resources/Info.plist has changed
diff -r acdf1d72ebcb -r 6748e5dd6ce5 Frameworks/libgthread.framework/Versions/2.0.0/libgthread
Binary file Frameworks/libgthread.framework/Versions/2.0.0/libgthread has changed
diff -r acdf1d72ebcb -r 6748e5dd6ce5 Frameworks/libintl.framework/Versions/8/Resources/Info.plist
Binary file Frameworks/libintl.framework/Versions/8/Resources/Info.plist has changed
diff -r acdf1d72ebcb -r 6748e5dd6ce5 Frameworks/libintl.framework/Versions/8/libintl
Binary file Frameworks/libintl.framework/Versions/8/libintl has changed
diff -r acdf1d72ebcb -r 6748e5dd6ce5 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 Tue Apr 27 11:09:33 2010 -0500
+++ b/Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-enum-types.h Wed May 12 06:59:21 2010 -0600
@@ -12,11 +12,11 @@
G_BEGIN_DECLS
-/* enumerations from "/Users/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/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 acdf1d72ebcb -r 6748e5dd6ce5 Frameworks/libjson-glib.framework/Versions/1.0.0/Resources/Info.plist
Binary file Frameworks/libjson-glib.framework/Versions/1.0.0/Resources/Info.plist has changed
diff -r acdf1d72ebcb -r 6748e5dd6ce5 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 acdf1d72ebcb -r 6748e5dd6ce5 Frameworks/libmeanwhile.framework/Versions/1/Resources/Info.plist
Binary file Frameworks/libmeanwhile.framework/Versions/1/Resources/Info.plist has changed
diff -r acdf1d72ebcb -r 6748e5dd6ce5 Frameworks/libmeanwhile.framework/Versions/1/libmeanwhile
Binary file Frameworks/libmeanwhile.framework/Versions/1/libmeanwhile has changed
diff -r acdf1d72ebcb -r 6748e5dd6ce5 Frameworks/libpurple.framework/Versions/0.6.5/Headers/account.h
--- a/Frameworks/libpurple.framework/Versions/0.6.5/Headers/account.h Tue Apr 27 11:09:33 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1065 +0,0 @@
-/**
- * @file account.h Account API
- * @ingroup core
- * @see @ref account-signals
- */
-
-/* purple
- *
- * Purple is the legal property of its developers, whose names are too numerous
- * to list here. Please refer to the COPYRIGHT file distributed with this
- * source distribution.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
- */
-#ifndef _PURPLE_ACCOUNT_H_
-#define _PURPLE_ACCOUNT_H_
-
-#include <glib.h>
-#include <glib-object.h>
-
-/** @copydoc _PurpleAccountUiOps */
-typedef struct _PurpleAccountUiOps PurpleAccountUiOps;
-/** @copydoc _PurpleAccount */
-typedef struct _PurpleAccount PurpleAccount;
-
-typedef gboolean (*PurpleFilterAccountFunc)(PurpleAccount *account);
-typedef void (*PurpleAccountRequestAuthorizationCb)(void *);
-typedef void (*PurpleAccountRegistrationCb)(PurpleAccount *account, gboolean succeeded, void *user_data);
-typedef void (*PurpleAccountUnregistrationCb)(PurpleAccount *account, gboolean succeeded, void *user_data);
-
-#include "connection.h"
-#include "log.h"
-#include "privacy.h"
-#include "proxy.h"
-#include "prpl.h"
-#include "status.h"
-
-/**
- * Account request types.
- */
-typedef enum
-{
- PURPLE_ACCOUNT_REQUEST_AUTHORIZATION = 0 /* Account authorization request */
-} PurpleAccountRequestType;
-
-
-/** Account UI operations, used to notify the user of status changes and when
- * buddies add this account to their buddy lists.
- */
-struct _PurpleAccountUiOps
-{
- /** A buddy who is already on this account's buddy list added this account
- * to their buddy list.
- */
- void (*notify_added)(PurpleAccount *account,
- const char *remote_user,
- const char *id,
- const char *alias,
- const char *message);
-
- /** This account's status changed. */
- void (*status_changed)(PurpleAccount *account,
- PurpleStatus *status);
-
- /** Someone we don't have on our list added us; prompt to add them. */
- void (*request_add)(PurpleAccount *account,
- const char *remote_user,
- const char *id,
- const char *alias,
- const char *message);
-
- /** Prompt for authorization when someone adds this account to their buddy
- * list. To authorize them to see this account's presence, call \a
- * authorize_cb (\a user_data); otherwise call \a deny_cb (\a user_data);
- * @return a UI-specific handle, as passed to #close_account_request.
- */
- void *(*request_authorize)(PurpleAccount *account,
- const char *remote_user,
- const char *id,
- const char *alias,
- const char *message,
- gboolean on_list,
- PurpleAccountRequestAuthorizationCb authorize_cb,
- PurpleAccountRequestAuthorizationCb deny_cb,
- void *user_data);
-
- /** Close a pending request for authorization. \a ui_handle is a handle
- * as returned by #request_authorize.
- */
- void (*close_account_request)(void *ui_handle);
-
- void (*_purple_reserved1)(void);
- void (*_purple_reserved2)(void);
- void (*_purple_reserved3)(void);
- void (*_purple_reserved4)(void);
-};
-
-/** Structure representing an account.
- */
-struct _PurpleAccount
-{
- char *username; /**< The username. */
- char *alias; /**< How you appear to yourself. */
- char *password; /**< The account password. */
- char *user_info; /**< User information. */
-
- char *buddy_icon_path; /**< The buddy icon's non-cached path. */
-
- gboolean remember_pass; /**< Remember the password. */
-
- char *protocol_id; /**< The ID of the protocol. */
-
- PurpleConnection *gc; /**< The connection handle. */
- gboolean disconnecting; /**< The account is currently disconnecting */
-
- GHashTable *settings; /**< Protocol-specific settings. */
- GHashTable *ui_settings; /**< UI-specific settings. */
-
- PurpleProxyInfo *proxy_info; /**< Proxy information. This will be set */
- /* to NULL when the account inherits */
- /* proxy settings from global prefs. */
-
- /*
- * TODO: Supplementing the next two linked lists with hash tables
- * should help performance a lot when these lists are long. This
- * matters quite a bit for protocols like MSN, where all your
- * buddies are added to your permit list. Currently we have to
- * iterate through the entire list if we want to check if someone
- * is permitted or denied. We should do this for 3.0.0.
- */
- GSList *permit; /**< Permit list. */
- GSList *deny; /**< Deny list. */
- PurplePrivacyType perm_deny; /**< The permit/deny setting. */
-
- GList *status_types; /**< Status types. */
-
- PurplePresence *presence; /**< Presence. */
- PurpleLog *system_log; /**< The system log */
-
- void *ui_data; /**< The UI can put data here. */
- PurpleAccountRegistrationCb registration_cb;
- void *registration_cb_user_data;
-
- gpointer priv; /**< Pointer to opaque private data. */
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**************************************************************************/
-/** @name Account API */
-/**************************************************************************/
-/*@{*/
-
-/**
- * Creates a new account.
- *
- * @param username The username.
- * @param protocol_id The protocol ID.
- *
- * @return The new account.
- */
-PurpleAccount *purple_account_new(const char *username, const char *protocol_id);
-
-/**
- * Destroys an account.
- *
- * @param account The account to destroy.
- */
-void purple_account_destroy(PurpleAccount *account);
-
-/**
- * Connects to an account.
- *
- * @param account The account to connect to.
- */
-void purple_account_connect(PurpleAccount *account);
-
-/**
- * Sets the callback for successful registration.
- *
- * @param account The account for which this callback should be used
- * @param cb The callback
- * @param user_data The user data passed to the callback
- */
-void purple_account_set_register_callback(PurpleAccount *account, PurpleAccountRegistrationCb cb, void *user_data);
-
-/**
- * Registers an account.
- *
- * @param account The account to register.
- */
-void purple_account_register(PurpleAccount *account);
-
-/**
- * Unregisters an account (deleting it from the server).
- *
- * @param account The account to unregister.
- * @param cb Optional callback to be called when unregistration is complete
- * @param user_data user data to pass to the callback
- */
-void purple_account_unregister(PurpleAccount *account, PurpleAccountUnregistrationCb cb, void *user_data);
-
-/**
- * Disconnects from an account.
- *
- * @param account The account to disconnect from.
- */
-void purple_account_disconnect(PurpleAccount *account);
-
-/**
- * Notifies the user that the account was added to a remote user's
- * buddy list.
- *
- * This will present a dialog informing the user that he was added to the
- * remote user's buddy list.
- *
- * @param account The account that was added.
- * @param remote_user The name of the user that added this account.
- * @param id The optional ID of the local account. Rarely used.
- * @param alias The optional alias of the user.
- * @param message The optional message sent from the user adding you.
- */
-void purple_account_notify_added(PurpleAccount *account, const char *remote_user,
- const char *id, const char *alias,
- const char *message);
-
-/**
- * Notifies the user that the account was addded to a remote user's buddy
- * list and asks ther user if they want to add the remote user to their buddy
- * list.
- *
- * This will present a dialog informing the local user that the remote user
- * added them to the remote user's buddy list and will ask if they want to add
- * the remote user to the buddy list.
- *
- * @param account The account that was added.
- * @param remote_user The name of the user that added this account.
- * @param id The optional ID of the local account. Rarely used.
- * @param alias The optional alias of the user.
- * @param message The optional message sent from the user adding you.
- */
-void purple_account_request_add(PurpleAccount *account, const char *remote_user,
- const char *id, const char *alias,
- const char *message);
-
-/**
- * Notifies the user that a remote user has wants to add the local user
- * to his or her buddy list and requires authorization to do so.
- *
- * This will present a dialog informing the user of this and ask if the
- * user authorizes or denies the remote user from adding him.
- *
- * @param account The account that was added
- * @param remote_user The name of the user that added this account.
- * @param id The optional ID of the local account. Rarely used.
- * @param alias The optional alias of the remote user.
- * @param message The optional message sent by the user wanting to add you.
- * @param on_list Is the remote user already on the buddy list?
- * @param auth_cb The callback called when the local user accepts
- * @param deny_cb The callback called when the local user rejects
- * @param user_data Data to be passed back to the above callbacks
- *
- * @return A UI-specific handle.
- */
-void *purple_account_request_authorization(PurpleAccount *account, const char *remote_user,
- const char *id, const char *alias, const char *message, gboolean on_list,
- PurpleAccountRequestAuthorizationCb auth_cb, PurpleAccountRequestAuthorizationCb deny_cb, void *user_data);
-
-/**
- * Close account requests registered for the given PurpleAccount
- *
- * @param account The account for which requests should be closed
- */
-void purple_account_request_close_with_account(PurpleAccount *account);
-
-/**
- * Close the account request for the given ui handle
- *
- * @param ui_handle The ui specific handle for which requests should be closed
- */
-void purple_account_request_close(void *ui_handle);
-
-/**
- * Requests a password from the user for the account. Does not set the
- * account password on success; do that in ok_cb if desired.
- *
- * @param account The account to request the password for.
- * @param ok_cb The callback for the OK button.
- * @param cancel_cb The callback for the cancel button.
- * @param user_data User data to be passed into callbacks.
- */
-void purple_account_request_password(PurpleAccount *account, GCallback ok_cb,
- GCallback cancel_cb, void *user_data);
-
-/**
- * Requests information from the user to change the account's password.
- *
- * @param account The account to change the password on.
- */
-void purple_account_request_change_password(PurpleAccount *account);
-
-/**
- * Requests information from the user to change the account's
- * user information.
- *
- * @param account The account to change the user information on.
- */
-void purple_account_request_change_user_info(PurpleAccount *account);
-
-/**
- * Sets the account's username.
- *
- * @param account The account.
- * @param username The username.
- */
-void purple_account_set_username(PurpleAccount *account, const char *username);
-
-/**
- * Sets the account's password.
- *
- * @param account The account.
- * @param password The password.
- */
-void purple_account_set_password(PurpleAccount *account, const char *password);
-
-/**
- * Sets the account's alias.
- *
- * @param account The account.
- * @param alias The alias.
- */
-void purple_account_set_alias(PurpleAccount *account, const char *alias);
-
-/**
- * Sets the account's user information
- *
- * @param account The account.
- * @param user_info The user information.
- */
-void purple_account_set_user_info(PurpleAccount *account, const char *user_info);
-
-/**
- * Sets the account's buddy icon path.
- *
- * @param account The account.
- * @param path The buddy icon non-cached path.
- */
-void purple_account_set_buddy_icon_path(PurpleAccount *account, const char *path);
-
-/**
- * Sets the account's protocol ID.
- *
- * @param account The account.
- * @param protocol_id The protocol ID.
- */
-void purple_account_set_protocol_id(PurpleAccount *account,
- const char *protocol_id);
-
-/**
- * Sets the account's connection.
- *
- * @param account The account.
- * @param gc The connection.
- */
-void purple_account_set_connection(PurpleAccount *account, PurpleConnection *gc);
-
-/**
- * Sets whether or not this account should save its password.
- *
- * @param account The account.
- * @param value @c TRUE if it should remember the password.
- */
-void purple_account_set_remember_password(PurpleAccount *account, gboolean value);
-
-/**
- * Sets whether or not this account should check for mail.
- *
- * @param account The account.
- * @param value @c TRUE if it should check for mail.
- */
-void purple_account_set_check_mail(PurpleAccount *account, gboolean value);
-
-/**
- * Sets whether or not this account is enabled for the specified
- * UI.
- *
- * @param account The account.
- * @param ui The UI.
- * @param value @c TRUE if it is enabled.
- */
-void purple_account_set_enabled(PurpleAccount *account, const char *ui,
- gboolean value);
-
-/**
- * Sets the account's proxy information.
- *
- * @param account The account.
- * @param info The proxy information.
- */
-void purple_account_set_proxy_info(PurpleAccount *account, PurpleProxyInfo *info);
-
-/**
- * Sets the account's status types.
- *
- * @param account The account.
- * @param status_types The list of status types.
- */
-void purple_account_set_status_types(PurpleAccount *account, GList *status_types);
-
-/**
- * Variadic version of purple_account_set_status_list(); the variadic list
- * replaces @a attrs, and should be <tt>NULL</tt>-terminated.
- *
- * @copydoc purple_account_set_status_list()
- */
-void purple_account_set_status(PurpleAccount *account, const char *status_id,
- gboolean active, ...) G_GNUC_NULL_TERMINATED;
-
-
-/**
- * Activates or deactivates a status. All changes to the statuses of
- * an account go through this function or purple_account_set_status().
- *
- * You can only deactivate an exclusive status by activating another exclusive
- * status. So, if @a status_id is an exclusive status and @a active is @c
- * FALSE, this function does nothing.
- *
- * @param account The account.
- * @param status_id The ID of the status.
- * @param active Whether @a status_id is to be activated (<tt>TRUE</tt>) or
- * deactivated (<tt>FALSE</tt>).
- * @param attrs A list of <tt>const char *</tt> attribute names followed by
- * <tt>const char *</tt> attribute values for the status.
- * (For example, one pair might be <tt>"message"</tt> followed
- * by <tt>"hello, talk to me!"</tt>.)
- */
-void purple_account_set_status_list(PurpleAccount *account,
- const char *status_id, gboolean active, GList *attrs);
-
-/**
- * Clears all protocol-specific settings on an account.
- *
- * @param account The account.
- */
-void purple_account_clear_settings(PurpleAccount *account);
-
-/**
- * Removes an account-specific setting by name.
- *
- * @param account The account.
- * @param setting The setting to remove.
- *
- * @since 2.6.0
- */
-void purple_account_remove_setting(PurpleAccount *account, const char *setting);
-
-/**
- * Sets a protocol-specific integer setting for an account.
- *
- * @param account The account.
- * @param name The name of the setting.
- * @param value The setting's value.
- */
-void purple_account_set_int(PurpleAccount *account, const char *name, int value);
-
-/**
- * Sets a protocol-specific string setting for an account.
- *
- * @param account The account.
- * @param name The name of the setting.
- * @param value The setting's value.
- */
-void purple_account_set_string(PurpleAccount *account, const char *name,
- const char *value);
-
-/**
- * Sets a protocol-specific boolean setting for an account.
- *
- * @param account The account.
- * @param name The name of the setting.
- * @param value The setting's value.
- */
-void purple_account_set_bool(PurpleAccount *account, const char *name,
- gboolean value);
-
-/**
- * Sets a UI-specific integer setting for an account.
- *
- * @param account The account.
- * @param ui The UI name.
- * @param name The name of the setting.
- * @param value The setting's value.
- */
-void purple_account_set_ui_int(PurpleAccount *account, const char *ui,
- const char *name, int value);
-
-/**
- * Sets a UI-specific string setting for an account.
- *
- * @param account The account.
- * @param ui The UI name.
- * @param name The name of the setting.
- * @param value The setting's value.
- */
-void purple_account_set_ui_string(PurpleAccount *account, const char *ui,
- const char *name, const char *value);
-
-/**
- * Sets a UI-specific boolean setting for an account.
- *
- * @param account The account.
- * @param ui The UI name.
- * @param name The name of the setting.
- * @param value The setting's value.
- */
-void purple_account_set_ui_bool(PurpleAccount *account, const char *ui,
- const char *name, gboolean value);
-
-/**
- * Returns whether or not the account is connected.
- *
- * @param account The account.
- *
- * @return @c TRUE if connected, or @c FALSE otherwise.
- */
-gboolean purple_account_is_connected(const PurpleAccount *account);
-
-/**
- * Returns whether or not the account is connecting.
- *
- * @param account The account.
- *
- * @return @c TRUE if connecting, or @c FALSE otherwise.
- */
-gboolean purple_account_is_connecting(const PurpleAccount *account);
-
-/**
- * Returns whether or not the account is disconnected.
- *
- * @param account The account.
- *
- * @return @c TRUE if disconnected, or @c FALSE otherwise.
- */
-gboolean purple_account_is_disconnected(const PurpleAccount *account);
-
-/**
- * Returns the account's username.
- *
- * @param account The account.
- *
- * @return The username.
- */
-const char *purple_account_get_username(const PurpleAccount *account);
-
-/**
- * Returns the account's password.
- *
- * @param account The account.
- *
- * @return The password.
- */
-const char *purple_account_get_password(const PurpleAccount *account);
-
-/**
- * Returns the account's alias.
More information about the commits
mailing list