[gtk+/wip/dboles/combobox-cleanup: 33/37] combobox: some code cleanups

[Daniel Boles <dboles src gnome org>]

commit c7e4c82df45f2a8671c53c10c30b664ad655bd52
Author: Daniel Boles <dboles src gnome org>
Date:   Sat Jan 21 14:44:30 2017 +0000

    combobox: some code cleanups
    
     * Merge adjacent if statements with the same condition
     * Add a space between a function and its declaration

 gtk/gtkcombobox.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
---
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index f54a09f..471e419 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -1794,10 +1794,7 @@ gtk_combo_box_unset_model (GtkComboBox *combo_box)
                                    priv->reordered_id);
       g_signal_handler_disconnect (priv->model,
                                    priv->changed_id);
-    }
 
-  if (priv->model)
-    {
       g_object_unref (priv->model);
       priv->model = NULL;
     }
@@ -3143,7 +3140,7 @@ gtk_combo_box_constructed (GObject *object)
 
 
 static void
-gtk_combo_box_dispose(GObject* object)
+gtk_combo_box_dispose (GObject* object)
 {
   GtkComboBox *combo_box = GTK_COMBO_BOX (object);
   GtkComboBoxPrivate *priv = combo_box->priv;