callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some issues when building Anjal.

Browse Source
This commit is contained in:
Matthew Barnes
2009-07-13 09:33:38 -04:00
parent 0d6061a4eb
commit f425fdc8e2
4 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
em-format/Makefile.am
View File

@ -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_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/shell/libeshell.la \
libemformat_la_LDFLAGS = $(NO_UNDEFINED)
libemformat_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/shell/libeshell.la \
$(EVOLUTION_MAIL_LIBS)
-include $(top_srcdir)/git.mk

10
mail/em-composer-utils.c
View File

@ -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... */

2
mail/em-composer-utils.h
View File

@ -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);

2
shell/e-shell-backend.h
View File

@ -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 \