* fixed ./plugins/gtk/gtk_callbacks.c to use the "dvd_device" config option

  instead of the now inexistant DVD_DEVICE macro.

diff --git a/ChangeLog b/ChangeLog
index 28cbe1c0e242f7307431bfb9d4eef9351ca58bf6..c04fa90d5cd3e254a6ca6e3174c4de1c54bd9635 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
 
 HEAD
 
+  * fixed ./plugins/gtk/gtk_callbacks.c to use the dvd_device config option.
   * ./po/ja.po: added Japanese translation from Fumio Nakayama
     <endymion@ca2.so-net.ne.jp>.
   * ./plugins/gtk/gtk_callbacks.c: fixed disc ejection code.

diff --git a/plugins/gtk/gtk_callbacks.c b/plugins/gtk/gtk_callbacks.c
index 4a9fd5c18e9d64180af62f9e295ebde02183960b..7509811a203143d517399970bfb6622db526e7b3 100644 (file)
--- a/plugins/gtk/gtk_callbacks.c
+++ b/plugins/gtk/gtk_callbacks.c
@@ -2,7 +2,7 @@
  * gtk_callbacks.c : Callbacks for the Gtk+ plugin.
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: gtk_callbacks.c,v 1.35 2002/04/03 02:43:14 sam Exp $
+ * $Id: gtk_callbacks.c,v 1.36 2002/04/03 06:19:43 gbazin Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Stéphane Borel <stef@via.ecp.fr>
@@ -500,7 +500,7 @@ gboolean GtkDiscEject ( GtkWidget *widget, GdkEventButton *event,
             {
             case '\0':
             case '@':
-                psz_device = strdup( DVD_DEVICE );
+                psz_device = config_GetPszVariable( "dvd_device" );
                 break;
             default:
                 /* Omit the first 4 characters */
@@ -514,7 +514,7 @@ gboolean GtkDiscEject ( GtkWidget *widget, GdkEventButton *event,
             {
             case '\0':
             case '@':
-                psz_device = strdup( VCD_DEVICE );
+                psz_device = config_GetPszVariable( "vcd_device" );
                 break;
             default:
                 /* Omit the first 4 characters */