Sun May 28 21:25:20 CEST 2017

This is an automated email from the git hooks/post-receive script.

bluesabre pushed a commit to branch master
in repository apps/parole.

commit 4becf63a73f3fc144a2e43a86cc79d0ea585fd42
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Sun May 28 15:24:55 2017 -0400

    cpplint: Even more whitespace fixes
    Closing ) should be moved to the previous line  [whitespace/parens] [2]
    At least two spaces is best between code and comments  [whitespace/comments] [2]
    Complex multi-line /*...*/-style comment found. Lint may give bogus warnings.  Consider replacing these with //-style comments, with #if 0...#endif, or with more clearly structured multi-line comments.  [readability/multiline_comment] [5]
    Extra space after (  [whitespace/parens] [2]
    Extra space after ( in function call  [whitespace/parens] [4]
    Extra space before )  [whitespace/parens] [2]
    Extra space before [  [whitespace/braces] [5]
    Extra space before last semicolon. If this should be an empty statement, use {} instead.  [whitespace/semicolon] [5]
    Extra space for operator !   [whitespace/operators] [4]
---
 src/gst/parole-gst.c                 |  75 ++++++++++++------------
 src/misc/parole-file.c               |   8 +--
 src/misc/parole-pl-parser.c          |   4 +-
 src/parole-button.c                  |  12 ++--
 src/parole-clutter.c                 |   2 +-
 src/parole-conf-dialog.c             |  10 ++--
 src/parole-disc.c                    |  14 ++---
 src/parole-mediachooser.c            |  24 ++++----
 src/parole-medialist.c               |  28 ++++-----
 src/parole-module.h                  |   2 +-
 src/parole-open-location.c           |   6 +-
 src/parole-player.c                  | 108 +++++++++++++++++------------------
 src/parole-plugin-player.c           |   8 +--
 src/parole-utils.c                   |   2 +-
 src/plugins/mpris2/mpris2-provider.c |   8 +--
 src/plugins/notify/notify-provider.c |   4 +-
 src/plugins/tray/tray-provider.c     |  22 +++----
 17 files changed, 168 insertions(+), 169 deletions(-)

diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
index 18d0bdd..b37cee8 100644
--- a/src/gst/parole-gst.c
+++ b/src/gst/parole-gst.c
@@ -171,7 +171,7 @@ enum
 
 static gpointer parole_gst_object = NULL;
 
-static guint signals [LAST_SIGNAL] = { 0 };
+static guint signals[LAST_SIGNAL] = { 0 };
 
 G_DEFINE_TYPE (ParoleGst, parole_gst, GTK_TYPE_WIDGET)
 
@@ -464,13 +464,13 @@ parole_gst_set_video_overlay (ParoleGst *gst)
 
     g_assert (video_sink != NULL);
 
-    if ( GDK_IS_WINDOW (gtk_widget_get_window(GTK_WIDGET (gst))) )
+    if (GDK_IS_WINDOW (gtk_widget_get_window(GTK_WIDGET (gst))))
 #if GST_CHECK_VERSION(1, 0, 0)
         gst_video_overlay_set_window_handle (GST_VIDEO_OVERLAY (video_sink),
-                          GDK_WINDOW_XID ( gtk_widget_get_window(GTK_WIDGET (gst)) ));
+                          GDK_WINDOW_XID (gtk_widget_get_window(GTK_WIDGET (gst))));
 #else
         gst_x_overlay_set_xwindow_id (GST_X_OVERLAY (video_sink),
-                          GDK_WINDOW_XID ( gtk_widget_get_window(GTK_WIDGET (gst)) ));
+                          GDK_WINDOW_XID (gtk_widget_get_window(GTK_WIDGET (gst))));
 #endif
 
     gst_object_unref (video_sink);
@@ -538,7 +538,7 @@ parole_gst_tick_timeout (gpointer data)
 
         if ( G_LIKELY (value > 0) )
         {
-            g_signal_emit (G_OBJECT (gst), signals [MEDIA_PROGRESSED], 0, gst->priv->stream, value);
+            g_signal_emit (G_OBJECT (gst), signals[MEDIA_PROGRESSED], 0, gst->priv->stream, value);
         }
     }
 
@@ -589,7 +589,7 @@ parole_gst_query_duration (ParoleGst *gst)
     if (gst_time == GST_FORMAT_TIME)
     {
         duration =  absolute_duration / GST_SECOND;
-        live = ( absolute_duration == 0 );
+        live = (absolute_duration == 0);
 
         TRACE ("Duration %" G_GINT64_FORMAT ", is_live=%d", duration, live);
 
@@ -728,7 +728,7 @@ parole_gst_get_pad_capabilities (GObject *object, GParamSpec *pspec, ParoleGst *
                           NULL);
         }
 
-        gtk_widget_get_allocation( GTK_WIDGET (gst), allocation );
+        gtk_widget_get_allocation(GTK_WIDGET (gst), allocation);
         parole_gst_size_allocate (GTK_WIDGET (gst), allocation);
         g_free(allocation);
     }
@@ -872,7 +872,7 @@ parole_gst_evaluate_state (ParoleGst *gst, GstState old, GstState new, GstState
             parole_gst_query_capabilities (gst);
             parole_gst_query_info (gst);
             parole_gst_query_duration (gst);
-            g_signal_emit  (G_OBJECT (gst), signals [MEDIA_STATE], 0,
+            g_signal_emit  (G_OBJECT (gst), signals[MEDIA_STATE], 0,
                             gst->priv->stream, PAROLE_STATE_PLAYING);
             break;
         }
@@ -887,7 +887,7 @@ parole_gst_evaluate_state (ParoleGst *gst, GstState old, GstState new, GstState
             }
 
             gst->priv->media_state = PAROLE_STATE_PAUSED;
-            g_signal_emit  (G_OBJECT (gst), signals [MEDIA_STATE], 0,
+            g_signal_emit  (G_OBJECT (gst), signals[MEDIA_STATE], 0,
                             gst->priv->stream, PAROLE_STATE_PAUSED);
             break;
         }
@@ -896,7 +896,7 @@ parole_gst_evaluate_state (ParoleGst *gst, GstState old, GstState new, GstState
             gst->priv->buffering = FALSE;
             gst->priv->seeking = FALSE;
             gst->priv->media_state = PAROLE_STATE_STOPPED;
-            g_signal_emit  (G_OBJECT (gst), signals [MEDIA_STATE], 0,
+            g_signal_emit  (G_OBJECT (gst), signals[MEDIA_STATE], 0,
                             gst->priv->stream, PAROLE_STATE_STOPPED);
 
             if (gst->priv->target == GST_STATE_PLAYING && pending < GST_STATE_PAUSED) {
@@ -904,7 +904,7 @@ parole_gst_evaluate_state (ParoleGst *gst, GstState old, GstState new, GstState
             } else if (gst->priv->target == GST_STATE_PAUSED) {
                 parole_gst_change_state (gst, GST_STATE_PAUSED);
             } else if (gst->priv->target == GST_STATE_READY) {
-                gtk_widget_get_allocation( GTK_WIDGET (gst), allocation );
+                gtk_widget_get_allocation(GTK_WIDGET (gst), allocation);
                 parole_gst_size_allocate (GTK_WIDGET (gst), allocation);
                 g_free(allocation);
             }
@@ -915,7 +915,7 @@ parole_gst_evaluate_state (ParoleGst *gst, GstState old, GstState new, GstState
             gst->priv->buffering = FALSE;
             gst->priv->seeking = FALSE;
             gst->priv->media_state = PAROLE_STATE_STOPPED;
-            g_signal_emit  (G_OBJECT (gst), signals [MEDIA_STATE], 0,
+            g_signal_emit  (G_OBJECT (gst), signals[MEDIA_STATE], 0,
                             gst->priv->stream, PAROLE_STATE_STOPPED);
             break;
         }
@@ -1175,10 +1175,10 @@ parole_gst_get_meta_data_dvd (ParoleGst *gst)
 
     TRACE("START");
 
-    g_object_get (  G_OBJECT (gst->priv->stream),
-                    "num-tracks", &current_num_chapters,
-                    "track", &current_chapter,
-                    NULL);
+    g_object_get (G_OBJECT (gst->priv->stream),
+                  "num-tracks", &current_num_chapters,
+                  "track", &current_chapter,
+                  NULL);
 
     /* Get the number of chapters for the current title. */
 #if GST_CHECK_VERSION(1, 0, 0)
@@ -1197,7 +1197,7 @@ parole_gst_get_meta_data_dvd (ParoleGst *gst)
                           NULL);
             TRACE("Updated DVD chapter count: %i", n_chapters);
 
-            g_signal_emit  (G_OBJECT (gst), signals [DVD_CHAPTER_COUNT_CHANGE], 0,
+            g_signal_emit  (G_OBJECT (gst), signals[DVD_CHAPTER_COUNT_CHANGE], 0,
                             n_chapters);
         }
     }
@@ -1220,7 +1220,7 @@ parole_gst_get_meta_data_dvd (ParoleGst *gst)
             TRACE("Updated current DVD chapter: %i", chapter);
 
             if (current_chapter != 1)
-                g_signal_emit  (G_OBJECT (gst), signals [DVD_CHAPTER_CHANGE], 0,
+                g_signal_emit  (G_OBJECT (gst), signals[DVD_CHAPTER_CHANGE], 0,
                                 chapter);
         }
     }
@@ -1253,7 +1253,7 @@ parole_gst_get_meta_data_cdda (ParoleGst *gst, GstTagList *tag)
                       NULL);
 
         TRACE ("num_tracks=%i track=%i", num_tracks, track);
-        g_signal_emit (G_OBJECT (gst), signals [MEDIA_TAG], 0, gst->priv->stream);
+        g_signal_emit (G_OBJECT (gst), signals[MEDIA_TAG], 0, gst->priv->stream);
     }
 }
 
