diff options
author | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-10-05 19:57:30 +0800 |
---|---|---|
committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-10-05 19:57:30 +0800 |
commit | 4ec46cc05fcb94d181fb9c2412984a1446647c85 (patch) | |
tree | d16ce30e77dd539c03509237dd4c723d46aea97a /modules/plugin-manager | |
parent | 5ea7e23aef0c239af2600c95419ba0bda0f08b3c (diff) | |
parent | 19163c2b71e6128fc9b32287b99b1f4422324c2d (diff) | |
download | gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.tar gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.tar.gz gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.tar.bz2 gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.tar.lz gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.tar.xz gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.tar.zst gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.zip |
Merge from master
Diffstat (limited to 'modules/plugin-manager')
-rw-r--r-- | modules/plugin-manager/Makefile.am | 8 | ||||
-rw-r--r-- | modules/plugin-manager/evolution-plugin-manager.c | 5 |
2 files changed, 6 insertions, 7 deletions
diff --git a/modules/plugin-manager/Makefile.am b/modules/plugin-manager/Makefile.am index 1e66fb4bd8..f350426b50 100644 --- a/modules/plugin-manager/Makefile.am +++ b/modules/plugin-manager/Makefile.am @@ -5,8 +5,8 @@ libevolution_module_plugin_manager_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -DG_LOG_DOMAIN=\"evolution-plugin-manager\" \ - $(GNOME_PLATFORM_CFLAGS) \ - $(SHELL_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) libevolution_module_plugin_manager_la_SOURCES = \ evolution-plugin-manager.c @@ -14,8 +14,8 @@ libevolution_module_plugin_manager_la_SOURCES = \ libevolution_module_plugin_manager_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ - $(GNOME_PLATFORM_LIBS) \ - $(SHELL_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) libevolution_module_plugin_manager_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) diff --git a/modules/plugin-manager/evolution-plugin-manager.c b/modules/plugin-manager/evolution-plugin-manager.c index 29dba6c160..f95af37b23 100644 --- a/modules/plugin-manager/evolution-plugin-manager.c +++ b/modules/plugin-manager/evolution-plugin-manager.c @@ -20,13 +20,12 @@ #include <config.h> #endif -#include <glib/gi18n-lib.h> - #include <string.h> #include <stdio.h> +#include <glib/gi18n-lib.h> +#include <libebackend/e-extension.h> #include <e-util/e-plugin.h> -#include <e-util/e-extension.h> #include <shell/e-shell-window.h> #include <shell/e-shell-window-actions.h> |