[gnumeric] Compilation: namespace work.



commit 005ea5c4fc032fba2a662c6b0f53576dbd3df1db
Author: Morten Welinder <terra gnome org>
Date:   Mon May 30 17:24:40 2011 -0400

    Compilation: namespace work.

 ChangeLog                 |    8 ++++++++
 src/dialogs/dialog-quit.c |    2 +-
 src/gui-clipboard.c       |    6 +++---
 src/gui-clipboard.h       |    6 +++---
 src/wbc-gtk.c             |    8 ++++----
 5 files changed, 19 insertions(+), 11 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 2b90d59..d21c956 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-30  Morten Welinder  <terra gnome org>
+
+	* src/gui-clipboard.c (gnm_x_claim_clipboard): Rename from
+	x_claim_clipboard.
+	(gnm_x_store_clipboard_if_needed): Rename from
+	x_store_clipboard_if_needed.
+	(gnm_x_request_clipboard): Rename from x_request_clipboard.
+
 2011-05-26  Andreas J. Guelzow <aguelzow pyrshep ca>
 
 	* src/application.c (gnm_app_workbook_get_by_uri): made static
diff --git a/src/dialogs/dialog-quit.c b/src/dialogs/dialog-quit.c
index 6c3c370..bd2d0cd 100644
--- a/src/dialogs/dialog-quit.c
+++ b/src/dialogs/dialog-quit.c
@@ -452,7 +452,7 @@ dialog_quit (WBCGtk *wbcg)
 			return;
 	}
 
-	x_store_clipboard_if_needed (wb_control_get_workbook (wbc));
+	gnm_x_store_clipboard_if_needed (wb_control_get_workbook (wbc));
 
 	l = g_list_copy (gnm_app_workbook_list ());
 	while (l) {
diff --git a/src/gui-clipboard.c b/src/gui-clipboard.c
index bbf0593..577b3ca 100644
--- a/src/gui-clipboard.c
+++ b/src/gui-clipboard.c
@@ -985,7 +985,7 @@ x_clipboard_clear_cb (GtkClipboard *clipboard,
 }
 
 void
-x_request_clipboard (WBCGtk *wbcg, GnmPasteTarget const *pt)
+gnm_x_request_clipboard (WBCGtk *wbcg, GnmPasteTarget const *pt)
 {
 	GnmGtkClipboardCtxt *ctxt;
 	GdkDisplay *display = gtk_widget_get_display (GTK_WIDGET (wbcg_toplevel (wbcg)));
@@ -1081,7 +1081,7 @@ set_clipman_targets (GdkDisplay *disp, GtkTargetEntry *targets, guint n_targets)
 }
 
 gboolean
-x_claim_clipboard (WBCGtk *wbcg)
+gnm_x_claim_clipboard (WBCGtk *wbcg)
 {
 	GdkDisplay *display = gtk_widget_get_display (GTK_WIDGET (wbcg_toplevel (wbcg)));
 	GnmCellRegion *content = gnm_app_clipboard_contents_get ();
@@ -1161,7 +1161,7 @@ x_claim_clipboard (WBCGtk *wbcg)
  * object is destroyed.
  */
 void
-x_store_clipboard_if_needed (Workbook *wb)
+gnm_x_store_clipboard_if_needed (Workbook *wb)
 {
 	Sheet *sheet = gnm_app_clipboard_sheet_get ();
 	WBCGtk *wbcg = NULL;
diff --git a/src/gui-clipboard.h b/src/gui-clipboard.h
index 5b4eefe..7b253a2 100644
--- a/src/gui-clipboard.h
+++ b/src/gui-clipboard.h
@@ -6,9 +6,9 @@
 
 G_BEGIN_DECLS
 
-void x_request_clipboard (WBCGtk *wbcg, GnmPasteTarget const *pt);
-gboolean x_claim_clipboard (WBCGtk *wbcg);
-void x_store_clipboard_if_needed (Workbook *wb);
+void gnm_x_request_clipboard (WBCGtk *wbcg, GnmPasteTarget const *pt);
+gboolean gnm_x_claim_clipboard (WBCGtk *wbcg);
+void gnm_x_store_clipboard_if_needed (Workbook *wb);
 
 G_END_DECLS
 
diff --git a/src/wbc-gtk.c b/src/wbc-gtk.c
index 5b9ff7b..d31ffbf 100644
--- a/src/wbc-gtk.c
+++ b/src/wbc-gtk.c
@@ -1760,13 +1760,13 @@ wbcg_undo_redo_labels (WorkbookControl *wbc, char const *undo, char const *redo)
 static void
 wbcg_paste_from_selection (WorkbookControl *wbc, GnmPasteTarget const *pt)
 {
-	x_request_clipboard ((WBCGtk *)wbc, pt);
+	gnm_x_request_clipboard ((WBCGtk *)wbc, pt);
 }
 
 static gboolean
 wbcg_claim_selection (WorkbookControl *wbc)
 {
-	return x_claim_clipboard ((WBCGtk *)wbc);
+	return gnm_x_claim_clipboard ((WBCGtk *)wbc);
 }
 
 static int
@@ -1864,7 +1864,7 @@ wbcg_close_if_user_permits (WBCGtk *wbcg,
 	if (!ask_user) {
 		done = gui_file_save (wbcg, wb_view);
 		if (done) {
-			x_store_clipboard_if_needed (wb);
+			gnm_x_store_clipboard_if_needed (wb);
 			g_object_unref (wb);
 			return 3;
 		}
@@ -1902,7 +1902,7 @@ wbcg_close_if_user_permits (WBCGtk *wbcg,
 	in_can_close = FALSE;
 
 	if (can_close) {
-		x_store_clipboard_if_needed (wb);
+		gnm_x_store_clipboard_if_needed (wb);
 		g_object_unref (wb);
 		switch (button) {
 		case GNM_RESPONSE_SAVE_ALL:



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]