Changeset 12400

Timestamp:

Apr 29, 2011, 9:36:44 PM (12 years ago)

Author:

jordan

Message:

(trunk gtk) in the details dialog, use the GQuark versions of g_object_{get,set}_data()

File:

• trunk/gtk/details.c (modified) (11 diffs)

trunk/gtk/details.c

@@ -29 +29 @@
 #include "util.h"
 
-#define DETAILS_KEY "details-data"
+static GQuark ARG_KEY = 0;
+static GQuark DETAILS_KEY = 0;
+static GQuark TORRENT_ID_KEY = 0;
+static GQuark TEXT_BUFFER_KEY = 0;
+static GQuark URL_ENTRY_KEY = 0;
 
 struct DetailsImpl
@@ -430 +434 @@
 static void refresh( struct DetailsImpl * di );
 
-#define ARG_KEY "arg-key"
-
 static void
 onComboEnumChanged( GtkComboBox * combo_box, struct DetailsImpl * di )
 {
-    const char * key = g_object_get_data( G_OBJECT( combo_box ), ARG_KEY );
+    const char * key = g_object_get_qdata( G_OBJECT( combo_box ), ARG_KEY );
     torrent_set_int( di, key, gtr_combo_box_get_active_enum( combo_box ) );
     refresh( di );
@@ -448 +450 @@
         _( "Stop seeding at ratio:" ),    TR_RATIOLIMIT_SINGLE,
         NULL );
-    g_object_set_data_full( G_OBJECT( w ), ARG_KEY, g_strdup( "seedRatioMode" ), g_free );
+    g_object_set_qdata( G_OBJECT( w ), ARG_KEY, (gpointer)"seedRatioMode" );
     return w;
 }
@@ -460 +462 @@
         _( "Stop seeding if idle for N minutes:" ), TR_IDLELIMIT_SINGLE,
         NULL );
-    g_object_set_data_full( G_OBJECT( w ), ARG_KEY, g_strdup( "seedIdleMode" ), g_free );
+    g_object_set_qdata( G_OBJECT( w ), ARG_KEY, (gpointer)"seedIdleMode" );
     return w;
 }
@@ -2112 +2114 @@
         int tier;
         GtkTextIter start, end;
-        const int torrent_id = GPOINTER_TO_INT( g_object_get_data( G_OBJECT( dialog ), "torrent-id" ) );
-        GtkTextBuffer * text_buffer = g_object_get_data( G_OBJECT( dialog ), "text-buffer" );
+        const int torrent_id = GPOINTER_TO_INT( g_object_get_qdata( G_OBJECT( dialog ), TORRENT_ID_KEY ) );
+        GtkTextBuffer * text_buffer = g_object_get_qdata( G_OBJECT( dialog ), TEXT_BUFFER_KEY );
         tr_torrent * tor = gtr_core_find_torrent( di->core, torrent_id );
 
@@ -2237 +2239 @@
         gtr_dialog_set_content( GTK_DIALOG( d ), t );
 
-        g_object_set_data( G_OBJECT( d ), "torrent-id", GINT_TO_POINTER( torrent_id ) );
-        g_object_set_data( G_OBJECT( d ), "text-buffer", gtk_text_view_get_buffer( GTK_TEXT_VIEW( w ) ) );
+        g_object_set_qdata( G_OBJECT( d ), TORRENT_ID_KEY, GINT_TO_POINTER( torrent_id ) );
+        g_object_set_qdata( G_OBJECT( d ), TEXT_BUFFER_KEY, gtk_text_view_get_buffer( GTK_TEXT_VIEW( w ) ) );
         gtk_widget_show( d );
     }
@@ -2263 +2265 @@
     {
         struct DetailsImpl * di = gdi;
-        GtkWidget * e = GTK_WIDGET( g_object_get_data( G_OBJECT( dialog ), "url-entry" ) );
-        const int torrent_id = GPOINTER_TO_INT( g_object_get_data( G_OBJECT( dialog ), "torrent-id" ) );
+        GtkWidget * e = GTK_WIDGET( g_object_get_qdata( G_OBJECT( dialog ), URL_ENTRY_KEY ) );
+        const int torrent_id = GPOINTER_TO_INT( g_object_get_qdata( G_OBJECT( dialog ), TORRENT_ID_KEY ) );
         char * url = g_strdup( gtk_entry_get_text( GTK_ENTRY( e ) ) );
         g_strstrip( url );
@@ -2329 +2331 @@
         gtk_widget_set_size_request( e, 400, -1 );
         gtr_paste_clipboard_url_into_entry( e );
-        g_object_set_data( G_OBJECT( w ), "url-entry", e );
-        g_object_set_data( G_OBJECT( w ), "torrent-id", GINT_TO_POINTER( tr_torrentId( tor ) ) );
+        g_object_set_qdata( G_OBJECT( w ), URL_ENTRY_KEY, e );
+        g_object_set_qdata( G_OBJECT( w ), TORRENT_ID_KEY, GINT_TO_POINTER( tr_torrentId( tor ) ) );
         hig_workarea_add_row( t, &row, _( "_Announce URL:" ), e, NULL );
         gtr_dialog_set_content( GTK_DIALOG( w ), t );
@@ -2515 +2517 @@
     struct DetailsImpl * di = g_new0( struct DetailsImpl, 1 );
 
+    /* one-time setup */
+    if( ARG_KEY == 0 )
+    {
+        ARG_KEY          = g_quark_from_static_string( "tr-arg-key" );
+        DETAILS_KEY      = g_quark_from_static_string( "tr-details-data-key" );
+        TORRENT_ID_KEY   = g_quark_from_static_string( "tr-torrent-id-key" );
+        TEXT_BUFFER_KEY  = g_quark_from_static_string( "tr-text-buffer-key" );
+        URL_ENTRY_KEY    = g_quark_from_static_string( "tr-url-entry-key" );
+    }
+
     /* create the dialog */
     di->core = core;
@@ -2526 +2538 @@
                               G_CALLBACK( gtk_widget_destroy ), d );
     gtk_container_set_border_width( GTK_CONTAINER( d ), GUI_PAD );
-    g_object_set_data_full( G_OBJECT( d ), DETAILS_KEY, di, details_free );
+    g_object_set_qdata_full( G_OBJECT( d ), DETAILS_KEY, di, details_free );
 
     n = gtk_notebook_new( );
@@ -2567 +2579 @@
     char title[256];
     const int len = g_slist_length( ids );
-    struct DetailsImpl * di = g_object_get_data( G_OBJECT( w ), DETAILS_KEY );
+    struct DetailsImpl * di = g_object_get_qdata( G_OBJECT( w ), DETAILS_KEY );
 
     g_slist_free( di->ids );