Skip to content

V
vlc-gpu
Commit 813e5145 authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options 

* Fixed uninitialized variable in config_Duplicate()
* Fixed problem introduced in latest gtk commit
parent b69353c5
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 13 deletions
plugins/gtk/gtk.glade
View file @ 813e5145
...@@ -89,6 +89,7 @@ ...@@ -89,6 +89,7 @@
<signal> <signal>
<name>activate</name> <name>activate</name>
<handler>GtkFileOpenActivate</handler> <handler>GtkFileOpenActivate</handler>
<data>&quot;intf_window&quot;</data>
<last_modification_time>Mon, 14 May 2001 21:27:36 GMT</last_modification_time> <last_modification_time>Mon, 14 May 2001 21:27:36 GMT</last_modification_time>
</signal> </signal>
<label>_Open File...</label> <label>_Open File...</label>
...@@ -107,6 +108,7 @@ ...@@ -107,6 +108,7 @@
<signal> <signal>
<name>activate</name> <name>activate</name>
<handler>GtkDiscOpenActivate</handler> <handler>GtkDiscOpenActivate</handler>
<data>&quot;intf_window&quot;</data>
<last_modification_time>Mon, 14 May 2001 21:27:47 GMT</last_modification_time> <last_modification_time>Mon, 14 May 2001 21:27:47 GMT</last_modification_time>
</signal> </signal>
<label>Open _Disc...</label> <label>Open _Disc...</label>
...@@ -125,6 +127,7 @@ ...@@ -125,6 +127,7 @@
<signal> <signal>
<name>activate</name> <name>activate</name>
<handler>GtkNetworkOpenActivate</handler> <handler>GtkNetworkOpenActivate</handler>
<data>&quot;intf_window&quot;</data>
<last_modification_time>Mon, 14 May 2001 21:28:06 GMT</last_modification_time> <last_modification_time>Mon, 14 May 2001 21:28:06 GMT</last_modification_time>
</signal> </signal>
<label>_Network Stream...</label> <label>_Network Stream...</label>
...@@ -144,6 +147,7 @@ ...@@ -144,6 +147,7 @@
<signal> <signal>
<name>activate</name> <name>activate</name>
<handler>GtkEjectDiscActivate</handler> <handler>GtkEjectDiscActivate</handler>
<data>&quot;intf_window&quot;</data>
<last_modification_time>Fri, 21 Dec 2001 12:51:34 GMT</last_modification_time> <last_modification_time>Fri, 21 Dec 2001 12:51:34 GMT</last_modification_time>
</signal> </signal>
<label>_Eject Disc</label> <label>_Eject Disc</label>
...@@ -168,6 +172,7 @@ ...@@ -168,6 +172,7 @@
<signal> <signal>
<name>activate</name> <name>activate</name>
<handler>GtkExitActivate</handler> <handler>GtkExitActivate</handler>
<data>&quot;intf_window&quot;</data>
<last_modification_time>Mon, 14 May 2001 21:28:20 GMT</last_modification_time> <last_modification_time>Mon, 14 May 2001 21:28:20 GMT</last_modification_time>
</signal> </signal>
<label>E_xit</label> <label>E_xit</label>
...@@ -193,6 +198,7 @@ ...@@ -193,6 +198,7 @@
<signal> <signal>
<name>activate</name> <name>activate</name>
<handler>GtkWindowToggleActivate</handler> <handler>GtkWindowToggleActivate</handler>
<data>&quot;intf_window&quot;</data>
<last_modification_time>Mon, 14 May 2001 21:32:49 GMT</last_modification_time> <last_modification_time>Mon, 14 May 2001 21:32:49 GMT</last_modification_time>
</signal> </signal>
<label>_Hide interface</label> <label>_Hide interface</label>
...@@ -205,6 +211,7 @@ ...@@ -205,6 +211,7 @@
<signal> <signal>
<name>activate</name> <name>activate</name>
<handler>GtkFullscreenActivate</handler> <handler>GtkFullscreenActivate</handler>
<data>&quot;intf_window&quot;</data>
<last_modification_time>Mon, 14 May 2001 21:29:21 GMT</last_modification_time> <last_modification_time>Mon, 14 May 2001 21:29:21 GMT</last_modification_time>
</signal> </signal>
<label>_Fullscreen</label> <label>_Fullscreen</label>
...@@ -264,6 +271,7 @@ ...@@ -264,6 +271,7 @@
<signal> <signal>
<name>activate</name> <name>activate</name>
<handler>GtkPlaylistActivate</handler> <handler>GtkPlaylistActivate</handler>
<data>&quot;intf_window&quot;</data>
<last_modification_time>Mon, 14 May 2001 21:29:34 GMT</last_modification_time> <last_modification_time>Mon, 14 May 2001 21:29:34 GMT</last_modification_time>
</signal> </signal>
<label>_Playlist...</label> <label>_Playlist...</label>
...@@ -278,6 +286,7 @@ ...@@ -278,6 +286,7 @@
<signal> <signal>
<name>activate</name> <name>activate</name>
<handler>GtkModulesActivate</handler> <handler>GtkModulesActivate</handler>
<data>&quot;intf_window&quot;</data>
<last_modification_time>Mon, 14 May 2001 21:29:44 GMT</last_modification_time> <last_modification_time>Mon, 14 May 2001 21:29:44 GMT</last_modification_time>
</signal> </signal>
<label>_Modules...</label> <label>_Modules...</label>
...@@ -291,6 +300,7 @@ ...@@ -291,6 +300,7 @@
<signal> <signal>
<name>activate</name> <name>activate</name>
<handler>GtkMessagesActivate</handler> <handler>GtkMessagesActivate</handler>
<data>&quot;intf_window&quot;</data>
<last_modification_time>Tue, 19 Feb 2002 02:03:47 GMT</last_modification_time> <last_modification_time>Tue, 19 Feb 2002 02:03:47 GMT</last_modification_time>
</signal> </signal>
<label>Messages...</label> <label>Messages...</label>
...@@ -340,6 +350,7 @@ ...@@ -340,6 +350,7 @@
<signal> <signal>
<name>activate</name> <name>activate</name>
<handler>GtkPreferencesActivate</handler> <handler>GtkPreferencesActivate</handler>
<data>&quot;intf_window&quot;</data>
<last_modification_time>Mon, 14 May 2001 21:30:02 GMT</last_modification_time> <last_modification_time>Mon, 14 May 2001 21:30:02 GMT</last_modification_time>
</signal> </signal>
<label>_Preferences...</label> <label>_Preferences...</label>
...@@ -365,6 +376,7 @@ ...@@ -365,6 +376,7 @@
<signal> <signal>
<name>activate</name> <name>activate</name>
<handler>GtkAboutActivate</handler> <handler>GtkAboutActivate</handler>
<data>&quot;intf_window&quot;</data>
<last_modification_time>Mon, 14 May 2001 21:30:15 GMT</last_modification_time> <last_modification_time>Mon, 14 May 2001 21:30:15 GMT</last_modification_time>
</signal> </signal>
<label>_About...</label> <label>_About...</label>
......
plugins/gtk/gtk_interface.c
View file @ 813e5145
...@@ -826,40 +826,40 @@ create_intf_window (void) ...@@ -826,40 +826,40 @@ create_intf_window (void)
"intf_window"); "intf_window");
gtk_signal_connect (GTK_OBJECT (menubar_open), "activate", gtk_signal_connect (GTK_OBJECT (menubar_open), "activate",
GTK_SIGNAL_FUNC (GtkFileOpenActivate), GTK_SIGNAL_FUNC (GtkFileOpenActivate),
NULL); "intf_window");
gtk_signal_connect (GTK_OBJECT (menubar_disc), "activate", gtk_signal_connect (GTK_OBJECT (menubar_disc), "activate",
GTK_SIGNAL_FUNC (GtkDiscOpenActivate), GTK_SIGNAL_FUNC (GtkDiscOpenActivate),
NULL); "intf_window");
gtk_signal_connect (GTK_OBJECT (menubar_network), "activate", gtk_signal_connect (GTK_OBJECT (menubar_network), "activate",
GTK_SIGNAL_FUNC (GtkNetworkOpenActivate), GTK_SIGNAL_FUNC (GtkNetworkOpenActivate),
NULL); "intf_window");
gtk_signal_connect (GTK_OBJECT (menubar_eject), "activate", gtk_signal_connect (GTK_OBJECT (menubar_eject), "activate",
GTK_SIGNAL_FUNC (GtkEjectDiscActivate), GTK_SIGNAL_FUNC (GtkEjectDiscActivate),
NULL); "intf_window");
gtk_signal_connect (GTK_OBJECT (menubar_exit), "activate", gtk_signal_connect (GTK_OBJECT (menubar_exit), "activate",
GTK_SIGNAL_FUNC (GtkExitActivate), GTK_SIGNAL_FUNC (GtkExitActivate),
NULL); "intf_window");
gtk_signal_connect (GTK_OBJECT (menubar_interface_hide), "activate", gtk_signal_connect (GTK_OBJECT (menubar_interface_hide), "activate",
GTK_SIGNAL_FUNC (GtkWindowToggleActivate), GTK_SIGNAL_FUNC (GtkWindowToggleActivate),
NULL); "intf_window");
gtk_signal_connect (GTK_OBJECT (menubar_fullscreen), "activate", gtk_signal_connect (GTK_OBJECT (menubar_fullscreen), "activate",
GTK_SIGNAL_FUNC (GtkFullscreenActivate), GTK_SIGNAL_FUNC (GtkFullscreenActivate),
NULL); "intf_window");
gtk_signal_connect (GTK_OBJECT (menubar_playlist), "activate", gtk_signal_connect (GTK_OBJECT (menubar_playlist), "activate",
GTK_SIGNAL_FUNC (GtkPlaylistActivate), GTK_SIGNAL_FUNC (GtkPlaylistActivate),
NULL); "intf_window");
gtk_signal_connect (GTK_OBJECT (menubar_modules), "activate", gtk_signal_connect (GTK_OBJECT (menubar_modules), "activate",
GTK_SIGNAL_FUNC (GtkModulesActivate), GTK_SIGNAL_FUNC (GtkModulesActivate),
NULL); "intf_window");
gtk_signal_connect (GTK_OBJECT (menubar_messages), "activate", gtk_signal_connect (GTK_OBJECT (menubar_messages), "activate",
GTK_SIGNAL_FUNC (GtkMessagesActivate), GTK_SIGNAL_FUNC (GtkMessagesActivate),
NULL); "intf_window");
gtk_signal_connect (GTK_OBJECT (menubar_preferences), "activate", gtk_signal_connect (GTK_OBJECT (menubar_preferences), "activate",
GTK_SIGNAL_FUNC (GtkPreferencesActivate), GTK_SIGNAL_FUNC (GtkPreferencesActivate),
NULL); "intf_window");
gtk_signal_connect (GTK_OBJECT (menubar_about), "activate", gtk_signal_connect (GTK_OBJECT (menubar_about), "activate",
GTK_SIGNAL_FUNC (GtkAboutActivate), GTK_SIGNAL_FUNC (GtkAboutActivate),
NULL); "intf_window");
gtk_signal_connect (GTK_OBJECT (toolbar_open), "button_press_event", gtk_signal_connect (GTK_OBJECT (toolbar_open), "button_press_event",
GTK_SIGNAL_FUNC (GtkFileOpenShow), GTK_SIGNAL_FUNC (GtkFileOpenShow),
"intf_window"); "intf_window");
......
src/misc/configuration.c
View file @ 813e5145
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* configuration.c management of the modules configuration * configuration.c management of the modules configuration
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * 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> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -233,12 +233,16 @@ module_config_t *config_Duplicate( module_config_t *p_config_orig, ...@@ -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; p_config[i].b_dirty = p_config_orig[i].b_dirty;
if( p_config_orig[i].psz_name ) if( p_config_orig[i].psz_name )
p_config[i].psz_name = strdup( 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 ) if( p_config_orig[i].psz_text )
p_config[i].psz_text = strdup( 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 ) if( p_config_orig[i].psz_longtext )
p_config[i].psz_longtext = strdup( 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 ) if( p_config_orig[i].psz_value )
p_config[i].psz_value = strdup( 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 /* the callback pointer is only valid when the module is loaded so this
* value is set in ActivateModule() and reset in DeactivateModule() */ * value is set in ActivateModule() and reset in DeactivateModule() */
......
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