You don't need to check one variable twice (trivial bugfix).

diff --git a/ChangeLog b/ChangeLog
index d16adc67156b8b0ed9611232f9650ec4110c4cd0..0e570a46f952b70aa0322953794a222a060d7b6d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1999-02-23  Pavel Machek  <pavel@artax.karlin.mff.cuni.cz>
+
+       * gtk/gtkentry.c (gtk_entry_finalize): trivial bugfix
+
 Mon Feb 22 19:06:30 1999  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkdnd.c (xdnd_send_*): When sending events to

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index d16adc67156b8b0ed9611232f9650ec4110c4cd0..0e570a46f952b70aa0322953794a222a060d7b6d 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,7 @@
+1999-02-23  Pavel Machek  <pavel@artax.karlin.mff.cuni.cz>
+
+       * gtk/gtkentry.c (gtk_entry_finalize): trivial bugfix
+
 Mon Feb 22 19:06:30 1999  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkdnd.c (xdnd_send_*): When sending events to

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d16adc67156b8b0ed9611232f9650ec4110c4cd0..0e570a46f952b70aa0322953794a222a060d7b6d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+1999-02-23  Pavel Machek  <pavel@artax.karlin.mff.cuni.cz>
+
+       * gtk/gtkentry.c (gtk_entry_finalize): trivial bugfix
+
 Mon Feb 22 19:06:30 1999  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkdnd.c (xdnd_send_*): When sending events to

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index d16adc67156b8b0ed9611232f9650ec4110c4cd0..0e570a46f952b70aa0322953794a222a060d7b6d 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+1999-02-23  Pavel Machek  <pavel@artax.karlin.mff.cuni.cz>
+
+       * gtk/gtkentry.c (gtk_entry_finalize): trivial bugfix
+
 Mon Feb 22 19:06:30 1999  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkdnd.c (xdnd_send_*): When sending events to

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d16adc67156b8b0ed9611232f9650ec4110c4cd0..0e570a46f952b70aa0322953794a222a060d7b6d 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+1999-02-23  Pavel Machek  <pavel@artax.karlin.mff.cuni.cz>
+
+       * gtk/gtkentry.c (gtk_entry_finalize): trivial bugfix
+
 Mon Feb 22 19:06:30 1999  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkdnd.c (xdnd_send_*): When sending events to

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d16adc67156b8b0ed9611232f9650ec4110c4cd0..0e570a46f952b70aa0322953794a222a060d7b6d 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+1999-02-23  Pavel Machek  <pavel@artax.karlin.mff.cuni.cz>
+
+       * gtk/gtkentry.c (gtk_entry_finalize): trivial bugfix
+
 Mon Feb 22 19:06:30 1999  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkdnd.c (xdnd_send_*): When sending events to

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d16adc67156b8b0ed9611232f9650ec4110c4cd0..0e570a46f952b70aa0322953794a222a060d7b6d 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+1999-02-23  Pavel Machek  <pavel@artax.karlin.mff.cuni.cz>
+
+       * gtk/gtkentry.c (gtk_entry_finalize): trivial bugfix
+
 Mon Feb 22 19:06:30 1999  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkdnd.c (xdnd_send_*): When sending events to

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 3fb6244aaed2dc59755ed625d1aa8a689c6dd2e5..c25e9693da8a7fdbaf01b16ae115a894eafc0fd0 100644 (file)
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -527,7 +527,6 @@ gtk_entry_finalize (GtkObject *object)
     g_free (entry->text_mb);
   entry->text_mb = NULL;
  
-   if (entry->backing_pixmap)
   if (entry->backing_pixmap)
     gdk_pixmap_unref (entry->backing_pixmap);