gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-08-25 02:36:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

kill g_log_domain_glib.

Browse source 
2001-11-21  Michael Meeks  <michael@ximian.com>

	* src/nautilus-main.c (main): kill g_log_domain_glib.

	* components/news/nautilus-news.c (main): ditto.

	* libnautilus-private/nautilus-marshal.h: upd.

	* libnautilus/nautilus-view.c (nautilus_view_class_init):
	update for new marshallers.

	* libnautilus-private/nautilus-directory-async.c
	(nautilus_directory_async_state_changed): #ifdef out
	GTK_OBJECT_DESTROYED check.

	* libnautilus/nautilus-clipboard.c
	(select_all_idle_callback): kill GTK_OBJECT_DESTROYED
	check; unneccessary.

	* libnautilus-private/nautilus-directory.c
	(nautilus_directory_find_file_by_internal_uri): ditto.

	* libnautilus-private/nautilus-entry.c
	(select_all_at_idle): ditto.

	* components/text/nautilus-text-view.c
	(file_read_callback): ditto.

	* src/file-manager/fm-properties-window.c
	(rename_callback): ditto.
This commit is contained in:
Michael Meeks 2001-11-21 06:14:51 +00:00 committed by Michael Meeks
parent e9e3b603f4
commit 44af9fae6c
11 changed files with 53 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
ChangeLog
View file

@ -1,3 +1,34 @@
2001-11-21 Michael Meeks <michael@ximian.com>
* src/nautilus-main.c (main): kill g_log_domain_glib.
* components/news/nautilus-news.c (main): ditto.
* libnautilus-private/nautilus-marshal.h: upd.
* libnautilus/nautilus-view.c (nautilus_view_class_init):
update for new marshallers.
* libnautilus-private/nautilus-directory-async.c
(nautilus_directory_async_state_changed): #ifdef out
GTK_OBJECT_DESTROYED check.
* libnautilus/nautilus-clipboard.c
(select_all_idle_callback): kill GTK_OBJECT_DESTROYED
check; unneccessary.
* libnautilus-private/nautilus-directory.c
(nautilus_directory_find_file_by_internal_uri): ditto.
* libnautilus-private/nautilus-entry.c
(select_all_at_idle): ditto.
* components/text/nautilus-text-view.c
(file_read_callback): ditto.
* src/file-manager/fm-properties-window.c
(rename_callback): ditto.
2001-11-15 Ramiro Estrugo <ramiro@fateware.com>
* src/nautilus-preferences-dialog.c:

2
components/news/nautilus-news.c
View file

@ -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",

17
components/text/nautilus-text-view.c
View file

@ -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) {

3
libnautilus-private/nautilus-directory-async.c
View file

@ -3044,9 +3044,12 @@ nautilus_directory_async_state_changed (NautilusDirectory *directory)
* is not longer needed once the callbacks are satisfied.
*/
#ifdef GNOME2_CONVERSION_COMPLETE
if (GTK_OBJECT_DESTROYED (directory)) {
return;
}
#endif
if (directory->details->in_async_service_loop) {
directory->details->state_changed = TRUE;
return;

1
libnautilus-private/nautilus-directory.c
View file

@ -669,7 +669,6 @@ nautilus_directory_find_file_by_internal_uri (NautilusDirectory *directory,
result = nautilus_directory_get_existing_corresponding_file (directory);
if (result != NULL) {
nautilus_file_unref (result);
g_return_val_if_fail (!GTK_OBJECT_DESTROYED (result), NULL);
}
} else {
result = nautilus_directory_find_file_by_relative_uri (directory, relative_uri);

8
libnautilus-private/nautilus-entry.c
View file

@ -264,13 +264,9 @@ nautilus_entry_select_all (NautilusEntry *entry)
static gboolean
select_all_at_idle (gpointer callback_data)
{
NautilusEntry *entry;
nautilus_entry_select_all (NAUTILUS_ENTRY (callback_data));
g_object_unref (G_OBJECT (callback_data));
entry = NAUTILUS_ENTRY (callback_data);
if (!GTK_OBJECT_DESTROYED (entry)) {
nautilus_entry_select_all (entry);
}
g_object_unref (G_OBJECT (entry));
return FALSE;
}

3
libnautilus-private/nautilus-marshal.h
View file

@ -1,3 +1,2 @@
#include <gobject/gclosure.h>
#include <gobject/gvaluetypes.h>
#include <glib-object.h>
#include "nautilus-marshal-guts.h"

4
libnautilus/nautilus-clipboard.c
View file

@ -103,9 +103,7 @@ select_all_idle_callback (gpointer callback_data)
editable = GTK_EDITABLE (callback_data);
if (!GTK_OBJECT_DESTROYED (GTK_OBJECT (editable))) {
select_all (editable);
}
select_all (editable);
g_object_unref (G_OBJECT (editable));

6
libnautilus/nautilus-view.c
View file

@ -817,7 +817,7 @@ nautilus_view_class_init (NautilusViewClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusViewClass, stop_loading),
NULL, NULL,
gtk_marshal_NONE__NONE,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
signals[SELECTION_CHANGED] =
g_signal_new ("selection_changed",
@ -825,7 +825,7 @@ nautilus_view_class_init (NautilusViewClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusViewClass, selection_changed),
NULL, NULL,
gtk_marshal_NONE__POINTER,
g_cclosure_marshal_VOID__POINTER,
G_TYPE_NONE, 1, G_TYPE_POINTER);
signals[TITLE_CHANGED] =
g_signal_new ("title_changed",
@ -841,7 +841,7 @@ nautilus_view_class_init (NautilusViewClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusViewClass, history_changed),
NULL, NULL,
gtk_marshal_NONE__POINTER,
g_cclosure_marshal_VOID__POINTER,
G_TYPE_NONE, 1, G_TYPE_POINTER);
epv->load_location = impl_Nautilus_View_load_location;

7
src/file-manager/fm-properties-window.c
View file

@ -446,7 +446,7 @@ name_field_restore_original_name (NautilusEntry *name_field)
char *displayed_name;
original_name = (const char *) g_object_get_data (G_OBJECT (name_field),
"original_name");
"original_name");
displayed_name = gtk_editable_get_chars (GTK_EDITABLE (name_field), 0, -1);
if (strcmp (original_name, displayed_name) != 0) {
@ -472,10 +472,7 @@ rename_callback (NautilusFile *file, GnomeVFSResult result, gpointer callback_da
window->details->pending_name,
result,
GTK_WINDOW (window));
/* This can trigger after window destroy, before finalize. */
if (!GTK_OBJECT_DESTROYED (window)) {
name_field_restore_original_name (window->details->name_field);
}
name_field_restore_original_name (window->details->name_field);
}
g_object_unref (G_OBJECT (window));

2
src/nautilus-main.c
View file

@ -167,7 +167,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,
(G_LOG_DOMAIN,
"Bonobo",
"Gdk",
"GnomeUI",