[Nautilus-list] Gnome 2 Patch
- From: Thomas Canty <Thomas Canty uts edu au>
- To: nautilus-list eazel com
- Subject: [Nautilus-list] Gnome 2 Patch
- Date: Thu, 25 Oct 2001 14:41:33 +0200
Hi,
here is a patch which does a bit more work towards compiling nautilus
under GNOME 2,
I didn't change the build stuff since i was not sure what is wanted to
be done with it,
thanks,
Thomas Canty
? nautilus.diff
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/nautilus/ChangeLog,v
retrieving revision 1.4800
diff -r1.4800 ChangeLog
0a1,5
> 2001-10-25 Thomas Canty <tommydal optushome com au>
>
> * Lots of files:
> More work towards compiling under GNOME 2
>
Index: applets/launcher/nautilus-launcher-applet.c
===================================================================
RCS file: /cvs/gnome/nautilus/applets/launcher/nautilus-launcher-applet.c,v
retrieving revision 1.8
diff -r1.8 nautilus-launcher-applet.c
66c66
< icon_pixbuf = gdk_pixbuf_new_from_file (path);
---
> icon_pixbuf = gdk_pixbuf_new_from_file (path, NULL);
Index: components/adapter/main.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/adapter/main.c,v
retrieving revision 1.10
diff -r1.10 main.c
29,30c29
< #include <libgnome/gnome-defs.h> /* must come before gnome-init.h */
< #include <libgnomeui/gnome-init.h> /* must come before liboaf.h */
---
> #include <libgnome/gnome-init.h> /* must come before liboaf.h */
39c38
< #include <liboaf/liboaf.h>
---
> #include <bonobo-activation/bonobo-activation.h>
103,104c102,103
< gnomelib_register_popt_table (oaf_popt_options, oaf_get_popt_table_name ());
< orb = oaf_init (argc, argv);
---
> gnomelib_register_popt_table (bonobo_activation_popt_options, bonobo_activation_get_popt_table_name ());
> orb = bonobo_activation_init (argc, argv);
115c114
< registration_id = oaf_make_registration_id (META_FACTORY_IID, g_getenv ("DISPLAY"));
---
> registration_id = bonobo_activation_make_registration_id (META_FACTORY_IID, g_getenv ("DISPLAY"));
Index: components/adapter/nautilus-adapter-factory-server.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/adapter/nautilus-adapter-factory-server.c,v
retrieving revision 1.7
diff -r1.7 nautilus-adapter-factory-server.c
37c37
< #include <libgnomeui/gnome-stock.h>
---
> #include <libgnomeui/gnome-stock-icons.h>
Index: components/adapter/nautilus-adapter.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/adapter/nautilus-adapter.c,v
retrieving revision 1.19
diff -r1.19 nautilus-adapter.c
36d35
< #include <bonobo/bonobo-object-client.h>
43c42
< #include <libgnomeui/gnome-stock.h>
---
> #include <libgnomeui/gnome-stock-icons.h>
Index: components/hardware/main.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/hardware/main.c,v
retrieving revision 1.11
diff -r1.11 main.c
33c33
< #include <liboaf/liboaf.h>
---
> #include <bonobo-activation/bonobo-activation.h>
48c48
< const char *oaf_iid,
---
> const char *bonobo_activation_iid,
53c53
< if (strcmp (oaf_iid, "OAFIID:nautilus_hardware_view:4a3f3793-bab4-4640-9f56-e7871fe8e150")) {
---
> if (strcmp (bonobo_activation_iid, "OAFIID:nautilus_hardware_view:4a3f3793-bab4-4640-9f56-e7871fe8e150")) {
89,90c89,90
< gnomelib_register_popt_table (oaf_popt_options, oaf_get_popt_table_name ());
< orb = oaf_init (argc, argv);
---
> gnomelib_register_popt_table (bonobo_activation_popt_options, bonobo_activation_get_popt_table_name ());
> orb = bonobo_activation_init (argc, argv);
101c101
< registration_id = oaf_make_registration_id ("OAFIID:nautilus_hardware_view_factory:8c80e55a-5c03-4403-9e51-3a5711b8a5ce",
---
> registration_id = bonobo_activation_make_registration_id ("OAFIID:nautilus_hardware_view_factory:8c80e55a-5c03-4403-9e51-3a5711b8a5ce",
Index: components/hardware/nautilus-hardware-view.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/hardware/nautilus-hardware-view.c,v
retrieving revision 1.35
diff -r1.35 nautilus-hardware-view.c
36d35
< #include <libgnorba/gnorba.h>
Index: components/help/hyperbola-filefmt.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/help/hyperbola-filefmt.c,v
retrieving revision 1.37
diff -r1.37 hyperbola-filefmt.c
28d27
< #include <libgnome/gnome-defs.h>
Index: components/help/hyperbola-main.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/help/hyperbola-main.c,v
retrieving revision 1.25
diff -r1.25 hyperbola-main.c
29c29
< #include <liboaf/liboaf.h>
---
> #include <bonobo-activation/bonobo-activation.h>
97,99c97,99
< gnomelib_register_popt_table (oaf_popt_options,
< oaf_get_popt_table_name ());
< orb = oaf_init (argc, argv);
---
> gnomelib_register_popt_table (bonobo_activation_popt_options,
> bonobo_activation_get_popt_table_name ());
> orb = bonobo_activation_init (argc, argv);
110c110
< oaf_make_registration_id
---
> bonobo_activation_make_registration_id
Index: components/help/hyperbola-nav-tree.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/help/hyperbola-nav-tree.c,v
retrieving revision 1.36
diff -r1.36 hyperbola-nav-tree.c
6d5
< #include <libgnome/gnome-defs.h>
83c82
< pixbuf = gdk_pixbuf_new_from_file (fullname);
---
> pixbuf = gdk_pixbuf_new_from_file (fullname, NULL);
Index: components/image-viewer/nautilus-image-view.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/image-viewer/nautilus-image-view.c,v
retrieving revision 1.22
diff -r1.22 nautilus-image-view.c
30c30
< #include <liboaf/liboaf.h>
---
> #include <bonobo-activation/bonobo-activation.h>
778c778
< bonobo_object_factory (BonoboGenericFactory *this, const char *oaf_iid,
---
> bonobo_object_factory (BonoboGenericFactory *this, const char *bonobo_activation_iid,
789c789
< if (strcmp (oaf_iid, "OAFIID:nautilus-image-generic:6ed7ef0d-9274-4132-9a27-9f048142782f") == 0) {
---
> if (strcmp (bonobo_activation_iid, "OAFIID:nautilus-image-generic:6ed7ef0d-9274-4132-9a27-9f048142782f") == 0) {
791c791
< } else if (strcmp (oaf_iid, "OAFIID:nautilus-image-viewer:30686633-23d5-422b-83c6-4f1b06f8abcd") == 0) {
---
> } else if (strcmp (bonobo_activation_iid, "OAFIID:nautilus-image-viewer:30686633-23d5-422b-83c6-4f1b06f8abcd") == 0) {
809c809
< registration_id = oaf_make_registration_id ("OAFIID:nautilus_image_view_factory:61ea9ab1-e4b4-4da8-8f54-61cf6f33c4f6",
---
> registration_id = bonobo_activation_make_registration_id ("OAFIID:nautilus_image_view_factory:61ea9ab1-e4b4-4da8-8f54-61cf6f33c4f6",
828,829c828,829
< gnomelib_register_popt_table (oaf_popt_options, oaf_get_popt_table_name ());
< oaf_init (argc, argv);
---
> gnomelib_register_popt_table (bonobo_activation_popt_options, bonobo_activation_get_popt_table_name ());
> bonobo_activation_init (argc, argv);
Index: components/loser/content/main.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/loser/content/main.c,v
retrieving revision 1.6
diff -r1.6 main.c
31c31
< #include <liboaf/liboaf.h>
---
> #include <bonobo-activation/bonobo-activation.h>
83,84c83,84
< gnomelib_register_popt_table (oaf_popt_options, oaf_get_popt_table_name ());
< orb = oaf_init (argc, argv);
---
> gnomelib_register_popt_table (bonobo_activation_popt_options, bonobo_activation_get_popt_table_name ());
> orb = bonobo_activation_init (argc, argv);
93c93
< registration_id = oaf_make_registration_id ("OAFIID:nautilus_content_loser_factory:adf30e75-3b63-4360-8784-a8e239390a69", getenv ("DISPLAY"));
---
> registration_id = bonobo_activation_make_registration_id ("OAFIID:nautilus_content_loser_factory:adf30e75-3b63-4360-8784-a8e239390a69", getenv ("DISPLAY"));
Index: components/loser/content/nautilus-content-loser.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/loser/content/nautilus-content-loser.c,v
retrieving revision 1.12
diff -r1.12 nautilus-content-loser.c
35c35
< #include <libgnomeui/gnome-stock.h>
---
> #include <libgnomeui/gnome-stock-icons.h>
Index: components/loser/sidebar/main.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/loser/sidebar/main.c,v
retrieving revision 1.6
diff -r1.6 main.c
31c31
< #include <liboaf/liboaf.h>
---
> #include <bonobo-activation/bonobo-activation.h>
83,84c83,84
< gnomelib_register_popt_table (oaf_popt_options, oaf_get_popt_table_name ());
< orb = oaf_init (argc, argv);
---
> gnomelib_register_popt_table (bonobo_activation_popt_options, bonobo_activation_get_popt_table_name ());
> orb = bonobo_activation_init (argc, argv);
94c94
< registration_id = oaf_make_registration_id ("OAFIID:nautilus_sidebar_loser_factory:5d9aadfa-a8a4-4ec0-8332-d6f806c211fa", getenv ("DISPLAY"));
---
> registration_id = bonobo_activation_make_registration_id ("OAFIID:nautilus_sidebar_loser_factory:5d9aadfa-a8a4-4ec0-8332-d6f806c211fa", getenv ("DISPLAY"));
Index: components/loser/sidebar/nautilus-sidebar-loser.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/loser/sidebar/nautilus-sidebar-loser.c,v
retrieving revision 1.14
diff -r1.14 nautilus-sidebar-loser.c
35c35
< #include <libgnomeui/gnome-stock.h>
---
> #include <libgnomeui/gnome-stock-icons.h>
Index: components/mozilla/bonobo-extensions.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/mozilla/bonobo-extensions.c,v
retrieving revision 1.5
diff -r1.5 bonobo-extensions.c
499c499
< oaf_activation_callback (Bonobo_Unknown activated_object,
---
> bonobo_activation_activation_callback (Bonobo_Unknown activated_object,
542,543c542,543
< oaf_activate_from_id_async ((char *) iid, 0,
< oaf_activation_callback,
---
> bonobo_activation_activate_from_id_async ((char *) iid, 0,
> bonobo_activation_activation_callback,
Index: components/mozilla/main.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/mozilla/main.c,v
retrieving revision 1.32
diff -r1.32 main.c
218,219c218,219
< gnomelib_register_popt_table (oaf_popt_options, oaf_get_popt_table_name ());
< orb = oaf_init (argc, argv);
---
> gnomelib_register_popt_table (bonobo_activation_popt_options, bonobo_activation_get_popt_table_name ());
> orb = bonobo_activation_init (argc, argv);
241c241
< registration_id = oaf_make_registration_id ("OAFIID:nautilus_mozilla_content_view_factory:020a0285-6b96-4685-84a1-4a56eb6baa2b", getenv ("DISPLAY"));
---
> registration_id = bonobo_activation_make_registration_id ("OAFIID:nautilus_mozilla_content_view_factory:020a0285-6b96-4685-84a1-4a56eb6baa2b", getenv ("DISPLAY"));
Index: components/mozilla/nautilus-mozilla-content-view.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/mozilla/nautilus-mozilla-content-view.c,v
retrieving revision 1.103
diff -r1.103 nautilus-mozilla-content-view.c
52c52
< #include <libgnomeui/gnome-stock.h>
---
> #include <libgnomeui/gnome-stock-icons.h>
Index: components/mozilla/nautilus-mozilla-encoding-tables.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/mozilla/nautilus-mozilla-encoding-tables.c,v
retrieving revision 1.3
diff -r1.3 nautilus-mozilla-encoding-tables.c
32d31
< #include <libgnome/gnome-defs.h>
Index: components/music/nautilus-music-view.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/music/nautilus-music-view.c,v
retrieving revision 1.145
diff -r1.145 nautilus-music-view.c
1703c1703
< pixbuf = gdk_pixbuf_new_from_file (image_path);
---
> pixbuf = gdk_pixbuf_new_from_file (image_path, NULL);
Index: components/news/nautilus-news.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/news/nautilus-news.c,v
retrieving revision 1.41
diff -r1.41 nautilus-news.c
40d39
< #include <libgnome/gnome-defs.h>
1181c1180
< current_node = container_node->childs;
---
> current_node = container_node->xmlChildrenNode;
1498c1497
< /* Parse the rss file with gnome-xml. The gnome-xml parser requires a zero-terminated array. */
---
> /* Parse the rss file with libxml. The libxml parser requires a zero-terminated array. */
1621c1620
< current_channel = xmlDocGetRootElement (channels)->childs;
---
> current_channel = xmlDocGetRootElement (channels)->xmlChildrenNode;
1765c1764
< news_data->bullet = gdk_pixbuf_new_from_file (news_bullet_path);
---
> news_data->bullet = gdk_pixbuf_new_from_file (news_bullet_path, NULL);
1775c1774
< news_data->changed_bullet = gdk_pixbuf_new_from_file (news_bullet_path);
---
> news_data->changed_bullet = gdk_pixbuf_new_from_file (news_bullet_path, NULL);
2165c2164
< current_channel = xmlDocGetRootElement (channel_doc)->childs;
---
> current_channel = xmlDocGetRootElement (channel_doc)->xmlChildrenNode;
Index: components/sample/nautilus-sample-content-view.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/sample/nautilus-sample-content-view.c,v
retrieving revision 1.25
diff -r1.25 nautilus-sample-content-view.c
48c48
< #include <libgnomeui/gnome-stock.h>
---
> #include <libgnomeui/gnome-stock-icons.h>
Index: components/shell/shell.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/shell/shell.c,v
retrieving revision 1.6
diff -r1.6 shell.c
2c2
< #include <liboaf/liboaf.h>
---
> #include <bonobo-activation/bonobo-activation.h>
8c8
< extern struct poptOption oaf_popt_options[];
---
> extern struct poptOption bonobo_activation_popt_options[];
42c42
< registration_id = oaf_make_registration_id (, g_getenv ("DISPLAY"));
---
> registration_id = bonobo_activation_make_registration_id (, g_getenv ("DISPLAY"));
60,61c60,61
< gnomelib_register_popt_table (oaf_popt_options, oaf_get_popt_table_name ());
< orb = oaf_init (argc, argv);
---
> gnomelib_register_popt_table (bonobo_activation_popt_options, bonobo_activation_get_popt_table_name ());
> orb = bonobo_activation_init (argc, argv);
Index: components/throbber/main.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/throbber/main.c,v
retrieving revision 1.10
diff -r1.10 main.c
83,84c83,84
< gnomelib_register_popt_table (oaf_popt_options, oaf_get_popt_table_name ());
< orb = oaf_init (argc, argv);
---
> gnomelib_register_popt_table (bonobo_activation_popt_options, bonobo_activation_get_popt_table_name ());
> orb = bonobo_activation_init (argc, argv);
94c94
< registration_id = oaf_make_registration_id ("OAFIID:nautilus_throbber_factory", g_getenv ("DISPLAY"));
---
> registration_id = bonobo_activation_make_registration_id ("OAFIID:nautilus_throbber_factory", g_getenv ("DISPLAY"));
Index: components/throbber/nautilus-throbber.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/throbber/nautilus-throbber.c,v
retrieving revision 1.14
diff -r1.14 nautilus-throbber.c
35d34
< #include <libgnome/gnome-defs.h>
569c568
< pixbuf = gdk_pixbuf_new_from_file (image_path);
---
> pixbuf = gdk_pixbuf_new_from_file (image_path, NULL);
Index: components/tree/libmain.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/tree/libmain.c,v
retrieving revision 1.8
diff -r1.8 libmain.c
32c32
< #include <liboaf/liboaf.h>
---
> #include <bonobo-activation/bonobo-activation.h>
34c34
< /* FIXME bugzilla.gnome.org 42736: oaf_plugin_unuse can't possibly work! this sucks */
---
> /* FIXME bugzilla.gnome.org 42736: bonobo_activation_plugin_unuse can't possibly work! this sucks */
39c39
< oaf_plugin_unuse (gtk_object_get_user_data (object));
---
> bonobo_activation_plugin_unuse (gtk_object_get_user_data (object));
61c61
< oaf_plugin_use (poa, impl_ptr);
---
> bonobo_activation_plugin_use (poa, impl_ptr);
Index: helper-utilities/error-dialog/nautilus-error-dialog.c
===================================================================
RCS file: /cvs/gnome/nautilus/helper-utilities/error-dialog/nautilus-error-dialog.c,v
retrieving revision 1.4
diff -r1.4 nautilus-error-dialog.c
59c59
< #include <libgnomeui/gnome-stock.h>
---
> #include <libgnomeui/gnome-stock-icons.h>
Index: libnautilus/nautilus-view-standard-main.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus/nautilus-view-standard-main.c,v
retrieving revision 1.11
diff -r1.11 nautilus-view-standard-main.c
190,191c190,191
< gnomelib_register_popt_table (oaf_popt_options, oaf_get_popt_table_name ());
< orb = oaf_init (argc, argv);
---
> gnomelib_register_popt_table (bonobo_activation_popt_options, bonobo_activation_get_popt_table_name ());
> orb = bonobo_activation_init (argc, argv);
212c212
< registration_id = oaf_make_registration_id (factory_iid,
---
> registration_id = bonobo_activation_make_registration_id (factory_iid,
Index: libnautilus-private/nautilus-bonobo-extensions.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-bonobo-extensions.c,v
retrieving revision 1.32
diff -r1.32 nautilus-bonobo-extensions.c
551c551
< oaf_activation_callback (Bonobo_Unknown activated_object,
---
> bonobo_activation_activation_callback (Bonobo_Unknown activated_object,
594,595c594,595
< oaf_activate_from_id_async ((char *) iid, 0,
< oaf_activation_callback,
---
> bonobo_activation_activate_from_id_async ((char *) iid, 0,
> bonobo_activation_activation_callback,
Index: libnautilus-private/nautilus-bookmark.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-bookmark.c,v
retrieving revision 1.41
diff -r1.41 nautilus-bookmark.c
36d35
< #include <libgnome/gnome-defs.h>
38d36
< #include <libgnomeui/gtkpixmapmenuitem.h>
Index: libnautilus-private/nautilus-customization-data.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-customization-data.c,v
retrieving revision 1.19
diff -r1.19 nautilus-customization-data.c
31d30
< #include <libgnome/gnome-defs.h>
43d41
< #include <libgnome/gnome-defs.h>
141c139
< data->pattern_frame = gdk_pixbuf_new_from_file (temp_str);
---
> data->pattern_frame = gdk_pixbuf_new_from_file (temp_str, NULL);
211c209
< orig_pixbuf = gdk_pixbuf_new_from_file (image_file_name);
---
> orig_pixbuf = gdk_pixbuf_new_from_file (image_file_name, NULL);
468c466
< current_node = category_node->childs;
---
> current_node = category_node->xmlChildrenNode;
Index: libnautilus-private/nautilus-directory-async.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-directory-async.c,v
retrieving revision 1.168
diff -r1.168 nautilus-directory-async.c
41,42d40
< #include <libgnome/gnome-metadata.h>
< #include <libgnome/gnome-mime-info.h>
2758c2756
< /* The gnome-xml parser requires a zero-terminated array. */
---
> /* The libxml parser requires a zero-terminated array. */
Index: libnautilus-private/nautilus-directory-metafile.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-directory-metafile.c,v
retrieving revision 1.37
diff -r1.37 nautilus-directory-metafile.c
34c34
< #include <liboaf/liboaf.h>
---
> #include <bonobo-activation/bonobo-activation.h>
102c102
< factory = oaf_activate_from_id (METAFILE_FACTORY_IID, 0,
---
> factory = bonobo_activation_activate_from_id (METAFILE_FACTORY_IID, 0,
Index: libnautilus-private/nautilus-druid-page-eazel.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-druid-page-eazel.c,v
retrieving revision 1.7
diff -r1.7 nautilus-druid-page-eazel.c
37c37
< #include <gdk-pixbuf/gnome-canvas-pixbuf.h>
---
> #include <libgnomecanvas/gnome-canvas-pixbuf.h>
267c267
< GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (fullname);
---
> GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (fullname, NULL);
Index: libnautilus-private/nautilus-druid-page-eazel.h
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-druid-page-eazel.h,v
retrieving revision 1.4
diff -r1.4 nautilus-druid-page-eazel.h
27c27
< #include <libgnomeui/gnome-canvas.h>
---
> #include <libgnomecanvas/gnome-canvas.h>
Index: libnautilus-private/nautilus-druid.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-druid.c,v
retrieving revision 1.4
diff -r1.4 nautilus-druid.c
27c27
< #include <libgnomeui/gnome-stock.h>
---
> #include <libgnomeui/gnome-stock-icons.h>
Index: libnautilus-private/nautilus-druid.h
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-druid.h,v
retrieving revision 1.3
diff -r1.3 nautilus-druid.h
27d26
< #include <libgnome/gnome-defs.h>
Index: libnautilus-private/nautilus-entry.h
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-entry.h,v
retrieving revision 1.17
diff -r1.17 nautilus-entry.h
30d29
< #include <libgnome/gnome-defs.h>
Index: libnautilus-private/nautilus-file-operations-progress.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-file-operations-progress.c,v
retrieving revision 1.27
diff -r1.27 nautilus-file-operations-progress.c
42c42
< #include <libgnomeui/gnome-stock.h>
---
> #include <libgnomeui/gnome-stock-icons.h>
Index: libnautilus-private/nautilus-file.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-file.c,v
retrieving revision 1.260
diff -r1.260 nautilus-file.c
49,50d48
< #include <libgnome/gnome-defs.h>
< #include <libgnome/gnome-dentry.h>
52,53d49
< #include <libgnome/gnome-metadata.h>
< #include <libgnome/gnome-mime.h>
Index: libnautilus-private/nautilus-find-icon-image.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-find-icon-image.c,v
retrieving revision 1.4
diff -r1.4 nautilus-find-icon-image.c
35d34
< #include <libgnome/gnome-defs.h>
Index: libnautilus-private/nautilus-global-preferences.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-global-preferences.c,v
retrieving revision 1.176
diff -r1.176 nautilus-global-preferences.c
885c885
< OAF_ServerInfo *oaf_info;
---
> OAF_ServerInfo *bonobo_activation_info;
888,889c888,889
< oaf_info = gnome_vfs_mime_get_default_component ("x-directory/normal");
< if (oaf_info == NULL) {
---
> bonobo_activation_info = gnome_vfs_mime_get_default_component ("x-directory/normal");
> if (bonobo_activation_info == NULL) {
892c892
< result = get_default_folder_viewer_preference_from_iid (oaf_info->iid);
---
> result = get_default_folder_viewer_preference_from_iid (bonobo_activation_info->iid);
896c896
< CORBA_free (oaf_info);
---
> CORBA_free (bonobo_activation_info);
Index: libnautilus-private/nautilus-horizontal-splitter.h
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-horizontal-splitter.h,v
retrieving revision 1.6
diff -r1.6 nautilus-horizontal-splitter.h
28d27
< #include <libgnome/gnome-defs.h>
Index: libnautilus-private/nautilus-icon-canvas-item.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-icon-canvas-item.c,v
retrieving revision 1.115
diff -r1.115 nautilus-icon-canvas-item.c
34,35c34,35
< #include <libgnomeui/gnome-canvas-util.h>
< #include <libgnomeui/gnome-icon-text.h>
---
> #include <libgnomecanvas/gnome-canvas-util.h>
> #include <libgnomecanvas/gnome-icon-text.h>
984c984
< knob_pixbuf = gdk_pixbuf_new_from_file (knob_filename);
---
> knob_pixbuf = gdk_pixbuf_new_from_file (knob_filename, NULL);
1087c1087
< knob_pixbuf = gdk_pixbuf_new_from_file (knob_filename);
---
> knob_pixbuf = gdk_pixbuf_new_from_file (knob_filename, NULL);
1295c1295
< audio_pixbuf = gdk_pixbuf_new_from_file (audio_filename);
---
> audio_pixbuf = gdk_pixbuf_new_from_file (audio_filename, NULL);
2107c2107
< knob_pixbuf = gdk_pixbuf_new_from_file (knob_filename);
---
> knob_pixbuf = gdk_pixbuf_new_from_file (knob_filename, NULL);
Index: libnautilus-private/nautilus-icon-canvas-item.h
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-icon-canvas-item.h,v
retrieving revision 1.18
diff -r1.18 nautilus-icon-canvas-item.h
28,29c28
< #include <libgnome/gnome-defs.h>
< #include <libgnomeui/gnome-canvas.h>
---
> #include <libgnomecanvas/gnome-canvas.h>
Index: libnautilus-private/nautilus-icon-container.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-icon-container.c,v
retrieving revision 1.220
diff -r1.220 nautilus-icon-container.c
45c45
< #include <gdk-pixbuf/gnome-canvas-pixbuf.h>
---
> #include <libgnomecanvas/gnome-canvas-pixbuf.h>
3066c3066
< GTK_TYPE_GDK_EVENT);
---
> GDK_TYPE_EVENT);
5131c5131
< container->details->highlight_frame = gdk_pixbuf_new_from_file (text_frame_path);
---
> container->details->highlight_frame = gdk_pixbuf_new_from_file (text_frame_path, NULL);
Index: libnautilus-private/nautilus-icon-container.h
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-icon-container.h,v
retrieving revision 1.59
diff -r1.59 nautilus-icon-container.h
29c29
< #include <libgnomeui/gnome-canvas.h>
---
> #include <libgnomecanvas/gnome-canvas.h>
Index: libnautilus-private/nautilus-icon-dnd.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-icon-dnd.c,v
retrieving revision 1.93
diff -r1.93 nautilus-icon-dnd.c
51,52c51,52
< #include <libgnomeui/gnome-canvas-rect-ellipse.h>
< #include <libgnomeui/gnome-stock.h>
---
> #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
> #include <libgnomeui/gnome-stock-icons.h>
Index: libnautilus-private/nautilus-icon-factory.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-icon-factory.c,v
retrieving revision 1.233
diff -r1.233 nautilus-icon-factory.c
52d51
< #include <libgnome/gnome-dentry.h>
349c348
< factory->thumbnail_frame = gdk_pixbuf_new_from_file (image_path);
---
> factory->thumbnail_frame = gdk_pixbuf_new_from_file (image_path, NULL);
356c355
< factory->thumbnail_frame_aa = gdk_pixbuf_new_from_file (image_path);
---
> factory->thumbnail_frame_aa = gdk_pixbuf_new_from_file (image_path, NULL);
1540c1539
< return gdk_pixbuf_new_from_file (path);
---
> return gdk_pixbuf_new_from_file (path, NULL);
Index: libnautilus-private/nautilus-icon-text-item.h
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-icon-text-item.h,v
retrieving revision 1.8
diff -r1.8 nautilus-icon-text-item.h
14,16c14,15
< #include <libgnome/gnome-defs.h>
< #include <libgnomeui/gnome-canvas.h>
< #include <libgnomeui/gnome-icon-text.h>
---
> #include <libgnomecanvas/gnome-canvas.h>
> #include <libgnomecanvas/gnome-icon-text.h>
Index: libnautilus-private/nautilus-link-desktop-file.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-link-desktop-file.c,v
retrieving revision 1.3
diff -r1.3 nautilus-link-desktop-file.c
40,41c40,41
< #include <gnome-xml/parser.h>
< #include <gnome-xml/xmlmemory.h>
---
> #include <libxml/parser.h>
> #include <libxml/xmlmemory.h>
Index: libnautilus-private/nautilus-link-desktop-file.h
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-link-desktop-file.h,v
retrieving revision 1.2
diff -r1.2 nautilus-link-desktop-file.h
30,31d29
< #include <libgnome/gnome-defs.h>
< #include <libgnome/gnome-dentry.h>
Index: libnautilus-private/nautilus-link-historical.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-link-historical.c,v
retrieving revision 1.2
diff -r1.2 nautilus-link-historical.c
41,42c41,42
< #include <gnome-xml/parser.h>
< #include <gnome-xml/xmlmemory.h>
---
> #include <libxml/parser.h>
> #include <libxml/xmlmemory.h>
Index: libnautilus-private/nautilus-link-historical.h
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-link-historical.h,v
retrieving revision 1.2
diff -r1.2 nautilus-link-historical.h
31,32d30
< #include <libgnome/gnome-defs.h>
< #include <libgnome/gnome-dentry.h>
Index: libnautilus-private/nautilus-link.h
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-link.h,v
retrieving revision 1.20
diff -r1.20 nautilus-link.h
31,32d30
< #include <libgnome/gnome-defs.h>
< #include <libgnome/gnome-dentry.h>
Index: libnautilus-private/nautilus-medusa-support.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-medusa-support.c,v
retrieving revision 1.10
diff -r1.10 nautilus-medusa-support.c
29d28
< #include <libgnome/gnome-defs.h>
Index: libnautilus-private/nautilus-metafile.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-metafile.c,v
retrieving revision 1.18
diff -r1.18 nautilus-metafile.c
1855c1855
< /* The gnome-xml parser requires a zero-terminated array. */
---
> /* The libxml parser requires a zero-terminated array. */
Index: libnautilus-private/nautilus-mime-actions.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-mime-actions.c,v
retrieving revision 1.90
diff -r1.90 nautilus-mime-actions.c
1244c1244
< make_oaf_query_for_explicit_content_view_iids (GList *view_iids)
---
> make_bonobo_activation_query_for_explicit_content_view_iids (GList *view_iids)
1281c1281
< make_oaf_query_with_known_mime_type (const char *mime_type,
---
> make_bonobo_activation_query_with_known_mime_type (const char *mime_type,
1292c1292
< explicit_iid_query = make_oaf_query_for_explicit_content_view_iids (explicit_iids);
---
> explicit_iid_query = make_bonobo_activation_query_for_explicit_content_view_iids (explicit_iids);
1383c1383
< make_oaf_query_with_uri_scheme_only (const char *uri_scheme,
---
> make_bonobo_activation_query_with_uri_scheme_only (const char *uri_scheme,
1390c1390
< explicit_iid_query = make_oaf_query_for_explicit_content_view_iids (explicit_iids);
---
> explicit_iid_query = make_bonobo_activation_query_for_explicit_content_view_iids (explicit_iids);
1502c1502
< prop = oaf_server_info_prop_find (server, "nautilus:required_directory_content_mime_types");
---
> prop = bonobo_activation_server_info_prop_find (server, "nautilus:required_directory_content_mime_types");
1528c1528
< prop = oaf_server_info_prop_find (server, "nautilus:required_directory_content_mime_types");
---
> prop = bonobo_activation_server_info_prop_find (server, "nautilus:required_directory_content_mime_types");
1563c1563
< OAF_ServerInfoList *oaf_result;
---
> OAF_ServerInfoList *bonobo_activation_result;
1569c1569
< oaf_result = NULL;
---
> bonobo_activation_result = NULL;
1573c1573
< query = make_oaf_query_with_known_mime_type (mime_type, uri_scheme, explicit_iids, extra_requirements);
---
> query = make_bonobo_activation_query_with_known_mime_type (mime_type, uri_scheme, explicit_iids, extra_requirements);
1575c1575
< query = make_oaf_query_with_uri_scheme_only (uri_scheme, explicit_iids, extra_requirements);
---
> query = make_bonobo_activation_query_with_uri_scheme_only (uri_scheme, explicit_iids, extra_requirements);
1582c1582
< oaf_result = oaf_query (query, all_sort_criteria, &ev);
---
> bonobo_activation_result = bonobo_activation_query (query, all_sort_criteria, &ev);
1589c1589
< if (ev._major == CORBA_NO_EXCEPTION && oaf_result != NULL && oaf_result->_length > 0) {
---
> if (ev._major == CORBA_NO_EXCEPTION && bonobo_activation_result != NULL && bonobo_activation_result->_length > 0) {
1595c1595
< for (i = 0; i < oaf_result->_length; i++) {
---
> for (i = 0; i < bonobo_activation_result->_length; i++) {
1598c1598
< server = &oaf_result->_buffer[i];
---
> server = &bonobo_activation_result->_buffer[i];
1616c1616
< CORBA_free (oaf_result);
---
> CORBA_free (bonobo_activation_result);
Index: libnautilus-private/nautilus-monitor.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-monitor.c,v
retrieving revision 1.16
diff -r1.16 nautilus-monitor.c
38d37
< #include <libgnome/gnome-defs.h>
Index: libnautilus-private/nautilus-program-chooser.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-program-chooser.c,v
retrieving revision 1.53
diff -r1.53 nautilus-program-chooser.c
45d44
< #include <libgnome/gnome-defs.h>
47c46
< #include <libgnomeui/gnome-stock.h>
---
> #include <libgnomeui/gnome-stock-icons.h>
Index: libnautilus-private/nautilus-search-uri.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-search-uri.c,v
retrieving revision 1.40
diff -r1.40 nautilus-search-uri.c
28d27
< #include <libgnome/gnome-defs.h>
Index: libnautilus-private/nautilus-sidebar-functions.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-sidebar-functions.c,v
retrieving revision 1.6
diff -r1.6 nautilus-sidebar-functions.c
32c32
< #include <liboaf/liboaf.h>
---
> #include <bonobo-activation/bonobo-activation.h>
100c100
< OAF_ServerInfoList *oaf_result;
---
> OAF_ServerInfoList *bonobo_activation_result;
109c109
< oaf_result = oaf_query (query, NULL, &ev);
---
> bonobo_activation_result = bonobo_activation_query (query, NULL, &ev);
113,114c113,114
< if (ev._major == CORBA_NO_EXCEPTION && oaf_result != NULL) {
< for (i = 0; i < oaf_result->_length; i++) {
---
> if (ev._major == CORBA_NO_EXCEPTION && bonobo_activation_result != NULL) {
> for (i = 0; i < bonobo_activation_result->_length; i++) {
116c116
< (&oaf_result->_buffer[i]);
---
> (&bonobo_activation_result->_buffer[i]);
122,123c122,123
< if (oaf_result != NULL) {
< CORBA_free (oaf_result);
---
> if (bonobo_activation_result != NULL) {
> CORBA_free (bonobo_activation_result);
Index: libnautilus-private/nautilus-theme.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-theme.c,v
retrieving revision 1.31
diff -r1.31 nautilus-theme.c
40d39
< #include <libgnome/gnome-defs.h>
341c340
< pixbuf = gdk_pixbuf_new_from_file (pixbuf_file);
---
> pixbuf = gdk_pixbuf_new_from_file (pixbuf_file, NULL);
351c350
< pixbuf = gdk_pixbuf_new_from_file (pixbuf_file);
---
> pixbuf = gdk_pixbuf_new_from_file (pixbuf_file, NULL);
409c408
< pixbuf = gdk_pixbuf_new_from_file (pixbuf_file);
---
> pixbuf = gdk_pixbuf_new_from_file (pixbuf_file, NULL);
Index: libnautilus-private/nautilus-thumbnails.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-thumbnails.c,v
retrieving revision 1.31
diff -r1.31 nautilus-thumbnails.c
690c690
< pixbuf = gdk_pixbuf_new_from_file (path);
---
> pixbuf = gdk_pixbuf_new_from_file (path, NULL);
Index: libnautilus-private/nautilus-trash-directory.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-trash-directory.c,v
retrieving revision 1.27
diff -r1.27 nautilus-trash-directory.c
38d37
< #include <libgnome/gnome-defs.h>
Index: libnautilus-private/nautilus-trash-file.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-trash-file.c,v
retrieving revision 1.13
diff -r1.13 nautilus-trash-file.c
38d37
< #include <libgnome/gnome-defs.h>
Index: libnautilus-private/nautilus-undo-signal-handlers.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-undo-signal-handlers.c,v
retrieving revision 1.12
diff -r1.12 nautilus-undo-signal-handlers.c
29d28
< #include <libgnome/gnome-defs.h>
Index: libnautilus-private/nautilus-view-identifier.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-view-identifier.c,v
retrieving revision 1.16
diff -r1.16 nautilus-view-identifier.c
28d27
< #include <libgnome/gnome-defs.h>
136c135
< nautilus_view_identifier_new_from_oaf_server_info (OAF_ServerInfo *server, char *name_attribute)
---
> nautilus_view_identifier_new_from_bonobo_activation_server_info (OAF_ServerInfo *server, char *name_attribute)
145,147c144,146
< view_as_name = oaf_server_info_prop_lookup (server, name_attribute, langs);
< view_as_label = oaf_server_info_prop_lookup (server, "nautilus:view_as_label", langs);
< viewer_label = oaf_server_info_prop_lookup (server, "nautilus:viewer_label", langs);
---
> view_as_name = bonobo_activation_server_info_prop_lookup (server, name_attribute, langs);
> view_as_label = bonobo_activation_server_info_prop_lookup (server, "nautilus:view_as_label", langs);
> viewer_label = bonobo_activation_server_info_prop_lookup (server, "nautilus:viewer_label", langs);
150c149
< view_as_name = oaf_server_info_prop_lookup (server, "name", langs);
---
> view_as_name = bonobo_activation_server_info_prop_lookup (server, "name", langs);
182c181
< return nautilus_view_identifier_new_from_oaf_server_info
---
> return nautilus_view_identifier_new_from_bonobo_activation_server_info
189c188
< return nautilus_view_identifier_new_from_oaf_server_info
---
> return nautilus_view_identifier_new_from_bonobo_activation_server_info
196c195
< return nautilus_view_identifier_new_from_oaf_server_info
---
> return nautilus_view_identifier_new_from_bonobo_activation_server_info
Index: libnautilus-private/nautilus-view-identifier.h
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-view-identifier.h,v
retrieving revision 1.10
diff -r1.10 nautilus-view-identifier.h
28c28
< #include <liboaf/liboaf.h>
---
> #include <bonobo-activation/bonobo-activation.h>
37c37
< NautilusViewIdentifier *nautilus_view_identifier_new_from_oaf_server_info (OAF_ServerInfo *server,
---
> NautilusViewIdentifier *nautilus_view_identifier_new_from_bonobo_activation_server_info (OAF_ServerInfo *server,
Index: libnautilus-private/nautilus-volume-monitor.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-volume-monitor.c,v
retrieving revision 1.105
diff -r1.105 nautilus-volume-monitor.c
49d48
< #include <libgnome/gnome-defs.h>
Index: src/nautilus-about.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-about.c,v
retrieving revision 1.29
diff -r1.29 nautilus-about.c
31d30
< #include <libgnome/gnome-defs.h>
137c136
< about->details->background_pixbuf = gdk_pixbuf_new_from_file (background_path);
---
> about->details->background_pixbuf = gdk_pixbuf_new_from_file (background_path, NULL);
Index: src/nautilus-application.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-application.c,v
retrieving revision 1.161
diff -r1.161 nautilus-application.c
51d50
< #include <libgnome/gnome-metadata.h>
55c54
< #include <libgnomeui/gnome-stock.h>
---
> #include <libgnomeui/gnome-stock-icons.h>
67c66
< #include <liboaf/liboaf.h>
---
> #include <bonobo-activation/bonobo-activation.h>
510c509
< result = oaf_active_server_register
---
> result = bonobo_activation_active_server_register
559c558
< g_warning ("bad error code from oaf_active_server_register");
---
> g_warning ("bad error code from bonobo_activation_active_server_register");
578c577
< shell = oaf_activate_from_id (SHELL_IID, 0, NULL, NULL);
---
> shell = bonobo_activation_activate_from_id (SHELL_IID, 0, NULL, NULL);
Index: src/nautilus-complex-search-bar.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-complex-search-bar.c,v
retrieving revision 1.55
diff -r1.55 nautilus-complex-search-bar.c
458c458
< pixbuf = gdk_pixbuf_new_from_file (NAUTILUS_PIXMAPDIR "/search.png");
---
> pixbuf = gdk_pixbuf_new_from_file (NAUTILUS_PIXMAPDIR "/search.png", NULL);
Index: src/nautilus-component-adapter-factory.h
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-component-adapter-factory.h,v
retrieving revision 1.1
diff -r1.1 nautilus-component-adapter-factory.h
33d32
< #include <bonobo/bonobo-object-client.h>
Index: src/nautilus-first-time-druid.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-first-time-druid.c,v
retrieving revision 1.110
diff -r1.110 nautilus-first-time-druid.c
368c368
< pixbuf = gdk_pixbuf_new_from_file (path);
---
> pixbuf = gdk_pixbuf_new_from_file (path, NULL);
Index: src/nautilus-location-bar.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-location-bar.c,v
retrieving revision 1.69
diff -r1.69 nautilus-location-bar.c
47d46
< #include <libgnome/gnome-defs.h>
49,50c48
< #include <libgnome/gnome-mime.h>
< #include <libgnomeui/gnome-stock.h>
---
> #include <libgnomeui/gnome-stock-icons.h>
Index: src/nautilus-main.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-main.c,v
retrieving revision 1.106
diff -r1.106 nautilus-main.c
47,48c47
< #include <libgnome/gnome-metadata.h>
< #include <libgnomeui/gnome-init.h>
---
> #include <libgnome/gnome-init.h>
53c52
< #include <liboaf/liboaf.h>
---
> #include <bonobo-activation/bonobo-activation.h>
202,203c201,202
< gnomelib_register_popt_table (oaf_popt_options,
< oaf_get_popt_table_name ());
---
> gnomelib_register_popt_table (bonobo_activation_popt_options,
> bonobo_activation_get_popt_table_name ());
208c207
< orb = oaf_init (argc, argv);
---
> orb = bonobo_activation_init (argc, argv);
246c245
< oaf_set_test_components_enabled (TRUE);
---
> bonobo_activation_set_test_components_enabled (TRUE);
Index: src/nautilus-property-browser.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-property-browser.c,v
retrieving revision 1.150
diff -r1.150 nautilus-property-browser.c
68d67
< #include <libgnome/gnome-defs.h>
73c72
< #include <libgnomeui/gnome-stock.h>
---
> #include <libgnomeui/gnome-stock-icons.h>
257c256
< property_browser->details->property_chit = gdk_pixbuf_new_from_file (temp_str);
---
> property_browser->details->property_chit = gdk_pixbuf_new_from_file (temp_str, NULL);
666c665
< orig_pixbuf = gdk_pixbuf_new_from_file (image_file_name);
---
> orig_pixbuf = gdk_pixbuf_new_from_file (image_file_name, NULL);
1721c1720
< reset_pixbuf = gdk_pixbuf_new_from_file (reset_image_file_name);
---
> reset_pixbuf = gdk_pixbuf_new_from_file (reset_image_file_name, NULL);
Index: src/nautilus-search-bar-criterion.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-search-bar-criterion.c,v
retrieving revision 1.38
diff -r1.38 nautilus-search-bar-criterion.c
43d42
< #include <libgnome/gnome-defs.h>
Index: src/nautilus-shell.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-shell.c,v
retrieving revision 1.40
diff -r1.40 nautilus-shell.c
46c46
< #include <libgnomeui/gnome-stock.h>
---
> #include <libgnomeui/gnome-stock-icons.h>
Index: src/nautilus-sidebar-tabs.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-sidebar-tabs.c,v
retrieving revision 1.84
diff -r1.84 nautilus-sidebar-tabs.c
36d35
< #include <libgnome/gnome-defs.h>
429c428
< pixbuf = gdk_pixbuf_new_from_file (image_path);
---
> pixbuf = gdk_pixbuf_new_from_file (image_path, NULL);
1359c1358
< tab_item->indicator_pixbuf = gdk_pixbuf_new_from_file (image_path);
---
> tab_item->indicator_pixbuf = gdk_pixbuf_new_from_file (image_path, NULL);
Index: src/nautilus-sidebar.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-sidebar.c,v
retrieving revision 1.188
diff -r1.188 nautilus-sidebar.c
679c679
< pixbuf = gdk_pixbuf_new_from_file (image_path);
---
> pixbuf = gdk_pixbuf_new_from_file (image_path, NULL);
Index: src/nautilus-switchable-navigation-bar.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-switchable-navigation-bar.c,v
retrieving revision 1.20
diff -r1.20 nautilus-switchable-navigation-bar.c
37d36
< #include <libgnome/gnome-defs.h>
Index: src/nautilus-switchable-search-bar.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-switchable-search-bar.c,v
retrieving revision 1.28
diff -r1.28 nautilus-switchable-search-bar.c
37d36
< #include <libgnome/gnome-defs.h>
Index: src/nautilus-theme-selector.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-theme-selector.c,v
retrieving revision 1.54
diff -r1.54 nautilus-theme-selector.c
45d44
< #include <libgnome/gnome-defs.h>
Index: src/nautilus-theme-selector.h
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-theme-selector.h,v
retrieving revision 1.3
diff -r1.3 nautilus-theme-selector.h
33d32
< #include <libgnome/gnome-defs.h>
Index: src/nautilus-view-frame.h
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-view-frame.h,v
retrieving revision 1.66
diff -r1.66 nautilus-view-frame.h
36d35
< #include <bonobo/bonobo-object-client.h>
Index: src/nautilus-window-toolbars.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-window-toolbars.c,v
retrieving revision 1.79
diff -r1.79 nautilus-window-toolbars.c
45d44
< #include <libgnomeui/gnome-preferences.h>
275c274
< pixbuf = gdk_pixbuf_new_from_file (icon_file_name);
---
> pixbuf = gdk_pixbuf_new_from_file (icon_file_name, NULL);
Index: src/nautilus-window.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-window.c,v
retrieving revision 1.342
diff -r1.342 nautilus-window.c
186c186
< pixbuf = gdk_pixbuf_new_from_file (filename);
---
> pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
Index: src/nautilus-window.h
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-window.h,v
retrieving revision 1.96
diff -r1.96 nautilus-window.h
32c32
< #include <bonobo/bonobo-win.h>
---
> #include <bonobo/bonobo-window.h>
Index: src/nautilus-zoom-control.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-zoom-control.c,v
retrieving revision 1.50
diff -r1.50 nautilus-zoom-control.c
31d30
< #include <libgnome/gnome-defs.h>
504c503
< pixbuf = gdk_pixbuf_new_from_file (image_path);
---
> pixbuf = gdk_pixbuf_new_from_file (image_path, NULL);
Index: src/file-manager/fm-desktop-icon-view.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/fm-desktop-icon-view.c,v
retrieving revision 1.146
diff -r1.146 fm-desktop-icon-view.c
45d44
< #include <libgnome/gnome-dentry.h>
47d45
< #include <libgnome/gnome-mime.h>
Index: src/file-manager/fm-directory-view.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/fm-directory-view.c,v
retrieving revision 1.473
diff -r1.473 fm-directory-view.c
37c37
< #include <bonobo/bonobo-win.h>
---
> #include <bonobo/bonobo-window.h>
Index: src/file-manager/fm-error-reporting.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/fm-error-reporting.c,v
retrieving revision 1.34
diff -r1.34 fm-error-reporting.c
30d29
< #include <libgnome/gnome-defs.h>
Index: src/file-manager/fm-icon-view.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/fm-icon-view.c,v
retrieving revision 1.217
diff -r1.217 fm-icon-view.c
50d49
< #include <libgnome/gnome-mime.h>
Index: src/file-manager/fm-properties-window.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/fm-properties-window.c,v
retrieving revision 1.125
diff -r1.125 fm-properties-window.c
57d56
< #include <libgnome/gnome-defs.h>
290c289
< pixbuf = gdk_pixbuf_new_from_file (image_path);
---
> pixbuf = gdk_pixbuf_new_from_file (image_path, NULL);
Index: src/file-manager/nautilus-indexing-info.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/nautilus-indexing-info.c,v
retrieving revision 1.27
diff -r1.27 nautilus-indexing-info.c
33d32
< #include <libgnome/gnome-defs.h>
Index: test/test-nautilus-async-activation.c
===================================================================
RCS file: /cvs/gnome/nautilus/test/test-nautilus-async-activation.c,v
retrieving revision 1.3
diff -r1.3 test-nautilus-async-activation.c
64c64
< oaf_init (argc, argv);
---
> bonobo_activation_init (argc, argv);
Index: test/test-nautilus-mime-actions-set.c
===================================================================
RCS file: /cvs/gnome/nautilus/test/test-nautilus-mime-actions-set.c,v
retrieving revision 1.11
diff -r1.11 test-nautilus-mime-actions-set.c
113,114c113,114
< gnomelib_register_popt_table (oaf_popt_options, oaf_get_popt_table_name ());
< oaf_init (argc, argv);
---
> gnomelib_register_popt_table (bonobo_activation_popt_options, bonobo_activation_get_popt_table_name ());
> bonobo_activation_init (argc, argv);
Index: test/test-nautilus-mime-actions.c
===================================================================
RCS file: /cvs/gnome/nautilus/test/test-nautilus-mime-actions.c,v
retrieving revision 1.13
diff -r1.13 test-nautilus-mime-actions.c
160,161c160,161
< gnomelib_register_popt_table (oaf_popt_options, oaf_get_popt_table_name ());
< oaf_init (argc, argv);
---
> gnomelib_register_popt_table (bonobo_activation_popt_options, bonobo_activation_get_popt_table_name ());
> bonobo_activation_init (argc, argv);
Index: test/test-nautilus-smooth-graphics.c
===================================================================
RCS file: /cvs/gnome/nautilus/test/test-nautilus-smooth-graphics.c,v
retrieving revision 1.4
diff -r1.4 test-nautilus-smooth-graphics.c
4,5c4
< #include <libgnome/gnome-defs.h>
< #include <libgnomeui/gnome-init.h>
---
> #include <libgnome/gnome-init.h>
Index: test/test.c
===================================================================
RCS file: /cvs/gnome/nautilus/test/test.c,v
retrieving revision 1.14
diff -r1.14 test.c
120c120
< pixbuf = gdk_pixbuf_new_from_file (path);
---
> pixbuf = gdk_pixbuf_new_from_file (path, NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