@@ -1353,7 +1353,7 @@ parole_gst_get_meta_data_file (ParoleGst *gst, GstTagList *tag)
                   "tag-available", TRUE,
                   NULL);
 
-    g_signal_emit (G_OBJECT (gst), signals [MEDIA_TAG], 0, gst->priv->stream);
+    g_signal_emit (G_OBJECT (gst), signals[MEDIA_TAG], 0, gst->priv->stream);
 }
 
 static void
@@ -1374,7 +1374,7 @@ parole_gst_get_meta_data_unknown (ParoleGst *gst)
                   "tag-available", FALSE,
                   NULL);
 
-    g_signal_emit (G_OBJECT (gst), signals [MEDIA_TAG], 0, gst->priv->stream);
+    g_signal_emit (G_OBJECT (gst), signals[MEDIA_TAG], 0, gst->priv->stream);
 }
 
 static void
@@ -1485,10 +1485,9 @@ parole_gst_missing_codec_dialog(ParoleGst *gst, GstMessage *msg)
 #endif
                             GTK_BUTTONS_NONE,
                             "<b><big>%s</big></b>",
-                            _("Additional software is required.")
-                            ));
+                            _("Additional software is required.")));
 
-    gtk_dialog_add_buttons( GTK_DIALOG(dialog),
+    gtk_dialog_add_buttons(GTK_DIALOG(dialog),
 #if defined(__linux__)
                             _("Don't Install"),
                             GTK_RESPONSE_REJECT,
@@ -1498,7 +1497,7 @@ parole_gst_missing_codec_dialog(ParoleGst *gst, GstMessage *msg)
                             _("OK"),
                             GTK_RESPONSE_ACCEPT,
 #endif
-                            NULL );
+                            NULL);
 
     gtk_message_dialog_format_secondary_markup(dialog,
 #if defined(__linux__)
@@ -1536,7 +1535,7 @@ parole_gst_bus_event (GstBus *bus, GstMessage *msg, gpointer data)
                           NULL);
 
             gst->priv->media_state = PAROLE_STATE_PLAYBACK_FINISHED;
-            g_signal_emit  (G_OBJECT (gst), signals [MEDIA_STATE], 0,
+            g_signal_emit  (G_OBJECT (gst), signals[MEDIA_STATE], 0,
                             gst->priv->stream, PAROLE_STATE_PLAYBACK_FINISHED);
             break;
         }
@@ -1550,7 +1549,7 @@ parole_gst_bus_event (GstBus *bus, GstMessage *msg, gpointer data)
         parole_gst_change_state (gst, GST_STATE_NULL);
         gst_message_parse_error (msg, &error, &debug);
         TRACE ("*** ERROR %s : %s ***", error->message, debug);
-        g_signal_emit (G_OBJECT (gst), signals [ERROR], 0, error->message);
+        g_signal_emit (G_OBJECT (gst), signals[ERROR], 0, error->message);
         g_error_free (error);
         g_free (debug);
         gtk_widget_queue_draw (GTK_WIDGET (gst));
@@ -1561,7 +1560,7 @@ parole_gst_bus_event (GstBus *bus, GstMessage *msg, gpointer data)
         gint per = 0;
         gst_message_parse_buffering (msg, &per);
         TRACE ("Buffering %d %%", per);
-        g_signal_emit  (G_OBJECT (gst), signals [BUFFERING], 0,
+        g_signal_emit  (G_OBJECT (gst), signals[BUFFERING], 0,
                         gst->priv->stream, per);
 
         gst->priv->buffering = per != 100;
@@ -1647,7 +1646,7 @@ parole_gst_bus_event (GstBus *bus, GstMessage *msg, gpointer data)
         if (gst->priv->seeking)
         {
             gst->priv->seeking = FALSE;
-            g_signal_emit (G_OBJECT (gst), signals [MEDIA_SEEKED], 0);
+            g_signal_emit (G_OBJECT (gst), signals[MEDIA_SEEKED], 0);
         }
         break;
     case GST_MESSAGE_WARNING:
@@ -1952,7 +1951,7 @@ parole_gst_about_to_finish_cb (GstElement *elm, gpointer data)
 
     gst = PAROLE_GST (data);
 
-    g_signal_emit  (G_OBJECT (gst), signals [MEDIA_STATE], 0,
+    g_signal_emit  (G_OBJECT (gst), signals[MEDIA_STATE], 0,
                     gst->priv->stream, PAROLE_STATE_ABOUT_TO_FINISH);
 }
 
@@ -1978,7 +1977,7 @@ parole_gst_conf_notify_cb (GObject *object, GParamSpec *spec, ParoleGst *gst)
                       "aspect-ratio", &gst->priv->aspect_ratio,
                       NULL);
 
-        gtk_widget_get_allocation( GTK_WIDGET (gst), allocation );
+        gtk_widget_get_allocation(GTK_WIDGET (gst), allocation);
         parole_gst_size_allocate (GTK_WIDGET (gst), allocation);
         g_free(allocation);
     }
@@ -2274,7 +2273,7 @@ parole_gst_class_init (ParoleGstClass *klass)
                         g_cclosure_marshal_VOID__VOID,
                         G_TYPE_NONE, 0);
 
