[gnome-builder] build: fix various compiler warnings.

[Christian Hergert <chergert src gnome org>]

commit b8ab47ea323fc672b5a8fc11ce922fb024efc8a0
Author: Christian Hergert <christian hergert me>
Date:   Mon Sep 15 16:15:28 2014 -0700

    build: fix various compiler warnings.

 src/app/gb-application.c          |    2 +-
 src/editor/gb-editor-tab.c        |    2 +-
 src/editor/gb-source-view.c       |    2 +-
 src/snippets/gb-source-snippets.c |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/app/gb-application.c b/src/app/gb-application.c
index 13727ae..021bd0d 100644
--- a/src/app/gb-application.c
+++ b/src/app/gb-application.c
@@ -118,7 +118,7 @@ setup_keybindings (GbApplication *application)
    * Load bundled keybindings.
    */
   bytes = g_resources_lookup_data ("/org/gnome/builder/keybindings/default.ini",
-                                   G_RESOURCE_FLAGS_NONE, NULL);
+                                   G_RESOURCE_LOOKUP_FLAGS_NONE, NULL);
   if (!gb_keybindings_load_bytes (keybindings, bytes, &error))
     {
       g_warning ("Failed to load default keybindings: %s", error->message);
diff --git a/src/editor/gb-editor-tab.c b/src/editor/gb-editor-tab.c
index 4bd36d0..1c3dedc 100644
--- a/src/editor/gb-editor-tab.c
+++ b/src/editor/gb-editor-tab.c
@@ -512,7 +512,7 @@ on_search_entry_key_press_event (GdTaggedEntry *entry,
   g_assert (GD_IS_TAGGED_ENTRY (entry));
   g_assert (GB_IS_EDITOR_TAB (tab));
 
-  if ((event->keyval == GDK_KEY_Escape))
+  if (event->keyval == GDK_KEY_Escape)
     {
       gtk_revealer_set_reveal_child (tab->priv->revealer, FALSE);
       gb_source_view_set_show_shadow (tab->priv->source_view, FALSE);
diff --git a/src/editor/gb-source-view.c b/src/editor/gb-source-view.c
index 8e56b00..76956ce 100644
--- a/src/editor/gb-source-view.c
+++ b/src/editor/gb-source-view.c
@@ -567,7 +567,7 @@ on_mark_set (GtkTextBuffer *buffer,
 
   gb_source_view_block_handlers (view);
 
-  if ((mark == gtk_text_buffer_get_insert (buffer)))
+  if (mark == gtk_text_buffer_get_insert (buffer))
     {
 again:
       if ((snippet = g_queue_peek_head (priv->snippets)))
diff --git a/src/snippets/gb-source-snippets.c b/src/snippets/gb-source-snippets.c
index 216e2fb..2c413ea 100644
--- a/src/snippets/gb-source-snippets.c
+++ b/src/snippets/gb-source-snippets.c
@@ -79,8 +79,8 @@ gb_source_snippets_merge (GbSourceSnippets *snippets,
 
   trie_traverse (other->priv->snippets,
                  "",
-                 G_TRAVERSE_LEAVES,
                  G_PRE_ORDER,
+                 G_TRAVERSE_LEAVES,
                  -1,
                  copy_into,
                  snippets->priv->snippets);