diff options
| author | Jody Goldberg <jody@src.gnome.org> | 2002-05-29 13:03:53 +0800 |
|---|---|---|
| committer | Jody Goldberg <jody@src.gnome.org> | 2002-05-29 13:03:53 +0800 |
| commit | 10df4e1be4d3dc30eb85a6a7c137a4622134fd87 (patch) | |
| tree | 31f35c205c8eb1a126b43812ae8b47d26ff14458 | |
| parent | 8e173c28c6d6f54cf0f8644d9045e4e8846915e1 (diff) | |
| download | gsoc2013-evolution-10df4e1be4d3dc30eb85a6a7c137a4622134fd87.tar gsoc2013-evolution-10df4e1be4d3dc30eb85a6a7c137a4622134fd87.tar.gz gsoc2013-evolution-10df4e1be4d3dc30eb85a6a7c137a4622134fd87.tar.bz2 gsoc2013-evolution-10df4e1be4d3dc30eb85a6a7c137a4622134fd87.tar.lz gsoc2013-evolution-10df4e1be4d3dc30eb85a6a7c137a4622134fd87.tar.xz gsoc2013-evolution-10df4e1be4d3dc30eb85a6a7c137a4622134fd87.tar.zst gsoc2013-evolution-10df4e1be4d3dc30eb85a6a7c137a4622134fd87.zip | |
make things compile again
svn path=/branches/gal-2/; revision=17030
| -rw-r--r-- | e-util/e-util.c | 1 | ||||
| -rw-r--r-- | widgets/menus/gal-view-etable.h | 5 | ||||
| -rw-r--r-- | widgets/misc/e-gui-utils.h | 1 | ||||
| -rw-r--r-- | widgets/table/e-cell-vbox.h | 9 | ||||
| -rw-r--r-- | widgets/table/e-table-memory-store.h | 5 | ||||
| -rw-r--r-- | widgets/table/e-table-simple.h | 6 | ||||
| -rw-r--r-- | widgets/table/e-table.h | 1 | ||||
| -rw-r--r-- | widgets/table/e-tree-model.h | 5 |
8 files changed, 11 insertions, 22 deletions
diff --git a/e-util/e-util.c b/e-util/e-util.c index f4e16f24b1..60e34cdb28 100644 --- a/e-util/e-util.c +++ b/e-util/e-util.c @@ -37,7 +37,6 @@ #include <stdio.h> #include <stdlib.h> #include <time.h> -#include <libgnome/gnome-defs.h> #include <libgnome/gnome-util.h> #include <math.h> diff --git a/widgets/menus/gal-view-etable.h b/widgets/menus/gal-view-etable.h index 2fd001e583..d11b1e4813 100644 --- a/widgets/menus/gal-view-etable.h +++ b/widgets/menus/gal-view-etable.h @@ -24,7 +24,6 @@ #ifndef _GAL_VIEW_ETABLE_H_ #define _GAL_VIEW_ETABLE_H_ -#include <libgnome/gnome-defs.h> #include <gtk/gtkobject.h> #include <gal/menus/gal-view.h> #include <gal/e-table/e-table-state.h> @@ -32,7 +31,7 @@ #include <gal/e-table/e-table.h> #include <gal/e-table/e-tree.h> -BEGIN_GNOME_DECLS +G_BEGIN_DECLS #define GAL_VIEW_ETABLE_TYPE (gal_view_etable_get_type ()) #define GAL_VIEW_ETABLE(o) (GTK_CHECK_CAST ((o), GAL_VIEW_ETABLE_TYPE, GalViewEtable)) @@ -73,6 +72,6 @@ void gal_view_etable_attach_tree (GalViewEtable *view, ETree *tree); void gal_view_etable_detach (GalViewEtable *view); -END_GNOME_DECLS +G_END_DECLS #endif /* _GAL_VIEW_ETABLE_H_ */ diff --git a/widgets/misc/e-gui-utils.h b/widgets/misc/e-gui-utils.h index 136cde542f..43b1c0b0f2 100644 --- a/widgets/misc/e-gui-utils.h +++ b/widgets/misc/e-gui-utils.h @@ -28,7 +28,6 @@ #include <gtk/gtkwindow.h> #include <libgnomeui/gnome-messagebox.h> -#include <libgnome/gnome-defs.h> #include <glade/glade-xml.h> G_BEGIN_DECLS diff --git a/widgets/table/e-cell-vbox.h b/widgets/table/e-cell-vbox.h index c5207561f5..f815d40512 100644 --- a/widgets/table/e-cell-vbox.h +++ b/widgets/table/e-cell-vbox.h @@ -30,11 +30,10 @@ #ifndef _E_CELL_VBOX_H_ #define _E_CELL_VBOX_H_ -#include <libgnomeui/gnome-canvas.h> +#include <libgnomecanvas/gnome-canvas.h> #include <gal/e-table/e-cell.h> -#include <libgnome/gnome-defs.h> -BEGIN_GNOME_DECLS +G_BEGIN_DECLS #define E_CELL_VBOX_TYPE (e_cell_vbox_get_type ()) #define E_CELL_VBOX(o) (GTK_CHECK_CAST ((o), E_CELL_VBOX_TYPE, ECellVbox)) @@ -61,8 +60,6 @@ void e_cell_vbox_append (ECellVbox *vbox, int model_col); -END_GNOME_DECLS +G_END_DECLS #endif /* _E_CELL_VBOX_H_ */ - - diff --git a/widgets/table/e-table-memory-store.h b/widgets/table/e-table-memory-store.h index c4d7f2bfe3..e484d40cb8 100644 --- a/widgets/table/e-table-memory-store.h +++ b/widgets/table/e-table-memory-store.h @@ -26,9 +26,8 @@ #include <gal/e-table/e-table-memory.h> #include <gal/e-table/e-table-memory-callbacks.h> -#include <libgnome/gnome-defs.h> -BEGIN_GNOME_DECLS +G_BEGIN_DECLS #define E_TABLE_MEMORY_STORE_TYPE (e_table_memory_store_get_type ()) #define E_TABLE_MEMORY_STORE(o) (GTK_CHECK_CAST ((o), E_TABLE_MEMORY_STORE_TYPE, ETableMemoryStore)) @@ -117,6 +116,6 @@ void e_table_memory_store_remove (ETableMemoryStore int row); void e_table_memory_store_clear (ETableMemoryStore *etms); -END_GNOME_DECLS +G_END_DECLS #endif /* _E_TABLE_MEMORY_STORE_H_ */ diff --git a/widgets/table/e-table-simple.h b/widgets/table/e-table-simple.h index 6dfe28f573..36ffa02de9 100644 --- a/widgets/table/e-table-simple.h +++ b/widgets/table/e-table-simple.h @@ -26,9 +26,8 @@ #define _E_TABLE_SIMPLE_H_ #include <gal/e-table/e-table-model.h> -#include <libgnome/gnome-defs.h> -BEGIN_GNOME_DECLS +G_BEGIN_DECLS #define E_TABLE_SIMPLE_TYPE (e_table_simple_get_type ()) #define E_TABLE_SIMPLE(o) (GTK_CHECK_CAST ((o), E_TABLE_SIMPLE_TYPE, ETableSimple)) @@ -117,7 +116,6 @@ char *e_table_simple_string_value_to_string (ETableModel const void *val, void *data); -END_GNOME_DECLS +G_END_DECLS #endif /* _E_TABLE_SIMPLE_H_ */ - diff --git a/widgets/table/e-table.h b/widgets/table/e-table.h index 37ef5002d2..5e4da26aba 100644 --- a/widgets/table/e-table.h +++ b/widgets/table/e-table.h @@ -41,7 +41,6 @@ #include <gal/e-table/e-table-state.h> #include <gal/e-table/e-table-sorter.h> #include <gal/e-table/e-table-search.h> -#include <libgnome/gnome-defs.h> G_BEGIN_DECLS diff --git a/widgets/table/e-tree-model.h b/widgets/table/e-tree-model.h index 04adde3072..c6dbc1a79d 100644 --- a/widgets/table/e-tree-model.h +++ b/widgets/table/e-tree-model.h @@ -27,9 +27,8 @@ #include <gdk-pixbuf/gdk-pixbuf.h> #include <gtk/gtkobject.h> -#include <libgnome/gnome-defs.h> -BEGIN_GNOME_DECLS +G_BEGIN_DECLS #define E_TREE_MODEL_TYPE (e_tree_model_get_type ()) @@ -220,6 +219,6 @@ void e_tree_model_node_deleted (ETreeModel *tree_model, void e_tree_model_node_request_collapse (ETreeModel *tree_model, ETreePath deleted_node); -END_GNOME_DECLS +G_END_DECLS #endif /* _E_TREE_MODEL_H */ |