Mercurial > audlegacy

changeset 1109:95365899992e trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn] - audacious should pick runtime library up from ${libdir}. - fix for chardet combobox bug. now combox will be drawn appropriately even if config file doesn't have chardet_detector.
author yaz
date Sun, 28 May 2006 08:27:54 -0700
parents 9b612dc7079b
children c4063c84b797
files audacious/Makefile.in audacious/prefswin.c
diffstat 2 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/audacious/Makefile.in	Sat May 27 13:26:29 2006 -0700
+++ b/audacious/Makefile.in	Sun May 28 08:27:54 2006 -0700
@@ -101,5 +101,5 @@
 	fi;
 
 audacious: $(OBJECTS)
-	$(CC) $(LDFLAGS) $(OBJECTS) $(LDADD) -o $@
+	$(CC) $(LDFLAGS) $(OBJECTS) $(LDADD) -o $@ -Wl,-rpath,${libdir}
 	@printf "%10s     %-20s\n" LINK $@
--- a/audacious/prefswin.c	Sat May 27 13:26:29 2006 -0700
+++ b/audacious/prefswin.c	Sun May 28 08:27:54 2006 -0700
@@ -1882,16 +1882,21 @@
     gchar *ret=NULL;
     guint i=0,index=0;
 
+    for(i=0; i<n_chardet_detector_presets; i++) {
+        gtk_combo_box_append_text(combobox, chardet_detector_presets[i]);
+    }
+
     db = bmp_cfg_db_open();
     if(bmp_cfg_db_get_string(db, NULL, "chardet_detector", &ret) != FALSE) {
         for(i=0; i<n_chardet_detector_presets; i++) {
-            gtk_combo_box_append_text(combobox, chardet_detector_presets[i]);
             if(!strcmp(chardet_detector_presets[i], ret)) {
                 cfg.chardet_detector = (char *)chardet_detector_presets[i];
                 index = i;
             }
         }
     }
+    bmp_cfg_db_close(db);
+
 #ifdef USE_CHARDET
     gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), index);
     gtk_widget_set_sensitive(GTK_WIDGET(data), 1);