Changeset 5229

Timestamp:

Mar 8, 2008, 5:37:13 PM (14 years ago)

Author:

charles

Message:

(gtk) remove the PREF_KEY_SYSTRAY cruft, as pointed out by wereHamster

Location:

trunk/gtk

Files:

• main.c (modified) (5 diffs)
• tr-prefs.c (modified) (1 diff)
• tr-prefs.h (modified) (1 diff)

trunk/gtk/main.c

@@ -145 +145 @@
 coreprompt( TrCore *, GList *, gpointer, gpointer );
 static void
-initializeFromPrefs( struct cbdata * cbdata );
-static void
 prefschanged( TrCore * core, const char * key, gpointer data );
 static gboolean
@@ -383 +381 @@
                       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 +398 @@
     /* set up main window */
     winsetup( cbdata, wind );
+
+    /* set up the system tray */
+    makeicon( cbdata );
 
     /* start model update timer */
@@ -816 +811 @@
 
 static void
-initializeFromPrefs( struct cbdata * cbdata )
-{
-    prefschanged( NULL, PREF_KEY_SYSTRAY, cbdata );
-}
-
-static void
 prefschanged( TrCore * core UNUSED, const char * key, gpointer data )
 {
@@ -862 +851 @@
         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 ) )

trunk/gtk/tr-prefs.c

@@ -61 +61 @@
     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 );

trunk/gtk/tr-prefs.h

@@ -31 +31 @@
 #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"