[gnome-nibbles] Code cleanup as per gnome coding conventions

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 93b5cc8e52713514b6710064f7008ce04cd64f1c
Author: Sahil Sareen <sahil sareen hotmail com>
Date:   Tue Oct 21 17:44:55 2014 +0530

    Code cleanup as per gnome coding conventions
    
    Code convention fixes
    
    https://bugzilla.gnome.org/show_bug.cgi?id=738926

 src/board.c                |   16 ++++++------
 src/boni.c                 |    2 +-
 src/bonus.c                |    4 +-
 src/games-controls.c       |    6 ++--
 src/games-scores-backend.c |    2 +-
 src/games-scores-dialog.c  |    2 +-
 src/gnibbles.c             |    2 +-
 src/main.c                 |   18 +++++++-------
 src/preferences.c          |   10 ++++----
 src/warp.c                 |    4 +-
 src/worm.c                 |   54 ++++++++++++++++++++++----------------------
 11 files changed, 60 insertions(+), 60 deletions(-)
---
diff --git a/src/board.c b/src/board.c
index 6242f01..479f578 100644
--- a/src/board.c
+++ b/src/board.c
@@ -57,13 +57,13 @@ gnibbles_board_new (void)
 
   filename = g_build_filename (DATA_DIRECTORY, "pixmaps", "wall-small-empty.svg", NULL);
 
-  board->surface = gtk_clutter_texture_new();
+  board->surface = gtk_clutter_texture_new ();
   gtk_clutter_texture_set_from_pixbuf (GTK_CLUTTER_TEXTURE (board->surface),
   gdk_pixbuf_new_from_file (filename, NULL), NULL);
 
   clutter_actor_set_opacity (CLUTTER_ACTOR (board->surface), 100);
   g_value_init (&val, G_TYPE_BOOLEAN);
-  g_value_set_boolean ( &val, TRUE);
+  g_value_set_boolean (&val, TRUE);
 
   g_object_set_property (G_OBJECT (board->surface), "repeat-y", &val);
   g_object_set_property (G_OBJECT (board->surface), "repeat-x", &val);
