Changeset e9de293df3df0a6c1b2d29a9d5acd8794f6e54f6

Show
Ignore:
Timestamp:
06/04/02 22:33:25 (6 years ago)
Author:
Sam Hocevar <sam@videolan.org>
git-committer:
Sam Hocevar <sam@videolan.org> 1023222805 +0000
git-parent:

[7291e0a7e2e207fed4cbb7063550d60d06824018]

git-author:
Sam Hocevar <sam@videolan.org> 1023222805 +0000
Message:

(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.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • ChangeLog

    r7291e0a re9de293  
    33#===================# 
    44 
    5 HEAD 
    6  
     50.5.0 
     6Not released yet 
     7 
     8  * ./plugins/gtk/gtk_callbacks.c: fixed a segfault when switching to 
     9    fullscreen from the popup menu. 
    710  * ./src/interface/interface.c: interfaces are no longer attached only to 
    811    p_vlc. 
    …… 
    4043  * ALL: the first libvlc commit. 
    4144 
     450.4.2 
     46Not released yet 
     47 
     48  * ./plugins/gtk/gnome_callbacks.c: fixed a crash when activating preferences  
     49    from the popup menu. 
     50 
    42510.4.1 
    4352Mon,  3 Jun 2002 23:43:35 +0200 
    4453 
     54  * ./plugins/gtk/gnome.glade: added lines this #@%$! Glade had munched, fixes 
     55    a segfault in the Gnome popup menu when toggling the interface. 
    4556  * ./configure.in, ./plugins/mpeg_system/mpeg_ts.c: fixed libdvbpsi handling. 
    4657  * ./src/misc/configuration.c: fixed the --nofoo option handling. 

  • plugins/gtk/gnome.glade

    r9e3ab28 re9de293  
    10231023      <name>activate</name> 
    10241024      <handler>GnomePopupPlayActivate</handler> 
     1025      <data>&quot;intf_popup&quot;</data> 
    10251026      <last_modification_time>Sat, 19 May 2001 16:16:58 GMT</last_modification_time> 
    10261027    </signal> 
    …… 
    10361037      <name>activate</name> 
    10371038      <handler>GnomePopupPauseActivate</handler> 
     1039      <data>&quot;intf_popup&quot;</data> 
    10381040      <last_modification_time>Sat, 19 May 2001 16:17:31 GMT</last_modification_time> 
    10391041    </signal> 
    …… 
    10491051      <name>activate</name> 
    10501052      <handler>GnomePopupStopActivate</handler> 
     1053      <data>&quot;intf_popup&quot;</data> 
    10511054      <last_modification_time>Sat, 19 May 2001 16:18:10 GMT</last_modification_time> 
    10521055    </signal> 
    …… 
    10631066      <name>activate</name> 
    10641067      <handler>GnomePopupBackActivate</handler> 
     1068      <data>&quot;intf_popup&quot;</data> 
    10651069      <last_modification_time>Sat, 19 May 2001 16:18:21 GMT</last_modification_time> 
    10661070    </signal> 
    …… 
    10761080      <name>activate</name> 
    10771081      <handler>GnomePopupSlowActivate</handler> 
     1082      <data>&quot;intf_popup&quot;</data> 
    10781083      <last_modification_time>Sat, 19 May 2001 16:18:29 GMT</last_modification_time> 
    10791084    </signal> 
    …… 
    10891094      <name>activate</name> 
    10901095      <handler>GnomePopupFastActivate</handler> 
     1096      <data>&quot;intf_popup&quot;</data> 
    10911097      <last_modification_time>Sat, 19 May 2001 16:18:37 GMT</last_modification_time> 
    10921098    </signal> 
    …… 
    11081114      <name>activate</name> 
    11091115      <handler>GnomePopupWindowToggleActivate</handler> 
     1116      <data>&quot;intf_popup&quot;</data> 
    11101117      <last_modification_time>Sat, 19 May 2001 16:18:51 GMT</last_modification_time> 
    11111118    </signal> 
    …… 
    11211128      <name>activate</name> 
    11221129      <handler>GnomePopupFullscreenActivate</handler> 
     1130      <data>&quot;intf_popup&quot;</data> 
    11231131      <last_modification_time>Sat, 19 May 2001 16:19:07 GMT</last_modification_time> 
    11241132    </signal> 
    …… 
    11391147      <name>activate</name> 
    11401148      <handler>GnomePopupNextActivate</handler> 
     1149      <data>&quot;intf_popup&quot;</data> 
    11411150      <last_modification_time>Sat, 19 May 2001 16:19:18 GMT</last_modification_time> 
    11421151    </signal> 
    …… 
    11511160      <name>activate</name> 
    11521161      <handler>GnomePopupPrevActivate</handler> 
     1162      <data>&quot;intf_popup&quot;</data> 
    11531163      <last_modification_time>Sat, 19 May 2001 16:19:26 GMT</last_modification_time> 
    11541164    </signal> 
    …… 
    11641174      <name>activate</name> 
    11651175      <handler>GnomePopupJumpActivate</handler> 
     1176      <data>&quot;intf_popup&quot;</data> 
    11661177      <last_modification_time>Sat, 19 May 2001 16:34:46 GMT</last_modification_time> 
    11671178    </signal> 
    …… 
    12321243      <name>activate</name> 
    12331244      <handler>GnomePopupFileOpenActivate</handler> 
     1245      <data>&quot;intf_popup&quot;</data> 
    12341246      <last_modification_time>Sat, 19 May 2001 16:20:08 GMT</last_modification_time> 
    12351247    </signal> 
    …… 
    12461258      <name>activate</name> 
    12471259      <handler>GnomePopupDiscOpenActivate</handler> 
     1260      <data>&quot;intf_popup&quot;</data> 
    12481261      <last_modification_time>Sat, 19 May 2001 16:20:44 GMT</last_modification_time> 
    12491262    </signal> 
    …… 
    12601273      <name>activate</name> 
    12611274      <handler>GnomePopupNetworkOpenActivate</handler> 
     1275      <data>&quot;intf_popup&quot;</data> 
    12621276      <last_modification_time>Sat, 19 May 2001 16:20:54 GMT</last_modification_time> 
    12631277    </signal> 
    …… 
    12791293      <name>activate</name> 
    12801294      <handler>GnomePopupAboutActivate</handler> 
     1295      <data>&quot;intf_popup&quot;</data> 
    12811296      <last_modification_time>Sat, 19 May 2001 16:21:02 GMT</last_modification_time> 
    12821297    </signal> 
    …… 
    12921307      <name>activate</name> 
    12931308      <handler>GnomePopupPlaylistActivate</handler> 
     1309      <data>&quot;intf_popup&quot;</data> 
    12941310      <last_modification_time>Sat, 19 May 2001 16:21:14 GMT</last_modification_time> 
    12951311    </signal> 
    …… 
    13041320      <name>activate</name> 
    13051321      <handler>GnomePopupPreferencesActivate</handler> 
     1322      <data>&quot;intf_popup&quot;</data> 
    13061323      <last_modification_time>Sat, 19 May 2001 16:21:25 GMT</last_modification_time> 
    13071324    </signal> 
    …… 
    13211338      <name>activate</name> 
    13221339      <handler>GnomePopupExitActivate</handler> 
     1340      <data>&quot;intf_popup&quot;</data> 
    13231341      <last_modification_time>Sat, 19 May 2001 16:21:45 GMT</last_modification_time> 
    13241342    </signal> 

  • plugins/gtk/gnome_callbacks.c

    r9e3ab28 re9de293  
    33 ***************************************************************************** 
    44 * Copyright (C) 2000, 2001, 2002 VideoLAN 
    5  * $Id: gnome_callbacks.c,v 1.10 2002/06/01 12:31:59 sam Exp $ 
     5 * $Id: gnome_callbacks.c,v 1.11 2002/06/04 20:33:25 sam Exp $ 
    66 * 
    77 * Authors: Samuel Hocevar <sam@zoy.org> 
    …… 
    250250                                        gpointer         user_data) 
    251251{ 
    252     GtkPreferencesActivate( menuitem, "intf_window" ); 
     252    GtkPreferencesActivate( menuitem, "intf_popup" ); 
    253253} 
    254254 

  • plugins/gtk/gtk_callbacks.c

    r7291e0a re9de293  
    33 ***************************************************************************** 
    44 * Copyright (C) 2000, 2001 VideoLAN 
    5  * $Id: gtk_callbacks.c,v 1.42 2002/06/04 00:11:12 sam Exp $ 
     5 * $Id: gtk_callbacks.c,v 1.43 2002/06/04 20:33:25 sam Exp $ 
    66 * 
    77 * Authors: Samuel Hocevar <sam@zoy.org> 
    …… 
    101101                        gpointer         user_data) 
    102102{ 
    103     intf_thread_t * p_intf =  GetIntf( GTK_WIDGET(widget), "intf_window" ); 
     103    intf_thread_t *p_intf = GetIntf( GTK_WIDGET(widget), (char*)user_data ); 
    104104    vout_thread_t *p_vout; 
    105105 
    106     p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, FIND_CHILD ); 
     106    p_vout = vlc_object_find( p_intf->p_sys->p_input, 
     107                              VLC_OBJECT_VOUT, FIND_CHILD ); 
    107108 
    108109    if( p_vout )