Made all of the header inclussion conditionals consistent

src/cell.h

@@ -52,7 +52,7 @@ typedef struct {
 typedef GList CellList;
 
 #define CELL_TEXT_GET(cell) ((cell)->text ? cell->text->str : cell->entered_text->str)
-#define CELL_IS_FORMULA(cell) (cell->entered_text->str [0] == '=')
+#define CELL_IS_FORMULA(cell) ((cell)->entered_text->str [0] == '=')
 
 typedef enum {
 	CELL_COPY_TYPE_CELL,

src/clipboard.h

-#ifndef CLIPBOARD_H
-#define CLIPBOARD_H
+#ifndef GNUMERIC_CLIPBOARD_H
+#define GNUMERIC_CLIPBOARD_H
 
 enum {
 	PASTE_VALUES   = 0,
@@ -32,4 +32,4 @@ void        clipboard_release            (CellRegion *region);
 
 void        x_clipboard_bind_workbook    (Workbook *wb);
 	
-#endif
+#endif /* GNUMERIC_CLIPBOARD_H */

src/color.h

-#ifndef COLOR_H
-#define COLOR_H
+#ifndef GNUMERIC_COLOR_H
+#define GNUMERIC_COLOR_H
 
 void     color_init      (void);
 
@@ -11,4 +11,4 @@ void     color_alloc_gdk  (GdkColor *color);
 /* Colors used by any GnumericSheet item */
 extern GdkColor gs_white, gs_light_gray, gs_dark_gray, gs_black, gs_red;
 
-#endif
+#endif /* GNUMERIC_COLOR_H */

src/cursors.h

-#ifndef CURSORS_H
-#define CURSORS_H
+#ifndef GNUMERIC_CURSORS_H
+#define GNUMERIC_CURSORS_H
 
 typedef struct {
 	GdkCursor *cursor;
@@ -22,4 +22,4 @@ void    cursors_shutdown  (void);
 #define cursor_set_widget(w,c) \
 	gdk_window_set_cursor (GTK_WIDGET (w)->window, gnumeric_cursors [c].cursor)
 
-#endif
+#endif /* GNUMERIC_CURSORS_H */

src/dependent.h

-#ifndef EVAL_H
-#define EVAL_H
+#ifndef GNUMERIC_EVAL_H
+#define GNUMERIC_EVAL_H
 
 /*
  * A DependencyRange defines a range of cells whose values
@@ -50,5 +50,5 @@ void cell_queue_recalc_list      (GList *list);
  */
 void cell_eval                   (Cell *cell);
 
-#endif
+#endif /* GNUMERIC_EVAL_H */
 

src/dialogs.h

-#ifndef DIALOGS_H
-#define DIALOGS_H
+#ifndef GNUMERIC_DIALOGS_H
+#define GNUMERIC_DIALOGS_H
 
 void  dialog_goto_cell       (Workbook *wb);
 void  dialog_cell_format     (Sheet *sheet);
@@ -10,4 +10,4 @@ void  dialog_zoom            (Sheet *sheet);
 char *dialog_query_load_file (void);
 void  dialog_about           (void);
 
-#endif
+#endif /* GNUMERIC_DIALOGS_H */

src/dialogs/dialogs.h

-#ifndef DIALOGS_H
-#define DIALOGS_H
+#ifndef GNUMERIC_DIALOGS_H
+#define GNUMERIC_DIALOGS_H
 
 void  dialog_goto_cell       (Workbook *wb);
 void  dialog_cell_format     (Sheet *sheet);
@@ -10,4 +10,4 @@ void  dialog_zoom            (Sheet *sheet);
 char *dialog_query_load_file (void);
 void  dialog_about           (void);
 
-#endif
+#endif /* GNUMERIC_DIALOGS_H */

src/eval.h

-#ifndef EVAL_H
-#define EVAL_H
+#ifndef GNUMERIC_EVAL_H
+#define GNUMERIC_EVAL_H
 
 /*
  * A DependencyRange defines a range of cells whose values
@@ -50,5 +50,5 @@ void cell_queue_recalc_list      (GList *list);
  */
 void cell_eval                   (Cell *cell);
 
-#endif
+#endif /* GNUMERIC_EVAL_H */
 

src/expr.h

-#ifndef EXPR_H
-#define EXPR_H
+#ifndef GNUMERIC_EXPR_H
+#define GNUMERIC_EXPR_H
 
 typedef enum {
 	OPER_EQUAL,
@@ -169,4 +169,4 @@ int         yyparse              (void);
 void        functions_init       (void);
 void        constants_init       (void);
 
-#endif
+#endif /* GNUMERIC_EXPR_H */

src/format.h

-#ifndef FORMAT_H_
-#define FORMAT_H_
+#ifndef GNUMERIC_FORMAT_H
+#define GNUMERIC_FORMAT_H
 
 void   format_destroy (StyleFormat *format);
 void   format_compile (StyleFormat *format);
@@ -7,4 +7,4 @@ gchar *format_value   (StyleFormat *format, Value *value, StyleColor **color);
 
 void   format_color_init     (void);
 void   format_color_shutdown (void);
-#endif
+#endif /* GNUMERIC_FORMAT_H */

src/gutils.h

-#ifndef G_UTILS_H
-#define G_UTILS_H
+#ifndef GNUMERIC_UTILS_H
+#define GNUMERIC_UTILS_H
 
 /* Gets an integer in the buffer in start to end */
 void      int_get_from_range   (char *start, char *end, int_t *t);
@@ -11,4 +11,4 @@ char      *cellref_name        (CellRef *cell_ref, int eval_col, int eval_row);
 int       parse_cell_name      (char *cell_str, int *col, int *row);
 char      *col_name            (int col);
 
-#endif
+#endif /* GNUMERIC_UTILS_H */

src/item-bar.h

-#ifndef ITEM_BAR_H
-#define ITEM_BAR_H
+#ifndef GNUMERIC_ITEM_BAR_H
+#define GNUMERIC_ITEM_BAR_H
 
 #define ITEM_BAR(obj)          (GTK_CHECK_CAST((obj), item_bar_get_type (), ItemBar))
 #define ITEM_BAR_CLASS(k)      (GTK_CHECK_CLASS_CAST ((k), item_bar_get_type ()))
@@ -40,4 +40,4 @@ typedef struct {
 	void (* size_changed)      (ItemBar *, int column, int new_width);
 } ItemBarClass;
 
-#endif
+#endif /* GNUMERIC_ITEM_BAR_H */

src/item-cursor.h

-#ifndef ITEM_CURSOR_H
-#define ITEM_CURSOR_H
+#ifndef GNUMERIC_ITEM_CURSOR_H
+#define GNUMERIC_ITEM_CURSOR_H
 
 #define ITEM_CURSOR(obj)          (GTK_CHECK_CAST((obj), item_cursor_get_type (), ItemCursor))
 #define ITEM_CURSOR_CLASS(k)      (GTK_CHECK_CLASS_CAST ((k), item_cursor_get_type ()))
@@ -57,5 +57,4 @@ void item_cursor_set_bounds     (ItemCursor *item_cursor,
 void item_cursor_set_visibility (ItemCursor *item_cursor,
 				 int visible);
 
-#endif
-
+#endif /* GNUMERIC_ITEM_CURSOR_H */

src/item-edit.h

-#ifndef ITEM_EDIT_H
-#define ITEM_EDIT_H
+#ifndef GNUMERIC_ITEM_EDIT_H
+#define GNUMERIC_ITEM_EDIT_H
 
 #define ITEM_EDIT(obj)          (GTK_CHECK_CAST((obj), item_edit_get_type (), ItemEdit))
 #define ITEM_EDIT_CLASS(k)      (GTK_CHECK_CLASS_CAST ((k), item_edit_get_type ()))
@@ -29,5 +29,4 @@ typedef struct {
 	GnomeCanvasItemClass parent_class;
 } ItemEditClass;
 
-
-#endif
+#endif /* GNUMERIC_ITEM_EDIT_H */

src/item-grid.h

-#ifndef ITEM_GRID_H
-#define ITEM_GRID_H
+#ifndef GNUMERIC_ITEM_GRID_H
+#define GNUMERIC_ITEM_GRID_H
 
 #define ITEM_GRID(obj)          (GTK_CHECK_CAST((obj), item_grid_get_type (), ItemGrid))
 #define ITEM_GRID_CLASS(k)      (GTK_CHECK_CLASS_CAST ((k), item_grid_get_type ()))
@@ -40,4 +40,4 @@ typedef struct {
 	GnomeCanvasItemClass parent_class;
 } ItemGridClass;
 
-#endif
+#endif /* GNUMERIC_ITEM_GRID_H */

src/number-match.h

-#ifndef GNUMERIC_NUMBER_MATCH
-#define GNUMERIC_NUMBER_MATCH
+#ifndef GNUMERIC_NUMBER_MATCH_H
+#define GNUMERIC_NUMBER_MATCH_H
 
 int      format_match_define (char *format);
 void     format_match_init   (void);
 void     format_match_finish (void);
 gboolean format_match        (char *s, double *v, char **format);
 
-#endif
+#endif /* GNUMERIC_NUMBER_MATCH_H */

src/numbers.h

+#ifndef GNUMERIC_NUMBERS_H
+#define GNUMERIC_NUMBERS_H
 #ifdef GNUMERIC_USE_GMP
 
 #include <gmp.h>
@@ -33,4 +35,4 @@ typedef int    int_t;
 #define mpf_neg(a,b) a = -b
 #endif
 
-
+#endif /* GNUMERIC_NUMBERS_H */

src/parser.y

@@ -169,8 +169,6 @@ exp:	  NUMBER 	{ $$ = $1 }
 	}
 
 	| '(' exp ')'  {
-		$$ = p_new (ExprTree);
-		$$->ref_count = 1;
 		$$ = $2;
 	}
 

src/pattern-selector.h

-#ifndef PATTERN_SELECTOR_H
-#define PATTERN_SELECTOR_H
+#ifndef GNUMERIC_PATTERN_SELECTOR_H
+#define GNUMERIC_PATTERN_SELECTOR_H
 
 #define PATTERN_SELECTOR_TYPE     (pattern_selector_get_type ())
 #define PATTERN_SELECTOR(obj)     (GTK_CHECK_CAST((obj), PATTERN_SELECTOR_TYPE, PatternSelector))
@@ -22,4 +22,4 @@ GtkType     pattern_selector_get_type   (void);
 GtkWidget  *pattern_selector_new        (int pattern);
 void        pattern_selector_select     (PatternSelector *ps, int pattern);
 
-#endif
+#endif /* GNUMERIC_PATTERN_SELECTOR_H */

src/pixmaps.h

+#ifndef GNUMERIC_PIXMAPS_H
+#define GNUMERIC_PIXMAPS_H
+
 #include "pixmaps/align-center.xpm"
 #include "pixmaps/align-left.xpm"
 #include "pixmaps/align-right.xpm"
@@ -7,3 +10,5 @@
 #include "pixmaps/oval.xpm"
 #include "pixmaps/bold.xpm"
 #include "pixmaps/italic.xpm"
+
+#endif /* GNUMERIC_PIXMAPS_H */

src/plugin.h

-#ifndef _PLUGIN_H
-#define _PLUGIN_H
+#ifndef GNUMERIC_PLUGIN_H
+#define GNUMERIC_PLUGIN_H
 
 #include <gmodule.h>
 
@@ -24,4 +24,4 @@ PluginData    *plugin_load           (gchar *filename);
 void           plugin_unload         (PluginData *pd);
 GtkWidget     *plugin_manager_new    (void);
 
-#endif
+#endif /* GNUMERIC_PLUGIN_H */

src/render-ascii.h

-#ifndef RENDER_ASCII_H
-#define RENDER_ASCII_H
+#ifndef GNUMERIC_RENDER_ASCII_H
+#define GNUMERIC_RENDER_ASCII_H
 
 char *cell_region_render_ascii (CellRegion *cr);
 	
-#endif
+#endif /* GNUMERIC_RENDER_ASCII_H */

src/sheet-autofill.h

-#ifndef SHEET_AUTOFILL
-#define SHEET_AUTOFILL
+#ifndef GNUMERIC_SHEET_AUTOFILL_H
+#define GNUMERIC_SHEET_AUTOFILL_H
 
 typedef int (*AutofillFunction)     (Sheet *sheet,
 				     int base_col, int base_row,
@@ -13,4 +13,4 @@ void    sheet_autofill              (Sheet *sheet,
 				     int w,        int h,
 				     int end_col,  int end_row);
 
-#endif
+#endif /* GNUMERIC_SHEET_AUTOFILL_H */

src/sheet-control-gui.h

-#ifndef SHEET_VIEW_H
-#define SHEET_VIEW_H
+#ifndef GNUMERIC_SHEET_VIEW_H
+#define GNUMERIC_SHEET_VIEW_H
 
 #include <gtk/gtktable.h>
 
@@ -60,4 +60,4 @@ typedef struct {
 	GtkTableClass parent_class;
 } SheetViewClass;
 
-#endif /* SHEET_VIEW_H */
+#endif /* GNUMERIC_SHEET_VIEW_H */

src/sheet-object.h

-#ifndef SHEET_OBJECT_H
-#define SHEET_OBJECT_H
+#ifndef GNUMERIC_SHEET_OBJECT_H
+#define GNUMERIC_SHEET_OBJECT_H
 
 typedef enum {
 	SHEET_OBJECT_LINE,
@@ -59,5 +59,5 @@ void             sheet_object_make_current   (Sheet *sheet,
 void             sheet_object_register       (Sheet *sheet,
 					      SheetObject *object);
 
-#endif
+#endif /* GNUMERIC_SHEET_OBJECT_H */
 

src/sheet-view.h

-#ifndef SHEET_VIEW_H
-#define SHEET_VIEW_H
+#ifndef GNUMERIC_SHEET_VIEW_H
+#define GNUMERIC_SHEET_VIEW_H
 
 #include <gtk/gtktable.h>
 
@@ -60,4 +60,4 @@ typedef struct {
 	GtkTableClass parent_class;
 } SheetViewClass;
 
-#endif /* SHEET_VIEW_H */
+#endif /* GNUMERIC_SHEET_VIEW_H */

src/sheet.c

@@ -637,6 +637,14 @@ sheet_set_text (Sheet *sheet, int col, int row, char *str)
 
 	text = gtk_entry_get_text (GTK_ENTRY (sheet->workbook->ea_input));
 
+	if (*text == '@'){
+		char *new_text = g_strdup (text);
+		
+		*new_text = '=';
+		gtk_entry_set_text (GTK_ENTRY (sheet->workbook->ea_input), new_text);
+		g_free (new_text);
+	}
+	
 	/*
 	 * Figure out if a format matches, and for sanity compare that to
 	 * a rendered version of the text, if they compare equally, then

src/sheet.h

-#ifndef SHEET_H
-#define SHEET_H
+#ifndef GNUMERIC_SHEET_H
+#define GNUMERIC_SHEET_H
 
 #define SHEET_MAX_ROWS (16 * 1024)
 #define SHEET_MAX_COLS 256
@@ -358,5 +358,5 @@ void     workbook_feedback_set        (Workbook *,
 				       void *data);
 
 extern   Workbook *current_workbook;
-#endif
+#endif /* GNUMERIC_SHEET_H */
 

src/str.h

-#ifndef STRING_H
-#define STRING_H
+#ifndef GNUMERIC_STRING_H
+#define GNUMERIC_STRING_H
 
 typedef struct {
 	int        ref_count;
@@ -14,4 +14,4 @@ String *string_ref            (String *);
 void    string_unref          (String *);
 void    string_unref_ptr      (String **);
 
-#endif
+#endif /* GNUMERIC_STRING_H */

src/style-color.h

-#ifndef COLOR_H
-#define COLOR_H
+#ifndef GNUMERIC_COLOR_H
+#define GNUMERIC_COLOR_H
 
 void     color_init      (void);
 
@@ -11,4 +11,4 @@ void     color_alloc_gdk  (GdkColor *color);
 /* Colors used by any GnumericSheet item */
 extern GdkColor gs_white, gs_light_gray, gs_dark_gray, gs_black, gs_red;
 
-#endif
+#endif /* GNUMERIC_COLOR_H */

src/symbol.h

-#ifndef SYMBOL_H
-#define SYMBOL_H
+#ifndef GNUMERIC_SYMBOL_H
+#define GNUMERIC_SYMBOL_H
 
 typedef enum {
 	SYMBOL_FUNCTION,
@@ -26,4 +26,4 @@ Symbol *symbol_ref_string     (char *str);
 
 extern GHashTable *symbol_hash_table;
 
-#endif
+#endif /* GNUMERIC_SYMBOL_H */

src/utils.h

-#ifndef G_UTILS_H
-#define G_UTILS_H
+#ifndef GNUMERIC_UTILS_H
+#define GNUMERIC_UTILS_H
 
 /* Gets an integer in the buffer in start to end */
 void      int_get_from_range   (char *start, char *end, int_t *t);
@@ -11,4 +11,4 @@ char      *cellref_name        (CellRef *cell_ref, int eval_col, int eval_row);
 int       parse_cell_name      (char *cell_str, int *col, int *row);
 char      *col_name            (int col);
 
-#endif
+#endif /* GNUMERIC_UTILS_H */

src/xml-io.h

@@ -6,12 +6,12 @@
  * $Id$
  */
 
-#ifndef __GNUMERIC_XML_IO__
-#define __GNUMERIC_XML_IO__
+#ifndef GNUMERIC_XML_IO_H
+#define GNUMERIC_XML_IO_H
 
 Sheet*    gnumericReadXmlSheet     (const char *filename);
 int       gnumericWriteXmlSheet    (Sheet *sheet, const char *filename);
 Workbook* gnumericReadXmlWorkbook  (const char *filename);
 int       gnumericWriteXmlWorkbook (Workbook *sheet, const char *filename);
 
-#endif /* __GNUMERIC_XML_IO__ */
+#endif /* GNUMERIC_XML_IO_H */