summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorinfirit <infirit@gmail.com>2015-08-26 13:24:46 +0200
committerinfirit <infirit@gmail.com>2015-08-26 14:44:57 +0200
commit613791d9eef6be44f820befd1a09da75c8fbc1b5 (patch)
tree9151697382fb2e9ff8707d0c4ca52803c9ee8b21
parent1112319594f210b0c6727d4657bc5b70de4168ab (diff)
downloadmate-panel-613791d9eef6be44f820befd1a09da75c8fbc1b5.tar.bz2
mate-panel-613791d9eef6be44f820befd1a09da75c8fbc1b5.tar.xz
Always use gtk_container_remove/gtk_container_add
Should work fine under both Gtk+ versions.
-rw-r--r--mate-panel/panel-widget.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/mate-panel/panel-widget.c b/mate-panel/panel-widget.c
index 9dd01d24..bd25fc89 100644
--- a/mate-panel/panel-widget.c
+++ b/mate-panel/panel-widget.c
@@ -2816,12 +2816,9 @@ panel_widget_reparent (PanelWidget *old_panel,
panel_widget_reset_saved_focus (old_panel);
if (gtk_container_get_focus_child (GTK_CONTAINER (old_panel)) == applet)
focus_widget = gtk_window_get_focus (GTK_WINDOW (old_panel->toplevel));
-#if GTK_CHECK_VERSION(3, 14, 0)
+
gtk_container_remove (GTK_CONTAINER(old_panel), applet);
gtk_container_add (GTK_CONTAINER(new_panel), applet);
-#else
- gtk_widget_reparent (applet, GTK_WIDGET (new_panel));
-#endif
if (info && info->type == PANEL_OBJECT_APPLET)
mate_panel_applet_frame_set_panel (MATE_PANEL_APPLET_FRAME (ad->applet), new_panel);