gtkhtml r8723 - branches/mbarnes-composer/components/editor

[mbarnes svn gnome org]

Author: mbarnes
Date: Thu Feb  7 19:13:39 2008
New Revision: 8723
URL: http://svn.gnome.org/viewvc/gtkhtml?rev=8723&view=rev

Log:
Rename the cut/copy/paste methods.


Modified:
   branches/mbarnes-composer/components/editor/gtkhtml-editor-actions.c
   branches/mbarnes-composer/components/editor/gtkhtml-editor.c
   branches/mbarnes-composer/components/editor/gtkhtml-editor.h

Modified: branches/mbarnes-composer/components/editor/gtkhtml-editor-actions.c
==============================================================================
--- branches/mbarnes-composer/components/editor/gtkhtml-editor-actions.c	(original)
+++ branches/mbarnes-composer/components/editor/gtkhtml-editor-actions.c	Thu Feb  7 19:13:39 2008
@@ -425,8 +425,8 @@
 	GtkhtmlEditorClass *class;
 
 	class = GTKHTML_EDITOR_GET_CLASS (editor);
-	g_return_if_fail (class->copy != NULL);
-	class->copy (editor);
+	g_return_if_fail (class->copy_clipboard != NULL);
+	class->copy_clipboard (editor);
 }
 
 static void
@@ -436,8 +436,8 @@
 	GtkhtmlEditorClass *class;
 
 	class = GTKHTML_EDITOR_GET_CLASS (editor);
-	g_return_if_fail (class->cut != NULL);
-	class->cut (editor);
+	g_return_if_fail (class->cut_clipboard != NULL);
+	class->cut_clipboard (editor);
 }
 
 static void
@@ -796,8 +796,8 @@
 	GtkhtmlEditorClass *class;
 
 	class = GTKHTML_EDITOR_GET_CLASS (editor);
-	g_return_if_fail (class->paste != NULL);
-	class->paste (editor);
+	g_return_if_fail (class->paste_clipboard != NULL);
+	class->paste_clipboard (editor);
 }
 
 static void

Modified: branches/mbarnes-composer/components/editor/gtkhtml-editor.c
==============================================================================
--- branches/mbarnes-composer/components/editor/gtkhtml-editor.c	(original)
+++ branches/mbarnes-composer/components/editor/gtkhtml-editor.c	Thu Feb  7 19:13:39 2008
@@ -368,19 +368,19 @@
 };
 
 static void
-editor_cut (GtkhtmlEditor *editor)
+editor_cut_clipboard (GtkhtmlEditor *editor)
 {
 	gtk_html_command (gtkhtml_editor_get_html (editor), "cut");
 }
 
 static void
-editor_copy (GtkhtmlEditor *editor)
+editor_copy_clipboard (GtkhtmlEditor *editor)
 {
 	gtk_html_command (gtkhtml_editor_get_html (editor), "copy");
 }
 
 static void
-editor_paste (GtkhtmlEditor *editor)
+editor_paste_clipboard (GtkhtmlEditor *editor)
 {
 	gtk_html_command (gtkhtml_editor_get_html (editor), "paste");
 }
@@ -596,9 +596,9 @@
 	object_class->dispose = editor_dispose;
 	object_class->finalize = editor_finalize;
 
-	class->cut = editor_cut;
-	class->copy = editor_copy;
-	class->paste = editor_paste;
+	class->cut_clipboard = editor_cut_clipboard;
+	class->copy_clipboard = editor_copy_clipboard;
+	class->paste_clipboard = editor_paste_clipboard;
 	class->select_all = editor_select_all;
 
 	g_object_class_install_property (

Modified: branches/mbarnes-composer/components/editor/gtkhtml-editor.h
==============================================================================
--- branches/mbarnes-composer/components/editor/gtkhtml-editor.h	(original)
+++ branches/mbarnes-composer/components/editor/gtkhtml-editor.h	Thu Feb  7 19:13:39 2008
@@ -66,10 +66,10 @@
 struct _GtkhtmlEditorClass {
 	GtkWindowClass parent_class;
 
-	void	(*cut)		(GtkhtmlEditor *editor);
-	void	(*copy)		(GtkhtmlEditor *editor);
-	void	(*paste)	(GtkhtmlEditor *editor);
-	void	(*select_all)	(GtkhtmlEditor *editor);
+	void	(*cut_clipboard)	(GtkhtmlEditor *editor);
+	void	(*copy_clipboard)	(GtkhtmlEditor *editor);
+	void	(*paste_clipboard)	(GtkhtmlEditor *editor);
+	void	(*select_all)		(GtkhtmlEditor *editor);
 };
 
 GType		gtkhtml_editor_get_type		(void);