From 7ade227e6409c98a4010992450e111cf7bb10520 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 14 Aug 2008 20:19:12 +0000 Subject: Merge revisions 35951:35992 from trunk. svn path=/branches/kill-bonobo/; revision=35994 --- plugins/email-custom-header/ChangeLog | 15 +++++++++++++++ plugins/email-custom-header/Makefile.am | 22 ++++++++++++++++++---- plugins/email-custom-header/email-custom-header.c | 12 ++++-------- 3 files changed, 37 insertions(+), 12 deletions(-) (limited to 'plugins/email-custom-header') diff --git a/plugins/email-custom-header/ChangeLog b/plugins/email-custom-header/ChangeLog index 7f4dc1918a..2c992a4fac 100644 --- a/plugins/email-custom-header/ChangeLog +++ b/plugins/email-custom-header/ChangeLog @@ -1,3 +1,18 @@ +2008-08-14 Matthew Barnes + + * gui/contact-editor/e-contact-editor.c: + Use e_display_help() for displaying help. + +2008-08-12 Bharath Acharya + + * Makefile.am: Have a check for OS_WIN32 and handle the schema data + differently. make install error on win32. + +2008-08-12 Bharath Acharya + + * Makefile.am: Added necessary libraries to link to. Build break while + compiling on Windows. + 2008-08-01 Matthew Barnes ** Fixes bug #543755 diff --git a/plugins/email-custom-header/Makefile.am b/plugins/email-custom-header/Makefile.am index 91a3b52df4..ccc9c787f8 100644 --- a/plugins/email-custom-header/Makefile.am +++ b/plugins/email-custom-header/Makefile.am @@ -24,6 +24,7 @@ liborg_gnome_email_custom_header_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/mail/libevolution-mail.la \ + $(EVOLUTION_MAIL_LIBS) \ $(NO_UNDEFINED_REQUIRED_LIBS) liborg_gnome_email_custom_header_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) @@ -34,12 +35,25 @@ schema_DATA = $(schema_in_files:.schemas.in=.schemas) @INTLTOOL_SCHEMAS_RULE@ +if OS_WIN32 install-data-local: - if test -z "$(DESTDIR)" ; then \ - for p in $(schema_DATA) ; do \ - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p; \ - done \ + if test -z "$(DESTDIR)" ; then \ + for p in $(schema_DATA) ; do \ + (echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE); \ + echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat; \ + cmd /c _temp.bat; \ + rm _temp.bat; \ + done \ fi +else +install-data-local: + if test -z "$(DESTDIR)" ; then \ + for p in $(schema_DATA) ; do \ + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ + $(GCONFTOOL) --makefile-install-rule $$p; \ + done \ + fi +endif glade_DATA = \ org-gnome-email-custom-header.glade \ diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c index 6918a9b43c..ab882cc197 100644 --- a/plugins/email-custom-header/email-custom-header.c +++ b/plugins/email-custom-header/email-custom-header.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include "mail/em-menu.h" #include "mail/em-utils.h" @@ -34,6 +33,7 @@ #include "composer/e-msg-composer.h" #include "libedataserver/e-account.h" #include "e-util/e-config.h" +#include "e-util/e-util.h" #include "email-custom-header.h" @@ -197,7 +197,6 @@ epech_header_options_cb (GtkDialog *dialog, gint state, gpointer func_data) { EmailCustomHeaderOptionsDialogPrivate *priv; CustomHeaderOptionsDialog *mch; - GError *error = NULL; mch = func_data; priv = mch->priv; @@ -211,12 +210,9 @@ epech_header_options_cb (GtkDialog *dialog, gint state, gpointer func_data) g_object_unref (priv->xml); break; case GTK_RESPONSE_HELP: - gnome_help_display ( - "evolution.xml", priv->help_section, &error); - if (error) { - g_warning ("%s", error->message); - g_error_free (error); - } + e_display_help ( + GTK_WINDOW (priv->main), + priv->help_section); break; } -- cgit v1.2.3