aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacob Leach <jleach@src.gnome.org>2001-01-28 02:23:06 +0800
committerJacob Leach <jleach@src.gnome.org>2001-01-28 02:23:06 +0800
commit92f7098e3ea093c9badd3347234ef8f4d93c7db1 (patch)
tree45cb5f1af0cfcb4fb763272f67f7cd2b2bc86372
parent0fda3e923ec78c749b3542bec0509844af9f0056 (diff)
downloadgsoc2013-evolution-92f7098e3ea093c9badd3347234ef8f4d93c7db1.tar.gz
gsoc2013-evolution-92f7098e3ea093c9badd3347234ef8f4d93c7db1.tar.zst
gsoc2013-evolution-92f7098e3ea093c9badd3347234ef8f4d93c7db1.zip
shell compile fixes (some #includes pointing to old headers) to go
with removing widgets/shortcut-bar because it's in gal. svn path=/trunk/; revision=7861
-rw-r--r--shell/ChangeLog6
-rw-r--r--shell/e-shortcuts-view-model.h2
-rw-r--r--shell/e-shortcuts-view.h4
-rw-r--r--shell/e-shortcuts.c2
4 files changed, 10 insertions, 4 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 01cc8de557..c17faa51ed 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,11 @@
2001-01-27 Jason Leach <jasonleach@usa.net>
+ * e-shortcuts-view.h: Fix #include to point to gal instead of
+ widgets/shortcut-bar/
+
+ * e-shortcuts.c: Here too.
+ * e-shortcuts-view-model.h: And lastly here.
+
* Makefile.am (evolution_LDADD): Don't link with the old
widgets/shortcut-bar/libshortcut-bar.la anymore, gal has the new
shortcut-bar.
diff --git a/shell/e-shortcuts-view-model.h b/shell/e-shortcuts-view-model.h
index af5259bbee..c8de47f773 100644
--- a/shell/e-shortcuts-view-model.h
+++ b/shell/e-shortcuts-view-model.h
@@ -26,7 +26,7 @@
#include "e-shortcuts.h"
-#include "shortcut-bar/e-shortcut-model.h"
+#include <gal/shortcut-bar/e-shortcut-model.h>
#ifdef __cplusplus
extern "C" {
diff --git a/shell/e-shortcuts-view.h b/shell/e-shortcuts-view.h
index 0acb7efdce..8c7763ec75 100644
--- a/shell/e-shortcuts-view.h
+++ b/shell/e-shortcuts-view.h
@@ -28,9 +28,9 @@
#include <config.h>
#endif
-#include <gnome.h>
+#include <gtk/gtkwidget.h>
-#include "shortcut-bar/e-shortcut-bar.h"
+#include <gal/shortcut-bar/e-shortcut-bar.h>
#include "e-shortcuts.h"
#ifdef __cplusplus
diff --git a/shell/e-shortcuts.c b/shell/e-shortcuts.c
index 63d9480f00..5acc856e33 100644
--- a/shell/e-shortcuts.c
+++ b/shell/e-shortcuts.c
@@ -53,8 +53,8 @@
#include <gal/util/e-util.h>
#include <gal/util/e-xml-utils.h>
+#include <gal/shortcut-bar/e-shortcut-bar.h>
-#include "shortcut-bar/e-shortcut-bar.h"
#include "e-shortcuts-view.h"
#include "e-shortcuts.h"