Changeset 4998 for trunk/gtk/tr_core.c

Timestamp:

Feb 9, 2008, 5:29:05 PM (14 years ago)

Author:

charles

Message:

(gtk) make TrCore?'s fields private

File:

• trunk/gtk/tr_core.c (modified) (17 diffs)

trunk/gtk/tr_core.c

@@ -39 +39 @@
 #include "util.h"
 
+struct TrCorePrivate
+{
+    GtkTreeModel     * model;
+    tr_handle        * handle;
+    int                nextid;
+    gboolean           quitting;
+    struct core_stats  stats;
+};
+
 static void
 tr_core_marshal_err( GClosure * closure, GValue * ret UNUSED, guint count,
@@ -118 +127 @@
 }
 
+static int
+isDisposed( const TrCore * core )
+{
+    return !core || !core->priv;
+}
+
 static void
 tr_core_dispose( GObject * obj )
 {
-    TrCore       * self = (TrCore *) obj;
+    TrCore * core = TR_CORE( obj );
     GObjectClass * parent;
 
-    if( self->disposed )
-        return;
-
-    self->disposed = TRUE;
-    pref_save( NULL );
+    if( !isDisposed( core ) )
+    {
+        pref_save( NULL );
+        core->priv = NULL;
+    }
+
     parent = g_type_class_peek( g_type_parent( TR_CORE_TYPE ) );
     parent->dispose( obj );
@@ -142 +158 @@
     gobject_class = G_OBJECT_CLASS( g_class );
     gobject_class->dispose = tr_core_dispose;
+
+    g_type_class_add_private( g_class,
+                              sizeof(struct TrCorePrivate) );
+
 
     core_class = TR_CORE_CLASS( g_class );
@@ -292 +312 @@
     int col = MC_TORRENT_RAW;
     GtkSortType type = isReversed ? GTK_SORT_ASCENDING : GTK_SORT_DESCENDING;
-    GtkTreeSortable * sortable = GTK_TREE_SORTABLE( core->model );
+    GtkTreeModel * model = tr_core_model( core );
+    GtkTreeSortable * sortable = GTK_TREE_SORTABLE( model );
 
     if( !strcmp( mode, "sort-by-activity" ) )
@@ -325 +346 @@
     {
         const uint16_t val = pref_int_get( key );
-        tr_setGlobalPeerLimit( core->handle, val );
+        tr_setGlobalPeerLimit( tr_core_handle( core ), val );
     }
 }
@@ -335 +356 @@
     TrCore * self = (TrCore *) instance;
     GtkListStore * store;
+    struct TrCorePrivate * p;
 
     /* column types for the model used to store torrent information */
@@ -347 +369 @@
         G_TYPE_INT        /* ID for IPC */
     };
+
+    p = self->priv = G_TYPE_INSTANCE_GET_PRIVATE( self,
+                                                  TR_CORE_TYPE,
+                                                  struct TrCorePrivate );
+
 
     h = tr_initFull( "gtk",
@@ -367 +394 @@
     store = gtk_list_store_newv( MC_ROW_COUNT, types );
 
-    self->model    = GTK_TREE_MODEL( store );
-    self->handle   = h;
-    self->nextid   = 1;
-    self->quitting = FALSE;
-    self->disposed = FALSE;
+    p->model    = GTK_TREE_MODEL( store );
+    p->handle   = h;
+    p->nextid   = 1;
+    p->quitting = FALSE;
 }
 
@@ -419 +445 @@
 
 GtkTreeModel *
