diff options
| -rw-r--r-- | em-format/Makefile.am | 27 | ||||
| -rw-r--r-- | mail/em-composer-utils.c | 10 | ||||
| -rw-r--r-- | mail/em-composer-utils.h | 2 | ||||
| -rw-r--r-- | shell/e-shell-backend.h | 2 |
4 files changed, 25 insertions, 16 deletions
diff --git a/em-format/Makefile.am b/em-format/Makefile.am index 2c758d068e..360ceac7c2 100644 --- a/em-format/Makefile.am +++ b/em-format/Makefile.am @@ -1,22 +1,27 @@ +emformatincludedir = $(privincludedir)/em-format + AM_CPPFLAGS = \ -I$(top_srcdir) \ $(EVOLUTION_MAIL_CFLAGS) -noinst_LTLIBRARIES = libemformat.la +privsolib_LTLIBRARIES = libemformat.la -libemformat_la_SOURCES = \ - em-format.h \ - em-format.c \ - em-format-quote.h \ - em-format-quote.c \ - em-stripsig-filter.c \ +emformatinclude_HEADERS = \ + em-format.h \ + em-format-quote.h \ em-stripsig-filter.h -libemformat_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) +libemformat_la_SOURCES = \ + $(emformatinclude_HEADERS) \ + em-format.c \ + em-format-quote.c \ + em-stripsig-filter.c + +libemformat_la_LDFLAGS = $(NO_UNDEFINED) -libemformat_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/shell/libeshell.la \ +libemformat_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/shell/libeshell.la \ $(EVOLUTION_MAIL_LIBS) -include $(top_srcdir)/git.mk diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index 40abdcf37d..ce72600ed4 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -734,7 +734,7 @@ em_utils_compose_lite_new_message (const gchar *fromuri) * window. If @url is non-NULL, the composer fields will be filled in * according to the values in the mailto url. **/ -void +EMsgComposer * em_utils_compose_new_message_with_mailto (const gchar *url, const gchar *fromuri) { EMsgComposer *composer; @@ -754,8 +754,12 @@ em_utils_compose_new_message_with_mailto (const gchar *url, const gchar *fromuri composer_set_no_change (composer, TRUE, url == NULL); - gtk_widget_show ((GtkWidget *) composer); - gdk_window_raise (((GtkWidget *) composer)->window); + if (!e_msg_composer_get_lite ()) { + gtk_widget_show ((GtkWidget *) composer); + gdk_window_raise (((GtkWidget *) composer)->window); + } + + return composer; } /* Editing messages... */ diff --git a/mail/em-composer-utils.h b/mail/em-composer-utils.h index f8c2cd580c..763de3301c 100644 --- a/mail/em-composer-utils.h +++ b/mail/em-composer-utils.h @@ -36,7 +36,7 @@ void em_utils_compose_new_message (const gchar *fromuri); EMsgComposer * em_utils_compose_lite_new_message (const gchar *fromuri); /* FIXME: mailto? url? should make up its mind what its called. imho use 'uri' */ -void em_utils_compose_new_message_with_mailto (const gchar *url, const gchar *fromuri); +EMsgComposer * em_utils_compose_new_message_with_mailto (const gchar *url, const gchar *fromuri); GtkWidget * em_utils_edit_message (CamelMimeMessage *message, CamelFolder *folder); void em_utils_edit_messages (CamelFolder *folder, GPtrArray *uids, gboolean replace); diff --git a/shell/e-shell-backend.h b/shell/e-shell-backend.h index 8b7e24034f..6dbbb33ea1 100644 --- a/shell/e-shell-backend.h +++ b/shell/e-shell-backend.h @@ -29,7 +29,7 @@ #define E_SHELL_BACKEND_H #include <shell/e-shell-common.h> -#include <widgets/misc/e-activity.h> +#include <misc/e-activity.h> /* Standard GObject macros */ #define E_TYPE_SHELL_BACKEND \ |