From a8ffe6f91bb6d67410fe886ef90deef1d5639aa9 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Sat, 27 Oct 2012 09:45:11 +0200 Subject: [bkmrks-win/prop-brwsr] don't use eel_gtk_window_*_close_accelerator() bk-window: don't use _event_is_close_accelerator() http://git.gnome.org/browse/nautilus/commit/?id=cab696f7d760f5ee63f0a623b13d27b76d2f2d00 Also needed to drop eel_gtk_window_set_up_close_accelerator() instance in src/caja-property-browser.c --- src/caja-bookmarks-window.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/caja-bookmarks-window.c') diff --git a/src/caja-bookmarks-window.c b/src/caja-bookmarks-window.c index 49f66850..aaf0aee1 100644 --- a/src/caja-bookmarks-window.c +++ b/src/caja-bookmarks-window.c @@ -1082,8 +1082,7 @@ handle_close_accelerator (GtkWindow *window, g_assert (event != NULL); g_assert (user_data == NULL); - if (eel_gtk_window_event_is_close_accelerator (window, event)) - { + if (event->state & GDK_CONTROL_MASK && event->keyval == GDK_w) { gtk_widget_hide (GTK_WIDGET (window)); return TRUE; } -- cgit v1.2.1 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-bookmarks-window.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/caja-bookmarks-window.c') diff --git a/src/caja-bookmarks-window.c b/src/caja-bookmarks-window.c index aaf0aee1..86c80bc5 100644 --- a/src/caja-bookmarks-window.c +++ b/src/caja-bookmarks-window.c @@ -749,7 +749,7 @@ on_key_pressed (GtkTreeView *view, GdkEventKey *event, gpointer user_data) { - if (event->keyval == GDK_Delete || event->keyval == GDK_KP_Delete) + if (event->keyval == GDK_KEY_Delete || event->keyval == GDK_KEY_KP_Delete) { bookmarks_delete_bookmark (); return TRUE; @@ -1082,7 +1082,7 @@ handle_close_accelerator (GtkWindow *window, g_assert (event != NULL); g_assert (user_data == NULL); - if (event->state & GDK_CONTROL_MASK && event->keyval == GDK_w) { + if (event->state & GDK_CONTROL_MASK && event->keyval == GDK_KEY_w) { gtk_widget_hide (GTK_WIDGET (window)); return TRUE; } -- cgit v1.2.1 From d92e8f674131476d7382496cbc37a5827cef0c84 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Fri, 19 Oct 2012 01:45:59 +0200 Subject: [bookmarks-window] use new CajaApplication API http://git.gnome.org/browse/nautilus/commit/?id=a3ce22ec6e8fcb39dafb35e04e445f4a94b8c394 --- src/caja-bookmarks-window.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'src/caja-bookmarks-window.c') diff --git a/src/caja-bookmarks-window.c b/src/caja-bookmarks-window.c index 86c80bc5..2ce15aae 100644 --- a/src/caja-bookmarks-window.c +++ b/src/caja-bookmarks-window.c @@ -582,35 +582,35 @@ open_selected_bookmark (gpointer user_data, GdkScreen *screen) if (CAJA_IS_NAVIGATION_WINDOW (user_data)) { - caja_window_go_to (CAJA_WINDOW (user_data), location); + window = user_data; } else if (CAJA_IS_SPATIAL_WINDOW (user_data)) { - window = caja_application_present_spatial_window (application, - NULL, - NULL, - location, - screen); - } - else /* window that opened bookmarks window has been closed */ - { - if (parent_is_browser_window || g_settings_get_boolean (caja_preferences, CAJA_PREFERENCES_ALWAYS_USE_BROWSER)) - { + window = caja_application_get_spatial_window (application, + NULL, + NULL, + location, + screen, + NULL); + } else { /* window that opened bookmarks window has been closed */ + if (parent_is_browser_window || g_settings_get_boolean (caja_preferences, CAJA_PREFERENCES_ALWAYS_USE_BROWSER)) { window = caja_application_create_navigation_window (application, NULL, screen); - caja_window_go_to (window, location); } else { - window = caja_application_present_spatial_window (application, - NULL, - NULL, - location, - screen); + window = caja_application_get_spatial_window (application, + NULL, + NULL, + location, + screen, + NULL); } } + caja_window_go_to (window, location); + g_object_unref (location); } -- cgit v1.2.1 From 2472d52a0f28dd84d362dcc5570e747a82aa8ba6 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Wed, 31 Oct 2012 04:42:15 +0200 Subject: [src] don't use GtkObject (GTK3) the ::destroy signal of GtkObject has only been moved to GtkWidget in GTK3 (after GtkObject removal): http://developer.gnome.org/gtk3/3.0/ch25s02.html So we use conditionals in this case, to keep it working with GTK2. A tad similar: http://git.gnome.org/browse/nautilus/commit/?id=cc6cb51e827c0b15d4ef09f12d37b9f331ddcef8 --- src/caja-bookmarks-window.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/caja-bookmarks-window.c') diff --git a/src/caja-bookmarks-window.c b/src/caja-bookmarks-window.c index 2ce15aae..4b13a1ee 100644 --- a/src/caja-bookmarks-window.c +++ b/src/caja-bookmarks-window.c @@ -229,9 +229,9 @@ static void edit_bookmarks_dialog_reset_signals (gpointer data, GObject *obj) { - g_signal_handler_disconnect (GTK_OBJECT (jump_button), + g_signal_handler_disconnect (jump_button, jump_button_signal_id); - g_signal_handler_disconnect (GTK_OBJECT (bookmark_list_widget), + g_signal_handler_disconnect (bookmark_list_widget, row_activated_signal_id); jump_button_signal_id = g_signal_connect (jump_button, "clicked", @@ -415,9 +415,9 @@ void edit_bookmarks_dialog_set_signals (CajaWindow *window) { - g_signal_handler_disconnect (GTK_OBJECT (jump_button), + g_signal_handler_disconnect (jump_button, jump_button_signal_id); - g_signal_handler_disconnect (GTK_OBJECT (bookmark_list_widget), + g_signal_handler_disconnect (bookmark_list_widget, row_activated_signal_id); jump_button_signal_id = -- cgit v1.2.1