remove this config relic, sticky_str was removes more than year ago.

CVS patchset: 5566
CVS date: 2003/10/21 22:10:34

3 files changed, 4 insertions, 17 deletions

diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c
index 413e158a4..b51854fe0 100644
--- a/src/xine-engine/configfile.c
+++ b/src/xine-engine/configfile.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: configfile.c,v 1.51 2003/10/20 08:36:56 valtri Exp $
+ * $Id: configfile.c,v 1.52 2003/10/21 22:10:34 f1rmb Exp $
  *
  * config object (was: file) management - implementation
  *
@@ -93,7 +93,6 @@ static cfg_entry_t *xine_config_add (config_values_t *this, const char *key) {
   entry->key           = copy_string (key);
   entry->type          = CONFIG_TYPE_UNKNOWN;
   entry->unknown_value = NULL;
-  entry->str_sticky    = NULL;
   entry->str_value     = NULL;
 
   /* extract parts of the new key */
@@ -242,16 +241,7 @@ static char *_xine_config_register_string (config_values_t *this,
     if(!entry->unknown_value)
       entry->unknown_value = copy_string(def_value);
 
-    /*
-     * Check for sticky string
-     */
-    if(entry->str_sticky) {
-      entry->str_value = (char *) xine_xmalloc(strlen(entry->unknown_value) +
-					       strlen(entry->str_sticky) + 1);
-      sprintf(entry->str_value, "%s%s", entry->unknown_value, entry->str_sticky);
-    }
-    else
-      entry->str_value = strdup(entry->unknown_value);
+    entry->str_value = strdup(entry->unknown_value);
 
   } else
     free (entry->str_default);
@@ -544,7 +534,6 @@ static void xine_config_shallow_copy(xine_cfg_entry_t *dest, cfg_entry_t *src)
   dest->unknown_value = src->unknown_value;
   dest->str_value     = src->str_value;
   dest->str_default   = src->str_default;
-  dest->str_sticky    = src->str_sticky;
   dest->num_value     = src->num_value;
   dest->num_default   = src->num_default;
   dest->range_min     = src->range_min;
diff --git a/src/xine-engine/configfile.h b/src/xine-engine/configfile.h
index e92b429be..5521118c3 100644
--- a/src/xine-engine/configfile.h
+++ b/src/xine-engine/configfile.h
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: configfile.h,v 1.27 2003/10/21 16:04:05 mroi Exp $
+ * $Id: configfile.h,v 1.28 2003/10/21 22:10:34 f1rmb Exp $
  *
  * config file management
  *
@@ -64,7 +64,6 @@ struct cfg_entry_s {
   /* type string */
   char            *str_value;
   char            *str_default;
-  char            *str_sticky;
 
   /* common to range, enum, num, bool: */
 
diff --git a/src/xine-engine/xine_interface.c b/src/xine-engine/xine_interface.c
index b46e2b73f..db60e60e7 100644
--- a/src/xine-engine/xine_interface.c
+++ b/src/xine-engine/xine_interface.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xine_interface.c,v 1.59 2003/10/06 19:19:05 valtri Exp $
+ * $Id: xine_interface.c,v 1.60 2003/10/21 22:10:34 f1rmb Exp $
  *
  * convenience/abstraction layer, functions to implement
  * libxine's public interface
@@ -176,7 +176,6 @@ static int xine_config_get_current_entry (xine_t *this,
   entry->type           = config->cur->type;
   entry->str_value      = config->cur->str_value;
   entry->str_default    = config->cur->str_default;
-  entry->str_sticky     = config->cur->str_sticky;
   entry->num_value      = config->cur->num_value;
   entry->num_default    = config->cur->num_default;
   entry->range_min      = config->cur->range_min;