aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/misc
diff options
context:
space:
mode:
Diffstat (limited to 'widgets/misc')
-rw-r--r--widgets/misc/ChangeLog7
-rw-r--r--widgets/misc/Makefile.am5
2 files changed, 12 insertions, 0 deletions
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index 7f31327bfc..8185300b22 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,10 @@
+2005-01-06 Chenthill Palanisamy <pchenthill@novell.com>
+
+ merging send options
+ * Makefile.am:
+ * e-send-options.[ch]: Widgets for the send options dialog
+ * e-send-options.glade: Contains interface for the dialog
+
2005-01-04 Harry Lu <harry.lu@sun.com>
* misc/e-combo-button.c: (e_combo_button_popup): new internal function
diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am
index 0d792bff5e..664627940a 100644
--- a/widgets/misc/Makefile.am
+++ b/widgets/misc/Makefile.am
@@ -3,6 +3,7 @@ INCLUDES = \
-I$(top_srcdir)/a11y/widgets/ \
-DMAP_DIR=\""$(imagesdir)"\" \
-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \
+ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DG_LOG_DOMAIN=__FILE__ \
$(E_WIDGETS_CFLAGS)
@@ -19,6 +20,8 @@ pilot_sources =
pilot_headers =
endif
+glade_DATA = e-send-options.glade
+
widgetsinclude_HEADERS = \
$(pilot_headers) \
e-activity-handler.h \
@@ -43,6 +46,7 @@ widgetsinclude_HEADERS = \
e-search-bar.h \
e-task-bar.h \
e-task-widget.h \
+ e-send-options.h \
e-url-entry.h
libemiscwidgets_la_SOURCES = \
@@ -71,6 +75,7 @@ libemiscwidgets_la_SOURCES = \
e-search-bar.c \
e-task-bar.c \
e-task-widget.c \
+ e-send-options.c \
e-url-entry.c
MARSHAL_GENERATED = e-util-marshal.c e-util-marshal.h