[gnome-builder] build: fix more build warnings

[Garrett Regier <gregier src gnome org>]

commit 6f6af4c61e52732e1e6aa0af3422db8af1e9ddea
Author: Garrett Regier <garrettregier gmail com>
Date:   Tue Mar 24 02:13:01 2015 -0700

    build: fix more build warnings

 libide/ide-context.c               |    4 ++--
 libide/ide-ref-ptr.c               |    4 ++--
 libide/modelines/modeline-parser.c |    5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/libide/ide-context.c b/libide/ide-context.c
index 2709b6a..56e18a2 100644
--- a/libide/ide-context.c
+++ b/libide/ide-context.c
@@ -707,10 +707,10 @@ ide_context_class_init (IdeContextClass *klass)
 static void
 ide_context_init (IdeContext *self)
 {
-  IDE_ENTRY;
-
   g_autofree gchar *scriptsdir = NULL;
 
+  IDE_ENTRY;
+
   self->root_build_dir = g_build_filename (g_get_user_cache_dir (),
                                            ide_get_program_name (),
                                            "builds",
diff --git a/libide/ide-ref-ptr.c b/libide/ide-ref-ptr.c
index 8633060..099e7b2 100644
--- a/libide/ide-ref-ptr.c
+++ b/libide/ide-ref-ptr.c
@@ -55,8 +55,8 @@ ide_ref_ptr_ref (IdeRefPtr *self)
 void
 ide_ref_ptr_unref (IdeRefPtr *self)
 {
-  g_return_val_if_fail (self, NULL);
-  g_return_val_if_fail (self->ref_count > 0, NULL);
+  g_return_if_fail (self);
+  g_return_if_fail (self->ref_count > 0);
 
   if (g_atomic_int_dec_and_test (&self->ref_count))
     {
diff --git a/libide/modelines/modeline-parser.c b/libide/modelines/modeline-parser.c
index ef7f098..ab2ad92 100644
--- a/libide/modelines/modeline-parser.c
+++ b/libide/modelines/modeline-parser.c
@@ -676,6 +676,7 @@ modeline_parser_apply_modeline (GtkSourceView *view)
        GtkTextIter iter, liter;
        gint line_count;
        GSettings *settings;
+       ModelineOptions *previous;
 
        options.language_id = NULL;
        options.set = MODELINE_SET_NONE;
@@ -771,8 +772,8 @@ modeline_parser_apply_modeline (GtkSourceView *view)
                }
        }
 
-       ModelineOptions *previous = g_object_get_data (G_OBJECT (buffer),
-                                                      MODELINE_OPTIONS_DATA_KEY);
+       previous = g_object_get_data (G_OBJECT (buffer),
+                                     MODELINE_OPTIONS_DATA_KEY);
 
        settings = g_settings_new ("org.gnome.gedit.preferences.editor");