Changeset 10490


Ignore:
Timestamp:
Apr 17, 2010, 12:41:24 AM (12 years ago)
Author:
charles
Message:

(trunk gtk) #3146 "Toggle state of 'toggle-main-window' not updated when window is shown after launch with running instance" -- fixed in trunk for 2.00 by a patch from qense

Location:
trunk/gtk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/gtk/actions.c

    r10383 r10490  
    133133    { "help", GTK_STOCK_HELP, N_( "_Contents" ), "F1", NULL, G_CALLBACK( action_cb ) },
    134134    { "update-tracker", GTK_STOCK_NETWORK, N_( "Ask Tracker for _More Peers" ), NULL, NULL, G_CALLBACK( action_cb ) },
    135     { "present-main-window", NULL, NULL, NULL, NULL, G_CALLBACK( action_cb ) },
    136135};
    137136
  • trunk/gtk/main.c

    r10435 r10490  
    736736
    737737static void
    738 toggleMainWindow( struct cbdata * cbdata,
    739                   gboolean        doPresent )
     738toggleMainWindow( struct cbdata * cbdata )
    740739{
    741740    GtkWindow * window = GTK_WINDOW( cbdata->wind );
     
    744743    static int  y = 0;
    745744
    746     if( doShow || doPresent )
     745    if( doShow )
    747746    {
    748747        cbdata->isIconified = 0;
     
    16931692    else if( !strcmp( action_name, "toggle-main-window" ) )
    16941693    {
    1695         toggleMainWindow( data, FALSE );
    1696     }
    1697     else if( !strcmp( action_name, "present-main-window" ) )
    1698     {
    1699         toggleMainWindow( data, TRUE );
     1694        toggleMainWindow( data );
    17001695    }
    17011696    else g_error ( "Unhandled action: %s", action_name );
  • trunk/gtk/tr-core.c

    r10391 r10490  
    11251125                        GError     ** err  UNUSED )
    11261126{
    1127     action_activate( "present-main-window" );
     1127    /* Setting the toggle-main-window GtkCheckMenuItem to
     1128       make sure its state is correctly set */
     1129    action_toggle( "toggle-main-window", TRUE);
     1130   
    11281131    *success = TRUE;
    11291132    return TRUE;
Note: See TracChangeset for help on using the changeset viewer.