-    signals [MEDIA_TAG] =
+    signals[MEDIA_TAG] =
         g_signal_new   ("media-tag",
                         PAROLE_TYPE_GST,
                         G_SIGNAL_RUN_LAST,
@@ -2594,7 +2593,7 @@ void parole_gst_shutdown (ParoleGst *gst)
 void parole_gst_seek (ParoleGst *gst, gdouble seek)
 {
     TRACE ("Seeking");
-    g_warn_if_fail ( gst_element_seek (gst->priv->playbin,
+    g_warn_if_fail (gst_element_seek (gst->priv->playbin,
                         1.0,
                         GST_FORMAT_TIME,
                         GST_SEEK_FLAG_KEY_UNIT | GST_SEEK_FLAG_FLUSH,
@@ -2841,7 +2840,7 @@ gst_get_lang_list_for_type (ParoleGst * gst, const gchar * type_name)
 }
 
 gboolean
-gst_get_has_vis( ParoleGst *gst )
+gst_get_has_vis(ParoleGst *gst)
 {
     gboolean has_vis;
 
@@ -2853,7 +2852,7 @@ gst_get_has_vis( ParoleGst *gst )
 }
 
 gboolean
-gst_get_has_video( ParoleGst *gst )
+gst_get_has_video(ParoleGst *gst)
 {
     gboolean playing_video;
 
@@ -2865,13 +2864,13 @@ gst_get_has_video( ParoleGst *gst )
 }
 
 void
-gst_set_current_audio_track( ParoleGst *gst, gint track_no )
+gst_set_current_audio_track(ParoleGst *gst, gint track_no)
 {
     g_object_set (G_OBJECT (gst->priv->playbin), "current-audio", (track_no), NULL);
 }
 
 void
-gst_set_current_subtitle_track( ParoleGst *gst, gint track_no )
+gst_set_current_subtitle_track(ParoleGst *gst, gint track_no)
 {
     gchar *uri, *sub;
     gint flags;
@@ -2905,7 +2904,7 @@ gst_set_current_subtitle_track( ParoleGst *gst, gint track_no )
         g_object_get (gst->priv->playbin, "current-text", &track_no, NULL);
     }
 
-    parole_gst_load_subtitle( gst );
+    parole_gst_load_subtitle(gst);
 }
 
 const ParoleStream     *parole_gst_get_stream       (ParoleGst *gst)
diff --git a/src/misc/parole-file.c b/src/misc/parole-file.c
index fba39d9..afb0fed 100644
--- a/src/misc/parole-file.c
+++ b/src/misc/parole-file.c
@@ -209,16 +209,16 @@ parole_file_constructed (GObject *object)
                               &error);
 
 
-    priv->directory = g_file_get_path (g_file_get_parent( gfile ));
+    priv->directory = g_file_get_path (g_file_get_parent(gfile));
 
     if ( error )
     {
-        if ( G_LIKELY (error->code == G_IO_ERROR_NOT_SUPPORTED) ) {
+        if (G_LIKELY (error->code == G_IO_ERROR_NOT_SUPPORTED)) {
             g_error_free (error);
-            if ( !priv->display_name )
+            if (!priv->display_name)
                 priv->display_name = g_file_get_basename (gfile);
         } else {
-            if ( !priv->display_name )
+            if (!priv->display_name)
                 priv->display_name = g_strdup (priv->filename);
             g_warning ("Unable to read file info %s", error->message);
         }
diff --git a/src/misc/parole-pl-parser.c b/src/misc/parole-pl-parser.c
index cb33ba2..dfe6ed9 100644
--- a/src/misc/parole-pl-parser.c
+++ b/src/misc/parole-pl-parser.c
@@ -126,7 +126,7 @@ parole_xspf_xml_end (GMarkupParseContext *context, const gchar *element_name,
     ParoleParserData *data = user_data;
     ParoleFile *file;
 
-    if (! g_ascii_strcasecmp (element_name, "playlist"))
+    if (!g_ascii_strcasecmp (element_name, "playlist"))
         data->started = FALSE;
 
     if (!data->started)
@@ -348,7 +348,7 @@ parole_pl_parser_parse_m3u (const gchar *filename)
     lines = g_strsplit (contents, split_char, 0);
     g_free (contents);
 
-    /* Regular expression for stream protocols, such as http:// smb:// */
+    // Regular expression for stream protocols, such as http:// and smb://
     regex = g_regex_new ("^(?!/)[a-zA-Z_0-9]+://", 0, 0, NULL);
 
     num_lines = g_strv_length (lines);
diff --git a/src/parole-button.c b/src/parole-button.c
index c666936..91761f6 100644
--- a/src/parole-button.c
+++ b/src/parole-button.c
@@ -60,7 +60,7 @@ static struct
 {
     ParoleButtonKey    key;
     guint              key_code;
-} parole_key_map [PAROLE_KEY_NUMBERS] = { {0, 0}, };
+} parole_key_map[PAROLE_KEY_NUMBERS] = { {0, 0}, };
 
 struct ParoleButtonPrivate
 {
@@ -95,8 +95,8 @@ parole_button_get_key (unsigned int keycode)
 
     for ( i = 0; i < G_N_ELEMENTS (parole_key_map); i++)
     {
-        if ( parole_key_map [i].key_code == keycode )
-            key = parole_key_map [i].key;
+        if ( parole_key_map[i].key_code == keycode )
+            key = parole_key_map[i].key;
     }
 
     return key;
@@ -212,8 +212,8 @@ parole_button_xevent_key (ParoleButton *button, guint keysym , ParoleButtonKey k
 
     PAROLE_DEBUG_ENUM_FULL (key, ENUM_GTYPE_BUTTON_KEY, "Grabbed key %li ", (long int) keycode);
 
-    parole_key_map [key].key_code = keycode;
-    parole_key_map [key].key = key;
+    parole_key_map[key].key_code = keycode;
+    parole_key_map[key].key = key;
 
     return TRUE;
 }
@@ -250,7 +250,7 @@ parole_button_class_init(ParoleButtonClass *klass)
 {
     GObjectClass *object_class = G_OBJECT_CLASS(klass);
 
-    signals [BUTTON_PRESSED] =
+    signals[BUTTON_PRESSED] =
         g_signal_new ("button-pressed",
                       PAROLE_TYPE_BUTTON,
                       G_SIGNAL_RUN_LAST,
diff --git a/src/parole-clutter.c b/src/parole-clutter.c
index efbb9b7..66c419c 100644
--- a/src/parole-clutter.c
+++ b/src/parole-clutter.c
@@ -230,7 +230,7 @@ parole_clutter_conf_notify_cb (GObject *object, GParamSpec *spec, ParoleClutter
                       "aspect-ratio", &clutter->priv->aspect_ratio,
                       NULL);
 
-        gtk_widget_get_allocation( GTK_WIDGET (clutter), allocation );
+        gtk_widget_get_allocation(GTK_WIDGET (clutter), allocation);
         parole_clutter_size_allocate (GTK_WIDGET (clutter->priv->embed), allocation);
         g_free(allocation);
     }
diff --git a/src/parole-conf-dialog.c b/src/parole-conf-dialog.c
index 837e804..993c15d 100644
--- a/src/parole-conf-dialog.c
+++ b/src/parole-conf-dialog.c
@@ -295,8 +295,8 @@ parole_conf_dialog_add_vis_plugins (gpointer key, gpointer value, GtkWidget *com
     GtkListStore *store = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(combox)));
     GtkTreeIter iter;
 
-    gtk_list_store_append( store, &iter );
-    gtk_list_store_set( store, &iter, 0, (const gchar *) key, -1 );
+    gtk_list_store_append(store, &iter);
+    gtk_list_store_set(store, &iter, 0, (const gchar *) key, -1);
 
     g_object_unref (store);
 }
@@ -308,9 +308,9 @@ parole_conf_dialog_add_clutter_sink (ParoleConfDialog *dialog, GtkComboBox *comb
     GtkListStore *store = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(combobox)));
     GtkTreeIter iter;
 
-    gtk_list_store_append( store, &iter );
-    gtk_list_store_set( store, &iter, 0, g_strdup("cluttersink"), -1 );
-    gtk_list_store_set( store, &iter, 1, g_strdup(_("Clutter (OpenGL)")), -1 );
+    gtk_list_store_append(store, &iter);
+    gtk_list_store_set(store, &iter, 0, g_strdup("cluttersink"), -1);
+    gtk_list_store_set(store, &iter, 1, g_strdup(_("Clutter (OpenGL)")), -1);
 
     g_object_unref (store);
 }
diff --git a/src/parole-disc.c b/src/parole-disc.c
index 5305588..f722e50 100644
--- a/src/parole-disc.c
+++ b/src/parole-disc.c
@@ -68,7 +68,7 @@ enum
     LAST_SIGNAL
 };
 
-static guint signals [LAST_SIGNAL] = { 0 };
+static guint signals[LAST_SIGNAL] = { 0 };
 
 G_DEFINE_TYPE (ParoleDisc, parole_disc, G_TYPE_OBJECT)
 
@@ -110,21 +110,21 @@ parole_disc_set_label(ParoleDisc *disc, const gchar *label)
 
     if ( g_strcmp0(label, _("Insert Disc")) != 0 ) {
         menu_label = g_strdup_printf ("%s '%s'", _("Play Disc"), label);
-        g_signal_emit (G_OBJECT (disc), signals [LABEL_CHANGED], 0, label);
+        g_signal_emit (G_OBJECT (disc), signals[LABEL_CHANGED], 0, label);
     } else {
         menu_label = g_strdup(label);
-        g_signal_emit (G_OBJECT (disc), signals [LABEL_CHANGED], 0, label);
+        g_signal_emit (G_OBJECT (disc), signals[LABEL_CHANGED], 0, label);
     }
 
-    gtk_menu_item_set_label( GTK_MENU_ITEM (disc->priv->disc_menu_item), menu_label );
+    gtk_menu_item_set_label(GTK_MENU_ITEM (disc->priv->disc_menu_item), menu_label);
     g_free(menu_label);
 }
 
 static void
 parole_disc_set_enabled(ParoleDisc *disc, gboolean enabled)
 {
-    gtk_widget_set_sensitive( GTK_WIDGET(disc->priv->disc_menu_item), enabled);
-    // g_signal_emit (G_OBJECT (disc), signals [DVD_ENABLED], 0, enabled);
+    gtk_widget_set_sensitive(GTK_WIDGET(disc->priv->disc_menu_item), enabled);
+    // g_signal_emit (G_OBJECT (disc), signals[DVD_ENABLED], 0, enabled);
 }
 
 static gboolean
@@ -169,7 +169,7 @@ parole_disc_media_activate_cb (GtkWidget *widget, ParoleDisc *disc)
 
     data = g_object_get_data (G_OBJECT (widget), "mount-data");
 
-    g_signal_emit (G_OBJECT (disc), signals [DISC_SELECTED], 0, data->uri, data->device);
+    g_signal_emit (G_OBJECT (disc), signals[DISC_SELECTED], 0, data->uri, data->device);
 }
 
 /**
diff --git a/src/parole-mediachooser.c b/src/parole-mediachooser.c
index 71860d0..192597f 100644
--- a/src/parole-mediachooser.c
+++ b/src/parole-mediachooser.c
@@ -88,7 +88,7 @@ enum
     LAST_SIGNAL
 };
 
-static guint signals [LAST_SIGNAL] = { 0 };
+static guint signals[LAST_SIGNAL] = { 0 };
 
 G_DEFINE_TYPE (ParoleMediaChooser, parole_media_chooser, G_TYPE_OBJECT)
 
@@ -140,7 +140,7 @@ parole_media_chooser_add (ParoleMediaChooser *chooser, GtkWidget *file_chooser)
             // For now we will play the ISO if it is the first file found, otherwise ignore.
             if (g_slist_length(media_files) != 0)
                 continue;
-            g_signal_emit (G_OBJECT (chooser), signals [ISO_OPENED], 0, file);
+            g_signal_emit (G_OBJECT (chooser), signals[ISO_OPENED], 0, file);
 
             g_slist_free (media_files);
 
@@ -152,7 +152,7 @@ parole_media_chooser_add (ParoleMediaChooser *chooser, GtkWidget *file_chooser)
         parole_get_media_files (filter, file, scan_recursive, &media_files);
     }
 
-    g_signal_emit (G_OBJECT (chooser), signals [MEDIA_FILES_OPENED], 0, media_files);
+    g_signal_emit (G_OBJECT (chooser), signals[MEDIA_FILES_OPENED], 0, media_files);
     g_slist_free (media_files);
 
     g_slist_foreach (files, (GFunc) g_free, NULL);
@@ -181,7 +181,7 @@ parole_media_chooser_open (ParoleMediaChooser *chooser)
 {
     parole_window_busy_cursor (gtk_widget_get_window(GTK_WIDGET(chooser->window)));
 
-    gtk_widget_show( chooser->spinner );
+    gtk_widget_show(chooser->spinner);
 
     g_idle_add ((GSourceFunc) parole_media_chooser_add_idle, chooser);
 }
@@ -224,28 +224,28 @@ parole_media_chooser_open_internal (ParoleMediaChooser *media_chooser)
     media_chooser->window = GTK_WIDGET (gtk_builder_get_object (builder, "chooser"));
     media_chooser->spinner = GTK_WIDGET (gtk_builder_get_object (builder, "spinner"));
 
-    gtk_widget_hide( media_chooser->spinner );
+    gtk_widget_hide(media_chooser->spinner);
 
     file_chooser = GTK_WIDGET (gtk_builder_get_object (builder, "filechooserwidget"));
 
     /* Set filters for the filechooser */
     filter = parole_get_supported_files_filter();
     gtk_file_filter_add_mime_type (GTK_FILE_FILTER (filter), "application/x-cd-image");
