diff options
| -rw-r--r-- | src/caja-main.c | 2 | ||||
| -rw-r--r-- | src/caja-navigation-window.c | 3 | ||||
| -rw-r--r-- | src/caja-view-as-action.c | 1 | ||||
| -rw-r--r-- | src/caja-zoom-action.c | 1 |
4 files changed, 5 insertions, 2 deletions
diff --git a/src/caja-main.c b/src/caja-main.c index dcd9df11..3227b5d4 100644 --- a/src/caja-main.c +++ b/src/caja-main.c @@ -389,7 +389,9 @@ main (int argc, char *argv[]) mallopt (M_MMAP_THRESHOLD, 128 *1024); #endif +#if !GLIB_CHECK_VERSION (2, 32, 0) g_thread_init (NULL); +#endif /* This will be done by gtk+ later, but for now, force it to MATE */ g_desktop_app_info_set_desktop_env ("MATE"); diff --git a/src/caja-navigation-window.c b/src/caja-navigation-window.c index 4b03a865..7eed3c91 100644 --- a/src/caja-navigation-window.c +++ b/src/caja-navigation-window.c @@ -185,6 +185,9 @@ caja_navigation_window_init (CajaNavigationWindow *window) ui_manager = caja_window_get_ui_manager (CAJA_WINDOW (window)); toolbar = gtk_ui_manager_get_widget (ui_manager, "/Toolbar"); +#if GTK_CHECK_VERSION(3, 0, 0) + gtk_style_context_add_class (gtk_widget_get_style_context (toolbar), GTK_STYLE_CLASS_PRIMARY_TOOLBAR); +#endif window->details->toolbar = toolbar; gtk_table_attach (GTK_TABLE (CAJA_WINDOW (window)->details->table), toolbar, diff --git a/src/caja-view-as-action.c b/src/caja-view-as-action.c index 87785855..0c34dd98 100644 --- a/src/caja-view-as-action.c +++ b/src/caja-view-as-action.c @@ -176,7 +176,6 @@ connect_proxy (GtkAction *action, view_as_menu_vbox = gtk_vbox_new (FALSE, 4); gtk_widget_show (view_as_menu_vbox); - gtk_container_set_border_width (GTK_CONTAINER (item), 4); gtk_container_add (GTK_CONTAINER (item), view_as_menu_vbox); view_as_combo_box = gtk_combo_box_text_new (); diff --git a/src/caja-zoom-action.c b/src/caja-zoom-action.c index 4f1ea786..cd54fee9 100644 --- a/src/caja-zoom-action.c +++ b/src/caja-zoom-action.c @@ -90,7 +90,6 @@ connect_proxy (GtkAction *action, GtkWidget *zoom_control; zoom_control = caja_zoom_control_new (); - gtk_container_set_border_width (GTK_CONTAINER (item), 4); gtk_container_add (GTK_CONTAINER (item), zoom_control); gtk_widget_show (zoom_control); |