diff options
| author | Michael Natterer <mitch@imendio.com> | 2005-11-24 16:51:22 +0000 |
|---|---|---|
| committer | Michael Natterer <mitch@src.gnome.org> | 2005-11-24 16:51:22 +0000 |
| commit | ff7a092232861b5eb6a60190dc38865acd7fd21c (patch) | |
| tree | 60f0122586ab53ffe148d73f0512c149fc929e7d | |
| parent | fbb2e3f4f51a4c0ccc8f2bf511f4766293fc4af0 (diff) | |
| download | gtk+-ff7a092232861b5eb6a60190dc38865acd7fd21c.tar.gz | |
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.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 10 | ||||
| -rw-r--r-- | gtk/gtktoolbar.c | 15 | ||||
| -rw-r--r-- | gtk/gtktoolbar.h | 8 |
4 files changed, 33 insertions, 10 deletions
@@ -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 f24b585756..6fb5ff27a8 100644 --- 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 8edd4ed545..760970d4f0 100644 --- 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 1b36b460c5..e80134d200 100644 --- 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; }; |