Changeset 11040

Timestamp:

Jul 23, 2010, 7:10:02 PM (12 years ago)

Author:

charles

Message:

(trunk gtk) minor cleanup to last night's ComboBox? utilities

Location:

trunk/gtk

Files:

• details.c (modified) (2 diffs)
• msgwin.c (modified) (2 diffs)
• tr-prefs.c (modified) (4 diffs)
• util.c (modified) (4 diffs)
• util.h (modified) (1 diff)

trunk/gtk/details.c

@@ -262 +262 @@
         if( i == n ) {
             g_signal_handler_block( di->bandwidthCombo, di->bandwidthComboTag );
-            gtr_priority_combo_set_value( di->bandwidthCombo, baseline );
+            gtr_priority_combo_set_value( GTK_COMBO_BOX( di->bandwidthCombo ), baseline );
             g_signal_handler_unblock( di->bandwidthCombo, di->bandwidthComboTag );
         }
@@ -419 +419 @@
 
 static void
-onPriorityChanged( GtkComboBox * w, struct DetailsImpl * di )
-{
-    const tr_priority_t priority = gtr_priority_combo_get_value( GTK_WIDGET( w ) );
+onPriorityChanged( GtkComboBox * combo_box, struct DetailsImpl * di )
+{
+    const tr_priority_t priority = gtr_priority_combo_get_value( combo_box );
     torrent_set_int( di, "bandwidthPriority", priority );
 }

trunk/gtk/msgwin.c

@@ -56 +56 @@
 
 static void
-level_combo_changed_cb( GtkWidget * w, gpointer gdata )
+level_combo_changed_cb( GtkComboBox * combo_box, gpointer gdata )
 {
     struct MsgData * data = gdata;
-    const int level = gtr_combo_box_get_active_val( w );
+    const int level = gtr_combo_box_get_active_enum( combo_box );
 
     tr_setMessageLevel( level );
@@ -366 +366 @@
                                             _( "Debug" ),       TR_MSG_DBG,
                                             NULL );
-    gtr_combo_box_set_active_val( w, pref_int_get( TR_PREFS_KEY_MSGLEVEL ) );
+    gtr_combo_box_set_active_enum( GTK_COMBO_BOX( w ), pref_int_get( TR_PREFS_KEY_MSGLEVEL ) );
     return w;
 }

trunk/gtk/tr-prefs.c

@@ -449 +449 @@
 
 static void
-onIntComboChanged( GtkComboBox * w, gpointer core )
-{
-    const int val = gtr_combo_box_get_active_val( GTK_WIDGET( w ) );
-    const char * key = g_object_get_data( G_OBJECT( w ), PREF_KEY );
+onIntComboChanged( GtkComboBox * combo_box, gpointer core )
+{
+    const int val = gtr_combo_box_get_active_enum( combo_box );
+    const char * key = g_object_get_data( G_OBJECT( combo_box ), PREF_KEY );
     tr_core_set_pref_int( TR_CORE( core ), key, val );
 }
@@ -463 +463 @@
                                             _( "Require encryption" ), TR_ENCRYPTION_REQUIRED,
                                             NULL );
-    gtr_combo_box_set_active_val( w, pref_int_get( key ) );
+    gtr_combo_box_set_active_enum( GTK_COMBO_BOX( w ), pref_int_get( key ) );
     g_object_set_data_full( G_OBJECT( w ), PREF_KEY, tr_strdup( key ), g_free );
     g_signal_connect( w, "changed", G_CALLBACK( onIntComboChanged ), core );
@@ -918 +918 @@
                                              "SOCKS5", TR_PROXY_SOCKS5,
                                              NULL );
-    gtr_combo_box_set_active_val( w, pref_int_get( key ) );
+    gtr_combo_box_set_active_enum( GTK_COMBO_BOX( w ), pref_int_get( key ) );
     g_object_set_data_full( G_OBJECT( w ), PREF_KEY, tr_strdup( key ), g_free );
     g_signal_connect( w, "changed", G_CALLBACK( onIntComboChanged ), core );
@@ -1084 +1084 @@
                                             _( "Saturday" ),  TR_SCHED_SAT,
                                             NULL );
-    gtr_combo_box_set_active_val( w, pref_int_get( key ) );
+    gtr_combo_box_set_active_enum( GTK_COMBO_BOX( w ), pref_int_get( key ) );
     g_object_set_data_full( G_OBJECT( w ), PREF_KEY, tr_strdup( key ), g_free );
     g_signal_connect( w, "changed", G_CALLBACK( onIntComboChanged ), core );

trunk/gtk/util.c

@@ -654 +654 @@
 
 void
-gtr_combo_box_set_active_val( GtkWidget * w, int value )
+gtr_combo_box_set_active_enum( GtkComboBox * combo_box, int value )
 {
     int i;
@@ -660 +660 @@
     const int column = 0;
     GtkTreeIter iter;
-    GtkComboBox * combobox = GTK_COMBO_BOX( w );
-    GtkTreeModel * model = gtk_combo_box_get_model( combobox );
+    GtkTreeModel * model = gtk_combo_box_get_model( combo_box );
 
     /* do the value and current value match? */
-    if( gtk_combo_box_get_active_iter( combobox, &iter ) ) {
+    if( gtk_combo_box_get_active_iter( combo_box, &iter ) ) {
         gtk_tree_model_get( model, &iter, column, &currentValue, -1 );
         if( currentValue == value )
@@ -675 +674 @@
         gtk_tree_model_get( model, &iter, column, &currentValue, -1 );
         if( currentValue == value ) {
-            gtk_combo_box_set_active_iter( combobox, &iter );
+            gtk_combo_box_set_active_iter( combo_box, &iter );
             return;
         }
@@ -714 +713 @@
 
 int
-gtr_combo_box_get_active_val( GtkWidget * w )
+gtr_combo_box_get_active_enum( GtkComboBox * combo_box )
 {
     int value = 0;
     GtkTreeIter iter;
-    GtkComboBox * combo_box = GTK_COMBO_BOX( w );
 
     if( gtk_combo_box_get_active_iter( combo_box, &iter ) )

trunk/gtk/util.h

@@ -170 +170 @@
 
 GtkWidget * gtr_priority_combo_new( void );
-#define gtr_priority_combo_get_value(w) gtr_combo_box_get_active_val(w)
-#define gtr_priority_combo_set_value(w,val) gtr_combo_box_set_active_val(w,val)
-
-GtkWidget * gtr_combo_box_new_enum( const char * text_1, ... );
-int gtr_combo_box_get_active_val( GtkWidget * w );
-void gtr_combo_box_set_active_val( GtkWidget * w, int value );
+#define gtr_priority_combo_get_value(w)     gtr_combo_box_get_active_enum(w)
+#define gtr_priority_combo_set_value(w,val) gtr_combo_box_set_active_enum(w,val)
+
+GtkWidget * gtr_combo_box_new_enum        ( const char * text_1, ... );
+int         gtr_combo_box_get_active_enum ( GtkComboBox * );
+void        gtr_combo_box_set_active_enum ( GtkComboBox *, int value );
 
 /***