aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/menus
diff options
context:
space:
mode:
Diffstat (limited to 'widgets/menus')
-rw-r--r--widgets/menus/Makefile.am43
-rw-r--r--widgets/menus/gal-define-views-dialog.c10
-rw-r--r--widgets/menus/gal-define-views-dialog.h4
-rw-r--r--widgets/menus/gal-define-views-model.c4
-rw-r--r--widgets/menus/gal-define-views-model.h6
-rw-r--r--widgets/menus/gal-view-collection.c8
-rw-r--r--widgets/menus/gal-view-collection.h2
-rw-r--r--widgets/menus/gal-view-etable.c2
-rw-r--r--widgets/menus/gal-view-etable.h10
-rw-r--r--widgets/menus/gal-view-factory-etable.c4
-rw-r--r--widgets/menus/gal-view-factory-etable.h4
-rw-r--r--widgets/menus/gal-view-factory.c2
-rw-r--r--widgets/menus/gal-view-factory.h2
-rw-r--r--widgets/menus/gal-view-instance-save-as-dialog.c8
-rw-r--r--widgets/menus/gal-view-instance-save-as-dialog.h6
-rw-r--r--widgets/menus/gal-view-instance.c8
-rw-r--r--widgets/menus/gal-view-instance.h4
-rw-r--r--widgets/menus/gal-view-menus.c6
-rw-r--r--widgets/menus/gal-view-menus.h2
-rw-r--r--widgets/menus/gal-view-new-dialog.c12
-rw-r--r--widgets/menus/gal-view.c2
21 files changed, 94 insertions, 55 deletions
diff --git a/widgets/menus/Makefile.am b/widgets/menus/Makefile.am
index 30f1734fe8..459eb25afe 100644
--- a/widgets/menus/Makefile.am
+++ b/widgets/menus/Makefile.am
@@ -2,10 +2,49 @@ privlib_LTLIBRARIES = libmenus.la
INCLUDES = \
-I$(top_srcdir) \
+ -I$(top_srcdir)/widgets \
-I$(top_srcdir)/widgets/menus \
+ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DG_LOG_DOMAIN=\"menus\" \
+ $(EXTRA_GNOME_CFLAGS) \
+ $(GNOME_INCLUDEDIR) \
+ $(ICONV_CFLAGS) \
$(GNOME_FULL_CFLAGS)
-libmenus_la_SOURCES = \
- gal-view-menus.c \
+libmenus_la_SOURCES = \
+ gal-view-menus.c \
+ gal-define-views-dialog.c \
+ gal-define-views-model.c \
+ gal-view-collection.c \
+ gal-view-etable.c \
+ gal-view-factory-etable.c \
+ gal-view-factory.c \
+ gal-view-instance-save-as-dialog.c \
+ gal-view-instance.c \
+ gal-view-new-dialog.c \
+ gal-view.c \
gal-view-menus.h
+
+glade_DATA = \
+ gal-define-views.glade \
+ gal-view-new-dialog.glade \
+ gal-view-instance-save-as-dialog.glade
+
+libmenusincludedir = $(privincludedir)/menus
+
+libmenusinclude_HEADERS = \
+ gal-define-views-dialog.h \
+ gal-define-views-model.h \
+ gal-view-collection.h \
+ gal-view-etable.h \
+ gal-view-factory-etable.h \
+ gal-view-factory.h \
+ gal-view-instance-save-as-dialog.h \
+ gal-view-instance.h \
+ gal-view-new-dialog.h \
+ gal-view.h
+
+icons =
+EXTRA_DIST = \
+ $(icons) \
+ $(glade_DATA)
diff --git a/widgets/menus/gal-define-views-dialog.c b/widgets/menus/gal-define-views-dialog.c
index 43edcef690..a4dd6cde7d 100644
--- a/widgets/menus/gal-define-views-dialog.c
+++ b/widgets/menus/gal-define-views-dialog.c
@@ -25,10 +25,10 @@
#include <gtk/gtk.h>
-#include "gal/e-table/e-table-scrolled.h"
-#include "gal/util/e-i18n.h"
-#include "gal/util/e-util.h"
-#include "gal/util/e-util-private.h"
+#include "table/e-table-scrolled.h"
+#include "e-util/e-i18n.h"
+#include "e-util/e-util.h"
+#include "e-util/e-util-private.h"
#include "gal-define-views-dialog.h"
#include "gal-define-views-model.h"
@@ -244,7 +244,7 @@ gal_define_views_dialog_init (GalDefineViewsDialog *dialog)
GladeXML *gui;
GtkWidget *widget;
GtkWidget *etable;
- gchar *filename = g_build_filename (GAL_GLADEDIR,
+ gchar *filename = g_build_filename (EVOLUTION_GLADEDIR,
"gal-define-views.glade",
NULL);
diff --git a/widgets/menus/gal-define-views-dialog.h b/widgets/menus/gal-define-views-dialog.h
index 03a047b9fe..52636f7444 100644
--- a/widgets/menus/gal-define-views-dialog.h
+++ b/widgets/menus/gal-define-views-dialog.h
@@ -26,8 +26,8 @@
#include <gtk/gtkdialog.h>
#include <glade/glade.h>
-#include <gal/e-table/e-table-model.h>
-#include <gal/menus/gal-view-collection.h>
+#include <table/e-table-model.h>
+#include <widgets/menus/gal-view-collection.h>
#ifdef __cplusplus
extern "C" {
diff --git a/widgets/menus/gal-define-views-model.c b/widgets/menus/gal-define-views-model.c
index 318992cc56..f526419398 100644
--- a/widgets/menus/gal-define-views-model.c
+++ b/widgets/menus/gal-define-views-model.c
@@ -27,8 +27,8 @@
#include <libxml/parser.h>
#include <libxml/xmlmemory.h>
-#include "gal/util/e-i18n.h"
-#include "gal/util/e-util.h"
+#include "e-util/e-i18n.h"
+#include "e-util/e-util.h"
#include "gal-define-views-model.h"
diff --git a/widgets/menus/gal-define-views-model.h b/widgets/menus/gal-define-views-model.h
index 6ea2b28cbc..65345b706b 100644
--- a/widgets/menus/gal-define-views-model.h
+++ b/widgets/menus/gal-define-views-model.h
@@ -24,9 +24,9 @@
#ifndef _GAL_DEFINE_VIEWS_MODEL_H_
#define _GAL_DEFINE_VIEWS_MODEL_H_
-#include <gal/e-table/e-table-model.h>
-#include <gal/menus/gal-view.h>
-#include <gal/menus/gal-view-collection.h>
+#include <table/e-table-model.h>
+#include <widgets/menus/gal-view.h>
+#include <widgets/menus/gal-view-collection.h>
#ifdef __cplusplus
extern "C" {
diff --git a/widgets/menus/gal-view-collection.c b/widgets/menus/gal-view-collection.c
index 826951b9e3..9d31fafb2b 100644
--- a/widgets/menus/gal-view-collection.c
+++ b/widgets/menus/gal-view-collection.c
@@ -31,10 +31,10 @@
#include <libxml/parser.h>
#include <libgnome/gnome-util.h>
-#include "gal/util/e-i18n.h"
-#include "gal/util/e-util.h"
-#include "gal/util/e-xml-utils.h"
-#include "gal/widgets/e-unicode.h"
+#include "e-util/e-i18n.h"
+#include "e-util/e-util.h"
+#include "e-util/e-xml-utils.h"
+#include "widgets/misc/e-unicode.h"
#include "gal-view-collection.h"
diff --git a/widgets/menus/gal-view-collection.h b/widgets/menus/gal-view-collection.h
index 9ba5eab71f..8f127a45c4 100644
--- a/widgets/menus/gal-view-collection.h
+++ b/widgets/menus/gal-view-collection.h
@@ -25,7 +25,7 @@
#define _GAL_VIEW_SET_H_
#include <gtk/gtkobject.h>
-#include <gal/menus/gal-view-factory.h>
+#include <widgets/menus/gal-view-factory.h>
G_BEGIN_DECLS
diff --git a/widgets/menus/gal-view-etable.c b/widgets/menus/gal-view-etable.c
index 3f23981fe7..f35d94e5db 100644
--- a/widgets/menus/gal-view-etable.c
+++ b/widgets/menus/gal-view-etable.c
@@ -23,7 +23,7 @@
#include <config.h>
-#include "gal/e-table/e-table-config.h"
+#include "table/e-table-config.h"
#include "gal-view-etable.h"
diff --git a/widgets/menus/gal-view-etable.h b/widgets/menus/gal-view-etable.h
index 65879663fa..971db2b8d6 100644
--- a/widgets/menus/gal-view-etable.h
+++ b/widgets/menus/gal-view-etable.h
@@ -25,11 +25,11 @@
#define _GAL_VIEW_ETABLE_H_
#include <gtk/gtkobject.h>
-#include <gal/menus/gal-view.h>
-#include <gal/e-table/e-table-state.h>
-#include <gal/e-table/e-table-specification.h>
-#include <gal/e-table/e-table.h>
-#include <gal/e-table/e-tree.h>
+#include <widgets/menus/gal-view.h>
+#include <table/e-table-state.h>
+#include <table/e-table-specification.h>
+#include <table/e-table.h>
+#include <table/e-tree.h>
G_BEGIN_DECLS
diff --git a/widgets/menus/gal-view-factory-etable.c b/widgets/menus/gal-view-factory-etable.c
index 3de27833ec..bdeb1e1e71 100644
--- a/widgets/menus/gal-view-factory-etable.c
+++ b/widgets/menus/gal-view-factory-etable.c
@@ -23,8 +23,8 @@
#include <config.h>
-#include "gal/util/e-i18n.h"
-#include "gal/util/e-util.h"
+#include "e-util/e-i18n.h"
+#include "e-util/e-util.h"
#include "gal-view-etable.h"
#include "gal-view-factory-etable.h"
diff --git a/widgets/menus/gal-view-factory-etable.h b/widgets/menus/gal-view-factory-etable.h
index 542aa255fc..92adb69cf4 100644
--- a/widgets/menus/gal-view-factory-etable.h
+++ b/widgets/menus/gal-view-factory-etable.h
@@ -25,8 +25,8 @@
#define _GAL_VIEW_FACTORY_ETABLE_H_
#include <gtk/gtkobject.h>
-#include <gal/menus/gal-view-factory.h>
-#include <gal/e-table/e-table-specification.h>
+#include <widgets/menus/gal-view-factory.h>
+#include <table/e-table-specification.h>
#ifdef __cplusplus
extern "C" {
diff --git a/widgets/menus/gal-view-factory.c b/widgets/menus/gal-view-factory.c
index 3a644606f6..6441d9ee24 100644
--- a/widgets/menus/gal-view-factory.c
+++ b/widgets/menus/gal-view-factory.c
@@ -23,7 +23,7 @@
#include <config.h>
-#include "gal/util/e-util.h"
+#include "e-util/e-util.h"
#include "gal-view-factory.h"
diff --git a/widgets/menus/gal-view-factory.h b/widgets/menus/gal-view-factory.h
index 5fff83e048..cc36fbdf8c 100644
--- a/widgets/menus/gal-view-factory.h
+++ b/widgets/menus/gal-view-factory.h
@@ -25,7 +25,7 @@
#define _GAL_VIEW_FACTORY_H_
#include <gtk/gtkobject.h>
-#include <gal/menus/gal-view.h>
+#include <widgets/menus/gal-view.h>
#ifdef __cplusplus
extern "C" {
diff --git a/widgets/menus/gal-view-instance-save-as-dialog.c b/widgets/menus/gal-view-instance-save-as-dialog.c
index d2ce6e9ac3..eb01386418 100644
--- a/widgets/menus/gal-view-instance-save-as-dialog.c
+++ b/widgets/menus/gal-view-instance-save-as-dialog.c
@@ -25,9 +25,9 @@
#include <gtk/gtk.h>
-#include "gal/e-table/e-table-scrolled.h"
-#include "gal/util/e-i18n.h"
-#include "gal/util/e-util-private.h"
+#include "table/e-table-scrolled.h"
+#include "e-util/e-i18n.h"
+#include "e-util/e-util-private.h"
#include "gal-define-views-model.h"
#include "gal-view-instance-save-as-dialog.h"
@@ -191,7 +191,7 @@ gal_view_instance_save_as_dialog_init (GalViewInstanceSaveAsDialog *dialog)
GladeXML *gui;
GtkWidget *widget;
GtkWidget *table;
- gchar *filename = g_build_filename (GAL_GLADEDIR,
+ gchar *filename = g_build_filename (EVOLUTION_GLADEDIR,
"gal-view-instance-save-as-dialog.glade",
NULL);
diff --git a/widgets/menus/gal-view-instance-save-as-dialog.h b/widgets/menus/gal-view-instance-save-as-dialog.h
index 53d99d0789..8187d32420 100644
--- a/widgets/menus/gal-view-instance-save-as-dialog.h
+++ b/widgets/menus/gal-view-instance-save-as-dialog.h
@@ -26,9 +26,9 @@
#include <gtk/gtkdialog.h>
#include <glade/glade.h>
-#include <gal/e-table/e-table-model.h>
-#include <gal/menus/gal-view-collection.h>
-#include <gal/menus/gal-view-instance.h>
+#include <table/e-table-model.h>
+#include <widgets/menus/gal-view-collection.h>
+#include <widgets/menus/gal-view-instance.h>
#ifdef __cplusplus
extern "C" {
diff --git a/widgets/menus/gal-view-instance.c b/widgets/menus/gal-view-instance.c
index 5cc3c696a3..44b4990925 100644
--- a/widgets/menus/gal-view-instance.c
+++ b/widgets/menus/gal-view-instance.c
@@ -34,10 +34,10 @@
#include <libgnome/gnome-util.h>
#include <glib/gstdio.h>
-#include "gal/util/e-i18n.h"
-#include "gal/util/e-util.h"
-#include "gal/util/e-xml-utils.h"
-#include "gal/widgets/e-unicode.h"
+#include "e-util/e-i18n.h"
+#include "e-util/e-util.h"
+#include "e-util/e-xml-utils.h"
+#include "widgets/misc/e-unicode.h"
#include "gal-define-views-dialog.h"
#include "gal-view-instance.h"
diff --git a/widgets/menus/gal-view-instance.h b/widgets/menus/gal-view-instance.h
index 05723a2ea6..09bffc32b4 100644
--- a/widgets/menus/gal-view-instance.h
+++ b/widgets/menus/gal-view-instance.h
@@ -25,8 +25,8 @@
#define _GAL_VIEW_INSTANCE_H_
#include <gtk/gtkobject.h>
-#include <gal/menus/gal-view-collection.h>
-#include <gal/widgets/e-popup-menu.h>
+#include <widgets/menus/gal-view-collection.h>
+#include <widgets/misc/e-popup-menu.h>
G_BEGIN_DECLS
diff --git a/widgets/menus/gal-view-menus.c b/widgets/menus/gal-view-menus.c
index 762f845d20..f9402c762f 100644
--- a/widgets/menus/gal-view-menus.c
+++ b/widgets/menus/gal-view-menus.c
@@ -22,9 +22,9 @@
#include <libgnomeui/gnome-dialog.h>
#include <libgnome/gnome-i18n.h>
#include <bonobo/bonobo-ui-util.h>
-#include <gal/util/e-util.h>
-#include <gal/util/e-xml-utils.h>
-#include <gal/menus/gal-define-views-dialog.h>
+#include <e-util/e-util.h>
+#include <e-util/e-xml-utils.h>
+#include <widgets/menus/gal-define-views-dialog.h>
#include <bonobo/bonobo-ui-util.h>
#include <e-util/e-list.h>
diff --git a/widgets/menus/gal-view-menus.h b/widgets/menus/gal-view-menus.h
index e4de898187..1e857d8e2b 100644
--- a/widgets/menus/gal-view-menus.h
+++ b/widgets/menus/gal-view-menus.h
@@ -4,7 +4,7 @@
#include <libxml/tree.h>
#include <bonobo/bonobo-ui-component.h>
-#include <gal/menus/gal-view-instance.h>
+#include <widgets/menus/gal-view-instance.h>
#include <glib-object.h>
diff --git a/widgets/menus/gal-view-new-dialog.c b/widgets/menus/gal-view-new-dialog.c
index 7de74c69a8..08a6841a25 100644
--- a/widgets/menus/gal-view-new-dialog.c
+++ b/widgets/menus/gal-view-new-dialog.c
@@ -25,11 +25,11 @@
#include <gtk/gtk.h>
-#include "gal/e-table/e-table-scrolled.h"
-#include "gal/util/e-i18n.h"
-#include "gal/util/e-util.h"
-#include "gal/util/e-util-private.h"
-#include "gal/widgets/e-unicode.h"
+#include "table/e-table-scrolled.h"
+#include "e-util/e-i18n.h"
+#include "e-util/e-util.h"
+#include "e-util/e-util-private.h"
+#include "widgets/misc/e-unicode.h"
#include "gal-define-views-model.h"
#include "gal-view-new-dialog.h"
@@ -88,7 +88,7 @@ gal_view_new_dialog_init (GalViewNewDialog *dialog)
{
GladeXML *gui;
GtkWidget *widget;
- gchar *filename = g_build_filename (GAL_GLADEDIR,
+ gchar *filename = g_build_filename (EVOLUTION_GLADEDIR,
"gal-view-new-dialog.glade",
NULL);
diff --git a/widgets/menus/gal-view.c b/widgets/menus/gal-view.c
index c375b4323f..36c325aefd 100644
--- a/widgets/menus/gal-view.c
+++ b/widgets/menus/gal-view.c
@@ -23,7 +23,7 @@
#include <config.h>
-#include "gal/util/e-util.h"
+#include "e-util/e-util.h"
#include "gal-view.h"
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 06:09:44 +0800