[gnumeric] Compilation: rename gnumeric-gconf to gnumeric-conf
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Compilation: rename gnumeric-gconf to gnumeric-conf
- Date: Fri, 28 Oct 2011 14:01:42 +0000 (UTC)
commit 5be0366502e3017eed33830ba905d0dbb68a5103
Author: Morten Welinder <terra gnome org>
Date: Fri Oct 28 10:01:05 2011 -0400
Compilation: rename gnumeric-gconf to gnumeric-conf
ChangeLog | 4 ++++
component/gnumeric.c | 2 +-
plugins/glpk/gnm-glpk.c | 2 +-
plugins/html/latex.c | 2 +-
plugins/lpsolve/gnm-lpsolve.c | 2 +-
plugins/openoffice/openoffice-read.c | 2 +-
src/Makefile.am | 4 ++--
src/application.c | 2 +-
src/commands.c | 2 +-
src/dialogs/dialog-cell-sort.c | 2 +-
src/dialogs/dialog-function-select.c | 2 +-
src/dialogs/dialog-plugin-manager.c | 2 +-
src/dialogs/dialog-preferences.c | 2 +-
src/dialogs/dialog-printer-setup.c | 2 +-
src/dialogs/dialog-search-replace.c | 2 +-
src/dialogs/dialog-search.c | 2 +-
src/dialogs/dialog-stf-export.c | 2 +-
src/file-autoft.c | 2 +-
src/gnm-pane.c | 2 +-
src/gnm-plugin.c | 2 +-
src/{gnumeric-gconf.c => gnumeric-conf.c} | 8 ++++----
src/{gnumeric-gconf.h => gnumeric-conf.h} | 0
src/gui-clipboard.c | 2 +-
src/gui-file.c | 2 +-
src/libgnumeric.c | 2 +-
src/main-application.c | 2 +-
src/mstyle.c | 2 +-
src/print-info.c | 2 +-
src/print.c | 4 ++--
src/ranges.c | 2 +-
src/sheet-control-gui.c | 2 +-
src/sheet-view.c | 2 +-
src/sheet.c | 2 +-
src/stf-export.c | 2 +-
src/style.c | 2 +-
src/tools/auto-correct.c | 2 +-
src/wbc-gtk-actions.c | 2 +-
src/wbc-gtk-edit.c | 2 +-
src/wbc-gtk.c | 2 +-
src/widgets/gnumeric-expr-entry.c | 2 +-
src/workbook-view.c | 2 +-
src/workbook.c | 2 +-
src/xml-sax-write.c | 2 +-
43 files changed, 50 insertions(+), 46 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index f9e9dc8..616d48e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-28 Morten Welinder <terra gnome org>
+
+ * src/gnumeric-conf.c: Rename from src/gnumeric-gconf.c
+
2011-10-28 Jean Brefort <jean brefort normalesup org>
* src/sheet-object-image.c (sheet_object_image_set_image),
diff --git a/component/gnumeric.c b/component/gnumeric.c
index 99b9a88..887c493 100644
--- a/component/gnumeric.c
+++ b/component/gnumeric.c
@@ -26,7 +26,7 @@
#include <gnumeric-config.h>
#include <gnumeric.h>
#include <gnm-plugin.h>
-#include <gnumeric-gconf.h>
+#include <gnumeric-conf.h>
#include <gui-file.h>
#include <gutils.h>
#include <print-cell.h>
diff --git a/plugins/glpk/gnm-glpk.c b/plugins/glpk/gnm-glpk.c
index 23623b2..0e653d4 100644
--- a/plugins/glpk/gnm-glpk.c
+++ b/plugins/glpk/gnm-glpk.c
@@ -6,7 +6,7 @@
#include "value.h"
#include "ranges.h"
#include "gutils.h"
-#include "gnumeric-gconf.h"
+#include "gnumeric-conf.h"
#include <gsf/gsf-impl-utils.h>
#include <gsf/gsf-input-textline.h>
#include <gsf/gsf-input-stdio.h>
diff --git a/plugins/html/latex.c b/plugins/html/latex.c
index d5a8799..c55879b 100644
--- a/plugins/html/latex.c
+++ b/plugins/html/latex.c
@@ -39,7 +39,7 @@
#include <gnumeric-config.h>
#include <gnumeric.h>
-#include <gnumeric-gconf.h>
+#include <gnumeric-conf.h>
#include "latex.h"
#include <goffice/goffice.h>
#include <workbook-view.h>
diff --git a/plugins/lpsolve/gnm-lpsolve.c b/plugins/lpsolve/gnm-lpsolve.c
index d93e4f4..d8cc59b 100644
--- a/plugins/lpsolve/gnm-lpsolve.c
+++ b/plugins/lpsolve/gnm-lpsolve.c
@@ -5,7 +5,7 @@
#include "sheet.h"
#include "value.h"
#include "ranges.h"
-#include "gnumeric-gconf.h"
+#include "gnumeric-conf.h"
#include <gsf/gsf-impl-utils.h>
#include <glib/gi18n-lib.h>
#include <string.h>
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index 2fabaf4..1d29d10 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -54,7 +54,7 @@
#include <sheet-object-cell-comment.h>
#include "sheet-object-widget.h"
#include <style-conditions.h>
-#include <gnumeric-gconf.h>
+#include <gnumeric-conf.h>
#include <mathfunc.h>
#include <sheet-object-graph.h>
#include <sheet-object-image.h>
diff --git a/src/Makefile.am b/src/Makefile.am
index 20e69eb..a2e7755 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -190,7 +190,7 @@ libspreadsheet_la_SOURCES = \
wbc-gtk-edit.c \
xml-sax-read.c \
xml-sax-write.c \
- gnumeric-gconf.c \
+ gnumeric-conf.c \
print.c \
print-cell.c
@@ -322,7 +322,7 @@ libspreadsheet_include_HEADERS = \
wbc-gtk-impl.h \
xml-io-version.h \
xml-sax.h \
- gnumeric-gconf.h \
+ gnumeric-conf.h \
print.h \
print-cell.h
diff --git a/src/application.c b/src/application.c
index 579a477..4fedbec 100644
--- a/src/application.c
+++ b/src/application.c
@@ -26,7 +26,7 @@
#include "pixmaps/gnumeric-stock-pixbufs.h"
#include "commands.h"
-#include <gnumeric-gconf.h>
+#include <gnumeric-conf.h>
#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
#include <glib/gi18n-lib.h>
diff --git a/src/commands.c b/src/commands.c
index 40f06b9..dd8028a 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -72,7 +72,7 @@
#include "sheet-filter.h"
#include "auto-format.h"
#include "tools/dao.h"
-#include "gnumeric-gconf.h"
+#include "gnumeric-conf.h"
#include "scenarios.h"
#include "data-shuffling.h"
#include "tools/tabulate.h"
diff --git a/src/dialogs/dialog-cell-sort.c b/src/dialogs/dialog-cell-sort.c
index fa94faa..c7da582 100644
--- a/src/dialogs/dialog-cell-sort.c
+++ b/src/dialogs/dialog-cell-sort.c
@@ -41,7 +41,7 @@
#include <sheet.h>
#include <sheet-view.h>
#include <wbc-gtk.h>
-#include <gnumeric-gconf.h>
+#include <gnumeric-conf.h>
#include <widgets/gnumeric-cell-renderer-toggle.h>
#include <widgets/gnumeric-expr-entry.h>
#include <value.h>
diff --git a/src/dialogs/dialog-function-select.c b/src/dialogs/dialog-function-select.c
index ea24753..d7fbf7d 100644
--- a/src/dialogs/dialog-function-select.c
+++ b/src/dialogs/dialog-function-select.c
@@ -39,7 +39,7 @@
#include <value.h>
#include <sheet.h>
#include <dead-kittens.h>
-#include <gnumeric-gconf.h>
+#include <gnumeric-conf.h>
#include <gnm-format.h>
#include <auto-format.h>
diff --git a/src/dialogs/dialog-plugin-manager.c b/src/dialogs/dialog-plugin-manager.c
index cb424f0..5e91615 100644
--- a/src/dialogs/dialog-plugin-manager.c
+++ b/src/dialogs/dialog-plugin-manager.c
@@ -32,7 +32,7 @@
#include "help.h"
#include <application.h>
#include <wbc-gtk.h>
-#include <gnumeric-gconf.h>
+#include <gnumeric-conf.h>
#include <gutils.h>
#include <gui-util.h>
diff --git a/src/dialogs/dialog-preferences.c b/src/dialogs/dialog-preferences.c
index 0fe968a..f117e15 100644
--- a/src/dialogs/dialog-preferences.c
+++ b/src/dialogs/dialog-preferences.c
@@ -40,7 +40,7 @@
#include "widgets/widget-font-selector.h"
#include "widgets/gnumeric-cell-renderer-text.h"
-#include "gnumeric-gconf.h"
+#include "gnumeric-conf.h"
#include <gui-util.h>
#include <gtk/gtk.h>
diff --git a/src/dialogs/dialog-printer-setup.c b/src/dialogs/dialog-printer-setup.c
index 344a691..70780cc 100644
--- a/src/dialogs/dialog-printer-setup.c
+++ b/src/dialogs/dialog-printer-setup.c
@@ -39,7 +39,7 @@
#include <workbook.h>
#include <wbc-gtk.h>
#include <style.h>
-#include <gnumeric-gconf.h>
+#include <gnumeric-conf.h>
#include <gdk/gdkkeysyms.h>
#include <goffice/goffice.h>
diff --git a/src/dialogs/dialog-search-replace.c b/src/dialogs/dialog-search-replace.c
index 4ed5dce..8300a90 100644
--- a/src/dialogs/dialog-search-replace.c
+++ b/src/dialogs/dialog-search-replace.c
@@ -29,7 +29,7 @@
#include "help.h"
#include <dead-kittens.h>
-#include <gnumeric-gconf.h>
+#include <gnumeric-conf.h>
#include <gui-util.h>
#include <search.h>
#include <widgets/gnumeric-expr-entry.h>
diff --git a/src/dialogs/dialog-search.c b/src/dialogs/dialog-search.c
index b7949fb..af87a17 100644
--- a/src/dialogs/dialog-search.c
+++ b/src/dialogs/dialog-search.c
@@ -28,7 +28,7 @@
#include "help.h"
#include <gui-util.h>
-#include <gnumeric-gconf.h>
+#include <gnumeric-conf.h>
#include <search.h>
#include <sheet.h>
#include <sheet-view.h>
diff --git a/src/dialogs/dialog-stf-export.c b/src/dialogs/dialog-stf-export.c
index 40338dd..129b1b2 100644
--- a/src/dialogs/dialog-stf-export.c
+++ b/src/dialogs/dialog-stf-export.c
@@ -30,7 +30,7 @@
#include <wbc-gtk.h>
#include <sheet.h>
#include <gui-util.h>
-#include <gnumeric-gconf.h>
+#include <gnumeric-conf.h>
#include <goffice/goffice.h>
#include <gtk/gtk.h>
diff --git a/src/file-autoft.c b/src/file-autoft.c
index fa7e178..e74bbe8 100644
--- a/src/file-autoft.c
+++ b/src/file-autoft.c
@@ -28,7 +28,7 @@
#include "gutils.h"
#include "workbook-control.h"
#include "format-template.h"
-#include "gnumeric-gconf.h"
+#include "gnumeric-conf.h"
#include <gsf/gsf-impl-utils.h>
#include <goffice/goffice.h>
diff --git a/src/gnm-pane.c b/src/gnm-pane.c
index acd62e7..115e73d 100644
--- a/src/gnm-pane.c
+++ b/src/gnm-pane.c
@@ -34,7 +34,7 @@
#include "item-cursor.h"
#include "item-edit.h"
#include "item-grid.h"
-#include "gnumeric-gconf.h"
+#include "gnumeric-conf.h"
#include "dead-kittens.h"
#include <gsf/gsf-impl-utils.h>
diff --git a/src/gnm-plugin.c b/src/gnm-plugin.c
index 941fe58..82666ab 100644
--- a/src/gnm-plugin.c
+++ b/src/gnm-plugin.c
@@ -11,7 +11,7 @@
#include <tools/gnm-solver.h>
#include "func.h"
#include "gnm-plugin.h"
-#include "gnumeric-gconf.h"
+#include "gnumeric-conf.h"
#include "application.h"
#include <goffice/goffice.h>
diff --git a/src/gnumeric-gconf.c b/src/gnumeric-conf.c
similarity index 99%
rename from src/gnumeric-gconf.c
rename to src/gnumeric-conf.c
index c588f40..d34d19b 100644
--- a/src/gnumeric-gconf.c
+++ b/src/gnumeric-conf.c
@@ -1,12 +1,12 @@
/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * gnumeric-gconf.c:
+ * gnumeric-conf.c:
*
* Author:
* Andreas J. Guelzow <aguelzow pyrshep ca>
*
* (C) Copyright 2002-2005 Andreas J. Guelzow <aguelzow pyrshep ca>
- * (C) Copyright 2009 Morten Welinder <terra gnome org>
+ * (C) Copyright 2009-2011 Morten Welinder <terra gnome org>
*
* Introduced the concept of "node" and implemented the win32 backend
* by Ivan, Wong Yat Cheung <email ivanwong info>, 2005
@@ -29,7 +29,7 @@
#include <gnumeric-config.h>
#include <gnumeric.h>
#include "application.h"
-#include "gnumeric-gconf.h"
+#include "gnumeric-conf.h"
#include "gutils.h"
#include "mstyle.h"
#include <goffice/goffice.h>
@@ -51,7 +51,7 @@
static GOConfNode *root = NULL;
/*
- * Hashes to simply ownership rules. We use this so none of the getters
+ * Hashes to simplify ownership rules. We use this so none of the getters
* have to return memory that the callers needs to free.
*/
static GHashTable *string_pool;
diff --git a/src/gnumeric-gconf.h b/src/gnumeric-conf.h
similarity index 100%
rename from src/gnumeric-gconf.h
rename to src/gnumeric-conf.h
diff --git a/src/gui-clipboard.c b/src/gui-clipboard.c
index da6268a..cb2269f 100644
--- a/src/gui-clipboard.c
+++ b/src/gui-clipboard.c
@@ -33,7 +33,7 @@
#include "stf-parse.h"
#include "mstyle.h"
#include "gnm-format.h"
-#include "gnumeric-gconf.h"
+#include "gnumeric-conf.h"
#include "xml-sax.h"
#include "gutils.h"
diff --git a/src/gui-file.c b/src/gui-file.c
index 327a359..390b8f4 100644
--- a/src/gui-file.c
+++ b/src/gui-file.c
@@ -20,7 +20,7 @@
#include "wbc-gtk-impl.h"
#include "workbook-view.h"
#include "workbook-priv.h"
-#include "gnumeric-gconf.h"
+#include "gnumeric-conf.h"
#include "application.h"
#include <dead-kittens.h>
diff --git a/src/libgnumeric.c b/src/libgnumeric.c
index 3bda506..5a22bc0 100644
--- a/src/libgnumeric.c
+++ b/src/libgnumeric.c
@@ -50,7 +50,7 @@
#include "expr.h"
#include "parse-util.h"
#include "rendered-value.h"
-#include "gnumeric-gconf.h"
+#include "gnumeric-conf.h"
#include "gnm-plugin.h"
#include "mathfunc.h"
#include "hlink.h"
diff --git a/src/main-application.c b/src/main-application.c
index 96a4b19..850df90 100644
--- a/src/main-application.c
+++ b/src/main-application.c
@@ -28,7 +28,7 @@
#include "workbook-view.h"
#include "workbook.h"
#include "gui-file.h"
-#include "gnumeric-gconf.h"
+#include "gnumeric-conf.h"
#include "gnumeric-paths.h"
#include "session.h"
#include "sheet.h"
diff --git a/src/mstyle.c b/src/mstyle.c
index 24342ec..1ca32a1 100644
--- a/src/mstyle.c
+++ b/src/mstyle.c
@@ -17,7 +17,7 @@
#include "style-conditions.h"
#include "application.h"
#include "gutils.h"
-#include "gnumeric-gconf.h"
+#include "gnumeric-conf.h"
#include <goffice/goffice.h>
#define DEBUG_STYLES
diff --git a/src/print-info.c b/src/print-info.c
index ac7e29a..5bac084 100644
--- a/src/print-info.c
+++ b/src/print-info.c
@@ -23,7 +23,7 @@
#include "value.h"
#include "workbook.h"
#include "workbook-view.h"
-#include "gnumeric-gconf.h"
+#include "gnumeric-conf.h"
#include "parse-util.h"
#include <goffice/goffice.h>
diff --git a/src/print.c b/src/print.c
index 1a87bf2..fc26f2a 100644
--- a/src/print.c
+++ b/src/print.c
@@ -29,7 +29,7 @@
#include "wbc-gtk.h"
#include "command-context.h"
#include "dialogs.h"
-#include "gnumeric-gconf.h"
+#include "gnumeric-conf.h"
#include "libgnumeric.h"
#include "sheet.h"
#include "value.h"
@@ -40,7 +40,7 @@
#include "ranges.h"
#include "parse-util.h"
#include "style-font.h"
-#include "gnumeric-gconf.h"
+#include "gnumeric-conf.h"
#include <goffice/goffice.h>
#include <gtk/gtk.h>
diff --git a/src/ranges.c b/src/ranges.c
index 3c94186..31d3ed6 100644
--- a/src/ranges.c
+++ b/src/ranges.c
@@ -24,7 +24,7 @@
#include "cell.h"
#include "style.h"
#include "workbook.h"
-#include "gnumeric-gconf.h"
+#include "gnumeric-conf.h"
#include <stdlib.h>
#include <glib.h>
diff --git a/src/sheet-control-gui.c b/src/sheet-control-gui.c
index d576854..5c2549f 100644
--- a/src/sheet-control-gui.c
+++ b/src/sheet-control-gui.c
@@ -55,7 +55,7 @@
#include "ranges.h"
#include "xml-sax.h"
#include "style-color.h"
-#include "gnumeric-gconf.h"
+#include "gnumeric-conf.h"
#include "gnm-pane-impl.h"
#include "item-bar.h"
diff --git a/src/sheet-view.c b/src/sheet-view.c
index 4ef7d91..d30a999 100644
--- a/src/sheet-view.c
+++ b/src/sheet-view.c
@@ -41,7 +41,7 @@
#include "parse-util.h"
#include "expr-name.h"
#include "command-context.h"
-#include "gnumeric-gconf.h"
+#include "gnumeric-conf.h"
#include <gsf/gsf-impl-utils.h>
diff --git a/src/sheet.c b/src/sheet.c
index b1b2a7d..4e79292 100644
--- a/src/sheet.c
+++ b/src/sheet.c
@@ -53,7 +53,7 @@
#include "expr.h"
#include "expr-impl.h"
#include "rendered-value.h"
-#include "gnumeric-gconf.h"
+#include "gnumeric-conf.h"
#include "sheet-object-impl.h"
#include "sheet-object-cell-comment.h"
#include <tools/gnm-solver.h>
diff --git a/src/stf-export.c b/src/stf-export.c
index 8785fac..6ca7c38 100644
--- a/src/stf-export.c
+++ b/src/stf-export.c
@@ -30,7 +30,7 @@
#include <glib/gi18n-lib.h>
#include "stf-export.h"
-#include "gnumeric-gconf.h"
+#include "gnumeric-conf.h"
#include "sheet.h"
#include "workbook.h"
#include "cell.h"
diff --git a/src/style.c b/src/style.c
index 0ef9a31..3a494d8 100644
--- a/src/style.c
+++ b/src/style.c
@@ -22,7 +22,7 @@
#include "gui-util.h"
#include "mathfunc.h"
-#include "gnumeric-gconf.h"
+#include "gnumeric-conf.h"
#include <pango/pangocairo.h>
#include <gdk/gdk.h>
diff --git a/src/tools/auto-correct.c b/src/tools/auto-correct.c
index 85aadff..26f5b0a 100644
--- a/src/tools/auto-correct.c
+++ b/src/tools/auto-correct.c
@@ -31,7 +31,7 @@
#include "application.h"
#include "gutils.h"
-#include "gnumeric-gconf.h"
+#include "gnumeric-conf.h"
#include "parse-util.h"
#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
diff --git a/src/wbc-gtk-actions.c b/src/wbc-gtk-actions.c
index 366d344..46377d6 100644
--- a/src/wbc-gtk-actions.c
+++ b/src/wbc-gtk-actions.c
@@ -61,7 +61,7 @@
#include "sheet-object-component.h"
#include "gui-util.h"
#include "gui-file.h"
-#include "gnumeric-gconf.h"
+#include "gnumeric-conf.h"
#include "expr.h"
#include "print.h"
#include "print-info.h"
diff --git a/src/wbc-gtk-edit.c b/src/wbc-gtk-edit.c
index 70fd46f..0bb3332 100644
--- a/src/wbc-gtk-edit.c
+++ b/src/wbc-gtk-edit.c
@@ -32,7 +32,7 @@
#include "clipboard.h"
#include "complete-sheet.h"
#include "commands.h"
-#include "gnumeric-gconf.h"
+#include "gnumeric-conf.h"
#include "mstyle.h"
#include "style-color.h"
#include "sheet-control-gui-priv.h"
diff --git a/src/wbc-gtk.c b/src/wbc-gtk.c
index 6ac84eb..6f95446 100644
--- a/src/wbc-gtk.c
+++ b/src/wbc-gtk.c
@@ -43,7 +43,7 @@
#include "expr-impl.h"
#include "style-color.h"
#include "style-border.h"
-#include "gnumeric-gconf.h"
+#include "gnumeric-conf.h"
#include "dialogs/dialogs.h"
#include "widgets/widget-editable-label.h"
#include "pixmaps/gnumeric-stock-pixbufs.h"
diff --git a/src/widgets/gnumeric-expr-entry.c b/src/widgets/gnumeric-expr-entry.c
index cc98154..ad678c6 100644
--- a/src/widgets/gnumeric-expr-entry.c
+++ b/src/widgets/gnumeric-expr-entry.c
@@ -33,7 +33,7 @@
#include <gnm-format.h>
#include <number-match.h>
#include <gnm-datetime.h>
-#include <gnumeric-gconf.h>
+#include <gnumeric-conf.h>
#include <dead-kittens.h>
#include <dialogs/dialogs.h>
#include <goffice/goffice.h>
diff --git a/src/workbook-view.c b/src/workbook-view.c
index 7ef6228..bf2ee9a 100644
--- a/src/workbook-view.c
+++ b/src/workbook-view.c
@@ -50,7 +50,7 @@
#include "command-context.h"
#include "auto-format.h"
#include "sheet-object.h"
-#include "gnumeric-gconf.h"
+#include "gnumeric-conf.h"
#include <goffice/goffice.h>
#include <gsf/gsf.h>
diff --git a/src/workbook.c b/src/workbook.c
index d3f0101..9535dc6 100644
--- a/src/workbook.c
+++ b/src/workbook.c
@@ -21,7 +21,7 @@
#include "workbook-control.h"
#include "command-context.h"
#include "application.h"
-#include "gnumeric-gconf.h"
+#include "gnumeric-conf.h"
#include "sheet.h"
#include "sheet-view.h"
#include "sheet-control.h"
diff --git a/src/xml-sax-write.c b/src/xml-sax-write.c
index f0a6a73..0d594de 100644
--- a/src/xml-sax-write.c
+++ b/src/xml-sax-write.c
@@ -54,7 +54,7 @@
#include <gutils.h>
#include <clipboard.h>
#include <tools/scenarios.h>
-#include <gnumeric-gconf.h>
+#include <gnumeric-conf.h>
#include <goffice/goffice.h>
#include <gsf/gsf-libxml.h>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]