gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-10-05 23:40:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

lots of files Get rid of casts in callers to g_object_ref/g_object_unref.

Browse source 
* lots of files
	Get rid of casts in callers to g_object_ref/g_object_unref.
	Remove parameters to eel_make_warnings_and_criticals_stop_in_debugger.
This commit is contained in:
Darin Adler 2001-12-07 00:55:34 +00:00
parent 60c93330fb
commit 5a749ac982
71 changed files with 301 additions and 346 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2001-12-06 Darin Adler <darin@bentspoon.com>
* lots of files
Get rid of casts in callers to g_object_ref/g_object_unref.
Remove parameters to eel_make_warnings_and_criticals_stop_in_debugger.
2001-12-05 Gediminas Paulauskas <menesis@delfi.lt>
* libnautilus-private/nautilus-desktop-file-loader.c: remove

2
components/adapter/bonobo-stream-vfs.c
View file

@ -459,7 +459,7 @@ bonobo_stream_vfs_new_internal (GnomeVFSHandle *handle)
CORBA_exception_init (&ev);
if (CORBA_Object_is_nil (corba_stream, &ev)){
g_object_unref (G_OBJECT (stream_vfs));
g_object_unref (stream_vfs);
CORBA_exception_free (&ev);
return NULL;
}

3
components/adapter/main.c
View file

@ -92,8 +92,7 @@ main (int argc, char *argv[])
char *registration_id;
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", "ORBit", NULL);
eel_make_warnings_and_criticals_stop_in_debugger ();
}
/* Disable session manager connection */

2
components/adapter/nautilus-adapter-control-embed-strategy.c
View file

