/soc/2013/ankitkv/gobjectification: c1cb4cd0543d: Resolved confl...

[Ankit Vani]

Changeset: c1cb4cd0543d62ade6c013bc20fb21fe5813b0e6
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-07-16 23:29 +0530
Branch:	 soc.2013.gobjectification
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/c1cb4cd0543d

Description:

Resolved conflicting function names

diffstat:

 libpurple/ft.c                       |   2 +-
 libpurple/ft.h                       |   4 ++--
 libpurple/plugins/perl/perl-common.c |  10 ++++++----
 libpurple/savedstatuses.c            |   2 +-
 libpurple/savedstatuses.h            |   4 ++--
 libpurple/status.c                   |   2 +-
 libpurple/status.h                   |   4 ++--
 7 files changed, 15 insertions(+), 13 deletions(-)

diffs (127 lines):

diff --git a/libpurple/ft.c b/libpurple/ft.c
--- a/libpurple/ft.c
+++ b/libpurple/ft.c
@@ -1776,7 +1776,7 @@ purple_xfer_copy(PurpleXfer *xfer)
 }
 
 GType
-purple_xfer_get_type(void)
+purple_xfer_get_g_type(void)
 {
 	static GType type = 0;
 
diff --git a/libpurple/ft.h b/libpurple/ft.h
--- a/libpurple/ft.h
+++ b/libpurple/ft.h
@@ -27,7 +27,7 @@
 #ifndef _PURPLE_FT_H_
 #define _PURPLE_FT_H_
 
-#define PURPLE_TYPE_XFER  (purple_xfer_get_type())
+#define PURPLE_TYPE_XFER  (purple_xfer_get_g_type())
 
 /**************************************************************************/
 /** Data Structures                                                       */
@@ -198,7 +198,7 @@ G_BEGIN_DECLS
  * TODO Boxing of PurpleXfer is a temporary solution to having a GType for
  *      file transfers. This should rather be a GObject instead of a GBoxed.
  */
-GType purple_xfer_get_type(void);
+GType purple_xfer_get_g_type(void);
 
 /**
  * Creates a new file transfer handle.
diff --git a/libpurple/plugins/perl/perl-common.c b/libpurple/plugins/perl/perl-common.c
--- a/libpurple/plugins/perl/perl-common.c
+++ b/libpurple/plugins/perl/perl-common.c
@@ -1,6 +1,8 @@
+#include "perl-common.h"
+
+#include "cipher.h"
 #include "debug.h"
-
-#include "perl-common.h"
+#include "savedstatuses.h"
 
 extern PerlInterpreter *my_perl;
 
@@ -437,11 +439,11 @@ purple_perl_sv_from_purple_type(const GT
 		stash = "Purple::Xfer";
 	else if (type == PURPLE_TYPE_XMLNODE)
 		stash = "Purple::XMLNode";
-	else if (type == PURPLE_TYPE_USERINFO)
+	else if (type == PURPLE_TYPE_NOTIFY_USER_INFO)
  		stash = "Purple::NotifyUserInfo";
 	else if (type == PURPLE_TYPE_STORED_IMAGE)
  		stash = "Purple::StoredImage";
-	else if (type == PURPLE_TYPE_CERTIFICATEPOOL)
+	else if (type == PURPLE_TYPE_CERTIFICATE_POOL)
  		stash = "Purple::Certificate::Pool";
 
 	return sv_2mortal(purple_perl_bless_object(arg, stash));
diff --git a/libpurple/savedstatuses.c b/libpurple/savedstatuses.c
--- a/libpurple/savedstatuses.c
+++ b/libpurple/savedstatuses.c
@@ -1186,7 +1186,7 @@ purple_savedstatus_copy(PurpleSavedStatu
 }
 
 GType
-purple_savedstatus_get_type(void)
+purple_savedstatus_get_g_type(void)
 {
 	static GType type = 0;
 
diff --git a/libpurple/savedstatuses.h b/libpurple/savedstatuses.h
--- a/libpurple/savedstatuses.h
+++ b/libpurple/savedstatuses.h
@@ -54,7 +54,7 @@
  *       something we should look into once the status box gets fleshed
  *       out more.
  */
-#define PURPLE_TYPE_SAVEDSTATUS  (purple_savedstatus_get_type())
+#define PURPLE_TYPE_SAVEDSTATUS  (purple_savedstatus_get_g_type())
 
 typedef struct _PurpleSavedStatus     PurpleSavedStatus;
 typedef struct _PurpleSavedStatusSub  PurpleSavedStatusSub;
@@ -73,7 +73,7 @@ G_BEGIN_DECLS
  * TODO Boxing of PurpleSavedStatus is a temporary solution to having a GType
  *      for saved statuses. This should rather be a GObject instead of a GBoxed.
  */
-GType purple_savedstatus_get_type(void);
+GType purple_savedstatus_get_g_type(void);
 
 /**
  * Create a new saved status.  This will add the saved status to the
diff --git a/libpurple/status.c b/libpurple/status.c
--- a/libpurple/status.c
+++ b/libpurple/status.c
@@ -1068,7 +1068,7 @@ purple_status_copy(PurpleStatus *status)
 }
 
 GType
-purple_status_get_type(void)
+purple_status_get_g_type(void)
 {
 	static GType type = 0;
 
diff --git a/libpurple/status.h b/libpurple/status.h
--- a/libpurple/status.h
+++ b/libpurple/status.h
@@ -82,7 +82,7 @@
  * hardcoded in each PRPL and will not change often.  And because
  * they are hardcoded, they do not need to be saved to any XML file.
  */
-#define PURPLE_TYPE_STATUS      (purple_status_get_type())
+#define PURPLE_TYPE_STATUS      (purple_status_get_g_type())
 typedef struct _PurpleStatus    PurpleStatus;
 
 typedef struct _PurplePresence    PurplePresence;
@@ -448,7 +448,7 @@ GValue *purple_status_attr_get_value(con
  * TODO Boxing of PurpleStatus is a temporary solution to having a GType for
  *      statuses. This should rather be a GObject instead of a GBoxed.
  */
-GType purple_status_get_type(void);
+GType purple_status_get_g_type(void);
 
 /**
  * Creates a new status.