(trunk gtk) kill "pref_flag_t" in a burlap sack and throw it off the cliff into the...

diff --git a/gtk/add-dialog.c b/gtk/add-dialog.c
index b5b673412a077fdd34de8aad3d96d36911f228c2..56f9ef961f18e168fadb1fc4558ce63e962dfb6c 100644 (file)
--- a/gtk/add-dialog.c
+++ b/gtk/add-dialog.c
@@ -407,14 +407,12 @@ onAddDialogResponse( GtkDialog * dialog,
         GtkFileChooser  * chooser = GTK_FILE_CHOOSER( dialog );
         GtkWidget       * w = gtk_file_chooser_get_extra_widget( chooser );
         GtkToggleButton * tb = GTK_TOGGLE_BUTTON( w );
-        const gboolean    showOptions = gtk_toggle_button_get_active( tb );
-        const pref_flag_t start = PREF_FLAG_DEFAULT;
-        const pref_flag_t prompt = showOptions
-                                 ? PREF_FLAG_TRUE
-                                 : PREF_FLAG_FALSE;
+        const gboolean    doStart = pref_flag_get( TR_PREFS_KEY_START );
+        const gboolean    doPrompt = gtk_toggle_button_get_active( tb );
+        const gboolean    doNotify = FALSE;
         GSList * l = gtk_file_chooser_get_filenames( chooser );
 
-        tr_core_add_list( core, l, start, prompt, FALSE );
+        tr_core_add_list( core, l, doStart, doPrompt, doNotify );
     }
 
     gtk_widget_destroy( GTK_WIDGET( dialog ) );

diff --git a/gtk/conf.c b/gtk/conf.c
index 3d7ae97e19611a0822beeaf0f1ffade2cccee142..6c1ace961466274bbc6a423a0d562e400dfbb08a 100644 (file)
--- a/gtk/conf.c
+++ b/gtk/conf.c
@@ -48,8 +48,7 @@ static char * gl_lockpath = NULL;
 
 /* errstr may be NULL, this might be called before GTK is initialized */
 gboolean
-cf_init( const char   * configDir,
-         char        ** errstr )
+cf_init( const char * configDir, char ** errstr )
 {
     if( errstr != NULL )
         *errstr = NULL;
@@ -74,9 +73,7 @@ cf_init( const char   * configDir,
 
 /* errstr may be NULL, this might be called before GTK is initialized */
 static gboolean
-lockfile( const char             * filename,
-          gtr_lockfile_state_t   * tr_state,
-          char                  ** errstr )
+lockfile( const char * filename, gtr_lockfile_state_t * tr_state, char ** errstr )
 {
     const gtr_lockfile_state_t state = gtr_lockfile( filename );
     const gboolean success = state == GTR_LOCKFILE_SUCCESS;
@@ -247,8 +244,7 @@ pref_int_get( const char * key )
 }
 
 void
-pref_int_set( const char * key,
-              int64_t      value )
+pref_int_set( const char * key, int64_t value )
 {
     tr_bencDictAddInt( getPrefs( ), key, value );
 }
@@ -262,8 +258,7 @@ pref_double_get( const char * key )
 }
 
 void
-pref_double_set( const char * key,
-                 double       value )
+pref_double_set( const char * key, double value )
 {
     tr_bencDictAddReal( getPrefs( ), key, value );
 }
@@ -280,26 +275,8 @@ pref_flag_get( const char * key )
     return boolVal != 0;
 }
 
-gboolean
-pref_flag_eval( pref_flag_t  val,
-                const char * key )
-{
-    switch( val )
-    {
-        case PREF_FLAG_TRUE:
-            return TRUE;
-
-        case PREF_FLAG_FALSE:
-            return FALSE;
-
-        default:
-            return pref_flag_get( key );
-    }
-}
-
 void
-pref_flag_set( const char * key,
-               gboolean     value )
+pref_flag_set( const char * key, gboolean value )
 {
     tr_bencDictAddBool( getPrefs( ), key, value );
 }
@@ -351,8 +328,7 @@ getCompat121PrefsFilename( void )
 }
 
 static void
