diff options
author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-07-23 17:15:57 +0800 |
---|---|---|
committer | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2012-07-30 14:56:45 +0800 |
commit | 671a16046a634beefc524bc24a2e7eebdee480a5 (patch) | |
tree | 0a2c8f1946ae3bab3c09276db3691a981ecb4fd9 | |
parent | 89800f161fb162f30aa4d13d3cb9707b553442fa (diff) | |
download | gsoc2013-empathy-671a16046a634beefc524bc24a2e7eebdee480a5.tar gsoc2013-empathy-671a16046a634beefc524bc24a2e7eebdee480a5.tar.gz gsoc2013-empathy-671a16046a634beefc524bc24a2e7eebdee480a5.tar.bz2 gsoc2013-empathy-671a16046a634beefc524bc24a2e7eebdee480a5.tar.lz gsoc2013-empathy-671a16046a634beefc524bc24a2e7eebdee480a5.tar.xz gsoc2013-empathy-671a16046a634beefc524bc24a2e7eebdee480a5.tar.zst gsoc2013-empathy-671a16046a634beefc524bc24a2e7eebdee480a5.zip |
add empathy-app-plugin
https://bugzilla.gnome.org/show_bug.cgi?id=680449
-rw-r--r-- | configure.ac | 8 | ||||
-rw-r--r-- | ubuntu-online-accounts/cc-plugins/Makefile.am | 2 | ||||
-rw-r--r-- | ubuntu-online-accounts/cc-plugins/app-plugin/Makefile.am | 23 | ||||
-rw-r--r-- | ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.c | 52 | ||||
-rw-r--r-- | ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.h | 73 | ||||
-rwxr-xr-x | ubuntu-online-accounts/cc-plugins/generate-plugins.py | 2 |
6 files changed, 158 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 9575d684b..b7b2e8c75 100644 --- a/configure.ac +++ b/configure.ac @@ -519,6 +519,13 @@ if test "x$enable_ubuntu_online_accounts" != "xno"; then AC_MSG_RESULT([$ACCOUNTS_PROVIDER_PLUGIN_DIR]) AC_SUBST(ACCOUNTS_PROVIDER_PLUGIN_DIR) + # app plugin dir + AC_MSG_CHECKING([Accounts provider app plugin dir]) + ACCOUNTS_APP_PLUGIN_DIR=`pkg-config --variable=application_plugindir account-plugin` + + AC_MSG_RESULT([$ACCOUNTS_APP_PLUGIN_DIR]) + AC_SUBST(ACCOUNTS_APP_PLUGIN_DIR) + # provider files dir AC_MSG_CHECKING([Accounts provider files dir]) ACCOUNTS_PROVIDER_FILES_DIR=`pkg-config --variable=providerfilesdir libaccounts-glib` @@ -599,6 +606,7 @@ AC_CONFIG_FILES([ ubuntu-online-accounts/cc-plugins/Makefile ubuntu-online-accounts/cc-plugins/providers/Makefile ubuntu-online-accounts/cc-plugins/services/Makefile + ubuntu-online-accounts/cc-plugins/app-plugin/Makefile help/Makefile tests/Makefile tests/interactive/Makefile diff --git a/ubuntu-online-accounts/cc-plugins/Makefile.am b/ubuntu-online-accounts/cc-plugins/Makefile.am index 6effb6c24..0521194b8 100644 --- a/ubuntu-online-accounts/cc-plugins/Makefile.am +++ b/ubuntu-online-accounts/cc-plugins/Makefile.am @@ -1,6 +1,6 @@ # Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py # Do NOT edit manually -SUBDIRS = providers services +SUBDIRS = providers services app-plugin plugindir = $(ACCOUNTS_PROVIDER_PLUGIN_DIR) diff --git a/ubuntu-online-accounts/cc-plugins/app-plugin/Makefile.am b/ubuntu-online-accounts/cc-plugins/app-plugin/Makefile.am new file mode 100644 index 000000000..fc2421747 --- /dev/null +++ b/ubuntu-online-accounts/cc-plugins/app-plugin/Makefile.am @@ -0,0 +1,23 @@ +plugindir = $(ACCOUNTS_APP_PLUGIN_DIR) + +INCLUDES = \ + -I$(top_builddir) \ + -I$(top_srcdir) \ + -DLOCALEDIR=\""$(datadir)/locale"\" \ + $(UOA_CFLAGS) \ + $(WARN_CFLAGS) \ + $(ERROR_CFLAGS) \ + $(DISABLE_DEPRECATED) \ + $(EMPATHY_CFLAGS) + +plugin_LTLIBRARIES = \ + libempathy.la\ + $(NULL) + +libempathy_la_SOURCES = \ + empathy-app-plugin.c \ + empathy-app-plugin.h +libempathy_la_LDFLAGS = -module -avoid-version +libempathy_la_LIBADD = \ + $(UOA_LIBS) \ + $(top_builddir)/libempathy-gtk/libempathy-gtk.la diff --git a/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.c b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.c new file mode 100644 index 000000000..b9501efcf --- /dev/null +++ b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.c @@ -0,0 +1,52 @@ +/* + * empathy-app-plugin.c + * + * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "config.h" + +#include "empathy-app-plugin.h" + + +G_DEFINE_TYPE (EmpathyAppPlugin, empathy_app_plugin, AP_TYPE_APPLICATION_PLUGIN) + +static GtkWidget * +empathy_app_plugin_build_widget (ApApplicationPlugin *plugin) +{ + /* TODO */ + return NULL; +} + +static void +empathy_app_plugin_class_init (EmpathyAppPluginClass *klass) +{ + ApApplicationPluginClass *app_class = AP_APPLICATION_PLUGIN_CLASS (klass); + + app_class->build_widget = empathy_app_plugin_build_widget; +} + +static void +empathy_app_plugin_init (EmpathyAppPlugin *self) +{ +} + +GType +ap_module_get_object_type (void) +{ + return EMPATHY_TYPE_APP_PLUGIN; +} diff --git a/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.h b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.h new file mode 100644 index 000000000..0167c851e --- /dev/null +++ b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.h @@ -0,0 +1,73 @@ +/* + * empathy-app-plugin.h + * + * Copyright (C) 2012 Collabora Ltd. <http://www.collabora.co.uk/> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef __EMPATHY_APP_PLUGIN_H__ +#define __EMPATHY_APP_PLUGIN_H__ + +#include <glib-object.h> + +#include <libaccount-plugin/application-plugin.h> + +G_BEGIN_DECLS + +typedef struct _EmpathyAppPlugin EmpathyAppPlugin; +typedef struct _EmpathyAppPluginClass EmpathyAppPluginClass; + +struct _EmpathyAppPluginClass +{ + /*<private>*/ + ApApplicationPluginClass parent_class; +}; + +struct _EmpathyAppPlugin +{ + /*<private>*/ + ApApplicationPlugin parent; +}; + +GType empathy_app_plugin_get_type (void); + +/* TYPE MACROS */ +#define EMPATHY_TYPE_APP_PLUGIN \ + (empathy_app_plugin_get_type ()) +#define EMPATHY_APP_PLUGIN(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj), \ + EMPATHY_TYPE_APP_PLUGIN, \ + EmpathyAppPlugin)) +#define EMPATHY_APP_PLUGIN_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass), \ + EMPATHY_TYPE_APP_PLUGIN, \ + EmpathyAppPluginClass)) +#define EMPATHY_IS_APP_PLUGIN(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE((obj), \ + EMPATHY_TYPE_APP_PLUGIN)) +#define EMPATHY_IS_APP_PLUGIN_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE((klass), \ + EMPATHY_TYPE_APP_PLUGIN)) +#define EMPATHY_APP_PLUGIN_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), \ + EMPATHY_TYPE_APP_PLUGIN, \ + EmpathyAppPluginClass)) + +GType ap_module_get_object_type (void); + +G_END_DECLS + +#endif /* #ifndef __EMPATHY_APP_PLUGIN_H__*/ diff --git a/ubuntu-online-accounts/cc-plugins/generate-plugins.py b/ubuntu-online-accounts/cc-plugins/generate-plugins.py index a5a892f77..c17a55ef6 100755 --- a/ubuntu-online-accounts/cc-plugins/generate-plugins.py +++ b/ubuntu-online-accounts/cc-plugins/generate-plugins.py @@ -59,7 +59,7 @@ def generate_makefile_am(plugins): f.write( '''# Generated using empathy/ubuntu-online-accounts/cc-plugins/generate-plugins.py # Do NOT edit manually -SUBDIRS = providers services +SUBDIRS = providers services app-plugin plugindir = $(ACCOUNTS_PROVIDER_PLUGIN_DIR) |