-    gtk_file_chooser_add_filter( GTK_FILE_CHOOSER(file_chooser), filter );
+    gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(file_chooser), filter);
 
     audio_filter = parole_get_supported_audio_filter();
-    gtk_file_chooser_add_filter( GTK_FILE_CHOOSER(file_chooser), audio_filter );
+    gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(file_chooser), audio_filter);
 
     video_filter = parole_get_supported_video_filter();
-    gtk_file_chooser_add_filter( GTK_FILE_CHOOSER(file_chooser), video_filter );
+    gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(file_chooser), video_filter);
 
     playlist_filter = parole_get_supported_playlist_filter();
-    gtk_file_chooser_add_filter( GTK_FILE_CHOOSER(file_chooser), playlist_filter );
+    gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(file_chooser), playlist_filter);
 
     all_files = gtk_file_filter_new();
-    gtk_file_filter_set_name( all_files, _("All files") );
-    gtk_file_filter_add_pattern ( all_files, "*");
-    gtk_file_chooser_add_filter( GTK_FILE_CHOOSER(file_chooser), all_files );
+    gtk_file_filter_set_name(all_files, _("All files"));
+    gtk_file_filter_add_pattern (all_files, "*");
+    gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(file_chooser), all_files);
 
     /* Set the folder that is shown */
     g_object_get (G_OBJECT (media_chooser->conf),
diff --git a/src/parole-medialist.c b/src/parole-medialist.c
index 66d6460..62078bf 100644
--- a/src/parole-medialist.c
+++ b/src/parole-medialist.c
@@ -72,7 +72,7 @@ static struct
 {
     ParolePlFormat format;
     gchar * ext;
-} playlist_format_map [] = {
+} playlist_format_map[] = {
     { PAROLE_PL_FORMAT_UNKNOWN, ""      },
     { PAROLE_PL_FORMAT_M3U,     ".m3u"  },
     { PAROLE_PL_FORMAT_PLS,     ".pls"  },
@@ -199,7 +199,7 @@ enum
     LAST_SIGNAL
 };
 
-static guint signals [LAST_SIGNAL] = { 0 };
+static guint signals[LAST_SIGNAL] = { 0 };
 
 G_DEFINE_TYPE (ParoleMediaList, parole_media_list, GTK_TYPE_BOX)
 
@@ -230,7 +230,7 @@ parole_media_list_set_playlist_count (ParoleMediaList *list, gint n_items)
      * Will emit the signal media_cursor_changed with FALSE because there is no any
      * row remaining, so the player can disable click on the play button.
      */
-    g_signal_emit (G_OBJECT (list), signals [MEDIA_CURSOR_CHANGED], 0, n_items != 0);
+    g_signal_emit (G_OBJECT (list), signals[MEDIA_CURSOR_CHANGED], 0, n_items != 0);
 }
 
 gint
@@ -325,7 +325,7 @@ parole_media_list_add (ParoleMediaList *list, ParoleFile *file, gboolean disc, g
             parole_media_list_select_path (list, disc, path);
         gtk_tree_path_free (path);
         if ( emit )
-            g_signal_emit (G_OBJECT (list), signals [MEDIA_ACTIVATED], 0, row);
+            g_signal_emit (G_OBJECT (list), signals[MEDIA_ACTIVATED], 0, row);
         gtk_tree_row_reference_free (row);
     }
 