@@ -167,7 +167,7 @@ gnibbles_board_load_level (GnibblesBoard *board)
       if (is_wall) {
         x_pos = j * properties->tilesize;
 
-        clutter_actor_set_size (CLUTTER_ACTOR(tmp),
+        clutter_actor_set_size (CLUTTER_ACTOR (tmp),
                                 properties->tilesize,
                                 properties->tilesize);
 
@@ -185,13 +185,13 @@ gnibbles_board_load_level (GnibblesBoard *board)
   clutter_actor_set_opacity (board->level, 0);
   clutter_actor_set_scale (CLUTTER_ACTOR (board->level), 0.2, 0.2);
  
-  clutter_actor_save_easing_state(board->level);
+  clutter_actor_save_easing_state (board->level);
   clutter_actor_set_easing_mode (board->level, CLUTTER_EASE_OUT_BOUNCE);
   clutter_actor_set_easing_duration (board->level, GAMEDELAY * GAMEDELAY);
   clutter_actor_set_scale (board->level, 1.0, 1.0);
   clutter_actor_set_pivot_point (board->level,.5,.5);
   clutter_actor_set_opacity (board->level, 0xff);
-  clutter_actor_restore_easing_state(board->level);
+  clutter_actor_restore_easing_state (board->level);
 
 }
 
@@ -239,7 +239,7 @@ gnibbles_board_level_new (GnibblesBoard *board, gint level)
 
   board->current_level = level;
 
-  tmp = g_strdup_printf("level%03d.gnl", level);
+  tmp = g_strdup_printf ("level%03d.gnl", level);
 
   filename = g_build_filename (DATA_DIRECTORY, "games", tmp, NULL);
 
@@ -284,7 +284,7 @@ gnibbles_board_level_new (GnibblesBoard *board, gint level)
         case 'n':
           board->walls[j][i] = EMPTYCHAR;
           if (count < properties->numworms)
-            gnibbles_worm_set_start(worms[count++], j, i, WORMLEFT);
+            gnibbles_worm_set_start (worms[count++], j, i, WORMLEFT);
           break;
         case 'o':
           board->walls[j][i] = EMPTYCHAR;
@@ -334,7 +334,7 @@ gnibbles_board_level_new (GnibblesBoard *board, gint level)
       for (j = 0; j < worms[i]->length; j++)
         gnibbles_worm_move_head_pointer (worms[i]);
       worms[i]->xtail++;
-    } else if ( worms[i]->direction == WORMLEFT) {
+    } else if (worms[i]->direction == WORMLEFT) {
       for (j = 0; j < worms[i]->length; j++)
         gnibbles_worm_move_head_pointer (worms[i]);
       worms[i]->xtail--;
diff --git a/src/boni.c b/src/boni.c
index 5f92cbe..5ebdf24 100644
--- a/src/boni.c
+++ b/src/boni.c
@@ -149,7 +149,7 @@ gnibbles_boni_rescale (GnibblesBoni *boni, gint tilesize)
     clutter_actor_set_position (boni->bonuses[i]->actor,
                                 (x_pos / properties->tilesize) * tilesize,
                                 (y_pos / properties->tilesize) * tilesize);
-    gtk_clutter_texture_set_from_pixbuf (GTK_CLUTTER_TEXTURE(boni->bonuses[i]->actor),
+    gtk_clutter_texture_set_from_pixbuf (GTK_CLUTTER_TEXTURE (boni->bonuses[i]->actor),
                                          boni_pixmaps[boni->bonuses[i]->type],
                                          &err);
     if (err)
diff --git a/src/bonus.c b/src/bonus.c
index fe52487..5694002 100644
--- a/src/bonus.c
+++ b/src/bonus.c
@@ -75,13 +75,13 @@ gnibbles_bonus_draw (GnibblesBonus *bonus)
   clutter_actor_set_opacity (bonus->actor, 0);
   clutter_actor_set_scale (bonus->actor, 3.0, 3.0);
 
-  clutter_actor_save_easing_state(bonus->actor);
+  clutter_actor_save_easing_state (bonus->actor);
   clutter_actor_set_easing_mode (bonus->actor, CLUTTER_EASE_OUT_BOUNCE);
   clutter_actor_set_easing_duration (bonus->actor, GAMEDELAY * 20);
   clutter_actor_set_scale (bonus->actor, 1.0, 1.0);
   clutter_actor_set_pivot_point (bonus->actor,.5,.5); 
   clutter_actor_set_opacity (bonus->actor, 0xff);
-  clutter_actor_restore_easing_state(bonus->actor);
+  clutter_actor_restore_easing_state (bonus->actor);
 
 }
 
diff --git a/src/games-controls.c b/src/games-controls.c
index 6d6209f..601a079 100644
--- a/src/games-controls.c
+++ b/src/games-controls.c
@@ -91,7 +91,7 @@ accel_edited_cb (GtkCellRendererAccel *cell,
   }
 
   /* Duplicate key check */
-  for (i = 0; i <  g_settings_get_int(settings, "players"); i++) {
+  for (i = 0; i <  g_settings_get_int (settings, "players"); i++) {
     if (g_settings_get_int (worm_settings[i], "key-up") == keyval ||
         g_settings_get_int (worm_settings[i], "key-down") == keyval ||
         g_settings_get_int (worm_settings[i], "key-left") == keyval ||
@@ -100,14 +100,14 @@ accel_edited_cb (GtkCellRendererAccel *cell,
 
       GtkWidget *dialog;
 
-      dialog = gtk_message_dialog_new_with_markup (GTK_WINDOW(window),
+      dialog = gtk_message_dialog_new_with_markup (GTK_WINDOW (window),
                                  GTK_DIALOG_DESTROY_WITH_PARENT,
                                  GTK_MESSAGE_WARNING,
                                  GTK_BUTTONS_OK,
                                  "<span weight=\"bold\" size=\"larger\">%s</span>",
                                  _("The shortcut you selected is already assigned."));
 
-      gtk_dialog_run (GTK_DIALOG(dialog));
+      gtk_dialog_run (GTK_DIALOG (dialog));
       gtk_widget_destroy (dialog);
       break;
     }
diff --git a/src/games-scores-backend.c b/src/games-scores-backend.c
index 5b22534..26e2f93 100644
--- a/src/games-scores-backend.c
+++ b/src/games-scores-backend.c
@@ -305,7 +305,7 @@ games_scores_backend_set_scores (GamesScoresBackend * self, GList * list)
       break;
     case GAMES_SCORES_STYLE_TIME_DESCENDING:
     case GAMES_SCORES_STYLE_TIME_ASCENDING:
-      rscore = games_score_get_value_as_time(d);
+      rscore = games_score_get_value_as_time (d);
       break;
     default:
       g_assert_not_reached ();
diff --git a/src/games-scores-dialog.c b/src/games-scores-dialog.c
index 1d6062a..456d946 100644
--- a/src/games-scores-dialog.c
+++ b/src/games-scores-dialog.c
@@ -306,7 +306,7 @@ void games_scores_dialog_set_category_description (GamesScoresDialog *self,
   lstr = g_strdup_printf ("<b>%s</b>", description);
   gtk_label_set_markup (GTK_LABEL (self->priv->label), lstr);
   gtk_label_set_use_underline (GTK_LABEL (self->priv->label), TRUE);
-  g_free(lstr);
+  g_free (lstr);
 }
 
 /**
diff --git a/src/gnibbles.c b/src/gnibbles.c
index d0283cd..20053d2 100644
--- a/src/gnibbles.c
+++ b/src/gnibbles.c
@@ -82,7 +82,7 @@ gnibbles_load_pixmap_file (const gchar * pixmap, gint xsize, gint ysize)
       g_strdup_printf (_("Nibbles couldn't find pixmap file:\n%s\n\n"
                        "Please check your Nibbles installation"), pixmap);
     gnibbles_error (message);
-    g_free(message);
+    g_free (message);
   }
 
   image = gdk_pixbuf_new_from_file_at_scale (filename, xsize, ysize, TRUE, NULL);
diff --git a/src/main.c b/src/main.c
index 9d39520..d03da98 100644
--- a/src/main.c
+++ b/src/main.c
@@ -274,7 +274,7 @@ configure_event_cb (GtkWidget *widget, GdkEventConfigure *event, gpointer data)
     ts_y--;
   tilesize = MIN (ts_x, ts_y);
 
-  if(tilesize != properties->tilesize)
+  if (tilesize != properties->tilesize)
   {    
     gnibbles_load_pixmap (tilesize);
 
@@ -439,15 +439,15 @@ animate_end_game (void)
 {
   int i;
   for (i = 0; i < properties->numworms; i++) {
-    clutter_actor_save_easing_state(worms[i]->actors);
+    clutter_actor_save_easing_state (worms[i]->actors);
     clutter_actor_set_easing_mode (worms[i]->actors, CLUTTER_EASE_IN_QUAD);
     clutter_actor_set_easing_duration (worms[i]->actors, GAMEDELAY * 15);
     clutter_actor_set_scale (worms[i]->actors, 0.4, 0.4);
     clutter_actor_set_opacity (worms[i]->actors, 0);
-    clutter_actor_restore_easing_state(worms[i]->actors);
+    clutter_actor_restore_easing_state (worms[i]->actors);
   }
 
-  for ( i = 0; i < boni->numbonuses; i++) {
+  for (i = 0; i < boni->numbonuses; i++) {
     clutter_actor_save_easing_state(boni->bonuses[i]->actor);
     clutter_actor_set_easing_mode (boni->bonuses[i]->actor, CLUTTER_EASE_IN_QUAD);
     clutter_actor_set_easing_duration (boni->bonuses[i]->actor, GAMEDELAY * 15);
@@ -457,23 +457,23 @@ animate_end_game (void)
     clutter_actor_restore_easing_state(boni->bonuses[i]->actor);
   }
 
-  for ( i = 0; i < warpmanager->numwarps; i++) {
-    clutter_actor_save_easing_state(warpmanager->warps[i]->actor);
+  for (i = 0; i < warpmanager->numwarps; i++) {
+    clutter_actor_save_easing_state (warpmanager->warps[i]->actor);
     clutter_actor_set_easing_mode (warpmanager->warps[i]->actor, CLUTTER_EASE_IN_QUAD);
     clutter_actor_set_easing_duration (warpmanager->warps[i]->actor, GAMEDELAY * 15);
     clutter_actor_set_scale (warpmanager->warps[i]->actor, 0.4, 0.4);
     clutter_actor_set_pivot_point (warpmanager->warps[i]->actor,.5,.5);
     clutter_actor_set_opacity (warpmanager->warps[i]->actor, 0);
-    clutter_actor_restore_easing_state(warpmanager->warps[i]->actor);
+    clutter_actor_restore_easing_state (warpmanager->warps[i]->actor);
   }
 
-  clutter_actor_save_easing_state(board->level);
+  clutter_actor_save_easing_state (board->level);
   clutter_actor_set_easing_mode (board->level, CLUTTER_EASE_IN_QUAD);
   clutter_actor_set_easing_duration (board->level, GAMEDELAY * 20);
   clutter_actor_set_scale (board->level, 0.4, 0.4);
   clutter_actor_set_pivot_point (board->level,.5,.5);
   clutter_actor_set_opacity (board->level, 0);
-  clutter_actor_restore_easing_state(board->level);
+  clutter_actor_restore_easing_state (board->level);
 }
 
 gboolean
diff --git a/src/preferences.c b/src/preferences.c
index f913d5a..7201120 100644
--- a/src/preferences.c
+++ b/src/preferences.c
@@ -238,7 +238,7 @@ gnibbles_preferences_cb (GtkWidget * widget, gpointer data)
 
   vbox_game = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
   gtk_container_set_border_width (GTK_CONTAINER (vbox_game), 12);
-  gtk_box_set_spacing (GTK_BOX(vbox_game), 18);
+  gtk_box_set_spacing (GTK_BOX (vbox_game), 18);
 
   gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox_game, label);
 
@@ -251,7 +251,7 @@ gnibbles_preferences_cb (GtkWidget * widget, gpointer data)
   /* Speed */
   label = gtk_label_new (_("Speed"));
   gtk_widget_set_halign (label, GTK_ALIGN_START);
-  set_label_bold (GTK_LABEL(label));
+  set_label_bold (GTK_LABEL (label));
   gtk_box_pack_start (GTK_BOX (vbox_speed), label, FALSE, FALSE, 0);
 
   button = gtk_radio_button_new_with_label (NULL, _("Nibbles newbie"));
@@ -300,7 +300,7 @@ gnibbles_preferences_cb (GtkWidget * widget, gpointer data)
 
   label = gtk_label_new (_("Options"));
   gtk_widget_set_halign (label, GTK_ALIGN_START);
-  set_label_bold (GTK_LABEL(label));
+  set_label_bold (GTK_LABEL (label));
   gtk_box_pack_start (GTK_BOX (vbox_options), label, FALSE, FALSE, 0);
 
 
@@ -408,7 +408,7 @@ gnibbles_preferences_cb (GtkWidget * widget, gpointer data)
 
     label2 = gtk_label_new (_("Keyboard Options"));
     gtk_widget_set_halign (label2, GTK_ALIGN_START);
-    set_label_bold (GTK_LABEL(label2));
+    set_label_bold (GTK_LABEL (label2));
     gtk_box_pack_start (GTK_BOX (vbox_wormx), label2, FALSE, FALSE, 0);
 
     controls = games_controls_list_new (worm_settings[i]);
@@ -423,7 +423,7 @@ gnibbles_preferences_cb (GtkWidget * widget, gpointer data)
 
     label2 = gtk_label_new (_("Options"));
     gtk_widget_set_halign (label2, GTK_ALIGN_START);
-    set_label_bold (GTK_LABEL(label2));
+    set_label_bold (GTK_LABEL (label2));
     gtk_box_pack_start (GTK_BOX (vbox_wormx), label2, FALSE, FALSE, 0);
 
     button = gtk_check_button_new_with_mnemonic (_("_Use relative movement"));
diff --git a/src/warp.c b/src/warp.c
index 9a10990..f84636c 100644
--- a/src/warp.c
+++ b/src/warp.c
@@ -70,11 +70,11 @@ gnibbles_warp_draw (GnibblesWarp *warp)
   clutter_actor_set_opacity (warp->actor, 0);
   clutter_actor_set_scale (warp->actor, 2.0, 2.0);
 
-  clutter_actor_save_easing_state(warp->actor);
+  clutter_actor_save_easing_state (warp->actor);
   clutter_actor_set_easing_mode (warp->actor, CLUTTER_EASE_OUT_CIRC);
   clutter_actor_set_easing_duration (warp->actor, GAMEDELAY * 15);
   clutter_actor_set_scale (warp->actor, 1.0, 1.0);
   clutter_actor_set_pivot_point (warp->actor,.5,.5); 
   clutter_actor_set_opacity (warp->actor, 0xff);
-  clutter_actor_restore_easing_state(warp->actor);
+  clutter_actor_restore_easing_state (warp->actor);
 }
diff --git a/src/worm.c b/src/worm.c
index 2ba210e..164c670 100644
--- a/src/worm.c
+++ b/src/worm.c
@@ -189,11 +189,11 @@ gnibbles_worm_handle_keypress (GnibblesWorm * worm, guint keyval)
     return FALSE;
 
   props = properties->wormprops[worm->number];
-  propsUp = toupper(props->up);
-  propsLeft = toupper(props->left);
-  propsDown = toupper(props->down);
-  propsRight = toupper(props->right);
-  keyvalUpper = toupper(keyval);
+  propsUp = toupper (props->up);
+  propsLeft = toupper (props->left);
+  propsDown = toupper (props->down);
+  propsRight = toupper (props->right);
+  keyvalUpper = toupper (keyval);
 
   if (properties->wormprops[worm->number]->relmove) {
     if (keyvalUpper == propsLeft) {
@@ -342,12 +342,12 @@ gnibbles_worm_handle_bonus (GnibblesWorm *worm)
     (board->walls[worm->xhead][worm->yhead] != WARPLETTER)) {
     actor = gnibbles_worm_get_head_actor (worm);
 
-    clutter_actor_save_easing_state(actor);
+    clutter_actor_save_easing_state (actor);
     clutter_actor_set_easing_mode (actor, CLUTTER_EASE_OUT_QUINT);
     clutter_actor_set_easing_duration (actor, GAMEDELAY * 15);
     clutter_actor_set_scale (actor, 1.45, 1.45);
     clutter_actor_set_pivot_point (actor,.5,.5);
-    clutter_actor_restore_easing_state(actor);
+    clutter_actor_restore_easing_state (actor);
 
     gnibbles_worm_grok_bonus (worm);
 
@@ -481,13 +481,13 @@ gnibbles_worm_animate_death (GnibblesWorm *worm)
 
   clutter_actor_add_child (stage, group);
 
-  clutter_actor_save_easing_state(group);
+  clutter_actor_save_easing_state (group);
   clutter_actor_set_easing_mode (group, CLUTTER_EASE_OUT_QUAD);
   clutter_actor_set_easing_duration (group, GAMEDELAY * 9);
   clutter_actor_set_scale (group, 2.0, 2.0);
   clutter_actor_set_pivot_point (group,.5,.5); 
   clutter_actor_set_opacity (group, 0);
-  clutter_actor_restore_easing_state(group);
+  clutter_actor_restore_easing_state (group);
 
 }
 
@@ -541,13 +541,13 @@ gnibbles_worm_show (GnibblesWorm *worm)
   clutter_actor_set_opacity (worm->actors, 0);
   clutter_actor_set_scale (worm->actors, 3.0, 3.0);
 
-  clutter_actor_save_easing_state(worm->actors);
+  clutter_actor_save_easing_state (worm->actors);
   clutter_actor_set_easing_mode (worm->actors, CLUTTER_EASE_OUT_CIRC);
   clutter_actor_set_easing_duration (worm->actors, GAMEDELAY * 26);
   clutter_actor_set_scale (worm->actors, 1.0, 1.0);
   clutter_actor_set_pivot_point (worm->actors,.5,.5);
   clutter_actor_set_opacity (worm->actors, 0xff);
-  clutter_actor_restore_easing_state(worm->actors);
+  clutter_actor_restore_easing_state (worm->actors);
 
   worm->stop = FALSE;
 }
@@ -702,11 +702,11 @@ gnibbles_worm_reduce_tail (GnibblesWorm *worm, gint erasesize)
     worm->length -= erasesize;
     clutter_actor_add_child (stage, group);
 
-    clutter_actor_save_easing_state(group);
+    clutter_actor_save_easing_state (group);
     clutter_actor_set_easing_mode (group, CLUTTER_EASE_OUT_EXPO);
     clutter_actor_set_easing_duration (group, GAMEDELAY * 25);
     clutter_actor_set_opacity (group, 0);
-    clutter_actor_restore_easing_state(group);
+    clutter_actor_restore_easing_state (group);
   }
 }
 
@@ -767,7 +767,7 @@ gnibbles_worm_test_move_head (GnibblesWorm * worm)
 {
   int x, y;
 
-  gnibbles_worm_position_move_head(worm, &x, &y);
+  gnibbles_worm_position_move_head (worm, &x, &y);
 
   if (board->walls[x][y] > EMPTYCHAR
       && board->walls[x][y] < 'z' + properties->numworms)
@@ -781,7 +781,7 @@ gnibbles_worm_is_move_safe (GnibblesWorm * worm)
 {
   int x, y, i;
 
-  gnibbles_worm_position_move_head(worm, &x, &y);
+  gnibbles_worm_position_move_head (worm, &x, &y);
 
   for (i = 0; i < properties->numworms; i++) {
     if (i != worm->number) {
@@ -858,7 +858,7 @@ gnibbles_worm_ai_deadend (gint x, gint y, gint lengthleft)
         && deadendboard[cx][cy] != deadend_runnumber) {
 
       deadendboard[cx][cy] = deadend_runnumber;
-      lengthleft = gnibbles_worm_ai_deadend(cx, cy, lengthleft - 1);
+      lengthleft = gnibbles_worm_ai_deadend (cx, cy, lengthleft - 1);
       if (!lengthleft)
         return 0;
     }
@@ -891,17 +891,17 @@ gnibbles_worm_ai_deadend_after (gint x, gint y, gint dir, gint length)
     dir = 4;
 
   i = properties->numworms;
-  while(i--) {
+  while (i--) {
     cx = worms[i]->xhead;
     cy = worms[i]->yhead;
-    if(cx != x || cy != y) {
-      if(cx > 0)
+    if (cx != x || cy != y) {
+      if (cx > 0)
         deadendboard[cx-1][cy] = deadend_runnumber;
-      if(cy > 0)
+      if (cy > 0)
         deadendboard[cx][cy-1] = deadend_runnumber;
-      if(cx < BOARDWIDTH-1)
+      if (cx < BOARDWIDTH-1)
         deadendboard[cx+1][cy] = deadend_runnumber;
-      if(cy < BOARDHEIGHT-1)
+      if (cy < BOARDHEIGHT-1)
         deadendboard[cx][cy+1] = deadend_runnumber;
     }
   }
@@ -1065,7 +1065,7 @@ gnibbles_worm_ai_move (GnibblesWorm * worm)
     } else {
       // Else move in random direction at random time intervals
       if (rand () % 30 == 1) {
-        dir = worm->direction + (rand() % 2 ? 1 : -1);
+        dir = worm->direction + (rand () % 2 ? 1 : -1);
         if (dir != opposite) {
           if (dir > 4)
             dir = 1;
@@ -1099,13 +1099,13 @@ gnibbles_worm_ai_move (GnibblesWorm * worm)
       continue;
     thislen = 0;
 
-    if(!gnibbles_worm_test_move_head (worm))
+    if (!gnibbles_worm_test_move_head (worm))
       thislen += CAPACITY;
 
-    if(gnibbles_worm_ai_tooclose (worm))
+    if (gnibbles_worm_ai_tooclose (worm))
       thislen += 4;
 
-    if(!gnibbles_worm_is_move_safe (worm))
+    if (!gnibbles_worm_is_move_safe (worm))
       thislen += 4;
 
     thislen += gnibbles_worm_ai_deadend_after (worm->xhead, worm->yhead, dir,
@@ -1118,7 +1118,7 @@ gnibbles_worm_ai_move (GnibblesWorm * worm)
        particular, to stop the worms bunching in the bottom-
        right corner of the board. */
     if (thislen <= 0)
-      thislen -= random() % 100;
+      thislen -= random () % 100;
     if (thislen < bestyet) {
       bestyet = thislen;
       bestdir = dir;