mirror of
https://code.videolan.org/videolan/vlc
synced 2024-09-04 09:11:33 +02:00
* Fixed uninitialized variable in config_Duplicate()
* Fixed problem introduced in latest gtk commit
This commit is contained in:
Gildas Bazin
parent
b69353c58d
commit
813e5145db
@ -89,6 +89,7 @@
|
||||
<signal>
|
||||
<name>activate</name>
|
||||
<handler>GtkFileOpenActivate</handler>
|
||||
<data>"intf_window"</data>
|
||||
<last_modification_time>Mon, 14 May 2001 21:27:36 GMT</last_modification_time>
|
||||
</signal>
|
||||
<label>_Open File...</label>
|
||||
@ -107,6 +108,7 @@
|
||||
<signal>
|
||||
<name>activate</name>
|
||||
<handler>GtkDiscOpenActivate</handler>
|
||||
<data>"intf_window"</data>
|
||||
<last_modification_time>Mon, 14 May 2001 21:27:47 GMT</last_modification_time>
|
||||
</signal>
|
||||
<label>Open _Disc...</label>
|
||||
@ -125,6 +127,7 @@
|
||||
<signal>
|
||||
<name>activate</name>
|
||||
<handler>GtkNetworkOpenActivate</handler>
|
||||
<data>"intf_window"</data>
|
||||
<last_modification_time>Mon, 14 May 2001 21:28:06 GMT</last_modification_time>
|
||||
</signal>
|
||||
<label>_Network Stream...</label>
|
||||
@ -144,6 +147,7 @@
|
||||
<signal>
|
||||
<name>activate</name>
|
||||
<handler>GtkEjectDiscActivate</handler>
|
||||
<data>"intf_window"</data>
|
||||
<last_modification_time>Fri, 21 Dec 2001 12:51:34 GMT</last_modification_time>
|
||||
</signal>
|
||||
<label>_Eject Disc</label>
|
||||
@ -168,6 +172,7 @@
|
||||
<signal>
|
||||
<name>activate</name>
|
||||
<handler>GtkExitActivate</handler>
|
||||
<data>"intf_window"</data>
|
||||
<last_modification_time>Mon, 14 May 2001 21:28:20 GMT</last_modification_time>
|
||||
</signal>
|
||||
<label>E_xit</label>
|
||||
@ -193,6 +198,7 @@
|
||||
<signal>
|
||||
<name>activate</name>
|
||||
<handler>GtkWindowToggleActivate</handler>
|
||||
<data>"intf_window"</data>
|
||||
<last_modification_time>Mon, 14 May 2001 21:32:49 GMT</last_modification_time>
|
||||
</signal>
|
||||
<label>_Hide interface</label>
|
||||
@ -205,6 +211,7 @@
|
||||
<signal>
|
||||
<name>activate</name>
|
||||
<handler>GtkFullscreenActivate</handler>
|
||||
<data>"intf_window"</data>
|
||||
<last_modification_time>Mon, 14 May 2001 21:29:21 GMT</last_modification_time>
|
||||
</signal>
|
||||
<label>_Fullscreen</label>
|
||||
@ -264,6 +271,7 @@
|
||||
<signal>
|
||||
<name>activate</name>
|
||||
<handler>GtkPlaylistActivate</handler>
|
||||
<data>"intf_window"</data>
|
||||
<last_modification_time>Mon, 14 May 2001 21:29:34 GMT</last_modification_time>
|
||||
</signal>
|
||||
<label>_Playlist...</label>
|
||||
@ -278,6 +286,7 @@
|
||||
<signal>
|
||||
<name>activate</name>
|
||||
<handler>GtkModulesActivate</handler>
|
||||
<data>"intf_window"</data>
|
||||
<last_modification_time>Mon, 14 May 2001 21:29:44 GMT</last_modification_time>
|
||||
</signal>
|
||||
<label>_Modules...</label>
|
||||
@ -291,6 +300,7 @@
|
||||
<signal>
|
||||
<name>activate</name>
|
||||
<handler>GtkMessagesActivate</handler>
|
||||
<data>"intf_window"</data>
|
||||
<last_modification_time>Tue, 19 Feb 2002 02:03:47 GMT</last_modification_time>
|
||||
</signal>
|
||||
<label>Messages...</label>
|
||||
@ -340,6 +350,7 @@
|
||||
<signal>
|
||||
<name>activate</name>
|
||||
<handler>GtkPreferencesActivate</handler>
|
||||
<data>"intf_window"</data>
|
||||
<last_modification_time>Mon, 14 May 2001 21:30:02 GMT</last_modification_time>
|
||||
</signal>
|
||||
<label>_Preferences...</label>
|
||||
@ -365,6 +376,7 @@
|
||||
<signal>
|
||||
<name>activate</name>
|
||||
<handler>GtkAboutActivate</handler>
|
||||
<data>"intf_window"</data>
|
||||
<last_modification_time>Mon, 14 May 2001 21:30:15 GMT</last_modification_time>
|
||||
</signal>
|
||||
<label>_About...</label>
|
||||
|
||||
@ -826,40 +826,40 @@ create_intf_window (void)
|
||||
"intf_window");
|
||||
gtk_signal_connect (GTK_OBJECT (menubar_open), "activate",
|
||||
GTK_SIGNAL_FUNC (GtkFileOpenActivate),
|
||||
NULL);
|
||||
"intf_window");
|
||||
gtk_signal_connect (GTK_OBJECT (menubar_disc), "activate",
|
||||
GTK_SIGNAL_FUNC (GtkDiscOpenActivate),
|
||||
NULL);
|
||||
"intf_window");
|
||||
gtk_signal_connect (GTK_OBJECT (menubar_network), "activate",
|
||||
GTK_SIGNAL_FUNC (GtkNetworkOpenActivate),
|
||||
NULL);
|
||||
"intf_window");
|
||||
gtk_signal_connect (GTK_OBJECT (menubar_eject), "activate",
|
||||
GTK_SIGNAL_FUNC (GtkEjectDiscActivate),
|
||||
NULL);
|
||||
"intf_window");
|
||||
gtk_signal_connect (GTK_OBJECT (menubar_exit), "activate",
|
||||
GTK_SIGNAL_FUNC (GtkExitActivate),
|
||||
NULL);
|
||||
"intf_window");
|
||||
gtk_signal_connect (GTK_OBJECT (menubar_interface_hide), "activate",
|
||||
GTK_SIGNAL_FUNC (GtkWindowToggleActivate),
|
||||
NULL);
|
||||
"intf_window");
|
||||
gtk_signal_connect (GTK_OBJECT (menubar_fullscreen), "activate",
|
||||
GTK_SIGNAL_FUNC (GtkFullscreenActivate),
|
||||
NULL);
|
||||
"intf_window");
|
||||
gtk_signal_connect (GTK_OBJECT (menubar_playlist), "activate",
|
||||
GTK_SIGNAL_FUNC (GtkPlaylistActivate),
|
||||
NULL);
|
||||
"intf_window");
|
||||
gtk_signal_connect (GTK_OBJECT (menubar_modules), "activate",
|
||||
GTK_SIGNAL_FUNC (GtkModulesActivate),
|
||||
NULL);
|
||||
"intf_window");
|
||||
gtk_signal_connect (GTK_OBJECT (menubar_messages), "activate",
|
||||
GTK_SIGNAL_FUNC (GtkMessagesActivate),
|
||||
NULL);
|
||||
"intf_window");
|
||||
gtk_signal_connect (GTK_OBJECT (menubar_preferences), "activate",
|
||||
GTK_SIGNAL_FUNC (GtkPreferencesActivate),
|
||||
NULL);
|
||||
"intf_window");
|
||||
gtk_signal_connect (GTK_OBJECT (menubar_about), "activate",
|
||||
GTK_SIGNAL_FUNC (GtkAboutActivate),
|
||||
NULL);
|
||||
"intf_window");
|
||||
gtk_signal_connect (GTK_OBJECT (toolbar_open), "button_press_event",
|
||||
GTK_SIGNAL_FUNC (GtkFileOpenShow),
|
||||
"intf_window");
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
* configuration.c management of the modules configuration
|
||||
*****************************************************************************
|
||||
* Copyright (C) 2001 VideoLAN
|
||||
* $Id: configuration.c,v 1.1 2002/02/24 20:51:10 gbazin Exp $
|
||||
* $Id: configuration.c,v 1.2 2002/02/26 22:08:57 gbazin Exp $
|
||||
*
|
||||
* Authors: Gildas Bazin <gbazin@netcourrier.com>
|
||||
*
|
||||
@ -233,12 +233,16 @@ module_config_t *config_Duplicate( module_config_t *p_config_orig,
|
||||
p_config[i].b_dirty = p_config_orig[i].b_dirty;
|
||||
if( p_config_orig[i].psz_name )
|
||||
p_config[i].psz_name = strdup( p_config_orig[i].psz_name );
|
||||
else p_config[i].psz_name = NULL;
|
||||
if( p_config_orig[i].psz_text )
|
||||
p_config[i].psz_text = strdup( p_config_orig[i].psz_text );
|
||||
else p_config[i].psz_text = NULL;
|
||||
if( p_config_orig[i].psz_longtext )
|
||||
p_config[i].psz_longtext = strdup( p_config_orig[i].psz_longtext );
|
||||
else p_config[i].psz_longtext = NULL;
|
||||
if( p_config_orig[i].psz_value )
|
||||
p_config[i].psz_value = strdup( p_config_orig[i].psz_value );
|
||||
else p_config[i].psz_value = NULL;
|
||||
|
||||
/* the callback pointer is only valid when the module is loaded so this
|
||||
* value is set in ActivateModule() and reset in DeactivateModule() */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user