diff options
Diffstat (limited to 'libnautilus-private')
| -rw-r--r-- | libnautilus-private/Makefile.am | 5 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-entry.c | 11 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-icon-container.c | 2 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-marshal.h | 2 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-marshal.list | 1 |
5 files changed, 13 insertions, 8 deletions
diff --git a/libnautilus-private/Makefile.am b/libnautilus-private/Makefile.am index 941553f42..607545cfa 100644 --- a/libnautilus-private/Makefile.am +++ b/libnautilus-private/Makefile.am @@ -27,7 +27,7 @@ nautilus_metafile_server_idl_sources = \ $(NULL) marshal_sources = \ - nautilus-marshal-guts.h \ + nautilus-marshal.h \ nautilus-marshal-guts.c \ $(NULL) @@ -112,7 +112,6 @@ libnautilus_private_la_SOURCES = \ nautilus-link-historical.h \ nautilus-link.c \ nautilus-link.h \ - nautilus-marshal-guts.h \ nautilus-marshal.c \ nautilus-marshal.h \ nautilus-medusa-support.c \ @@ -176,7 +175,7 @@ nautilus_metafile_server_idl_stamp: nautilus-metafile-server.idl $(ORBIT_IDL) $(ORBIT_IDL) -I$(top_srcdir) $(CORE_IDL_INCLUDES) $< touch $@ -nautilus-marshal-guts.h: nautilus-marshal.list $(GLIB_GENMARSHAL) +nautilus-marshal.h: nautilus-marshal.list $(GLIB_GENMARSHAL) $(GLIB_GENMARSHAL) $< --header --prefix=nautilus_marshal > $@ nautilus-marshal-guts.c: nautilus-marshal.list $(GLIB_GENMARSHAL) $(GLIB_GENMARSHAL) $< --body --prefix=nautilus_marshal > $@ diff --git a/libnautilus-private/nautilus-entry.c b/libnautilus-private/nautilus-entry.c index 45115d7eb..c6505c08f 100644 --- a/libnautilus-private/nautilus-entry.c +++ b/libnautilus-private/nautilus-entry.c @@ -283,14 +283,21 @@ select_all_at_idle (gpointer callback_data) void nautilus_entry_select_all_at_idle (NautilusEntry *entry) { + GSource *source; + g_return_if_fail (NAUTILUS_IS_ENTRY (entry)); /* If the text cursor position changes in this routine * then gtk_entry_key_press will unselect (and we want * to move the text cursor position to the end). */ - g_object_ref (G_OBJECT (entry)); - gtk_idle_add (select_all_at_idle, entry); + + source = g_idle_source_new (); + g_source_set_callback (source, select_all_at_idle, entry, NULL); + g_signal_connect_swapped (entry, "destroy", + G_CALLBACK (g_source_destroy), source); + g_source_attach (source, NULL); + g_source_unref (source); } /** diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c index f79d0ab60..b65b43693 100644 --- a/libnautilus-private/nautilus-icon-container.c +++ b/libnautilus-private/nautilus-icon-container.c @@ -3298,7 +3298,7 @@ nautilus_icon_container_class_init (NautilusIconContainerClass *class) G_STRUCT_OFFSET (NautilusIconContainerClass, preview), NULL, NULL, - nautilus_marshal_INT__POINTER_INT, + nautilus_marshal_INT__POINTER_BOOLEAN, G_TYPE_INT, 2, G_TYPE_POINTER, G_TYPE_BOOLEAN); diff --git a/libnautilus-private/nautilus-marshal.h b/libnautilus-private/nautilus-marshal.h deleted file mode 100644 index 50f6ae267..000000000 --- a/libnautilus-private/nautilus-marshal.h +++ /dev/null @@ -1,2 +0,0 @@ -#include <glib-object.h> -#include "nautilus-marshal-guts.h" diff --git a/libnautilus-private/nautilus-marshal.list b/libnautilus-private/nautilus-marshal.list index 2139d6cbb..486f196c0 100644 --- a/libnautilus-private/nautilus-marshal.list +++ b/libnautilus-private/nautilus-marshal.list @@ -1,5 +1,6 @@ BOOLEAN:POINTER INT:POINTER,INT +INT:POINTER,BOOLEAN INT:POINTER,POINTER POINTER:VOID VOID:DOUBLE |