** Fixes bug #564543

2009-01-14  Matthew Barnes  <mbarnes@redhat.com>

	** Fixes bug #564543

	* configure.in:
	Bump gtk_minimum_version to 2.14.0.

	* libedataserverui/e-categories-dialog.c:
	* libedataserverui/e-cell-renderer-color.c:
	* libedataserverui/e-contact-store.h:
	* libedataserverui/e-destination-store.h:
	* libedataserverui/e-name-selector-dialog.c:
	* libedataserverui/e-name-selector-dialog.h:
	* libedataserverui/e-name-selector-entry.h:
	* libedataserverui/e-name-selector-list.c:
	* libedataserverui/e-passwords.c:
	* libedataserverui/e-source-option-menu.c:
	* libedataserverui/e-source-selector-dialog.c:
	* libedataserverui/e-tree-model-generator.c:
	* libedataserverui/e-tree-model-generator.h:
	Fix what we can with GSEAL_ENABLE defined.

	* calendar/backends/caldav/e-cal-backend-caldav.c (caldav_debug_setup):
	* servers/exchange/lib/e2k-context.c (e2k_context_set_auth):
	Call soup_session_add_feature() instead of soup_logger_attach().

	* servers/exchange/lib/e2k-context.c (e2k_context_fba):
	* servers/google/libgdata-google/gdata-google-service.c
	(gdata_google_service_authenticate):
	Call soup_form_encode_hash() instead of soup_form_encode_urlencoded().


svn path=/trunk/; revision=9932

1 files changed, 22 insertions, 10 deletions

diff --git a/libedataserverui/e-tree-model-generator.h b/libedataserverui/e-tree-model-generator.h
index 78902e6e4..1b82ee212 100644
--- a/libedataserverui/e-tree-model-generator.h
+++ b/libedataserverui/e-tree-model-generator.h
@@ -25,14 +25,26 @@
 
 #include <gtk/gtk.h>
 
-G_BEGIN_DECLS
+/* Standard GObject macros */
+#define E_TYPE_TREE_MODEL_GENERATOR \
+	(e_tree_model_generator_get_type ())
+#define E_TREE_MODEL_GENERATOR(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_TREE_MODEL_GENERATOR, ETreeModelGenerator))
+#define E_TREE_MODEL_GENERATOR_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_TREE_MODEL_GENERATOR, ETreeModelGeneratorClass))
+#define E_IS_TREE_MODEL_GENERATOR(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_TREE_MODEL_GENERATOR))
+#define E_IS_TREE_MODEL_GENERATOR_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_TREE_MODEL_GENERATOR))
+#define E_TREE_MODEL_GENERATOR_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_TREE_MODEL_GENERATOR, ETreeModelGeneratorClass))
 
-#define E_TYPE_TREE_MODEL_GENERATOR            (e_tree_model_generator_get_type ())
-#define E_TREE_MODEL_GENERATOR(obj)	       (GTK_CHECK_CAST ((obj), E_TYPE_TREE_MODEL_GENERATOR, ETreeModelGenerator))
-#define E_TREE_MODEL_GENERATOR_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_TREE_MODEL_GENERATOR, ETreeModelGeneratorClass))
-#define E_IS_TREE_MODEL_GENERATOR(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_TREE_MODEL_GENERATOR))
-#define E_IS_TREE_MODEL_GENERATOR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_TREE_MODEL_GENERATOR))
-#define E_TREE_MODEL_GENERATOR_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), E_TYPE_TREE_MODEL_GENERATOR, ETreeModelGeneratorClass))
+G_BEGIN_DECLS
 
 typedef gint (*ETreeModelGeneratorGenerateFunc) (GtkTreeModel *model, GtkTreeIter *child_iter,
 						 gpointer data);
@@ -63,17 +75,17 @@ struct _ETreeModelGenerator {
 	gpointer                         modify_func_data;
 };
 
-GtkType              e_tree_model_generator_get_type                   (void);
+GType                e_tree_model_generator_get_type                   (void);
 
 ETreeModelGenerator *e_tree_model_generator_new                        (GtkTreeModel *child_model);
 GtkTreeModel        *e_tree_model_generator_get_model                  (ETreeModelGenerator *tree_model_generator);
 
 void                 e_tree_model_generator_set_generate_func          (ETreeModelGenerator *tree_model_generator,
 									ETreeModelGeneratorGenerateFunc func,
-									gpointer data, GtkDestroyNotify destroy);
+									gpointer data, GDestroyNotify destroy);
 void                 e_tree_model_generator_set_modify_func            (ETreeModelGenerator *tree_model_generator,
 									ETreeModelGeneratorModifyFunc func,
-									gpointer data, GtkDestroyNotify destroy);
+									gpointer data, GDestroyNotify destroy);
 
 GtkTreePath         *e_tree_model_generator_convert_child_path_to_path (ETreeModelGenerator *tree_model_generator,
 									GtkTreePath *child_path);