diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-05-01 18:44:36 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-05-01 18:44:36 +0800 |
| commit | 5f55aba5b052fb7284973f50009f8b369334d084 (patch) | |
| tree | e7a5149f56fd8550915c3141a408fb79a14d0239 /plugins/groupwise-features | |
| parent | 6824309c1179f1346b4877f67e386f237d954196 (diff) | |
| download | gsoc2013-evolution-5f55aba5b052fb7284973f50009f8b369334d084.tar gsoc2013-evolution-5f55aba5b052fb7284973f50009f8b369334d084.tar.gz gsoc2013-evolution-5f55aba5b052fb7284973f50009f8b369334d084.tar.bz2 gsoc2013-evolution-5f55aba5b052fb7284973f50009f8b369334d084.tar.lz gsoc2013-evolution-5f55aba5b052fb7284973f50009f8b369334d084.tar.xz gsoc2013-evolution-5f55aba5b052fb7284973f50009f8b369334d084.tar.zst gsoc2013-evolution-5f55aba5b052fb7284973f50009f8b369334d084.zip | |
Merge in changes from master.
Diffstat (limited to 'plugins/groupwise-features')
| -rw-r--r-- | plugins/groupwise-features/install-shared.c | 4 | ||||
| -rw-r--r-- | plugins/groupwise-features/junk-settings.c | 2 | ||||
| -rw-r--r-- | plugins/groupwise-features/proxy.c | 2 | ||||
| -rw-r--r-- | plugins/groupwise-features/share-folder-common.c | 1 | ||||
| -rw-r--r-- | plugins/groupwise-features/share-folder.c | 2 |
5 files changed, 2 insertions, 9 deletions
diff --git a/plugins/groupwise-features/install-shared.c b/plugins/groupwise-features/install-shared.c index 35e3ae6c68..2f60b34bff 100644 --- a/plugins/groupwise-features/install-shared.c +++ b/plugins/groupwise-features/install-shared.c @@ -26,9 +26,9 @@ #include <string.h> #include <glib.h> -#include <gnome.h> #include <gtk/gtk.h> -#include <libgnomeui/libgnomeui.h> +#include <libgnomeui/gnome-druid.h> +#include <libgnomeui/gnome-druid-page-edge.h> #include <glib/gi18n.h> #include <gconf/gconf-client.h> #include <e-util/e-config.h> diff --git a/plugins/groupwise-features/junk-settings.c b/plugins/groupwise-features/junk-settings.c index 460883a61a..bff2abc35a 100644 --- a/plugins/groupwise-features/junk-settings.c +++ b/plugins/groupwise-features/junk-settings.c @@ -26,8 +26,6 @@ #include <glade/glade.h> #include "junk-settings.h" #include <gtk/gtk.h> -#include <libgnomeui/gnome-ui-init.h> -#include <libgnome/gnome-init.h> #include <glib/gi18n.h> #include <e-util/e-error.h> #include <e-util/e-util-private.h> diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c index a7eed9b963..8bf212ee24 100644 --- a/plugins/groupwise-features/proxy.c +++ b/plugins/groupwise-features/proxy.c @@ -31,8 +31,6 @@ #include <libedataserverui/e-contact-store.h> -#include <libgnomeui/gnome-ui-init.h> -#include <libgnome/gnome-init.h> #include <e-util/e-error.h> #include <e-util/e-util-private.h> #include <e-gw-container.h> diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c index cdea5a7265..0b811d0787 100644 --- a/plugins/groupwise-features/share-folder-common.c +++ b/plugins/groupwise-features/share-folder-common.c @@ -48,7 +48,6 @@ #include <e-gw-container.h> #include <e-gw-connection.h> #include <glade/glade.h> -#include <libgnomeui/libgnomeui.h> #include "share-folder.h" #define d(x) diff --git a/plugins/groupwise-features/share-folder.c b/plugins/groupwise-features/share-folder.c index 87d6564f0e..d16c205758 100644 --- a/plugins/groupwise-features/share-folder.c +++ b/plugins/groupwise-features/share-folder.c @@ -27,8 +27,6 @@ #include "share-folder.h" #include <glib/gi18n-lib.h> #include <libedataserverui/e-contact-store.h> -#include <libgnomeui/gnome-ui-init.h> -#include <libgnome/gnome-init.h> #include <e-util/e-error.h> #include <e-util/e-util-private.h> #include <e-gw-container.h> |