@ -157,7 +157,7 @@ nautilus_adapter_control_embed_strategy_new (Bonobo_Control control,
CORBA_Environment ev;
strategy = NAUTILUS_ADAPTER_CONTROL_EMBED_STRATEGY (g_object_new (NAUTILUS_TYPE_ADAPTER_CONTROL_EMBED_STRATEGY, NULL));
g_object_ref (G_OBJECT (strategy));
g_object_ref (strategy);
gtk_object_sink (GTK_OBJECT (strategy));
strategy->details->control_frame = bonobo_control_frame_new (ui_container);

2
components/adapter/nautilus-adapter-control-factory-embed-strategy.c
View file

@ -169,7 +169,7 @@ nautilus_adapter_embeddable_embed_strategy_new (Bonobo_Embeddable embeddable,
CORBA_Environment ev;
strategy = NAUTILUS_ADAPTER_EMBEDDABLE_EMBED_STRATEGY (g_object_new (NAUTILUS_TYPE_ADAPTER_EMBEDDABLE_EMBED_STRATEGY, NULL));
g_object_ref (G_OBJECT (strategy));
g_object_ref (strategy);
gtk_object_sink (GTK_OBJECT (strategy));
embeddable_wrapper = bonobo_object_client_from_corba

2
components/adapter/nautilus-adapter-embeddable-embed-strategy.c
View file

@ -169,7 +169,7 @@ nautilus_adapter_embeddable_embed_strategy_new (Bonobo_Embeddable embeddable,
CORBA_Environment ev;
strategy = NAUTILUS_ADAPTER_EMBEDDABLE_EMBED_STRATEGY (g_object_new (NAUTILUS_TYPE_ADAPTER_EMBEDDABLE_EMBED_STRATEGY, NULL));
g_object_ref (G_OBJECT (strategy));
g_object_ref (strategy);
gtk_object_sink (GTK_OBJECT (strategy));
embeddable_wrapper = bonobo_object_client_from_corba

6
components/adapter/nautilus-adapter-file-load-strategy.c
View file

@ -106,7 +106,7 @@ nautilus_adapter_file_load_strategy_new (Bonobo_PersistFile persist_file)
NautilusAdapterFileLoadStrategy *strategy;
strategy = NAUTILUS_ADAPTER_FILE_LOAD_STRATEGY (g_object_new (NAUTILUS_TYPE_ADAPTER_FILE_LOAD_STRATEGY, NULL));
g_object_ref (G_OBJECT (strategy));
g_object_ref (strategy);
gtk_object_sink (GTK_OBJECT (strategy));
strategy->details->persist_file = persist_file;
@ -126,7 +126,7 @@ nautilus_adapter_file_load_strategy_load_location (NautilusAdapterLoadStrategy *
strategy = NAUTILUS_ADAPTER_FILE_LOAD_STRATEGY (abstract_strategy);
g_object_ref (G_OBJECT (strategy));
g_object_ref (strategy);
CORBA_exception_init (&ev);
@ -148,7 +148,7 @@ nautilus_adapter_file_load_strategy_load_location (NautilusAdapterLoadStrategy *
nautilus_adapter_load_strategy_report_load_failed (abstract_strategy);
}
g_object_unref (G_OBJECT (strategy));
g_object_unref (strategy);
CORBA_exception_free (&ev);

12
components/adapter/nautilus-adapter-progressive-load-strategy.c
View file

@ -119,7 +119,7 @@ nautilus_adapter_progressive_load_strategy_new (Bonobo_ProgressiveDataSink prog
CORBA_exception_init (&ev);
strategy = NAUTILUS_ADAPTER_PROGRESSIVE_LOAD_STRATEGY (g_object_new (NAUTILUS_TYPE_ADAPTER_PROGRESSIVE_LOAD_STRATEGY, NULL));
g_object_ref (G_OBJECT (strategy));
g_object_ref (strategy);
gtk_object_sink (GTK_OBJECT (strategy));
strategy->details->progressive_data_sink = progressive_data_sink;
@ -188,7 +188,7 @@ stop_loading (NautilusAdapterProgressiveLoadStrategy *strategy,
nautilus_adapter_load_strategy_report_load_complete (NAUTILUS_ADAPTER_LOAD_STRATEGY (strategy));
}
}
g_object_unref (G_OBJECT (strategy));
g_object_unref (strategy);
gnome_vfs_close (handle);
CORBA_free (iobuf);
CORBA_exception_free (ev);
@ -241,7 +241,7 @@ nautilus_adapter_progressive_load_strategy_load_location (NautilusAdapterLoadStr
strategy->details->no_report_stop = FALSE;
g_object_ref (G_OBJECT (strategy));
g_object_ref (strategy);
strategy->details->loading = TRUE;
strategy->details->stop = FALSE;
@ -256,7 +256,7 @@ nautilus_adapter_progressive_load_strategy_load_location (NautilusAdapterLoadStr
if (gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ) != GNOME_VFS_OK) {
nautilus_adapter_load_strategy_report_load_failed (abstract_strategy);
g_object_unref (G_OBJECT (strategy));
g_object_unref (strategy);
CORBA_exception_free (&ev);
declare_done_loading (strategy);
return;
@ -271,7 +271,7 @@ nautilus_adapter_progressive_load_strategy_load_location (NautilusAdapterLoadStr
if (strategy->details->stop) {
nautilus_adapter_load_strategy_report_load_complete (abstract_strategy);
g_object_unref (G_OBJECT (strategy));
g_object_unref (strategy);
CORBA_exception_free (&ev);
declare_done_loading (strategy);
return;
@ -312,7 +312,7 @@ nautilus_adapter_progressive_load_strategy_load_location (NautilusAdapterLoadStr
if (ev._major == CORBA_NO_EXCEPTION) {
Bonobo_ProgressiveDataSink_end (strategy->details->progressive_data_sink, &ev);
nautilus_adapter_load_strategy_report_load_complete (abstract_strategy);
g_object_unref (G_OBJECT (strategy));
g_object_unref (strategy);
gnome_vfs_close (handle);
CORBA_free (iobuf);
CORBA_exception_free (&ev);

6
components/adapter/nautilus-adapter-stream-load-strategy.c
View file

@ -103,7 +103,7 @@ nautilus_adapter_stream_load_strategy_new (Bonobo_PersistStream persist_stream)
NautilusAdapterStreamLoadStrategy *strategy;
strategy = NAUTILUS_ADAPTER_STREAM_LOAD_STRATEGY (g_object_new (NAUTILUS_TYPE_ADAPTER_STREAM_LOAD_STRATEGY, NULL));
g_object_ref (G_OBJECT (strategy));
g_object_ref (strategy);
gtk_object_sink (GTK_OBJECT (strategy));
strategy->details->persist_stream = persist_stream;
@ -121,7 +121,7 @@ nautilus_adapter_stream_load_strategy_load_location (NautilusAdapterLoadStrategy
CORBA_Environment ev;
strategy = NAUTILUS_ADAPTER_STREAM_LOAD_STRATEGY (abstract_strategy);
g_object_ref (G_OBJECT (strategy));
g_object_ref (strategy);
CORBA_exception_init (&ev);
@ -157,7 +157,7 @@ nautilus_adapter_stream_load_strategy_load_location (NautilusAdapterLoadStrategy
}
g_object_unref (G_OBJECT (strategy));
g_object_unref (strategy);
CORBA_exception_free (&ev);
}

10
components/adapter/nautilus-adapter.c
View file

@ -94,7 +94,7 @@ static void
nautilus_adapter_init (NautilusAdapter *adapter)
{
adapter->details = g_new0 (NautilusAdapterDetails, 1);
g_object_ref (G_OBJECT (adapter));
g_object_ref (adapter);
gtk_object_sink (GTK_OBJECT (adapter));
}
@ -120,11 +120,11 @@ nautilus_adapter_destroy (GtkObject *object)
if (adapter->details->load_strategy != NULL) {
nautilus_adapter_load_strategy_stop_loading (adapter->details->load_strategy);
g_object_unref (G_OBJECT (adapter->details->load_strategy));
g_object_unref (adapter->details->load_strategy);
}
if (adapter->details->embed_strategy != NULL) {
g_object_unref (G_OBJECT (adapter->details->embed_strategy));
g_object_unref (adapter->details->embed_strategy);
}
g_free (adapter->details);
@ -161,7 +161,7 @@ nautilus_adapter_new (Bonobo_Unknown component)
/* Get the class to handle embedding this kind of component. */
adapter->details->embed_strategy = nautilus_adapter_embed_strategy_get (component);
if (adapter->details->embed_strategy == NULL) {
g_object_unref (G_OBJECT (adapter));
g_object_unref (adapter);
return NULL;
}
@ -181,7 +181,7 @@ nautilus_adapter_new (Bonobo_Unknown component)
/* Get the class to handle loading this kind of component. */
adapter->details->load_strategy = nautilus_adapter_load_strategy_get (component);
if (adapter->details->load_strategy == NULL) {
g_object_unref (G_OBJECT (adapter));
g_object_unref (adapter);
return NULL;
}

5
components/hardware/main.c
View file

@ -80,11 +80,8 @@ int main(int argc, char *argv[])
textdomain (PACKAGE);
#endif
/* Make criticals and warnings stop in the debugger if NAUTILUS_DEBUG is set.
* Unfortunately, this has to be done explicitly for each domain.
*/
if (g_getenv ("NAUTILUS_DEBUG") != NULL) {
eel_make_warnings_and_criticals_stop_in_debugger (G_LOG_DOMAIN, NULL);
eel_make_warnings_and_criticals_stop_in_debugger ();
}
CORBA_exception_init(&ev);

5
components/help/hyperbola-main.c
View file

@ -102,11 +102,8 @@ main (int argc, char *argv[])
textdomain (PACKAGE);
#endif
/* Make criticals and warnings stop in the debugger if NAUTILUS_DEBUG is set.
* Unfortunately, this has to be done explicitly for each domain.
*/
if (g_getenv ("NAUTILUS_DEBUG") != NULL) {
eel_make_warnings_and_criticals_stop_in_debugger (G_LOG_DOMAIN, NULL);
eel_make_warnings_and_criticals_stop_in_debugger ();
}
/* Disable session manager connection */

11
components/history/nautilus-history-view.c
View file

@ -170,7 +170,7 @@ update_history (NautilusHistoryView *view,
pixbuf = bonobo_ui_util_xml_to_pixbuf (item->icon);
install_icon (list, new_row, pixbuf);
if (pixbuf != NULL) {
g_object_unref (G_OBJECT (pixbuf));
g_object_unref (pixbuf);
}
gtk_clist_columns_autosize (list);
@ -279,7 +279,7 @@ nautilus_history_view_instance_init (NautilusHistoryView *view)
nautilus_view_construct (NAUTILUS_VIEW (view), window);
g_object_ref (G_OBJECT (list));
g_object_ref (list);
view->list = list;
g_signal_connect (list,
@ -308,7 +308,7 @@ nautilus_history_view_finalize (GObject *object)
*view->external_destroyed_flag = TRUE;
}
g_object_unref (G_OBJECT (view->list));
g_object_unref (view->list);
GNOME_CALL_PARENT (G_OBJECT_CLASS, finalize, (object));
}
@ -322,11 +322,8 @@ nautilus_history_view_class_init (NautilusHistoryViewClass *klass)
int
main (int argc, char *argv[])
{
/* Make criticals and warnings stop in the debugger if NAUTILUS_DEBUG is set.
* Unfortunately, this has to be done explicitly for each domain.
*/
if (g_getenv ("NAUTILUS_DEBUG") != NULL) {
eel_make_warnings_and_criticals_stop_in_debugger (G_LOG_DOMAIN, NULL);
eel_make_warnings_and_criticals_stop_in_debugger ();
}
return nautilus_view_standard_main ("nautilus_history-view",

25
components/image-viewer/nautilus-image-view.c
View file

@ -81,17 +81,17 @@ release_pixbuf (bonobo_object_data_t *bod)
g_return_if_fail (bod != NULL);
if (bod->pixbuf != NULL) {
g_object_unref (G_OBJECT (bod->pixbuf));
g_object_unref (bod->pixbuf);
}
bod->pixbuf = NULL;
if (bod->zoomed != NULL) {
g_object_unref (G_OBJECT (bod->zoomed));
g_object_unref (bod->zoomed);
}
bod->zoomed = NULL;
if (bod->scaled != NULL) {
g_object_unref (G_OBJECT (bod->scaled));
g_object_unref (bod->scaled);
}
bod->scaled = NULL;
}
@ -409,7 +409,7 @@ rezoom_control (bonobo_object_data_t *bod, float new_zoom_level)
new_height = old_height * new_zoom_level;
if (bod->zoomed)
g_object_unref (G_OBJECT (bod->zoomed));
g_object_unref (bod->zoomed);
if (new_width >= 1 && new_height >= 1) {
bod->zoomed = gdk_pixbuf_scale_simple (pixbuf, new_width,
@ -484,7 +484,7 @@ load_image_from_stream (BonoboPersistStream *ps, Bonobo_Stream stream,
Bonobo_Stream_read (stream, LOAD_BUFFER_SIZE, &buffer, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
gdk_pixbuf_loader_close (loader, NULL);
g_object_unref (G_OBJECT (loader));
g_object_unref (loader);
return;
}
@ -496,7 +496,7 @@ load_image_from_stream (BonoboPersistStream *ps, Bonobo_Stream stream,
ex_Bonobo_Persist_WrongDataType, NULL);
}
gdk_pixbuf_loader_close (loader, NULL);
g_object_unref (G_OBJECT (loader));
g_object_unref (loader);
return;
}
@ -509,9 +509,9 @@ load_image_from_stream (BonoboPersistStream *ps, Bonobo_Stream stream,
if (bod->pixbuf == NULL) {
CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_Bonobo_Persist_WrongDataType, NULL);
g_object_unref (G_OBJECT (loader));
g_object_unref (loader);
} else {
g_object_ref (G_OBJECT (bod->pixbuf));
g_object_ref (bod->pixbuf);
/* Restore current zoomed pixbuf cache. */
if (bod->zoom_level != 1.0) {
@ -559,7 +559,7 @@ control_size_allocate_callback (GtkWidget *drawing_area, GtkAllocation *allocati
if (allocation->width == gdk_pixbuf_get_width (buf) &&
allocation->height == gdk_pixbuf_get_height (buf)) {
if (bod->scaled != NULL) {
g_object_unref (G_OBJECT (bod->scaled));
g_object_unref (bod->scaled);
bod->scaled = NULL;
}
return;
@ -572,7 +572,7 @@ control_size_allocate_callback (GtkWidget *drawing_area, GtkAllocation *allocati
return;
} else {
bod->scaled = NULL;
g_object_unref (G_OBJECT (control_buf));
g_object_unref (control_buf);
control_buf = NULL;
}
}
@ -852,11 +852,8 @@ main (int argc, char *argv [])
textdomain (PACKAGE);
#endif
/* Make criticals and warnings stop in the debugger if NAUTILUS_DEBUG is set.
* Unfortunately, this has to be done explicitly for each domain.
*/
if (g_getenv ("NAUTILUS_DEBUG") != NULL) {
eel_make_warnings_and_criticals_stop_in_debugger (G_LOG_DOMAIN, NULL);
eel_make_warnings_and_criticals_stop_in_debugger ();
}
init_server_factory (argc, argv);

5
components/mozilla/main.c
View file

@ -224,11 +224,8 @@ main (int argc, char *argv[])
bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL);
/* Make criticals and warnings stop in the debugger if NAUTILUS_DEBUG is set.
* Unfortunately, this has to be done explicitly for each domain.
*/
if (g_getenv ("NAUTILUS_DEBUG") != NULL) {
eel_make_warnings_and_criticals_stop_in_debugger (G_LOG_DOMAIN, NULL);
eel_make_warnings_and_criticals_stop_in_debugger ();
}
/* the fake_argv thing is just superstition. I just don't

5
components/music/main.c
View file

@ -38,11 +38,8 @@
int
main (int argc, char *argv[])
{
/* Make criticals and warnings stop in the debugger if NAUTILUS_DEBUG is set.
* Unfortunately, this has to be done explicitly for each domain.
*/
if (g_getenv ("NAUTILUS_DEBUG") != NULL) {
eel_make_warnings_and_criticals_stop_in_debugger (G_LOG_DOMAIN, NULL);
eel_make_warnings_and_criticals_stop_in_debugger ();
}
return nautilus_view_standard_main ("nautilus-music-view",

4
components/music/nautilus-music-view.c
View file

@ -1719,10 +1719,10 @@ nautilus_music_view_set_album_image (NautilusMusicView *music_view, const char *
if (pixbuf != NULL) {
scaled_pixbuf = eel_gdk_pixbuf_scale_down_to_fit (pixbuf, SCALED_IMAGE_WIDTH, SCALED_IMAGE_HEIGHT);
g_object_unref (G_OBJECT (pixbuf));
g_object_unref (pixbuf);
gdk_pixbuf_render_pixmap_and_mask (scaled_pixbuf, &pixmap, &mask, EEL_STANDARD_ALPHA_THRESHHOLD);
g_object_unref (G_OBJECT (scaled_pixbuf));
g_object_unref (scaled_pixbuf);
if (music_view->details->album_image == NULL) {
music_view->details->album_image = gtk_pixmap_new (pixmap, mask);

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

@ -307,11 +307,11 @@ do_destroy (GtkObject *obj, News *news)
g_free (news->uri);
if (news->font) {
g_object_unref (G_OBJECT (news->font));
g_object_unref (news->font);
}
if (news->bold_font) {
g_object_unref (G_OBJECT (news->bold_font));
g_object_unref (news->bold_font);
}
if (news->timer_task != 0) {
@ -325,27 +325,27 @@ do_destroy (GtkObject *obj, News *news)
}
if (news->closed_triangle != NULL) {
g_object_unref (G_OBJECT (news->closed_triangle));
g_object_unref (news->closed_triangle);
}
if (news->closed_triangle_changed != NULL) {
g_object_unref (G_OBJECT (news->closed_triangle_changed));
g_object_unref (news->closed_triangle_changed);
}
if (news->open_triangle != NULL) {
g_object_unref (G_OBJECT (news->open_triangle));
g_object_unref (news->open_triangle);
}
if (news->open_triangle_changed != NULL) {
g_object_unref (G_OBJECT (news->open_triangle_changed));
g_object_unref (news->open_triangle_changed);
}
if (news->bullet != NULL) {
g_object_unref (G_OBJECT (news->bullet));
g_object_unref (news->bullet);
}
if (news->changed_bullet != NULL) {
g_object_unref (G_OBJECT (news->changed_bullet));
g_object_unref (news->changed_bullet);
}
/* free all the channel data */
@ -434,7 +434,7 @@ draw_triangle (GdkPixbuf *pixbuf, RSSChannelData *channel_data, int v_offset)
pixbuf_composite (mapped_image, pixbuf, 2, triangle_position, 255);
if (mapped_image != triangle) {
g_object_unref (G_OBJECT (mapped_image));
g_object_unref (mapped_image);
}
}
@ -467,7 +467,7 @@ draw_rss_logo_image (RSSChannelData *channel_data,
}
pixbuf_composite (mapped_image, pixbuf, LOGO_LEFT_OFFSET, v_offset, 255);
if (mapped_image != channel_data->logo_image) {
g_object_unref (G_OBJECT (mapped_image));
g_object_unref (mapped_image);
}
}
v_offset += logo_height + 2;
@ -636,7 +636,7 @@ draw_rss_items (RSSChannelData *channel_data,
}
}
g_object_unref (G_OBJECT (smooth_text_layout));
g_object_unref (smooth_text_layout);
item_data->item_end_y = item_data->item_start_y + text_dimensions.height;
v_offset += text_dimensions.height + 4;
@ -729,7 +729,7 @@ static gint
nautilus_news_configure_event (GtkWidget *widget, GdkEventConfigure *event, News *news_data )
{
if (news_data->pixbuf != NULL) {
g_object_unref (G_OBJECT (news_data->pixbuf));
g_object_unref (news_data->pixbuf);
}
news_data->pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8,
@ -979,7 +979,7 @@ free_channel (RSSChannelData *channel_data)
g_free (channel_data->title);
if (channel_data->logo_image != NULL) {
g_object_unref (G_OBJECT (channel_data->logo_image));
g_object_unref (channel_data->logo_image);
}
if (channel_data->load_file_handle != NULL) {
@ -1131,12 +1131,12 @@ rss_logo_callback (GnomeVFSResult error, GdkPixbuf *pixbuf, gpointer callback_d
channel_data->load_image_handle = NULL;
if (channel_data->logo_image) {
g_object_unref (G_OBJECT (channel_data->logo_image));
g_object_unref (channel_data->logo_image);
channel_data->logo_image = NULL;
}
if (pixbuf != NULL) {
g_object_ref (G_OBJECT (pixbuf));
g_object_ref (pixbuf);
pixbuf = eel_gdk_pixbuf_scale_down_to_fit (pixbuf, 192, 40);
channel_data->logo_image = pixbuf;
queue_update_size_and_redraw (channel_data->owner);
@ -1747,7 +1747,7 @@ static void
load_xpm_image (GdkPixbuf** image_result, const char** image_name)
{
if (*image_result != NULL) {
g_object_unref (G_OBJECT (*image_result));
g_object_unref (*image_result);
}
*image_result = gdk_pixbuf_new_from_xpm_data (image_name);
}
@ -1764,7 +1764,7 @@ nautilus_news_load_images (News *news_data)
load_xpm_image (&news_data->open_triangle_changed, (const char**) open_triangle_changed_xpm);
if (news_data->bullet != NULL) {
g_object_unref (G_OBJECT (news_data->bullet));
g_object_unref (news_data->bullet);
}
news_bullet_path = nautilus_theme_get_image_path ("news_bullet.png");
@ -1774,7 +1774,7 @@ nautilus_news_load_images (News *news_data)
}
if (news_data->changed_bullet != NULL) {
g_object_unref (G_OBJECT (news_data->changed_bullet));
g_object_unref (news_data->changed_bullet);
}
news_bullet_path = nautilus_theme_get_image_path ("changed_bullet.png");
@ -2537,12 +2537,8 @@ make_news_view (const char *iid, gpointer callback_data)
int
main(int argc, char *argv[])
{
/* Make criticals and warnings stop in the debugger if NAUTILUS_DEBUG is set.
* Unfortunately, this has to be done explicitly for each domain.
*/
if (g_getenv("NAUTILUS_DEBUG") != NULL) {
eel_make_warnings_and_criticals_stop_in_debugger
(G_LOG_DOMAIN, "Gdk", "Gtk", "GnomeVFS", "GnomeUI", "Bonobo", NULL);
if (g_getenv ("NAUTILUS_DEBUG") != NULL) {
eel_make_warnings_and_criticals_stop_in_debugger ();
}
return nautilus_view_standard_main ("nautilus-news",

5
components/notes/nautilus-notes.c
View file

@ -429,11 +429,8 @@ make_notes_view (const char *iid, gpointer callback_data)
int
main(int argc, char *argv[])
{
/* Make criticals and warnings stop in the debugger if NAUTILUS_DEBUG is set.
* Unfortunately, this has to be done explicitly for each domain.
*/
if (g_getenv ("NAUTILUS_DEBUG") != NULL) {
eel_make_warnings_and_criticals_stop_in_debugger (G_LOG_DOMAIN, NULL);
eel_make_warnings_and_criticals_stop_in_debugger ();
}
return nautilus_view_standard_main ("nautilus-notes",

5
components/text/main.c
View file

@ -38,11 +38,8 @@
int
main (int argc, char *argv[])
{
/* Make criticals and warnings stop in the debugger if NAUTILUS_DEBUG is set.
* Unfortunately, this has to be done explicitly for each domain.
*/
if (g_getenv ("NAUTILUS_DEBUG") != NULL) {
eel_make_warnings_and_criticals_stop_in_debugger (G_LOG_DOMAIN, NULL);
eel_make_warnings_and_criticals_stop_in_debugger ();
}
return nautilus_view_standard_main ("nautilus-text-view",

5
components/throbber/main.c
View file

@ -72,11 +72,8 @@ main (int argc, char *argv[])
char *registration_id;
#endif
/* Make criticals and warnings stop in the debugger if NAUTILUS_DEBUG is set.
* Unfortunately, this has to be done explicitly for each domain.
*/
if (g_getenv ("NAUTILUS_DEBUG") != NULL) {
eel_make_warnings_and_criticals_stop_in_debugger (G_LOG_DOMAIN, NULL);
eel_make_warnings_and_criticals_stop_in_debugger ();
}
/* Disable session manager connection */

14
components/throbber/nautilus-throbber.c
View file

@ -327,7 +327,7 @@ select_throbber_image (NautilusThrobber *throbber)
GList *element;
if (throbber->details->timer_task == 0) {
return g_object_ref (G_OBJECT (throbber->details->quiescent_pixbuf));
return g_object_ref (throbber->details->quiescent_pixbuf);
}
if (throbber->details->image_list == NULL) {
@ -336,7 +336,7 @@ select_throbber_image (NautilusThrobber *throbber)
element = g_list_nth (throbber->details->image_list, throbber->details->current_frame);
return g_object_ref (G_OBJECT (element->data));
return g_object_ref (element->data);
}
/* draw the throbber into the passed-in rectangle */
@ -377,7 +377,7 @@ draw_throbber_image (GtkWidget *widget, GdkRectangle *box)
} else {
massaged_pixbuf = eel_create_spotlight_pixbuf (pixbuf);
}
g_object_unref (G_OBJECT (pixbuf));
g_object_unref (pixbuf);
pixbuf = massaged_pixbuf;
}
@ -387,7 +387,7 @@ draw_throbber_image (GtkWidget *widget, GdkRectangle *box)
draw_pixbuf (pixbuf, widget->window, box->x + x_offset, box->y + y_offset);
g_object_unref (G_OBJECT (pixbuf));
g_object_unref (pixbuf);
}
#ifdef GNOME2_CONVERSION_COMPLETE
@ -504,14 +504,14 @@ nautilus_throbber_unload_images (NautilusThrobber *throbber)
GList *current_entry;
if (throbber->details->quiescent_pixbuf != NULL) {
g_object_unref (G_OBJECT (throbber->details->quiescent_pixbuf));
g_object_unref (throbber->details->quiescent_pixbuf);
throbber->details->quiescent_pixbuf = NULL;
}
/* unref all the images in the list, and then let go of the list itself */
current_entry = throbber->details->image_list;
while (current_entry != NULL) {
g_object_unref (G_OBJECT (current_entry->data));
g_object_unref (current_entry->data);
current_entry = current_entry->next;
}
@ -539,7 +539,7 @@ load_themed_image (const char *file_name, const char *image_theme, gboolean smal
gdk_pixbuf_get_width (pixbuf) / 2,
gdk_pixbuf_get_height (pixbuf) / 2,
GDK_INTERP_BILINEAR);
g_object_unref (G_OBJECT (pixbuf));
g_object_unref (pixbuf);
pixbuf = temp_pixbuf;
}

6
components/tree/nautilus-tree-change-queue.c
View file

@ -93,7 +93,7 @@ nautilus_tree_change_queue_new (void)
NautilusTreeChangeQueue *change_queue;
change_queue = NAUTILUS_TREE_CHANGE_QUEUE (g_object_new (NAUTILUS_TYPE_TREE_CHANGE_QUEUE, NULL));
g_object_ref (G_OBJECT (change_queue));
g_object_ref (change_queue);
gtk_object_sink (GTK_OBJECT (change_queue));
return change_queue;
}
@ -149,7 +149,7 @@ nautilus_tree_change_new (NautilusTreeChangeType change_type,
change = g_new0 (NautilusTreeChange, 1);
change->change_type = change_type;
g_object_ref (G_OBJECT (node));
g_object_ref (node);
change->node = node;
return change;
@ -158,6 +158,6 @@ nautilus_tree_change_new (NautilusTreeChangeType change_type,
void
nautilus_tree_change_free (NautilusTreeChange *change)
{
g_object_unref (G_OBJECT (change->node));
g_object_unref (change->node);
g_free (change);
}

2
components/tree/nautilus-tree-expansion-state.c
View file

@ -174,7 +174,7 @@ nautilus_tree_expansion_state_new (void)
NautilusTreeExpansionState *state;
state = NAUTILUS_TREE_EXPANSION_STATE (g_object_new (NAUTILUS_TYPE_TREE_EXPANSION_STATE, NULL));
g_object_ref (G_OBJECT (state));
g_object_ref (state);
gtk_object_sink (GTK_OBJECT (state));
return state;
}

16
components/tree/nautilus-tree-model.c
View file

@ -205,7 +205,7 @@ nautilus_tree_model_new (const char *root_uri)
NautilusTreeModel *model;
model = NAUTILUS_TREE_MODEL (g_object_new (NAUTILUS_TYPE_TREE_MODEL, NULL));
g_object_ref (G_OBJECT (model));
g_object_ref (model);
gtk_object_sink (GTK_OBJECT (model));
nautilus_tree_model_set_root_uri (model, root_uri);
@ -294,7 +294,7 @@ remove_all_nodes (NautilusTreeModel *model)
NULL);
if (model->details->root_node != NULL) {
g_object_unref (G_OBJECT (model->details->root_node));
g_object_unref (model->details->root_node);
model->details->root_node = NULL;
}
model->details->root_node_reported = FALSE;
@ -770,7 +770,7 @@ report_node_changed (NautilusTreeModel *model,
g_free (parent_uri);
}
g_object_ref (G_OBJECT (node));
g_object_ref (node);
g_hash_table_insert (model->details->file_to_node_map,
nautilus_tree_node_get_file (node),
node);
@ -794,7 +794,7 @@ report_node_changed (NautilusTreeModel *model,
} else {
/* A move or rename - model it as a remove followed by an add */
g_object_ref (G_OBJECT (node));
g_object_ref (node);
/* Let the view know that the rename is happening, this allows
@ -822,7 +822,7 @@ report_node_changed (NautilusTreeModel *model,
report_node_changed (model, node);
g_object_unref (G_OBJECT (node));
g_object_unref (node);
}
g_free (file_uri);
@ -869,7 +869,7 @@ report_node_removed_internal (NautilusTreeModel *model,
}
g_object_unref (G_OBJECT (node));
g_object_unref (node);
}
}
@ -921,10 +921,10 @@ process_file_change (NautilusTreeModel *model,
if (node == NULL) {
node = nautilus_tree_node_new (file);
} else {
g_object_ref (G_OBJECT (node));
g_object_ref (node);
}
report_node_changed (model, node);
g_object_unref (G_OBJECT (node));
g_object_unref (node);
}
}

2
components/tree/nautilus-tree-node.c
View file

@ -89,7 +89,7 @@ nautilus_tree_node_new (NautilusFile *file)
NautilusTreeNode *node;
node = NAUTILUS_TREE_NODE (g_object_new (NAUTILUS_TYPE_TREE_NODE, NULL));
g_object_ref (G_OBJECT (node));
g_object_ref (node);
gtk_object_sink (GTK_OBJECT (node));
node->details->file = nautilus_file_ref (file);

20
components/tree/nautilus-tree-view.c
View file

@ -258,8 +258,8 @@ nautilus_tree_view_insert_model_node (NautilusTreeView *view, NautilusTreeNode *
CLIST_AUTO_SORT);
view->details->inserting_node = FALSE;
g_object_unref (G_OBJECT (closed_pixbuf));
g_object_unref (G_OBJECT (open_pixbuf));
g_object_unref (closed_pixbuf);
g_object_unref (open_pixbuf);
eel_ctree_node_set_row_data (EEL_CTREE (view->details->tree),
@ -451,8 +451,8 @@ nautilus_tree_view_update_model_node (NautilusTreeView *view, NautilusTreeNode *
g_free (name);
g_object_unref (G_OBJECT (closed_pixbuf));
g_object_unref (G_OBJECT (open_pixbuf));
g_object_unref (closed_pixbuf);
g_object_unref (open_pixbuf);
@ -490,7 +490,7 @@ register_unparented_node (NautilusTreeView *view, NautilusTreeNode *node)
g_return_if_fail (!nautilus_tree_node_is_toplevel (node));
if (g_list_find (view->details->unparented_tree_nodes, node) == NULL) {
g_object_ref (G_OBJECT (node));
g_object_ref (node);
view->details->unparented_tree_nodes = g_list_prepend (view->details->unparented_tree_nodes, node);
}
}
@ -503,7 +503,7 @@ forget_unparented_node (NautilusTreeView *view, NautilusTreeNode *node)
if (g_list_find (view->details->unparented_tree_nodes, node) != NULL) {
view->details->unparented_tree_nodes = g_list_remove (view->details->unparented_tree_nodes, node);
g_object_unref (G_OBJECT (node));
g_object_unref (node);
}
}
@ -535,7 +535,7 @@ insert_unparented_nodes (NautilusTreeView *view, NautilusTreeNode *node)
sub_node = p->data;
view->details->unparented_tree_nodes = g_list_remove (view->details->unparented_tree_nodes, sub_node);
nautilus_tree_view_insert_model_node (view, sub_node);
g_object_unref (G_OBJECT (sub_node));
g_object_unref (sub_node);
}
g_list_free (to_add);
}
@ -1114,7 +1114,7 @@ nautilus_tree_view_destroy (BonoboObject *object)
}
if (view->details->tree != NULL) {
g_object_unref (G_OBJECT (view->details->change_queue));
g_object_unref (view->details->change_queue);
if (compare_cached_key == view->details->tree) {
compare_cached_key = NULL;
@ -1147,10 +1147,10 @@ nautilus_tree_view_destroy (BonoboObject *object)
nautilus_tree_view_free_dnd (view);
disconnect_model_handlers (view);
g_object_unref (G_OBJECT (view->details->model));
g_object_unref (view->details->model);
nautilus_tree_expansion_state_save (view->details->expansion_state);
g_object_unref (G_OBJECT (view->details->expansion_state));
g_object_unref (view->details->expansion_state);
view->details->tree = NULL;
}

4
libnautilus-private/nautilus-bookmark.c
View file

@ -217,7 +217,7 @@ nautilus_bookmark_get_pixmap_and_mask (NautilusBookmark *bookmark,
}
gdk_pixbuf_render_pixmap_and_mask (pixbuf, pixmap_return, mask_return, EEL_STANDARD_ALPHA_THRESHHOLD);
g_object_unref (G_OBJECT (pixbuf));
g_object_unref (pixbuf);
return TRUE;
}
@ -518,7 +518,7 @@ nautilus_bookmark_new_with_icon (const char *uri, const char *name,
NautilusBookmark *new_bookmark;
new_bookmark = NAUTILUS_BOOKMARK (g_object_new (NAUTILUS_TYPE_BOOKMARK, NULL));
g_object_ref (G_OBJECT (new_bookmark));
g_object_ref (new_bookmark);
gtk_object_sink (GTK_OBJECT (new_bookmark));
new_bookmark->details->name = g_strdup (name);

10
libnautilus-private/nautilus-customization-data.c
View file

@ -219,7 +219,7 @@ nautilus_customization_data_get_next_element_for_display (NautilusCustomizationD
pixbuf = eel_gdk_pixbuf_scale_down_to_fit (orig_pixbuf,
data->maximum_icon_width,
data->maximum_icon_height);
g_object_unref (G_OBJECT (orig_pixbuf));
g_object_unref (orig_pixbuf);
}
*pixbuf_out = pixbuf;
@ -257,7 +257,7 @@ nautilus_customization_data_destroy (NautilusCustomizationData *data)
data->private_file_list != NULL);
if (data->pattern_frame != NULL) {
g_object_unref (G_OBJECT (data->pattern_frame));
g_object_unref (data->pattern_frame);
}
gnome_vfs_file_info_list_free (data->public_file_list);
@ -372,7 +372,7 @@ add_reset_text (GdkPixbuf *pixbuf)
EEL_RGBA_COLOR_OPAQUE_WHITE,
EEL_OPACITY_FULLY_OPAQUE);
g_object_unref (G_OBJECT (font));
g_object_unref (font);
}
/* utility to make an attractive pattern image by compositing with a frame */
@ -397,11 +397,11 @@ nautilus_customization_make_pattern_chit (GdkPixbuf *pattern_tile, GdkPixbuf *fr
if (dragging) {
temp_pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, frame_width - 6, frame_height - 6);
gdk_pixbuf_copy_area (pixbuf, 2, 2, frame_width - 6, frame_height - 6, temp_pixbuf, 0, 0);
g_object_unref (G_OBJECT (pixbuf));
g_object_unref (pixbuf);
pixbuf = temp_pixbuf;
}
g_object_unref (G_OBJECT (pattern_tile));
g_object_unref (pattern_tile);
if (is_reset) {
add_reset_text (pixbuf);

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

@ -146,7 +146,7 @@ nautilus_directory_ref (NautilusDirectory *directory)
g_return_if_fail (NAUTILUS_IS_DIRECTORY (directory));
g_object_ref (G_OBJECT (directory));
g_object_ref (directory);
}
void
@ -158,7 +158,7 @@ nautilus_directory_unref (NautilusDirectory *directory)
g_return_if_fail (NAUTILUS_IS_DIRECTORY (directory));
g_object_unref (G_OBJECT (directory));
g_object_unref (directory);
}
static void
@ -511,7 +511,7 @@ nautilus_directory_new (const char *uri)
} else {
directory = NAUTILUS_DIRECTORY (g_object_new (NAUTILUS_TYPE_VFS_DIRECTORY, NULL));
}
g_object_ref (G_OBJECT (directory));
g_object_ref (directory);
gtk_object_sink (GTK_OBJECT (directory));
set_directory_uri (directory, uri);

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

@ -265,7 +265,7 @@ static gboolean
select_all_at_idle (gpointer callback_data)
{
nautilus_entry_select_all (NAUTILUS_ENTRY (callback_data));
g_object_unref (G_OBJECT (callback_data));
g_object_unref (callback_data);
return FALSE;
}

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

@ -160,7 +160,7 @@ nautilus_file_new_from_relative_uri (NautilusDirectory *directory,
} else {
file = NAUTILUS_FILE (g_object_new (NAUTILUS_TYPE_VFS_FILE, NULL));
}
g_object_ref (G_OBJECT (file));
g_object_ref (file);
gtk_object_sink (GTK_OBJECT (file));
#ifdef NAUTILUS_FILE_DEBUG_REF
@ -276,7 +276,7 @@ nautilus_file_new_from_info (NautilusDirectory *directory,
eazel_dump_stack_trace ("\t", 10);
#endif
g_object_ref (G_OBJECT (file));
g_object_ref (file);
gtk_object_sink (GTK_OBJECT (file));
nautilus_directory_ref (directory);
@ -469,7 +469,7 @@ nautilus_file_ref (NautilusFile *file)
eazel_dump_stack_trace ("\t", 10);
#endif
g_object_ref (G_OBJECT (file));
g_object_ref (file);
return file;
}
@ -487,7 +487,7 @@ nautilus_file_unref (NautilusFile *file)
eazel_dump_stack_trace ("\t", 10);
#endif
g_object_unref (G_OBJECT (file));
g_object_unref (file);
}
/**

4
libnautilus-private/nautilus-font-factory.c
View file

@ -77,7 +77,7 @@ EEL_CLASS_BOILERPLATE (NautilusFontFactory,
static void
unref_global_font_factory (void)
{
g_object_unref (G_OBJECT (global_font_factory));
g_object_unref (global_font_factory);
}
/* Return a pointer to the single global font factory. */
@ -86,7 +86,7 @@ nautilus_get_current_font_factory (void)
{
if (global_font_factory == NULL) {
global_font_factory = NAUTILUS_FONT_FACTORY (g_object_new (nautilus_font_factory_get_type (), NULL));
g_object_ref (G_OBJECT (global_font_factory));
g_object_ref (global_font_factory);
gtk_object_sink (GTK_OBJECT (global_font_factory));
g_atexit (unref_global_font_factory);
}

2
libnautilus-private/nautilus-global-preferences.c
View file

@ -936,7 +936,7 @@ global_preferences_get_smooth_bold_font (const char *file_name)
if (bold_font == NULL) {
bold_font = plain_font;
} else {
g_object_unref (G_OBJECT (plain_font));
g_object_unref (plain_font);
}
g_assert (EEL_IS_SCALABLE_FONT (bold_font));

48
libnautilus-private/nautilus-icon-canvas-item.c
View file

@ -197,7 +197,7 @@ static EelSmoothTextLayoutCache *layout_cache;
static void
free_layout_cache (void)
{
g_object_unref (G_OBJECT (layout_cache));
g_object_unref (layout_cache);
}
/* Object initialization function for the icon item. */
@ -230,7 +230,7 @@ nautilus_icon_canvas_item_finalize (GObject *object)
details = NAUTILUS_ICON_CANVAS_ITEM (object)->details;
if (details->pixbuf != NULL) {
g_object_unref (G_OBJECT (details->pixbuf));
g_object_unref (details->pixbuf);
}
eel_gdk_pixbuf_list_free (details->emblem_pixbufs);
g_free (details->editable_text);
@ -241,10 +241,10 @@ nautilus_icon_canvas_item_finalize (GObject *object)
gdk_font_unref (details->font);
}
g_object_unref (G_OBJECT (details->smooth_font));
g_object_unref (details->smooth_font);
if (details->rendered_pixbuf != NULL) {
g_object_unref (G_OBJECT (details->rendered_pixbuf));
g_object_unref (details->rendered_pixbuf);
}
g_free (details);
@ -402,7 +402,7 @@ nautilus_icon_canvas_item_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
break;
case ARG_SMOOTH_FONT:
g_object_ref (G_OBJECT (details->smooth_font));
g_object_ref (details->smooth_font);
GTK_VALUE_OBJECT (*arg) = GTK_OBJECT (details->smooth_font);
break;
@ -443,13 +443,13 @@ nautilus_icon_canvas_item_set_image (NautilusIconCanvasItem *item,
}
if (image != NULL) {
g_object_ref (G_OBJECT (image));
g_object_ref (image);
}
if (details->pixbuf != NULL) {
g_object_unref (G_OBJECT (details->pixbuf));
g_object_unref (details->pixbuf);
}
if (details->rendered_pixbuf != NULL) {
g_object_unref (G_OBJECT (details->rendered_pixbuf));
g_object_unref (details->rendered_pixbuf);
details->rendered_pixbuf = NULL;
}
@ -913,7 +913,7 @@ draw_stretch_handles (NautilusIconCanvasItem *item, GdkDrawable *drawable,
draw_pixbuf (knob_pixbuf, drawable, rect->x1 - knob_width, rect->y1 - knob_height);
g_free (knob_filename);
g_object_unref (G_OBJECT (knob_pixbuf));
g_object_unref (knob_pixbuf);
gdk_gc_unref (gc);
}
@ -1010,7 +1010,7 @@ draw_stretch_handles_aa (NautilusIconCanvasItem *item, GnomeCanvasBuf *buf,
eel_gnome_canvas_draw_pixbuf (buf, knob_pixbuf, rect->x1 - knob_width, rect->y1 - knob_height);
g_free (knob_filename);
g_object_unref (G_OBJECT (knob_pixbuf));
g_object_unref (knob_pixbuf);
}
static void
@ -1183,12 +1183,12 @@ real_map_pixbuf (NautilusIconCanvasItem *icon_item)
temp_pixbuf = icon_item->details->pixbuf;
canvas = GNOME_CANVAS_ITEM(icon_item)->canvas;
g_object_ref (G_OBJECT (temp_pixbuf));
g_object_ref (temp_pixbuf);
if (icon_item->details->is_prelit) {
old_pixbuf = temp_pixbuf;
temp_pixbuf = eel_create_spotlight_pixbuf (temp_pixbuf);
g_object_unref (G_OBJECT (old_pixbuf));
g_object_unref (old_pixbuf);
/* FIXME bugzilla.gnome.org 42471: This hard-wired image is inappropriate to
* this level of code, which shouldn't know that the
@ -1220,7 +1220,7 @@ real_map_pixbuf (NautilusIconCanvasItem *icon_item)
canvas->pixels_per_unit,
GDK_INTERP_BILINEAR, 0xFF);
g_object_unref (G_OBJECT (audio_pixbuf));
g_object_unref (audio_pixbuf);
}
g_free (audio_filename);
@ -1233,7 +1233,7 @@ real_map_pixbuf (NautilusIconCanvasItem *icon_item)
temp_pixbuf = eel_create_darkened_pixbuf (temp_pixbuf,
0.8 * 255,
0.8 * 255);
g_object_unref (G_OBJECT (old_pixbuf));
g_object_unref (old_pixbuf);
}
return temp_pixbuf;
@ -1248,7 +1248,7 @@ map_pixbuf (NautilusIconCanvasItem *icon_item)
&& icon_item->details->rendered_is_highlighted_for_selection == icon_item->details->is_highlighted_for_selection
&& icon_item->details->rendered_is_highlighted_for_drop == icon_item->details->is_highlighted_for_drop)) {
if (icon_item->details->rendered_pixbuf != NULL) {
g_object_unref (G_OBJECT (icon_item->details->rendered_pixbuf));
g_object_unref (icon_item->details->rendered_pixbuf);
}
icon_item->details->rendered_pixbuf = real_map_pixbuf (icon_item);
icon_item->details->rendered_is_active = icon_item->details->is_active;
@ -1257,7 +1257,7 @@ map_pixbuf (NautilusIconCanvasItem *icon_item)
icon_item->details->rendered_is_highlighted_for_drop = icon_item->details->is_highlighted_for_drop;
}
g_object_ref (G_OBJECT (icon_item->details->rendered_pixbuf));
g_object_ref (icon_item->details->rendered_pixbuf);
return icon_item->details->rendered_pixbuf;
}
@ -1291,7 +1291,7 @@ nautilus_icon_canvas_item_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
/* if the pre-lit or selection flag is set, make a pre-lit or darkened pixbuf and draw that instead */
temp_pixbuf = map_pixbuf (icon_item);
draw_pixbuf (temp_pixbuf, drawable, icon_rect.x0, icon_rect.y0);
g_object_unref (G_OBJECT (temp_pixbuf));
g_object_unref (temp_pixbuf);
/* Draw the emblem pixbufs. */
emblem_layout_reset (&emblem_layout, icon_item, icon_rect);
@ -1319,7 +1319,7 @@ draw_or_measure_label_text_aa (NautilusIconCanvasItem *item,
GnomeCanvasItem *canvas_item;
int max_text_width;
int icon_width, text_left, box_left;
const EelSmoothTextLayout *smooth_text_layout;
EelSmoothTextLayout *smooth_text_layout;
char **pieces;
const char *text_piece;
int i;
@ -1485,7 +1485,7 @@ draw_or_measure_label_text_aa (NautilusIconCanvasItem *item,
width_so_far = MAX (width_so_far, (guint) eel_smooth_text_layout_get_width (smooth_text_layout));
height_so_far += eel_smooth_text_layout_get_height (smooth_text_layout) + LABEL_LINE_SPACING;
g_object_unref (G_OBJECT (smooth_text_layout));
g_object_unref (smooth_text_layout);
}
g_strfreev (pieces);
@ -1620,7 +1620,7 @@ draw_label_text_aa (NautilusIconCanvasItem *icon_item, GnomeCanvasBuf *buf, int
eel_gnome_canvas_draw_pixbuf (buf, text_pixbuf, x - x_delta, y + LABEL_OFFSET);
g_object_unref (G_OBJECT (text_pixbuf));
g_object_unref (text_pixbuf);
/* draw the keyboard selection focus indicator if necessary */
if (icon_item->details->is_highlighted_as_keyboard_focus) {
@ -1656,7 +1656,7 @@ nautilus_icon_canvas_item_render (GnomeCanvasItem *item, GnomeCanvasBuf *buf)
/* draw the icon */
eel_gnome_canvas_draw_pixbuf (buf, temp_pixbuf, icon_rect.x0, icon_rect.y0);
g_object_unref (G_OBJECT (temp_pixbuf));
g_object_unref (temp_pixbuf);
/* draw the emblems */
emblem_layout_reset (&emblem_layout, icon_item, icon_rect);
@ -2019,7 +2019,7 @@ hit_test_stretch_handle (NautilusIconCanvasItem *item,
knob_height = gdk_pixbuf_get_height (knob_pixbuf);
g_free (knob_filename);
g_object_unref (G_OBJECT (knob_pixbuf));
g_object_unref (knob_pixbuf);
/* Check for hits in the stretch handles. */
return (probe_canvas_rect.x0 < icon_rect.x0 + knob_width
@ -2102,9 +2102,9 @@ nautilus_icon_canvas_item_set_smooth_font (NautilusIconCanvasItem *icon_item,
g_return_if_fail (NAUTILUS_IS_ICON_CANVAS_ITEM (icon_item));
g_return_if_fail (EEL_IS_SCALABLE_FONT (font));
g_object_unref (G_OBJECT (icon_item->details->smooth_font));
g_object_unref (icon_item->details->smooth_font);
g_object_ref (G_OBJECT (font));
g_object_ref (font);
icon_item->details->smooth_font = font;

14
libnautilus-private/nautilus-icon-container.c
View file

@ -2338,11 +2338,11 @@ finalize (GObject *object)
}
if (details->smooth_label_font != NULL) {
g_object_unref (G_OBJECT (details->smooth_label_font));
g_object_unref (details->smooth_label_font);
}
if (details->highlight_frame != NULL) {
g_object_unref (G_OBJECT (details->highlight_frame));
g_object_unref (details->highlight_frame);
}
g_hash_table_destroy (details->icon_set);
@ -3807,7 +3807,7 @@ nautilus_icon_container_update_icon (NautilusIconContainer *container,
scaled_height = floor (height * scale_factor + .5);
saved_pixbuf = pixbuf;
pixbuf = gdk_pixbuf_scale_simple (pixbuf, scaled_width, scaled_height, GDK_INTERP_BILINEAR);
g_object_unref (G_OBJECT (saved_pixbuf));
g_object_unref (saved_pixbuf);
}
emblem_pixbufs = NULL;
@ -3870,7 +3870,7 @@ nautilus_icon_container_update_icon (NautilusIconContainer *container,
nautilus_icon_canvas_item_set_emblems (icon->item, emblem_pixbufs);
/* Let the pixbufs go. */
g_object_unref (G_OBJECT (pixbuf));
g_object_unref (pixbuf);
eel_gdk_pixbuf_list_free (emblem_pixbufs);
g_free (editable_text);
@ -5034,8 +5034,8 @@ nautilus_icon_container_set_smooth_label_font (NautilusIconContainer *container,
g_return_if_fail (NAUTILUS_IS_ICON_CONTAINER (container));
g_return_if_fail (EEL_IS_SCALABLE_FONT (font));
g_object_ref (G_OBJECT (font));
g_object_unref (G_OBJECT (container->details->smooth_label_font));
g_object_ref (font);
g_object_unref (container->details->smooth_label_font);
container->details->smooth_label_font = font;
}
@ -5159,7 +5159,7 @@ nautilus_icon_container_theme_changed (gpointer user_data)
/* load the highlight frame */
text_frame_path = nautilus_theme_get_image_path ("text-selection-frame-aa.png");
if (container->details->highlight_frame != NULL) {
g_object_unref (G_OBJECT (container->details->highlight_frame));
g_object_unref (container->details->highlight_frame);
}
container->details->highlight_frame = gdk_pixbuf_new_from_file (text_frame_path, NULL);

32
libnautilus-private/nautilus-icon-factory.c
View file

@ -263,7 +263,7 @@ destroy_icon_factory (void)
eel_preferences_remove_callback (NAUTILUS_PREFERENCES_IMAGE_FILE_THUMBNAIL_LIMIT,
thumbnail_limit_changed_callback,
NULL);
g_object_unref (G_OBJECT (global_icon_factory));
g_object_unref (global_icon_factory);
}
/* Return a pointer to the single global icon factory. */
@ -273,7 +273,7 @@ get_icon_factory (void)
if (global_icon_factory == NULL) {
global_icon_factory = NAUTILUS_ICON_FACTORY
(g_object_new (nautilus_icon_factory_get_type (), NULL));
g_object_ref (G_OBJECT (global_icon_factory));
g_object_ref (global_icon_factory);
gtk_object_sink (GTK_OBJECT (global_icon_factory));
icon_theme_changed_callback (NULL);
@ -341,14 +341,14 @@ load_thumbnail_frames (NautilusIconFactory *factory)
image_path = nautilus_theme_get_image_path ("thumbnail_frame.png");
if (factory->thumbnail_frame != NULL) {
g_object_unref (G_OBJECT (factory->thumbnail_frame));
g_object_unref (factory->thumbnail_frame);
}
factory->thumbnail_frame = gdk_pixbuf_new_from_file (image_path, NULL);
g_free (image_path);
image_path = nautilus_theme_get_image_path ("thumbnail_frame.aa.png");
if (factory->thumbnail_frame_aa != NULL) {
g_object_unref (G_OBJECT (factory->thumbnail_frame_aa));
g_object_unref (factory->thumbnail_frame_aa);
}
factory->thumbnail_frame_aa = gdk_pixbuf_new_from_file (image_path, NULL);
g_free (image_path);
@ -431,7 +431,7 @@ cache_icon_new (GdkPixbuf *pixbuf,
g_assert (g_hash_table_lookup (factory->cache_icons, pixbuf) == NULL);
/* Grab the pixbuf since we are keeping it. */
g_object_ref (G_OBJECT (pixbuf));
g_object_ref (pixbuf);
#if GNOME2_CONVERSION_COMPLETE
gdk_pixbuf_set_last_unref_handler
(pixbuf, mark_icon_not_outstanding, NULL);
@ -528,7 +528,7 @@ cache_icon_unref (CacheIcon *icon)
* and we were counting on the unref handler to catch it.
*/
if (!icon->outstanding) {
g_object_unref (G_OBJECT (icon->pixbuf));
g_object_unref (icon->pixbuf);
}
g_free (icon);
@ -587,10 +587,10 @@ nautilus_icon_factory_destroy (GtkObject *object)
g_hash_table_destroy (factory->icon_cache);
if (factory->thumbnail_frame != NULL) {
g_object_unref (G_OBJECT (factory->thumbnail_frame));
g_object_unref (factory->thumbnail_frame);
}
if (factory->thumbnail_frame_aa != NULL) {
g_object_unref (G_OBJECT (factory->thumbnail_frame_aa));
g_object_unref (factory->thumbnail_frame_aa);
}
g_free (factory->theme.current.name);
@ -1618,7 +1618,7 @@ load_specific_icon (NautilusScalableIcon *scalable_icon,
/* Since we got something, we can create a cache icon. */
icon = cache_icon_new (pixbuf, type, FALSE, &details);
get_cache_time (scalable_icon->uri, &icon->cache_time);
g_object_unref (G_OBJECT (pixbuf));
g_object_unref (pixbuf);
return icon;
}
@ -1753,7 +1753,7 @@ scale_icon (CacheIcon *icon,
&scaled_details);
scaled_icon->is_fallback = icon->is_fallback;
scaled_icon->cache_time = icon->cache_time;
g_object_unref (G_OBJECT (scaled_pixbuf));
g_object_unref (scaled_pixbuf);
return scaled_icon;
}
@ -2058,10 +2058,10 @@ nautilus_icon_factory_get_pixbuf_for_icon (NautilusScalableIcon *scalable_icon,
if (!icon->outstanding) {
icon->outstanding = TRUE;
#ifndef GNOME2_CONVERSION_COMPLETE
g_object_ref (G_OBJECT (pixbuf));
g_object_ref (pixbuf);
#endif
} else {
g_object_ref (G_OBJECT (pixbuf));
g_object_ref (pixbuf);
}
cache_icon_unref (icon);
@ -2178,7 +2178,7 @@ nautilus_icon_factory_get_pixmap_and_mask_for_file (NautilusFile *file,
return;
}
gdk_pixbuf_render_pixmap_and_mask (pixbuf, pixmap, mask, EEL_STANDARD_ALPHA_THRESHHOLD);
g_object_unref (G_OBJECT (pixbuf));
g_object_unref (pixbuf);
}
/* Convenience routine for getting a pixbuf from an icon name. */
@ -2252,7 +2252,7 @@ embedded_text_font_free (void)
return;
}
g_object_unref (G_OBJECT (embedded_text_font));
g_object_unref (embedded_text_font);
embedded_text_font = NULL;
}
@ -2308,7 +2308,7 @@ embed_text (GdkPixbuf *pixbuf_without_text,
EEL_RGB_COLOR_BLACK,
EEL_OPACITY_FULLY_OPAQUE);
g_object_unref (G_OBJECT (smooth_text_layout));
g_object_unref (smooth_text_layout);
return pixbuf_with_text;
}
@ -2352,7 +2352,7 @@ load_icon_with_embedded_text (NautilusScalableIcon *scalable_icon,
&details);
icon_with_text->cache_time = icon_without_text->cache_time;
cache_icon_unref (icon_without_text);
g_object_unref (G_OBJECT (pixbuf_with_text));
g_object_unref (pixbuf_with_text);
return icon_with_text;
}

2
libnautilus-private/nautilus-icon-text-item.c
View file

@ -727,7 +727,7 @@ iti_render (GnomeCanvasItem *item, GnomeCanvasBuf *buffer)
/* draw the pixbuf containing the label */
draw_pixbuf_aa (text_pixbuf, buffer, affine, eel_round (item->x1), eel_round (item->y1));
g_object_unref (G_OBJECT (text_pixbuf));
g_object_unref (text_pixbuf);
buffer->is_bg = FALSE;
buffer->is_buf = TRUE;

8
libnautilus-private/nautilus-program-choosing.c
View file

@ -86,7 +86,7 @@ choose_application_destroy (ChooseApplicationCallbackData *choose_data)
{
nautilus_file_unref (choose_data->file);
if (choose_data->parent_window != NULL) {
g_object_unref (G_OBJECT (choose_data->parent_window));
g_object_unref (choose_data->parent_window);
}
g_free (choose_data);
}
@ -120,7 +120,7 @@ choose_component_destroy (ChooseComponentCallbackData *choose_data)
{
nautilus_file_unref (choose_data->file);
if (choose_data->parent_window != NULL) {
g_object_unref (G_OBJECT (choose_data->parent_window));
g_object_unref (choose_data->parent_window);
}
g_free (choose_data);
}
@ -234,7 +234,7 @@ nautilus_choose_component_for_file (NautilusFile *file,
*/
nautilus_file_ref (file);
if (parent_window != NULL) {
g_object_ref (G_OBJECT (parent_window));
g_object_ref (parent_window);
}
/* Create data to pass through. */
@ -374,7 +374,7 @@ nautilus_choose_application_for_file (NautilusFile *file,
*/
nautilus_file_ref (file);
if (parent_window != NULL) {
g_object_ref (G_OBJECT (parent_window));
g_object_ref (parent_window);
}
/* Create data to pass through. */

4
libnautilus-private/nautilus-theme.c
View file

@ -575,7 +575,7 @@ theme_list_prepend (GList *theme_list,
attributes->preview_pixbuf = eel_gdk_pixbuf_scale_down_to_fit (unscaled_preview_pixbuf,
THEME_PREVIEW_ICON_WIDTH,
THEME_PREVIEW_ICON_HEIGHT);
g_object_unref (G_OBJECT (unscaled_preview_pixbuf));
g_object_unref (unscaled_preview_pixbuf);
attributes->builtin = builtin;
@ -721,7 +721,7 @@ attributes_free (gpointer data,
g_free (attributes->display_name);
g_free (attributes->description);
if (attributes->preview_pixbuf != NULL) {
g_object_unref (G_OBJECT (attributes->preview_pixbuf));
g_object_unref (attributes->preview_pixbuf);
}
}

6
libnautilus-private/nautilus-thumbnails.c
View file

@ -589,7 +589,7 @@ make_thumbnails (gpointer data)
if (full_size_image != NULL) {
/* scale the content image as necessary */
scaled_image = eel_gdk_pixbuf_scale_down_to_fit (full_size_image, 96, 96);
g_object_unref (G_OBJECT (full_size_image));
g_object_unref (full_size_image);
thumbnail_path = gnome_vfs_get_local_path_from_uri (new_thumbnail_uri);
if (thumbnail_path == NULL
@ -597,7 +597,7 @@ make_thumbnails (gpointer data)
g_warning ("error saving thumbnail %s", thumbnail_path);
}
g_free (thumbnail_path);
g_object_unref (G_OBJECT (scaled_image));
g_object_unref (scaled_image);
} else {
/* gdk-pixbuf couldn't load the image, so trying using ImageMagick */
char *temp_str;
@ -717,6 +717,6 @@ nautilus_thumbnail_load_framed_image (const char *path, gboolean anti_aliased_fr
pixbuf_with_frame = eel_embed_image_in_frame
(pixbuf, frame,
left_offset, top_offset, right_offset, bottom_offset);
g_object_unref (G_OBJECT (pixbuf));
g_object_unref (pixbuf);
return pixbuf_with_frame;
}

4
libnautilus-private/nautilus-trash-monitor.c
View file

@ -175,7 +175,7 @@ destroy (GtkObject *object)
static void
unref_trash_monitor (void)
{
g_object_unref (G_OBJECT (nautilus_trash_monitor));
g_object_unref (nautilus_trash_monitor);
}
NautilusTrashMonitor *
@ -191,7 +191,7 @@ nautilus_trash_monitor_get (void)
nautilus_trash_monitor = NAUTILUS_TRASH_MONITOR
(g_object_new (NAUTILUS_TYPE_TRASH_MONITOR, NULL));
g_object_ref (G_OBJECT (nautilus_trash_monitor));
g_object_ref (nautilus_trash_monitor);
gtk_object_sink (GTK_OBJECT (nautilus_trash_monitor));
g_atexit (unref_trash_monitor);

4
libnautilus-private/nautilus-volume-monitor.c
View file

@ -380,7 +380,7 @@ nautilus_volume_monitor_destroy (GtkObject *object)
static void
unref_global_volume_monitor (void)
{
g_object_unref (G_OBJECT (global_volume_monitor));
g_object_unref (global_volume_monitor);
}
/* Return the global instance of the NautilusVolumeMonitor. Create one
@ -393,7 +393,7 @@ nautilus_volume_monitor_get (void)
global_volume_monitor = NAUTILUS_VOLUME_MONITOR
(g_object_new (nautilus_volume_monitor_get_type(),
NULL));
g_object_ref (G_OBJECT (global_volume_monitor));
g_object_ref (global_volume_monitor);
gtk_object_sink (GTK_OBJECT (global_volume_monitor));
g_atexit (unref_global_volume_monitor);
}

4
src/file-manager/fm-desktop-icon-view.c
View file

@ -1060,7 +1060,7 @@ mount_parameters_new (FMDesktopIconView *view, const char *mount_path)
g_assert (!eel_str_is_empty (mount_path));
new_parameters = g_new (MountParameters, 1);
g_object_ref (G_OBJECT (view));
g_object_ref (view);
new_parameters->view = view;
new_parameters->mount_path = g_strdup (mount_path);
@ -1072,7 +1072,7 @@ mount_parameters_free (MountParameters *parameters)
{
g_assert (parameters != NULL);
g_object_unref (G_OBJECT (parameters->view));
g_object_unref (parameters->view);
g_free (parameters->mount_path);
g_free (parameters);
}

8
src/file-manager/fm-directory-view.c
View file

@ -1778,7 +1778,7 @@ debuting_uri_add_file_callback (FMDirectoryView *view,
uri = nautilus_file_get_uri (new_file);
if (g_hash_table_remove (data->debuting_uris, uri)) {
g_object_ref (G_OBJECT (new_file));
g_object_ref (new_file);
data->added_files = g_list_prepend (data->added_files, new_file);
if (g_hash_table_size (data->debuting_uris) == 0) {
@ -1811,7 +1811,7 @@ copy_move_done_data_free (CopyMoveDoneData *data)
static void
pre_copy_move_add_file_callback (FMDirectoryView *view, NautilusFile *new_file, CopyMoveDoneData *data)
{
g_object_ref (G_OBJECT (new_file));
g_object_ref (new_file);
data->added_files = g_list_prepend (data->added_files, new_file);
}
@ -3690,7 +3690,7 @@ add_script_to_script_menus (FMDirectoryView *directory_view,
launch_parameters,
NULL);
g_object_unref (G_OBJECT (pixbuf));
g_object_unref (pixbuf);
g_free (name);
g_free (tip);
}
@ -3709,7 +3709,7 @@ add_submenu_to_script_menus (FMDirectoryView *directory_view,
(file, NULL, NAUTILUS_ICON_SIZE_FOR_MENUS, TRUE);
add_submenu (directory_view->details->ui, menu_path, name, pixbuf);
add_submenu (directory_view->details->ui, popup_path, name, pixbuf);
g_object_unref (G_OBJECT (pixbuf));
g_object_unref (pixbuf);
g_free (name);
}

2
src/file-manager/fm-icon-view.c
View file

@ -2389,7 +2389,7 @@ fm_icon_view_update_icon_container_smooth_font (FMIconView *icon_view)
nautilus_icon_container_set_smooth_label_font (icon_container,
scalable_font);
g_object_unref (G_OBJECT (scalable_font));
g_object_unref (scalable_font);
nautilus_icon_container_request_update_all (icon_container);
}

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

@ -267,7 +267,7 @@ update_properties_window_icon (EelImage *image)
eel_image_set_pixbuf (image, pixbuf);
g_object_unref (G_OBJECT (pixbuf));
g_object_unref (pixbuf);
}
@ -289,7 +289,7 @@ uri_is_local_image (const char *uri)
if (pixbuf == NULL) {
return FALSE;
}
g_object_unref (G_OBJECT (pixbuf));
g_object_unref (pixbuf);
return TRUE;
}
@ -363,7 +363,7 @@ create_image_widget_for_file (NautilusFile *file)
eel_image_set_pixbuf (EEL_IMAGE (image), pixbuf);
g_object_unref (G_OBJECT (pixbuf));
g_object_unref (pixbuf);
nautilus_file_ref (file);
g_object_set_data_full (G_OBJECT (image),
@ -477,7 +477,7 @@ rename_callback (NautilusFile *file, GnomeVFSResult result, gpointer callback_da
}
}
g_object_unref (G_OBJECT (window));
g_object_unref (window);
}
static void
@ -513,7 +513,7 @@ name_field_done_editing (NautilusEntry *name_field, FMPropertiesWindow *window)
name_field_restore_original_name (NAUTILUS_ENTRY (name_field));
} else {
set_pending_name (window, new_name);
g_object_ref (G_OBJECT (window));
g_object_ref (window);
nautilus_file_rename (file, new_name,
rename_callback, window);
}
@ -1728,7 +1728,7 @@ create_emblems_page (FMPropertiesWindow *window)
}
if (strcmp (emblem_name, "erase") == 0) {
g_object_unref (G_OBJECT (pixbuf));
g_object_unref (pixbuf);
g_free (label);
g_free (emblem_name);
continue;
@ -1739,7 +1739,7 @@ create_emblems_page (FMPropertiesWindow *window)
eel_labeled_image_set_spacing (EEL_LABELED_IMAGE (GTK_BIN (button)->child), EMBLEM_LABEL_SPACING);
g_free (label);
g_object_unref (G_OBJECT (pixbuf));
g_object_unref (pixbuf);
/* Attach parameters and signal handler. */
g_object_set_data_full (G_OBJECT (button),

8
src/nautilus-about.c
View file

@ -96,7 +96,7 @@ nautilus_about_finalize (GObject *object)
about = NAUTILUS_ABOUT (object);
if (about->details->background_pixbuf != NULL) {
g_object_unref (G_OBJECT (about->details->background_pixbuf));
g_object_unref (about->details->background_pixbuf);
}
g_strfreev (about->details->authors);
@ -386,8 +386,8 @@ nautilus_about_draw_info (NautilusAbout *about,
g_strfreev (comment_array);
/* release the fonts */
g_object_unref (G_OBJECT(plain_font));
g_object_unref (G_OBJECT(bold_font));
g_object_unref(plain_font);
g_object_unref(bold_font);
}
/* update authors is called to randomize the author array and redraw it */
@ -415,7 +415,7 @@ nautilus_about_update_authors (NautilusAbout *about)
/* redraw the authors */
plain_font = eel_scalable_font_get_default_font ();
draw_author_list (about, about->details->background_pixbuf, plain_font);
g_object_unref (G_OBJECT(plain_font));
g_object_unref(plain_font);
about->details->last_update_time = time (NULL);

6
src/nautilus-bookmark-list.c
View file

@ -284,7 +284,7 @@ nautilus_bookmark_list_delete_item_at (NautilusBookmarkList *bookmarks,
g_assert (NAUTILUS_IS_BOOKMARK (doomed->data));
stop_monitoring_bookmark (bookmarks, NAUTILUS_BOOKMARK (doomed->data));
g_object_unref (G_OBJECT (doomed->data));
g_object_unref (doomed->data);
g_list_free_1 (doomed);
@ -317,7 +317,7 @@ nautilus_bookmark_list_delete_items_with_uri (NautilusBookmarkList *bookmarks,
if (eel_strcmp (bookmark_uri, uri) == 0) {
bookmarks->list = g_list_remove_link (bookmarks->list, node);
stop_monitoring_bookmark (bookmarks, NAUTILUS_BOOKMARK (node->data));
g_object_unref (G_OBJECT (node->data));
g_object_unref (node->data);
g_list_free_1 (node);
list_changed = TRUE;
}
@ -473,7 +473,7 @@ nautilus_bookmark_list_new (void)
NautilusBookmarkList *list;
list = NAUTILUS_BOOKMARK_LIST (g_object_new (NAUTILUS_TYPE_BOOKMARK_LIST, NULL));
g_object_ref (G_OBJECT (list));
g_object_ref (list);
gtk_object_sink (GTK_OBJECT (list));
return list;

4
src/nautilus-bookmarks-window.c
View file

@ -432,7 +432,7 @@ on_row_move (GtkCList *clist,
gtk_signal_handler_unblock(GTK_OBJECT(bookmarks),
bookmark_list_changed_signal_id);
g_object_unref (G_OBJECT (bookmark));
g_object_unref (bookmark);
}
static void
@ -490,7 +490,7 @@ update_bookmark_from_text (void)
gtk_signal_handler_unblock (GTK_OBJECT (bookmarks),
bookmark_list_changed_signal_id);
g_object_unref (G_OBJECT (bookmark));
g_object_unref (bookmark);
}
}

2
src/nautilus-complex-search-bar.c
View file

@ -433,7 +433,7 @@ load_find_them_pixmap_widget (void)
pixbuf = gdk_pixbuf_new_from_file (NAUTILUS_PIXMAPDIR "/search.png", NULL);
if (pixbuf != NULL) {
gdk_pixbuf_render_pixmap_and_mask (pixbuf, &pixmap, &mask, EEL_STANDARD_ALPHA_THRESHHOLD);
g_object_unref (G_OBJECT (pixbuf));
g_object_unref (pixbuf);
widget = gtk_pixmap_new (pixmap, mask);
gdk_pixmap_unref (pixmap);

4
src/nautilus-component-adapter-factory.c
View file

@ -147,7 +147,7 @@ static void
component_adapter_factory_at_exit_destructor (void)
{
if (global_component_adapter_factory != NULL) {
g_object_unref (G_OBJECT (global_component_adapter_factory));
g_object_unref (global_component_adapter_factory);
}
}
@ -160,7 +160,7 @@ nautilus_component_adapter_factory_get (void)
factory = NAUTILUS_COMPONENT_ADAPTER_FACTORY
(g_object_new (NAUTILUS_TYPE_COMPONENT_ADAPTER_FACTORY, NULL));
g_object_ref (G_OBJECT (factory));
g_object_ref (factory);
gtk_object_sink (GTK_OBJECT (factory));
global_component_adapter_factory = factory;

6
src/nautilus-information-panel.c
View file

@ -276,7 +276,7 @@ nautilus_sidebar_init (GtkObject *object)
/* allocate and install the panel tabs */
sidebar->details->notebook = GTK_NOTEBOOK (gtk_notebook_new ());
g_object_ref (G_OBJECT (sidebar->details->notebook));
g_object_ref (sidebar->details->notebook);
gtk_object_sink (GTK_OBJECT (sidebar->details->notebook));
gtk_notebook_set_show_tabs (sidebar->details->notebook, FALSE);
@ -304,7 +304,7 @@ nautilus_sidebar_destroy (GtkObject *object)
sidebar = NAUTILUS_SIDEBAR (object);
g_object_unref (G_OBJECT (sidebar->details->notebook));
g_object_unref (sidebar->details->notebook);
if (sidebar->details->file != NULL) {
gtk_signal_disconnect (GTK_OBJECT (sidebar->details->file),
@ -681,7 +681,7 @@ uri_is_local_image (const char *uri)
if (pixbuf == NULL) {
return FALSE;
}
g_object_unref (G_OBJECT (pixbuf));
g_object_unref (pixbuf);
return TRUE;
}

27
src/nautilus-main.c
View file

@ -34,13 +34,14 @@
#include "nautilus-application.h"
#include "nautilus-self-check-functions.h"
#include "nautilus-window.h"
#include <X11/Xlib.h>
#include <bonobo-activation/bonobo-activation.h>
#include <bonobo/bonobo-main.h>
#include <dlfcn.h>
#include <eel/eel-debug.h>
#include <eel/eel-glib-extensions.h>
#include <eel/eel-self-checks.h>
#include <gdk/gdkx.h>
#include <libxml/parser.h>
#include <gtk/gtkmain.h>
#include <gtk/gtksignal.h>
#include <libgnome/gnome-i18n.h>
@ -50,11 +51,10 @@
#include <libnautilus-private/nautilus-directory-metafile.h>
#include <libnautilus-private/nautilus-global-preferences.h>
#include <libnautilus-private/nautilus-lib-self-check-functions.h>
#include <bonobo-activation/bonobo-activation.h>
#include <libxml/parser.h>
#include <popt.h>
#include <stdlib.h>
#include <unistd.h>
#include <X11/Xlib.h>
/* Keeps track of everyone who wants the main event loop kept active */
static GSList *event_loop_registrants;
@ -161,27 +161,8 @@ main (int argc, char *argv[])
{ NULL, '\0', 0, NULL, 0, NULL, NULL }
};
/* Make criticals and warnings stop in the debugger if
* NAUTILUS_DEBUG is set. Unfortunately, this has to be done
* explicitly for each domain.
*/
if (g_getenv ("NAUTILUS_DEBUG") != NULL) {
eel_make_warnings_and_criticals_stop_in_debugger
(G_LOG_DOMAIN,
"Bonobo",
"GLib",
"GLib-GObject",
"Gdk",
"GnomeUI",
"GnomeVFS",
"GnomeVFS-CORBA",
"GnomeVFS-pthread",
"Gtk",
"Nautilus",
"Nautilus-Authenticate",
"Nautilus-Tree",
"ORBit",
NULL);
eel_make_warnings_and_criticals_stop_in_debugger ();
}
/* Initialize gettext support */

10
src/nautilus-navigation-window-menus.c
View file

@ -152,7 +152,7 @@ bookmark_holder_new (NautilusBookmark *bookmark,
/* Ref the bookmark because it might be unreffed away while
* we're holding onto it (not an issue for window).
*/
g_object_ref (G_OBJECT (bookmark));
g_object_ref (bookmark);
new_bookmark_holder->prompt_for_removal = is_bookmarks_menu;
new_bookmark_holder->changed_handler_id =
@ -170,7 +170,7 @@ bookmark_holder_free (BookmarkHolder *bookmark_holder)
{
gtk_signal_disconnect (GTK_OBJECT (bookmark_holder->bookmark),
bookmark_holder->changed_handler_id);
g_object_unref (G_OBJECT (bookmark_holder->bookmark));
g_object_unref (bookmark_holder->bookmark);
g_free (bookmark_holder);
}
@ -885,7 +885,7 @@ append_bookmark_to_menu (NautilusWindow *window,
index_in_parent,
display_name,
pixbuf);
g_object_unref (G_OBJECT (pixbuf));
g_object_unref (pixbuf);
g_free (display_name);
/* Add the status tip */
@ -1002,7 +1002,7 @@ create_menu_item_from_node (NautilusWindow *window,
if (strcmp (node->name, "bookmark") == 0) {
bookmark = nautilus_bookmark_new_from_node (node);
append_bookmark_to_menu (window, bookmark, menu_path, *index, TRUE);
g_object_unref (G_OBJECT (bookmark));
g_object_unref (bookmark);
} else if (strcmp (node->name, "separator") == 0) {
append_separator (window, menu_path);
} else if (strcmp (node->name, "folder") == 0) {
@ -1063,7 +1063,7 @@ static NautilusBookmarkList *bookmarks = NULL;
static void
free_bookmark_list (void)
{
g_object_unref (G_OBJECT (bookmarks));
g_object_unref (bookmarks);
}
static NautilusBookmarkList *

14
src/nautilus-navigation-window.c
View file

@ -187,7 +187,7 @@ nautilus_window_class_init (NautilusWindowClass *klass)
gdk_pixbuf_render_pixmap_and_mask
(pixbuf, &mini_icon_pixmap, &mini_icon_mask,
EEL_STANDARD_ALPHA_THRESHHOLD);
g_object_unref (G_OBJECT (pixbuf));
g_object_unref (pixbuf);
g_atexit (unref_mini_icon);
}
g_free (filename);
@ -915,10 +915,10 @@ nautilus_window_destroy (GtkObject *object)
nautilus_window_clear_forward_list (window);
if (window->current_location_bookmark != NULL) {
g_object_unref (G_OBJECT (window->current_location_bookmark));
g_object_unref (window->current_location_bookmark);
}
if (window->last_location_bookmark != NULL) {
g_object_unref (G_OBJECT (window->last_location_bookmark));
g_object_unref (window->last_location_bookmark);
}
if (window->status_bar_clear_id != 0) {
@ -1765,7 +1765,7 @@ remove_from_history_list (NautilusBookmark *bookmark)
/* Remove any older entry for this same item. There can be at most 1. */
if (node != NULL) {
history_list = g_list_remove_link (history_list, node);
g_object_unref (G_OBJECT (node->data));
g_object_unref (node->data);
g_list_free_1 (node);
}
}
@ -1787,7 +1787,7 @@ add_to_history_list (NautilusBookmark *bookmark)
free_history_list_is_set_up = TRUE;
}
g_object_ref (G_OBJECT (bookmark));
g_object_ref (bookmark);
remove_from_history_list (bookmark);
history_list = g_list_prepend (history_list, bookmark);
@ -1795,7 +1795,7 @@ add_to_history_list (NautilusBookmark *bookmark)
if (extra_count > 0) {
history_list = g_list_reverse (history_list);
for (index = 0; index < extra_count; ++index) {
g_object_unref (G_OBJECT (history_list->data));
g_object_unref (history_list->data);
history_list = g_list_remove (history_list, history_list->data);
}
history_list = g_list_reverse (history_list);
@ -1811,7 +1811,7 @@ nautilus_remove_from_history_list_no_notify (const char *uri)
bookmark = nautilus_bookmark_new (uri, "");
remove_from_history_list (bookmark);
g_object_unref (G_OBJECT (bookmark));
g_object_unref (bookmark);
}
static void

14
src/nautilus-object-window.c
View file

@ -187,7 +187,7 @@ nautilus_window_class_init (NautilusWindowClass *klass)
gdk_pixbuf_render_pixmap_and_mask
(pixbuf, &mini_icon_pixmap, &mini_icon_mask,
EEL_STANDARD_ALPHA_THRESHHOLD);
g_object_unref (G_OBJECT (pixbuf));
g_object_unref (pixbuf);
g_atexit (unref_mini_icon);
}
g_free (filename);
@ -915,10 +915,10 @@ nautilus_window_destroy (GtkObject *object)
nautilus_window_clear_forward_list (window);
if (window->current_location_bookmark != NULL) {
g_object_unref (G_OBJECT (window->current_location_bookmark));
g_object_unref (window->current_location_bookmark);
}
if (window->last_location_bookmark != NULL) {
g_object_unref (G_OBJECT (window->last_location_bookmark));
g_object_unref (window->last_location_bookmark);
}
if (window->status_bar_clear_id != 0) {
@ -1765,7 +1765,7 @@ remove_from_history_list (NautilusBookmark *bookmark)
/* Remove any older entry for this same item. There can be at most 1. */
if (node != NULL) {
history_list = g_list_remove_link (history_list, node);
g_object_unref (G_OBJECT (node->data));
g_object_unref (node->data);
g_list_free_1 (node);
}
}
@ -1787,7 +1787,7 @@ add_to_history_list (NautilusBookmark *bookmark)
free_history_list_is_set_up = TRUE;
}
g_object_ref (G_OBJECT (bookmark));
g_object_ref (bookmark);
remove_from_history_list (bookmark);
history_list = g_list_prepend (history_list, bookmark);
@ -1795,7 +1795,7 @@ add_to_history_list (NautilusBookmark *bookmark)
if (extra_count > 0) {
history_list = g_list_reverse (history_list);
for (index = 0; index < extra_count; ++index) {
g_object_unref (G_OBJECT (history_list->data));
g_object_unref (history_list->data);
history_list = g_list_remove (history_list, history_list->data);
}
history_list = g_list_reverse (history_list);
@ -1811,7 +1811,7 @@ nautilus_remove_from_history_list_no_notify (const char *uri)
bookmark = nautilus_bookmark_new (uri, "");
remove_from_history_list (bookmark);
g_object_unref (G_OBJECT (bookmark));
g_object_unref (bookmark);
}
static void

10
src/nautilus-property-browser.c
View file

@ -446,7 +446,7 @@ nautilus_property_browser_destroy (GtkObject *object)
eel_g_list_free_deep (property_browser->details->keywords);
if (property_browser->details->property_chit) {
g_object_unref (G_OBJECT (property_browser->details->property_chit));
g_object_unref (property_browser->details->property_chit);
}
g_free (property_browser->details);
@ -672,7 +672,7 @@ make_drag_image (NautilusPropertyBrowser *property_browser, const char* file_nam
pixbuf = nautilus_customization_make_pattern_chit (orig_pixbuf, property_browser->details->property_chit, TRUE, is_reset);
} else {
pixbuf = eel_gdk_pixbuf_scale_down_to_fit (orig_pixbuf, MAX_ICON_WIDTH, MAX_ICON_HEIGHT);
g_object_unref (G_OBJECT (orig_pixbuf));
g_object_unref (orig_pixbuf);
}
g_free (image_file_name);
@ -1544,7 +1544,7 @@ element_clicked_callback (GtkWidget *image_table,
&mask_for_dragged_file,
EEL_STANDARD_ALPHA_THRESHHOLD);
g_object_unref (G_OBJECT (pixbuf));
g_object_unref (pixbuf);
gtk_drag_set_icon_pixmap
(context,
gtk_widget_get_colormap (GTK_WIDGET (property_browser)),
@ -1696,7 +1696,7 @@ make_properties_from_directories (NautilusPropertyBrowser *property_browser)
g_free (object_name);
g_free (object_label);
g_object_unref (G_OBJECT (object_pixbuf));
g_object_unref (object_pixbuf);
}
/*
@ -1808,7 +1808,7 @@ make_properties_from_xml_node (NautilusPropertyBrowser *property_browser,
gtk_container_add (GTK_CONTAINER (property_browser->details->content_table), new_property);
gtk_widget_show (new_property);
g_object_unref (G_OBJECT (pixbuf));
g_object_unref (pixbuf);
xmlFree (color);
xmlFree (name);
}

4
src/nautilus-search-bar-criterion.c
View file

@ -998,7 +998,7 @@ make_emblem_value_menu (NautilusSearchBarCriterion *criterion)
}
if (strcmp (emblem_name, "erase") == 0) {
g_object_unref (G_OBJECT (pixbuf));
g_object_unref (pixbuf);
g_free (label);
g_free (emblem_name);
continue;
@ -1018,7 +1018,7 @@ make_emblem_value_menu (NautilusSearchBarCriterion *criterion)
gtk_widget_show_all (menu_item);
gtk_menu_append (GTK_MENU (value_menu), menu_item);
g_object_unref (G_OBJECT (pixbuf));
g_object_unref (pixbuf);
g_free (label);
g_free (emblem_name);
}

18
src/nautilus-sidebar-tabs.c
View file

@ -241,7 +241,7 @@ nautilus_sidebar_tabs_load_theme_data (NautilusSidebarTabs *sidebar_tabs)
/* unload the old font if necessary */
if (sidebar_tabs->details->tab_font != NULL) {
g_object_unref (G_OBJECT (sidebar_tabs->details->tab_font));
g_object_unref (sidebar_tabs->details->tab_font);
sidebar_tabs->details->tab_font = NULL;
}
@ -264,7 +264,7 @@ smooth_font_changed_callback (gpointer callback_data)
new_font = nautilus_global_preferences_get_default_smooth_bold_font ();
if (sidebar_tabs->details->tab_font != NULL) {
g_object_unref (G_OBJECT (sidebar_tabs->details->tab_font));
g_object_unref (sidebar_tabs->details->tab_font);
sidebar_tabs->details->tab_font = NULL;
}
@ -353,7 +353,7 @@ tab_item_destroy (TabItem *item)
g_free (item->indicator_pixbuf_name);
if (item->indicator_pixbuf != NULL) {
g_object_unref (G_OBJECT (item->indicator_pixbuf));
g_object_unref (item->indicator_pixbuf);
}
if (item->listener_id != 0) {
@ -387,7 +387,7 @@ nautilus_sidebar_tabs_destroy (GtkObject *object)
}
if (sidebar_tabs->details->tab_font != NULL) {
g_object_unref (G_OBJECT (sidebar_tabs->details->tab_font));
g_object_unref (sidebar_tabs->details->tab_font);
sidebar_tabs->details->tab_font = NULL;
}
@ -415,7 +415,7 @@ nautilus_sidebar_tabs_unload_tab_pieces (NautilusSidebarTabs *sidebar_tabs)
int index;
for (index = 0; index < LAST_TAB_OFFSET; index++) {
if (sidebar_tabs->details->tab_piece_images[index]) {
g_object_unref (G_OBJECT (sidebar_tabs->details->tab_piece_images[index]));
g_object_unref (sidebar_tabs->details->tab_piece_images[index]);
sidebar_tabs->details->tab_piece_images[index] = NULL;
}
}
@ -688,7 +688,7 @@ draw_one_tab_plain (NautilusSidebarTabs *sidebar_tabs, GdkGC *gc, char *tab_name
GDK_RGB_DITHER_MAX,
0, 0);
g_object_unref (G_OBJECT (temp_pixbuf));
g_object_unref (temp_pixbuf);
/* draw the bottom lines */
tab_bottom = y + sidebar_tabs->details->tab_height - 1;
@ -1224,7 +1224,7 @@ draw_or_layout_all_tabs (NautilusSidebarTabs *sidebar_tabs, gboolean layout_only
GDK_RGB_DITHER_MAX,
0, 0);
g_object_unref (G_OBJECT (tab_pixbuf));
g_object_unref (tab_pixbuf);
}
}
@ -1307,7 +1307,7 @@ nautilus_sidebar_tabs_expose (GtkWidget *widget, GdkEventExpose *event)
GDK_RGB_DITHER_MAX,
0, 0);
g_object_unref (G_OBJECT (pixbuf));
g_object_unref (pixbuf);
} else {
draw_one_tab_plain (sidebar_tabs, temp_gc, sidebar_tabs->details->title, NULL,
x_pos + TITLE_TAB_OFFSET, y_pos, sidebar_tabs->details->title_prelit, &sidebar_tabs->details->title_rect);
@ -1355,7 +1355,7 @@ nautilus_sidebar_tabs_update_tab_item (NautilusSidebarTabs *sidebar_tabs, TabIte
tab_item->indicator_pixbuf_name = g_strdup (tab_image_name);
if (tab_item->indicator_pixbuf != NULL) {
g_object_unref (G_OBJECT (tab_item->indicator_pixbuf));
g_object_unref (tab_item->indicator_pixbuf);
tab_item->indicator_pixbuf = NULL;
}
if (tab_image_name != NULL) {

8
src/nautilus-sidebar-title.c
View file

@ -161,8 +161,8 @@ smooth_font_changed_callback (gpointer callback_data)
eel_label_set_smooth_font (EEL_LABEL (sidebar_title->details->title_label), new_bold_font);
eel_label_set_smooth_font (EEL_LABEL (sidebar_title->details->more_info_label), new_font);
g_object_unref (G_OBJECT (new_font));
g_object_unref (G_OBJECT (new_bold_font));
g_object_unref (new_font);
g_object_unref (new_bold_font);
#endif
}
@ -576,7 +576,7 @@ update_title_font (NautilusSidebarTitle *sidebar_title)
eel_label_set_smooth_font_size (EEL_LABEL (sidebar_title->details->title_label),
largest_fitting_smooth_font_size);
g_object_unref (G_OBJECT (smooth_font));
g_object_unref (smooth_font);
/* Update the regular font */
template_font = get_non_smooth_font (MAX_TITLE_FONT_SIZE);
@ -764,7 +764,7 @@ update_emblems (NautilusSidebarTitle *sidebar_title)
FALSE, NULL, FALSE);
if (pixbuf != NULL) {
add_emblem (sidebar_title, pixbuf);
g_object_unref (G_OBJECT (pixbuf));
g_object_unref (pixbuf);
}
}

6
src/nautilus-sidebar.c
View file

@ -276,7 +276,7 @@ nautilus_sidebar_init (GtkObject *object)
/* allocate and install the panel tabs */
sidebar->details->notebook = GTK_NOTEBOOK (gtk_notebook_new ());
g_object_ref (G_OBJECT (sidebar->details->notebook));
g_object_ref (sidebar->details->notebook);
gtk_object_sink (GTK_OBJECT (sidebar->details->notebook));
gtk_notebook_set_show_tabs (sidebar->details->notebook, FALSE);
@ -304,7 +304,7 @@ nautilus_sidebar_destroy (GtkObject *object)
sidebar = NAUTILUS_SIDEBAR (object);
g_object_unref (G_OBJECT (sidebar->details->notebook));
g_object_unref (sidebar->details->notebook);
if (sidebar->details->file != NULL) {
gtk_signal_disconnect (GTK_OBJECT (sidebar->details->file),
@ -681,7 +681,7 @@ uri_is_local_image (const char *uri)
if (pixbuf == NULL) {
return FALSE;
}
g_object_unref (G_OBJECT (pixbuf));
g_object_unref (pixbuf);
return TRUE;
}

4
src/nautilus-signaller.c
View file

@ -88,7 +88,7 @@ nautilus_signaller_init (gpointer object, gpointer klass)
static void
unref_global_signaller (void)
{
g_object_unref (G_OBJECT (global_signaller));
g_object_unref (global_signaller);
}
GtkObject *
@ -96,7 +96,7 @@ nautilus_signaller_get_current (void)
{
if (global_signaller == NULL) {
global_signaller = g_object_new (nautilus_signaller_get_type (), NULL);
g_object_ref (G_OBJECT (global_signaller));
g_object_ref (global_signaller);
gtk_object_sink (GTK_OBJECT (global_signaller));
g_atexit (unref_global_signaller);
}

14
src/nautilus-spatial-window.c
View file

@ -187,7 +187,7 @@ nautilus_window_class_init (NautilusWindowClass *klass)
gdk_pixbuf_render_pixmap_and_mask
(pixbuf, &mini_icon_pixmap, &mini_icon_mask,
EEL_STANDARD_ALPHA_THRESHHOLD);
g_object_unref (G_OBJECT (pixbuf));
g_object_unref (pixbuf);
g_atexit (unref_mini_icon);
}
g_free (filename);
@ -915,10 +915,10 @@ nautilus_window_destroy (GtkObject *object)
nautilus_window_clear_forward_list (window);
if (window->current_location_bookmark != NULL) {
g_object_unref (G_OBJECT (window->current_location_bookmark));
g_object_unref (window->current_location_bookmark);
}
if (window->last_location_bookmark != NULL) {
g_object_unref (G_OBJECT (window->last_location_bookmark));
g_object_unref (window->last_location_bookmark);
}
if (window->status_bar_clear_id != 0) {
@ -1765,7 +1765,7 @@ remove_from_history_list (NautilusBookmark *bookmark)
/* Remove any older entry for this same item. There can be at most 1. */
if (node != NULL) {
history_list = g_list_remove_link (history_list, node);
g_object_unref (G_OBJECT (node->data));
g_object_unref (node->data);
g_list_free_1 (node);
}
}
@ -1787,7 +1787,7 @@ add_to_history_list (NautilusBookmark *bookmark)
free_history_list_is_set_up = TRUE;
}
g_object_ref (G_OBJECT (bookmark));
g_object_ref (bookmark);
remove_from_history_list (bookmark);
history_list = g_list_prepend (history_list, bookmark);
@ -1795,7 +1795,7 @@ add_to_history_list (NautilusBookmark *bookmark)
if (extra_count > 0) {
history_list = g_list_reverse (history_list);
for (index = 0; index < extra_count; ++index) {
g_object_unref (G_OBJECT (history_list->data));
g_object_unref (history_list->data);
history_list = g_list_remove (history_list, history_list->data);
}
history_list = g_list_reverse (history_list);
@ -1811,7 +1811,7 @@ nautilus_remove_from_history_list_no_notify (const char *uri)
bookmark = nautilus_bookmark_new (uri, "");
remove_from_history_list (bookmark);
g_object_unref (G_OBJECT (bookmark));
g_object_unref (bookmark);
}
static void

24
src/nautilus-window-manage-views.c
View file

@ -309,7 +309,7 @@ set_displayed_location (NautilusWindow *window, const char *location)
if (recreate) {
/* We've changed locations, must recreate bookmark for current location. */
if (window->last_location_bookmark != NULL) {
g_object_unref (G_OBJECT (window->last_location_bookmark));
g_object_unref (window->last_location_bookmark);
}
window->last_location_bookmark = window->current_location_bookmark;
window->current_location_bookmark = location == NULL ? NULL
@ -363,7 +363,7 @@ handle_go_back (NautilusWindow *window, const char *location)
/* Use the first bookmark in the history list rather than creating a new one. */
window->forward_list = g_list_prepend (window->forward_list,
window->last_location_bookmark);
g_object_ref (G_OBJECT (window->forward_list->data));
g_object_ref (window->forward_list->data);
/* Move extra links from Back to Forward list */
for (i = 0; i < window->details->location_change_distance; ++i) {
@ -375,7 +375,7 @@ handle_go_back (NautilusWindow *window, const char *location)
/* One bookmark falls out of back/forward lists and becomes viewed location */
link = window->back_list;
window->back_list = g_list_remove_link (window->back_list, link);
g_object_unref (G_OBJECT (link->data));
g_object_unref (link->data);
g_list_free_1 (link);
}
@ -400,7 +400,7 @@ handle_go_forward (NautilusWindow *window, const char *location)
/* Use the first bookmark in the history list rather than creating a new one. */
window->back_list = g_list_prepend (window->back_list,
window->last_location_bookmark);
g_object_ref (G_OBJECT (window->back_list->data));
g_object_ref (window->back_list->data);
/* Move extra links from Forward to Back list */
for (i = 0; i < window->details->location_change_distance; ++i) {
@ -412,7 +412,7 @@ handle_go_forward (NautilusWindow *window, const char *location)
/* One bookmark falls out of back/forward lists and becomes viewed location */
link = window->forward_list;
window->forward_list = g_list_remove_link (window->forward_list, link);
g_object_unref (G_OBJECT (link->data));
g_object_unref (link->data);
g_list_free_1 (link);
}
@ -434,7 +434,7 @@ handle_go_elsewhere (NautilusWindow *window, const char *location)
/* Use the first bookmark in the history list rather than creating a new one. */
window->back_list = g_list_prepend (window->back_list,
window->last_location_bookmark);
g_object_ref (G_OBJECT (window->back_list->data));
g_object_ref (window->back_list->data);
}
}
}
@ -627,7 +627,7 @@ update_for_new_location (NautilusWindow *window)
static gboolean
unref_callback (gpointer callback_data)
{
g_object_unref (G_OBJECT (callback_data));
g_object_unref (callback_data);
return FALSE;
}
@ -658,7 +658,7 @@ location_has_really_changed (NautilusWindow *window)
disconnect_view (window, window->content_view);
nautilus_window_set_content_view_widget (window, window->new_content_view);
}
g_object_unref (G_OBJECT (window->new_content_view));
g_object_unref (window->new_content_view);
window->new_content_view = NULL;
/* Update displayed view in menu. Only do this if we're not switching
@ -971,14 +971,14 @@ load_content_view (NautilusWindow *window,
/* reuse existing content view */
view = window->content_view;
window->new_content_view = view;
g_object_ref (G_OBJECT (view));
g_object_ref (view);
set_to_pending_location_and_selection (window);
} else {
/* create a new content view */
view = nautilus_view_frame_new (window->details->ui_container,
window->application->undo_manager);
window->new_content_view = view;
g_object_ref (G_OBJECT (view));
g_object_ref (view);
gtk_object_sink (GTK_OBJECT (view));
set_view_frame_info (view, FALSE, id);
connect_view (window, view);
@ -1077,7 +1077,7 @@ free_location_change (NautilusWindow *window)
disconnect_view (window, window->new_content_view);
gtk_widget_destroy (GTK_WIDGET (window->new_content_view));
}
g_object_unref (G_OBJECT (window->new_content_view));
g_object_unref (window->new_content_view);
window->new_content_view = NULL;
}
}
@ -1684,7 +1684,7 @@ get_history_list_callback (NautilusViewFrame *view,
g_free (name);
g_free (location);
g_free (pixbuf_xml);
g_object_unref (G_OBJECT (pixbuf));
g_object_unref (pixbuf);
}
return list;

10
src/nautilus-window-menus.c
View file

@ -152,7 +152,7 @@ bookmark_holder_new (NautilusBookmark *bookmark,
/* Ref the bookmark because it might be unreffed away while
* we're holding onto it (not an issue for window).
*/
g_object_ref (G_OBJECT (bookmark));
g_object_ref (bookmark);
new_bookmark_holder->prompt_for_removal = is_bookmarks_menu;
new_bookmark_holder->changed_handler_id =
@ -170,7 +170,7 @@ bookmark_holder_free (BookmarkHolder *bookmark_holder)
{
gtk_signal_disconnect (GTK_OBJECT (bookmark_holder->bookmark),
bookmark_holder->changed_handler_id);
g_object_unref (G_OBJECT (bookmark_holder->bookmark));
g_object_unref (bookmark_holder->bookmark);
g_free (bookmark_holder);
}
@ -885,7 +885,7 @@ append_bookmark_to_menu (NautilusWindow *window,
index_in_parent,
display_name,
pixbuf);
g_object_unref (G_OBJECT (pixbuf));
g_object_unref (pixbuf);
g_free (display_name);
/* Add the status tip */
@ -1002,7 +1002,7 @@ create_menu_item_from_node (NautilusWindow *window,
if (strcmp (node->name, "bookmark") == 0) {
bookmark = nautilus_bookmark_new_from_node (node);
append_bookmark_to_menu (window, bookmark, menu_path, *index, TRUE);
g_object_unref (G_OBJECT (bookmark));
g_object_unref (bookmark);
} else if (strcmp (node->name, "separator") == 0) {
append_separator (window, menu_path);
} else if (strcmp (node->name, "folder") == 0) {
@ -1063,7 +1063,7 @@ static NautilusBookmarkList *bookmarks = NULL;
static void
free_bookmark_list (void)
{
g_object_unref (G_OBJECT (bookmarks));
g_object_unref (bookmarks);
}
static NautilusBookmarkList *

2
src/nautilus-window-toolbars.c
View file

@ -284,7 +284,7 @@ set_up_special_bonobo_button (NautilusWindow *window,
nautilus_window_ui_freeze (window);
bonobo_ui_toolbar_button_item_set_image (item, gtk_image_new_from_pixbuf (pixbuf));
g_object_unref (G_OBJECT (pixbuf));
g_object_unref (pixbuf);
#if GNOME2_CONVERSION_COMPLETE
/* FIXME bugzilla.gnome.org 45005:

14
src/nautilus-window.c
View file

@ -187,7 +187,7 @@ nautilus_window_class_init (NautilusWindowClass *klass)
gdk_pixbuf_render_pixmap_and_mask
(pixbuf, &mini_icon_pixmap, &mini_icon_mask,
EEL_STANDARD_ALPHA_THRESHHOLD);
g_object_unref (G_OBJECT (pixbuf));
g_object_unref (pixbuf);
g_atexit (unref_mini_icon);
}
g_free (filename);
@ -915,10 +915,10 @@ nautilus_window_destroy (GtkObject *object)
nautilus_window_clear_forward_list (window);
if (window->current_location_bookmark != NULL) {
g_object_unref (G_OBJECT (window->current_location_bookmark));
g_object_unref (window->current_location_bookmark);
}
if (window->last_location_bookmark != NULL) {
g_object_unref (G_OBJECT (window->last_location_bookmark));
g_object_unref (window->last_location_bookmark);
}
if (window->status_bar_clear_id != 0) {
@ -1765,7 +1765,7 @@ remove_from_history_list (NautilusBookmark *bookmark)
/* Remove any older entry for this same item. There can be at most 1. */
if (node != NULL) {
history_list = g_list_remove_link (history_list, node);
g_object_unref (G_OBJECT (node->data));
g_object_unref (node->data);
g_list_free_1 (node);
}
}
@ -1787,7 +1787,7 @@ add_to_history_list (NautilusBookmark *bookmark)
free_history_list_is_set_up = TRUE;
}
g_object_ref (G_OBJECT (bookmark));
g_object_ref (bookmark);
remove_from_history_list (bookmark);
history_list = g_list_prepend (history_list, bookmark);
@ -1795,7 +1795,7 @@ add_to_history_list (NautilusBookmark *bookmark)
if (extra_count > 0) {
history_list = g_list_reverse (history_list);
for (index = 0; index < extra_count; ++index) {
g_object_unref (G_OBJECT (history_list->data));
g_object_unref (history_list->data);
history_list = g_list_remove (history_list, history_list->data);
}
history_list = g_list_reverse (history_list);
@ -1811,7 +1811,7 @@ nautilus_remove_from_history_list_no_notify (const char *uri)
bookmark = nautilus_bookmark_new (uri, "");
remove_from_history_list (bookmark);
g_object_unref (G_OBJECT (bookmark));
g_object_unref (bookmark);
}
static void

12
src/nautilus-zoom-control.c
View file

@ -262,7 +262,7 @@ void draw_number (GtkWidget *widget, GdkRectangle *box)
}
if (number_pixbuf != zoom_control->details->number_strip) {
g_object_unref (G_OBJECT (number_pixbuf));
g_object_unref (number_pixbuf);
}
gdk_gc_unref(temp_gc);
@ -289,7 +289,7 @@ draw_pixbuf_with_prelight (NautilusZoomControl *zoom_control, GdkPixbuf *pixbuf,
}
draw_pixbuf (temp_pixbuf, GTK_WIDGET (zoom_control)->window, x_pos, y_pos + zoom_control->details->y_offset);
if (pixbuf != temp_pixbuf) {
g_object_unref (G_OBJECT (temp_pixbuf));
g_object_unref (temp_pixbuf);
}
}
@ -382,19 +382,19 @@ static void
nautilus_zoom_control_unload_images (NautilusZoomControl *zoom_control)
{
if (zoom_control->details->zoom_body_image) {
g_object_unref (G_OBJECT (zoom_control->details->zoom_body_image));
g_object_unref (zoom_control->details->zoom_body_image);
}
if (zoom_control->details->zoom_decrement_image) {
g_object_unref (G_OBJECT (zoom_control->details->zoom_decrement_image));
g_object_unref (zoom_control->details->zoom_decrement_image);
}
if (zoom_control->details->zoom_increment_image) {
g_object_unref (G_OBJECT (zoom_control->details->zoom_increment_image));
g_object_unref (zoom_control->details->zoom_increment_image);
}
if (zoom_control->details->number_strip != NULL) {
g_object_unref (G_OBJECT (zoom_control->details->number_strip));
g_object_unref (zoom_control->details->number_strip);
}
if (zoom_control->details->label_font != NULL) {

4
test/test-nautilus-wrap-table.c
View file

@ -68,7 +68,7 @@ main (int argc, char* argv[])
}
if (strcmp (emblem_name, "erase") == 0) {
g_object_unref (G_OBJECT (pixbuf));
g_object_unref (pixbuf);
g_free (label);
g_free (emblem_name);
continue;
@ -76,7 +76,7 @@ main (int argc, char* argv[])
button = eel_labeled_image_check_button_new (label, pixbuf);
g_free (label);
g_object_unref (G_OBJECT (pixbuf));
g_object_unref (pixbuf);
/* Attach parameters and signal handler. */
g_object_set_data_full (G_OBJECT (button),

6
test/test.c
View file

@ -130,7 +130,7 @@ test_pixbuf_new_named (const char *name, float scale)
scaled = gdk_pixbuf_scale_simple (pixbuf, width, height, GDK_INTERP_BILINEAR);
g_object_unref (G_OBJECT (pixbuf));
g_object_unref (pixbuf);
g_return_val_if_fail (scaled != NULL, NULL);
@ -160,7 +160,7 @@ test_image_new (const char *pixbuf_name,
if (pixbuf != NULL) {
eel_image_set_pixbuf (EEL_IMAGE (image), pixbuf);
g_object_unref (G_OBJECT (pixbuf));
g_object_unref (pixbuf);
}
}
@ -339,5 +339,5 @@ test_pixbuf_draw_rectangle_tiled (GdkPixbuf *pixbuf,
opacity,
GDK_INTERP_NEAREST);
g_object_unref (G_OBJECT (tile_pixbuf));
g_object_unref (tile_pixbuf);
}