Stopping vlc from the Familiar interface is possible again.

diff --git a/modules/gui/familiar/callbacks.c b/modules/gui/familiar/callbacks.c
index e44165a4e2c3c36e590dc5aaf267923b94292a89..1231eff5c04827640d23e603045e575e483d20d5 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.6 2002/08/18 20:36:04 jpsaman Exp $
+ * $Id: callbacks.c,v 1.7 2002/08/21 19:30:03 jpsaman Exp $
  *
  * Authors: Jean-Paul Saman <jpsaman@wxs.nl>
  *
@@ -237,16 +237,6 @@ gboolean GtkExit( GtkWidget       *widget,
     return TRUE;
 }
 
-gboolean
-on_familiar_destroy_event              (GtkWidget       *widget,
-                                        GdkEvent        *event,
-                                        gpointer         user_data)
-{
-    GtkExit( GTK_WIDGET( widget ), user_data );
-    return TRUE;
-}
-
-
 void
 on_toolbar_open_clicked                (GtkButton       *button,
                                         gpointer         user_data)
@@ -480,3 +470,13 @@ on_cbautoplay_toggled                  (GtkToggleButton *togglebutton,
     }
 }
 
+
+gboolean
+on_familiar_delete_event               (GtkWidget       *widget,
+                                        GdkEvent        *event,
+                                        gpointer         user_data)
+{
+    GtkExit( GTK_WIDGET( widget ), user_data );
+    return TRUE;
+}
+

diff --git a/modules/gui/familiar/callbacks.h b/modules/gui/familiar/callbacks.h
index 8ee900b0463cf8b378eeddd40abe38560d6842d7..a659e6498256706e68bb50319ac53524002fd676 100644 (file)
--- a/modules/gui/familiar/callbacks.h
+++ b/modules/gui/familiar/callbacks.h
@@ -2,7 +2,7 @@
  * callbacks.h : familiar plugin for vlc
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: callbacks.h,v 1.5 2002/08/18 20:36:04 jpsaman Exp $
+ * $Id: callbacks.h,v 1.6 2002/08/21 19:30:03 jpsaman Exp $
  *
  * Authors: Jean-Paul Saman <jpsaman@wxs.nl>
  *
@@ -27,11 +27,6 @@ gboolean GtkExit                ( GtkWidget *, gpointer );
 
 void ReadDirectory(GtkCList *clist, char *psz_dir);
 
-gboolean
-on_familiar_destroy_event              (GtkWidget       *widget,
-                                        GdkEvent        *event,
-                                        gpointer         user_data);
-
 void
 on_toolbar_open_clicked                (GtkButton       *button,
                                         gpointer         user_data);
@@ -85,3 +80,8 @@ void
 on_cbautoplay_toggled                  (GtkToggleButton *togglebutton,
                                         gpointer         user_data);
 
+
+gboolean
+on_familiar_delete_event               (GtkWidget       *widget,
+                                        GdkEvent        *event,
+                                        gpointer         user_data);

diff --git a/modules/gui/familiar/familiar.c b/modules/gui/familiar/familiar.c
index 9b395a6e020d8774b2baee469c1f82483d379289..3b1e2b1143347ccadb082efb385ab30d7174bfcf 100644 (file)
--- a/modules/gui/familiar/familiar.c
+++ b/modules/gui/familiar/familiar.c
@@ -2,7 +2,7 @@
  * familiar.c : familiar plugin for vlc
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: familiar.c,v 1.6 2002/08/20 18:08:51 sam Exp $
+ * $Id: familiar.c,v 1.7 2002/08/21 19:30:03 jpsaman Exp $
  *
  * Authors: Jean-Paul Saman <jpsaman@wxs.nl>
  *
@@ -158,5 +158,6 @@ static void Run( intf_thread_t *p_intf )
     gtk_object_destroy( GTK_OBJECT(p_intf->p_sys->p_window) );
 
     gdk_threads_leave();
+    gtk_main_quit();
 }
 

diff --git a/modules/gui/familiar/familiar.glade b/modules/gui/familiar/familiar.glade
index d8a593484ef58e6ae0e1d901ac63bb3433a0cc4f..75b9658186e82f7f6d7841f20e09870309743bed 100644 (file)
--- a/modules/gui/familiar/familiar.glade
+++ b/modules/gui/familiar/familiar.glade
@@ -21,14 +21,9 @@
   <width>240</width>
   <height>320</height>
   <signal>
-    <name>destroy_event</name>
-    <handler>on_familiar_destroy_event</handler>
-    <last_modification_time>Tue, 23 Jul 2002 18:16:11 GMT</last_modification_time>
-  </signal>
-  <signal>
-    <name>destroy</name>
-    <handler>gtk_main_quit</handler>
-    <last_modification_time>Tue, 23 Jul 2002 18:17:28 GMT</last_modification_time>
+    <name>delete_event</name>
+    <handler>on_familiar_delete_event</handler>
+    <last_modification_time>Wed, 21 Aug 2002 19:12:40 GMT</last_modification_time>
   </signal>
   <title>vlc (familiar)</title>
   <type>GTK_WINDOW_TOPLEVEL</type>

diff --git a/modules/gui/familiar/interface.c b/modules/gui/familiar/interface.c
index 836deec30ae46e41ddcf6e864e125390e9682b27..8cc08840101b84abd0b4447a74db491094b65dae 100644 (file)
--- a/modules/gui/familiar/interface.c
+++ b/modules/gui/familiar/interface.c
@@ -453,11 +453,8 @@ create_familiar (void)
   gtk_widget_show (about);
   gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 2), about);
 
-  gtk_signal_connect (GTK_OBJECT (familiar), "destroy_event",
-                      GTK_SIGNAL_FUNC (on_familiar_destroy_event),
-                      NULL);
-  gtk_signal_connect (GTK_OBJECT (familiar), "destroy",
-                      GTK_SIGNAL_FUNC (gtk_main_quit),
+  gtk_signal_connect (GTK_OBJECT (familiar), "delete_event",
+                      GTK_SIGNAL_FUNC (on_familiar_delete_event),
                       NULL);
   gtk_signal_connect (GTK_OBJECT (toolbar_open), "clicked",
                       GTK_SIGNAL_FUNC (on_toolbar_open_clicked),