diff options
-rw-r--r-- | composer/ChangeLog | 10 | ||||
-rw-r--r-- | composer/e-msg-composer.c | 19 | ||||
-rw-r--r-- | composer/e-msg-composer.h | 4 | ||||
-rw-r--r-- | composer/listener.c | 2 |
4 files changed, 21 insertions, 14 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog index 69262acb33..b10d9cd50a 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,13 @@ +2007-10-25 Kjartan Maraas <kmaraas@gnome.org> + + * e-msg-composer.c: + * e-msg-composer.h: + * listener.c: + Warning fixes. + - NULL vs. 0 + - ANSIfication of declarations + - mixing code and declarations + 2007-10-11 Milan Crha <mcrha@redhat.com> ** Fix for bug #412360 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; diff --git a/composer/e-msg-composer.h b/composer/e-msg-composer.h index 2e3f6dc9ba..9bddb9871e 100644 --- a/composer/e-msg-composer.h +++ b/composer/e-msg-composer.h @@ -66,10 +66,6 @@ EMsgComposer *e_msg_composer_new_redirect (CamelM const char *resent_from); void e_msg_composer_show_attachments_ui (EMsgComposer *composer); -/* -void e_msg_composer_show_attachments (EMsgComposer *composer, - gboolean show);*/ - void e_msg_composer_set_alternative (EMsgComposer *composer, gboolean alt); diff --git a/composer/listener.c b/composer/listener.c index 97a8403d91..5f32ba53da 100644 --- a/composer/listener.c +++ b/composer/listener.c @@ -40,7 +40,7 @@ listener_from_servant (PortableServer_Servant servant) } static CORBA_any * -get_any_null () +get_any_null (void) { CORBA_any *rv; |