diff options
| author | raveit65 <[email protected]> | 2016-05-29 21:19:29 +0200 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2016-05-29 21:31:50 +0200 |
| commit | c816ebb3cdcca4559bcc25356bd5287dfaae982e (patch) | |
| tree | 34b57cf152b9c39d4bb9ddc0b9c57c4f4d3502c3 /mate-dictionary | |
| parent | f832d9e9327f41ac653a7623e4f51d5139a03e1d (diff) | |
| download | mate-utils-c816ebb3cdcca4559bcc25356bd5287dfaae982e.tar.bz2 mate-utils-c816ebb3cdcca4559bcc25356bd5287dfaae982e.tar.xz | |
GTK3 dictionary: Remove style_set class handler
The ::style-set signal should not be used, and we don't need to resize
on style changes. This eliminates an assertion triggered by the resize
grip.
taken from:
https://git.gnome.org/browse/gnome-dictionary/commit/?id=3313b7c
Diffstat (limited to 'mate-dictionary')
| -rw-r--r-- | mate-dictionary/src/gdict-window.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/mate-dictionary/src/gdict-window.c b/mate-dictionary/src/gdict-window.c index 424d7616..7c917d36 100644 --- a/mate-dictionary/src/gdict-window.c +++ b/mate-dictionary/src/gdict-window.c @@ -1611,6 +1611,7 @@ gdict_window_size_allocate (GtkWidget *widget, allocation); } +#if !GTK_CHECK_VERSION (3, 0, 0) static void set_window_default_size (GdictWindow *window) { @@ -1629,11 +1630,7 @@ set_window_default_size (GdictWindow *window) /* make sure that the widget is realized */ /*Do this implicitly in GTK3.21 or segfault results */ -#if GTK_CHECK_VERSION (3, 21, 0) - gtk_widget_show (widget); -#else gtk_widget_realize (widget); -#endif /* XXX - the user wants mate-dictionary to resize itself, so * we compute the minimum safe geometry needed for displaying * the text returned by a dictionary server, which is based @@ -1689,7 +1686,7 @@ gdict_window_style_set (GtkWidget *widget, set_window_default_size (GDICT_WINDOW (widget)); } - +#endif static void gdict_window_handle_notify_position_cb (GtkWidget *widget, GParamSpec *pspec, @@ -2112,7 +2109,9 @@ gdict_window_class_init (GdictWindowClass *klass) LAST_PROP, gdict_window_properties); +#if !GTK_CHECK_VERSION (3, 0, 0) widget_class->style_set = gdict_window_style_set; +#endif widget_class->size_allocate = gdict_window_size_allocate; } |