summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSoeren Sandmann <sandmann@daimi.au.dk>2004-02-01 15:36:22 +0000
committerSøren Sandmann Pedersen <ssp@src.gnome.org>2004-02-01 15:36:22 +0000
commita4bb27616f5315acc0101b3ab6d96b510e10b66c (patch)
tree890cfb8e92492664a47923638d620076f2d5aeca
parent623370a8e7cbb6b73939ce70430019cf2f76aae8 (diff)
downloadgtk+-a4bb27616f5315acc0101b3ab6d96b510e10b66c.tar.gz
Only start sliding when using the new API.
Sun Feb 1 16:34:07 2004 Soeren Sandmann <sandmann@daimi.au.dk> * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Only start sliding when using the new API.
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-2-105
-rw-r--r--ChangeLog.pre-2-45
-rw-r--r--ChangeLog.pre-2-65
-rw-r--r--ChangeLog.pre-2-85
-rw-r--r--gtk/gtktoolbar.c2
6 files changed, 26 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 581635d56e..798a324abe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Feb 1 16:34:07 2004 Soeren Sandmann <sandmann@daimi.au.dk>
+
+ * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Only start
+ sliding when using the new API.
+
Sun Feb 1 16:03:39 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Make sure
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 581635d56e..798a324abe 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Sun Feb 1 16:34:07 2004 Soeren Sandmann <sandmann@daimi.au.dk>
+
+ * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Only start
+ sliding when using the new API.
+
Sun Feb 1 16:03:39 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Make sure
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 581635d56e..798a324abe 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Sun Feb 1 16:34:07 2004 Soeren Sandmann <sandmann@daimi.au.dk>
+
+ * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Only start
+ sliding when using the new API.
+
Sun Feb 1 16:03:39 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Make sure
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 581635d56e..798a324abe 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Sun Feb 1 16:34:07 2004 Soeren Sandmann <sandmann@daimi.au.dk>
+
+ * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Only start
+ sliding when using the new API.
+
Sun Feb 1 16:03:39 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Make sure
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 581635d56e..798a324abe 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Sun Feb 1 16:34:07 2004 Soeren Sandmann <sandmann@daimi.au.dk>
+
+ * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Only start
+ sliding when using the new API.
+
Sun Feb 1 16:03:39 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Make sure
diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index 94524f7519..224cb361de 100644
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -1513,7 +1513,7 @@ gtk_toolbar_size_allocate (GtkWidget *widget,
new_states[i] != NORMAL)
{
/* an item disappeared, begin sliding */
- if (!size_changed)
+ if (!size_changed && priv->api_mode == NEW_API)
gtk_toolbar_begin_sliding (toolbar);
}
}