/soc/2013/ankitkv/gobjectification: 0d0601382feb: Renamed accoun...

Ankit Vani a at nevitus.org
Thu Oct 10 10:31:28 EDT 2013


Changeset: 0d0601382febfb65df49a2b7e4c41c5e38528679
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-10-10 18:41 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/0d0601382feb

Description:

Renamed accounts.[ch] to account-manager.[ch]

diffstat:

 ChangeLog.API                          |  2 +-
 libpurple/Makefile.am                  |  6 +++---
 libpurple/Makefile.mingw               |  2 +-
 libpurple/accounts.c                   |  4 ++--
 libpurple/accounts.h                   |  8 ++++----
 libpurple/account.c                    |  2 +-
 libpurple/dbus-useful.c                |  2 +-
 libpurple/internal.h                   |  2 +-
 libpurple/plugins/perl/common/module.h |  2 +-
 libpurple/purple.h.in                  |  2 +-
 libpurple/server.h                     |  2 +-
 libpurple/status.c                     |  2 +-
 pidgin/gtkaccount.h                    |  2 +-
 13 files changed, 19 insertions(+), 19 deletions(-)

diffs (200 lines):

diff --git a/ChangeLog.API b/ChangeLog.API
--- a/ChangeLog.API
+++ b/ChangeLog.API
@@ -173,7 +173,7 @@ version 3.0.0 (??/??/????):
 
 		Changed:
 		* account.h has been split into account.h (PurpleAccount GObject) and
-		  accounts.h (Accounts subsystem)
+		  account-manager.h (PurpleAccountManager GObject)
 		* blist.h has been split into buddylist.h (PurpleBuddyList and
 		  subsystem), blistnode.h (PurpleBlistNode and PurpleCountingNode
 		  GObjects), blistnodetypes (Buddy, Chat, Contact, Group GObjects)
diff --git a/libpurple/Makefile.am b/libpurple/Makefile.am
--- a/libpurple/Makefile.am
+++ b/libpurple/Makefile.am
@@ -47,7 +47,7 @@ endif
 
 purple_coresources = \
 	account.c \
-	accounts.c \
+	account-manager.c \
 	accountopt.c \
 	blistnode.c \
 	blistnodetypes.c \
@@ -133,7 +133,7 @@ purple_builtsources = \
 
 purple_coreheaders = \
 	account.h \
-	accounts.h \
+	account-manager.h \
 	accountopt.h \
 	blistnode.h \
 	blistnodetypes.h \
@@ -269,7 +269,7 @@ CLEANFILES += \
 dbus_sources  = dbus-server.c dbus-useful.c
 dbus_headers  = dbus-server.h dbus-bindings.h dbus-purple.h dbus-useful.h dbus-define-api.h dbus-types.h
 
-dbus_exported = dbus-useful.h dbus-define-api.h account.h accounts.h blistnode.h \
+dbus_exported = dbus-useful.h dbus-define-api.h account.h account-manager.h blistnode.h \
                 blistnodetypes.h buddylist.h buddyicon.h connection.h conversation.h \
                 conversationtypes.h conversations.h core.h xfer.h log.h notify.h \
                 prefs.h presence.h roomlist.h savedstatuses.h smiley.h status.h \
diff --git a/libpurple/Makefile.mingw b/libpurple/Makefile.mingw
--- a/libpurple/Makefile.mingw
+++ b/libpurple/Makefile.mingw
@@ -63,7 +63,7 @@ BUILT_SRC = marshallers.c enums.c
 C_SRC =	\
 			$(BUILT_SRC) \
 			account.c \
-			accounts.c \
+			account-manager.c \
 			accountopt.c \
 			blistnode.c \
 			blistnodetypes.c \
diff --git a/libpurple/accounts.c b/libpurple/account-manager.c
rename from libpurple/accounts.c
rename to libpurple/account-manager.c
--- a/libpurple/accounts.c
+++ b/libpurple/account-manager.c
@@ -1,5 +1,5 @@
 /**
- * @file accounts.c Accounts API
+ * @file account-manager.c Account Manager API
  * @ingroup core
  */
 
@@ -24,7 +24,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "internal.h"
-#include "accounts.h"
+#include "account-manager.h"
 #include "core.h"
 #include "dbus-maybe.h"
 #include "debug.h"
