Changeset 10231

Timestamp:

Feb 19, 2010, 2:49:03 PM (11 years ago)

Author:

charles

Message:

(trunk gtk) #2932 "The 'comment' field in the Torrent Properties dialog loses selection" -- fixed in trunk for 1.91

File:

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

trunk/gtk/details.c

@@ -546 +546 @@
 }
 
+/* Only call gtk_label_set_text() if the new text differs from the old.
+ * This way if the user has text selected, refreshing won't deselect it */
 static void
 gtr_label_set_text( GtkLabel * lb, const char * newstr )
@@ -553 +555 @@
     if( ( oldstr == NULL ) || strcmp( oldstr, newstr ) )
         gtk_label_set_text( lb, newstr );
+}
+
+/* Only call gtk_text_buffer_set_text() if the new text differs from the old.
+ * This way if the user has text selected, refreshing won't deselect it */
+static void
+gtr_text_buffer_set_text( GtkTextBuffer * b, const char * str )
+{
+    char * old_str;
+    GtkTextIter start, end;
+
+    if( str == NULL )
+        str = "";
+
+    gtk_text_buffer_get_bounds( b, &start, &end );
+    old_str = gtk_text_buffer_get_text( b, &start, &end, FALSE );
+
+    if( ( old_str == NULL ) || strcmp( old_str, str ) )
+        gtk_text_buffer_set_text( b, str, -1 );
+
+    g_free( old_str );
 }
 
@@ -632 +654 @@
             str = mixed;
     }
-    gtk_text_buffer_set_text( di->comment_buffer, str, -1 );
+    gtr_text_buffer_set_text( di->comment_buffer, str );
 
     /* destination_lb */