summaryrefslogtreecommitdiff
path: root/components
diff options
context:
space:
mode:
Diffstat (limited to 'components')
-rw-r--r--components/news/nautilus-news.c2
-rw-r--r--components/text/nautilus-text-view.c17
2 files changed, 9 insertions, 10 deletions
diff --git a/components/news/nautilus-news.c b/components/news/nautilus-news.c
index be8d675e6..82adc2b0c 100644
--- a/components/news/nautilus-news.c
+++ b/components/news/nautilus-news.c
@@ -2542,7 +2542,7 @@ main(int argc, char *argv[])
*/
if (g_getenv("NAUTILUS_DEBUG") != NULL) {
eel_make_warnings_and_criticals_stop_in_debugger
- (G_LOG_DOMAIN, g_log_domain_glib, "Gdk", "Gtk", "GnomeVFS", "GnomeUI", "Bonobo", NULL);
+ (G_LOG_DOMAIN, "Gdk", "Gtk", "GnomeVFS", "GnomeUI", "Bonobo", NULL);
}
return nautilus_view_standard_main ("nautilus-news",
diff --git a/components/text/nautilus-text-view.c b/components/text/nautilus-text-view.c
index e0eb059c4..bb131b131 100644
--- a/components/text/nautilus-text-view.c
+++ b/components/text/nautilus-text-view.c
@@ -326,15 +326,14 @@ file_read_callback (GnomeVFSAsyncHandle *vfs_handle,
if (result == GNOME_VFS_OK && bytes_read > 0) {
/* write the buffer into the text field */
display = GTK_TEXT (text_view->details->text_display);
- if (!GTK_OBJECT_DESTROYED (display)) {
- gtk_text_freeze (display);
- gtk_text_set_point (display,
- gtk_text_get_length (display));
- gtk_text_insert (display,
- NULL, NULL, NULL,
- buffer, bytes_read);
- gtk_text_thaw (display);
- }
+
+ gtk_text_freeze (display);
+ gtk_text_set_point (display,
+ gtk_text_get_length (display));
+ gtk_text_insert (display,
+ NULL, NULL, NULL,
+ buffer, bytes_read);
+ gtk_text_thaw (display);
/* read more if necessary */
if (text_view->details->file_size < MAX_FILE_SIZE) {