From b24f066e23fb5b204c940c229c5cdebffd2f7600 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Mon, 5 Nov 2012 23:14:35 +0200 Subject: [src] convert to new GDK_KEY prefix http://git.gnome.org/browse/nautilus/commit/?id=71fa1a50145a6f06da3b805a29e75c1295fd546b Also, make sure we use GDK_KEY prefix in places-sidebar where this patch was previously applied to Caja but with old prefix: places-sidebar: allow keyboard navigation with Enter/Space (#637768) http://git.gnome.org/browse/nautilus/commit/?id=fd03c910a73ba18459e68baaf15e8dd295acd5c1 --- src/caja-zoom-control.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/caja-zoom-control.c') diff --git a/src/caja-zoom-control.c b/src/caja-zoom-control.c index 8ba974c4..5dc79518 100644 --- a/src/caja-zoom-control.c +++ b/src/caja-zoom-control.c @@ -723,32 +723,32 @@ caja_zoom_control_class_init (CajaZoomControlClass *class) binding_set = gtk_binding_set_by_class (class); gtk_binding_entry_add_signal (binding_set, - GDK_KP_Subtract, 0, + GDK_KEY_KP_Subtract, 0, "change_value", 1, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_STEP_DOWN); gtk_binding_entry_add_signal (binding_set, - GDK_minus, 0, + GDK_KEY_minus, 0, "change_value", 1, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_STEP_DOWN); gtk_binding_entry_add_signal (binding_set, - GDK_KP_Equal, 0, + GDK_KEY_KP_Equal, 0, "zoom_to_default", 0); gtk_binding_entry_add_signal (binding_set, - GDK_KP_Equal, 0, + GDK_KEY_KP_Equal, 0, "zoom_to_default", 0); gtk_binding_entry_add_signal (binding_set, - GDK_KP_Add, 0, + GDK_KEY_KP_Add, 0, "change_value", 1, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_STEP_UP); gtk_binding_entry_add_signal (binding_set, - GDK_plus, 0, + GDK_KEY_plus, 0, "change_value", 1, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_STEP_UP); -- cgit v1.2.1 From df6ac41622e955bfc2e3d3d38624dceaf4436df5 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Sat, 27 Oct 2012 15:29:36 +0200 Subject: [build] don't include marshals we don't own http://git.gnome.org/browse/nautilus/commit/?id=8d07a73b28767b7c866fe403e9ac706b8affb8a2 --- src/caja-zoom-control.c | 1 - 1 file changed, 1 deletion(-) (limited to 'src/caja-zoom-control.c') diff --git a/src/caja-zoom-control.c b/src/caja-zoom-control.c index 5dc79518..685242dc 100644 --- a/src/caja-zoom-control.c +++ b/src/caja-zoom-control.c @@ -40,7 +40,6 @@ #include #include #include -#include #include #include #include -- cgit v1.2.1 From 48d2f19ea2b821d1f3b3017afc912154ab2ee7da Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Thu, 8 Nov 2012 01:03:47 +0200 Subject: [src] use gtk_widget_get_preferred_size() http://git.gnome.org/browse/nautilus/commit/?id=c47d18f566fa9518ca7750922da7da66d3211f3e --- src/caja-zoom-control.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/caja-zoom-control.c') diff --git a/src/caja-zoom-control.c b/src/caja-zoom-control.c index 685242dc..1b251da2 100644 --- a/src/caja-zoom-control.c +++ b/src/caja-zoom-control.c @@ -44,6 +44,10 @@ #include #include +#if !GTK_CHECK_VERSION(3,0,0) +#define gtk_widget_get_preferred_size(x,y,z) gtk_widget_size_request(x,y) +#endif + enum { ZOOM_IN, @@ -153,8 +157,8 @@ menu_position_under_widget (GtkMenu *menu, container = gtk_widget_get_ancestor (widget, GTK_TYPE_CONTAINER); g_assert (container != NULL); - gtk_widget_size_request (widget, &req); - gtk_widget_size_request (GTK_WIDGET (menu), &menu_req); + gtk_widget_get_preferred_size (GTK_WIDGET (menu), &menu_req, NULL); + gtk_widget_get_preferred_size (widget, &req, NULL); gtk_widget_get_allocation (widget, &allocation); screen = gtk_widget_get_screen (GTK_WIDGET (menu)); -- cgit v1.2.1