[patch] Patch to fix / conversion

audacious-1.2.1-fixslashes.patch (text/plain), 5.84 KB, created by Chris Kehler on 2006-11-29 11:09:43 UTC

diff -Naurb audacious-1.2.1/audacious/glade/prefswin.glade audacious-working/audacious/glade/prefswin.glade
--- audacious-1.2.1/audacious/glade/prefswin.glade	2006-10-22 14:38:20.000000000 -0400
+++ audacious-working/audacious/glade/prefswin.glade	2006-11-29 12:51:30.000000000 -0500
@@ -1767,6 +1767,41 @@
 		      </child>
 
 		      <child>
+			<widget class="GtkAlignment" id="alignment88">
+			  <property name="visible">True</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xscale">1</property>
+			  <property name="yscale">1</property>
+			  <property name="top_padding">0</property>
+			  <property name="bottom_padding">0</property>
+			  <property name="left_padding">12</property>
+			  <property name="right_padding">0</property>
+
+			  <child>
+			    <widget class="GtkCheckButton" id="playlist_convert_slash">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">Convert forward slash '\' to backslash '/'</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">False</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			      <signal name="realize" handler="on_playlist_convert_slash_realize" after="yes" last_modification_time="Sat, 03 Jul 2004 04:40:06 GMT"/>
+			      <signal name="toggled" handler="on_playlist_convert_slash_toggled" last_modification_time="Sat, 03 Jul 2004 04:40:16 GMT"/>
+			    </widget>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+
+		      <child>
 			<widget class="GtkAlignment" id="alignment15">
 			  <property name="visible">True</property>
 			  <property name="xalign">0.5</property>
diff -Naurb audacious-1.2.1/audacious/main.c audacious-working/audacious/main.c
--- audacious-1.2.1/audacious/main.c	2006-10-22 14:38:20.000000000 -0400
+++ audacious-working/audacious/main.c	2006-11-29 12:28:25.000000000 -0500
@@ -127,7 +127,7 @@
     FALSE,                      /* equalizer shaded */
     FALSE,                      /* allow multiple instances */
     TRUE,                       /* always show cb */
-    TRUE, TRUE,                 /* convert '_' and %20 */
+    TRUE, TRUE, TRUE,           /* convert '_', %20 and '\' */
     TRUE,                       /* show numbers in playlist */
     TRUE,                       /* snap windows */
     TRUE,                       /* save window positions */
@@ -259,6 +259,7 @@
     {"always_show_cb", &cfg.always_show_cb, TRUE},
     {"convert_underscore", &cfg.convert_underscore, TRUE},
     {"convert_twenty", &cfg.convert_twenty, TRUE},
+    {"convert_slash", &cfg.convert_slash, TRUE },
     {"show_numbers_in_pl", &cfg.show_numbers_in_pl, TRUE},
     {"show_separator_in_pl", &cfg.show_separator_in_pl, TRUE},
     {"snap_windows", &cfg.snap_windows, TRUE},
diff -Naurb audacious-1.2.1/audacious/main.h audacious-working/audacious/main.h
--- audacious-1.2.1/audacious/main.h	2006-10-22 14:38:20.000000000 -0400
+++ audacious-working/audacious/main.h	2006-11-29 12:27:05.000000000 -0500
@@ -61,7 +61,7 @@
     gboolean playlist_visible, equalizer_visible, player_visible;
     gboolean player_shaded, playlist_shaded, equalizer_shaded;
     gboolean allow_multiple_instances, always_show_cb;
-    gboolean convert_underscore, convert_twenty;
+    gboolean convert_underscore, convert_twenty, convert_slash;
     gboolean show_numbers_in_pl;
     gboolean snap_windows, save_window_position;
     gboolean dim_titlebar;
diff -Naurb audacious-1.2.1/audacious/playlist.c audacious-working/audacious/playlist.c
--- audacious-1.2.1/audacious/playlist.c	2006-10-13 00:12:58.000000000 -0400
+++ audacious-working/audacious/playlist.c	2006-11-29 13:26:45.000000000 -0500
@@ -1355,6 +1355,7 @@
 
     filename = g_strchug(g_strdup(filename_p));
 
+    if(cfg.convert_slash)
     while ((tmp = strchr(filename, '\\')) != NULL)
         *tmp = '/';
 
diff -Naurb audacious-1.2.1/audacious/prefswin.c audacious-working/audacious/prefswin.c
--- audacious-1.2.1/audacious/prefswin.c	2006-10-22 14:38:20.000000000 -0400
+++ audacious-working/audacious/prefswin.c	2006-11-29 12:31:54.000000000 -0500
@@ -1588,6 +1588,18 @@
     cfg.convert_twenty = gtk_toggle_button_get_active(button);
 }
 
+static void
+on_playlist_convert_slash_realize(GtkToggleButton * button, gpointer data)
+{
+    gtk_toggle_button_set_active(button, cfg.convert_slash);
+}
+
+static void
+on_playlist_convert_slash_toggled(GtkToggleButton * button, gpointer data)
+{
+    cfg.convert_slash = gtk_toggle_button_get_active(button);
+}
+
 #if 0
 static void
 on_playlist_update_clicked(GtkButton * button,
@@ -2136,6 +2148,8 @@
     FUNC_MAP_ENTRY(on_playlist_convert_twenty_toggled)
     FUNC_MAP_ENTRY(on_playlist_convert_underscore_realize)
     FUNC_MAP_ENTRY(on_playlist_convert_underscore_toggled)
+    FUNC_MAP_ENTRY(on_playlist_convert_slash_realize)
+    FUNC_MAP_ENTRY(on_playlist_convert_slash_toggled)
     FUNC_MAP_ENTRY(on_playlist_font_button_realize)
     FUNC_MAP_ENTRY(on_playlist_font_button_font_set)
     FUNC_MAP_ENTRY(on_playlist_no_advance_realize)
diff -Naurb audacious-1.2.1/audacious/util.c audacious-working/audacious/util.c
--- audacious-1.2.1/audacious/util.c	2006-10-22 15:12:43.000000000 -0400
+++ audacious-working/audacious/util.c	2006-11-29 13:03:18.000000000 -0500
@@ -1328,6 +1328,9 @@
 {
     g_return_val_if_fail(title != NULL, NULL);
 
+    if (cfg.convert_slash)
+	    str_replace_char(title, '\\', '/');
+    
     if (cfg.convert_underscore)
         str_replace_char(title, '_', ' ');