diff --git a/libpurple/accounts.h b/libpurple/account-manager.h
rename from libpurple/accounts.h
rename to libpurple/account-manager.h
--- a/libpurple/accounts.h
+++ b/libpurple/account-manager.h
@@ -1,5 +1,5 @@
 /**
- * @file accounts.h Accounts API
+ * @file account-manager.h Account Manager API
  * @ingroup core
  * @see @ref account-signals
  */
@@ -24,8 +24,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 _PURPLE_ACCOUNTS_H_
-#define _PURPLE_ACCOUNTS_H_
+#ifndef _PURPLE_ACCOUNT_MANAGER_H_
+#define _PURPLE_ACCOUNT_MANAGER_H_
 
 #include "account.h"
 #include "status.h"
@@ -222,4 +222,4 @@ void purple_accounts_schedule_save(void)
 
 G_END_DECLS
 
-#endif /* _PURPLE_ACCOUNTS_H_ */
+#endif /* _PURPLE_ACCOUNT_MANAGER_H_ */
diff --git a/libpurple/account.c b/libpurple/account.c
--- a/libpurple/account.c
+++ b/libpurple/account.c
@@ -24,7 +24,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #include "internal.h"
-#include "accounts.h"
+#include "account-manager.h"
 #include "core.h"
 #include "dbus-maybe.h"
 #include "debug.h"
diff --git a/libpurple/dbus-useful.c b/libpurple/dbus-useful.c
--- a/libpurple/dbus-useful.c
+++ b/libpurple/dbus-useful.c
@@ -2,7 +2,7 @@
 #include <glib.h>
 
 #include "dbus-useful.h"
-#include "accounts.h"
+#include "account-manager.h"
 #include "conversation.h"
 #include "util.h"
 
diff --git a/libpurple/internal.h b/libpurple/internal.h
--- a/libpurple/internal.h
+++ b/libpurple/internal.h
@@ -154,7 +154,7 @@
 
 /* INTERNAL FUNCTIONS */
 
-#include "accounts.h"
+#include "account-manager.h"
 #include "connection.h"
 
 /* This is for the accounts code to notify the buddy icon code that
diff --git a/libpurple/plugins/perl/common/module.h b/libpurple/plugins/perl/common/module.h
--- a/libpurple/plugins/perl/common/module.h
+++ b/libpurple/plugins/perl/common/module.h
@@ -19,7 +19,7 @@ typedef struct group *Purple__Group;
 
 #include "../perl-common.h"
 
-#include "accounts.h"
+#include "account-manager.h"
 #include "accountopt.h"
 #include "buddylist.h"
 #include "buddyicon.h"
diff --git a/libpurple/purple.h.in b/libpurple/purple.h.in
--- a/libpurple/purple.h.in
+++ b/libpurple/purple.h.in
@@ -44,7 +44,7 @@
 
 @PLUGINS_DEFINE@
 
-#include <accounts.h>
+#include <account-manager.h>
 #include <accountopt.h>
 #include <buddylist.h>
 #include <buddyicon.h>
diff --git a/libpurple/server.h b/libpurple/server.h
--- a/libpurple/server.h
+++ b/libpurple/server.h
@@ -26,7 +26,7 @@
 #ifndef _PURPLE_SERVER_H_
 #define _PURPLE_SERVER_H_
 
-#include "accounts.h"
+#include "account-manager.h"
 #include "conversations.h"
 #include "protocols.h"
 
diff --git a/libpurple/status.c b/libpurple/status.c
--- a/libpurple/status.c
+++ b/libpurple/status.c
@@ -671,7 +671,7 @@ purple_status_set_active(PurpleStatus *s
 /*
  * This used to parse the va_list directly, but now it creates a GList
  * and passes it to purple_status_set_active_with_attrs_list().  That
- * function was created because accounts.c needs to pass a GList of
+ * function was created because account.c needs to pass a GList of
  * attributes to the status API.
  */
 void
diff --git a/pidgin/gtkaccount.h b/pidgin/gtkaccount.h
--- a/pidgin/gtkaccount.h
+++ b/pidgin/gtkaccount.h
@@ -27,7 +27,7 @@
 #ifndef _PIDGINACCOUNT_H_
 #define _PIDGINACCOUNT_H_
 
-#include "accounts.h"
+#include "account-manager.h"
 
 typedef enum
 {



More information about the Commits mailing list