From 40167f57fa40d667514b805d6253c372a4a1b9a4 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Thu, 25 Oct 2012 13:15:36 +0200 Subject: [src] autogenerate marshallers http://git.gnome.org/browse/nautilus/commit/?id=608918449f548b0d3ea3e7916c944b077ac43e87 --- src/caja-query-editor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/caja-query-editor.c') diff --git a/src/caja-query-editor.c b/src/caja-query-editor.c index dab9e329..dcd4416a 100644 --- a/src/caja-query-editor.c +++ b/src/caja-query-editor.c @@ -23,10 +23,10 @@ #include #include "caja-query-editor.h" +#include "caja-src-marshal.h" #include "caja-window-slot.h" #include -#include #include #include #include @@ -197,7 +197,7 @@ caja_query_editor_class_init (CajaQueryEditorClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (CajaQueryEditorClass, changed), NULL, NULL, - caja_marshal_VOID__OBJECT_BOOLEAN, + caja_src_marshal_VOID__OBJECT_BOOLEAN, G_TYPE_NONE, 2, CAJA_TYPE_QUERY, G_TYPE_BOOLEAN); signals[CANCEL] = -- cgit v1.2.1 From 40cd5a93ced42275631a3d86ad68219aa73cb7a3 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Thu, 18 Oct 2012 22:56:14 +0200 Subject: [all] Don't use gtk_dialog_set_has_separator() http://git.gnome.org/browse/nautilus/commit/?id=73e2941f9b837d5d0326e6e88caa7a1e3fdcabeb --- src/caja-query-editor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/caja-query-editor.c') diff --git a/src/caja-query-editor.c b/src/caja-query-editor.c index dcd4416a..44425df3 100644 --- a/src/caja-query-editor.c +++ b/src/caja-query-editor.c @@ -587,7 +587,7 @@ type_combo_changed (GtkComboBox *combo_box, CajaQueryEditorRow *row) toplevel = gtk_widget_get_toplevel (GTK_WIDGET (combo_box)); dialog = gtk_dialog_new_with_buttons (_("Select type"), GTK_WINDOW (toplevel), - GTK_DIALOG_NO_SEPARATOR, + 0, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); gtk_window_set_default_size (GTK_WINDOW (dialog), 400, 600); -- 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-query-editor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/caja-query-editor.c') diff --git a/src/caja-query-editor.c b/src/caja-query-editor.c index 44425df3..7beb13d0 100644 --- a/src/caja-query-editor.c +++ b/src/caja-query-editor.c @@ -210,7 +210,7 @@ caja_query_editor_class_init (CajaQueryEditorClass *class) G_TYPE_NONE, 0); binding_set = gtk_binding_set_by_class (class); - gtk_binding_entry_add_signal (binding_set, GDK_Escape, 0, "cancel", 0); + gtk_binding_entry_add_signal (binding_set, GDK_KEY_Escape, 0, "cancel", 0); } static void -- cgit v1.2.1 From 345bf975a496493161baf455af07977d57cbf709 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Thu, 25 Oct 2012 14:13:07 +0200 Subject: [src] replace deprecated GtkComboBox text APIs with GtkComboBoxText [src] don't use GtkComboBox text APIs (#632651) They got replaced by GtkComboBoxText. Thanks to Mathias Clasen and Flo Gravo. http://git.gnome.org/browse/nautilus/commit/?id=f123f99bee1005cd279783f9d441f538fcf85542 --- src/caja-query-editor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/caja-query-editor.c') diff --git a/src/caja-query-editor.c b/src/caja-query-editor.c index 7beb13d0..1b7ea10f 100644 --- a/src/caja-query-editor.c +++ b/src/caja-query-editor.c @@ -967,11 +967,11 @@ caja_query_editor_add_row (CajaQueryEditor *editor, gtk_widget_show (hbox); gtk_box_pack_start (GTK_BOX (editor->details->visible_vbox), hbox, FALSE, FALSE, 0); - combo = gtk_combo_box_new_text (); + combo = gtk_combo_box_text_new (); row->combo = combo; for (i = 0; i < CAJA_QUERY_EDITOR_ROW_LAST; i++) { - gtk_combo_box_append_text (GTK_COMBO_BOX (combo), gettext (row_type[i].name)); + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), gettext (row_type[i].name)); } gtk_widget_show (combo); gtk_box_pack_start (GTK_BOX (hbox), combo, FALSE, FALSE, 0); -- cgit v1.2.1 From 7a42b9b076d6b831c89bd0b9e996368c1c95aef3 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Thu, 18 Oct 2012 10:30:31 +0200 Subject: [all] use g_list_free() and g_strcmp0 instead of eel functions Was: general: use g_list_free_full() instead of eel functions http://git.gnome.org/browse/nautilus/commit/?id=5e669515fd7f760382e6b7aa1449734a35a2d7f4 . Instead of g_list_free_full(), we use g_list_foreach and g_list_free() to avoid unnecessary glib dependency bump to 2.28 --- src/caja-query-editor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/caja-query-editor.c') diff --git a/src/caja-query-editor.c b/src/caja-query-editor.c index 1b7ea10f..b0d04008 100644 --- a/src/caja-query-editor.c +++ b/src/caja-query-editor.c @@ -864,8 +864,8 @@ type_add_rows_from_query (CajaQueryEditor *editor, &iter); } - eel_g_list_free_deep (mime_types); - + g_list_foreach(mime_types, (GFunc) g_free, NULL); + g_list_free(mime_types); } /* End of row types */ -- cgit v1.2.1