@@ -364,7 +364,7 @@ parole_media_list_files_open (ParoleMediaList *list, GSList *files, gboolean dis
     TRACE ("Adding %i files", len);
 
     if ( len > 1 && !disc )
-        g_signal_emit (G_OBJECT (list), signals [SHOW_PLAYLIST], 0, TRUE);
+        g_signal_emit (G_OBJECT (list), signals[SHOW_PLAYLIST], 0, TRUE);
 
     if ( len != 0 )
     {
@@ -390,7 +390,7 @@ parole_media_list_add_cdda_tracks (ParoleMediaList *list, gint n_tracks)
 
     for (i = 0; i < n_tracks; i++)
     {
-        file = parole_file_new_cdda_track( i+1, g_strdup_printf( _("Track %i"), i+1) );
+        file = parole_file_new_cdda_track(i+1, g_strdup_printf(_("Track %i"), i+1));
         files = g_slist_append(files, file);
     }
 
@@ -406,7 +406,7 @@ parole_media_list_add_dvd_chapters (ParoleMediaList *list, gint n_chapters)
 
     for (i = 0; i < n_chapters; i++)
     {
-        file = PAROLE_FILE(parole_file_new_dvd_chapter( i+1, g_strdup_printf( _("Chapter %i"), i+1) ));
+        file = PAROLE_FILE(parole_file_new_dvd_chapter(i+1, g_strdup_printf(_("Chapter %i"), i+1)));
         files = g_slist_append(files, file);
     }
 
@@ -435,7 +435,7 @@ parole_media_list_open_uri (ParoleMediaList *list, const gchar *uri)
     ParoleFile *file;
 
     if ( parole_is_uri_disc (uri) ) {
-        g_signal_emit (G_OBJECT (list), signals [URI_OPENED], 0, uri);
+        g_signal_emit (G_OBJECT (list), signals[URI_OPENED], 0, uri);
     } else {
         file = parole_file_new (uri);
         parole_media_list_add (list, file, FALSE, TRUE, TRUE);
@@ -455,7 +455,7 @@ parole_media_list_iso_opened_cb (ParoleMediaChooser *chooser,
 {
     gchar *uri;
     uri = g_strdup_printf ("dvd://%s", filename);
-    g_signal_emit (G_OBJECT (list), signals [ISO_OPENED], 0, uri);
+    g_signal_emit (G_OBJECT (list), signals[ISO_OPENED], 0, uri);
 }
 
 static void
@@ -570,7 +570,7 @@ gboolean parole_media_list_key_press (GtkWidget *widget, GdkEventKey *ev, Parole
         case GDK_KEY_Page_Up:
         case GDK_KEY_Escape:
             // FIXME: There has got to be a better way.
-            vbox_player = GTK_WIDGET(gtk_container_get_children( GTK_CONTAINER(gtk_widget_get_parent(gtk_widget_get_parent(gtk_widget_get_parent(gtk_widget_get_parent(gtk_widget_get_parent(gtk_widget_get_parent(widget))))))) )[0].data);
+            vbox_player = GTK_WIDGET(gtk_container_get_children(GTK_CONTAINER(gtk_widget_get_parent(gtk_widget_get_parent(gtk_widget_get_parent(gtk_widget_get_parent(gtk_widget_get_parent(gtk_widget_get_parent(widget))))))) )[0].data);
             gtk_widget_grab_focus(vbox_player);
             return TRUE;
             break;
@@ -1144,13 +1144,13 @@ parole_media_list_row_activated_cb (GtkTreeView *view, GtkTreePath *path,
     else
         row = gtk_tree_row_reference_new (gtk_tree_view_get_model (GTK_TREE_VIEW (list->priv->disc_view)), path);
 
-    g_signal_emit (G_OBJECT (list), signals [MEDIA_ACTIVATED], 0, row);
+    g_signal_emit (G_OBJECT (list), signals[MEDIA_ACTIVATED], 0, row);
 }
 
 static void
 parole_media_list_selection_changed_cb (GtkTreeSelection *sel, ParoleMediaList *list)
 {
-    g_signal_emit  (G_OBJECT (list), signals [MEDIA_CURSOR_CHANGED], 0,
+    g_signal_emit  (G_OBJECT (list), signals[MEDIA_CURSOR_CHANGED], 0,
                     gtk_tree_selection_count_selected_rows (sel) > 0);
 }
 
@@ -1709,7 +1709,7 @@ parole_media_list_add_by_path (ParoleMediaList *list, const gchar *path, gboolea
     if (g_path_is_absolute(path)) {
         full_path = g_strdup(path);
     } else {
-        if (g_file_test( g_strjoin("/", g_get_current_dir(), g_strdup(path), NULL), G_FILE_TEST_EXISTS)) {
+        if (g_file_test(g_strjoin("/", g_get_current_dir(), g_strdup(path), NULL), G_FILE_TEST_EXISTS)) {
             full_path = g_strjoin("/", g_get_current_dir(), g_strdup(path), NULL);
         } else {
             full_path = g_strdup(path);
@@ -1800,7 +1800,7 @@ GtkTreeRowReference *parole_media_list_get_row_n (ParoleMediaList *list,
     if (wanted_row == -1)
         return NULL;
 
-    path = gtk_tree_path_new_from_string( g_strdup_printf("%i", wanted_row) );
+    path = gtk_tree_path_new_from_string(g_strdup_printf("%i", wanted_row));
 
     if (gtk_notebook_get_current_page(GTK_NOTEBOOK(list->priv->playlist_notebook)) == 0) {
         if ( gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), &iter, path))
diff --git a/src/parole-module.h b/src/parole-module.h
index fe741e3..7fc9b61 100644
--- a/src/parole-module.h
+++ b/src/parole-module.h
@@ -61,7 +61,7 @@ struct _ParoleProviderModule
 struct _ParoleProviderModuleClass
 {
     GTypeModuleClass        parent_class;
-} ;
+};
 
 GType                       parole_provider_module_get_type        (void) G_GNUC_CONST;
 
diff --git a/src/parole-open-location.c b/src/parole-open-location.c
index 72f5653..59943df 100644
--- a/src/parole-open-location.c
+++ b/src/parole-open-location.c
@@ -65,7 +65,7 @@ enum
     N_COLS
 };
 
-static guint signals [LAST_SIGNAL] = { 0 };
+static guint signals[LAST_SIGNAL] = { 0 };
 
 G_DEFINE_TYPE (ParoleOpenLocation, parole_open_location, G_TYPE_OBJECT)
 
@@ -88,7 +88,7 @@ parole_open_location_response_cb (GtkDialog *dialog, gint response_id, ParoleOpe
         TRACE ("Location %s", location);
 
         gtk_widget_hide (GTK_WIDGET (dialog));
-        g_signal_emit (G_OBJECT (self), signals [LOCATION_OPENED], 0, location);
+        g_signal_emit (G_OBJECT (self), signals[LOCATION_OPENED], 0, location);
     }
 
 out:
@@ -116,7 +116,7 @@ parole_open_location_get_completion_model (void)
             {
                 gtk_list_store_append (store, &iter);
                 gtk_list_store_set (store, &iter,
-                                    COL_ADDRESS, lines [i],
+                                    COL_ADDRESS, lines[i],
                                     -1);
             }
         }
diff --git a/src/parole-player.c b/src/parole-player.c
index 1c18726..f5eb590 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -538,7 +538,7 @@ void parole_player_set_playlist_visible (ParolePlayer *player, gboolean visibili
     gint window_w, window_h, playlist_w;
     GtkAllocation *allocation = g_new0 (GtkAllocation, 1);
 
-    gtk_widget_set_tooltip_text (GTK_WIDGET(player->priv->showhide_playlist_button), visibility ? _("Hide Playlist"):_("Show Playlist"));
+    gtk_widget_set_tooltip_text (GTK_WIDGET(player->priv->showhide_playlist_button), visibility ? _("Hide Playlist") : _("Show Playlist"));
 
     if (gtk_widget_get_visible (player->priv->playlist_nt) == visibility)
         return;
@@ -546,12 +546,12 @@ void parole_player_set_playlist_visible (ParolePlayer *player, gboolean visibili
     gtk_window_get_size (GTK_WINDOW (player->priv->window), &window_w, &window_h);
 
     /* Get the playlist width.  If we fail to get it, use the default 220. */
-    gtk_widget_get_allocation( GTK_WIDGET( player->priv->playlist_nt ), allocation );
+    gtk_widget_get_allocation(GTK_WIDGET(player->priv->playlist_nt), allocation);
     playlist_w = allocation->width;
     if (playlist_w == 1)
         playlist_w = 220;
 
-    g_simple_toggle_action_set_active( player->priv->toggle_playlist_action, visibility );
+    g_simple_toggle_action_set_active(player->priv->toggle_playlist_action, visibility);
     gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(player->priv->showhide_playlist_menu_item), visibility);
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(player->priv->showhide_playlist_button), visibility);
     if ( visibility ) {
@@ -579,7 +579,7 @@ void parole_player_toggle_playlist_action_cb (GSimpleAction *action)
 
     visible = gtk_widget_get_visible (parole_player->priv->playlist_nt);
 
-    parole_player_set_playlist_visible (parole_player, !visible );
+    parole_player_set_playlist_visible (parole_player, !visible);
 }
 
 static void
@@ -710,7 +710,7 @@ parole_player_clear_chapters (ParolePlayer *player)
     gint counter = 0;
 
     /* Clear the chapter menu options */
-    menu_items = gtk_container_get_children( GTK_CONTAINER (player->priv->chapters_menu) );
+    menu_items = gtk_container_get_children(GTK_CONTAINER(player->priv->chapters_menu));
 
     for (menu_iter = menu_items; menu_iter != NULL; menu_iter = g_list_next(menu_iter))
     {
@@ -759,10 +759,10 @@ parole_player_clear_subtitles (ParolePlayer *player)
     gtk_list_store_clear(player->priv->liststore_subtitles);
     gtk_list_store_append(GTK_LIST_STORE(player->priv->liststore_subtitles), &iter);
     gtk_list_store_set(GTK_LIST_STORE(player->priv->liststore_subtitles), &iter, 0, _("None"), -1);
-    gtk_combo_box_set_active( GTK_COMBO_BOX(player->priv->combobox_subtitles), 0 );
+    gtk_combo_box_set_active(GTK_COMBO_BOX(player->priv->combobox_subtitles), 0);
 
     /* Clear the subtitle menu options */
-    menu_items = gtk_container_get_children( GTK_CONTAINER (player->priv->subtitles_menu) );
+    menu_items = gtk_container_get_children(GTK_CONTAINER(player->priv->subtitles_menu));
     gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(player->priv->subtitles_group), TRUE);
 
     for (menu_iter = menu_items; menu_iter != NULL; menu_iter = g_list_next(menu_iter))
@@ -785,7 +785,7 @@ parole_player_set_subtitles_list (ParolePlayer *player, GList *subtitle_list)
 
     GtkWidget *menu_item;
 
-    parole_player_clear_subtitles( player );
+    parole_player_clear_subtitles(player);
 
     player->priv->subtitle_list = subtitle_list;
 
@@ -824,15 +824,15 @@ parole_player_clear_audio_tracks (ParolePlayer *player)
 
     /* Clear the subtitle menu options */
 
-    menu_items = gtk_container_get_children( GTK_CONTAINER (player->priv->languages_menu) );
+    menu_items = gtk_container_get_children(GTK_CONTAINER(player->priv->languages_menu));
 
     for (menu_iter = menu_items; menu_iter != NULL; menu_iter = g_list_next(menu_iter))
         gtk_widget_destroy(GTK_WIDGET(menu_iter->data));
     g_list_free(menu_items);
 
     empty_item = gtk_menu_item_new_with_label(_("Empty"));
-    gtk_widget_set_sensitive( empty_item, FALSE );
-    gtk_widget_show( empty_item );
+    gtk_widget_set_sensitive(empty_item, FALSE);
+    gtk_widget_show(empty_item);
 
     gtk_menu_shell_append (GTK_MENU_SHELL (player->priv->languages_menu), empty_item);
 }
@@ -848,9 +848,9 @@ parole_player_set_audio_list (ParolePlayer *player, GList *audio_list)
 
     GtkWidget *menu_item;
 
-    parole_player_clear_audio_tracks( player );
+    parole_player_clear_audio_tracks(player);
 
-    menu_iter = gtk_container_get_children( GTK_CONTAINER (player->priv->languages_menu) );
+    menu_iter = gtk_container_get_children(GTK_CONTAINER (player->priv->languages_menu));
 
     gtk_widget_destroy(GTK_WIDGET(menu_iter->data));
     g_list_free(menu_iter);
@@ -884,13 +884,13 @@ parole_player_set_audio_list (ParolePlayer *player, GList *audio_list)
         g_free (language);
     }
 
-    gtk_combo_box_set_active( GTK_COMBO_BOX(player->priv->combobox_audiotrack), 0 );
+    gtk_combo_box_set_active(GTK_COMBO_BOX(player->priv->combobox_audiotrack), 0);
 
     if (g_list_length (audio_list) >= 2) {
-        gtk_widget_set_sensitive( GTK_WIDGET( player->priv->combobox_audiotrack ), TRUE );
+        gtk_widget_set_sensitive(GTK_WIDGET(player->priv->combobox_audiotrack), TRUE);
         gtk_widget_show(player->priv->infobar);
     } else {
-        gtk_widget_set_sensitive( GTK_WIDGET( player->priv->combobox_audiotrack ), FALSE );
+        gtk_widget_set_sensitive(GTK_WIDGET(player->priv->combobox_audiotrack), FALSE);
     }
 }
 
@@ -939,7 +939,7 @@ parole_player_update_subtitles (ParolePlayer *player, ParoleGst *gst)
 
     parole_player_set_subtitles_list (player, list);
 
-    gtk_combo_box_set_active( GTK_COMBO_BOX(player->priv->combobox_subtitles), sub_index );
+    gtk_combo_box_set_active(GTK_COMBO_BOX(player->priv->combobox_subtitles), sub_index);
 
     if (g_list_length (list) != 1) {
         gtk_widget_show(player->priv->infobar);
@@ -953,7 +953,7 @@ static void
 parole_player_update_languages (ParolePlayer *player, ParoleGst *gst)
 {
     if (player->priv->update_languages == TRUE) {
-        if (gst_get_has_video( PAROLE_GST(player->priv->gst) )) {
+        if (gst_get_has_video(PAROLE_GST(player->priv->gst))) {
             parole_player_update_audio_tracks(player, gst);
             parole_player_update_subtitles(player, gst);
 
@@ -974,8 +974,8 @@ parole_player_show_audiobox (ParolePlayer *player)
     /* Only show the audiobox if we're sure there's no video playing and
        visualizations are disabled. */
     gtk_widget_hide(player->priv->logo_image);
-    if (!gst_get_has_video ( PAROLE_GST(player->priv->gst) ) &&
-        !gst_get_has_vis   ( PAROLE_GST(player->priv->gst) ) )
+    if (!gst_get_has_video(PAROLE_GST(player->priv->gst)) &&
+        !gst_get_has_vis(PAROLE_GST(player->priv->gst)))
     {
         gtk_widget_show(player->priv->audiobox);
         gtk_widget_hide(player->priv->videobox);
@@ -1073,7 +1073,7 @@ parole_player_select_custom_subtitle (GtkMenuItem *widget, gpointer data)
             TRACE ("Trying to use subtitle file %s", sub);
             player->priv->updated_subs = TRUE;
 
-            file = parole_media_list_get_selected_file( player->priv->list );
+            file = parole_media_list_get_selected_file(player->priv->list);
 
             /* Set the subtitles in gst as well as in the media list, for later
                retrieval. */
@@ -1212,14 +1212,14 @@ parole_player_recent_menu_clear_activated_cb (GtkWidget *widget, ParolePlayer *p
     gtk_message_dialog_set_markup  (GTK_MESSAGE_DIALOG(dlg),
                                     g_strdup_printf("<big><b>%s</b></big>",
                                     _("Clear Recent Items")));
-    gtk_message_dialog_format_secondary_text ( GTK_MESSAGE_DIALOG(dlg),
+    gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG(dlg),
     _("Are you sure you wish to clear your recent items history?  This cannot be undone."));
 
     gtk_dialog_add_button (GTK_DIALOG(dlg), _("Cancel"), 0);
     clear_button = gtk_dialog_add_button(GTK_DIALOG(dlg),
                                          "edit-clear",
                                          1);
-    gtk_button_set_label( GTK_BUTTON(clear_button), _("Clear Recent Items") );
+    gtk_button_set_label(GTK_BUTTON(clear_button), _("Clear Recent Items"));
 
     gtk_widget_show_all(dlg);
 
@@ -1436,14 +1436,14 @@ parole_player_playing (ParolePlayer *player, const ParoleStream *stream)
     player->priv->internal_range_change = TRUE;
     if (live || duration == 0) {
         parole_player_change_range_value (player, 0);
-        gtk_widget_set_visible( player->priv->label_duration, FALSE );
-        gtk_widget_set_visible( player->priv->label_divider, FALSE );
-        gtk_widget_set_visible( player->priv->label_elapsed, FALSE );
+        gtk_widget_set_visible(player->priv->label_duration, FALSE);
+        gtk_widget_set_visible(player->priv->label_divider, FALSE);
+        gtk_widget_set_visible(player->priv->label_elapsed, FALSE);
     } else {
         gtk_range_set_range (GTK_RANGE (player->priv->range), 0, duration);
-        gtk_widget_set_visible( player->priv->label_duration, TRUE );
-        gtk_widget_set_visible( player->priv->label_divider, TRUE );
-        gtk_widget_set_visible( player->priv->label_elapsed, TRUE );
+        gtk_widget_set_visible(player->priv->label_duration, TRUE);
+        gtk_widget_set_visible(player->priv->label_divider, TRUE);
+        gtk_widget_set_visible(player->priv->label_elapsed, TRUE);
     }
 
     if (duration != 0) {
@@ -2019,8 +2019,8 @@ parole_player_window_state_event (GtkWidget *widget,
     if (event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN)
         fullscreen = TRUE;
 
-    if ( player->priv->full_screen != fullscreen )
-        parole_player_reset_controls( player, fullscreen );
+    if (player->priv->full_screen != fullscreen)
+        parole_player_reset_controls(player, fullscreen);
 
     return TRUE;
 }
@@ -2276,10 +2276,10 @@ parole_player_gst_widget_button_press (GtkWidget *widget, GdkEventButton *ev, Pa
     if ( ev->type == GDK_2BUTTON_PRESS ) {
         g_action_activate (G_ACTION(player->priv->media_fullscreen_action), NULL);
         ret_val = TRUE;
-    } else if ( ev->button == 1 && gtk_widget_get_visible (player->priv->logo_image) ) {
+    } else if (ev->button == 1 && gtk_widget_get_visible (player->priv->logo_image)) {
         /* Clicking on the play or replay logo will activate appropriate functionality */
-        h = gtk_widget_get_allocated_height ( widget );
-        w = gtk_widget_get_allocated_width ( widget );
+        h = gtk_widget_get_allocated_height (widget);
+        w = gtk_widget_get_allocated_width (widget);
 
         if ( (ev->x > ((w / 2) - 128) && ev->x < ((w / 2) + 128)) &&
              (ev->y > ((h / 2) - 128) && ev->y < ((h / 2) + 128)) )
@@ -2482,10 +2482,10 @@ void parole_player_volume_mute (GtkWidget *widget, ParolePlayer *player)
         g_object_get (G_OBJECT (player->priv->conf),
                       "volume", &value,
                       NULL);
-        gtk_menu_item_set_label( GTK_MENU_ITEM(player->priv->mute), _("Mute") );
+        gtk_menu_item_set_label(GTK_MENU_ITEM(player->priv->mute), _("Mute"));
     } else {
         value = 0;
-        gtk_menu_item_set_label( GTK_MENU_ITEM(player->priv->mute), _("Unmute") );
+        gtk_menu_item_set_label(GTK_MENU_ITEM(player->priv->mute), _("Unmute"));
     }
     gtk_scale_button_set_value (GTK_SCALE_BUTTON (player->priv->volume), (gdouble)(value)/100);
 }
@@ -3063,10 +3063,10 @@ parole_audiobox_expose_event (GtkWidget *w, GdkEventExpose *ev, ParolePlayer *pl
     g_free(allocation);
 
     /* Nothing to do if the homogeneous setting is already good */
-    if ( gtk_box_get_homogeneous( GTK_BOX(w) ) == homogeneous )
+    if (gtk_box_get_homogeneous(GTK_BOX(w)) == homogeneous)
         return FALSE;
 
-    gtk_box_set_homogeneous( GTK_BOX(w), homogeneous );
+    gtk_box_set_homogeneous(GTK_BOX(w), homogeneous);
 
     /* Expand the coverart if the parent box packing is homogenous */
     gtk_box_set_child_packing (GTK_BOX(w),
@@ -3383,8 +3383,8 @@ parole_player_init (ParolePlayer *player)
 
     // Recent Menu file filter
     recent_filter = parole_get_supported_recent_media_filter ();
-    gtk_recent_filter_add_application( recent_filter, "parole" );
-    gtk_recent_chooser_set_filter( GTK_RECENT_CHOOSER(player->priv->recent_menu), recent_filter);
+    gtk_recent_filter_add_application(recent_filter, "parole");
+    gtk_recent_chooser_set_filter(GTK_RECENT_CHOOSER(player->priv->recent_menu), recent_filter);
 
     // Recent Menu Separator
     recent_separator = gtk_separator_menu_item_new();
@@ -3401,7 +3401,7 @@ parole_player_init (ParolePlayer *player)
             G_CALLBACK (parole_player_recent_menu_clear_activated_cb), player);
 
     /* Attach the Recent Menu */
-    gtk_menu_item_set_submenu( GTK_MENU_ITEM(recent_menu), player->priv->recent_menu );
+    gtk_menu_item_set_submenu(GTK_MENU_ITEM(recent_menu), player->priv->recent_menu);
 
     /* DVD Menu */
     player->priv->dvd_menu = GTK_WIDGET(gtk_builder_get_object (builder, "dvd-menu"));
@@ -3642,7 +3642,7 @@ parole_player_init (ParolePlayer *player)
     gtk_overlay_add_overlay(GTK_OVERLAY(controls_overlay), player->priv->revealer);
     gtk_widget_show_all(player->priv->revealer);
 
-    gtk_box_set_child_packing( GTK_BOX(player->priv->control), GTK_WIDGET(play_box), TRUE, TRUE, 2, GTK_PACK_START );
+    gtk_box_set_child_packing(GTK_BOX(player->priv->control), GTK_WIDGET(play_box), TRUE, TRUE, 2, GTK_PACK_START);
     gtk_container_set_border_width(GTK_CONTAINER(play_box), 3);
     gtk_widget_show_all(controls_parent);
 
@@ -3667,7 +3667,7 @@ parole_player_init (ParolePlayer *player)
 
     /* Time Slider */
     player->priv->range = GTK_WIDGET (gtk_builder_get_object (builder, "media_progress_slider"));
-    gtk_widget_set_name( player->priv->range, "ParoleScale" );
+    gtk_widget_set_name(player->priv->range, "ParoleScale");
 
     /* Buffering Progressbar */
     player->priv->progressbar_buffering = GTK_WIDGET (gtk_builder_get_object (builder, "media_buffering_progressbar"));
@@ -3687,8 +3687,8 @@ parole_player_init (ParolePlayer *player)
 
     // Initialize the InfoBar
     player->priv->infobar = gtk_info_bar_new ();
-    gtk_info_bar_set_message_type (GTK_INFO_BAR (player->priv->infobar),
-                                   GTK_MESSAGE_QUESTION);
+    gtk_info_bar_set_message_type(GTK_INFO_BAR(player->priv->infobar),
+                                  GTK_MESSAGE_QUESTION);
 
     gtk_widget_set_no_show_all (player->priv->infobar, TRUE);
 
@@ -3696,7 +3696,7 @@ parole_player_init (ParolePlayer *player)
     g_signal_connect (content_area, "size-allocate",
               G_CALLBACK (on_content_area_size_allocate), player);
 
-    gtk_box_pack_start( GTK_BOX( hbox_infobar ), player->priv->infobar, TRUE, TRUE, 0);
+    gtk_box_pack_start(GTK_BOX(hbox_infobar), player->priv->infobar, TRUE, TRUE, 0);
 
     // Initialize the Audio Track combobox
     player->priv->liststore_audiotrack = gtk_list_store_new(1, G_TYPE_STRING);
@@ -3704,8 +3704,8 @@ parole_player_init (ParolePlayer *player)
     player->priv->audio_list = NULL;
 
     cell = gtk_cell_renderer_text_new();
-    gtk_cell_layout_pack_start( GTK_CELL_LAYOUT( player->priv->combobox_audiotrack ), cell, TRUE );
-    gtk_cell_layout_set_attributes( GTK_CELL_LAYOUT( player->priv->combobox_audiotrack ), cell, "text", 0, NULL );
+    gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(player->priv->combobox_audiotrack), cell, TRUE);
+    gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(player->priv->combobox_audiotrack), cell, "text", 0, NULL);
 
     g_signal_connect (player->priv->combobox_audiotrack, "changed",
             G_CALLBACK (parole_player_combo_box_audiotrack_changed_cb), player);
@@ -3723,8 +3723,8 @@ parole_player_init (ParolePlayer *player)
     player->priv->subtitle_list = NULL;
 
     sub_cell = gtk_cell_renderer_text_new();
-    gtk_cell_layout_pack_start( GTK_CELL_LAYOUT( player->priv->combobox_subtitles ), sub_cell, TRUE );
-    gtk_cell_layout_set_attributes( GTK_CELL_LAYOUT( player->priv->combobox_subtitles ), sub_cell, "text", 0, NULL );
+    gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(player->priv->combobox_subtitles), sub_cell, TRUE);
+    gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(player->priv->combobox_subtitles), sub_cell, "text", 0, NULL);
 
     g_signal_connect (player->priv->combobox_subtitles, "changed",
             G_CALLBACK (parole_player_combo_box_subtitles_changed_cb), player);
@@ -3907,7 +3907,7 @@ void parole_player_set_audiotrack_radio_menu_item_selected(ParolePlayer *player,
     GList *menu_items, *menu_iter;
     gint counter = 0;
 
-    menu_items = gtk_container_get_children( GTK_CONTAINER (player->priv->languages_menu) );
+    menu_items = gtk_container_get_children(GTK_CONTAINER (player->priv->languages_menu));
 
     for (menu_iter = menu_items; menu_iter != NULL; menu_iter = g_list_next(menu_iter))
     {
@@ -3923,7 +3923,7 @@ void parole_player_set_audiotrack_radio_menu_item_selected(ParolePlayer *player,
 void parole_player_set_subtitle_radio_menu_item_selected(ParolePlayer *player, gint sub_index)
 {
     GList *menu_items, *menu_iter;
-    menu_items = gtk_container_get_children( GTK_CONTAINER (player->priv->subtitles_menu) );
+    menu_items = gtk_container_get_children(GTK_CONTAINER (player->priv->subtitles_menu));
 
     if (sub_index <= 0) {
         gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_items->data), TRUE);
@@ -3948,7 +3948,7 @@ void parole_player_audiotrack_radio_menu_item_changed_cb(GtkWidget *widget, Paro
     gint counter = 0;
     gint combobox_index;
 
-    menu_items = gtk_container_get_children( GTK_CONTAINER (player->priv->languages_menu) );
+    menu_items = gtk_container_get_children(GTK_CONTAINER (player->priv->languages_menu));
 
     for (menu_iter = menu_items; menu_iter != NULL; menu_iter = g_list_next(menu_iter))
     {
@@ -3972,7 +3972,7 @@ void parole_player_subtitles_radio_menu_item_changed_cb(GtkWidget *widget, Parol
     gint counter = 0;
 
     GList *menu_items, *menu_iter;
-    menu_items = gtk_container_get_children( GTK_CONTAINER (player->priv->subtitles_menu) );
+    menu_items = gtk_container_get_children(GTK_CONTAINER (player->priv->subtitles_menu));
 
     for (menu_iter = menu_items; menu_iter != NULL; menu_iter = g_list_next(menu_iter))
     {
diff --git a/src/parole-plugin-player.c b/src/parole-plugin-player.c
index 708b54b..8916f9d 100644
--- a/src/parole-plugin-player.c
+++ b/src/parole-plugin-player.c
@@ -330,10 +330,10 @@ parole_plugin_player_init (ParolePluginPlayer *player)
 
     player->priv->fullscreen = FALSE;
     window = GTK_WIDGET(gtk_widget_get_toplevel (player->priv->gst));
-    g_signal_connect(   G_OBJECT(window),
-                        "window-state-event",
-                        G_CALLBACK(parole_plugin_player_window_state_event),
-                        player );
+    g_signal_connect(G_OBJECT(window),
+                     "window-state-event",
+                     G_CALLBACK(parole_plugin_player_window_state_event),
+                     player);
 
     player->priv->packed = FALSE;
     player->priv->box = NULL;
diff --git a/src/parole-utils.c b/src/parole-utils.c
index 9ba166e..8ea7e1c 100644
--- a/src/parole-utils.c
+++ b/src/parole-utils.c
@@ -232,7 +232,7 @@ parole_get_name_without_extension (const gchar *name)
 
     for ( suffix = len -1; suffix > 0;  suffix--)
     {
-        if ( name [suffix] == '.' )
+        if ( name[suffix] == '.' )
             break;
     }
 
diff --git a/src/plugins/mpris2/mpris2-provider.c b/src/plugins/mpris2/mpris2-provider.c
index 63a14bc..1aac559 100644
--- a/src/plugins/mpris2/mpris2-provider.c
+++ b/src/plugins/mpris2/mpris2-provider.c
@@ -1031,10 +1031,10 @@ mpris2_provider_set_player (ParoleProviderPlugin *plugin, ParoleProviderPlayer *
                       G_CALLBACK (conf_changed_cb), plugin);
 
     window = parole_provider_player_get_main_window(provider->player);
-    g_signal_connect(   G_OBJECT(window),
-                        "window-state-event",
-                        G_CALLBACK(on_window_state_event),
-                        provider );
+    g_signal_connect(G_OBJECT(window),
+                     "window-state-event",
+                     G_CALLBACK(on_window_state_event),
+                     provider);
 }
 
 static void
diff --git a/src/plugins/notify/notify-provider.c b/src/plugins/notify/notify-provider.c
index ec3c0fa..e6ac8e0 100644
--- a/src/plugins/notify/notify-provider.c
+++ b/src/plugins/notify/notify-provider.c
@@ -142,9 +142,9 @@ notify_playing (NotifyProvider *notify, const ParoleStream *stream)
     }
 
     if (!album)
-        album = g_strdup( _("Unknown Album") );
+        album = g_strdup(_("Unknown Album"));
     if (!artist)
-        artist = g_strdup( _("Unknown Artist") );
+        artist = g_strdup(_("Unknown Artist"));
 
     if (!year)
         message = g_strdup_printf ("%s %s\n%s %s", _("<i>on</i>"), album, _("<i>by</i>"), artist);
diff --git a/src/plugins/tray/tray-provider.c b/src/plugins/tray/tray-provider.c
index 0e86387..880335b 100644
--- a/src/plugins/tray/tray-provider.c
+++ b/src/plugins/tray/tray-provider.c
@@ -330,21 +330,21 @@ delete_event_cb (GtkWidget *widget, GdkEvent *ev, TrayProvider *tray)
     gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG(dialog),
             _("Parole can be minimized to the system tray instead."));
 
-    minimize = gtk_dialog_add_button(   GTK_DIALOG(dialog),
-                                        _("Minimize to tray"),
-                                        GTK_RESPONSE_OK );
+    minimize = gtk_dialog_add_button(GTK_DIALOG(dialog),
+                                     _("Minimize to tray"),
+                                     GTK_RESPONSE_OK);
     img = gtk_image_new_from_icon_name ("go-down", GTK_ICON_SIZE_BUTTON);
     gtk_button_set_image (GTK_BUTTON (minimize), img);
 
-    button = gtk_dialog_add_button( GTK_DIALOG(dialog),
-                                    _("Cancel"),
-                                    GTK_RESPONSE_CANCEL );
+    button = gtk_dialog_add_button(GTK_DIALOG(dialog),
+                                   _("Cancel"),
+                                   GTK_RESPONSE_CANCEL);
     img = gtk_image_new_from_icon_name ("gtk-cancel", GTK_ICON_SIZE_BUTTON);
     gtk_button_set_image(GTK_BUTTON(button), img);
 
-    button = gtk_dialog_add_button(  GTK_DIALOG(dialog),
-                                     _("Quit"),
-                                     GTK_RESPONSE_CLOSE );
+    button = gtk_dialog_add_button(GTK_DIALOG(dialog),
+                                   _("Quit"),
+                                   GTK_RESPONSE_CLOSE);
     img = gtk_image_new_from_icon_name ("gtk-quit", GTK_ICON_SIZE_BUTTON);
     gtk_button_set_image(GTK_BUTTON(button), img);
 
@@ -362,9 +362,9 @@ delete_event_cb (GtkWidget *widget, GdkEvent *ev, TrayProvider *tray)
 
     gtk_widget_set_margin_start (GTK_WIDGET(check), 3);
 
-    gtk_widget_show_all( GTK_WIDGET(dialog) );
+    gtk_widget_show_all(GTK_WIDGET(dialog));
 
-    switch ( gtk_dialog_run (GTK_DIALOG (dialog)) )
+    switch (gtk_dialog_run (GTK_DIALOG (dialog)))
     {
         case GTK_RESPONSE_OK:
             {

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.
