From 074949340958b1adccd4fd61fc5bfb338fc57781 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 17 Sep 2014 11:18:57 -0500 Subject: Put into our namespace --- src/Makefile.am | 4 +-- src/accounts-service.c | 75 ----------------------------------------------- src/accounts-service.h | 51 -------------------------------- src/im-accounts-service.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++ src/im-accounts-service.h | 51 ++++++++++++++++++++++++++++++++ src/im-menu.c | 6 ++-- 6 files changed, 131 insertions(+), 131 deletions(-) delete mode 100644 src/accounts-service.c delete mode 100644 src/accounts-service.h create mode 100644 src/im-accounts-service.c create mode 100644 src/im-accounts-service.h (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index 184e9b2..36e6a93 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,13 +5,13 @@ pkglibexec_PROGRAMS = indicator-messages-service indicator_messages_service_SOURCES = \ messages-service.c \ - accounts-service.c \ - accounts-service.h \ dbus-data.h \ gactionmuxer.c \ gactionmuxer.h \ gsettingsstrv.c \ gsettingsstrv.h \ + im-accounts-service.c \ + im-accounts-service.h \ im-menu.c \ im-menu.h \ im-phone-menu.c \ diff --git a/src/accounts-service.c b/src/accounts-service.c deleted file mode 100644 index 34af4f8..0000000 --- a/src/accounts-service.c +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright © 2014 Canonical Ltd. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 3, as published - * by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranties of - * MERCHANTABILITY, SATISFACTORY QUALITY, 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, see . - * - * Authors: - * Ted Gould - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "accounts-service.h" - -typedef struct _AccountsServicePrivate AccountsServicePrivate; - -struct _AccountsServicePrivate { - int dummy; -}; - -#define ACCOUNTS_SERVICE_GET_PRIVATE(o) \ -(G_TYPE_INSTANCE_GET_PRIVATE ((o), ACCOUNTS_SERVICE_TYPE, AccountsServicePrivate)) - -static void accounts_service_class_init (AccountsServiceClass *klass); -static void accounts_service_init (AccountsService *self); -static void accounts_service_dispose (GObject *object); -static void accounts_service_finalize (GObject *object); - -G_DEFINE_TYPE (AccountsService, accounts_service, G_TYPE_OBJECT); - -static void -accounts_service_class_init (AccountsServiceClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - g_type_class_add_private (klass, sizeof (AccountsServicePrivate)); - - object_class->dispose = accounts_service_dispose; - object_class->finalize = accounts_service_finalize; -} - -static void -accounts_service_init (AccountsService *self) -{ -} - -static void -accounts_service_dispose (GObject *object) -{ - G_OBJECT_CLASS (accounts_service_parent_class)->dispose (object); -} - -static void -accounts_service_finalize (GObject *object) -{ - G_OBJECT_CLASS (accounts_service_parent_class)->finalize (object); -} - -AccountsService * -accounts_service_ref_default (void) -{ - - return NULL; -} diff --git a/src/accounts-service.h b/src/accounts-service.h deleted file mode 100644 index 6298d9c..0000000 --- a/src/accounts-service.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright © 2014 Canonical Ltd. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 3, as published - * by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranties of - * MERCHANTABILITY, SATISFACTORY QUALITY, 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, see . - * - * Authors: - * Ted Gould - */ - -#ifndef __ACCOUNTS_SERVICE_H__ -#define __ACCOUNTS_SERVICE_H__ - -#include -#include - -G_BEGIN_DECLS - -#define ACCOUNTS_SERVICE_TYPE (accounts_service_get_type ()) -#define ACCOUNTS_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ACCOUNTS_SERVICE_TYPE, AccountsService)) -#define ACCOUNTS_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ACCOUNTS_SERVICE_TYPE, AccountsServiceClass)) -#define IS_ACCOUNTS_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ACCOUNTS_SERVICE_TYPE)) -#define IS_ACCOUNTS_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ACCOUNTS_SERVICE_TYPE)) -#define ACCOUNTS_SERVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ACCOUNTS_SERVICE_TYPE, AccountsServiceClass)) - -typedef struct _AccountsService AccountsService; -typedef struct _AccountsServiceClass AccountsServiceClass; - -struct _AccountsServiceClass { - GObjectClass parent_class; -}; - -struct _AccountsService { - GObject parent; -}; - -GType accounts_service_get_type (void); -AccountsService * accounts_service_ref_default (void); - -G_END_DECLS - -#endif diff --git a/src/im-accounts-service.c b/src/im-accounts-service.c new file mode 100644 index 0000000..f618524 --- /dev/null +++ b/src/im-accounts-service.c @@ -0,0 +1,75 @@ +/* + * Copyright © 2014 Canonical Ltd. + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 3, as published + * by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranties of + * MERCHANTABILITY, SATISFACTORY QUALITY, 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, see . + * + * Authors: + * Ted Gould + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "im-accounts-service.h" + +typedef struct _ImAccountsServicePrivate ImAccountsServicePrivate; + +struct _ImAccountsServicePrivate { + int dummy; +}; + +#define IM_ACCOUNTS_SERVICE_GET_PRIVATE(o) \ +(G_TYPE_INSTANCE_GET_PRIVATE ((o), IM_ACCOUNTS_SERVICE_TYPE, ImAccountsServicePrivate)) + +static void im_accounts_service_class_init (ImAccountsServiceClass *klass); +static void im_accounts_service_init (ImAccountsService *self); +static void im_accounts_service_dispose (GObject *object); +static void im_accounts_service_finalize (GObject *object); + +G_DEFINE_TYPE (ImAccountsService, im_accounts_service, G_TYPE_OBJECT); + +static void +im_accounts_service_class_init (ImAccountsServiceClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + g_type_class_add_private (klass, sizeof (ImAccountsServicePrivate)); + + object_class->dispose = im_accounts_service_dispose; + object_class->finalize = im_accounts_service_finalize; +} + +static void +im_accounts_service_init (ImAccountsService *self) +{ +} + +static void +im_accounts_service_dispose (GObject *object) +{ + G_OBJECT_CLASS (im_accounts_service_parent_class)->dispose (object); +} + +static void +im_accounts_service_finalize (GObject *object) +{ + G_OBJECT_CLASS (im_accounts_service_parent_class)->finalize (object); +} + +ImAccountsService * +im_accounts_service_ref_default (void) +{ + + return NULL; +} diff --git a/src/im-accounts-service.h b/src/im-accounts-service.h new file mode 100644 index 0000000..4e7da59 --- /dev/null +++ b/src/im-accounts-service.h @@ -0,0 +1,51 @@ +/* + * Copyright © 2014 Canonical Ltd. + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 3, as published + * by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranties of + * MERCHANTABILITY, SATISFACTORY QUALITY, 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, see . + * + * Authors: + * Ted Gould + */ + +#ifndef __IM_ACCOUNTS_SERVICE_H__ +#define __IM_ACCOUNTS_SERVICE_H__ + +#include +#include + +G_BEGIN_DECLS + +#define IM_ACCOUNTS_SERVICE_TYPE (im_accounts_service_get_type ()) +#define IM_ACCOUNTS_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), IM_ACCOUNTS_SERVICE_TYPE, ImAccountsService)) +#define IM_ACCOUNTS_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), IM_ACCOUNTS_SERVICE_TYPE, ImAccountsServiceClass)) +#define IM_IS_ACCOUNTS_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), IM_ACCOUNTS_SERVICE_TYPE)) +#define IM_IS_ACCOUNTS_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), IM_ACCOUNTS_SERVICE_TYPE)) +#define IM_ACCOUNTS_SERVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), IM_ACCOUNTS_SERVICE_TYPE, ImAccountsServiceClass)) + +typedef struct _ImAccountsService ImAccountsService; +typedef struct _ImAccountsServiceClass ImAccountsServiceClass; + +struct _ImAccountsServiceClass { + GObjectClass parent_class; +}; + +struct _ImAccountsService { + GObject parent; +}; + +GType im_accounts_service_get_type (void); +ImAccountsService * im_accounts_service_ref_default (void); + +G_END_DECLS + +#endif diff --git a/src/im-menu.c b/src/im-menu.c index e35f7c2..bd45098 100644 --- a/src/im-menu.c +++ b/src/im-menu.c @@ -18,7 +18,7 @@ */ #include "im-menu.h" -#include "accounts-service.h" +#include "im-accounts-service.h" struct _ImMenuPrivate { @@ -26,7 +26,7 @@ struct _ImMenuPrivate GMenu *menu; ImApplicationList *applist; gboolean on_greeter; - AccountsService *as; + ImAccountsService *as; }; G_DEFINE_TYPE_WITH_PRIVATE (ImMenu, im_menu, G_TYPE_OBJECT) @@ -128,7 +128,7 @@ im_menu_init (ImMenu *menu) priv->toplevel_menu = g_menu_new (); priv->menu = g_menu_new (); priv->on_greeter = FALSE; - priv->as = accounts_service_ref_default(); + priv->as = im_accounts_service_ref_default(); root = g_menu_item_new (NULL, "indicator.messages"); g_menu_item_set_attribute (root, "x-canonical-type", "s", "com.canonical.indicator.root"); -- cgit v1.2.3