diff options
| -rw-r--r-- | composer/e-msg-composer.c | 2 | ||||
| -rw-r--r-- | e-util/gtk-compat.h | 10 | ||||
| -rw-r--r-- | mail/e-mail-reader.c | 2 | ||||
| -rw-r--r-- | mail/em-account-editor.c | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index e1bf625200..8571e61b6a 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -2536,7 +2536,7 @@ handle_multipart_signed (EMsgComposer *composer, CamelContentType *content_type; CamelDataWrapper *content; CamelMimePart *mime_part; - GtkToggleAction *action; + GtkToggleAction *action = NULL; const gchar *protocol; content = CAMEL_DATA_WRAPPER (multipart); diff --git a/e-util/gtk-compat.h b/e-util/gtk-compat.h index b01b8c5e19..3e531b2b1f 100644 --- a/e-util/gtk-compat.h +++ b/e-util/gtk-compat.h @@ -27,12 +27,10 @@ #if GTK_CHECK_VERSION (2,90,5) /* Recreate GdkRegion until we drop GTK2 compatibility. */ - -typedef enum { - GDK_OVERLAP_RECTANGLE_IN, - GDK_OVERLAP_RECTANGLE_OUT, - GDK_OVERLAP_RECTANGLE_PART -} GdkOverlapType; +#define GdkOverlapType cairo_region_overlap_t +#define GDK_OVERLAP_RECTANGLE_IN CAIRO_REGION_OVERLAP_IN +#define GDK_OVERLAP_RECTANGLE_OUT CAIRO_REGION_OVERLAP_OUT +#define GDK_OVERLAP_RECTANGLE_PART CAIRO_REGION_OVERLAP_PART #define GdkRegion cairo_region_t diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c index 22271732b9..43f41c93c5 100644 --- a/mail/e-mail-reader.c +++ b/mail/e-mail-reader.c @@ -124,7 +124,7 @@ action_mail_add_sender_cb (GtkAction *action, { EShell *shell; EShellBackend *shell_backend; - CamelMessageInfo *info; + CamelMessageInfo *info = NULL; CamelFolder *folder; GPtrArray *uids; const gchar *address; diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c index 603aa529a4..99ba81739c 100644 --- a/mail/em-account-editor.c +++ b/mail/em-account-editor.c @@ -2606,6 +2606,7 @@ emae_receive_options_extra_item (EConfig *ec, EConfigItem *eitem, GtkWidget *par return NULL; section: d (printf ("Building extra section '%s'\n", eitem->path)); + w = NULL; url = emae_account_url (emae, emae_service_info[service->type].account_uri_key); item->extra_table = g_hash_table_new (g_str_hash, g_str_equal); extra = g_hash_table_new (g_str_hash, g_str_equal); @@ -2699,7 +2700,8 @@ section: } camel_url_free (url); - gtk_widget_show (w); + if (w) + gtk_widget_show (w); return w; } |