diff options
| author | Michael Natterer <mitch@imendio.com> | 2005-11-24 16:55:48 +0000 |
|---|---|---|
| committer | Michael Natterer <mitch@src.gnome.org> | 2005-11-24 16:55:48 +0000 |
| commit | 6eda5e1af1c782b8d5f8a877bafea0e9c8ec77af (patch) | |
| tree | 6d7a84fb3066ee25d05a11c972ab0e2fd14d6836 | |
| parent | 902c39b5f0adb667602d5cca4668d3dc03bcc9e3 (diff) | |
| download | gdk-pixbuf-6eda5e1af1c782b8d5f8a877bafea0e9c8ec77af.tar.gz | |
Merged from HEAD:
2005-11-24 Michael Natterer <mitch@imendio.com>
Merged from HEAD:
* 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 | 12 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 12 | ||||
| -rw-r--r-- | gtk/gtktoolbar.c | 15 | ||||
| -rw-r--r-- | gtk/gtktoolbar.h | 8 |
4 files changed, 37 insertions, 10 deletions
@@ -1,3 +1,15 @@ +2005-11-24 Michael Natterer <mitch@imendio.com> + + Merged from HEAD: + + * 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. + 2005-11-23 Matthias Clasen <mclasen@redhat.com> * gtk/gtkentry.c: Include gtkimcontextsimple.h (#322235, diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 35169fd08..eecb512d0 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,15 @@ +2005-11-24 Michael Natterer <mitch@imendio.com> + + Merged from HEAD: + + * 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. + 2005-11-23 Matthias Clasen <mclasen@redhat.com> * gtk/gtkentry.c: Include gtkimcontextsimple.h (#322235, diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c index 9cd60bead..859840dd2 100644 --- a/gtk/gtktoolbar.c +++ b/gtk/gtktoolbar.c @@ -140,7 +140,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; @@ -1981,20 +1984,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 1b36b460c..e80134d20 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; }; |