From 95cd590543f00df99e56e591148de4daf3dd99a7 Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Thu, 9 Jun 2011 16:02:46 -0400
Subject: [PATCH] * #6085: renamed codecs* widgets/functions audiocodecs*

---
 .../src/config/accountconfigdialog.c          | 28 +++++++++----------
 sflphone-client-gnome/src/config/audioconf.c  |  2 +-
 sflphone-client-gnome/src/config/audioconf.h  |  4 +--
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/sflphone-client-gnome/src/config/accountconfigdialog.c b/sflphone-client-gnome/src/config/accountconfigdialog.c
index adde0dd18a..5c4e9acc20 100644
--- a/sflphone-client-gnome/src/config/accountconfigdialog.c
+++ b/sflphone-client-gnome/src/config/accountconfigdialog.c
@@ -1211,11 +1211,11 @@ void ringtone_enabled (GtkWidget *widget UNUSED, gpointer fileChooser, const gch
 }
 
 
-GtkWidget* create_codecs_configuration (account_t **a)
+GtkWidget* create_audiocodecs_configuration (account_t **a)
 {
 
     // Main widget
-    GtkWidget *ret, *codecs, *dtmf, *box, *frame, *sipinfo, *table;
+    GtkWidget *ret, *audiocodecs, *dtmf, *box, *frame, *sipinfo, *table;
     account_t *currentAccount = *a;
     gchar *currentDtmfType = "";
     gboolean dtmf_are_rtp = TRUE;
@@ -1224,14 +1224,14 @@ GtkWidget* create_codecs_configuration (account_t **a)
     ret = gtk_vbox_new (FALSE, 10);
     gtk_container_set_border_width (GTK_CONTAINER (ret), 10);
 
-    box = codecs_box (a);
+    box = audiocodecs_box (a);
 
-    // Box for the codecs
-    gnome_main_section_new (_ ("Audio"), &codecs);
-    gtk_box_pack_start (GTK_BOX (ret), codecs, FALSE, FALSE, 0);
-    gtk_widget_set_size_request (GTK_WIDGET (codecs), -1, 200);
-    gtk_widget_show (codecs);
-    gtk_container_add (GTK_CONTAINER (codecs) , box);
+    // Box for the audiocodecs
+    gnome_main_section_new (_ ("Audio"), &audiocodecs);
+    gtk_box_pack_start (GTK_BOX (ret), audiocodecs, FALSE, FALSE, 0);
+    gtk_widget_set_size_request (GTK_WIDGET (audiocodecs), -1, 200);
+    gtk_widget_show (audiocodecs);
+    gtk_container_add (GTK_CONTAINER (audiocodecs) , box);
 
     // Add DTMF type selection for SIP account only
     p = g_hash_table_lookup (currentAccount->properties, g_strdup (ACCOUNT_TYPE));
@@ -1300,7 +1300,7 @@ void show_account_window (account_t * a)
 {
 
     GtkWidget * notebook;
-    GtkWidget *tab, *codecs_tab, *ip_tab;
+    GtkWidget *tab, *audiocodecs_tab, *ip_tab;
     gint response;
     account_t *currentAccount;
 
@@ -1352,10 +1352,10 @@ void show_account_window (account_t * a)
 
     }
 
-    /* Codecs */
-    codecs_tab = create_codecs_configuration (&currentAccount);
-    gtk_notebook_append_page (GTK_NOTEBOOK (notebook), codecs_tab, gtk_label_new (_ ("Audio")));
-    gtk_notebook_page_num (GTK_NOTEBOOK (notebook), codecs_tab);
+    /* Audio Codecs */
+    audiocodecs_tab = create_audiocodecs_configuration (&currentAccount);
+    gtk_notebook_append_page (GTK_NOTEBOOK (notebook), audiocodecs_tab, gtk_label_new (_ ("Audio")));
+    gtk_notebook_page_num (GTK_NOTEBOOK (notebook), audiocodecs_tab);
 
     // Get current protocol for this account protocol
     gchar *currentProtocol = "SIP";
diff --git a/sflphone-client-gnome/src/config/audioconf.c b/sflphone-client-gnome/src/config/audioconf.c
index 069e0c4285..06b97e3d32 100644
--- a/sflphone-client-gnome/src/config/audioconf.c
+++ b/sflphone-client-gnome/src/config/audioconf.c
@@ -641,7 +641,7 @@ static void codec_move_down (GtkButton *button UNUSED, gpointer data)
     codec_move (FALSE, data);
 }
 
-GtkWidget* codecs_box (account_t **a)
+GtkWidget* audiocodecs_box (account_t **a)
 {
     GtkWidget *ret;
     GtkWidget *scrolledWindow;
diff --git a/sflphone-client-gnome/src/config/audioconf.h b/sflphone-client-gnome/src/config/audioconf.h
index 7df80871c7..373e5e45c4 100644
--- a/sflphone-client-gnome/src/config/audioconf.h
+++ b/sflphone-client-gnome/src/config/audioconf.h
@@ -34,12 +34,12 @@
 #include "actions.h"
 
 GtkWidget* create_audio_configuration (void);
-GtkWidget* create_codecs_configuration (account_t **a);
+GtkWidget* create_audiocodecs_configuration (account_t **a);
 
 GtkWidget* api_box();
 GtkWidget* alsa_box();
 GtkWidget* pulse_box();
-GtkWidget* codecs_box();
+GtkWidget* audiocodecs_box();
 GtkWidget* ringtone_box();
 
 gboolean get_api();
-- 
GitLab