diff options
| author | Jasmine Hassan <[email protected]> | 2012-10-27 09:45:11 +0200 |
|---|---|---|
| committer | Jasmine Hassan <[email protected]> | 2012-11-16 09:45:49 +0200 |
| commit | a8ffe6f91bb6d67410fe886ef90deef1d5639aa9 (patch) | |
| tree | 9bd605ceaa3b902a2523fd489ed3b3d6871bb62e /src | |
| parent | 5d8273c1bc7e355e4f032bdc9d40363e01c689b6 (diff) | |
| download | caja-a8ffe6f91bb6d67410fe886ef90deef1d5639aa9.tar.bz2 caja-a8ffe6f91bb6d67410fe886ef90deef1d5639aa9.tar.xz | |
[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
Diffstat (limited to 'src')
| -rw-r--r-- | src/caja-bookmarks-window.c | 3 | ||||
| -rw-r--r-- | src/caja-property-browser.c | 1 |
2 files changed, 1 insertions, 3 deletions
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; } diff --git a/src/caja-property-browser.c b/src/caja-property-browser.c index 92de4738..8c8cea9d 100644 --- a/src/caja-property-browser.c +++ b/src/caja-property-browser.c @@ -256,7 +256,6 @@ caja_property_browser_init (GtkObject *object) gtk_window_set_title (GTK_WINDOW (widget), _("Backgrounds and Emblems")); gtk_window_set_wmclass (GTK_WINDOW (widget), "property_browser", "Caja"); gtk_window_set_type_hint (GTK_WINDOW (widget), GDK_WINDOW_TYPE_HINT_DIALOG); - eel_gtk_window_set_up_close_accelerator (GTK_WINDOW (widget)); /* create the main vbox. */ vbox = gtk_vbox_new (FALSE, 12); |