diff options
| author | Jasmine Hassan <[email protected]> | 2012-11-08 06:40:35 +0200 |
|---|---|---|
| committer | Jasmine Hassan <[email protected]> | 2012-11-16 09:45:53 +0200 |
| commit | 5ee6f114f83b68d02e7d5b723090f1dfe8c443ca (patch) | |
| tree | 313d87138adedf6e209f650f825bd3a99c5771f0 /src/file-manager | |
| parent | b7f2233c06be6506e6913fcd02ae9c9e2183c9d3 (diff) | |
| download | caja-5ee6f114f83b68d02e7d5b723090f1dfe8c443ca.tar.bz2 caja-5ee6f114f83b68d02e7d5b723090f1dfe8c443ca.tar.xz | |
[general] use new GtkScrollable interface
http://git.gnome.org/browse/nautilus/commit/?id=d811553a4e74106efdf8bf6c91c6d29944ed6df7
canvas: use GTK_LAYOUT casts instead of going through the parent struct
http://git.gnome.org/browse/nautilus/commit/?id=2260005986d8c620669e56c4b9f2fba12e8e0625
Diffstat (limited to 'src/file-manager')
| -rw-r--r-- | src/file-manager/fm-desktop-icon-view.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/file-manager/fm-desktop-icon-view.c b/src/file-manager/fm-desktop-icon-view.c index 232b198a..3885ca13 100644 --- a/src/file-manager/fm-desktop-icon-view.c +++ b/src/file-manager/fm-desktop-icon-view.c @@ -59,6 +59,12 @@ #include <sys/types.h> #include <unistd.h> +#if !GTK_CHECK_VERSION(3, 0, 0) +#define gtk_scrollable_get_hadjustment gtk_layout_get_hadjustment +#define gtk_scrollable_get_vadjustment gtk_layout_get_vadjustment +#define GTK_SCROLLABLE GTK_LAYOUT +#endif + /* Timeout to check the desktop directory for updates */ #define RESCAN_TIMEOUT 4 @@ -566,8 +572,8 @@ fm_desktop_icon_view_init (FMDesktopIconView *desktop_icon_view) gtk_widget_queue_resize (GTK_WIDGET (icon_container)); - hadj = gtk_layout_get_hadjustment (GTK_LAYOUT (icon_container)); - vadj = gtk_layout_get_vadjustment (GTK_LAYOUT (icon_container)); + hadj = gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (icon_container)); + vadj = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (icon_container)); eel_gtk_adjustment_set_value (hadj, 0); eel_gtk_adjustment_set_value (vadj, 0); |