From e9196cf3a71a5cdfaaf7e1732579cf7af335372b Mon Sep 17 00:00:00 2001 From: Tristan Matthews <tristan.matthews@savoirfairelinux.com> Date: Fri, 10 Jun 2011 11:36:32 -0400 Subject: [PATCH] * #6098: global variables should have file-scope to avoid name conflicts --- sflphone-client-gnome/src/config/audioconf.c | 33 ++++++++++---------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/sflphone-client-gnome/src/config/audioconf.c b/sflphone-client-gnome/src/config/audioconf.c index 06b97e3d32..98b530d563 100644 --- a/sflphone-client-gnome/src/config/audioconf.c +++ b/sflphone-client-gnome/src/config/audioconf.c @@ -35,23 +35,22 @@ #include <eel-gconf-extensions.h> #include "dbus/dbus.h" -GtkListStore *pluginlist; -GtkListStore *outputlist; -GtkListStore *inputlist; -GtkListStore *ringtonelist; - -GtkWidget *output; -GtkWidget *input; -GtkWidget *ringtone; -GtkWidget *plugin; -GtkWidget *codecMoveUpButton; -GtkWidget *codecMoveDownButton; -GtkWidget *codecTreeView; // View used instead of store to get access to selection -GtkWidget *pulse; -GtkWidget *alsabox; -GtkWidget *alsa_conf; -GtkWidget *noisebox; -GtkWidget *noise_conf; +/* FIXME: these should be in a struct rather than at file scope */ +static GtkListStore *pluginlist; +static GtkListStore *outputlist; +static GtkListStore *inputlist; +static GtkListStore *ringtonelist; + +static GtkWidget *output; +static GtkWidget *input; +static GtkWidget *ringtone; +static GtkWidget *plugin; +static GtkWidget *codecMoveUpButton; +static GtkWidget *codecMoveDownButton; +static GtkWidget *codecTreeView; // View used instead of store to get access to selection +static GtkWidget *pulse; +static GtkWidget *alsabox; +static GtkWidget *alsa_conf; // Codec properties ID enum { -- GitLab