GNOME.org
 

[Nautilus-list] Another patch for various components

More work towards gettting the components working, the help component
now works and tree component compiles and links,

This patch also is needed to get the throbber working, an oversight of
mine from last time

thanks,

Thomas





Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/nautilus/ChangeLog,v
retrieving revision 1.4841
diff -r1.4841 ChangeLog
0a1,16
> 2001-11-11  Thomas Canty  <tommydal optushome com au>
> 	* configure.in: Initialise the gnome-vfs-module package,
> 	which is required for the help component
> 
>   	* components/help/*.[c|am]: Get the help component
> 	working.
> 
> 	* components/text/nautilus-text-view.c: Some work towards
> 	getting this file compiling.
> 
> 	* components/throbber/main.c: register the factory iid 
> 	directly.
> 
> 	* components/tree/*.c: get the tree component compiling 
> 	and linking.
> 	
Index: configure.in
===================================================================
RCS file: /cvs/gnome/nautilus/configure.in,v
retrieving revision 1.383
diff -r1.383 configure.in
535c535
< COMPONENT_MODULES="eel-2.0 libbonoboui-2.0"
---
> COMPONENT_MODULES="eel-2.0 libbonoboui-2.0 gnome-vfs-module-2.0"
Index: components/help/Makefile.am
===================================================================
RCS file: /cvs/gnome/nautilus/components/help/Makefile.am,v
retrieving revision 1.42
diff -r1.42 Makefile.am
45c45
< test_help_method_LDADD = 
---
> test_help_method_LDADD = $(COMPONENT_LIBS)
Index: components/help/help-method.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/help/help-method.c,v
retrieving revision 1.36
diff -r1.36 help-method.c
31a32
> #include <libgnomevfs/gnome-vfs-mime.h>
207c208
< 	if (!g_file_test (file, G_FILE_TEST_ISFILE | G_FILE_TEST_ISLINK)) { 
---
> 	if (!g_file_test (file, G_FILE_TEST_IS_REGULAR | G_FILE_TEST_IS_SYMLINK)) { 
212c213
< 	mime_type = gnome_vfs_get_file_mime_type (file, NULL, FALSE);
---
> 	mime_type = gnome_vfs_mime_type_from_name (file);
400c401
< 	language_list = gnome_i18n_get_language_list ("LC_MESSAGES");
---
> 	language_list = (GList *) gnome_i18n_get_language_list ("LC_MESSAGES");
Index: components/help/hyperbola-filefmt.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/help/hyperbola-filefmt.c,v
retrieving revision 1.41
diff -r1.41 hyperbola-filefmt.c
27a28
> #include <eel/eel-string.h>
330c331
< 				     (gnome_i18n_get_language_list (NULL)));
---
> 				     ((GList *) gnome_i18n_get_language_list (NULL)));
1456c1457
< 	for (node = gnome_i18n_get_language_list ("LC_MESSAGES");
---
> 	for (node = (GList *) gnome_i18n_get_language_list ("LC_MESSAGES");
1772c1773
< 		locales = gnome_i18n_get_language_list ("LC_MESSAGES");
---
> 		locales = (GList *) gnome_i18n_get_language_list ("LC_MESSAGES");
Index: components/help/hyperbola-main.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/help/hyperbola-main.c,v
retrieving revision 1.30
diff -r1.30 hyperbola-main.c
32a33,34
> #define IID "OAFIID:hyperbola_factory:02b54c63-101b-4b27-a285-f99ed332ecdb"
> 
91a94
> #ifdef GNOME2_CONVERSION_COMPLETE
93c96
< 
---
> #endif
133c136
< 		bonobo_generic_factory_new (registration_id, make_obj,
---
> 		bonobo_generic_factory_new (IID, make_obj,
134a138
> #ifdef GNOME2_CONVERSION_COMPLETE
136c140
< 
---
> #endif
Index: components/help/hyperbola-nav-index.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/help/hyperbola-nav-index.c,v
retrieving revision 1.33
diff -r1.33 hyperbola-nav-index.c
11a12
> #include <eel/eel-string.h>
790c791
< 	stxt = gtk_entry_get_text (GTK_ENTRY (hni->ent));
---
> 	stxt = (char *) gtk_entry_get_text (GTK_ENTRY (hni->ent));
935c936
< characters (SAXParseInfo * spi, const gchar * chars, int len)
---
> parse_characters (SAXParseInfo * spi, const gchar * chars, int len)
956c957
<         g_assert (s->len == (int) strlen (s->str));
---
>         g_assert (s->len == (guint) strlen (s->str));
1564c1565
<         (charactersSAXFunc) characters, /* characters */
---
>         (charactersSAXFunc) parse_characters, /* characters */
2047c2048
< 	g_signal_connect(hni->none_button"clicked",
---
> 	g_signal_connect(hni->none_button, "clicked",
2172c2173
< 	tmp = gtk_entry_get_text (GTK_ENTRY (hni->ent));
---
> 	tmp = (char *) gtk_entry_get_text (GTK_ENTRY (hni->ent));
2283c2284
< 				hyperbola_navigation_index_ent_changed, hni);
---
> 				G_CALLBACK (hyperbola_navigation_index_ent_changed), hni);
2285c2286
< 				hyperbola_navigation_index_ent_activate, hni);
---
> 				G_CALLBACK (hyperbola_navigation_index_ent_activate), hni);
Index: components/help/hyperbola-nav-search.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/help/hyperbola-nav-search.c,v
retrieving revision 1.18
diff -r1.18 hyperbola-nav-search.c
45c45
< 	line = gtk_entry_get_text (GTK_ENTRY (hns->ent));
---
> 	line = (char *) gtk_entry_get_text (GTK_ENTRY (hns->ent));
Index: components/help/hyperbola-nav-tree.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/help/hyperbola-nav-tree.c,v
retrieving revision 1.40
diff -r1.40 hyperbola-nav-tree.c
14a15
> #include <string.h>
265c266
< 			    hyperbola_navigation_tree_select_row, contents);
---
> 			    G_CALLBACK (hyperbola_navigation_tree_select_row), contents);
267c268
< 			    hyperbola_navigation_tree_destroy, contents);
---
> 			    G_CALLBACK (hyperbola_navigation_tree_destroy), contents);
279c280
< 			    hyperbola_navigation_tree_select_row, contents);
---
> 			    G_CALLBACK (hyperbola_navigation_tree_select_row), contents);
281c282
< 			    hyperbola_navigation_tree_destroy, contents);
---
> 			    G_CALLBACK (hyperbola_navigation_tree_destroy), contents);
501,502c502,503
< 	gtk_signal_connect(GTK_OBJECT(notebook), "switch_page",
< 				hyperbola_navigation_notebook_page_changed, index);
---
> 	g_signal_connect(notebook, "switch_page",
> 				G_CALLBACK (hyperbola_navigation_notebook_page_changed), index);
505c506
<                             hyperbola_navigation_index_clist_select_row, index);
---
>                             G_CALLBACK (hyperbola_navigation_index_clist_select_row), index);
512c513
< 	gtk_signal_connect(GTK_OBJECT(nautilus_view_get_bonobo_control(
---
> 	g_signal_connect((nautilus_view_get_bonobo_control(
514c515
< 				   					merge_items_callback, index);
---
> 				   					G_CALLBACK (merge_items_callback), index);
516c517
< 			    hyperbola_navigation_tree_load_location, contents);
---
> 			    G_CALLBACK (hyperbola_navigation_tree_load_location), contents);
Index: components/text/nautilus-text-view.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/text/nautilus-text-view.c,v
retrieving revision 1.39
diff -r1.39 nautilus-text-view.c
40a41,42
> 
> #ifdef GNOME2_CONVERSION_COMPLETE
41a44
> #endif
182c185
< 			    text_view_load_location_callback, 
---
> 			    G_CALLBACK (text_view_load_location_callback), 
226c229
<         g_signal_connect (nautilus_view_get_bonobo_control (NAUTILUS_VIEW (text_view))),
---
>         g_signal_connect (nautilus_view_get_bonobo_control (NAUTILUS_VIEW (text_view)),
228c231
<                           merge_bonobo_menu_items,
---
>                           G_CALLBACK (merge_bonobo_menu_items),
395a399
> 			      GNOME_VFS_PRIORITY_DEFAULT,
549c553
< service_menu_item_parameters_free (ServiceMenuItemParameters *parameters)
---
> service_menu_item_parameters_free (gpointer data, GClosure *closure)
550a555,556
> 	ServiceMenuItemParameters *parameters = (ServiceMenuItemParameters *) data;
> 
609c615
< 							   handle_service_menu_item,
---
> 							   g_cclosure_new (G_CALLBACK (handle_service_menu_item),
611c617
< 							  (GDestroyNotify) service_menu_item_parameters_free);	   
---
> 							   service_menu_item_parameters_free));	   
649c655
< 	result = gnome_vfs_directory_list_load (&file_list, services_uri, GNOME_VFS_FILE_INFO_DEFAULT, NULL);
---
> 	result = gnome_vfs_directory_list_load (&file_list, services_uri, GNOME_VFS_FILE_INFO_DEFAULT);
782c788
<                                     "ui_event", handle_ui_event, text_view);
---
>                                     "ui_event", G_CALLBACK (handle_ui_event), text_view);
Index: components/throbber/main.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/throbber/main.c,v
retrieving revision 1.14
diff -r1.14 main.c
69a70
> #ifdef GNOME2_CONVERSION_COMPLETE
70a72
> #endif
95c97,98
< 	
---
> 
> #ifdef GNOME2_CONVERSION_COMPLETE
97c100,101
< 	factory = bonobo_generic_factory_new (registration_id, 
---
> #endif
> 	factory = bonobo_generic_factory_new ("OAFIID:nautilus_throbber_factory", 
99a104,105
> 
> #ifdef GNOME2_CONVERSION_COMPLETE
100a107
> #endif
Index: components/tree/Makefile.am
===================================================================
RCS file: /cvs/gnome/nautilus/components/tree/Makefile.am,v
retrieving revision 1.21
diff -r1.21 Makefile.am
7a8
> 	-DGTK_ENABLE_BROKEN				\
Index: components/tree/nautilus-tree-model.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/tree/nautilus-tree-model.c,v
retrieving revision 1.57
diff -r1.57 nautilus-tree-model.c
133c133
< 		              gtk_marshal_VOID__POINTER_POINTER,
---
> 			      gtk_marshal_VOID__STRING_STRING,
163a164
> #ifdef GNOME2_CONVERSION_COMPLETE
167a169
> #endif
327,328c329,330
< 		model->details->root_node_changed_signal_id = gtk_signal_connect 
< 			(GTK_OBJECT (nautilus_tree_node_get_file (model->details->root_node)),
---
> 		model->details->root_node_changed_signal_id = g_signal_connect 
> 			(nautilus_tree_node_get_file (model->details->root_node),
330c332
< 			 nautilus_tree_model_root_node_file_monitor,
---
> 			 G_CALLBACK (nautilus_tree_model_root_node_file_monitor),
442,443c444,445
< 	node->details->done_loading_id = gtk_signal_connect 
< 		(GTK_OBJECT (directory),
---
> 	node->details->done_loading_id = g_signal_connect 
> 		(directory,
445c447
< 		 nautilus_tree_model_directory_done_loading_callback,
---
> 		 G_CALLBACK (nautilus_tree_model_directory_done_loading_callback),
450,451c452,453
< 	node->details->files_added_id = gtk_signal_connect 
< 		(GTK_OBJECT (directory),
---
> 	node->details->files_added_id = g_signal_connect 
> 		(directory,
453c455
< 		 nautilus_tree_model_directory_files_changed_callback,
---
> 		 G_CALLBACK (nautilus_tree_model_directory_files_changed_callback),
456,457c458,459
< 	node->details->files_changed_id = gtk_signal_connect 
< 		(GTK_OBJECT (directory),
---
> 	node->details->files_changed_id = g_signal_connect 
> 		(directory,
459c461
< 		 nautilus_tree_model_directory_files_changed_callback,
---
> 		 G_CALLBACK (nautilus_tree_model_directory_files_changed_callback),
Index: components/tree/nautilus-tree-view-dnd.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/tree/nautilus-tree-view-dnd.c,v
retrieving revision 1.18
diff -r1.18 nautilus-tree-view-dnd.c
262c262
< 			    tree_view_realize_callback, view);
---
> 			    G_CALLBACK (tree_view_realize_callback), view);
402c402
< 		GdkAtom target_atom = GPOINTER_TO_UINT (target->data);
---
> 		GdkAtom target_atom = GDK_POINTER_TO_ATOM (target->data);
802a803
> #ifdef GNOME2_CONVERSION_COMPLETE
803a805
> #endif
Index: components/tree/nautilus-tree-view.c
===================================================================
RCS file: /cvs/gnome/nautilus/components/tree/nautilus-tree-view.c,v
retrieving revision 1.109
diff -r1.109 nautilus-tree-view.c
788c788
< 			    nautilus_tree_view_model_node_changed_callback,
---
> 			    G_CALLBACK (nautilus_tree_view_model_node_changed_callback),
792c792
< 			    nautilus_tree_view_model_node_removed_callback,
---
> 			    G_CALLBACK (nautilus_tree_view_model_node_removed_callback),
796c796
< 			    nautilus_tree_view_model_node_renamed_callback,
---
> 			    G_CALLBACK (nautilus_tree_view_model_node_renamed_callback),
800c800
< 			    nautilus_tree_view_model_done_loading_callback,
---
> 			    G_CALLBACK (nautilus_tree_view_model_done_loading_callback),
912a913,914
> 	GdkFont *font;
> 
942a945,947
> 
> 	font = gtk_style_get_font (view->details->tree->style);
> 
945,946c950,951
< 				       view->details->tree->style->font->ascent
< 				       + view->details->tree->style->font->descent));
---
> 				       font->ascent
> 				       + font->descent));
992c997
< 		 nautilus_tree_view_update_all_icons,
---
> 		 GTK_SIGNAL_FUNC (nautilus_tree_view_update_all_icons),
1066c1071
< 			    tree_map_callback,
---
> 			    G_CALLBACK (tree_map_callback),
1070c1075
< 			    tree_unmap_callback,
---
> 			    G_CALLBACK (tree_unmap_callback),
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]