(new in MAIN)

  * ./plugins/gtk/gtk_callbacks.c: fixed a segfault when switching to
    fullscreen from the popup menu.
(from v0_4_1_branch)
  * ./plugins/gtk/gnome_callbacks.c: fixed a crash when activating preferences
    from the popup menu.
  * ./plugins/gtk/gnome.glade: added lines this #@%$! Glade had munched, fixes
    a segfault in the Gnome popup menu when toggling the interface.

diff --git a/ChangeLog b/ChangeLog
index f40b08394d37c4c12b98e29cf767b29cdc7371ea..d8d519bb179a9428e53a93aa9f7446589d9ca87f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,8 +2,11 @@
 # ChangeLog for vlc #
 #===================#
 
-HEAD
+0.5.0
+Not released yet
 
+  * ./plugins/gtk/gtk_callbacks.c: fixed a segfault when switching to
+    fullscreen from the popup menu.
   * ./src/interface/interface.c: interfaces are no longer attached only to
     p_vlc.
   * ./src/libvlc.c, ./src/misc/modules.c, ./src/playlist/playlist.c,
@@ -39,9 +42,17 @@ HEAD
     belongs to plugins/mpeg_vdec.
   * ALL: the first libvlc commit.
 
+0.4.2
+Not released yet
+
+  * ./plugins/gtk/gnome_callbacks.c: fixed a crash when activating preferences 
+    from the popup menu.
+
 0.4.1
 Mon,  3 Jun 2002 23:43:35 +0200
 
+  * ./plugins/gtk/gnome.glade: added lines this #@%$! Glade had munched, fixes
+    a segfault in the Gnome popup menu when toggling the interface.
   * ./configure.in, ./plugins/mpeg_system/mpeg_ts.c: fixed libdvbpsi handling.
   * ./src/misc/configuration.c: fixed the --nofoo option handling.
   * ./src/interface/main.c: fixed two compilation warnings under Solaris.

diff --git a/plugins/gtk/gnome.glade b/plugins/gtk/gnome.glade
index d4ebd212ec33ef44917070285ad4b5ac880dc316..a3d4a040a86d3649d40b8c8f625c8ff4257467a6 100644 (file)
--- a/plugins/gtk/gnome.glade
+++ b/plugins/gtk/gnome.glade
@@ -1022,6 +1022,7 @@
     <signal>
       <name>activate</name>
       <handler>GnomePopupPlayActivate</handler>
+      <data>&quot;intf_popup&quot;</data>
       <last_modification_time>Sat, 19 May 2001 16:16:58 GMT</last_modification_time>
     </signal>
     <label>Play</label>
@@ -1035,6 +1036,7 @@
     <signal>
       <name>activate</name>
       <handler>GnomePopupPauseActivate</handler>
+      <data>&quot;intf_popup&quot;</data>
       <last_modification_time>Sat, 19 May 2001 16:17:31 GMT</last_modification_time>
     </signal>
     <label>Pause</label>
@@ -1048,6 +1050,7 @@
     <signal>
       <name>activate</name>
       <handler>GnomePopupStopActivate</handler>
+      <data>&quot;intf_popup&quot;</data>
       <last_modification_time>Sat, 19 May 2001 16:18:10 GMT</last_modification_time>
     </signal>
     <label>Stop</label>
@@ -1062,6 +1065,7 @@
     <signal>
       <name>activate</name>
       <handler>GnomePopupBackActivate</handler>
+      <data>&quot;intf_popup&quot;</data>
       <last_modification_time>Sat, 19 May 2001 16:18:21 GMT</last_modification_time>
     </signal>
     <label>Back</label>
@@ -1075,6 +1079,7 @@
     <signal>
       <name>activate</name>
       <handler>GnomePopupSlowActivate</handler>
+      <data>&quot;intf_popup&quot;</data>
       <last_modification_time>Sat, 19 May 2001 16:18:29 GMT</last_modification_time>
     </signal>
     <label>Slow</label>
@@ -1088,6 +1093,7 @@
     <signal>
       <name>activate</name>
       <handler>GnomePopupFastActivate</handler>
+      <data>&quot;intf_popup&quot;</data>
       <last_modification_time>Sat, 19 May 2001 16:18:37 GMT</last_modification_time>
     </signal>
     <label>Fast</label>
@@ -1107,6 +1113,7 @@
     <signal>
       <name>activate</name>
       <handler>GnomePopupWindowToggleActivate</handler>
+      <data>&quot;intf_popup&quot;</data>
       <last_modification_time>Sat, 19 May 2001 16:18:51 GMT</last_modification_time>
     </signal>
     <label>Toggle _Interface</label>
@@ -1120,6 +1127,7 @@
     <signal>
       <name>activate</name>
       <handler>GnomePopupFullscreenActivate</handler>
+      <data>&quot;intf_popup&quot;</data>
       <last_modification_time>Sat, 19 May 2001 16:19:07 GMT</last_modification_time>
     </signal>
     <label>_Fullscreen</label>
@@ -1138,6 +1146,7 @@
     <signal>
       <name>activate</name>
       <handler>GnomePopupNextActivate</handler>
+      <data>&quot;intf_popup&quot;</data>
       <last_modification_time>Sat, 19 May 2001 16:19:18 GMT</last_modification_time>
     </signal>
     <label>Next</label>
@@ -1150,6 +1159,7 @@
     <signal>
       <name>activate</name>
       <handler>GnomePopupPrevActivate</handler>
