[Nautilus-list] nautilus patch

From: Havoc Pennington <hp redhat com>
To: nautilus-list eazel com
Subject: [Nautilus-list] nautilus patch
Date: 01 Nov 2001 22:45:28 -0500
Hi,

Eel patch went in with suggested changes, the patch to make Nautilus
compile again is appended (already committed since it's all pretty
obvious hopefully and I didn't want to leave things broken).

Havoc

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/nautilus/ChangeLog,v
retrieving revision 1.4808
diff -u -p -u -r1.4808 ChangeLog
--- ChangeLog	2001/11/01 19:41:29	1.4808
+++ ChangeLog	2001/11/02 03:45:57
@@ -1,3 +1,64 @@
+2001-11-01  Havoc Pennington  <hp pobox com>
+
+	* src/nautilus-view-frame-corba.c: fix
+	EEL_DEFINE_BONOBO_BOILERPLATE call
+	
+	* src/nautilus-property-browser.c
+	(nautilus_property_browser_init): mnemonics
+
+	* src/nautilus-complex-search-bar.c
+	(attach_criterion_to_search_bar): use gtk_widget_activate instead
+	of eel_gtk_button_auto_click
+
+	* src/nautilus-simple-search-bar.c
+	(nautilus_simple_search_bar_new): ditto
+	
+	* src/nautilus-sidebar.c (nautilus_sidebar_update_buttons): 
+	remove eel_gtk_button_set_standard_padding, add mnemonic to
+	button
+
+	* src/nautilus-bookmarks-window.c (create_bookmarks_window): 
+	remove eel_gtk_button_set_standard_padding, add mnemonic to
+	button
+	
+	* src/file-manager/fm-properties-window.c (create_basic_page):
+	remove eel_gtk_button_set_standard_padding, add mnemonics to
+	buttons
+
+	* src/file-manager/fm-directory-view.c (copy_or_cut_files): remove
+	use of eel_get_current_event_time()
+	(paste_files_callback): ditto
+
+	* Makefile.am (SUBDIRS): cut-n-paste-code seems to be required by
+	libnautilus-private, so move it before libnautilus-private
+
+	* libnautilus-private/nautilus-undo-manager.c: fix
+	EEL_DEFINE_BONOBO_BOILERPLATE call
+
+	* libnautilus-private/nautilus-undo-context.c: fix
+	EEL_DEFINE_BONOBO_BOILERPLATE call
+
+	* libnautilus-private/nautilus-program-chooser.c
+	(nautilus_program_chooser_new): axe
+	eel_gtk_button_set_standard_padding, add mnemonic to button
+	(nautilus_program_chooser_new): axe
+	eel_gtk_button_set_standard_padding, add mnemonic to button
+
+	* libnautilus-private/nautilus-metafile.c: fix
+	EEL_DEFINE_BONOBO_BOILERPLATE call
+
+	* libnautilus-private/nautilus-metafile-factory.c: fix 
+	EEL_DEFINE_BONOBO_BOILERPLATE call
+
+	* libnautilus-private/nautilus-icon-dnd.c
+	(nautilus_icon_dnd_begin_drag): replace eel_drag_set_icon_pixbuf
+	
+	* libnautilus-private/nautilus-directory-metafile-monitor.c: fix
+	EEL_DEFINE_BONOBO_BOILERPLATE call
+	
+	* libnautilus/nautilus-undo-transaction.c: fix
+	EEL_DEFINE_BONOBO_BOILERPLATE call
+
 2001-11-01  Louise Miller  <louise miller sun com>
 
 	* Lots of files in components/help 
Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/nautilus/Makefile.am,v
retrieving revision 1.59
diff -u -p -u -r1.59 Makefile.am
--- Makefile.am	2001/11/01 01:24:17	1.59
+++ Makefile.am	2001/11/02 03:45:57
@@ -7,9 +7,9 @@ DESKTOP_FILES=$(DESKTOP_IN_FILES:.deskto
 
 SUBDIRS =			\
 	libnautilus 		\
+	cut-n-paste-code 	\
 	libnautilus-private 	\
 	libnautilus-adapter	\
-	cut-n-paste-code 	\
 	src 			\
 	po 			\
 	data 			\
Index: configure.in
===================================================================
RCS file: /cvs/gnome/nautilus/configure.in,v
retrieving revision 1.378
diff -u -p -u -r1.378 configure.in
--- configure.in	2001/11/01 01:24:18	1.378
+++ configure.in	2001/11/02 03:45:57
@@ -26,7 +26,8 @@ ORBIT_REQUIRED=0.5.7
 POPT_REQUIRED=1.5
 RSVG_REQUIRED=1.1
 SCROLLKEEPER_REQUIRED=0.1.4
-XML_REQUIRED=2.4.6
+## don't commit this
+XML_REQUIRED=2.4.5
 
 AC_SUBST(EEL_REQUIRED)
 AC_SUBST(ESOUND_REQUIRED)
Index: libnautilus/nautilus-undo-transaction.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus/nautilus-undo-transaction.c,v
retrieving revision 1.16
diff -u -p -u -r1.16 nautilus-undo-transaction.c
--- libnautilus/nautilus-undo-transaction.c	2001/10/28 20:21:42	1.16
+++ libnautilus/nautilus-undo-transaction.c	2001/11/02 03:45:57
@@ -58,7 +58,7 @@ static void                    impl_Naut
 static void                    undo_atom_list_free                                (GList                        *list);
 static void                    undo_atom_list_undo_and_free                       (GList                        *list);
 
-EEL_DEFINE_BONOBO_BOILERPLATE (NautilusUndoTransaction, nautilus_undo_transaction, BONOBO_OBJECT_TYPE)
+EEL_DEFINE_BONOBO_BOILERPLATE (NautilusUndoTransaction, Nautilus_Undo_Transaction, nautilus_undo_transaction, BONOBO_OBJECT_TYPE)
 
 static Nautilus_Undo_MenuItem *
 impl_Nautilus_Undo_Transaction__get_undo_menu_item (PortableServer_Servant servant,
Index: libnautilus-private/nautilus-directory-metafile-monitor.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-directory-metafile-monitor.c,v
retrieving revision 1.10
diff -u -p -u -r1.10 nautilus-directory-metafile-monitor.c
--- libnautilus-private/nautilus-directory-metafile-monitor.c	2001/10/31 00:30:59	1.10
+++ libnautilus-private/nautilus-directory-metafile-monitor.c	2001/11/02 03:45:57
@@ -46,7 +46,7 @@ static void corba_metafile_changed (Port
 static void corba_metafile_ready   (PortableServer_Servant       servant,
 				    CORBA_Environment           *ev);
 
-EEL_DEFINE_BONOBO_BOILERPLATE (NautilusMetafileMonitor, nautilus_metafile_monitor, BONOBO_OBJECT_TYPE)
+EEL_DEFINE_BONOBO_BOILERPLATE (NautilusMetafileMonitor, Nautilus_MetafileMonitor, nautilus_metafile_monitor, BONOBO_OBJECT_TYPE)
 
 static void
 nautilus_metafile_monitor_class_init (NautilusMetafileMonitorClass *klass)
Index: libnautilus-private/nautilus-icon-dnd.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-icon-dnd.c,v
retrieving revision 1.96
diff -u -p -u -r1.96 nautilus-icon-dnd.c
--- libnautilus-private/nautilus-icon-dnd.c	2001/10/30 00:26:25	1.96
+++ libnautilus-private/nautilus-icon-dnd.c	2001/11/02 03:45:57
@@ -1310,7 +1310,7 @@ nautilus_icon_dnd_begin_drag (NautilusIc
         y_offset = dnd_info->drag_info.start_y - window_rect.y0;
         
         /* set the icon for dragging */
-        eel_drag_set_icon_pixbuf (context, pixbuf, x_offset, y_offset);
+        gtk_drag_set_icon_pixbuf (context, pixbuf, x_offset, y_offset);
 }
 
 static gboolean
Index: libnautilus-private/nautilus-metafile-factory.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-metafile-factory.c,v
retrieving revision 1.12
diff -u -p -u -r1.12 nautilus-metafile-factory.c
--- libnautilus-private/nautilus-metafile-factory.c	2001/10/31 00:30:59	1.12
+++ libnautilus-private/nautilus-metafile-factory.c	2001/11/02 03:45:57
@@ -41,6 +41,7 @@ static Nautilus_Metafile corba_open (Por
 				     CORBA_Environment      *ev);
 
 EEL_DEFINE_BONOBO_BOILERPLATE (NautilusMetafileFactory,
+			       Nautilus_MetafileFactory,
 			       nautilus_metafile_factory,
 			       BONOBO_OBJECT_TYPE)
 
Index: libnautilus-private/nautilus-metafile.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-metafile.c,v
retrieving revision 1.21
diff -u -p -u -r1.21 nautilus-metafile.c
--- libnautilus-private/nautilus-metafile.c	2001/10/31 00:30:59	1.21
+++ libnautilus-private/nautilus-metafile.c	2001/11/02 03:45:58
@@ -156,7 +156,7 @@ static void async_read_cancel           
 static void nautilus_metafile_set_metafile_contents (NautilusMetafile *metafile,
 					             xmlDocPtr metafile_contents);
 
-EEL_DEFINE_BONOBO_BOILERPLATE (NautilusMetafile, nautilus_metafile, BONOBO_OBJECT_TYPE)
+EEL_DEFINE_BONOBO_BOILERPLATE (NautilusMetafile, Nautilus_Metafile, nautilus_metafile, BONOBO_OBJECT_TYPE)
 
 typedef struct MetafileReadState {
 	gboolean use_public_metafile;
Index: libnautilus-private/nautilus-program-chooser.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-program-chooser.c,v
retrieving revision 1.55
diff -u -p -u -r1.55 nautilus-program-chooser.c
--- libnautilus-private/nautilus-program-chooser.c	2001/10/30 00:26:25	1.55
+++ libnautilus-private/nautilus-program-chooser.c	2001/11/02 03:45:58
@@ -1343,8 +1343,8 @@ nautilus_program_chooser_new (GnomeVFSMi
 	gtk_widget_show (change_button_holder);
   	gtk_box_pack_end (GTK_BOX (framed_hbox), change_button_holder, FALSE, FALSE, 0);
 
-  	change_button = gtk_button_new_with_label(_("Modify..."));
-	eel_gtk_button_set_standard_padding (GTK_BUTTON (change_button));
+  	change_button = gtk_button_new_with_mnemonic (_("_Modify..."));
+
   	gtk_widget_show (change_button);
   	gtk_box_pack_end (GTK_BOX (change_button_holder), change_button, TRUE, FALSE, 0);
 
@@ -1366,8 +1366,8 @@ nautilus_program_chooser_new (GnomeVFSMi
 	capplet_button_vbox = gtk_vbox_new (FALSE, 0);
 	gtk_widget_show (capplet_button_vbox);
 	gtk_box_pack_end (GTK_BOX (capplet_hbox), capplet_button_vbox, FALSE, FALSE, 0);
-	capplet_button = gtk_button_new_with_label (_("Go There"));	 
-	eel_gtk_button_set_standard_padding (GTK_BUTTON (capplet_button));
+	capplet_button = gtk_button_new_with_mnemonic (_("_Go There"));	 
+
 	gtk_signal_connect (GTK_OBJECT (capplet_button),
 			    "clicked",
 			    G_CALLBACK (launch_mime_capplet_and_close_dialog),
Index: libnautilus-private/nautilus-undo-context.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-undo-context.c,v
retrieving revision 1.15
diff -u -p -u -r1.15 nautilus-undo-context.c
--- libnautilus-private/nautilus-undo-context.c	2001/10/31 00:30:59	1.15
+++ libnautilus-private/nautilus-undo-context.c	2001/11/02 03:45:58
@@ -44,7 +44,7 @@ static void                  destroy    
 static Nautilus_Undo_Manager impl_Nautilus_Undo_Context__get_undo_manager (PortableServer_Servant    servant,
 									   CORBA_Environment        *ev);
 
-EEL_DEFINE_BONOBO_BOILERPLATE (NautilusUndoContext, nautilus_undo_context, BONOBO_OBJECT_TYPE)
+EEL_DEFINE_BONOBO_BOILERPLATE (NautilusUndoContext, Nautilus_Undo_Context, nautilus_undo_context, BONOBO_OBJECT_TYPE)
 
 static Nautilus_Undo_Manager
 impl_Nautilus_Undo_Context__get_undo_manager (PortableServer_Servant servant,
Index: libnautilus-private/nautilus-undo-manager.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-undo-manager.c,v
retrieving revision 1.29
diff -u -p -u -r1.29 nautilus-undo-manager.c
--- libnautilus-private/nautilus-undo-manager.c	2001/10/31 00:30:59	1.29
+++ libnautilus-private/nautilus-undo-manager.c	2001/11/02 03:45:58
@@ -71,7 +71,7 @@ static void nautilus_undo_manager_class_
 static void nautilus_undo_manager_init       (NautilusUndoManager       *item);
 static void destroy                                (GtkObject                 *object);
 
-EEL_DEFINE_BONOBO_BOILERPLATE (NautilusUndoManager, nautilus_undo_manager, BONOBO_OBJECT_TYPE)
+EEL_DEFINE_BONOBO_BOILERPLATE (NautilusUndoManager, Nautilus_Undo_Manager, nautilus_undo_manager, BONOBO_OBJECT_TYPE)
 
 static void
 release_transaction (NautilusUndoManager *manager)
Index: src/nautilus-bookmarks-window.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-bookmarks-window.c,v
retrieving revision 1.48
diff -u -p -u -r1.48 nautilus-bookmarks-window.c
--- src/nautilus-bookmarks-window.c	2001/10/30 19:31:54	1.48
+++ src/nautilus-bookmarks-window.c	2001/11/02 03:45:58
@@ -188,8 +188,8 @@ create_bookmarks_window (NautilusBookmar
 	gtk_widget_show (hbox2);
 	gtk_box_pack_start (GTK_BOX (right_side), hbox2, FALSE, FALSE, 0);
 
-	remove_button = gtk_button_new_with_label (_("Remove"));
-	eel_gtk_button_set_standard_padding (GTK_BUTTON (remove_button));
+	remove_button = gtk_button_new_with_mnemonic (_("_Remove"));
+
 	gtk_widget_show (remove_button);
 	gtk_box_pack_start (GTK_BOX (hbox2), remove_button, TRUE, FALSE, 0);
 
Index: src/nautilus-complex-search-bar.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-complex-search-bar.c,v
retrieving revision 1.58
diff -u -p -u -r1.58 nautilus-complex-search-bar.c
--- src/nautilus-complex-search-bar.c	2001/10/31 00:30:59	1.58
+++ src/nautilus-complex-search-bar.c	2001/11/02 03:45:58
@@ -428,7 +428,7 @@ attach_criterion_to_search_bar (Nautilus
 		g_assert (GTK_IS_BUTTON (bar->details->find_them));
 		gtk_signal_connect_object (GTK_OBJECT (criterion->details->value_entry), 
 					   "activate",
-					   G_CALLBACK (eel_gtk_button_auto_click),
+					   G_CALLBACK (gtk_widget_activate),
 					   GTK_OBJECT (bar->details->find_them));
 	}
 	nautilus_complex_search_bar_queue_resize (bar);
Index: src/nautilus-property-browser.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-property-browser.c,v
retrieving revision 1.153
diff -u -p -u -r1.153 nautilus-property-browser.c
--- src/nautilus-property-browser.c	2001/10/31 00:30:59	1.153
+++ src/nautilus-property-browser.c	2001/11/02 03:45:59
@@ -354,8 +354,9 @@ nautilus_property_browser_init (GtkObjec
   	gtk_container_add (GTK_CONTAINER (temp_frame), property_browser->details->bottom_box);
   	
   	/* create the "done" button */
- 	temp_button = gtk_button_new_with_label (_("Done"));
+ 	temp_button = gtk_button_new_with_mnemonic (_("_Done"));
 	eel_gtk_button_set_padding (GTK_BUTTON (temp_button), GNOME_PAD_SMALL);
+
 	gtk_widget_show(temp_button);
 	gtk_box_pack_end (GTK_BOX(property_browser->details->bottom_box), temp_button, FALSE, FALSE, GNOME_PAD_SMALL);  
  	gtk_signal_connect(GTK_OBJECT (temp_button), "clicked", G_CALLBACK (done_button_callback), property_browser);
@@ -364,7 +365,7 @@ nautilus_property_browser_init (GtkObjec
   	property_browser->details->add_button = gtk_button_new ();
 	gtk_widget_show(property_browser->details->add_button);
 	
-	property_browser->details->add_button_label = gtk_label_new (_("Add new..."));
+	property_browser->details->add_button_label = gtk_label_new_with_mnemonic (_("_Add new..."));
 	gtk_widget_show(property_browser->details->add_button_label);
 	gtk_container_add (GTK_CONTAINER(property_browser->details->add_button),
 			   property_browser->details->add_button_label);
@@ -380,7 +381,7 @@ nautilus_property_browser_init (GtkObjec
 	gtk_widget_show(property_browser->details->remove_button);
 	
 	/* FIXME: Using spaces to add padding is not good design. */
-	property_browser->details->remove_button_label = gtk_label_new (_("Remove..."));	
+	property_browser->details->remove_button_label = gtk_label_new_with_mnemonic (_("_Remove..."));	
 	gtk_widget_show(property_browser->details->remove_button_label);
 	gtk_container_add (GTK_CONTAINER(property_browser->details->remove_button),
 			   property_browser->details->remove_button_label);
Index: src/nautilus-sidebar.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-sidebar.c,v
retrieving revision 1.190
diff -u -p -u -r1.190 nautilus-sidebar.c
--- src/nautilus-sidebar.c	2001/10/30 19:31:56	1.190
+++ src/nautilus-sidebar.c	2001/11/02 03:45:59
@@ -1492,10 +1492,10 @@ nautilus_sidebar_update_buttons (Nautilu
 	 * need a framework to allow protocols to add commands buttons */
 	if (eel_istr_has_prefix (sidebar->details->uri, "trash:")) {
 		/* FIXME: We don't use spaces to pad labels! */
-		temp_button = gtk_button_new_with_label (confirm_trash_auto_value 
-							 ? _("Empty Trash...") 
-							 : _("Empty Trash"));
-		eel_gtk_button_set_standard_padding (GTK_BUTTON (temp_button));
+		temp_button = gtk_button_new_with_mnemonic (confirm_trash_auto_value 
+							 ? _("_Empty Trash...") 
+							 : _("_Empty Trash"));
+
 		gtk_box_pack_start (GTK_BOX (sidebar->details->button_box), 
 					temp_button, FALSE, FALSE, 0);
 		gtk_widget_set_sensitive (temp_button, !nautilus_trash_monitor_is_empty ());
Index: src/nautilus-simple-search-bar.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-simple-search-bar.c,v
retrieving revision 1.28
diff -u -p -u -r1.28 nautilus-simple-search-bar.c
--- src/nautilus-simple-search-bar.c	2001/10/30 19:31:56	1.28
+++ src/nautilus-simple-search-bar.c	2001/11/02 03:45:59
@@ -137,7 +137,7 @@ nautilus_simple_search_bar_new (Nautilus
 		 TRUE);
 	
 	gtk_signal_connect_object (GTK_OBJECT (bar->details->entry), "activate",
-				   G_CALLBACK (eel_gtk_button_auto_click), 
+				   G_CALLBACK (gtk_widget_activate), 
 				   GTK_OBJECT (bar->details->find_button));
 	gtk_signal_connect_object (GTK_OBJECT (bar->details->entry), "changed",
 				   G_CALLBACK (update_simple_find_button_state), GTK_OBJECT (bar));
Index: src/nautilus-view-frame-corba.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-view-frame-corba.c,v
retrieving revision 1.37
diff -u -p -u -r1.37 nautilus-view-frame-corba.c
--- src/nautilus-view-frame-corba.c	2001/10/31 00:30:59	1.37
+++ src/nautilus-view-frame-corba.c	2001/11/02 03:45:59
@@ -392,6 +392,7 @@ nautilus_view_frame_corba_part_init (Nau
 static GType nautilus_view_frame_corba_part_get_type (void);
 
 EEL_DEFINE_BONOBO_BOILERPLATE (NautilusViewFrameCorbaPart,
+			       Nautilus_ViewFrame,
 			       nautilus_view_frame_corba_part,
 			       BONOBO_OBJECT_TYPE)
 
Index: src/file-manager/fm-directory-view.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/fm-directory-view.c,v
retrieving revision 1.475
diff -u -p -u -r1.475 fm-directory-view.c
--- src/file-manager/fm-directory-view.c	2001/10/30 19:32:08	1.475
+++ src/file-manager/fm-directory-view.c	2001/11/02 03:46:00
@@ -3909,7 +3909,7 @@ copy_or_cut_files (FMDirectoryView *view
 
 	if (!gtk_selection_owner_set (GTK_WIDGET (view),
 				      clipboard_atom,
-				      eel_get_current_event_time ())) {
+				      gtk_get_current_event_time ())) {
 		return;
 	}
 
@@ -3971,7 +3971,7 @@ paste_files_callback (BonoboUIComponent 
 	gtk_selection_convert (GTK_WIDGET (callback_data), 
 			       clipboard_atom, 
 			       copied_files_atom,
-			       eel_get_current_event_time ());
+			       gtk_get_current_event_time ());
 }
 
 static gboolean
Index: src/file-manager/fm-properties-window.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/fm-properties-window.c,v
retrieving revision 1.128
diff -u -p -u -r1.128 fm-properties-window.c
--- src/file-manager/fm-properties-window.c	2001/10/31 00:31:00	1.128
+++ src/file-manager/fm-properties-window.c	2001/11/02 03:46:01
@@ -1642,16 +1642,16 @@ create_basic_page (FMPropertiesWindow *w
 		gtk_widget_show (button_box);
 		gtk_box_pack_end (GTK_BOX(container), button_box, FALSE, FALSE, 4);  
 		
-	 	temp_button = gtk_button_new_with_label (_("Select Custom Icon..."));
+	 	temp_button = gtk_button_new_with_mnemonic (_("_Select Custom Icon..."));
 		gtk_widget_show (temp_button);
 		gtk_box_pack_start (GTK_BOX (button_box), temp_button, FALSE, FALSE, 4);  
-		eel_gtk_button_set_standard_padding (GTK_BUTTON (temp_button));
+
 		gtk_signal_connect(GTK_OBJECT (temp_button), "clicked", GTK_SIGNAL_FUNC (select_image_button_callback), window);
 	 	
-	 	temp_button = gtk_button_new_with_label (_("Remove Custom Icon"));
+	 	temp_button = gtk_button_new_with_mnemonic (_("_Remove Custom Icon"));
 		gtk_widget_show (temp_button);
 		gtk_box_pack_start (GTK_BOX(button_box), temp_button, FALSE, FALSE, 4);  
-		eel_gtk_button_set_standard_padding (GTK_BUTTON (temp_button));
+
 	 	gtk_signal_connect (GTK_OBJECT (temp_button), "clicked", GTK_SIGNAL_FUNC (remove_image_button_callback), window);
 
 		window->details->remove_image_button = temp_button;
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]