Changeset 6978

Timestamp:

Oct 28, 2008, 7:49:33 PM (12 years ago)

Author:

charles

Message:

janitorial: tr_handle -> tr_session

Location:

trunk

Files:

• cli/cli.c (modified) (2 diffs)
• daemon/daemon.c (modified) (1 diff)
• gtk/add-dialog.c (modified) (3 diffs)
• gtk/blocklist.c (modified) (1 diff)
• gtk/main.c (modified) (6 diffs)
• gtk/makemeta-ui.c (modified) (4 diffs)
• gtk/makemeta-ui.h (modified) (1 diff)
• gtk/stats.c (modified) (2 diffs)
• gtk/tr-core.c (modified) (12 diffs)
• gtk/tr-core.h (modified) (2 diffs)
• gtk/tr-prefs.c (modified) (6 diffs)
• gtk/tr-torrent.c (modified) (2 diffs)
• gtk/tr-torrent.h (modified) (1 diff)
• gtk/tr-window.c (modified) (7 diffs)

trunk/cli/cli.c

@@ -184 +184 @@
 
 static void
-scrapeDoneFunc( struct tr_handle    * session UNUSED,
-                long                  response_code,
-                const void *          response,
-                size_t                response_byte_count,
-                void *                host )
+scrapeDoneFunc( tr_session   * session UNUSED,
+                long           response_code,
+                const void   * response,
+                size_t         response_byte_count,
+                void         * host )
 {
     tr_benc top, *files;
@@ -305 +305 @@
       char ** argv )
 {
-    int          error;
-    tr_handle *  h;
-    tr_ctor *    ctor;
-    tr_torrent * tor = NULL;
+    int           error;
+    tr_session  * h;
+    tr_ctor     * ctor;
+    tr_torrent  * tor = NULL;
 
     printf( "Transmission %s - http://www.transmissionbt.com/\n",

trunk/daemon/daemon.c

@@ -30 +30 @@
 #define MY_NAME "transmission-daemon"
 
-static int         closing = FALSE;
-static tr_handle * mySession;
-static char      * myConfigFilename = NULL;
+static int           closing = FALSE;
+static tr_session  * mySession = NULL;
+static char        * myConfigFilename = NULL;
 
 #define KEY_BLOCKLIST         "blocklist-enabled"

trunk/gtk/add-dialog.c

@@ -169 +169 @@
         int          new_file = 0;
         tr_torrent * torrent;
-        tr_handle *  handle = tr_core_handle( data->core );
+        tr_session * session = tr_core_session( data->core );
 
         if( filename
@@ -184 +184 @@
         tr_ctorSetDeleteSource( data->ctor, FALSE );
 
-        if( ( torrent = tr_torrentNew( handle, data->ctor, &err ) ) )
+        if( ( torrent = tr_torrentNew( session, data->ctor, &err ) ) )
         {
             removeOldTorrent( data );
@@ -408 +408 @@
     if( response == GTK_RESPONSE_ACCEPT )
     {
-        GtkWidget *       w = gtk_file_chooser_get_extra_widget(
-             GTK_FILE_CHOOSER( dialog ) );
-        const gboolean    showOptions = gtk_toggle_button_get_active(
-             GTK_TOGGLE_BUTTON ( w ) );
+        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;
-        GSList *          l = gtk_file_chooser_get_filenames(
-             GTK_FILE_CHOOSER( dialog ) );
+        const pref_flag_t prompt = showOptions
+                                 ? PREF_FLAG_TRUE
+                                 : PREF_FLAG_FALSE;
+        GSList * l = gtk_file_chooser_get_filenames( chooser );
+
         tr_core_add_list( core, l, start, prompt );
     }

trunk/gtk/blocklist.c

@@ -140 +140 @@
     {
         emitProgress( core, FALSE, _( "Parsing blocklist..." ) );
-        rules = tr_blocklistSetContent( tr_core_handle( core ), filename2 );
+        rules = tr_blocklistSetContent( tr_core_session( core ), filename2 );
     }
 

trunk/gtk/main.c

@@ -311 +311 @@
 
 static tr_rpc_callback_status
-onRPCChanged( tr_handle             * handle UNUSED,
+onRPCChanged( tr_session            * session UNUSED,
               tr_rpc_callback_type    type,
               struct tr_torrent     * tor,
@@ -440 +440 @@
         GtkWindow * win;
 
-        tr_handle * h = tr_sessionInitFull(
+        tr_session * h = tr_sessionInitFull(
             configDir,
             "gtk",
@@ -502 +502 @@
 updateScheduledLimits( gpointer data )
 {
-    tr_handle *     tr = (tr_handle *) data;
+    tr_session *    tr = data;
     static gboolean last_state = FALSE;
     gboolean        in_sched_state = FALSE;
@@ -642 +642 @@
 
     /* start scheduled rate timer */
-    updateScheduledLimits ( tr_core_handle( cbdata->core ) );
+    updateScheduledLimits ( tr_core_session( cbdata->core ) );
     g_timeout_add( 60 * 1000, updateScheduledLimits,
-                  tr_core_handle( cbdata->core ) );
+                  tr_core_session( cbdata->core ) );
 
     /* either show the window or iconify it */
@@ -1098 +1098 @@
               gpointer      data )
 {
-    struct cbdata * cbdata = data;
-    tr_handle *     tr     = tr_core_handle( cbdata->core );
+    struct cbdata  * cbdata = data;
+    tr_session     * tr     = tr_core_session( cbdata->core );
 
     if( !strcmp( key, PREF_KEY_ENCRYPTION ) )
@@ -1489 +1489 @@
     {
         GtkWidget * w = make_meta_ui( GTK_WINDOW( data->wind ),
-                                     tr_core_handle( data->core ) );
+                                     tr_core_session( data->core ) );
         gtk_widget_show_all( w );
     }

trunk/gtk/makemeta-ui.c

@@ -32 +32 @@
 typedef struct
 {
-    GtkWidget *            filename_entry;
-    GtkWidget *            size_lb;
-    GtkWidget *            pieces_lb;
-    GtkWidget *            announce_list;
-    GtkWidget *            comment_entry;
-    GtkWidget *            progressbar;
-    GtkWidget *            private_check;
-    GtkWidget *            dialog;
-
-    tr_metainfo_builder *  builder;
-    tr_handle *            handle;
+    GtkWidget * filename_entry;
+    GtkWidget * size_lb;
+    GtkWidget * pieces_lb;
+    GtkWidget * announce_list;
+    GtkWidget * comment_entry;
+    GtkWidget * progressbar;
+    GtkWidget * private_check;
+    GtkWidget * dialog;
+
+    tr_metainfo_builder   *  builder;
+    tr_session            *  session;
 
     gboolean               isBuilding;
@@ -304 +304 @@
     if( ui->builder )
         tr_metaInfoBuilderFree( ui->builder );
-    ui->builder = tr_metaInfoBuilderCreate( ui->handle, filename );
+    ui->builder = tr_metaInfoBuilderCreate( ui->session, filename );
     refreshFromBuilder( ui );
 }
@@ -365 +365 @@
 
 GtkWidget*
-make_meta_ui( GtkWindow * parent,
-              tr_handle * handle )
+make_meta_ui( GtkWindow  * parent,
+              tr_session * session )
 {
     int          n;
@@ -374 +374 @@
     MakeMetaUI * ui = g_new0 ( MakeMetaUI, 1 );
 
-    ui->handle = handle;
+    ui->session = session;
 
     d = gtk_dialog_new_with_buttons( _(

trunk/gtk/makemeta-ui.h

@@ -17 +17 @@
 #include <libtransmission/transmission.h>
 
-GtkWidget* make_meta_ui( GtkWindow * parent,
-                         tr_handle * handle );
+GtkWidget* make_meta_ui( GtkWindow  * parent,
+                         tr_session * session );
 
 #endif

trunk/gtk/stats.c

@@ -62 +62 @@
     tr_session_stats one, all;
 
-    tr_sessionGetStats( tr_core_handle( ui->core ), &one );
-    tr_sessionGetCumulativeStats( tr_core_handle( ui->core ), &all );
+    tr_sessionGetStats( tr_core_session( ui->core ), &one );
+    tr_sessionGetCumulativeStats( tr_core_session( ui->core ), &all );
 
     setLabel( ui->one_up_lb,
@@ -104 +104 @@
     if( response == TR_RESPONSE_CLEAR )
     {
-        tr_handle * handle = tr_core_handle( ui->core );
-        tr_sessionClearStats( handle );
+        tr_sessionClearStats( tr_core_session( ui->core ) );
         updateStats( ui );
     }

trunk/gtk/tr-core.c

@@ -66 +66 @@
     guint           inhibit_cookie;
     GtkTreeModel *  model;
-    tr_handle *     handle;
+    tr_session *    session;
 };
 
@@ -588 +588 @@
     {
         const uint16_t val = pref_int_get( key );
-        tr_sessionSetPeerLimit( tr_core_handle( core ), val );
+        tr_sessionSetPeerLimit( tr_core_session( core ), val );
     }
     else if( !strcmp( key, PREF_KEY_INHIBIT_HIBERNATION ) )
@@ -675 +675 @@
 
 TrCore *
-tr_core_new( tr_handle * h )
+tr_core_new( tr_session * session )
 {
     TrCore * core = TR_CORE( g_object_new( TR_CORE_TYPE, NULL ) );
 
-    core->priv->handle   = h;
+    core->priv->session  = session;
 
     /* init from prefs & listen to pref changes */
@@ -696 +696 @@
 tr_core_close( TrCore * core )
 {
-    tr_handle * handle = tr_core_handle( core );
-
-    if( handle )
-    {
-        core->priv->handle = NULL;
-        tr_sessionClose( handle );
+    tr_session * session = tr_core_session( core );
+
+    if( session )
+    {
+        core->priv->session = NULL;
+        tr_sessionClose( session );
     }
 }
@@ -711 +711 @@
 }
 
-tr_handle *
-tr_core_handle( TrCore * core )
-{
-    return isDisposed( core ) ? NULL : core->priv->handle;
+tr_session *
+tr_core_session( TrCore * core )
+{
+    return isDisposed( core ) ? NULL : core->priv->session;
 }
 
@@ -746 +746 @@
     if( !isDisposed( core ) )
     {
-        tr_sessionGetSpeed( core->priv->handle,
+        tr_sessionGetSpeed( core->priv->session,
                             &setme->clientDownloadSpeed,
                             &setme->clientUploadSpeed );
@@ -816 +816 @@
     tr_ctor *     ctor;
 
-    ctor = tr_ctorNew( tr_core_handle( self ) );
+    ctor = tr_ctorNew( tr_core_session( self ) );
     if( forcePaused )
         tr_ctorSetPaused( ctor, TR_FORCE, TRUE );
@@ -822 +822 @@
                         pref_int_get( PREF_KEY_MAX_PEERS_PER_TORRENT ) );
 
-    torrents = tr_sessionLoadTorrents ( tr_core_handle(
-                                            self ), ctor, &count );
+    torrents = tr_sessionLoadTorrents ( tr_core_session( self ), ctor, &count );
     for( i = 0; i < count; ++i )
         tr_core_add_torrent( self, tr_torrent_new_preexisting( torrents[i] ) );
@@ -856 +855 @@
               gboolean     doPrompt )
 {
-    tr_handle * handle = tr_core_handle( core );
-
-    if( filename && handle )
+    tr_session * session = tr_core_session( core );
+
+    if( filename && session )
     {
         int       err;
-        tr_ctor * ctor = tr_ctorNew( handle );
+        tr_ctor * ctor = tr_ctorNew( session );
         tr_core_apply_defaults( ctor );
         tr_ctorSetPaused( ctor, TR_FORCE, !doStart );
@@ -869 +868 @@
             tr_ctorFree( ctor );
         }
-        else if( ( err = tr_torrentParse( handle, ctor, NULL ) ) )
+        else if( ( err = tr_torrentParse( session, ctor, NULL ) ) )
         {
             /* don't complain about .torrent files in the watch directory
@@ -886 +885 @@
         else
         {
-            tr_torrent * tor = tr_torrentNew( handle, ctor, &err );
+            tr_torrent * tor = tr_torrentNew( session, ctor, &err );
             if( err )
                 tr_core_errsig( core, err, filename );
@@ -1194 +1193 @@
     if( inhibit ) {
         gboolean active = FALSE;
-        tr_handle *  session = tr_core_handle( core );
+        tr_session *  session = tr_core_session( core );
         tr_torrent * tor = NULL;
         while(( tor = tr_torrentNext( session, tor )))

trunk/gtk/tr-core.h

@@ -98 +98 @@
 GType          tr_core_get_type( void );
 
-TrCore *       tr_core_new( tr_handle * );
+TrCore *       tr_core_new( tr_session * );
 
 void           tr_core_close( TrCore* );
@@ -105 +105 @@
 GtkTreeModel * tr_core_model( TrCore * self );
 
-tr_handle *    tr_core_handle( TrCore * self );
+tr_session *   tr_core_session( TrCore * self );
 
 void           tr_core_get_stats( const TrCore *      core,

trunk/gtk/tr-prefs.c

@@ -428 +428 @@
                      TrCore *    core )
 {
-    const int n = tr_blocklistGetRuleCount( tr_core_handle( core ) );
+    const int n = tr_blocklistGetRuleCount( tr_core_session( core ) );
     char      buf[512];
 
@@ -537 +537 @@
     b = gtr_button_new_from_stock( GTK_STOCK_REFRESH, _( "_Update" ) );
     data->check = w;
-    g_object_set_data( G_OBJECT( b ), "handle",
-                      tr_core_handle( TR_CORE( core ) ) );
+    g_object_set_data( G_OBJECT( b ), "session",
+                      tr_core_session( TR_CORE( core ) ) );
     g_signal_connect( b, "clicked", G_CALLBACK( onUpdateBlocklistCB ), data );
     gtk_box_pack_start( GTK_BOX( h ), b, FALSE, FALSE, 0 );
@@ -1229 +1229 @@
 
 static void
-testing_port_done( tr_handle   * handle        UNUSED,
+testing_port_done( tr_session * session        UNUSED,
                    long          response_code UNUSED,
                    const void *                response,
@@ -1258 +1258 @@
                                                       data->label ),
                                                   "tr-port-spin" );
-        tr_handle *     handle = g_object_get_data( G_OBJECT(
+        tr_session *     session = g_object_get_data( G_OBJECT(
                                                         data->label ),
-                                                    "handle" );
+                                                    "session" );
         const int       port = gtk_spin_button_get_value_as_int( spin );
         char            url[256];
@@ -1266 +1266 @@
                     "http://portcheck.transmissionbt.com/%d",
                     port );
-        tr_webRun( handle, url, NULL, testing_port_done, data );
+        tr_webRun( session, url, NULL, testing_port_done, data );
     }
     return FALSE;
@@ -1347 +1347 @@
 
     g_object_set_data( G_OBJECT( l ), "tr-port-spin", w2 );
-    g_object_set_data( G_OBJECT( l ), "handle",
-                      tr_core_handle( TR_CORE( core ) ) );
+    g_object_set_data( G_OBJECT( l ), "session",
+                      tr_core_session( TR_CORE( core ) ) );
     data->id = g_signal_connect( TR_CORE(
                                      core ), "prefs-changed",

trunk/gtk/tr-torrent.c

@@ -188 +188 @@
 
 TrTorrent *
-tr_torrent_new_ctor( tr_handle * handle,
-                     tr_ctor *   ctor,
-                     char **     err )
+tr_torrent_new_ctor( tr_session   * session,
+                     tr_ctor      * ctor,
+                     char        ** err )
 {
     tr_torrent * tor;
@@ -203 +203 @@
     tr_ctorGetDeleteSource( ctor, &doTrash );
     tr_ctorSetDeleteSource( ctor, FALSE );
-    tor = tr_torrentNew( handle, ctor, &errcode );
+    tor = tr_torrentNew( session, ctor, &errcode );
 
     if( tor && doTrash )
     {
-        const char * config = tr_sessionGetConfigDir( handle );
+        const char * config = tr_sessionGetConfigDir( session );
         const char * source = tr_ctorGetSourceFile( ctor );
         const int is_internal = source && ( strstr( source, config ) == source );

trunk/gtk/tr-torrent.h

@@ -74 +74 @@
 TrTorrent *    tr_torrent_new_preexisting( tr_torrent * tor );
 
-TrTorrent *    tr_torrent_new_ctor( tr_handle * handle,
-                                    tr_ctor *   ctor,
-                                    char **     err );
+TrTorrent *    tr_torrent_new_ctor( tr_session  * session,
+                                    tr_ctor     * ctor,
+                                    char       ** err );
 
 void           tr_torrent_set_remove_flag( TrTorrent *,

trunk/gtk/tr-window.c

@@ -726 +726 @@
     char                    up[32], down[32], ratio[32], buf[128];
     struct tr_session_stats stats;
-    tr_handle *             handle = tr_core_handle( p->core );
+    tr_session *            session = tr_core_session( p->core );
 
     /* update the stats */
@@ -732 +732 @@
     if( !strcmp( pch, "session-ratio" ) )
     {
-        tr_sessionGetStats( handle, &stats );
+        tr_sessionGetStats( session, &stats );
         tr_strlratio( ratio, stats.ratio, sizeof( ratio ) );
         g_snprintf( buf, sizeof( buf ), _( "Ratio: %s" ), ratio );
@@ -738 +738 @@
     else if( !strcmp( pch, "session-transfer" ) )
     {
-        tr_sessionGetStats( handle, &stats );
+        tr_sessionGetStats( session, &stats );
         tr_strlsize( up, stats.uploadedBytes, sizeof( up ) );
         tr_strlsize( down, stats.downloadedBytes, sizeof( down ) );
@@ -749 +749 @@
     else if( !strcmp( pch, "total-transfer" ) )
     {
-        tr_sessionGetCumulativeStats( handle, &stats );
+        tr_sessionGetCumulativeStats( session, &stats );
         tr_strlsize( up, stats.uploadedBytes, sizeof( up ) );
         tr_strlsize( down, stats.downloadedBytes, sizeof( down ) );
@@ -760 +760 @@
     else     /* default is total-ratio */
     {
-        tr_sessionGetCumulativeStats( handle, &stats );
+        tr_sessionGetCumulativeStats( session, &stats );
         tr_strlratio( ratio, stats.ratio, sizeof( ratio ) );
         g_snprintf( buf, sizeof( buf ), _( "Ratio: %s" ), ratio );
@@ -772 +772 @@
     char        buf[128];
     float       u, d;
-    tr_handle * handle = tr_core_handle( p->core );
-
-    tr_sessionGetSpeed( handle, &d, &u );
+    tr_session * session = tr_core_session( p->core );
+
+    tr_sessionGetSpeed( session, &d, &u );
     tr_strlspeed( buf, d, sizeof( buf ) );
     gtk_label_set_text( GTK_LABEL( p->dl_lb ), buf );
@@ -786 +786 @@
     PrivateData * p = get_private_data( self );
 
-    if( p && p->core && tr_core_handle( p->core ) )
+    if( p && p->core && tr_core_session( p->core ) )
     {
         updateSpeeds( p );