[gtk/wip/baedert/for-master: 5/5] fo
- From: Timm Bäder <baedert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/baedert/for-master: 5/5] fo
- Date: Sat, 5 Oct 2019 12:04:56 +0000 (UTC)
commit 5a0c97c33a8f1db2dd593402e9c5ffbe79cb0670
Author: Timm Bäder <mail baedert org>
Date: Sat Oct 5 14:04:17 2019 +0200
fo
gtk/gtkheaderbar.c | 17 +++++++++--------
gtk/gtkmenu.c | 6 ++++--
2 files changed, 13 insertions(+), 10 deletions(-)
---
diff --git a/gtk/gtkheaderbar.c b/gtk/gtkheaderbar.c
index 0c5be8c450..3b3f06e43e 100644
--- a/gtk/gtkheaderbar.c
+++ b/gtk/gtkheaderbar.c
@@ -805,10 +805,19 @@ gtk_header_bar_get_custom_title (GtkHeaderBar *bar)
return priv->custom_title;
}
+static void
+notify_child_cb (GObject *child,
+ GParamSpec *pspec,
+ GtkHeaderBar *bar)
+{
+ _gtk_header_bar_update_separator_visibility (bar);
+}
+
static void
gtk_header_bar_dispose (GObject *object)
{
GtkHeaderBarPrivate *priv = gtk_header_bar_get_instance_private (GTK_HEADER_BAR (object));
+ GtkWidget *w;
if (priv->label_sizing_box)
{
@@ -946,14 +955,6 @@ gtk_header_bar_set_property (GObject *object,
}
}
-static void
-notify_child_cb (GObject *child,
- GParamSpec *pspec,
- GtkHeaderBar *bar)
-{
- _gtk_header_bar_update_separator_visibility (bar);
-}
-
static void
gtk_header_bar_pack (GtkHeaderBar *bar,
GtkWidget *widget,
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 6e159b318a..8b0e5fc26d 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -896,8 +896,10 @@ gtk_menu_dispose (GObject *object)
if (priv->toplevel)
{
- g_signal_handlers_disconnect_by_func (priv->toplevel, moved_to_rect_cb, menu);
- gtk_widget_destroy (priv->toplevel);
+ GtkWidget *toplevel = priv->toplevel;
+ priv->toplevel = NULL;
+ g_signal_handlers_disconnect_by_func (toplevel, moved_to_rect_cb, menu);
+ gtk_widget_destroy (toplevel);
}
g_clear_pointer (&priv->heights, g_free);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]