From a1794552bd7775f8dbe32a4b7e495ee61a31ab6c Mon Sep 17 00:00:00 2001 From: Kjartan Maraas Date: Fri, 26 Oct 2007 07:50:39 +0000 Subject: Warning fixes. - NULL vs. 0 - ANSIfication of declarations - mixing code 2007-10-25 Kjartan Maraas * e-msg-composer.c: * e-msg-composer.h: * listener.c: Warning fixes. - NULL vs. 0 - ANSIfication of declarations - mixing code and declarations svn path=/trunk/; revision=34427 --- composer/e-msg-composer.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'composer/e-msg-composer.c') diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index 4e43eaa119..0fda7c98c8 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -262,12 +262,12 @@ static struct { GdkAtom atom; guint32 actions; } drag_info[] = { - { "message/rfc822", 0, GDK_ACTION_COPY }, - { "x-uid-list", 0, GDK_ACTION_ASK|GDK_ACTION_MOVE|GDK_ACTION_COPY }, - { "text/uri-list", 0, GDK_ACTION_COPY }, - { "_NETSCAPE_URL", 0, GDK_ACTION_COPY }, - { "text/x-vcard", 0, GDK_ACTION_COPY }, - { "text/calendar", 0, GDK_ACTION_COPY }, + { "message/rfc822", NULL, GDK_ACTION_COPY }, + { "x-uid-list", NULL, GDK_ACTION_ASK|GDK_ACTION_MOVE|GDK_ACTION_COPY }, + { "text/uri-list", NULL, GDK_ACTION_COPY }, + { "_NETSCAPE_URL", NULL, GDK_ACTION_COPY }, + { "text/x-vcard", NULL, GDK_ACTION_COPY }, + { "text/calendar", NULL, GDK_ACTION_COPY }, }; static const char *emc_draft_format_names[] = { "pgp-sign", "pgp-encrypt", "smime-sign", "smime-encrypt" }; @@ -1638,7 +1638,7 @@ autosave_manager_stop (AutosaveManager *am) } static AutosaveManager * -autosave_manager_new () +autosave_manager_new (void) { AutosaveManager *am; GHashTable *table; @@ -2765,9 +2765,10 @@ static void composer_finalise (GObject *object) { EMsgComposer *composer; + EMsgComposerPrivate *p; composer = E_MSG_COMPOSER (object); - EMsgComposerPrivate *p = composer->priv; + p = composer->priv; if (p->extra_hdr_names) { int i; @@ -3384,7 +3385,7 @@ init (EMsgComposer *composer) p->has_changed = FALSE; p->autosaved = FALSE; - p->redirect = FALSE; + p->redirect = NULL; p->send_invoked = FALSE; p->charset = NULL; -- cgit