(gtk) #1012: don't show the tray by default

diff --git a/gtk/actions.c b/gtk/actions.c
index a6e8d03cec9a23f8a4d9e26783d74daa6867dbe5..e5862deeb984e63bb4307f0ca485702d241146dc 100644 (file)
--- a/gtk/actions.c
+++ b/gtk/actions.c
@@ -117,9 +117,6 @@ static GtkActionEntry entries[] =
   { "new-torrent", GTK_STOCK_NEW, N_("_New..."), NULL,
     N_("Create a torrent"),
     G_CALLBACK(action_cb) },
-  { "close", GTK_STOCK_CLOSE, N_("Close _Window"), "<control>W",
-    N_("Close main window"),
-    G_CALLBACK(action_cb) },
   { "quit", GTK_STOCK_QUIT, N_("_Quit"), NULL, NULL, G_CALLBACK(action_cb) },
   { "select-all", GTK_STOCK_SELECT_ALL,
     N_( "Select _All" ), "<control>A", NULL, G_CALLBACK(action_cb) },

diff --git a/gtk/main.c b/gtk/main.c
index 9a84f1fd6f5b623af9dd201c17d35f57491c0fac..f2164d2104260c4ec241654b7fbf5da2c73c0bd4 100644 (file)
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -894,7 +894,6 @@ prefschanged( TrCore * core UNUSED, const char * key, gpointer data )
     else if( !strcmp( key, PREF_KEY_SHOW_TRAY_ICON ) )
     {
         const int show = pref_flag_get( key );
-        action_sensitize ( "close", show );
         if( show && !cbdata->icon )
             cbdata->icon = tr_icon_new( cbdata->core );
         else if( !show && cbdata->icon ) {
@@ -1240,11 +1239,6 @@ doAction ( const char * action_name, gpointer user_data )
     {
         removeSelected( data, TRUE );
     }
-    else if (!strcmp (action_name, "close"))
-    {
-        if( data->wind != NULL )
-            winclose( NULL, NULL, data );
-    }
     else if (!strcmp (action_name, "quit"))
     {
         askquit( data->core, data->wind, wannaquit, data );

diff --git a/gtk/tr-prefs.c b/gtk/tr-prefs.c
index c9980b5bd3429a1d158a30ba36b220a97cc8b04f..00a6135366ea603e5ca17734f8e6c0ad9656a77d 100644 (file)
--- a/gtk/tr-prefs.c
+++ b/gtk/tr-prefs.c
@@ -63,7 +63,7 @@ tr_prefs_init_global( void )
     pref_flag_set_default   ( PREF_KEY_TOOLBAR, TRUE );
     pref_flag_set_default   ( PREF_KEY_FILTERBAR, TRUE );
     pref_flag_set_default   ( PREF_KEY_STATUSBAR, TRUE );
-    pref_flag_set_default   ( PREF_KEY_SHOW_TRAY_ICON, TRUE );
+    pref_flag_set_default   ( PREF_KEY_SHOW_TRAY_ICON, FALSE );
     pref_string_set_default ( PREF_KEY_STATUSBAR_STATS, "total-ratio" );
 
     pref_flag_set_default   ( PREF_KEY_DL_LIMIT_ENABLED, FALSE );

diff --git a/gtk/ui.h b/gtk/ui.h
index 76246727038bf3019d25fda3fec28a746c5a123f..179492872eddff5e7c290bee2572076792bd6553 100644 (file)
--- a/gtk/ui.h
+++ b/gtk/ui.h
@@ -15,7 +15,6 @@ const char * fallback_ui_file =
 "      <menuitem action='remove-torrent'/>\n"
 "      <menuitem action='delete-torrent'/>\n"
 "      <separator/>\n"
-"      <menuitem action='close'/>\n"
 "      <menuitem action='quit'/>\n"
 "    </menu>\n"
 "    <menu action='edit-menu'>\n"