+      <data>&quot;intf_popup&quot;</data>
       <last_modification_time>Sat, 19 May 2001 16:19:26 GMT</last_modification_time>
     </signal>
     <label>Prev</label>
@@ -1163,6 +1173,7 @@
     <signal>
       <name>activate</name>
       <handler>GnomePopupJumpActivate</handler>
+      <data>&quot;intf_popup&quot;</data>
       <last_modification_time>Sat, 19 May 2001 16:34:46 GMT</last_modification_time>
     </signal>
     <label>_Jump...</label>
@@ -1231,6 +1242,7 @@
        <signal>
          <name>activate</name>
          <handler>GnomePopupFileOpenActivate</handler>
+         <data>&quot;intf_popup&quot;</data>
          <last_modification_time>Sat, 19 May 2001 16:20:08 GMT</last_modification_time>
        </signal>
        <label>_Open File...</label>
@@ -1245,6 +1257,7 @@
        <signal>
          <name>activate</name>
          <handler>GnomePopupDiscOpenActivate</handler>
+         <data>&quot;intf_popup&quot;</data>
          <last_modification_time>Sat, 19 May 2001 16:20:44 GMT</last_modification_time>
        </signal>
        <label>Open _Disc...</label>
@@ -1259,6 +1272,7 @@
        <signal>
          <name>activate</name>
          <handler>GnomePopupNetworkOpenActivate</handler>
+         <data>&quot;intf_popup&quot;</data>
          <last_modification_time>Sat, 19 May 2001 16:20:54 GMT</last_modification_time>
        </signal>
        <label>_Network Stream...</label>
@@ -1278,6 +1292,7 @@
        <signal>
          <name>activate</name>
          <handler>GnomePopupAboutActivate</handler>
+         <data>&quot;intf_popup&quot;</data>
          <last_modification_time>Sat, 19 May 2001 16:21:02 GMT</last_modification_time>
        </signal>
        <stock_item>GNOMEUIINFO_MENU_ABOUT_ITEM</stock_item>
@@ -1291,6 +1306,7 @@
     <signal>
       <name>activate</name>
       <handler>GnomePopupPlaylistActivate</handler>
+      <data>&quot;intf_popup&quot;</data>
       <last_modification_time>Sat, 19 May 2001 16:21:14 GMT</last_modification_time>
     </signal>
     <label>Playlist...</label>
@@ -1303,6 +1319,7 @@
     <signal>
       <name>activate</name>
       <handler>GnomePopupPreferencesActivate</handler>
+      <data>&quot;intf_popup&quot;</data>
       <last_modification_time>Sat, 19 May 2001 16:21:25 GMT</last_modification_time>
     </signal>
     <stock_item>GNOMEUIINFO_MENU_PREFERENCES_ITEM</stock_item>
@@ -1320,6 +1337,7 @@
     <signal>
       <name>activate</name>
       <handler>GnomePopupExitActivate</handler>
+      <data>&quot;intf_popup&quot;</data>
       <last_modification_time>Sat, 19 May 2001 16:21:45 GMT</last_modification_time>
     </signal>
     <stock_item>GNOMEUIINFO_MENU_EXIT_ITEM</stock_item>

diff --git a/plugins/gtk/gnome_callbacks.c b/plugins/gtk/gnome_callbacks.c
index b40bc703f21ed314b40df610ab5e3a8dfdc78a56..28d340724c0361056af87bd0843efafc7d74aac5 100644 (file)
--- a/plugins/gtk/gnome_callbacks.c
+++ b/plugins/gtk/gnome_callbacks.c
@@ -2,7 +2,7 @@
  * gnome_callbacks.c : GNOME-specific callbacks.
  *****************************************************************************
  * Copyright (C) 2000, 2001, 2002 VideoLAN
- * $Id: gnome_callbacks.c,v 1.10 2002/06/01 12:31:59 sam Exp $
+ * $Id: gnome_callbacks.c,v 1.11 2002/06/04 20:33:25 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Stéphane Borel <stef@via.ecp.fr>
@@ -249,7 +249,7 @@ void
 GnomePopupPreferencesActivate          (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
-    GtkPreferencesActivate( menuitem, "intf_window" );
+    GtkPreferencesActivate( menuitem, "intf_popup" );
 }
 
 

diff --git a/plugins/gtk/gtk_callbacks.c b/plugins/gtk/gtk_callbacks.c
index 00359d459e4f6fdd86b8896c70c136b6e0e60f1a..58332ce1bcb1784337e2586c64b170b85910511f 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.42 2002/06/04 00:11:12 sam Exp $
+ * $Id: gtk_callbacks.c,v 1.43 2002/06/04 20:33:25 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Stéphane Borel <stef@via.ecp.fr>
@@ -100,10 +100,11 @@ gboolean GtkFullscreen( GtkWidget       *widget,
                         GdkEventButton  *event,
                         gpointer         user_data)
 {
-    intf_thread_t * p_intf =  GetIntf( GTK_WIDGET(widget), "intf_window" );
+    intf_thread_t *p_intf = GetIntf( GTK_WIDGET(widget), (char*)user_data );
     vout_thread_t *p_vout;
 
-    p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, FIND_CHILD );
+    p_vout = vlc_object_find( p_intf->p_sys->p_input,
+                              VLC_OBJECT_VOUT, FIND_CHILD );
 
     if( p_vout )
     {