evolution-data-server r10055 - in trunk: . libedataserverui src

[mbarnes svn gnome org]

Author: mbarnes
Date: Sun Feb 15 03:20:04 2009
New Revision: 10055
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=10055&view=rev

Log:
2009-02-14  Matthew Barnes  <mbarnes redhat com>

	** Fixes part of bug #571761

	* src/server-interface-check.h:
	* libedataserverui/e-name-selector-list.h:
	Stop using deprecated GtkType macros.



Modified:
   trunk/ChangeLog
   trunk/libedataserverui/ChangeLog
   trunk/libedataserverui/e-name-selector-list.h
   trunk/src/server-interface-check.h

Modified: trunk/libedataserverui/e-name-selector-list.h
==============================================================================
--- trunk/libedataserverui/e-name-selector-list.h	(original)
+++ trunk/libedataserverui/e-name-selector-list.h	Sun Feb 15 03:20:04 2009
@@ -34,12 +34,24 @@
 
 G_BEGIN_DECLS
 
-#define E_TYPE_NAME_SELECTOR_LIST            (e_name_selector_list_get_type ())
-#define E_NAME_SELECTOR_LIST(obj)            (GTK_CHECK_CAST ((obj), e_name_selector_list_get_type (), ENameSelectorEntry))
-#define E_NAME_SELECTOR_LIST_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), e_name_selector_list_get_type (), ENameSelectorEntryClass))
-#define E_IS_NAME_SELECTOR_LIST(obj)         (GTK_CHECK_TYPE (obj, e_name_selector_list_get_type ()))
-#define E_IS_NAME_SELECTOR_LIST_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), e_name_selector_list_get_type ()))
-#define E_NAME_SELECTOR_LIST_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), E_NAME_SELECTOR_LIST_TYPE, ENameSelectorEntryClass))
+/* Standard GObject macros */
+#define E_TYPE_NAME_SELECTOR_LIST \
+	(e_name_selector_list_get_type ())
+#define E_NAME_SELECTOR_LIST(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), e_name_selector_list_get_type (), ENameSelectorEntry))
+#define E_NAME_SELECTOR_LIST_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), e_name_selector_list_get_type (), ENameSelectorEntryClass))
+#define E_IS_NAME_SELECTOR_LIST(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), e_name_selector_list_get_type ()))
+#define E_IS_NAME_SELECTOR_LIST_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), e_name_selector_list_get_type ()))
+#define E_NAME_SELECTOR_LIST_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_NAME_SELECTOR_LIST_TYPE, ENameSelectorEntryClass))
 
 typedef struct _ENameSelectorList      ENameSelectorList;
 typedef struct _ENameSelectorListClass ENameSelectorListClass;

Modified: trunk/src/server-interface-check.h
==============================================================================
--- trunk/src/server-interface-check.h	(original)
+++ trunk/src/server-interface-check.h	Sun Feb 15 03:20:04 2009
@@ -32,11 +32,21 @@
 
 G_BEGIN_DECLS
 
-#define SERVER_TYPE_INTERFACE_CHECK		(server_interface_check_get_type ())
-#define SERVER_INTERFACE_CHECK(obj)		(GTK_CHECK_CAST ((obj), SERVER_TYPE_INTERFACE_CHECK, ServerInterfaceCheck))
-#define SERVER_INTERFACE_CHECK_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), SERVER_TYPE_INTERFACE_CHECK, ServerInterfaceCheckClass))
-#define SERVER_IS_INTERFACE_CHECK(obj)		(GTK_CHECK_TYPE ((obj), SERVER_TYPE_INTERFACE_CHECK))
-#define SERVER_IS_INTERFACE_CHECK_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), SERVER_TYPE_INTERFACE_CHECK))
+/* Standard GObject macros */
+#define SERVER_TYPE_INTERFACE_CHECK \
+	(server_interface_check_get_type ())
+#define SERVER_INTERFACE_CHECK(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), SERVER_TYPE_INTERFACE_CHECK, ServerInterfaceCheck))
+#define SERVER_INTERFACE_CHECK_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), SERVER_TYPE_INTERFACE_CHECK, ServerInterfaceCheckClass))
+#define SERVER_IS_INTERFACE_CHECK(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), SERVER_TYPE_INTERFACE_CHECK))
+#define SERVER_IS_INTERFACE_CHECK_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), SERVER_TYPE_INTERFACE_CHECK))
 
 
 typedef struct _ServerInterfaceCheck        ServerInterfaceCheck;