** Fixes part of bug #571761

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.

svn path=/trunk/; revision=10055

diff --git a/ChangeLog b/ChangeLog
index b5f6d59..9d060b3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-02-14  Matthew Barnes  <mbarnes@redhat.com>
+
+       ** Fixes part of bug #571761
+
+       * src/server-interface-check.h:
+       Stop using deprecated GtkType macros.
+
 2009-02-09  Milan Crha  <mcrha@redhat.com>
 
        ** Part of fix for bug #567861

diff --git a/libedataserverui/ChangeLog b/libedataserverui/ChangeLog
index e8a95f1..2db01cf 100644 (file)
--- a/libedataserverui/ChangeLog
+++ b/libedataserverui/ChangeLog
@@ -1,3 +1,10 @@
+2009-02-14  Matthew Barnes  <mbarnes@redhat.com>
+
+       ** Fixes part of bug #571761
+
+       * e-name-selector-list.h:
+       Stop using deprecated GtkType macros.
+
 2009-01-19  Suman Manjunath  <msuman@novell.com>
 
        ** Fix for bug #448349 (bugzilla.novell.com)

diff --git a/libedataserverui/e-name-selector-list.h b/libedataserverui/e-name-selector-list.h
index ad86a0e..8838057 100644 (file)
--- a/libedataserverui/e-name-selector-list.h
+++ b/libedataserverui/e-name-selector-list.h
@@ -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;

diff --git a/src/server-interface-check.h b/src/server-interface-check.h
index 5c34f40..5859e52 100644 (file)
--- a/src/server-interface-check.h
+++ b/src/server-interface-check.h
@@ -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))
 
 \f
 typedef struct _ServerInterfaceCheck        ServerInterfaceCheck;