-tr_core_model( TrCore * self )
-{
-    g_return_val_if_fail (TR_IS_CORE(self), NULL);
-
-    return self->disposed ? NULL : self->model;
+tr_core_model( TrCore * core )
+{
+    return isDisposed( core ) ? NULL : core->priv->model;
 }
 
 tr_handle *
-tr_core_handle( TrCore * self )
-{
-    g_return_val_if_fail (TR_IS_CORE(self), NULL);
-
-    return self->disposed ? NULL : self->handle;
+tr_core_handle( TrCore * core )
+{
+    return isDisposed( core ) ? NULL : core->priv->handle;
+}
+
+
+const struct core_stats*
+tr_core_get_stats( const TrCore * core )
+{
+    return isDisposed( core ) ? NULL : &core->priv->stats;
 }
 
@@ -464 +493 @@
     const tr_stat * torStat = tr_torrent_stat( tor );
     char * collated = doCollate( inf->name );
+    GtkListStore * store = GTK_LIST_STORE( tr_core_model( self ) );
     GtkTreeIter unused;
-    gtk_list_store_insert_with_values( GTK_LIST_STORE( self->model ), &unused, 0, 
+    gtk_list_store_insert_with_values( store, &unused, 0, 
                                        MC_NAME,          inf->name,
                                        MC_NAME_COLLATED, collated,
@@ -472 +502 @@
                                        MC_TORRENT_RAW,   tor->handle,
                                        MC_STATUS,        torStat->status,
-                                       MC_ID,            self->nextid,
+                                       MC_ID,            self->priv->nextid,
                                        -1);
-    self->nextid++;
+    self->priv->nextid++;
     g_object_unref( tor );
     g_free( collated );
@@ -492 +522 @@
     path = getdownloaddir( );
 
-    ctor = tr_ctorNew( self->handle );
+    ctor = tr_ctorNew( tr_core_handle( self ) );
     if( forcePaused )
         tr_ctorSetPaused( ctor, TR_FORCE, TRUE );
@@ -498 +528 @@
     tr_ctorSetMaxConnectedPeers( ctor, TR_FALLBACK, pref_int_get( PREF_KEY_MAX_PEERS_PER_TORRENT ) );
 
-    torrents = tr_loadTorrents ( self->handle, ctor, &count );
+    torrents = tr_loadTorrents ( tr_core_handle( self ), ctor, &count );
     for( i=0; i<count; ++i )
         tr_core_insert( self, tr_torrent_new_preexisting( torrents[i] ) );
@@ -544 +574 @@
 
     errstr = NULL;
-    tor = tr_torrent_new( self->handle, path, dir, act, paused, &errstr );
+    tor = tr_torrent_new( tr_core_handle( self ), path, dir, act, paused, &errstr );
     if( NULL == tor )
     {
@@ -613 +643 @@
     TR_IS_CORE( self );
 
-    tor = tr_torrent_new_with_data( self->handle, data, size, dir,
+    tor = tr_torrent_new_with_data( tr_core_handle( self ), data, size, dir,
                                     paused, &errstr );
     if( NULL == tor )
@@ -641 +671 @@
 {
     TrTorrent * tor;
+    GtkTreeModel * model = tr_core_model( self );
 
     TR_IS_CORE( self );
 
-    gtk_tree_model_get( self->model, iter, MC_TORRENT, &tor, -1 );
-    gtk_list_store_remove( GTK_LIST_STORE( self->model ), iter );
+    gtk_tree_model_get( model, iter, MC_TORRENT, &tor, -1 );
+    gtk_list_store_remove( GTK_LIST_STORE( model ), iter );
     tr_torrentRemoveSaved( tr_torrent_handle( tor ) );
 
     g_object_unref( G_OBJECT( tor ) );
 }
+
+/***
+****
+***/
 
 static gboolean
@@ -694 +729 @@
     GtkSortType order;
     GtkTreeSortable * sortable;
+    GtkTreeModel * model = tr_core_model( self );
 
     /* pause sorting */
-    sortable = GTK_TREE_SORTABLE( self->model );
+    sortable = GTK_TREE_SORTABLE( model );
     gtk_tree_sortable_get_sort_column_id( sortable, &column, &order );
     gtk_tree_sortable_set_sort_column_id( sortable, GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID, order );
 
     /* refresh the model */
-    memset( &self->stats, 0, sizeof( struct core_stats ) );
-    gtk_tree_model_foreach( self->model, update_foreach, &self->stats );
+    memset( &self->priv->stats, 0, sizeof( struct core_stats ) );
+    gtk_tree_model_foreach( model, update_foreach, &self->priv->stats );
 
     /* resume sorting */