remove extraneous gtk_label_clear_layout (label)

Fri Nov  2 11:51:49 2001  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtklabel.c (gtk_label_select_region_index): remove
	extraneous gtk_label_clear_layout (label)

diff --git a/ChangeLog b/ChangeLog
index 8aae2e2e064463b5c2481232b1728fa7807bf9a6..949db8d94dcdf6a718991c296ff8d85c85c649b2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Nov  2 11:51:49 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtklabel.c (gtk_label_select_region_index): remove
+       extraneous gtk_label_clear_layout (label)
+
 2001-11-02  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * tests/makefile.msc, gtk/makefile.msc.in: Removed

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 8aae2e2e064463b5c2481232b1728fa7807bf9a6..949db8d94dcdf6a718991c296ff8d85c85c649b2 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Fri Nov  2 11:51:49 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtklabel.c (gtk_label_select_region_index): remove
+       extraneous gtk_label_clear_layout (label)
+
 2001-11-02  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * tests/makefile.msc, gtk/makefile.msc.in: Removed

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8aae2e2e064463b5c2481232b1728fa7807bf9a6..949db8d94dcdf6a718991c296ff8d85c85c649b2 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Fri Nov  2 11:51:49 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtklabel.c (gtk_label_select_region_index): remove
+       extraneous gtk_label_clear_layout (label)
+
 2001-11-02  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * tests/makefile.msc, gtk/makefile.msc.in: Removed

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 8aae2e2e064463b5c2481232b1728fa7807bf9a6..949db8d94dcdf6a718991c296ff8d85c85c649b2 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Fri Nov  2 11:51:49 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtklabel.c (gtk_label_select_region_index): remove
+       extraneous gtk_label_clear_layout (label)
+
 2001-11-02  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * tests/makefile.msc, gtk/makefile.msc.in: Removed

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 8aae2e2e064463b5c2481232b1728fa7807bf9a6..949db8d94dcdf6a718991c296ff8d85c85c649b2 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Fri Nov  2 11:51:49 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtklabel.c (gtk_label_select_region_index): remove
+       extraneous gtk_label_clear_layout (label)
+
 2001-11-02  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * tests/makefile.msc, gtk/makefile.msc.in: Removed

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 8aae2e2e064463b5c2481232b1728fa7807bf9a6..949db8d94dcdf6a718991c296ff8d85c85c649b2 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Fri Nov  2 11:51:49 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtklabel.c (gtk_label_select_region_index): remove
+       extraneous gtk_label_clear_layout (label)
+
 2001-11-02  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * tests/makefile.msc, gtk/makefile.msc.in: Removed

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 8aae2e2e064463b5c2481232b1728fa7807bf9a6..949db8d94dcdf6a718991c296ff8d85c85c649b2 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Fri Nov  2 11:51:49 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtklabel.c (gtk_label_select_region_index): remove
+       extraneous gtk_label_clear_layout (label)
+
 2001-11-02  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * tests/makefile.msc, gtk/makefile.msc.in: Removed

diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 87f1d51dfe2cce6370054b00f5d358f85a81bf86..035031f1cdfde2342a013983d87e12967b145a6c 100644 (file)
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -2447,7 +2447,6 @@ clear_text_callback (GtkClipboard     *clipboard,
     {
       label->select_info->selection_anchor = label->select_info->selection_end;
       
-      gtk_label_clear_layout (label);
       gtk_widget_queue_draw (GTK_WIDGET (label));
     }
 }
@@ -2470,6 +2469,10 @@ gtk_label_select_region_index (GtkLabel *label,
     {
       GtkClipboard *clipboard;
 
+      if (label->select_info->selection_anchor == anchor_index &&
+         label->select_info->selection_end == end_index)
+       return;
+
       label->select_info->selection_anchor = anchor_index;
       label->select_info->selection_end = end_index;
 
@@ -2490,7 +2493,6 @@ gtk_label_select_region_index (GtkLabel *label,
             gtk_clipboard_clear (clipboard);
         }
 
-      gtk_label_clear_layout (label);
       gtk_widget_queue_draw (GTK_WIDGET (label));
 
       g_object_freeze_notify (G_OBJECT (label));