2 files changed, 15 insertions, 2 deletions
diff --git a/src/eggsmclient-xsmp.c b/src/eggsmclient-xsmp.c
index 2c55b13..f278ded 100644
--- a/src/eggsmclient-xsmp.c
+++ b/src/eggsmclient-xsmp.c
@@ -376,13 +376,13 @@ sm_client_xsmp_startup (EggSMClient *client,
 xsmp->client_id = g_strdup (ret_client_id);
 free (ret_client_id);
 
- gdk_threads_enter ();
 #if GTK_CHECK_VERSION (3, 0, 0)
 gdk_x11_set_sm_client_id (xsmp->client_id);
 #else
+ gdk_threads_enter ();
 gdk_set_sm_client_id (xsmp->client_id);
-#endif
 gdk_threads_leave ();
+#endif
 
 g_debug ("Got client ID \"%s\"", xsmp->client_id);
 }
@@ -568,7 +568,9 @@ idle_do_pending_events (gpointer data)
 EggSMClientXSMP *xsmp = data;
 EggSMClient *client = data;
 
+#if !GTK_CHECK_VERSION (3, 0, 0)
 gdk_threads_enter ();
+#endif
 
 xsmp->idle = 0;
 
@@ -593,7 +595,9 @@ idle_do_pending_events (gpointer data)
 }
 
 out:
+#if !GTK_CHECK_VERSION (3, 0, 0)
 gdk_threads_leave ();
+#endif
 return FALSE;
 }
 
@@ -1326,9 +1330,13 @@ process_ice_messages (IceConn ice_conn)
 {
 IceProcessMessagesStatus status;
 
+#if GTK_CHECK_VERSION (3, 0, 0)
+ status = IceProcessMessages (ice_conn, NULL, NULL);
+#else
 gdk_threads_enter ();
 status = IceProcessMessages (ice_conn, NULL, NULL);
 gdk_threads_leave ();
+#endif
 
 switch (status)
 {
diff --git a/src/terminal-window.c b/src/terminal-window.c
index b2b1295..7415083 100644
--- a/src/terminal-window.c
+++ b/src/terminal-window.c
@@ -395,8 +395,13 @@ position_menu_under_widget (GtkMenu *menu,
 gtk_widget_get_allocation (widget, &widget_allocation);
 container = gtk_widget_get_ancestor (widget, GTK_TYPE_CONTAINER);
 
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gtk_widget_get_preferred_size (widget, &req, NULL);
+ gtk_widget_get_preferred_size (GTK_WIDGET (menu), &menu_req, NULL);
+#else
 gtk_widget_size_request (widget, &req);
 gtk_widget_size_request (GTK_WIDGET (menu), &menu_req);
+#endif
 
 screen = gtk_widget_get_screen (GTK_WIDGET (menu));
 monitor_num = gdk_screen_get_monitor_at_window (screen, widget_window);