Cleanup action.

diff --git a/modules/gui/familiar/callbacks.c b/modules/gui/familiar/callbacks.c
index 47cc1b9cd677d89047a0d1fc9b4312608a536e79..ae8307b5c0e2fc2018b37de4c667051670a539ab 100644 (file)
--- a/modules/gui/familiar/callbacks.c
+++ b/modules/gui/familiar/callbacks.c
@@ -2,7 +2,7 @@
  * callbacks.c : Callbacks for the Familiar Linux Gtk+ plugin.
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: callbacks.c,v 1.15 2002/12/16 21:48:17 jpsaman Exp $
+ * $Id: callbacks.c,v 1.16 2002/12/16 22:06:59 jpsaman Exp $
  *
  * Authors: Jean-Paul Saman <jpsaman@wxs.nl>
  *
@@ -282,12 +282,13 @@ void
 on_toolbar_rewind_clicked              (GtkButton       *button,
                                         gpointer         user_data)
 {
-    intf_thread_t *  p_intf = GtkGetIntf( GTK_WIDGET(button) );
+    intf_thread_t *  p_intf = GtkGetIntf( button );
 
-    if( p_intf->p_sys->p_input )
+    if( p_intf->p_sys->p_input != NULL )
     {
         input_SetStatus( p_intf->p_sys->p_input, INPUT_STATUS_SLOWER );
     }
+    else msg_Err(p_intf, "p_intf->p_sys->p_input is NULL" );
 }
 
 
@@ -295,12 +296,13 @@ void
 on_toolbar_pause_clicked               (GtkButton       *button,
                                         gpointer         user_data)
 {
-    intf_thread_t *  p_intf = GtkGetIntf( GTK_WIDGET( button ) );
+    intf_thread_t *  p_intf = GtkGetIntf( button );
 
-    if( p_intf->p_sys->p_input )
+    if( p_intf->p_sys->p_input != NULL )
     {
         input_SetStatus( p_intf->p_sys->p_input, INPUT_STATUS_PAUSE );
     }
+    else msg_Err(p_intf, "p_intf->p_sys->p_input is NULL" );
 }
 
 
@@ -356,12 +358,13 @@ void
 on_toolbar_forward_clicked             (GtkButton       *button,
                                         gpointer         user_data)
 {
-    intf_thread_t *  p_intf = GtkGetIntf( GTK_WIDGET( button ));
+    intf_thread_t *  p_intf = GtkGetIntf( button );
 
-    if( p_intf->p_sys->p_input )
+    if( p_intf->p_sys->p_input != NULL )
     {
         input_SetStatus( p_intf->p_sys->p_input, INPUT_STATUS_FASTER );
     }
+    else msg_Err(p_intf, "p_intf->p_sys->p_input is NULL" );
 }
 
 

diff --git a/modules/gui/familiar/familiar.h b/modules/gui/familiar/familiar.h
index 25917a92ec81e2774c509eeaa14b6f802abdbfd4..168d6733a0b2588f41fc21cab74c7398d478f383 100644 (file)
--- a/modules/gui/familiar/familiar.h
+++ b/modules/gui/familiar/familiar.h
@@ -2,7 +2,7 @@
  * familiar.h: private Gtk+ interface description
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: familiar.h,v 1.8 2002/12/15 22:45:35 jpsaman Exp $
+ * $Id: familiar.h,v 1.9 2002/12/16 22:06:59 jpsaman Exp $
  *
  * Authors: Jean-Paul Saman <jpsaman@wxs.nl>
  *
@@ -41,7 +41,6 @@ struct intf_sys_t
     GtkCList    *       p_clist;
 
     vlc_bool_t          b_autoplayfile;
-    vlc_bool_t                 b_filelist_update;
     /* The input thread */
     input_thread_t *    p_input;
 };