Changeset 10382

Timestamp:

Mar 15, 2010, 2:35:43 PM (13 years ago)

Author:

charles

Message:

(trunk gtk) small filter/favicon code cleanups

Location:

trunk/gtk

Files:

• favicon.c (modified) (4 diffs)
• filter.c (modified) (18 diffs)

trunk/gtk/favicon.c

@@ -11 +11 @@
  */
 
-#include <glib/gstdio.h> /* g_remove */
+#include <glib/gstdio.h> /* g_remove() */
 #include <gtk/gtk.h>
 
 #include <libtransmission/transmission.h>
-#include <libtransmission/web.h> /* tr_webRun */
+#include <libtransmission/web.h> /* tr_webRun() */
 
 #include "favicon.h"
@@ -36 +36 @@
     if( dir == NULL )
     {
-        dir = g_build_filename( g_get_user_cache_dir(), "transmission", "favicons", NULL );
+        dir = g_build_filename( g_get_user_cache_dir(),
+                                "transmission",
+                                "favicons",
+                                NULL );
         gtr_mkdir_with_parents( dir, 0777 );
     }
@@ -64 +67 @@
     if( len > 0 )
     {
-        GInputStream * input_stream = g_memory_input_stream_new_from_data( data, len, NULL );
-        pixbuf = gdk_pixbuf_new_from_stream_at_scale( input_stream, 16, 16, TRUE, NULL, NULL );
-        g_object_unref( input_stream );
+        GInputStream * i = g_memory_input_stream_new_from_data( data, len, NULL );
+        pixbuf = gdk_pixbuf_new_from_stream_at_scale( i, 16, 16, TRUE, NULL, NULL );
+        g_object_unref( i );
     }
 
@@ -124 +127 @@
     
 void
-gtr_get_favicon( tr_session * session,
-                 const char * host, 
-                 GFunc pixbuf_ready_func, 
-                 gpointer pixbuf_ready_func_data )
+gtr_get_favicon( tr_session  * session,
+                 const char  * host, 
+                 GFunc         pixbuf_ready_func, 
+                 gpointer      pixbuf_ready_func_data )
 {
     GdkPixbuf * pixbuf = favicon_load_from_file( host );

trunk/gtk/filter.c

@@ -17 +17 @@
 #include <libtransmission/utils.h>
 
-#include "favicon.h"
+#include "favicon.h" /* gtr_get_favicon() */
 #include "filter.h"
 #include "hig.h" /* GUI_PAD */
-#include "tr-core.h"
+#include "tr-core.h" /* MC_TORRENT_RAW */
 #include "util.h" /* gtr_idle_add() */
 
-#define DIRTY_KEY          "tr-filter-dirty"
+#define DIRTY_KEY          "tr-filter-dirty-key"
 #define SESSION_KEY        "tr-session-key"
-#define TEXT_KEY           "tr-filter-text"
-#define TEXT_MODE_KEY      "tr-filter-text-mode"
+#define TEXT_KEY           "tr-filter-text-key"
+#define TEXT_MODE_KEY      "tr-filter-text-mode-key"
 #define TORRENT_MODEL_KEY  "tr-filter-torrent-model-key"
 
@@ -72 +72 @@
 }
 
+/* pattern-matching text; ie, legaltorrents.com */
 static char*
 get_host_from_url( const char * url )
@@ -93 +94 @@
 }
 
+/* human-readable name; ie, Legaltorrents */
 static char*
 get_name_from_host( const char * host )
@@ -131 +133 @@
 
         if( gtk_tree_model_get_iter( model, &iter, path ) )
-            gtk_tree_store_set( GTK_TREE_STORE( model ), &iter, CAT_FILTER_COL_PIXBUF, pixbuf, -1 );
+            gtk_tree_store_set( GTK_TREE_STORE( model ), &iter,
+                                CAT_FILTER_COL_PIXBUF, pixbuf,
+                                -1 );
 
         gtk_tree_path_free( path );
@@ -156 +160 @@
     GtkTreeModel * model = GTK_TREE_MODEL( store );
     GPtrArray * hosts = g_ptr_array_new( );
