[Xfce4-commits] [panel-plugins/xfce4-pulseaudio-plugin] 01/01: First fix for BSD builds

[noreply at xfce.org]

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

b   l   u   e   s   a   b   r   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository panel-plugins/xfce4-pulseaudio-plugin.

commit bec1b177b237e8dd324398dd1a6a433f5af58614
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Thu Nov 23 08:17:51 2017 -0500

    First fix for BSD builds
---
 panel-plugin/pulseaudio-config.c |  6 ++++--
 panel-plugin/pulseaudio-menu.c   | 10 ++++++----
 panel-plugin/pulseaudio-mpris.c  |  3 ++-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/panel-plugin/pulseaudio-config.c b/panel-plugin/pulseaudio-config.c
index 2cc23e9..a337193 100644
--- a/panel-plugin/pulseaudio-config.c
+++ b/panel-plugin/pulseaudio-config.c
@@ -492,18 +492,20 @@ pulseaudio_config_set_mpris_players (PulseaudioConfig  *config,
   gchar  *player_string;
   GValue  src = { 0, };
   guint   index = 0;
+  guint   i = 0;
+  GSList *list = NULL;
 
   g_return_if_fail (IS_PULSEAUDIO_CONFIG (config));
 
   player_array = NULL;
-  for (guint i = 0; i < g_strv_length (players); i++)
+  for (i = 0; i < g_strv_length (players); i++)
     {
       player_array = g_slist_prepend (player_array, players[i]);
     }
 
   player_array = g_slist_sort (player_array, (GCompareFunc) compare_players);
 
-  for (GSList *list = player_array; list != NULL; list = g_slist_next (list))
+  for (list = player_array; list != NULL; list = g_slist_next (list))
     {
       players[index] = list->data;
       index++;
diff --git a/panel-plugin/pulseaudio-menu.c b/panel-plugin/pulseaudio-menu.c
index 2a03246..8fb73b5 100644
--- a/panel-plugin/pulseaudio-menu.c
+++ b/panel-plugin/pulseaudio-menu.c
@@ -412,9 +412,11 @@ pulseaudio_menu_new (PulseaudioVolume *volume,
   gdouble         volume_max;
 
   GList          *sources = NULL;
+  GList          *list = NULL;
+  guint           i = 0;
 
 #ifdef HAVE_MPRIS2
-  gchar         **players;
+      gchar **players;
   gchar          *title = NULL;
   gchar          *artist = NULL;
   gboolean        is_running;
@@ -471,7 +473,7 @@ pulseaudio_menu_new (PulseaudioVolume *volume,
       if (g_list_length (sources) > 1)
         {
           device_mi = device_menu_item_new_with_label(_("Output"));
-          for (GList *list = sources; list != NULL; list = g_list_next(list))
+          for (list = sources; list != NULL; list = g_list_next(list))
             {
               device_menu_item_add_device(DEVICE_MENU_ITEM(device_mi), (gchar *)list->data, pulseaudio_volume_get_output_by_name(menu->volume, list->data));
             }
@@ -510,7 +512,7 @@ pulseaudio_menu_new (PulseaudioVolume *volume,
       if (g_list_length(sources) > 1)
         {
           device_mi = device_menu_item_new_with_label(_("Input"));
-          for (GList *list = sources; list != NULL; list = g_list_next(list))
+          for (list = sources; list != NULL; list = g_list_next(list))
             {
               device_menu_item_add_device(DEVICE_MENU_ITEM(device_mi), (gchar *)list->data, pulseaudio_volume_get_input_by_name(menu->volume, list->data));
             }
@@ -536,7 +538,7 @@ pulseaudio_menu_new (PulseaudioVolume *volume,
       players = pulseaudio_config_get_mpris_players (menu->config);
       if (players != NULL)
         {
-          for (guint i = 0; i < g_strv_length (players); i++)
+          for (i = 0; i < g_strv_length (players); i++)
             {
               mi = mpris_menu_item_new_from_player_name (players[i]);
               if (mi != NULL)
diff --git a/panel-plugin/pulseaudio-mpris.c b/panel-plugin/pulseaudio-mpris.c
index 269f286..83b6578 100644
--- a/panel-plugin/pulseaudio-mpris.c
+++ b/panel-plugin/pulseaudio-mpris.c
@@ -174,12 +174,13 @@ pulseaudio_mpris_tick_cb (gpointer user_data)
   PulseaudioMpris        *mpris = user_data;
   PulseaudioMprisPlayer  *player;
   gchar                 **players;
+  guint                   i = 0;
 
   players = pulseaudio_mpris_get_available_players (mpris);
   if (players == NULL)
     return TRUE;
 
-  for (guint i = 0; i < g_strv_length (players); i++)
+  for (i = 0; i < g_strv_length (players); i++)
     {
       if (!g_hash_table_contains (mpris->players, players[i]))
         {

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