Mercurial > mplayer.hg

comparison gui/dialog/url.c @ 36008:d154d0035cb0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't use WidgetDestroy(). (It's not the best idea to call gtk_widget_destroy() there while the object is currently being destroyed.) In order to set the widget pointer to NULL, use gtk_widget_destroyed(). Simply destroy the widget to automatically get the pointer set to NULL then.
author ib
date Sat, 30 Mar 2013 14:32:07 +0000
parents 7d749e44a9e5
children 5c720c434d56
comparison
equal deleted inserted replaced
36007:90ff4280cc80 36008:d154d0035cb0
70 add_to_gui_playlist(str, PLAYLIST_ITEM_APPEND); 70 add_to_gui_playlist(str, PLAYLIST_ITEM_APPEND);
71 uiEvent( evPlay,0 ); 71 uiEvent( evPlay,0 );
72 } 72 }
73 } 73 }
74 gtk_widget_destroy( URLDialog ); 74 gtk_widget_destroy( URLDialog );
75 URLDialog = NULL;
76 } 75 }
77 76
78 static GtkWidget * CreateURLDialog( void ) 77 static GtkWidget * CreateURLDialog( void )
79 { 78 {
80 GtkWidget * vbox1; 79 GtkWidget * vbox1;
124 Cancel=AddButton( MSGTR_Cancel,hbuttonbox1 ); 123 Cancel=AddButton( MSGTR_Cancel,hbuttonbox1 );
125 124
126 gtk_widget_add_accelerator( Ok,"clicked",accel_group,GDK_Return,0,GTK_ACCEL_VISIBLE ); 125 gtk_widget_add_accelerator( Ok,"clicked",accel_group,GDK_Return,0,GTK_ACCEL_VISIBLE );
127 gtk_widget_add_accelerator( Cancel,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE ); 126 gtk_widget_add_accelerator( Cancel,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE );
128 127
129 gtk_signal_connect( GTK_OBJECT( URLDialog ),"destroy",GTK_SIGNAL_FUNC( WidgetDestroy ),&URLDialog ); 128 gtk_signal_connect( GTK_OBJECT( URLDialog ),"destroy",GTK_SIGNAL_FUNC( gtk_widget_destroyed ),&URLDialog );
130 gtk_signal_connect( GTK_OBJECT( Ok ),"clicked",GTK_SIGNAL_FUNC( on_Button_pressed ),(void *)1 ); 129 gtk_signal_connect( GTK_OBJECT( Ok ),"clicked",GTK_SIGNAL_FUNC( on_Button_pressed ),(void *)1 );
131 gtk_signal_connect( GTK_OBJECT( Cancel ),"clicked",GTK_SIGNAL_FUNC( on_Button_pressed ),NULL ); 130 gtk_signal_connect( GTK_OBJECT( Cancel ),"clicked",GTK_SIGNAL_FUNC( on_Button_pressed ),NULL );
132 131
133 gtk_widget_grab_focus( URLEntry ); 132 gtk_widget_grab_focus( URLEntry );
134 gtk_window_add_accel_group( GTK_WINDOW( URLDialog ),accel_group ); 133 gtk_window_add_accel_group( GTK_WINDOW( URLDialog ),accel_group );