-    GHashTable * hosts_hash = g_hash_table_new_full( g_str_hash, g_str_equal, g_free, g_free );
+    GHashTable * hosts_hash = g_hash_table_new_full( g_str_hash, g_str_equal,
+                                                     g_free, g_free );
     GObject * o = G_OBJECT( store );
     GtkTreeModel * tmodel = GTK_TREE_MODEL(
@@ -229 +234 @@
     category_model_update_count( store, &iter, all );
 
-    /* update the "public" count */
+    /* update the "public" subtree */
     gtk_tree_model_iter_nth_child( model, &parent, NULL, 2 );
     gtk_tree_model_iter_nth_child( model, &iter, &parent, 0 );
@@ -247 +252 @@
     /* update the "hosts" subtree */
     gtk_tree_model_iter_nth_child( model, &parent, NULL, 4 );
-    i = 0;
-    n = hosts->len;
-    store_pos = 0;
-    for( ;; )
+    for( i=store_pos=0, n=hosts->len ; ; )
     {
         const gboolean new_hosts_done = i >= n;
@@ -391 +393 @@
 
 static gboolean
-is_it_a_separator( GtkTreeModel * model, GtkTreeIter * iter, gpointer data UNUSED )
+is_it_a_separator( GtkTreeModel * m, GtkTreeIter * iter, gpointer data UNUSED )
 {
     int type;
-    gtk_tree_model_get( model, iter, CAT_FILTER_COL_TYPE, &type, -1 );
+    gtk_tree_model_get( m, iter, CAT_FILTER_COL_TYPE, &type, -1 );
     return type == CAT_FILTER_TYPE_SEPARATOR;
 }
@@ -402 +404 @@
 {
     GObject * o = G_OBJECT( category_model );
-    gboolean pending = GPOINTER_TO_INT( g_object_get_data( o, DIRTY_KEY ) );
+    const gboolean pending = g_object_get_data( o, DIRTY_KEY ) != NULL;
     if( !pending )
     {
@@ -440 +442 @@
 }
 static void
-render_hit_count_func( GtkCellLayout    * cell_layout UNUSED,
-                       GtkCellRenderer  * cell_renderer,
-                       GtkTreeModel     * tree_model,
-                       GtkTreeIter      * iter,
-                       gpointer           data UNUSED )
+render_number_func( GtkCellLayout    * cell_layout UNUSED,
+                    GtkCellRenderer  * cell_renderer,
+                    GtkTreeModel     * tree_model,
+                    GtkTreeIter      * iter,
+                    gpointer           data UNUSED )
 {
     int count;
@@ -503 +505 @@
     r = number_renderer_new( );
     gtk_cell_layout_pack_end( GTK_CELL_LAYOUT( c ), r, TRUE );
-    gtk_cell_layout_set_cell_data_func( GTK_CELL_LAYOUT( c ), r, render_hit_count_func, NULL, NULL );
+    gtk_cell_layout_set_cell_data_func( GTK_CELL_LAYOUT( c ), r, render_number_func, NULL, NULL );
 
     g_signal_connect( tmodel, "row-changed",
@@ -514 +516 @@
     return c;
 }
-
-/***
-****
-***/
 
 static gboolean
@@ -627 +625 @@
         case STATE_FILTER_ACTIVE:
             return ( st->peersSendingToUs > 0 )
-                || ( st->peersGettingFromUs > 0 );
+                || ( st->peersGettingFromUs > 0 )
                 || ( st->activity == TR_STATUS_CHECK );
 
@@ -668 +666 @@
 {
     int count;
-    gtk_tree_model_get( GTK_TREE_MODEL( store ), iter, STATE_FILTER_COL_COUNT, &count, -1 );
+    GtkTreeModel * model = GTK_TREE_MODEL( store );
+    gtk_tree_model_get( model, iter, STATE_FILTER_COL_COUNT, &count, -1 );
     if( n != count )
         gtk_list_store_set( store, iter, STATE_FILTER_COL_COUNT, n, -1 );
@@ -719 +718 @@
         { STATE_FILTER_PAUSED, N_( "Paused" ) },
         { STATE_FILTER_QUEUED, N_( "Queued" ) },
-        { STATE_FILTER_CHECKING, N_( "Verifying" ) },
+        { STATE_FILTER_VERIFYING, N_( "Verifying" ) },
         { STATE_FILTER_ERROR, N_( "Error" ) }
     };
     GtkListStore * store;
 
-    store = gtk_list_store_new( STATE_FILTER_N_COLS, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT );
+    store = gtk_list_store_new( STATE_FILTER_N_COLS,
+                                G_TYPE_STRING,
+                                G_TYPE_INT,
+                                G_TYPE_INT );
     for( i=0, n=G_N_ELEMENTS(types); i<n; ++i )
         gtk_list_store_insert_with_values( store, NULL, -1,
@@ -740 +742 @@
 {
     GObject * o = G_OBJECT( state_model );
-    gboolean pending = GPOINTER_TO_INT( g_object_get_data( o, DIRTY_KEY ) );
+    const gboolean pending = g_object_get_data( o, DIRTY_KEY ) != NULL;
     if( !pending )
     {
@@ -785 +787 @@
     r = number_renderer_new( );
     gtk_cell_layout_pack_end( GTK_CELL_LAYOUT( c ), r, TRUE );
-    gtk_cell_layout_set_cell_data_func( GTK_CELL_LAYOUT( c ), r, render_hit_count_func, NULL, NULL );
+    gtk_cell_layout_set_cell_data_func( GTK_CELL_LAYOUT( c ), r, render_number_func, NULL, NULL );
 
     g_signal_connect( tmodel, "row-changed",
@@ -971 +973 @@
     g_object_set_data( G_OBJECT( gtk_combo_box_get_model( GTK_COMBO_BOX( data->category ) ) ), SESSION_KEY, session );
 
-    gtk_tree_model_filter_set_visible_func( GTK_TREE_MODEL_FILTER( data->filter_model ),
-                                            is_row_visible, data, g_free );
+    gtk_tree_model_filter_set_visible_func(
+        GTK_TREE_MODEL_FILTER( data->filter_model ),
+        is_row_visible, data, g_free );
 
     g_signal_connect( data->category, "changed", G_CALLBACK( selection_changed_cb ), data );