diff options
| author | Michael Meeks <michael@ximian.com> | 2001-11-22 05:58:33 +0000 |
|---|---|---|
| committer | Michael Meeks <michael@src.gnome.org> | 2001-11-22 05:58:33 +0000 |
| commit | 50a26e58132eeff159587cc446779f08c3ab667c (patch) | |
| tree | a6c4c42596812a32138b403b1d69f184fe40a81f /libnautilus-private/nautilus-entry.c | |
| parent | 7a030297d96722f9c7255b46ea971d8c848d83e7 (diff) | |
| download | nautilus-50a26e58132eeff159587cc446779f08c3ab667c.tar.gz | |
fix marshaller.
2001-11-22 Michael Meeks <michael@ximian.com>
* libnautilus-private/nautilus-icon-container.c
(nautilus_icon_container_class_init): fix marshaller.
* libnautilus-private/nautilus-marshal.list: add
INT_POINTER_BOOLEAN
* src/file-manager/fm-properties-window.c
(real_destroy): protect against double destroys.
Tue Nov 20 21:45:43 2001 Owen Taylor <otaylor@redhat.com>
* configure.in: Add [quoting] around AC_CHECK_HEADERS needed for
some autoconf versions.
* components/text/nautilus-text-view.c (file_read_callback):
text_view->details->text_display is set to NULL in
nautilus_text_view_destroy(), so simply check for non-NULL
rather than calling GTK_OBJECT_DESTROYED().
* src/file-manager/fm-properties-window.c (real_destroy): NULL
out name_field here, since it will be destroyed, so we
can avoid accessing it in rename_callback.
* libnautilus-private/Makefile.am (nautilus-marshal-guts.c): Get rid
of nautilus-marshal-guts.h, since glib-genmarshal now generates correct
standalone headers.
* libnautilus/nautilus-clipboard.c (select_all_callback),
* libnautilus-private/nautilus-entry.c (nautilus_entry_select_all_at_idle):
Remove the idle on destrunction of the widget, rather than checking
GTK_OBJECT_DESTROYED().
Diffstat (limited to 'libnautilus-private/nautilus-entry.c')
| -rw-r--r-- | libnautilus-private/nautilus-entry.c | 11 |
1 files changed, 9 insertions, 2 deletions
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); } /** |