soc.2010.detachablepurple: 59851f3c: Moved and renamed the nullmarshaller, fr...

[gillux at soc.pidgin.im]

----------------------------------------------------------------------
Revision: 59851f3cb683e9172dce6c8b90c5079f9b543d78
Parent:   798e660b29e50fc0eba6dc2a2443d73398a5db8f
Author:   gillux at soc.pidgin.im
Date:     07/30/10 11:30:24
Branch:   im.pidgin.soc.2010.detachablepurple
URL: http://d.pidgin.im/viewmtn/revision/info/59851f3cb683e9172dce6c8b90c5079f9b543d78

Changelog: 

Moved and renamed the nullmarshaller, from purpled to libpurple. It will be used
in both, finally.

Changes against parent 798e660b29e50fc0eba6dc2a2443d73398a5db8f

  renamed  purpled/nullmarshaller.c
       to  libpurple/nullmarshaller.c
  renamed  purpled/nullmarshaller.h
       to  libpurple/nullmarshaller.h
  patched  libpurple/Makefile.am
  patched  libpurple/nullmarshaller.c
  patched  libpurple/nullmarshaller.h
  patched  purpled/Makefile.am
  patched  purpled/purpled-account.c

-------------- next part --------------
============================================================
--- libpurple/Makefile.am	0760cf159291af221ce54c6ce4c2ee5844aec023
+++ libpurple/Makefile.am	f9fdfd548e90d78c5c13208d85412bae326603e9
@@ -82,6 +82,7 @@ purple_coresources = \
 	network.c \
 	ntlm.c \
 	notify.c \
+	nullmarshaller.c \
 	plugin.c \
 	pluginpref.c \
 	pobject.c \
@@ -163,6 +164,7 @@ purple_coreheaders = \
 	nat-pmp.h \
 	network.h \
 	notify.h \
+	nullmarshaller.h \
 	ntlm.h \
 	plugin.h \
 	pluginpref.h \
============================================================
--- purpled/Makefile.am	fb15ce6071d8906607f80620ea3bce90f35f21c3
+++ purpled/Makefile.am	f034626f8db2c1b7005adc8d70fbfae7b30789f5
@@ -10,10 +10,10 @@ purpled_SOURCES = \
 bin_PROGRAMS = purpled
 
 purpled_SOURCES = \
-	purpled.c purpled-account.c nullmarshaller.c
+	purpled.c purpled-account.c
 
 purpled_headers = \
-	purpled.h purpled-account.h nullmarshaller.h
+	purpled.h purpled-account.h
 
 purpled_LDFLAGS = 
 purpled_LDADD = \
============================================================
--- purpled/purpled-account.c	c9ae5fad090fa0906cec1c21e57bfb1ffc256ca4
+++ purpled/purpled-account.c	93feb368857bb7d4b9b778e1de8e73649cbfdbdb
@@ -73,8 +73,8 @@ purpled_account_request_authorize(Purple
 	 * the PurpleDBusCallback object */
 	auth_closure = g_cclosure_new(G_CALLBACK(auth_cb), data, NULL);
 	deny_closure = g_cclosure_new(G_CALLBACK(deny_cb), data, NULL);
-	g_closure_set_marshal(auth_closure, purpled_nullmarshaller);
-	g_closure_set_marshal(deny_closure, purpled_nullmarshaller);
+	g_closure_set_marshal(auth_closure, purple_nullmarshaller);
+	g_closure_set_marshal(deny_closure, purple_nullmarshaller);
 	req_id = purple_callback_register_req(2, auth_closure, deny_closure);
 	g_return_val_if_fail(req_id > 0, NULL);
 
============================================================
--- purpled/nullmarshaller.c	932b2af022a35ae40664dee7c3dad616d9839b63
+++ libpurple/nullmarshaller.c	45a7365c37cb3b3aaa7783dc8fc66f6ca3b72fa0
@@ -4,9 +4,9 @@ void
 #include "nullmarshaller.h"
 
 void
-purpled_nullmarshaller(GClosure *closure, GValue *return_value,
-                       guint n_param_values, const GValue *param_values,
-                       gpointer invocation_hint, gpointer marshal_data)
+purple_nullmarshaller(GClosure *closure, GValue *return_value,
+                      guint n_param_values, const GValue *param_values,
+                      gpointer invocation_hint, gpointer marshal_data)
 {
 	GSourceFunc callback;
 	GCClosure *cc = (GCClosure*) closure;
============================================================
--- purpled/nullmarshaller.h	39cc748ac8b85ea8c33d79501239a13d2eb15663
+++ libpurple/nullmarshaller.h	f1b669f54497d765c5e1e142d8127bc8efff254c
@@ -7,4 +7,4 @@
  * take at least a GObject as first parameter, and then the parameters red in
  * the marshallers.list file.
  */
-void purpled_nullmarshaller(GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data);
+void purple_nullmarshaller(GClosure *closure, GValue *return_value, guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data);