Skip to content

V
vlc-2-2
Commit e9de293d authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options

(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.
parent 7291e0a7
Show whitespace changes
Inline Side-by-side
Showing with 36 additions and 6 deletions
ChangeLog
View file @ e9de293d
...@@ -2,8 +2,11 @@ ...@@ -2,8 +2,11 @@
# ChangeLog for vlc # # 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 * ./src/interface/interface.c: interfaces are no longer attached only to
p_vlc. p_vlc.
* ./src/libvlc.c, ./src/misc/modules.c, ./src/playlist/playlist.c, * ./src/libvlc.c, ./src/misc/modules.c, ./src/playlist/playlist.c,
...@@ -39,9 +42,17 @@ HEAD ...@@ -39,9 +42,17 @@ HEAD
belongs to plugins/mpeg_vdec. belongs to plugins/mpeg_vdec.
* ALL: the first libvlc commit. * 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 0.4.1
Mon, 3 Jun 2002 23:43:35 +0200 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. * ./configure.in, ./plugins/mpeg_system/mpeg_ts.c: fixed libdvbpsi handling.
* ./src/misc/configuration.c: fixed the --nofoo option handling. * ./src/misc/configuration.c: fixed the --nofoo option handling.
* ./src/interface/main.c: fixed two compilation warnings under Solaris. * ./src/interface/main.c: fixed two compilation warnings under Solaris.
......
plugins/gtk/gnome.glade
View file @ e9de293d
...@@ -1022,6 +1022,7 @@ ...@@ -1022,6 +1022,7 @@
<signal> <signal>
<name>activate</name> <name>activate</name>
<handler>GnomePopupPlayActivate</handler> <handler>GnomePopupPlayActivate</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Sat, 19 May 2001 16:16:58 GMT</last_modification_time> <last_modification_time>Sat, 19 May 2001 16:16:58 GMT</last_modification_time>
</signal> </signal>
<label>Play</label> <label>Play</label>
...@@ -1035,6 +1036,7 @@ ...@@ -1035,6 +1036,7 @@
<signal> <signal>
<name>activate</name> <name>activate</name>
<handler>GnomePopupPauseActivate</handler> <handler>GnomePopupPauseActivate</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Sat, 19 May 2001 16:17:31 GMT</last_modification_time> <last_modification_time>Sat, 19 May 2001 16:17:31 GMT</last_modification_time>
</signal> </signal>
<label>Pause</label> <label>Pause</label>
...@@ -1048,6 +1050,7 @@ ...@@ -1048,6 +1050,7 @@
<signal> <signal>
<name>activate</name> <name>activate</name>
<handler>GnomePopupStopActivate</handler> <handler>GnomePopupStopActivate</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Sat, 19 May 2001 16:18:10 GMT</last_modification_time> <last_modification_time>Sat, 19 May 2001 16:18:10 GMT</last_modification_time>
</signal> </signal>
<label>Stop</label> <label>Stop</label>
...@@ -1062,6 +1065,7 @@ ...@@ -1062,6 +1065,7 @@
<signal> <signal>
<name>activate</name> <name>activate</name>
<handler>GnomePopupBackActivate</handler> <handler>GnomePopupBackActivate</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Sat, 19 May 2001 16:18:21 GMT</last_modification_time> <last_modification_time>Sat, 19 May 2001 16:18:21 GMT</last_modification_time>
</signal> </signal>
<label>Back</label> <label>Back</label>
...@@ -1075,6 +1079,7 @@ ...@@ -1075,6 +1079,7 @@
<signal> <signal>
<name>activate</name> <name>activate</name>
<handler>GnomePopupSlowActivate</handler> <handler>GnomePopupSlowActivate</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Sat, 19 May 2001 16:18:29 GMT</last_modification_time> <last_modification_time>Sat, 19 May 2001 16:18:29 GMT</last_modification_time>
</signal> </signal>
<label>Slow</label> <label>Slow</label>
...@@ -1088,6 +1093,7 @@ ...@@ -1088,6 +1093,7 @@
<signal> <signal>
<name>activate</name> <name>activate</name>
<handler>GnomePopupFastActivate</handler> <handler>GnomePopupFastActivate</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Sat, 19 May 2001 16:18:37 GMT</last_modification_time> <last_modification_time>Sat, 19 May 2001 16:18:37 GMT</last_modification_time>
</signal> </signal>
<label>Fast</label> <label>Fast</label>
...@@ -1107,6 +1113,7 @@ ...@@ -1107,6 +1113,7 @@
<signal> <signal>
<name>activate</name> <name>activate</name>
<handler>GnomePopupWindowToggleActivate</handler> <handler>GnomePopupWindowToggleActivate</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Sat, 19 May 2001 16:18:51 GMT</last_modification_time> <last_modification_time>Sat, 19 May 2001 16:18:51 GMT</last_modification_time>
</signal> </signal>
<label>Toggle _Interface</label> <label>Toggle _Interface</label>
...@@ -1120,6 +1127,7 @@ ...@@ -1120,6 +1127,7 @@
<signal> <signal>
<name>activate</name> <name>activate</name>
<handler>GnomePopupFullscreenActivate</handler> <handler>GnomePopupFullscreenActivate</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Sat, 19 May 2001 16:19:07 GMT</last_modification_time> <last_modification_time>Sat, 19 May 2001 16:19:07 GMT</last_modification_time>
</signal> </signal>
<label>_Fullscreen</label> <label>_Fullscreen</label>
...@@ -1138,6 +1146,7 @@ ...@@ -1138,6 +1146,7 @@
<signal> <signal>
<name>activate</name> <name>activate</name>
<handler>GnomePopupNextActivate</handler> <handler>GnomePopupNextActivate</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Sat, 19 May 2001 16:19:18 GMT</last_modification_time> <last_modification_time>Sat, 19 May 2001 16:19:18 GMT</last_modification_time>
</signal> </signal>
<label>Next</label> <label>Next</label>
...@@ -1150,6 +1159,7 @@ ...@@ -1150,6 +1159,7 @@
<signal> <signal>
<name>activate</name> <name>activate</name>
<handler>GnomePopupPrevActivate</handler> <handler>GnomePopupPrevActivate</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Sat, 19 May 2001 16:19:26 GMT</last_modification_time> <last_modification_time>Sat, 19 May 2001 16:19:26 GMT</last_modification_time>
</signal> </signal>
<label>Prev</label> <label>Prev</label>
...@@ -1163,6 +1173,7 @@ ...@@ -1163,6 +1173,7 @@
<signal> <signal>
<name>activate</name> <name>activate</name>
<handler>GnomePopupJumpActivate</handler> <handler>GnomePopupJumpActivate</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Sat, 19 May 2001 16:34:46 GMT</last_modification_time> <last_modification_time>Sat, 19 May 2001 16:34:46 GMT</last_modification_time>
</signal> </signal>
<label>_Jump...</label> <label>_Jump...</label>
...@@ -1231,6 +1242,7 @@ ...@@ -1231,6 +1242,7 @@
<signal> <signal>
<name>activate</name> <name>activate</name>
<handler>GnomePopupFileOpenActivate</handler> <handler>GnomePopupFileOpenActivate</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Sat, 19 May 2001 16:20:08 GMT</last_modification_time> <last_modification_time>Sat, 19 May 2001 16:20:08 GMT</last_modification_time>
</signal> </signal>
<label>_Open File...</label> <label>_Open File...</label>
...@@ -1245,6 +1257,7 @@ ...@@ -1245,6 +1257,7 @@
<signal> <signal>
<name>activate</name> <name>activate</name>
<handler>GnomePopupDiscOpenActivate</handler> <handler>GnomePopupDiscOpenActivate</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Sat, 19 May 2001 16:20:44 GMT</last_modification_time> <last_modification_time>Sat, 19 May 2001 16:20:44 GMT</last_modification_time>
</signal> </signal>
<label>Open _Disc...</label> <label>Open _Disc...</label>
...@@ -1259,6 +1272,7 @@ ...@@ -1259,6 +1272,7 @@
<signal> <signal>
<name>activate</name> <name>activate</name>
<handler>GnomePopupNetworkOpenActivate</handler> <handler>GnomePopupNetworkOpenActivate</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Sat, 19 May 2001 16:20:54 GMT</last_modification_time> <last_modification_time>Sat, 19 May 2001 16:20:54 GMT</last_modification_time>
</signal> </signal>
<label>_Network Stream...</label> <label>_Network Stream...</label>
...@@ -1278,6 +1292,7 @@ ...@@ -1278,6 +1292,7 @@
<signal> <signal>
<name>activate</name> <name>activate</name>
<handler>GnomePopupAboutActivate</handler> <handler>GnomePopupAboutActivate</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Sat, 19 May 2001 16:21:02 GMT</last_modification_time> <last_modification_time>Sat, 19 May 2001 16:21:02 GMT</last_modification_time>
</signal> </signal>
<stock_item>GNOMEUIINFO_MENU_ABOUT_ITEM</stock_item> <stock_item>GNOMEUIINFO_MENU_ABOUT_ITEM</stock_item>
...@@ -1291,6 +1306,7 @@ ...@@ -1291,6 +1306,7 @@
<signal> <signal>
<name>activate</name> <name>activate</name>
<handler>GnomePopupPlaylistActivate</handler> <handler>GnomePopupPlaylistActivate</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Sat, 19 May 2001 16:21:14 GMT</last_modification_time> <last_modification_time>Sat, 19 May 2001 16:21:14 GMT</last_modification_time>
</signal> </signal>
<label>Playlist...</label> <label>Playlist...</label>
...@@ -1303,6 +1319,7 @@ ...@@ -1303,6 +1319,7 @@
<signal> <signal>
<name>activate</name> <name>activate</name>
<handler>GnomePopupPreferencesActivate</handler> <handler>GnomePopupPreferencesActivate</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Sat, 19 May 2001 16:21:25 GMT</last_modification_time> <last_modification_time>Sat, 19 May 2001 16:21:25 GMT</last_modification_time>
</signal> </signal>
<stock_item>GNOMEUIINFO_MENU_PREFERENCES_ITEM</stock_item> <stock_item>GNOMEUIINFO_MENU_PREFERENCES_ITEM</stock_item>
...@@ -1320,6 +1337,7 @@ ...@@ -1320,6 +1337,7 @@
<signal> <signal>
<name>activate</name> <name>activate</name>
<handler>GnomePopupExitActivate</handler> <handler>GnomePopupExitActivate</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Sat, 19 May 2001 16:21:45 GMT</last_modification_time> <last_modification_time>Sat, 19 May 2001 16:21:45 GMT</last_modification_time>
</signal> </signal>
<stock_item>GNOMEUIINFO_MENU_EXIT_ITEM</stock_item> <stock_item>GNOMEUIINFO_MENU_EXIT_ITEM</stock_item>
......
plugins/gtk/gnome_callbacks.c
View file @ e9de293d
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* gnome_callbacks.c : GNOME-specific callbacks. * gnome_callbacks.c : GNOME-specific callbacks.
***************************************************************************** *****************************************************************************
* Copyright (C) 2000, 2001, 2002 VideoLAN * 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> * Authors: Samuel Hocevar <sam@zoy.org>
* Stphane Borel <stef@via.ecp.fr> * Stphane Borel <stef@via.ecp.fr>
...@@ -249,7 +249,7 @@ void ...@@ -249,7 +249,7 @@ void
GnomePopupPreferencesActivate (GtkMenuItem *menuitem, GnomePopupPreferencesActivate (GtkMenuItem *menuitem,
gpointer user_data) gpointer user_data)
{ {
GtkPreferencesActivate( menuitem, "intf_window" ); GtkPreferencesActivate( menuitem, "intf_popup" );
} }
......
plugins/gtk/gtk_callbacks.c
View file @ e9de293d
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* gtk_callbacks.c : Callbacks for the Gtk+ plugin. * gtk_callbacks.c : Callbacks for the Gtk+ plugin.
***************************************************************************** *****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN * 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> * Authors: Samuel Hocevar <sam@zoy.org>
* Stphane Borel <stef@via.ecp.fr> * Stphane Borel <stef@via.ecp.fr>
...@@ -100,10 +100,11 @@ gboolean GtkFullscreen( GtkWidget *widget, ...@@ -100,10 +100,11 @@ gboolean GtkFullscreen( GtkWidget *widget,
GdkEventButton *event, GdkEventButton *event,
gpointer user_data) 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; 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 ) if( p_vout )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment