mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

(trunk gtk) #3644 "About Dialog appear with main window" -- handle another special case. Fix confirmed by kovalev

This commit is contained in:
Charles Kerr 2010-10-18 22:18:15 +00:00
parent ac588c4835
commit d365c40958
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gtk/main.c
View File

@ -1407,7 +1407,7 @@ onUriClicked( GtkAboutDialog * u UNUSED, const gchar * uri, gpointer u2 UNUSED )
}
static void
about( GtkWindow * parent UNUSED )
about( GtkWindow * parent )
{
GtkWidget * d;
const char * website_uri = "http://www.transmissionbt.com/";
@ -1437,9 +1437,9 @@ about( GtkWindow * parent UNUSED )
"wrap-license", TRUE,
#endif
NULL );
gtk_dialog_run( GTK_DIALOG( d ) );
gtk_widget_destroy( d );
gtk_window_set_transient_for( GTK_WINDOW( d ), parent );
g_signal_connect_swapped( d, "response", G_CALLBACK (gtk_widget_destroy), d );
gtk_widget_show_all( d );
}
static void
@ -1727,9 +1727,8 @@ doAction( const char * action_name, gpointer user_data )
{
if( !data->msgwin )
{
GtkWidget * win = msgwin_new( data->core );
g_signal_connect( win, "destroy", G_CALLBACK( msgwinclosed ),
NULL );
GtkWidget * win = msgwin_new( data->core, data->wind );
g_signal_connect( win, "destroy", G_CALLBACK( msgwinclosed ), NULL );
data->msgwin = win;
}
else

3
gtk/msgwin.c
View File

@ -374,7 +374,7 @@ debug_level_combo_new( void )
**/
GtkWidget *
msgwin_new( TrCore * core )
msgwin_new( TrCore * core, GtkWindow * parent )
{
GtkWidget * win;
GtkWidget * vbox;
@ -388,6 +388,7 @@ msgwin_new( TrCore * core )
data->core = core;
win = gtk_window_new( GTK_WINDOW_TOPLEVEL );
gtk_window_set_transient_for( GTK_WINDOW( win ), parent );
gtk_window_set_title( GTK_WINDOW( win ), _( "Message Log" ) );
gtk_window_set_default_size( GTK_WINDOW( win ), 560, 350 );
gtk_window_set_role( GTK_WINDOW( win ), "message-log" );

2
gtk/msgwin.h
View File

@ -13,6 +13,6 @@
#ifndef TG_MSGWIN_H
#define TG_MSGWIN_H
GtkWidget * msgwin_new( TrCore * core );
GtkWidget * msgwin_new( TrCore * core, GtkWindow * parent );
#endif