Gentoo Attachment #102997 for bug #156639

View | Details | Raw Unified
Collapse All | Expand All

(-) audacious-1.2.1/audacious/glade/prefswin.glade (+35 lines)

Lines 1767-1772	Link Here

		      </child>

		      </child>

		      <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">

			<widget class="GtkAlignment" id="alignment15">

			  <property name="visible">True</property>

			  <property name="visible">True</property>

			  <property name="xalign">0.5</property>

			  <property name="xalign">0.5</property>

(-) audacious-1.2.1/audacious/main.c (-1 / +2 lines)

Lines 127-133	Link Here

    FALSE,                      /* equalizer shaded */

    FALSE,                      /* equalizer shaded */

    FALSE,                      /* allow multiple instances */

    FALSE,                      /* allow multiple instances */

    TRUE,                       /* always show cb */

    TRUE,                       /* always show cb */

    TRUE, TRUE,                 /* convert '_' and %20 */

    TRUE, TRUE, TRUE,           /* convert '_', %20 and '\' */

    TRUE,                       /* show numbers in playlist */

    TRUE,                       /* show numbers in playlist */

    TRUE,                       /* snap windows */

    TRUE,                       /* snap windows */

    TRUE,                       /* save window positions */

    TRUE,                       /* save window positions */

Lines 259-264	Link Here

    {"always_show_cb", &cfg.always_show_cb, TRUE},

    {"always_show_cb", &cfg.always_show_cb, TRUE},

    {"convert_underscore", &cfg.convert_underscore, TRUE},

    {"convert_underscore", &cfg.convert_underscore, TRUE},

    {"convert_twenty", &cfg.convert_twenty, TRUE},

    {"convert_twenty", &cfg.convert_twenty, TRUE},

    {"convert_slash", &cfg.convert_slash, TRUE },

    {"show_numbers_in_pl", &cfg.show_numbers_in_pl, TRUE},

    {"show_numbers_in_pl", &cfg.show_numbers_in_pl, TRUE},

    {"show_separator_in_pl", &cfg.show_separator_in_pl, TRUE},

    {"show_separator_in_pl", &cfg.show_separator_in_pl, TRUE},

    {"snap_windows", &cfg.snap_windows, TRUE},

    {"snap_windows", &cfg.snap_windows, TRUE},

(-) audacious-1.2.1/audacious/main.h (-1 / +1 lines)

Lines 61-67	Link Here

    gboolean playlist_visible, equalizer_visible, player_visible;

    gboolean playlist_visible, equalizer_visible, player_visible;

    gboolean player_shaded, playlist_shaded, equalizer_shaded;

    gboolean player_shaded, playlist_shaded, equalizer_shaded;

    gboolean allow_multiple_instances, always_show_cb;

    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 show_numbers_in_pl;

    gboolean snap_windows, save_window_position;

    gboolean snap_windows, save_window_position;

    gboolean dim_titlebar;

    gboolean dim_titlebar;

(-) audacious-1.2.1/audacious/playlist.c (+1 lines)

Lines 1355-1360	Link Here

    filename = g_strchug(g_strdup(filename_p));

    filename = g_strchug(g_strdup(filename_p));

    if(cfg.convert_slash)

    while ((tmp = strchr(filename, '\\')) != NULL)

    while ((tmp = strchr(filename, '\\')) != NULL)

        *tmp = '/';

        *tmp = '/';

(-) audacious-1.2.1/audacious/prefswin.c (+14 lines)

Lines 1588-1593	Link Here

    cfg.convert_twenty = gtk_toggle_button_get_active(button);

    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

#if 0

static void

static void

on_playlist_update_clicked(GtkButton * button,

on_playlist_update_clicked(GtkButton * button,

Lines 2136-2141	Link Here

    FUNC_MAP_ENTRY(on_playlist_convert_twenty_toggled)

    FUNC_MAP_ENTRY(on_playlist_convert_twenty_toggled)

    FUNC_MAP_ENTRY(on_playlist_convert_underscore_realize)

    FUNC_MAP_ENTRY(on_playlist_convert_underscore_realize)

    FUNC_MAP_ENTRY(on_playlist_convert_underscore_toggled)

    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_realize)

    FUNC_MAP_ENTRY(on_playlist_font_button_font_set)

    FUNC_MAP_ENTRY(on_playlist_font_button_font_set)

    FUNC_MAP_ENTRY(on_playlist_no_advance_realize)

    FUNC_MAP_ENTRY(on_playlist_no_advance_realize)

(-) audacious-1.2.1/audacious/util.c (+3 lines)

Lines 1328-1333	Link Here

    g_return_val_if_fail(title != NULL, NULL);

    g_return_val_if_fail(title != NULL, NULL);

    if (cfg.convert_slash)

	    str_replace_char(title, '\\', '/');

    if (cfg.convert_underscore)

    if (cfg.convert_underscore)

        str_replace_char(title, '_', ' ');

        str_replace_char(title, '_', ' ');

Attachment #102997: Patch to fix / conversion for bug #156639