[Nautilus-list] More Gnome 2 Work
- From: Thomas Canty <tommydal optushome com au>
- To: nautilus-list eazel com, darin bentspoon com
- Subject: [Nautilus-list] More Gnome 2 Work
- Date: 10 Nov 2001 21:48:16 +0100
Hi,
I did some more work getting Nautilus working under Gnome 2
Now the history, news, notes and throbber components are working to a
certain extent,
cheers,
Thomas
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/nautilus/ChangeLog,v
retrieving revision 1.4839
diff -u -r1.4839 ChangeLog
--- ChangeLog 2001/11/10 05:00:25 1.4839
+++ ChangeLog 2001/11/10 12:15:00
@@ -1,3 +1,16 @@
+2001-11-10 Thomas Canty <tommydal optushome com au>
+
+ * Lots of files:
+ Work towards getting the components compiling and
+ working. History, News, Notes and Throbber components
+ are now working.
+
+ * libnautilus/nautilus-view-standard-main.c:
+ Change the initialisation to use bonobo_ui_init
+
+ * src/nautilus-window-toolbars.c:
+ Re-enable the throbber.
+
2001-11-09 Darin Adler <darin bentspoon com>
* libnautilus-private/nautilus-horizontal-splitter.c:
Index: components/Makefile.am
===================================================================
RCS file: /cvs/gnome/nautilus/components/Makefile.am,v
retrieving revision 1.30
diff -u -r1.30 Makefile.am
--- components/Makefile.am 2001/11/09 01:09:25 1.30
+++ components/Makefile.am 2001/11/10 12:15:01
@@ -6,20 +6,20 @@
SUBDIRS = \
sample \
+ history \
+ news \
+ notes \
+ throbber \
$(NULL)
XXX=
adapter \
hardware \
help \
- history \
image-viewer \
loser \
music \
- news \
- notes \
text \
- throbber \
tree \
$(MOZILLA_COMPONENT_SUBDIRS) \
$(NULL)
Index: components/hardware/Makefile.am
===================================================================
RCS file: /cvs/gnome/nautilus/components/hardware/Makefile.am,v
retrieving revision 1.17
diff -u -r1.17 Makefile.am
--- components/hardware/Makefile.am 2001/11/09 01:09:26 1.17
+++ components/hardware/Makefile.am 2001/11/10 12:15:01
@@ -6,7 +6,7 @@
-DG_LOG_DOMAIN=\"Nautilus-Hardware\" \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-I$(top_srcdir) \
- $(NAUTILUS_PRIVATE_CFLAGS) \
+ $(COMPONENT_CFLAGS) \
$(NULL)
serverdir = $(libdir)/bonobo/servers
@@ -30,7 +30,7 @@
nautilus_hardware_view_LDADD = \
$(top_builddir)/libnautilus/libnautilus.la \
$(top_builddir)/libnautilus-private/libnautilus-private.la \
- $(NAUTILUS_PRIVATE_LIBS) \
+ $(COMPONENT_LIBS) \
$(NULL)
EXTRA_DIST = $(server_DATA) $(server_in_files)
Index: components/hardware/main.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/hardware/main.c,v
retrieving revision 1.14
diff -u -r1.14 main.c
--- components/hardware/main.c 2001/11/09 02:05:15 1.14
+++ components/hardware/main.c 2001/11/10 12:15:01
@@ -22,6 +22,8 @@
/* main.c - main function and object activation function for the hardware view component. */
+#define IID "OAFIID:nautilus_hardware_view_factory:8c80e55a-5c03-4403-9e51-3a5711b8a5ce"
+
#include <config.h>
#include "nautilus-hardware-view.h"
@@ -58,7 +60,7 @@
object_count++;
- g_signal_connect (view, "destroy", hardware_view_object_destroyed, NULL);
+ g_signal_connect (view, "destroy", G_CALLBACK (hardware_view_object_destroyed), NULL);
return BONOBO_OBJECT (view);
}
@@ -66,10 +68,10 @@
int main(int argc, char *argv[])
{
BonoboGenericFactory *factory;
- CORBA_ORB orb;
CORBA_Environment ev;
+#ifdef GNOME2_CONVERSION_COMPLETE
char *registration_id;
-
+#endif
/* Initialize gettext support */
#ifdef ENABLE_NLS /* sadly we need this ifdef because otherwise the following get empty statement warnings */
@@ -85,7 +87,8 @@
}
CORBA_exception_init(&ev);
-
+
+#ifdef GNOME2_CONVERSION_COMPLETE
gnomelib_register_popt_table (bonobo_activation_popt_options, bonobo_activation_get_popt_table_name ());
orb = bonobo_activation_init (argc, argv);
@@ -97,13 +100,17 @@
/* initialize gnome-vfs, etc */
g_thread_init (NULL);
gnome_vfs_init ();
+#endif
+ bonobo_ui_init ("nautilus-hardware-view", VERSION, &argc, argv);
+ /* FIXME
registration_id = bonobo_activation_make_registration_id ("OAFIID:nautilus_hardware_view_factory:8c80e55a-5c03-4403-9e51-3a5711b8a5ce",
- getenv ("DISPLAY"));
- factory = bonobo_generic_factory_new_multi (registration_id,
+ getenv ("DISPLAY"));*/
+
+ factory = bonobo_generic_factory_new (IID,
hardware_view_make_object,
NULL);
- g_free (registration_id);
+ /*g_free (registration_id);*/
do {
Index: components/hardware/nautilus-hardware-view.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/hardware/nautilus-hardware-view.c,v
retrieving revision 1.40
diff -u -r1.40 nautilus-hardware-view.c
--- components/hardware/nautilus-hardware-view.c 2001/11/09 02:05:15 1.40
+++ components/hardware/nautilus-hardware-view.c 2001/11/10 12:15:03
@@ -34,6 +34,8 @@
#include <gnome.h>
#include <gtk/gtksignal.h>
#include <eel/eel-background.h>
+/* FIXME */
+#include <bonobo/bonobo-property-bag.h>
#include <libnautilus-private/nautilus-directory-background.h>
#include <libnautilus-private/nautilus-file-utilities.h>
#include <libnautilus-private/nautilus-file.h>
@@ -175,7 +177,9 @@
/* allocate a property bag to specify the name of the icon for this component */
hardware_view->details->property_bag = bonobo_property_bag_new (get_bonobo_properties, set_bonobo_properties, hardware_view);
+#ifdef GNOME2_CONVERSION_COMPLETE
bonobo_control_set_properties (nautilus_view_get_bonobo_control (hardware_view->details->nautilus_view), hardware_view->details->property_bag);
+#endif
bonobo_property_bag_add (hardware_view->details->property_bag, "icon_name", ICON_NAME, BONOBO_ARG_STRING, NULL,
_("name of icon for the hardware view"), 0);
bonobo_property_bag_add (hardware_view->details->property_bag, "summary_info", COMPONENT_INFO, BONOBO_ARG_STRING, NULL,
Index: components/help/Makefile.am
===================================================================
RCS file: /cvs/gnome/nautilus/components/help/Makefile.am,v
retrieving revision 1.41
diff -u -r1.41 Makefile.am
--- components/help/Makefile.am 2001/11/09 01:09:28 1.41
+++ components/help/Makefile.am 2001/11/10 12:15:03
@@ -1,7 +1,5 @@
NULL=
-SUBDIRS=converters
-
bin_PROGRAMS=hyperbola
modules_LTLIBRARIES=libvfs-help.la
noinst_PROGRAMS=test-help-method
@@ -13,14 +11,14 @@
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DINFODIR=\"$(infodir)\" \
-DENABLE_SCROLLKEEPER_SUPPORT \
- $(NAUTILUS_PRIVATE_CFLAGS) \
+ $(COMPONENT_CFLAGS) \
$(GNOME_DB2HTML3_FLAG) \
$(NULL)
LDADD =\
$(top_builddir)/libnautilus/libnautilus.la \
$(top_builddir)/libnautilus-private/libnautilus-private.la \
- $(NAUTILUS_PRIVATE_LIBS)
+ $(COMPONENT_LIBS)
hyperbola_SOURCES= \
hyperbola-nav.h \
Index: components/help/hyperbola-filefmt.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/help/hyperbola-filefmt.c,v
retrieving revision 1.40
diff -u -r1.40 hyperbola-filefmt.c
--- components/help/hyperbola-filefmt.c 2001/11/07 21:43:33 1.40
+++ components/help/hyperbola-filefmt.c 2001/11/10 12:15:07
@@ -28,12 +28,12 @@
#include <libgnome/gnome-i18n.h>
#include <libgnome/gnome-util.h>
#include <limits.h>
-#include <parser.h>
+#include <libxml/parser.h>
#include <regex.h>
#include <string.h>
-#include <tree.h>
+#include <libxml/tree.h>
#include <unistd.h>
-#include <xmlmemory.h>
+#include <libxml/xmlmemory.h>
#include <zlib.h>
typedef struct {
Index: components/help/hyperbola-main.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/help/hyperbola-main.c,v
retrieving revision 1.29
diff -u -r1.29 hyperbola-main.c
--- components/help/hyperbola-main.c 2001/11/09 02:05:16 1.29
+++ components/help/hyperbola-main.c 2001/11/10 12:15:07
@@ -78,8 +78,8 @@
if (retval) {
object_count++;
- g_signal_connect (retval, "destroy",
- do_destroy, NULL);
+ g_signal_connect (G_OBJECT (retval), "destroy",
+ G_CALLBACK (do_destroy), NULL);
}
return retval;
@@ -89,7 +89,6 @@
main (int argc, char *argv[])
{
BonoboGenericFactory *factory;
- CORBA_ORB orb;
char *registration_id;
@@ -107,6 +106,7 @@
}
/* Disable session manager connection */
+#ifdef GNOME2_CONVERSION_COMPLETE
gnome_client_disable_master_connection ();
gnomelib_register_popt_table (bonobo_activation_popt_options,
@@ -118,6 +118,8 @@
gdk_rgb_init ();
bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL);
+#endif
+ bonobo_ui_init ("hyperbola", VERSION, &argc, argv);
nautilus_global_preferences_init ();
@@ -126,7 +128,7 @@
("OAFIID:hyperbola_factory:02b54c63-101b-4b27-a285-f99ed332ecdb",
g_getenv ("DISPLAY"));
factory =
- bonobo_generic_factory_new_multi (registration_id, make_obj,
+ bonobo_generic_factory_new (registration_id, make_obj,
NULL);
g_free (registration_id);
Index: components/help/hyperbola-nav-index.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/help/hyperbola-nav-index.c,v
retrieving revision 1.31
diff -u -r1.31 hyperbola-nav-index.c
--- components/help/hyperbola-nav-index.c 2001/11/09 02:05:16 1.31
+++ components/help/hyperbola-nav-index.c 2001/11/10 12:15:13
@@ -1750,9 +1750,9 @@
hni->ent = gtk_entry_new ();
g_signal_connect (hni->ent, "changed",
- hyperbola_navigation_index_ent_changed, hni);
+ G_CALLBACK (hyperbola_navigation_index_ent_changed), hni);
g_signal_connect (hni->ent, "activate",
- hyperbola_navigation_index_ent_activate, hni);
+ G_CALLBACK (hyperbola_navigation_index_ent_activate), hni);
gtk_container_add (GTK_CONTAINER (vbox), hni->ent);
hni->clist = gtk_clist_new (1);
@@ -1761,7 +1761,7 @@
GTK_SELECTION_BROWSE);
g_signal_connect (hni->clist, "select_row",
- hyperbola_navigation_index_select_row, hni);
+ G_CALLBACK (hyperbola_navigation_index_select_row), hni);
wtmp =
gtk_scrolled_window_new (gtk_clist_get_hadjustment
@@ -2039,14 +2039,14 @@
ok_button = gtk_button_new_from_stock (GTK_STOCK_OK);
cancel_button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
- gtk_signal_connect(GTK_OBJECT(ok_button), "clicked",
- hyperbola_navigation_index_OK_button, hni);
- gtk_signal_connect(GTK_OBJECT(hni->all_button), "clicked",
- hyperbola_navigation_index_select_all_button, hni);
- gtk_signal_connect(GTK_OBJECT(hni->none_button), "clicked",
- hyperbola_navigation_index_select_none_button, hni);
- gtk_signal_connect(GTK_OBJECT(cancel_button), "clicked",
- hyperbola_navigation_index_cancel_button, hni);
+ g_signal_connect(G_OBJECT(ok_button), "clicked",
+ G_CALLBACK (hyperbola_navigation_index_OK_button), hni);
+ g_signal_connect(G_OBJECT(hni->all_button), "clicked",
+ G_CALLBACK (hyperbola_navigation_index_select_all_button), hni);
+ g_signal_connect(G_OBJECT(hni->none_button), "clicked",
+ G_CALLBACK (hyperbola_navigation_index_select_none_button), hni);
+ g_signal_connect(G_OBJECT(cancel_button), "clicked",
+ G_CALLBACK (hyperbola_navigation_index_cancel_button), hni);
hseparator = gtk_hseparator_new();
gtk_box_pack_start( GTK_BOX(hbox1), hni->all_button, TRUE, TRUE, 0);
@@ -2217,7 +2217,7 @@
gtk_container_add(GTK_CONTAINER(hni->contents_rbutton),
GTK_WIDGET(underlined_label));
- radio_group = gtk_radio_button_group(GTK_RADIO_BUTTON(hni->contents_rbutton));
+ radio_group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(hni->contents_rbutton));
underlined_label = gtk_label_new("");
gtk_label_parse_uline(GTK_LABEL(underlined_label), _("_All documents"));
@@ -2225,7 +2225,7 @@
hni->all_rbutton = gtk_radio_button_new(radio_group);
gtk_container_add(GTK_CONTAINER(hni->all_rbutton),
GTK_WIDGET(underlined_label));
- radio_group = gtk_radio_button_group(GTK_RADIO_BUTTON(hni->all_rbutton));
+ radio_group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(hni->all_rbutton));
underlined_label = gtk_label_new("");
gtk_label_parse_uline(GTK_LABEL(underlined_label),
_("_Specific documents"));
@@ -2246,7 +2246,7 @@
button = gtk_button_new_with_label ("...");
- gtk_signal_connect(GTK_OBJECT(button),"clicked",make_index_select_page,hni);
+ g_signal_connect(G_OBJECT(button),"clicked",G_CALLBACK (make_index_select_page),hni);
gtk_box_pack_end(GTK_BOX(top_hbox), button, FALSE, FALSE, 5);
@@ -2266,7 +2266,7 @@
g_signal_connect (hni->all_terms_rbutton, "toggled",
G_CALLBACK(show_index_for_all_terms), hni);
gtk_box_pack_start(GTK_BOX(mid_vbox), hni->all_terms_rbutton,FALSE,FALSE,0);
- radio_group = gtk_radio_button_group(GTK_RADIO_BUTTON(hni->all_terms_rbutton));
+ radio_group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(hni->all_terms_rbutton));
underlined_label = gtk_label_new("");
gtk_label_parse_uline(GTK_LABEL(underlined_label),
_("Show _only terms containing"));
@@ -2288,8 +2288,8 @@
gtk_label_parse_uline(GTK_LABEL(underlined_label), _("Sho_w"));
hni->show_button = gtk_button_new();
gtk_container_add(GTK_CONTAINER(hni->show_button),GTK_WIDGET(underlined_label));
- gtk_signal_connect(GTK_OBJECT(hni->show_button), "clicked",
- hyperbola_navigation_index_show_button, hni);
+ g_signal_connect(G_OBJECT(hni->show_button), "clicked",
+ G_CALLBACK (hyperbola_navigation_index_show_button), hni);
gtk_box_pack_start(GTK_BOX(mid_hbox), hni->show_button, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(mid_vbox), mid_hbox, FALSE, FALSE, 0);
@@ -2717,11 +2717,11 @@
GTK_SELECTION_EXTENDED);
gtk_clist_thaw(GTK_CLIST (hni->index_contents->ctree));
select_handler_id = g_signal_connect (hni->index_contents->ctree, "tree_select_row",
- hyperbola_navigation_index_tree_select_row, hni);
+ G_CALLBACK (hyperbola_navigation_index_tree_select_row), hni);
g_signal_connect (hni->index_contents->ctree, "tree_unselect_row",
- hyperbola_navigation_index_tree_unselect_row, hni);
+ G_CALLBACK (hyperbola_navigation_index_tree_unselect_row), hni);
g_signal_connect (hni->index_contents->ctree, "destroy",
- hyperbola_navigation_tree_destroy, hni->index_contents);
+ G_CALLBACK (hyperbola_navigation_tree_destroy), hni->index_contents);
/* The default is for Selection on Contents tab to be selected */
hyperbola_navigation_index_find_contents_selected_index_files(hni);
Index: components/help/hyperbola-nav-search.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/help/hyperbola-nav-search.c,v
retrieving revision 1.17
diff -u -r1.17 hyperbola-nav-search.c
--- components/help/hyperbola-nav-search.c 2001/11/09 02:05:16 1.17
+++ components/help/hyperbola-nav-search.c 2001/11/10 12:15:14
@@ -161,9 +161,9 @@
hns->ent = gtk_entry_new ();
g_signal_connect (hns->ent, "changed",
- hyperbola_navigation_search_ent_changed, hns);
+ G_CALLBACK (hyperbola_navigation_search_ent_changed), hns);
g_signal_connect (hns->ent, "activate",
- hyperbola_navigation_search_ent_activate, hns);
+ G_CALLBACK (hyperbola_navigation_search_ent_activate), hns);
gtk_container_add (GTK_CONTAINER (vbox), hns->ent);
hns->clist = gtk_clist_new (1);
@@ -172,7 +172,7 @@
GTK_SELECTION_BROWSE);
g_signal_connect (hns->clist, "select_row",
- hyperbola_navigation_search_select_row, hns);
+ G_CALLBACK (hyperbola_navigation_search_select_row), hns);
wtmp =
gtk_scrolled_window_new (gtk_clist_get_hadjustment
Index: components/help/hyperbola-types.h
===================================================================
RCS file: /cvs/gnome/nautilus/components/help/hyperbola-types.h,v
retrieving revision 1.4
diff -u -r1.4 hyperbola-types.h
--- components/help/hyperbola-types.h 2001/11/01 19:41:31 1.4
+++ components/help/hyperbola-types.h 2001/11/10 12:15:15
@@ -8,7 +8,6 @@
#include <gtk/gtk.h>
#include <gtk/gtkctree.h>
#include <gtk/gtknotebook.h>
-#include <libgnome/gnome-defs.h>
#include <libgnome/gnome-i18n.h>
#include <libgnomeui/gnome-uidefs.h>
#include <libnautilus-private/nautilus-theme.h>
Index: components/history/Makefile.am
===================================================================
RCS file: /cvs/gnome/nautilus/components/history/Makefile.am,v
retrieving revision 1.22
diff -u -r1.22 Makefile.am
--- components/history/Makefile.am 2001/11/09 01:09:30 1.22
+++ components/history/Makefile.am 2001/11/10 12:15:15
@@ -5,13 +5,13 @@
INCLUDES=\
-I$(top_srcdir) \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
- $(NAUTILUS_PRIVATE_CFLAGS) \
+ $(COMPONENT_CFLAGS)
$(NULL)
LDADD=\
$(top_builddir)/libnautilus/libnautilus.la \
$(top_builddir)/libnautilus-private/libnautilus-private.la \
- $(NAUTILUS_PRIVATE_LIBS) \
+ $(COMPONENT_LIBS)
$(NULL)
nautilus_history_view_SOURCES=nautilus-history-view.c
Index: components/history/nautilus-history-view.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/history/nautilus-history-view.c,v
retrieving revision 1.70
diff -u -r1.70 nautilus-history-view.c
--- components/history/nautilus-history-view.c 2001/11/09 02:05:18 1.70
+++ components/history/nautilus-history-view.c 2001/11/10 12:15:15
@@ -302,16 +302,16 @@
g_signal_connect (list,
"button-press-event",
- button_press_callback,
+ G_CALLBACK (button_press_callback),
view);
g_signal_connect (list,
"button-release-event",
- button_release_callback,
+ G_CALLBACK (button_release_callback),
view);
g_signal_connect (view,
"history_changed",
- history_changed_callback,
+ G_CALLBACK (history_changed_callback),
view);
}
@@ -322,11 +322,13 @@
view = NAUTILUS_HISTORY_VIEW (object);
+#ifdef GNOME2_CONVERSION_COMPLETE
if (view->external_destroyed_flag != NULL) {
*view->external_destroyed_flag = TRUE;
}
g_object_unref (G_OBJECT (view->list));
+#endif
EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
}
Index: components/image-viewer/Makefile.am
===================================================================
RCS file: /cvs/gnome/nautilus/components/image-viewer/Makefile.am,v
retrieving revision 1.9
diff -u -r1.9 Makefile.am
--- components/image-viewer/Makefile.am 2001/11/09 01:09:32 1.9
+++ components/image-viewer/Makefile.am 2001/11/10 12:15:15
@@ -10,12 +10,12 @@
INCLUDES = \
-I$(top_srcdir) \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
- $(NAUTILUS_PRIVATE_CFLAGS) \
+ $(COMPONENT_CFLAGS) \
$(NULL)
nautilus_image_view_LDADD = \
$(top_builddir)/libnautilus/libnautilus.la \
- $(NAUTILUS_PRIVATE_LIBS) \
+ $(COMPONENT_LIBS) \
$(NULL)
serverdir = $(libdir)/bonobo/servers
Index: components/image-viewer/nautilus-image-view.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/image-viewer/nautilus-image-view.c,v
retrieving revision 1.27
diff -u -r1.27 nautilus-image-view.c
--- components/image-viewer/nautilus-image-view.c 2001/11/09 02:05:20 1.27
+++ components/image-viewer/nautilus-image-view.c 2001/11/10 12:15:16
@@ -483,19 +483,19 @@
do {
Bonobo_Stream_read (stream, LOAD_BUFFER_SIZE, &buffer, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
- gdk_pixbuf_loader_close (loader);
+ gdk_pixbuf_loader_close (loader, NULL);
g_object_unref (G_OBJECT (loader));
return;
}
if (buffer->_buffer != NULL &&
- !gdk_pixbuf_loader_write (loader, buffer->_buffer, buffer->_length)) {
+ !gdk_pixbuf_loader_write (loader, buffer->_buffer, buffer->_length, NULL)) {
CORBA_free (buffer);
if (ev->_major != CORBA_NO_EXCEPTION) {
CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
ex_Bonobo_Persist_WrongDataType, NULL);
}
- gdk_pixbuf_loader_close (loader);
+ gdk_pixbuf_loader_close (loader, NULL);
g_object_unref (G_OBJECT (loader));
return;
}
@@ -504,7 +504,7 @@
CORBA_free (buffer);
} while (len > 0);
- gdk_pixbuf_loader_close (loader);
+ gdk_pixbuf_loader_close (loader, NULL);
bod->pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
if (bod->pixbuf == NULL) {
@@ -651,7 +651,7 @@
* Notify the ControlFrame that we accept to be activated or
* deactivated (we are an acquiescent BonoboControl, yes we are).
*/
- bonobo_control_activate_notify (control, activate);
+ bonobo_control_activate_notify (control, activate, NULL);
}
static bonobo_object_data_t *
@@ -809,7 +809,7 @@
registration_id = bonobo_activation_make_registration_id ("OAFIID:nautilus_image_view_factory:61ea9ab1-e4b4-4da8-8f54-61cf6f33c4f6",
g_getenv ("DISPLAY"));
- image_factory = bonobo_generic_factory_new_multi
+ image_factory = bonobo_generic_factory_new
(registration_id,
bonobo_object_factory, NULL);
@@ -823,6 +823,7 @@
CORBA_exception_init (&ev);
/* Disable session manager connection */
+#ifdef GNOME2_CONVERSION_COMPLETE
gnome_client_disable_master_connection ();
gnomelib_register_popt_table (bonobo_activation_popt_options, bonobo_activation_get_popt_table_name ());
@@ -833,6 +834,9 @@
gdk_rgb_init ();
if (!bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL))
+ g_error (_("I could not initialize Bonobo"));
+#endif
+ if (!bonobo_ui_init ("bonobo-image-generic", VERSION, &argc, argv))
g_error (_("I could not initialize Bonobo"));
CORBA_exception_free (&ev);
Index: components/music/Makefile.am
===================================================================
RCS file: /cvs/gnome/nautilus/components/music/Makefile.am,v
retrieving revision 1.35
diff -u -r1.35 Makefile.am
--- components/music/Makefile.am 2001/11/09 01:09:38 1.35
+++ components/music/Makefile.am 2001/11/10 12:15:17
@@ -14,7 +14,8 @@
-DG_LOG_DOMAIN=\"Nautilus-Music\" \
-I$(top_srcdir) \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
- $(NAUTILUS_PRIVATE_CFLAGS) \
+ $(COMPONENT_CFLAGS) \
+ $(ESD_CFLAGS) \
$(NULL)
bin_PROGRAMS = \
@@ -59,7 +60,7 @@
nautilus_music_view_LDADD = \
$(top_builddir)/libnautilus/libnautilus.la \
$(top_builddir)/libnautilus-private/libnautilus-private.la \
- $(NAUTILUS_PRIVATE_LIBS) \
+ $(COMPONENT_CFLAGS) \
$(NULL)
serverdir = $(libdir)/bonobo/servers
Index: components/music/nautilus-music-view.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/music/nautilus-music-view.c,v
retrieving revision 1.151
diff -u -r1.151 nautilus-music-view.c
--- components/music/nautilus-music-view.c 2001/11/09 02:05:29 1.151
+++ components/music/nautilus-music-view.c 2001/11/10 12:15:22
@@ -294,7 +294,7 @@
g_signal_connect (music_view->details->event_box,
"drag_data_received",
- nautilus_music_view_drag_data_received,
+ G_CALLBACK (nautilus_music_view_drag_data_received),
music_view);
nautilus_view_construct (NAUTILUS_VIEW (music_view),
@@ -303,12 +303,12 @@
g_signal_connect (music_view,
"load_location",
- music_view_load_location_callback,
+ G_CALLBACK (music_view_load_location_callback),
music_view);
g_signal_connect (eel_get_widget_background (GTK_WIDGET (music_view->details->event_box)),
"appearance_changed",
- music_view_background_appearance_changed_callback,
+ G_CALLBACK (music_view_background_appearance_changed_callback),
music_view);
/* NOTE: we don't show the widgets until the directory has been loaded,
@@ -347,7 +347,9 @@
font_name = eel_preferences_get (NAUTILUS_PREFERENCES_LIST_VIEW_FONT);
standard_font_size = eel_preferences_get_integer (NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_ZOOM_LEVEL_FONT_SIZE);
font = nautilus_font_factory_get_font_by_family (font_name, standard_font_size);
+#ifdef GNOME2_CONVERSION_COMPLETE
eel_gtk_widget_set_font (GTK_WIDGET (music_view->details->song_list), font);
+#endif
eel_list_set_anti_aliased_mode (EEL_LIST (music_view->details->song_list), FALSE);
gdk_font_unref (font);
@@ -362,7 +364,7 @@
eel_clist_set_column_justification(EEL_CLIST(music_view->details->song_list), TIME, GTK_JUSTIFY_RIGHT);
g_signal_connect (music_view->details->song_list,
- "select-row", selection_callback, music_view);
+ "select-row", G_CALLBACK (selection_callback), music_view);
music_view->details->scroll_window = gtk_scrolled_window_new (NULL, eel_clist_get_vadjustment (EEL_CLIST (music_view->details->song_list)));
gtk_widget_show (music_view->details->scroll_window);
@@ -374,11 +376,11 @@
/* We have to know when we the adjustment is changed to cause a redraw due to a lame CList bug */
g_signal_connect (eel_clist_get_vadjustment (EEL_CLIST (music_view->details->song_list)),
- "value-changed", value_changed_callback, music_view->details->song_list);
+ "value-changed", G_CALLBACK (value_changed_callback), music_view->details->song_list);
/* connect a signal to let us know when the column titles are clicked */
g_signal_connect (music_view->details->song_list, "click_column",
- click_column_callback, music_view);
+ G_CALLBACK (click_column_callback), music_view);
gtk_widget_show (music_view->details->song_list);
@@ -398,7 +400,7 @@
gtk_widget_show (label);
gtk_container_add (GTK_CONTAINER(button), label);
gtk_box_pack_end (GTK_BOX(music_view->details->control_box), music_view->details->image_box, FALSE, FALSE, 4);
- g_signal_connect (button, "clicked", image_button_callback, music_view);
+ g_signal_connect (button, "clicked", G_CALLBACK (image_button_callback), music_view);
/* prepare ourselves to receive dropped objects */
gtk_drag_dest_set (GTK_WIDGET (music_view->details->event_box),
@@ -1782,8 +1784,7 @@
/* iterate through the directory, collecting mp3 files and extracting id3 data if present */
result = gnome_vfs_directory_list_load (&list, uri,
GNOME_VFS_FILE_INFO_GET_MIME_TYPE
- | GNOME_VFS_FILE_INFO_FOLLOW_LINKS,
- NULL);
+ | GNOME_VFS_FILE_INFO_FOLLOW_LINKS);
if (result != GNOME_VFS_OK) {
path = gnome_vfs_get_local_path_from_uri (uri);
message = g_strdup_printf (_("Sorry, but there was an error reading %s."), path);
Index: components/news/Makefile.am
===================================================================
RCS file: /cvs/gnome/nautilus/components/news/Makefile.am,v
retrieving revision 1.9
diff -u -r1.9 Makefile.am
--- components/news/Makefile.am 2001/11/09 01:09:39 1.9
+++ components/news/Makefile.am 2001/11/10 12:15:22
@@ -8,13 +8,13 @@
-DNAUTILUS_PIXMAPDIR=\""$(datadir)/pixmaps/nautilus"\" \
-DDATADIR=\""$(datadir)"\" \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
- $(NAUTILUS_PRIVATE_CFLAGS) \
+ $(COMPONENT_CFLAGS) \
$(NULL)
LDADD=\
$(top_builddir)/libnautilus/libnautilus.la \
$(top_builddir)/libnautilus-private/libnautilus-private.la \
- $(NAUTILUS_PRIVATE_LIBS) \
+ $(COMPONENT_LIBS) \
$(NULL)
nautilus_news_SOURCES=nautilus-news.c nautilus-news-pixmaps.h
Index: components/news/nautilus-news.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/news/nautilus-news.c,v
retrieving revision 1.46
diff -u -r1.46 nautilus-news.c
--- components/news/nautilus-news.c 2001/11/09 02:05:30 1.46
+++ components/news/nautilus-news.c 2001/11/10 12:15:27
@@ -28,6 +28,7 @@
*/
#include <config.h>
+#include <time.h>
#include <gtk/gtkcheckbutton.h>
#include <gtk/gtkdrawingarea.h>
@@ -35,8 +36,11 @@
#include <gtk/gtkhbbox.h>
#include <gtk/gtkmain.h>
#include <gtk/gtkscrolledwindow.h>
+#include <gtk/gtkstock.h>
#include <gtk/gtkvbox.h>
+#include <bonobo/bonobo-property-bag.h>
+
#include <libgnome/gnome-i18n.h>
#include <libgnome/gnome-util.h>
@@ -1021,10 +1025,10 @@
tab_image_arg = bonobo_arg_new (BONOBO_ARG_STRING);
BONOBO_ARG_SET_STRING (tab_image_arg, tab_image);
-
+#ifdef GNOME2_CONVERSION_COMPLETE
bonobo_property_bag_notify_listeners (news_data->property_bag,
"tab_image", tab_image_arg, NULL);
-
+#endif
bonobo_arg_release (tab_image_arg);
g_free (tab_image);
}
@@ -1428,7 +1432,8 @@
if (uri_node != NULL) {
image_uri = xmlNodeGetContent (uri_node);
if (image_uri != NULL) {
- channel_data->load_image_handle = eel_gdk_pixbuf_load_async (image_uri, rss_logo_callback, channel_data);
+ channel_data->load_image_handle = eel_gdk_pixbuf_load_async (image_uri,
+ GNOME_VFS_PRIORITY_DEFAULT, rss_logo_callback, channel_data);
got_image = TRUE;
xmlFree (image_uri);
}
@@ -1454,7 +1459,8 @@
if (image_node != NULL) {
image_uri = xmlNodeGetContent (image_node);
if (image_uri != NULL) {
- channel_data->load_image_handle = eel_gdk_pixbuf_load_async (image_uri, rss_logo_callback, channel_data);
+ channel_data->load_image_handle = eel_gdk_pixbuf_load_async (image_uri,
+ GNOME_VFS_PRIORITY_DEFAULT, rss_logo_callback, channel_data);
got_image = TRUE;
xmlFree (image_uri);
}
@@ -1525,7 +1531,8 @@
old_items = channel_data->items;
channel_data->items = NULL;
- current_node = rss_document->root;
+ current_node = xmlDocGetRootElement (rss_document);
+
item_count = extract_items (channel_data, current_node);
/* if we couldn't find any items at the main level, look inside the channel node */
@@ -1562,7 +1569,8 @@
/* load the uri asynchronously, calling a completion routine when completed */
channel_data->update_in_progress = TRUE;
- channel_data->load_file_handle = eel_read_entire_file_async (channel_data->uri, rss_read_done_callback, channel_data);
+ channel_data->load_file_handle = eel_read_entire_file_async (channel_data->uri,
+ GNOME_VFS_PRIORITY_DEFAULT, rss_read_done_callback, channel_data);
/* put up a title that's displayed while we wait */
title = g_strdup_printf (_("Loading %s"), channel_data->name);
@@ -1898,8 +1906,8 @@
int channel_count, byte_count;
gboolean got_xml_file;
- site_name = gtk_entry_get_text (GTK_ENTRY (news->item_name_field));
- site_location = gtk_entry_get_text (GTK_ENTRY (news->item_location_field));
+ site_name = (char *) gtk_entry_get_text (GTK_ENTRY (news->item_name_field));
+ site_location = (char *)gtk_entry_get_text (GTK_ENTRY (news->item_location_field));
/* make sure there's something in the fields */
if (site_name == NULL || strlen (site_name) == 0) {
@@ -2127,10 +2135,10 @@
/* set up user data to use in toggle handler */
gtk_object_set_user_data (GTK_OBJECT (check_button), news_data);
- g_object_set_data (G_OBJECT (check_button),
+ g_object_set_data_full (G_OBJECT (check_button),
"channel_name",
g_strdup (channel_name),
- (GtkDestroyNotify) g_free);
+ g_free);
}
/* here's the routine that loads and parses the xml file, then iterates through it
@@ -2488,19 +2496,22 @@
news->timer_task = gtk_timeout_add (10000, check_for_updates, news);
/* arrange for notification when we're resized */
- g_signal_connect (news->news_display, "size_allocate", news_display_size_allocate, news);
- g_signal_connect (news->empty_message, "size_allocate", empty_message_size_allocate, news);
+ g_signal_connect (news->news_display, "size_allocate", G_CALLBACK (news_display_size_allocate), news);
+ g_signal_connect (news->empty_message, "size_allocate", G_CALLBACK (empty_message_size_allocate), news);
/* Create the nautilus view CORBA object. */
news->view = nautilus_view_new (main_container);
- g_signal_connect (news->view, "destroy", do_destroy, news);
+ g_signal_connect (news->view, "destroy", G_CALLBACK (do_destroy), news);
g_signal_connect (news->view, "load_location",
- nautilus_news_load_location, news);
+ G_CALLBACK (nautilus_news_load_location), news);
/* allocate a property bag to reflect the TAB_IMAGE property */
news->property_bag = bonobo_property_bag_new (get_bonobo_properties, set_bonobo_properties, news);
+
+#ifdef GNOME2_CONVERSION_COMPLETE
bonobo_control_set_properties (nautilus_view_get_bonobo_control (news->view), news->property_bag);
+#endif
bonobo_property_bag_add (news->property_bag, "tab_image", TAB_IMAGE, BONOBO_ARG_STRING, NULL,
_("image indicating that the news has changed"), 0);
bonobo_property_bag_add (news->property_bag, "close", CLOSE_NOTIFY,
Index: components/notes/Makefile.am
===================================================================
RCS file: /cvs/gnome/nautilus/components/notes/Makefile.am,v
retrieving revision 1.23
diff -u -r1.23 Makefile.am
--- components/notes/Makefile.am 2001/11/09 01:09:40 1.23
+++ components/notes/Makefile.am 2001/11/10 12:15:27
@@ -6,13 +6,14 @@
-DG_LOG_DOMAIN=\"Nautilus-Notes\" \
-I$(top_srcdir) \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
- $(NAUTILUS_PRIVATE_CFLAGS) \
- $(NULL)
+ $(COMPONENT_CFLAGS) \
+ $(NULL) \
+ -DGTK_ENABLE_BROKEN
LDADD=\
$(top_builddir)/libnautilus/libnautilus.la \
$(top_builddir)/libnautilus-private/libnautilus-private.la \
- $(NAUTILUS_PRIVATE_LIBS) \
+ $(COMPONENT_CFLAGS) \
$(NULL)
nautilus_notes_SOURCES=nautilus-notes.c
Index: components/notes/nautilus-notes.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/notes/nautilus-notes.c,v
retrieving revision 1.66
diff -u -r1.66 nautilus-notes.c
--- components/notes/nautilus-notes.c 2001/11/09 02:05:31 1.66
+++ components/notes/nautilus-notes.c 2001/11/10 12:15:28
@@ -32,8 +32,10 @@
#include <eel/eel-gtk-extensions.h>
#include <eel/eel-string.h>
#include <gtk/gtkmain.h>
-#include <gtk/gtktext.h>
+#include <gtk/gtktextbuffer.h>
+#include <gtk/gtktextview.h>
#include <gtk/gtkvbox.h>
+#include <bonobo/bonobo-property-bag.h>
#include <libnautilus-private/nautilus-file-attributes.h>
#include <libnautilus-private/nautilus-file.h>
#include <libnautilus-private/nautilus-font-factory.h>
@@ -62,6 +64,7 @@
NautilusView *view;
BonoboPropertyBag *property_bag;
GtkWidget *note_text_field;
+ GtkTextBuffer *text_buffer;
char *uri;
NautilusFile *file;
guint save_timeout_id;
@@ -149,7 +152,6 @@
load_note_text_from_metadata (NautilusFile *file,
Notes *notes)
{
- int position;
char *saved_text;
g_assert (NAUTILUS_IS_FILE (file));
@@ -166,14 +168,8 @@
g_free (notes->previous_saved_text);
notes->previous_saved_text = saved_text;
cancel_pending_save (notes);
-
- gtk_editable_delete_text (GTK_EDITABLE (notes->note_text_field), 0, -1);
-
- position = 0;
- gtk_editable_insert_text (GTK_EDITABLE (notes->note_text_field),
- saved_text,
- strlen (saved_text),
- &position);
+
+ gtk_text_buffer_set_text (notes->text_buffer, saved_text, -1);
} else {
g_free (saved_text);
}
@@ -208,7 +204,7 @@
done_with_file (notes);
notes->file = nautilus_file_get (notes->uri);
- gtk_editable_delete_text (GTK_EDITABLE (notes->note_text_field), 0, -1);
+ gtk_text_buffer_set_text (notes->text_buffer, NULL, -1);
if (notes->file == NULL) {
return;
@@ -242,10 +238,10 @@
tab_image_arg = bonobo_arg_new (BONOBO_ARG_STRING);
BONOBO_ARG_SET_STRING (tab_image_arg, tab_image);
-
+#ifdef GNOME2_CONVERSION_COMPLETE
bonobo_property_bag_notify_listeners (notes->property_bag,
"tab_image", tab_image_arg, NULL);
-
+#endif
bonobo_arg_release (tab_image_arg);
g_free (tab_image);
}
@@ -256,6 +252,8 @@
notes_save_metainfo (Notes *notes)
{
char *notes_text;
+ GtkTextIter start_iter;
+ GtkTextIter end_iter;
if (notes->file == NULL) {
return;
@@ -266,16 +264,22 @@
/* Block the handler, so we don't respond to our own change.
*/
gtk_signal_handler_block_by_func (GTK_OBJECT (notes->file),
- load_note_text_from_metadata,
+ G_CALLBACK (load_note_text_from_metadata),
notes);
-
- notes_text = gtk_editable_get_chars (GTK_EDITABLE (notes->note_text_field), 0 , -1);
- nautilus_file_set_metadata (notes->file,
+
+ gtk_text_buffer_get_start_iter (notes->text_buffer, &start_iter);
+ gtk_text_buffer_get_end_iter (notes->text_buffer, &end_iter);
+ notes_text = gtk_text_buffer_get_text (notes->text_buffer,
+ &start_iter,
+ &end_iter,
+ FALSE);
+
+ nautilus_file_set_metadata (notes->file,
NAUTILUS_METADATA_KEY_ANNOTATION,
NULL, notes_text);
gtk_signal_handler_unblock_by_func (GTK_OBJECT (notes->file),
- load_note_text_from_metadata,
+ G_CALLBACK (load_note_text_from_metadata),
notes);
notify_listeners_if_changed (notes, notes_text);
@@ -356,26 +360,25 @@
GtkWidget *vbox;
Notes *notes;
EelBackground *background;
- GdkFont *font;
-
notes = g_new0 (Notes, 1);
notes->uri = g_strdup ("");
/* allocate a vbox to hold all of the UI elements */
vbox = gtk_vbox_new (FALSE, 0);
-
+
/* create the text container */
- notes->note_text_field = gtk_text_new (NULL, NULL);
-
+ notes->text_buffer = gtk_text_buffer_new (NULL);
+ notes->note_text_field = gtk_text_view_new_with_buffer (notes->text_buffer);
+
+#ifdef GNOME2_CONVERSION_COMPLETE
font = nautilus_font_factory_get_font_from_preferences (14);
eel_gtk_widget_set_font (notes->note_text_field, font);
gdk_font_unref (font);
-
- gtk_text_set_editable (GTK_TEXT (notes->note_text_field), TRUE);
+#endif
+ gtk_text_view_set_editable (GTK_TEXT_VIEW (notes->note_text_field), TRUE);
gtk_box_pack_start (GTK_BOX (vbox), notes->note_text_field, TRUE, TRUE, 0);
background = eel_get_widget_background (notes->note_text_field);
eel_background_set_color (background, NOTES_DEFAULT_BACKGROUND_COLOR);
-
g_signal_connect (notes->note_text_field, "focus_out_event",
G_CALLBACK (on_text_field_focus_out_event),
notes);
@@ -387,24 +390,26 @@
/* Create CORBA object. */
notes->view = nautilus_view_new (vbox);
- g_signal_connect (notes->view, "destroy", do_destroy, notes);
+ g_signal_connect (notes->view, "destroy", G_CALLBACK (do_destroy), notes);
/* allocate a property bag to reflect the TAB_IMAGE property */
notes->property_bag = bonobo_property_bag_new (get_bonobo_properties, set_bonobo_properties, notes);
+#ifdef GNOME2_CONVERSION_COMPLETE
bonobo_control_set_properties (nautilus_view_get_bonobo_control (notes->view), notes->property_bag);
-
bonobo_property_bag_add (notes->property_bag, "tab_image", TAB_IMAGE, BONOBO_ARG_STRING, NULL,
"image indicating that a note is present", 0);
-
+#endif
/* handle events */
g_signal_connect (notes->view, "load_location",
- notes_load_location, notes);
+ G_CALLBACK (notes_load_location), notes);
/* handle selections */
+#ifdef GNOME2_CONVERSION_COMPLETE
nautilus_clipboard_set_up_editable_in_control
(GTK_EDITABLE (notes->note_text_field),
nautilus_view_get_bonobo_control (notes->view),
FALSE);
+#endif
/* FIXME bugzilla.gnome.org 44436:
* Undo not working in notes-view.
Index: components/text/Makefile.am
===================================================================
RCS file: /cvs/gnome/nautilus/components/text/Makefile.am,v
retrieving revision 1.12
diff -u -r1.12 Makefile.am
--- components/text/Makefile.am 2001/11/09 01:09:45 1.12
+++ components/text/Makefile.am 2001/11/10 12:15:28
@@ -7,7 +7,8 @@
-DDATADIR=\""$(datadir)"\" \
-I$(top_srcdir) \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
- $(NAUTILUS_PRIVATE_CFLAGS) \
+ $(COMPONENT_CFLAGS) \
+ -DGTK_ENABLE_BROKEN \
$(NULL)
bin_PROGRAMS = \
@@ -21,7 +22,7 @@
nautilus_text_view_LDADD = \
$(top_builddir)/libnautilus/libnautilus.la \
$(top_builddir)/libnautilus-private/libnautilus-private.la \
- $(NAUTILUS_PRIVATE_LIBS) \
+ $(COMPONENT_LIBS) \
$(NULL)
uidir = $(datadir)/gnome-2.0/ui
Index: components/throbber/Makefile.am
===================================================================
RCS file: /cvs/gnome/nautilus/components/throbber/Makefile.am,v
retrieving revision 1.10
diff -u -r1.10 Makefile.am
--- components/throbber/Makefile.am 2001/11/09 01:09:58 1.10
+++ components/throbber/Makefile.am 2001/11/10 12:15:28
@@ -5,7 +5,7 @@
-DDATADIR=\""$(datadir)"\" \
-I$(top_srcdir) \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
- $(NAUTILUS_PRIVATE_CFLAGS) \
+ $(COMPONENT_CFLAGS) \
$(NULL)
bin_PROGRAMS = \
@@ -19,7 +19,7 @@
nautilus_throbber_LDADD = \
$(top_builddir)/libnautilus/libnautilus.la \
$(top_builddir)/libnautilus-private/libnautilus-private.la \
- $(NAUTILUS_PRIVATE_LIBS) \
+ $(COMPONENT_LIBS)
$(NULL)
serverdir = $(libdir)/bonobo/servers
Index: components/throbber/main.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/throbber/main.c,v
retrieving revision 1.13
diff -u -r1.13 main.c
--- components/throbber/main.c 2001/11/09 02:05:33 1.13
+++ components/throbber/main.c 2001/11/10 12:15:29
@@ -58,7 +58,7 @@
bonobo_control = nautilus_throbber_get_control (throbber);
- g_signal_connect (bonobo_control, "destroy", throbber_object_destroyed, NULL);
+ g_signal_connect (bonobo_control, "destroy", G_CALLBACK (throbber_object_destroyed), NULL);
return bonobo_control;
}
@@ -67,7 +67,6 @@
main (int argc, char *argv[])
{
BonoboGenericFactory *factory;
- CORBA_ORB orb;
char *registration_id;
/* Make criticals and warnings stop in the debugger if NAUTILUS_DEBUG is set.
@@ -78,6 +77,7 @@
}
/* Disable session manager connection */
+#ifdef GNOME2_CONVERSION_COMPLETE
gnome_client_disable_master_connection ();
gnomelib_register_popt_table (bonobo_activation_popt_options, bonobo_activation_get_popt_table_name ());
@@ -88,11 +88,13 @@
gdk_rgb_init ();
gnome_vfs_init ();
bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL);
+#endif
+ bonobo_ui_init ("nautilus-throbber", VERSION, &argc, argv);
nautilus_global_preferences_init ();
registration_id = bonobo_activation_make_registration_id ("OAFIID:nautilus_throbber_factory", g_getenv ("DISPLAY"));
- factory = bonobo_generic_factory_new_multi (registration_id,
+ factory = bonobo_generic_factory_new (registration_id,
throbber_make_object,
NULL);
g_free (registration_id);
Index: components/throbber/nautilus-throbber.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/throbber/nautilus-throbber.c,v
retrieving revision 1.18
diff -u -r1.18 nautilus-throbber.c
--- components/throbber/nautilus-throbber.c 2001/11/06 18:40:00 1.18
+++ components/throbber/nautilus-throbber.c 2001/11/10 12:15:30
@@ -69,8 +69,10 @@
static void nautilus_throbber_class_init (NautilusThrobberClass *klass);
static void nautilus_throbber_init (NautilusThrobber *throbber);
static void nautilus_throbber_destroy (GtkObject *object);
+#ifdef GNOME2_CONVERSION_COMPLETE
static void nautilus_throbber_draw (GtkWidget *widget,
GdkRectangle *box);
+#endif
static int nautilus_throbber_expose (GtkWidget *widget,
GdkEventExpose *event);
static gboolean nautilus_throbber_button_press_event (GtkWidget *widget,
@@ -101,7 +103,9 @@
object_class->destroy = nautilus_throbber_destroy;
+#ifdef GNOME2_CONVERSION_COMPLETE
widget_class->draw = nautilus_throbber_draw;
+#endif
widget_class->expose_event = nautilus_throbber_expose;
widget_class->button_press_event = nautilus_throbber_button_press_event;
widget_class->button_release_event = nautilus_throbber_button_release_event;
@@ -197,9 +201,9 @@
nautilus_throbber_destroy (GtkObject *object)
{
NautilusThrobber *throbber = NAUTILUS_THROBBER (object);
-
+#ifdef GNOME2_CONVERSION_COMPLETE
nautilus_bonobo_object_force_destroy_later (throbber->details->control);
-
+#endif
nautilus_throbber_remove_update_callback (throbber);
nautilus_throbber_unload_images (throbber);
@@ -296,16 +300,17 @@
throbber->details->control = BONOBO_OBJECT (bonobo_control_new (widget));
gtk_signal_connect_while_alive (GTK_OBJECT (throbber->details->control),
"destroy",
- null_pointer_callback,
+ GTK_SIGNAL_FUNC (null_pointer_callback),
&throbber->details->control,
GTK_OBJECT (throbber));
/* attach a property bag with the configure property */
throbber->details->property_bag = bonobo_property_bag_new (get_bonobo_properties,
set_bonobo_properties, throbber);
+#ifdef GNOME2_CONVERSION_COMPLETE
bonobo_control_set_properties (BONOBO_CONTROL (throbber->details->control),
throbber->details->property_bag);
-
+#endif
bonobo_property_bag_add (throbber->details->property_bag, "throbbing", THROBBING, BONOBO_ARG_BOOLEAN, NULL,
"Throbber active", 0);
bonobo_property_bag_add (throbber->details->property_bag, "location", LOCATION, BONOBO_ARG_STRING, NULL,
@@ -424,6 +429,7 @@
g_object_unref (G_OBJECT (pixbuf));
}
+#ifdef GNOME2_CONVERSION_COMPLETE
static void
nautilus_throbber_draw (GtkWidget *widget, GdkRectangle *box)
{
@@ -432,6 +438,7 @@
draw_throbber_image (widget, box);
}
+#endif
/* handle expose events */
@@ -696,8 +703,10 @@
if (location != NULL) {
location_arg = bonobo_arg_new (BONOBO_ARG_STRING);
BONOBO_ARG_SET_STRING (location_arg, location);
+#ifdef GNOME2_CONVERSION_COMPLETE
bonobo_property_bag_notify_listeners
(throbber->details->property_bag, "location", location_arg, NULL);
+#endif
bonobo_arg_release (location_arg);
g_free (location);
}
Index: components/tree/Makefile.am
===================================================================
RCS file: /cvs/gnome/nautilus/components/tree/Makefile.am,v
retrieving revision 1.20
diff -u -r1.20 Makefile.am
--- components/tree/Makefile.am 2001/11/09 01:09:58 1.20
+++ components/tree/Makefile.am 2001/11/10 12:15:30
@@ -4,7 +4,7 @@
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DG_LOG_DOMAIN=\"Nautilus-Tree\" \
-I$(top_srcdir) \
- $(NAUTILUS_PRIVATE_CFLAGS) \
+ $(COMPONENT_CFLAGS) \
$(NULL)
TREE_VIEW_COMMON_SOURCES = \
@@ -31,6 +31,7 @@
libnautilus_tree_view_la_SOURCES = \
$(TREE_VIEW_COMMON_SOURCES) \
+ $(COMPONENT_LIBS) \
libmain.c \
$(NULL)
Index: components/tree/libmain.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/tree/libmain.c,v
retrieving revision 1.11
diff -u -r1.11 libmain.c
--- components/tree/libmain.c 2001/11/09 02:05:34 1.11
+++ components/tree/libmain.c 2001/11/10 12:15:30
@@ -64,12 +64,12 @@
(BONOBO_OBJECT (view)), ev);
}
-static const OAFPluginObject tree_plugin_list[] = {
+static const BonoboActivationPluginObject tree_plugin_list[] = {
{ TREE_VIEW_IID, tree_shlib_make_object },
{ NULL }
};
-const OAFPlugin OAF_Plugin_info = {
+const BonoboActivationPlugin BonoboActivation_Plugin_info = {
tree_plugin_list,
"Nautilus Tree Sidebar Panel"
};
Index: libnautilus/nautilus-view-standard-main.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus/nautilus-view-standard-main.c,v
retrieving revision 1.14
diff -u -r1.14 nautilus-view-standard-main.c
--- libnautilus/nautilus-view-standard-main.c 2001/11/09 02:05:36 1.14
+++ libnautilus/nautilus-view-standard-main.c 2001/11/10 12:15:35
@@ -33,6 +33,7 @@
#include <X11/Xlib.h>
#include <bonobo/bonobo-generic-factory.h>
#include <bonobo/bonobo-main.h>
+#include <bonobo/bonobo-ui-main.h>
#include <gdk/gdkx.h>
#include <gtk/gtkmain.h>
#include <gtk/gtksignal.h>
@@ -155,10 +156,11 @@
GVoidFunc post_initialize_callback,
void *user_data)
{
- CORBA_ORB orb;
BonoboGenericFactory *factory;
CallbackData callback_data;
+#ifdef GNOME2_CONVERSION_COMPLETE
char *registration_id;
+#endif
g_return_val_if_fail (executable_name != NULL, EXIT_FAILURE);
g_return_val_if_fail (version != NULL, EXIT_FAILURE);
@@ -192,9 +194,8 @@
#if GNOME2_CONVERSION_COMPLETE
gnomelib_register_popt_table (bonobo_activation_popt_options, bonobo_activation_get_popt_table_name ());
-#endif
orb = bonobo_activation_init (argc, argv);
-
+#endif
/* Initialize libraries. */
#if GNOME2_CONVERSION_COMPLETE
gnome_init (executable_name, version, argc, argv);
@@ -203,7 +204,9 @@
gnome_vfs_init ();
#if GNOME2_CONVERSION_COMPLETE
bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL);
+
#endif
+ bonobo_ui_init (executable_name, version, &argc, argv);
if (post_initialize_callback != NULL) {
(* post_initialize_callback) ();
@@ -217,13 +220,18 @@
callback_data.delayed_quit_timeout_id = 0;
/* Create the factory. */
+
+#ifdef GNOME2_CONVERSION_COMPLETE
registration_id = bonobo_activation_make_registration_id (factory_iid,
DisplayString (GDK_DISPLAY ()));
- factory = bonobo_generic_factory_new (registration_id,
+#endif
+
+ factory = bonobo_generic_factory_new (factory_iid,
make_object,
&callback_data);
+#ifdef GNOME2_CONVERSION_COMPLETE
g_free (registration_id);
-
+#endif
/* Loop until we have no more objects. */
do {
bonobo_main ();
Index: src/nautilus-window-toolbars.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-window-toolbars.c,v
retrieving revision 1.85
diff -u -r1.85 nautilus-window-toolbars.c
--- src/nautilus-window-toolbars.c 2001/11/09 02:05:50 1.85
+++ src/nautilus-window-toolbars.c 2001/11/10 12:15:38
@@ -390,9 +390,7 @@
nautilus_window_initialize_toolbars (NautilusWindow *window)
{
CORBA_Environment ev;
-#ifdef GNOME2_CONVERSION_COMPLETE
char *exception_as_text;
-#endif
CORBA_exception_init (&ev);
@@ -407,7 +405,6 @@
* at realize time, but another way is to special-case the
* desktop window.
*/
-#ifdef GNOME2_CONVERSION_COMPLETE
if (!NAUTILUS_IS_DESKTOP_WINDOW (window)) {
window->throbber = bonobo_get_object ("OAFIID:nautilus_throbber", "IDL:Bonobo/Control:1.0", &ev);
if (BONOBO_EX (&ev)) {
@@ -418,7 +415,6 @@
window->throbber = CORBA_OBJECT_NIL;
}
}
-#endif
nautilus_window_ui_freeze (window);
Index: src/nautilus-window.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-window.c,v
retrieving revision 1.354
diff -u -r1.354 nautilus-window.c
--- src/nautilus-window.c 2001/11/09 02:05:50 1.354
+++ src/nautilus-window.c 2001/11/10 12:15:42
@@ -550,6 +550,7 @@
return FALSE;
}
+
/* handle bonobo events from the throbber -- since they can come in at
any time right in the middle of things, defer until idle */
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
