[epiphany] Miscellaneous code style adjustments

[Michael Catanzaro <mcatanzaro src gnome org>]

commit f30bf73bf4e4c93591f971279952bea2c24eebe0
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Fri Feb 24 16:34:06 2017 -0600

    Miscellaneous code style adjustments
    
    https://bugzilla.gnome.org/show_bug.cgi?id=776738

 lib/ephy-search-engine-manager.c |   15 +++++++--------
 src/ephy-location-controller.c   |   12 ++++++------
 src/ephy-search-engine-dialog.c  |   19 ++++++++-----------
 3 files changed, 21 insertions(+), 25 deletions(-)
---
diff --git a/lib/ephy-search-engine-manager.c b/lib/ephy-search-engine-manager.c
index 3357f83..5bddaf8 100644
--- a/lib/ephy-search-engine-manager.c
+++ b/lib/ephy-search-engine-manager.c
@@ -72,7 +72,6 @@ search_engines_changed_cb (GSettings *settings,
                            char      *key,
                            gpointer   user_data)
 {
-
   g_signal_emit (EPHY_SEARCH_ENGINE_MANAGER (user_data),
                  signals[SEARCH_ENGINES_CHANGED], 0);
 }
@@ -141,7 +140,7 @@ ephy_search_engine_manager_get_address (EphySearchEngineManager *manager,
 {
   EphySearchEngineInfo *info;
 
-  info = (EphySearchEngineInfo *) g_hash_table_lookup (manager->search_engines, name);
+  info = (EphySearchEngineInfo *)g_hash_table_lookup (manager->search_engines, name);
 
   if (info)
     return info->address;
@@ -155,7 +154,7 @@ ephy_search_engine_manager_get_bang (EphySearchEngineManager *manager,
 {
   EphySearchEngineInfo *info;
 
-  info = (EphySearchEngineInfo *) g_hash_table_lookup (manager->search_engines, name);
+  info = (EphySearchEngineInfo *)g_hash_table_lookup (manager->search_engines, name);
 
   if (info)
     return info->bang;
@@ -194,7 +193,7 @@ ephy_search_engine_manager_get_names (EphySearchEngineManager *manager)
   g_hash_table_iter_init (&iter, manager->search_engines);
 
   while (g_hash_table_iter_next (&iter, &key, NULL))
-    search_engine_names[i++] = g_strdup((char *) key);
+    search_engine_names[i++] = g_strdup ((char *) key);
 
   return search_engine_names;
 }
@@ -233,7 +232,7 @@ ephy_search_engine_manager_apply_settings (EphySearchEngineManager *manager)
   g_hash_table_iter_init (&iter, manager->search_engines);
 
   while (g_hash_table_iter_next (&iter, &key, &value)) {
-    info = (EphySearchEngineInfo *) value;
+    info = (EphySearchEngineInfo *)value;
     g_variant_builder_add (&builder, "(sss)", key, info->address, info->bang);
   }
   variant = g_variant_builder_end (&builder);
@@ -288,7 +287,7 @@ ephy_search_engine_manager_engine_from_bang (EphySearchEngineManager *manager,
   g_hash_table_iter_init (&iter, manager->search_engines);
 
   while (g_hash_table_iter_next (&iter, &key, &value)) {
-    info = (EphySearchEngineInfo *) value;
+    info = (EphySearchEngineInfo *)value;
     if (g_strcmp0(bang, info->bang) == 0)
       return (const char *)key;
   }
@@ -327,7 +326,7 @@ ephy_search_engine_manager_build_search_address (EphySearchEngineManager *manage
 {
   EphySearchEngineInfo *info;
 
-  info = (EphySearchEngineInfo *) g_hash_table_lookup (manager->search_engines, name);
+  info = (EphySearchEngineInfo *)g_hash_table_lookup (manager->search_engines, name);
 
   if (info == NULL)
     return NULL;
@@ -348,7 +347,7 @@ ephy_search_engine_manager_parse_bang_search (EphySearchEngineManager *manager,
   g_hash_table_iter_init (&iter, manager->search_engines);
 
   while (g_hash_table_iter_next (&iter, NULL, &value)) {
-    info = (EphySearchEngineInfo *) value;
+    info = (EphySearchEngineInfo *)value;
     buffer = g_string_new (info->bang);
     g_string_append (buffer, " ");
     if (strstr (search, buffer->str) == search) {
diff --git a/src/ephy-location-controller.c b/src/ephy-location-controller.c
index 7dd274e..37fd6e7 100644
--- a/src/ephy-location-controller.c
+++ b/src/ephy-location-controller.c
@@ -22,16 +22,17 @@
 #include "config.h"
 #include "ephy-location-controller.h"
 
-#include "ephy-widgets-type-builtins.h"
+
 #include "ephy-completion-model.h"
 #include "ephy-debug.h"
+#include "ephy-dnd.h"
 #include "ephy-embed-container.h"
 #include "ephy-embed-utils.h"
 #include "ephy-link.h"
 #include "ephy-location-entry.h"
-#include "ephy-dnd.h"
 #include "ephy-shell.h"
 #include "ephy-title-widget.h"
+#include "ephy-widgets-type-builtins.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
@@ -150,7 +151,8 @@ entry_activate_cb (GtkEntry               *entry,
   }
 
   content = gtk_entry_get_text (entry);
-  if (content == NULL || content[0] == '\0') return;
+  if (content == NULL || content[0] == '\0')
+    return;
 
   address = g_strdup (content);
   effective_address = ephy_embed_utils_normalize_or_autosearch_address (g_strstrip (address));
@@ -306,7 +308,6 @@ action_activated_cb (GtkEntryCompletion     *completion,
   url = ephy_search_engine_manager_build_search_address (controller->search_engine_manager,
                                                          engine_names[index],
                                                          content);
-
   g_strfreev (engine_names);
 
   ephy_link_open (EPHY_LINK (controller), url, NULL,
@@ -354,9 +355,8 @@ search_engines_changed_cb (EphySearchEngineManager *manager,
   controller = EPHY_LOCATION_CONTROLLER (data);
   completion = gtk_entry_get_completion (GTK_ENTRY (controller->title_widget));
 
-  for (guint i = 0; i < controller->num_search_engines_actions; i++) {
+  for (guint i = 0; i < controller->num_search_engines_actions; i++)
     gtk_entry_completion_delete_action (completion, 0);
-  }
 
   fill_entry_completion_with_actions (completion, controller);
 }
diff --git a/src/ephy-search-engine-dialog.c b/src/ephy-search-engine-dialog.c
index 8381c48..c8f5a97 100644
--- a/src/ephy-search-engine-dialog.c
+++ b/src/ephy-search-engine-dialog.c
@@ -198,12 +198,13 @@ dialog_check_bang_entry (const char             *bang,
     dialog_set_entry_error_state (dialog->search_engine_bang_entry);
     return FALSE;
   }
-  else if (g_strcmp0 (bang, NEW_SEARCH_ENGINE_BANG) == 0) {
+
+  if (g_strcmp0 (bang, NEW_SEARCH_ENGINE_BANG) == 0) {
     dialog_set_entry_error_state (dialog->search_engine_bang_entry);
     return FALSE;
   }
-  else
-    dialog_set_entry_normal_state (dialog->search_engine_bang_entry);
+
+  dialog_set_entry_normal_state (dialog->search_engine_bang_entry);
 
   return TRUE;
 }
@@ -244,14 +245,13 @@ list_box_row_selected_cb (GtkListBox    *list_box,
     gtk_entry_set_placeholder_text (GTK_ENTRY (dialog->search_engine_name_entry),
                                     search_engine_name);
     search_engine_name = "";
-  }
-  else
-  {
+  } else {
     gtk_entry_set_text (GTK_ENTRY (dialog->search_engine_name_entry), search_engine_name);
     gtk_entry_set_text (GTK_ENTRY (dialog->search_engine_address_entry), search_engine_address);
     gtk_entry_set_text (GTK_ENTRY (dialog->search_engine_bang_entry), search_engine_bang);
 
     search_engine_default = ephy_search_engine_manager_get_default_engine (manager);
+
     if (g_strcmp0 (search_engine_name, search_engine_default) == 0)
       is_default = TRUE;
   }
@@ -271,7 +271,6 @@ list_box_row_selected_cb (GtkListBox    *list_box,
 static void
 ephy_search_engine_dialog_fill_list_box (EphySearchEngineDialog *dialog)
 {
-
   GtkListBox *listbox;
   GtkWidget *list_box_row;
   EphySearchEngineManager *manager;
@@ -302,8 +301,7 @@ generate_new_unique_default_engine_name (EphySearchEngineDialog *dialog)
   guint i = 1;
   char *default_name = g_strdup_printf ("%s %d", NEW_SEARCH_ENGINE_NAME, i);
 
-  while (dialog_list_box_child_n_occurence (default_name, dialog) != 0)
-  {
+  while (dialog_list_box_child_n_occurence (default_name, dialog) != 0) {
     if (i == UINT_MAX)
       break;
 
@@ -518,8 +516,7 @@ dialog_entry_change_on_event (GtkWidget *entry,
                                            search_engine_name,
                                            search_engine_address,
                                            search_engine_bang);
-  }
-  else {
+  } else {
     ephy_search_engine_manager_modify_engine (manager,
                                               search_engine_name,
                                               search_engine_address,