changed two private guint that used to hold signal handler IDs to two

2005-11-24  Michael Natterer  <mitch@imendio.com>

	* gtk/gtktoolbar.h (struct _GtkToolbar): changed two private guint
	that used to hold signal handler IDs to two guint of padding.

	* gtk/gtktoolbar.c (struct _GtkToolbarPrivate): added them as
	gulong here.

	(gtk_toolbar_screen_changed): changed accordingly.

diff --git a/ChangeLog b/ChangeLog
index f24b585756d39c74d508cc3cba457c09067c8350..6fb5ff27a883e1fa6b5e3c95f15b9defaf45b075 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-11-24  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtktoolbar.h (struct _GtkToolbar): changed two private guint
+       that used to hold signal handler IDs to two guint of padding.
+
+       * gtk/gtktoolbar.c (struct _GtkToolbarPrivate): added them as
+       gulong here.
+
+       (gtk_toolbar_screen_changed): changed accordingly.
+
 Wed Nov 23 18:55:47 2005  Tim Janik  <timj@imendio.com>
 
        * gtk/gtkobject.[hc]: deprecated floating/sink API and implemented it

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f24b585756d39c74d508cc3cba457c09067c8350..6fb5ff27a883e1fa6b5e3c95f15b9defaf45b075 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,13 @@
+2005-11-24  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtktoolbar.h (struct _GtkToolbar): changed two private guint
+       that used to hold signal handler IDs to two guint of padding.
+
+       * gtk/gtktoolbar.c (struct _GtkToolbarPrivate): added them as
+       gulong here.
+
+       (gtk_toolbar_screen_changed): changed accordingly.
+
 Wed Nov 23 18:55:47 2005  Tim Janik  <timj@imendio.com>
 
        * gtk/gtkobject.[hc]: deprecated floating/sink API and implemented it

diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index 8edd4ed545a74d6b83a7c1d104d9706119594082..760970d4f0651af773ebcaa1d0376cee42f8c011 100644 (file)
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -142,7 +142,10 @@ struct _GtkToolbarPrivate
   gint         max_homogeneous_pixels;
   
   GTimer *     timer;
-  
+
+  gulong        style_set_connection;
+  gulong        icon_size_connection;
+
   guint                show_arrow : 1;
   guint                need_sync : 1;
   guint                is_sliding : 1;
@@ -2035,20 +2038,20 @@ gtk_toolbar_screen_changed (GtkWidget *widget,
   
   if (old_settings)
     {
-      g_signal_handler_disconnect (old_settings, toolbar->style_set_connection);
-      g_signal_handler_disconnect (old_settings, toolbar->icon_size_connection);
-      
+      g_signal_handler_disconnect (old_settings, priv->style_set_connection);
+      g_signal_handler_disconnect (old_settings, priv->icon_size_connection);
+
       g_object_unref (old_settings);
     }
   
   if (settings)
     {
-      toolbar->style_set_connection =
+      priv->style_set_connection =
        g_signal_connect_swapped (settings,
                                  "notify::gtk-toolbar-style",
                                  G_CALLBACK (style_change_notify),
                                  toolbar);
-      toolbar->icon_size_connection =
+      priv->icon_size_connection =
        g_signal_connect_swapped (settings,
                                  "notify::gtk-toolbar-icon-size",
                                  G_CALLBACK (icon_size_change_notify),

diff --git a/gtk/gtktoolbar.h b/gtk/gtktoolbar.h
index 1b36b460c568f6c09ed1993b8b0b63168cc27bc2..e80134d2008fa5a89682a010a3ed8be36de02f4c 100644 (file)
--- a/gtk/gtktoolbar.h
+++ b/gtk/gtktoolbar.h
@@ -104,10 +104,10 @@ struct _GtkToolbar
   /*< private >*/
   gint             button_maxw;                /* maximum width of homogeneous children */
   gint             button_maxh;                /* maximum height of homogeneous children */
-  
-  guint            style_set_connection;
-  guint            icon_size_connection;
-  
+
+  guint            _gtk_reserved1;
+  guint            _gtk_reserved2;
+
   guint            style_set : 1;
   guint            icon_size_set : 1;
 };