[balsa] Fix some conditional compilation code

[Peter Bloomfield <peterb src gnome org>]

commit 96b829b6d1b82feb18df686ae0650edc9fc6986c
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Tue Jan 24 23:06:06 2017 -0500

    Fix some conditional compilation code
    
    Fix some conditional compilation code so that uncrustify does
    not break the build.
    
        * src/balsa-message.c (balsa_headers_attachments_popup),
        (tree_button_press_cb): fix it.
        * src/balsa-mime-widget-text.c (prepare_url_offsets): ditto.
        * src/sendmsg-window.c (attachment_button_press_cb),
        (attachment_popup_cb): ditto.

 ChangeLog                    |   11 +++++++++++
 src/balsa-message.c          |    6 ++++--
 src/balsa-mime-widget-text.c |    3 ++-
 src/sendmsg-window.c         |    6 ++++--
 4 files changed, 21 insertions(+), 5 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index a09df5f..0b75e88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2017-01-24  Peter Bloomfield  <pbloomfield bellsouth net>
+
+       Fix some conditional compilation code so that uncrustify does
+       not break the build.
+
+       * src/balsa-message.c (balsa_headers_attachments_popup),
+       (tree_button_press_cb): fix it.
+       * src/balsa-mime-widget-text.c (prepare_url_offsets): ditto.
+       * src/sendmsg-window.c (attachment_button_press_cb),
+       (attachment_popup_cb): ditto.
+
 2017-01-03  Albrecht Dreß
 
        Use glib for digest calculations
diff --git a/src/balsa-message.c b/src/balsa-message.c
index 64a7ddd..3c2af39 100644
--- a/src/balsa-message.c
+++ b/src/balsa-message.c
@@ -253,7 +253,7 @@ balsa_message_class_init(BalsaMessageClass * klass)
 static void
 balsa_headers_attachments_popup(GtkButton * button, BalsaMessage * bm)
 {
-    if (bm->parts_popup)
+    if (bm->parts_popup) {
 #if GTK_CHECK_VERSION(3, 22, 0)
         gtk_menu_popup_at_widget(GTK_MENU(bm->parts_popup),
                                  GTK_WIDGET(bm),
@@ -263,6 +263,7 @@ balsa_headers_attachments_popup(GtkButton * button, BalsaMessage * bm)
        gtk_menu_popup(GTK_MENU(bm->parts_popup), NULL, NULL, NULL, NULL, 0,
                       gtk_get_current_event_time());
 #endif                          /*GTK_CHECK_VERSION(3, 22, 0) */
+    }
 }
 
 
@@ -1066,7 +1067,7 @@ tree_button_press_cb(GtkWidget * widget, GdkEventButton * event,
             if (gtk_tree_model_get_iter (model, &iter, path)) {
                 gtk_tree_model_get(model, &iter, PART_INFO_COLUMN, &info, -1);
                 if (info) {
-                    if (info->popup_menu)
+                    if (info->popup_menu) {
 #if GTK_CHECK_VERSION(3, 22, 0)
                         gtk_menu_popup_at_pointer(GTK_MENU(info->popup_menu),
                                                   (GdkEvent *) event);
@@ -1074,6 +1075,7 @@ tree_button_press_cb(GtkWidget * widget, GdkEventButton * event,
                         gtk_menu_popup(GTK_MENU(info->popup_menu), NULL, NULL,
                                        NULL, NULL, event->button, event->time);
 #endif                          /*GTK_CHECK_VERSION(3, 22, 0) */
+                    }
                     g_object_unref(info);
                 }
             }
diff --git a/src/balsa-mime-widget-text.c b/src/balsa-mime-widget-text.c
index 4e01557..3574107 100644
--- a/src/balsa-mime-widget-text.c
+++ b/src/balsa-mime-widget-text.c
@@ -678,7 +678,7 @@ prepare_url_offsets(GtkTextBuffer * buffer, GList * url_list)
 #ifdef BUG_102711_FIXED
         gtk_text_iter_backward_to_tag_toggle(&iter, url_tag);
 #else
-        while (gtk_text_iter_backward_char(&iter))
+        while (gtk_text_iter_backward_char(&iter)) {
 #if GTK_CHECK_VERSION(3, 19, 0)
             if (gtk_text_iter_starts_tag(&iter, url_tag))
                 break;
@@ -686,6 +686,7 @@ prepare_url_offsets(GtkTextBuffer * buffer, GList * url_list)
             if (gtk_text_iter_begins_tag(&iter, url_tag))
                 break;
 #endif                          /* GTK_CHECK_VERSION(3, 20, 0) */
+        }
 #endif                          /* BUG_102711_FIXED */
         url->start = gtk_text_iter_get_offset(&iter);
     }
diff --git a/src/sendmsg-window.c b/src/sendmsg-window.c
index b85b9d7..0a86df1 100644
--- a/src/sendmsg-window.c
+++ b/src/sendmsg-window.c
@@ -2458,7 +2458,7 @@ attachment_button_press_cb(GtkWidget * widget, GdkEventButton * event,
 
            gtk_tree_model_get(model, &iter, ATTACH_INFO_COLUMN, &attach_info, -1);
            if (attach_info) {
-               if (attach_info->popup_menu)
+               if (attach_info->popup_menu) {
 #if GTK_CHECK_VERSION(3, 22, 0)
                     gtk_menu_popup_at_pointer(GTK_MENU(attach_info->popup_menu),
                                               (GdkEvent *) event);
@@ -2466,6 +2466,7 @@ attachment_button_press_cb(GtkWidget * widget, GdkEventButton * event,
                    gtk_menu_popup(GTK_MENU(attach_info->popup_menu), NULL, NULL,
                                   NULL, NULL, event->button, event->time);
 #endif                          /*GTK_CHECK_VERSION(3, 22, 0) */
+                }
                g_object_unref(attach_info);
            }
         }
@@ -2489,7 +2490,7 @@ attachment_popup_cb(GtkWidget *widget, gpointer user_data)
 
     gtk_tree_model_get(model, &iter, ATTACH_INFO_COLUMN, &attach_info, -1);
     if (attach_info) {
-       if (attach_info->popup_menu)
+       if (attach_info->popup_menu) {
 #if GTK_CHECK_VERSION(3, 22, 0)
             gtk_menu_popup_at_widget(GTK_MENU(attach_info->popup_menu),
                                      GTK_WIDGET(widget),
@@ -2499,6 +2500,7 @@ attachment_popup_cb(GtkWidget *widget, gpointer user_data)
        gtk_menu_popup(GTK_MENU(attach_info->popup_menu), NULL, NULL, NULL,
                       NULL, 0, gtk_get_current_event_time());
 #endif                          /*GTK_CHECK_VERSION(3, 22, 0) */
+        }
        g_object_unref(attach_info);
     }