-translate_keyfile_to_json( const char * old_file,
-                           const char * new_file )
+translate_keyfile_to_json( const char * old_file, const char * new_file )
 {
     tr_benc    dict;
     GKeyFile * keyfile;

diff --git a/gtk/conf.h b/gtk/conf.h
index 687cec17d4acc862a2570f5f943ef08c8e222b43..c88e581f741625e211eceb69decf98f1bce30563 100644 (file)
--- a/gtk/conf.h
+++ b/gtk/conf.h
@@ -48,19 +48,6 @@ struct tr_benc*  pref_get_all           ( void );
 ***
 **/
 
-enum
-{
-    PREF_FLAG_DEFAULT = 0,
-    PREF_FLAG_FALSE = 1,
-    PREF_FLAG_TRUE = 2
-};
-
-typedef int pref_flag_t;
-
-gboolean pref_flag_eval( pref_flag_t  val,
-                         const char * key );
-
-
 /**
 ***
 **/

diff --git a/gtk/details.c b/gtk/details.c
index 144f3cffb4fd399934f33bd4024e50acdf8a7288..e8fc8cc584f0b14c082c72681e03c9175f56bdc3 100644 (file)
--- a/gtk/details.c
+++ b/gtk/details.c
@@ -21,6 +21,7 @@
 #include <libtransmission/utils.h> /* tr_free */
 
 #include "actions.h"
+#include "conf.h"
 #include "details.h"
 #include "favicon.h" /* gtr_get_favicon() */
 #include "file-list.h"

diff --git a/gtk/main.c b/gtk/main.c
index 452e5ac749fbdf3d0ac6ce4e560f8866b06a22b1..2d3ca07af31e109e132ddbd2ea1e7711499a99f6 100644 (file)
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -844,9 +844,9 @@ appsetup( TrWindow *      wind,
           gboolean        forcepause,
           gboolean        isIconified )
 {
-    const pref_flag_t start =
-        forcepause ? PREF_FLAG_FALSE : PREF_FLAG_DEFAULT;
-    const pref_flag_t prompt = PREF_FLAG_DEFAULT;
+    const gboolean doStart = pref_flag_get( TR_PREFS_KEY_START ) && !forcepause;
+    const gboolean doPrompt = pref_flag_get( PREF_KEY_OPTIONS_PROMPT );
+    const gboolean doNotify = TRUE;
 
     /* fill out cbdata */
     cbdata->wind         = NULL;
@@ -873,7 +873,7 @@ appsetup( TrWindow *      wind,
 
     /* add torrents from command-line and saved state */
     tr_core_load( cbdata->core, forcepause );
-    tr_core_add_list( cbdata->core, torrentFiles, start, prompt, TRUE );
+    tr_core_add_list( cbdata->core, torrentFiles, doStart, doPrompt, doNotify );
     torrentFiles = NULL;
     tr_core_torrents_added( cbdata->core );
 

diff --git a/gtk/tr-core.c b/gtk/tr-core.c
index aedae60c03a15bd7a828f612b0161cc509dce6fe..47ff9f3663d132c34621ea1a9815fb6717755983 100644 (file)
--- a/gtk/tr-core.c
+++ b/gtk/tr-core.c
@@ -1189,15 +1189,13 @@ tr_core_present_window( TrCore      * core UNUSED,
 void
 tr_core_add_list( TrCore       * core,
                   GSList       * torrentFiles,
-                  pref_flag_t    start,
-                  pref_flag_t    prompt,
+                  gboolean       doStart,
+                  gboolean       doPrompt,
                   gboolean       doNotify )
 {
-    const gboolean doStart = pref_flag_eval( start, TR_PREFS_KEY_START );
-    const gboolean doPrompt = pref_flag_eval( prompt, PREF_KEY_OPTIONS_PROMPT );
     GSList * l;
 
-    for( l = torrentFiles; l != NULL; l = l->next )
+    for( l=torrentFiles; l!=NULL; l=l->next )
     {
         char * filename = l->data;
         add_filename( core, filename, doStart, doPrompt, doNotify );
@@ -1209,6 +1207,15 @@ tr_core_add_list( TrCore       * core,
     g_slist_free( torrentFiles );
 }
 
+void
+tr_core_add_list_defaults( TrCore * core, GSList * torrentFiles, gboolean doNotify )
+{
+    const gboolean doStart = pref_flag_get( TR_PREFS_KEY_START );
+    const gboolean doPrompt = pref_flag_get( PREF_KEY_OPTIONS_PROMPT );
+
+    tr_core_add_list( core, torrentFiles, doStart, doPrompt, doNotify );
+}
+
 void
 tr_core_torrents_added( TrCore * self )
 {

diff --git a/gtk/tr-core.h b/gtk/tr-core.h
index 811721950c18b970b1df4349a54a61214daa662f..4eb3f8593943e63ac783f299e59a802e5f0af6a2 100644 (file)
--- a/gtk/tr-core.h
+++ b/gtk/tr-core.h
@@ -29,7 +29,6 @@
 #include <gtk/gtk.h>
 
 #include <libtransmission/transmission.h>
-#include "conf.h" /* pref_flag_t */
 #include "tr-torrent.h"
 
 #define TR_CORE_TYPE ( tr_core_get_type( ) )
@@ -104,14 +103,15 @@ void tr_core_load( TrCore * self, gboolean forcepaused );
  * May pop up dialogs for each torrent if that preference is enabled.
  * May trigger one or more "error" signals with TR_CORE_ERR_ADD_TORRENT
  */
-void     tr_core_add_list( TrCore *    self,
-                           GSList *    torrentFiles,
-                           pref_flag_t start,
-                           pref_flag_t prompt,
-                           gboolean    doNotify );
-
-#define tr_core_add_list_defaults( c, l, doNotify ) \
-    tr_core_add_list( c, l, PREF_FLAG_DEFAULT, PREF_FLAG_DEFAULT, doNotify )
+void tr_core_add_list( TrCore *    self,
+                       GSList *    torrentFiles,
+                       gboolean    doStart,
+                       gboolean    doPrompt,
+                       gboolean    doNotify );
+
+void tr_core_add_list_defaults( TrCore    * core,
+                                GSList    * torrentFiles,
+                                gboolean    doNotify );
 
 
 /** @brief Add a torrent. */