mirror of
https://github.com/transmission/transmission
synced 2025-03-03 18:25:35 +00:00
(gtk) remove the PREF_KEY_SYSTRAY cruft, as pointed out by wereHamster
This commit is contained in:
parent
cd5103011a
commit
e85a328b1b
3 changed files with 3 additions and 28 deletions
29
gtk/main.c
29
gtk/main.c
|
@ -144,8 +144,6 @@ coreerr( TrCore * core, enum tr_core_err code, const char * msg,
|
|||
static void
|
||||
coreprompt( TrCore *, GList *, gpointer, gpointer );
|
||||
static void
|
||||
initializeFromPrefs( struct cbdata * cbdata );
|
||||
static void
|
||||
prefschanged( TrCore * core, const char * key, gpointer data );
|
||||
static gboolean
|
||||
updatemodel(gpointer gdata);
|
||||
|
@ -382,12 +380,6 @@ appsetup( TrWindow * wind, GList * args,
|
|||
g_signal_connect( cbdata->core, "prefs-changed",
|
||||
G_CALLBACK( prefschanged ), cbdata );
|
||||
|
||||
/* apply a few prefs */
|
||||
|
||||
if( minimized )
|
||||
tr_core_set_pref_bool( cbdata->core, PREF_KEY_SYSTRAY, TRUE );
|
||||
initializeFromPrefs( cbdata );
|
||||
|
||||
/* add torrents from command-line and saved state */
|
||||
tr_core_load( cbdata->core, forcepause );
|
||||
|
||||
|
@ -406,6 +398,9 @@ appsetup( TrWindow * wind, GList * args,
|
|||
/* set up main window */
|
||||
winsetup( cbdata, wind );
|
||||
|
||||
/* set up the system tray */
|
||||
makeicon( cbdata );
|
||||
|
||||
/* start model update timer */
|
||||
cbdata->timer = g_timeout_add( UPDATE_INTERVAL, updatemodel, cbdata );
|
||||
updatemodel( cbdata );
|
||||
|
@ -814,12 +809,6 @@ coreprompt( TrCore * core,
|
|||
#endif
|
||||
}
|
||||
|
||||
static void
|
||||
initializeFromPrefs( struct cbdata * cbdata )
|
||||
{
|
||||
prefschanged( NULL, PREF_KEY_SYSTRAY, cbdata );
|
||||
}
|
||||
|
||||
static void
|
||||
prefschanged( TrCore * core UNUSED, const char * key, gpointer data )
|
||||
{
|
||||
|
@ -862,18 +851,6 @@ prefschanged( TrCore * core UNUSED, const char * key, gpointer data )
|
|||
const gboolean enabled = pref_flag_get( key );
|
||||
tr_natTraversalEnable( tr, enabled );
|
||||
}
|
||||
else if( !strcmp( key, PREF_KEY_SYSTRAY ) )
|
||||
{
|
||||
if( pref_flag_get( key ) )
|
||||
{
|
||||
makeicon( cbdata );
|
||||
}
|
||||
else if( cbdata->icon )
|
||||
{
|
||||
g_object_unref( cbdata->icon );
|
||||
cbdata->icon = NULL;
|
||||
}
|
||||
}
|
||||
else if( !strcmp( key, PREF_KEY_PEX ) )
|
||||
{
|
||||
const gboolean enabled = pref_flag_get( key );
|
||||
|
|
|
@ -60,7 +60,6 @@ tr_prefs_init_global( void )
|
|||
|
||||
pref_flag_set_default ( PREF_KEY_NAT, TRUE );
|
||||
pref_flag_set_default ( PREF_KEY_PEX, TRUE );
|
||||
pref_flag_set_default ( PREF_KEY_SYSTRAY, TRUE );
|
||||
pref_flag_set_default ( PREF_KEY_ASKQUIT, TRUE );
|
||||
pref_flag_set_default ( PREF_KEY_ENCRYPTED_ONLY, FALSE );
|
||||
|
||||
|
|
|
@ -30,7 +30,6 @@ GtkWidget * tr_prefs_dialog_new( GObject * core, GtkWindow * parent );
|
|||
#define PREF_KEY_PORT "listening-port"
|
||||
#define PREF_KEY_NAT "nat-traversal-enabled"
|
||||
#define PREF_KEY_PEX "pex-enabled"
|
||||
#define PREF_KEY_SYSTRAY "system-tray-icon-enabled"
|
||||
#define PREF_KEY_ASKQUIT "prompt-before-exit"
|
||||
#define PREF_KEY_ENCRYPTED_ONLY "encrypted-connections-only"
|
||||
#define PREF_KEY_MSGLEVEL "debug-message-level"
|
||||
|
|
Loading…
Reference in a new issue