soc.2010.detachablepurple: feba32b4: Cleaned the detachable session related h...
gillux at soc.pidgin.im
gillux at soc.pidgin.im
Thu Aug 12 00:37:17 EDT 2010
----------------------------------------------------------------------
Revision: feba32b43a23e1471962ce0033873a65fa180a12
Parent: 48ccd0de0771f8f3f1af4e6631692d9c432841bc
Author: gillux at soc.pidgin.im
Date: 08/11/10 20:24:36
Branch: im.pidgin.soc.2010.detachablepurple
URL: http://d.pidgin.im/viewmtn/revision/info/feba32b43a23e1471962ce0033873a65fa180a12
Changelog:
Cleaned the detachable session related headers. Now we have in each the GPL
header, the #define to protect multiple inclusions, and the C++
G_BEGIN_DECLS/G_END_DECLS thing.
Changes against parent 48ccd0de0771f8f3f1af4e6631692d9c432841bc
patched libpurple/dbus/account.h
patched libpurple/dbus/blist.h
patched libpurple/dbus/buddy.h
patched libpurple/dbus/callback.h
patched libpurple/dbus/chat.h
patched libpurple/dbus/connection.h
patched libpurple/dbus/constructor.h
patched libpurple/dbus/contact.h
patched libpurple/dbus/group.h
-------------- next part --------------
============================================================
--- libpurple/dbus/account.h 265ed8573ae136979845334c65dc44a3c272f49b
+++ libpurple/dbus/account.h b8a23825e227ceca519b504f006986cffc1e2ae4
@@ -1,6 +1,30 @@
+/* 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_DBUS_ACCOUNT_H
+#define _PURPLE_DBUS_ACCOUNT_H
#ifdef HAVE_DBUS
+G_BEGIN_DECLS
+
/**
* Initialize the dbus data of the account class.
*/
@@ -66,6 +90,8 @@ gboolean DBUS_purple_account_unregister(
*/
gboolean DBUS_purple_account_unregister(PurpleAccount *account, gboolean have_callback, guint64 *callback_id, GError** error);
+G_END_DECLS
+
#else /* !HAVE_DBUS */
#define purple_account_class_dbus_init() ((void)0)
@@ -78,3 +104,4 @@ gboolean DBUS_purple_account_unregister(
#define purple_account_unregister_RPC(account, cb, user_data) ((void)0)
#endif /* HAVE_DBUS */
+#endif /* _PURPLE_DBUS_ACCOUNT_H */
============================================================
--- libpurple/dbus/constructor.h d48449b34ce324647c343872741a0454b73b5cf5
+++ libpurple/dbus/constructor.h 6aa24788db64d1c82059b477adfd1bacd894e682
@@ -18,8 +18,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
-#ifndef _DBUS_CONSTRUCTOR_H_
-#define _DBUS_CONSTRUCTOR_H_
+#ifndef _PURPLE_DBUS_CONSTRUCTOR_H_
+#define _PURPLE_DBUS_CONSTRUCTOR_H_
#include "pobject.h"
@@ -97,6 +97,4 @@ G_END_DECLS
#define purple_accounts_get_all_RPC() ((void)0)
#endif /* HAVE_DBUS */
-
-#endif /* _DBUS_CONSTRUCTOR_H_ */
-
+#endif /* _PURPLE_DBUS_CONSTRUCTOR_H_ */
============================================================
--- libpurple/dbus/callback.h ec53567a1a2d96588acbb572377643dd3b1bde4d
+++ libpurple/dbus/callback.h c1729e822bb045c2296961f5c9e7aceb13c2f7ce
@@ -18,8 +18,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
-#ifndef _DBUS_CALLBACK_H_
-#define _DBUS_CALLBACK_H_
+#ifndef _PURPLE_DBUS_CALLBACK_H_
+#define _PURPLE_DBUS_CALLBACK_H_
#ifdef HAVE_DBUS
@@ -61,6 +61,8 @@ typedef struct {
#define DBUS_GVALUE_ARRAY \
dbus_g_type_get_collection("GPtrArray", G_TYPE_VALUE)
+G_BEGIN_DECLS
+
/**
* Creates the PurpleDBusCallback singleton.
*/
@@ -165,5 +167,7 @@ guint purple_callback_get_req_id(void *u
*/
guint purple_callback_get_req_id(void *ui_handle);
+G_END_DECLS
+
#endif /* HAVE_DBUS */
-#endif /* _DBUS_CALLBACK_H_ */
+#endif /* _PURPLE_DBUS_CALLBACK_H_ */
============================================================
--- libpurple/dbus/connection.h 4299cc3a9223bfdbc79b19d355f700d4e0fcbf8b
+++ libpurple/dbus/connection.h dab0143460d392532577c9c82d06f868ac02fed0
@@ -18,9 +18,13 @@
* 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_DBUS_CONNECTION_H
+#define _PURPLE_DBUS_CONNECTION_H
#ifdef HAVE_DBUS
+G_BEGIN_DECLS
+
/**
* Initialize the dbus data of the connection class.
*/
@@ -31,9 +35,12 @@ void purple_connection_dbus_init(PurpleC
*/
void purple_connection_dbus_init(PurpleConnection *gc, PurpleAccount *account, gboolean regist, const char *password);
+G_END_DECLS
+
#else /* !HAVE_DBUS */
#define purple_connection_class_dbus_init() ((void)0)
#define purple_connection_dbus_init(gc, account) ((void)0)
#endif /* HAVE_DBUS */
+#endif /* _PURPLE_DBUS_CONNECTION_H */
============================================================
--- libpurple/dbus/blist.h f45b9c6593b22783be373941cc61e2138bbd84f8
+++ libpurple/dbus/blist.h 341b8277abd4ff41470037227b18f329be48a67b
@@ -20,9 +20,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*
*/
+#ifndef _PURPLE_DBUS_BLIST_H
+#define _PURPLE_DBUS_BLIST_H
#ifdef HAVE_DBUS
+G_BEGIN_DECLS
+
/**
* Creates and exports the PurpleBuddyList dbus equivalent singleton.
*/
@@ -38,6 +42,8 @@ void purple_blist_load_RPC(void);
*/
void purple_blist_load_RPC(void);
+G_END_DECLS
+
#else /* !HAVE_DBUS */
#define purple_blist_init_dbus() ((void)0)
@@ -45,3 +51,4 @@ void purple_blist_load_RPC(void);
#define purple_blist_get_buddy_list_RPC() ((void)0)
#endif /* HAVE_DBUS */
+#endif /* _PURPLE_DBUS_BLIST_H */
============================================================
--- libpurple/dbus/group.h b7d729df4a21138db96b65c77e48d06a2ba92a9c
+++ libpurple/dbus/group.h 770a57cd0f602c1c37b0f08375902df5cddcabec
@@ -18,9 +18,13 @@
* 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_DBUS_GROUP_H
+#define _PURPLE_DBUS_GROUP_H
#ifdef HAVE_DBUS
+G_BEGIN_DECLS
+
/**
* Initialize the dbus data of the group class.
*/
@@ -31,9 +35,12 @@ void purple_group_dbus_init(PurpleGroup
*/
void purple_group_dbus_init(PurpleGroup *group, const char *name);
+G_END_DECLS
+
#else /* !HAVE_DBUS */
#define purple_group_class_dbus_init() ((void)0)
#define purple_group_dbus_init(group, name) ((void)0)
#endif /* HAVE_DBUS */
+#endif /* _PURPLE_DBUS_GROUP_H */
============================================================
--- libpurple/dbus/contact.h 71fd0e789cc5a6d65906e3d1ddf7110507007eb2
+++ libpurple/dbus/contact.h d5ab2d53ff0e61c9f96d15f6fb325dfa37f49274
@@ -18,9 +18,13 @@
* 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_DBUS_CONTACT_H
+#define _PURPLE_DBUS_CONTACT_H
#ifdef HAVE_DBUS
+G_BEGIN_DECLS
+
/**
* Initialize the dbus data of the contact class.
*/
@@ -31,9 +35,12 @@ void purple_contact_dbus_init(PurpleCont
*/
void purple_contact_dbus_init(PurpleContact *contact);
+G_END_DECLS
+
#else /* !HAVE_DBUS */
#define purple_contact_class_dbus_init() ((void)0)
#define purple_contact_dbus_init(contact) ((void)0)
#endif /* HAVE_DBUS */
+#endif /* _PURPLE_DBUS_CONTACT_H */
============================================================
--- libpurple/dbus/buddy.h 11d2323b01379364bef803052c52ead7b1bc8fa5
+++ libpurple/dbus/buddy.h 14fe52d8b9c39cf99d40e810dd5149e875afe166
@@ -18,9 +18,13 @@
* 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_DBUS_BUDDY_H
+#define _PURPLE_DBUS_BUDDY_H
#ifdef HAVE_DBUS
+G_BEGIN_DECLS
+
/**
* Initialize the dbus data of the buddy class.
*/
@@ -31,9 +35,12 @@ void purple_buddy_dbus_init(PurpleBuddy
*/
void purple_buddy_dbus_init(PurpleBuddy *buddy, const char *name);
+G_END_DECLS
+
#else /* !HAVE_DBUS */
#define purple_buddy_class_dbus_init() ((void)0)
#define purple_buddy_dbus_init(buddy, name) ((void)0)
#endif /* HAVE_DBUS */
+#endif /* _PURPLE_DBUS_BUDDY_H */
============================================================
--- libpurple/dbus/chat.h d89ed3fdb02380f2ded98e15081c9846a8700c0e
+++ libpurple/dbus/chat.h 6f2769e6c313c82dba87757226a74701a63b54de
@@ -18,9 +18,13 @@
* 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_DBUS_CHAT_H
+#define _PURPLE_DBUS_CHAT_H
#ifdef HAVE_DBUS
+G_BEGIN_DECLS
+
/**
* Initialize the dbus data of the chat class.
*/
@@ -31,9 +35,12 @@ void purple_chat_dbus_init(PurpleChat *c
*/
void purple_chat_dbus_init(PurpleChat *chat);
+G_END_DECLS
+
#else /* !HAVE_DBUS */
#define purple_chat_class_dbus_init() ((void)0)
#define purple_chat_dbus_init(chat) ((void)0)
#endif /* HAVE_DBUS */
+#endif /* _PURPLE_DBUS_CHAT_H */
More information about the Commits
mailing list