diff options
author | raveit65 <[email protected]> | 2016-06-27 21:11:46 +0200 |
---|---|---|
committer | raveit65 <[email protected]> | 2016-07-06 17:47:42 +0200 |
commit | c5bcad96143a48b6c04107ec8e4d3d554297425c (patch) | |
tree | c7202b5f880ba69d1b5a26cc43f77c4a57a4a3d6 /src | |
parent | 60efc5224fd7768ee100c248660338607f8ecf15 (diff) | |
download | caja-c5bcad96143a48b6c04107ec8e4d3d554297425c.tar.bz2 caja-c5bcad96143a48b6c04107ec8e4d3d554297425c.tar.xz |
GTK+-3 fm-list-view: use widget properties instead of GtkAlignment
taken from:
https://git.gnome.org/browse/nautilus/commit/?id=f81188e
Diffstat (limited to 'src')
-rw-r--r-- | src/file-manager/fm-list-view.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c index 71b7f65d..f39c1975 100644 --- a/src/file-manager/fm-list-view.c +++ b/src/file-manager/fm-list-view.c @@ -2517,7 +2517,9 @@ create_column_editor (FMListView *view) GtkWidget *label; GtkWidget *box; GtkWidget *column_chooser; +#if !GTK_CHECK_VERSION (3, 0, 0) GtkWidget *alignment; +#endif CajaFile *file; char *str; char *name; @@ -2560,6 +2562,12 @@ create_column_editor (FMListView *view) g_free (str); +#if GTK_CHECK_VERSION (3, 0, 0) + column_chooser = caja_column_chooser_new (file); + gtk_widget_set_margin_start (column_chooser, 12); + gtk_widget_show (column_chooser); + gtk_box_pack_start (GTK_BOX (box), column_chooser, TRUE, TRUE, 0); +#else alignment = gtk_alignment_new (0.5, 0.5, 1, 1); gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 12, 0); @@ -2569,6 +2577,7 @@ create_column_editor (FMListView *view) column_chooser = caja_column_chooser_new (file); gtk_widget_show (column_chooser); gtk_container_add (GTK_CONTAINER (alignment), column_chooser); +#endif g_signal_connect (column_chooser, "changed", G_CALLBACK (column_chooser_changed_callback), |