[gnumeric] compilation: avoid reserved identifier.
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] compilation: avoid reserved identifier.
- Date: Wed, 28 Jul 2010 00:25:31 +0000 (UTC)
commit a67b47bb9abfbb0bbf747dfe93d53340a166bd76
Author: Morten Welinder <terra gnome org>
Date: Tue Jul 27 20:25:12 2010 -0400
compilation: avoid reserved identifier.
src/dialogs/ChangeLog | 27 ++++++++++++++++-----------
src/dialogs/dialog-function-select.c | 6 +++---
2 files changed, 19 insertions(+), 14 deletions(-)
---
diff --git a/src/dialogs/ChangeLog b/src/dialogs/ChangeLog
index bb7fbdc..7cffedd 100644
--- a/src/dialogs/ChangeLog
+++ b/src/dialogs/ChangeLog
@@ -1,7 +1,12 @@
+2010-07-27 Morten Welinder <terra gnome org>
+
+ * dialog-function-select.c (mode_t): Rename to DialogMode since
+ mode_t is reserved (and actually used by mingw).
+
2010-07-26 Andreas J. Guelzow <aguelzow pyrshep ca>
* dialog-search.c (dialog_search_save_in_prefs): fix type
-
+
2010-07-25 Andreas J. Guelzow <aguelzow pyrshep ca>
* dialog-search.c (dialog_search_save_in_prefs): new
@@ -12,9 +17,9 @@
2010-07-25 Andreas J. Guelzow <aguelzow pyrshep ca>
- * dialog-hyperlink.c (dialog_hyperlink): duplicate the hyperlink, it
+ * dialog-hyperlink.c (dialog_hyperlink): duplicate the hyperlink, it
may be used in many cells and we want to change it only here.
-
+
2010-07-22 Andreas J. Guelzow <aguelzow pyrshep ca>
* dialog-function-select.c (pref_tool_page_initializer): add checkboxes
@@ -30,14 +35,14 @@
* dialog-function-select.c (cb_dialog_function_select_destroy): handle
new field of state
(dialog_function_select_init): load new field of state
-
+
2010-07-21 Andreas J. Guelzow <aguelzow pyrshep ca>
- * dialog-function-select.c (cb_dialog_function_select_paste_clicked):
+ * dialog-function-select.c (cb_dialog_function_select_paste_clicked):
use the range passed if appropriate
(dialog_function_select_full): add arguments and save the passed range
info, change all callers
-
+
2010-07-20 Andreas J. Guelzow <aguelzow pyrshep ca>
* dialogs.h (dialog_function_select_paste): add arguments
@@ -45,12 +50,12 @@
2010-07-20 Andreas J. Guelzow <aguelzow pyrshep ca>
- * dialog-define-names.c (name_guru_init): set the window title for the
+ * dialog-define-names.c (name_guru_init): set the window title for the
paste dialog.
2010-07-20 Andreas J. Guelzow <aguelzow pyrshep ca>
- * dialog-function-select.c (cb_dialog_function_row_activated):
+ * dialog-function-select.c (cb_dialog_function_row_activated):
consider the current mode
(dialog_function_select_init): connect cb_dialog_function_row_activated
also in paste mode
@@ -69,13 +74,13 @@
* dialog-function-select.c (cb_dialog_function_row_activated): new
(dialog_function_select_init): connect cb_dialog_function_row_activated
-
+
2010-07-15 Andreas J. Guelzow <aguelzow pyrshep ca>
* dialog-workbook-attr.c (attr_dialog_init_cell_marker_page): new
(page_info): add new page
* workbook-attr.glade: add cell marker pane
-
+
2010-07-14 Andreas J. Guelzow <aguelzow pyrshep ca>
* dialog-preferences.c (custom_pref_conf_to_widget_ecd): new
@@ -83,7 +88,7 @@
(gnm_conf_get_core_file_save_extension_check_disabled_wrap): new
(custom_pref_create_widget_ecd): new
(pref_file_page_initializer): add disable-extension-check check box
-
+
2010-07-09 Morten Welinder <terra gnome org>
* dialog-stf-fixed-page.c (calc_char_index): add missing
diff --git a/src/dialogs/dialog-function-select.c b/src/dialogs/dialog-function-select.c
index 10aadba..7af194b 100644
--- a/src/dialogs/dialog-function-select.c
+++ b/src/dialogs/dialog-function-select.c
@@ -59,7 +59,7 @@ typedef enum {
GURU_MODE = 0,
HELP_MODE,
PASTE_MODE
-} mode_t;
+} DialogMode;
typedef struct {
WBCGtk *wbcg;
@@ -86,7 +86,7 @@ typedef struct {
char *prefix;
} paste;
- mode_t mode;
+ DialogMode mode;
char const *formula_guru_key;
} FunctionSelectState;
@@ -1334,7 +1334,7 @@ dialog_function_select_init (FunctionSelectState *state)
static void
dialog_function_select_full (WBCGtk *wbcg, char const *guru_key,
- char const *key, mode_t mode, gint from, gint to)
+ char const *key, DialogMode mode, gint from, gint to)
{
FunctionSelectState* state;
GladeXML *gui;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]