GNOME.org
 

seahorse r2240 - in trunk: . libcryptui libegg libseahorse src

Author: chpe
Date: Fri Jun 20 17:07:48 2008
New Revision: 2240
URL: http://svn.gnome.org/viewvc/seahorse?rev=2240&view=rev

Log:
	* libcryptui/cryptui-key-chooser.h:
	* libcryptui/cryptui-key-store.h:
	* libcryptui/cryptui-keyset.h:
	* libegg/egg-datetime.c: (egg_datetime_get_type):
	* libegg/egg-datetime.h:
	* libseahorse/seahorse-context.h:
	* libseahorse/seahorse-dns-sd.h:
	* libseahorse/seahorse-key-model.h:
	* libseahorse/seahorse-key.h:
	* libseahorse/seahorse-keyserver-control.h:
	* libseahorse/seahorse-keyset.h:
	* libseahorse/seahorse-widget.h:
	* src/seahorse-key-manager-store.h:
	* src/seahorse-key-manager.c: (seahorse_key_manager_show):
	* src/seahorse-key-widget.h: Replace deprecated gtk type macros with
	nondeprecated gtype ones. Bug #539287.

Modified:
   trunk/ChangeLog
   trunk/libcryptui/cryptui-key-chooser.h
   trunk/libcryptui/cryptui-key-store.h
   trunk/libcryptui/cryptui-keyset.h
   trunk/libegg/egg-datetime.c
   trunk/libegg/egg-datetime.h
   trunk/libseahorse/seahorse-context.h
   trunk/libseahorse/seahorse-dns-sd.h
   trunk/libseahorse/seahorse-key-model.h
   trunk/libseahorse/seahorse-key.h
   trunk/libseahorse/seahorse-keyserver-control.h
   trunk/libseahorse/seahorse-keyset.h
   trunk/libseahorse/seahorse-widget.h
   trunk/src/seahorse-key-manager-store.h
   trunk/src/seahorse-key-manager.c
   trunk/src/seahorse-key-widget.h

Modified: trunk/libcryptui/cryptui-key-chooser.h
==============================================================================
--- trunk/libcryptui/cryptui-key-chooser.h	(original)
+++ trunk/libcryptui/cryptui-key-chooser.h	Fri Jun 20 17:07:48 2008
@@ -34,11 +34,11 @@
 } CryptUIKeyChooserMode;
 
 #define CRYPTUI_TYPE_KEY_CHOOSER             (cryptui_key_chooser_get_type ())
-#define CRYPTUI_KEY_CHOOSER(obj)             (GTK_CHECK_CAST ((obj), CRYPTUI_TYPE_KEY_CHOOSER, CryptUIKeyChooser))
-#define CRYPTUI_KEY_CHOOSER_CLASS(klass)     (GTK_CHECK_CLASS_CAST ((klass), CRYPTUI_TYPE_KEY_CHOOSER, CryptUIKeyChooser))
-#define CRYPTUI_IS_KEY_CHOOSER(obj)          (GTK_CHECK_TYPE ((obj), CRYPTUI_TYPE_KEY_CHOOSER))
-#define CRYPTUI_IS_KEY_CHOOSER_CLASS(klass)  (GTK_CHECK_CLASS_TYPE ((klass), CRYPTUI_TYPE_KEY_CHOOSER))
-#define CRYPTUI_KEY_CHOOSER_GET_CLASS(obj)   (GTK_CHECK_GET_CLASS ((obj), CRYPTUI_TYPE_KEY_CHOOSER, CryptUIKeyChooser))
+#define CRYPTUI_KEY_CHOOSER(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), CRYPTUI_TYPE_KEY_CHOOSER, CryptUIKeyChooser))
+#define CRYPTUI_KEY_CHOOSER_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), CRYPTUI_TYPE_KEY_CHOOSER, CryptUIKeyChooser))
+#define CRYPTUI_IS_KEY_CHOOSER(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CRYPTUI_TYPE_KEY_CHOOSER))
+#define CRYPTUI_IS_KEY_CHOOSER_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), CRYPTUI_TYPE_KEY_CHOOSER))
+#define CRYPTUI_KEY_CHOOSER_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), CRYPTUI_TYPE_KEY_CHOOSER, CryptUIKeyChooser))
 
 typedef struct _CryptUIKeyChooser CryptUIKeyChooser;
 typedef struct _CryptUIKeyChooserPriv CryptUIKeyChooserPriv;

Modified: trunk/libcryptui/cryptui-key-store.h
==============================================================================
--- trunk/libcryptui/cryptui-key-store.h	(original)
+++ trunk/libcryptui/cryptui-key-store.h	Fri Jun 20 17:07:48 2008
@@ -27,11 +27,11 @@
 #include "cryptui-keyset.h"
 
 #define CRYPTUI_TYPE_KEY_STORE             (cryptui_key_store_get_type ())
-#define CRYPTUI_KEY_STORE(obj)             (GTK_CHECK_CAST ((obj), CRYPTUI_TYPE_KEY_STORE, CryptUIKeyStore))
-#define CRYPTUI_KEY_STORE_CLASS(klass)     (GTK_CHECK_CLASS_CAST ((klass), CRYPTUI_TYPE_KEY_STORE, CryptUIKeyStore))
-#define CRYPTUI_IS_KEY_STORE(obj)          (GTK_CHECK_TYPE ((obj), CRYPTUI_TYPE_KEY_STORE))
-#define CRYPTUI_IS_KEY_STORE_CLASS(klass)  (GTK_CHECK_CLASS_TYPE ((klass), CRYPTUI_TYPE_KEY_STORE))
-#define CRYPTUI_KEY_STORE_GET_CLASS(obj)   (GTK_CHECK_GET_CLASS ((obj), CRYPTUI_TYPE_KEY_STORE, CryptUIKeyStore))
+#define CRYPTUI_KEY_STORE(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), CRYPTUI_TYPE_KEY_STORE, CryptUIKeyStore))
+#define CRYPTUI_KEY_STORE_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), CRYPTUI_TYPE_KEY_STORE, CryptUIKeyStore))
+#define CRYPTUI_IS_KEY_STORE(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CRYPTUI_TYPE_KEY_STORE))
+#define CRYPTUI_IS_KEY_STORE_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), CRYPTUI_TYPE_KEY_STORE))
+#define CRYPTUI_KEY_STORE_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), CRYPTUI_TYPE_KEY_STORE, CryptUIKeyStore))
 
 typedef struct _CryptUIKeyStore CryptUIKeyStore;
 typedef struct _CryptUIKeyStorePriv CryptUIKeyStorePriv;

Modified: trunk/libcryptui/cryptui-keyset.h
==============================================================================
--- trunk/libcryptui/cryptui-keyset.h	(original)
+++ trunk/libcryptui/cryptui-keyset.h	Fri Jun 20 17:07:48 2008
@@ -55,11 +55,11 @@
 #include "cryptui.h"
 
 #define CRYPTUI_TYPE_KEYSET               (cryptui_keyset_get_type ())
-#define CRYPTUI_KEYSET(obj)               (GTK_CHECK_CAST ((obj), CRYPTUI_TYPE_KEYSET, CryptUIKeyset))
-#define CRYPTUI_KEYSET_CLASS(klass)       (GTK_CHECK_CLASS_CAST ((klass), CRYPTUI_TYPE_KEYSET, CryptUIKeysetClass))
-#define CRYPTUI_IS_KEYSET(obj)            (GTK_CHECK_TYPE ((obj), CRYPTUI_TYPE_KEYSET))
-#define CRYPTUI_IS_KEYSET_CLASS(klass)    (GTK_CHECK_CLASS_TYPE ((klass), CRYPTUI_TYPE_KEYSET))
-#define CRYPTUI_KEYSET_GET_CLASS(obj)     (GTK_CHECK_GET_CLASS ((obj), CRYPTUI_TYPE_KEYSET, CryptUIKeysetClass))
+#define CRYPTUI_KEYSET(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), CRYPTUI_TYPE_KEYSET, CryptUIKeyset))
+#define CRYPTUI_KEYSET_CLASS(klass)       (G_TYPE_CHECK_CLASS_CAST ((klass), CRYPTUI_TYPE_KEYSET, CryptUIKeysetClass))
+#define CRYPTUI_IS_KEYSET(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CRYPTUI_TYPE_KEYSET))
+#define CRYPTUI_IS_KEYSET_CLASS(klass)    (G_TYPE_CHECK_CLASS_TYPE ((klass), CRYPTUI_TYPE_KEYSET))
+#define CRYPTUI_KEYSET_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS ((obj), CRYPTUI_TYPE_KEYSET, CryptUIKeysetClass))
 
 GType               cryptui_keyset_get_type           (void);
 

Modified: trunk/libegg/egg-datetime.c
==============================================================================
--- trunk/libegg/egg-datetime.c	(original)
+++ trunk/libegg/egg-datetime.c	Fri Jun 20 17:07:48 2008
@@ -266,10 +266,10 @@
 static GtkHBoxClass *parent_class = NULL;
 
 
-GtkType
+GType
 egg_datetime_get_type (void)
 {
-   static GtkType datetime_type = 0;
+   static GType datetime_type = 0;
 
    if (!datetime_type) {
       static const GTypeInfo datetime_info = {

Modified: trunk/libegg/egg-datetime.h
==============================================================================
--- trunk/libegg/egg-datetime.h	(original)
+++ trunk/libegg/egg-datetime.h	Fri Jun 20 17:07:48 2008
@@ -85,7 +85,7 @@
 
 
 /* Constructors */
-GtkType         egg_datetime_get_type        (void);
+GType         egg_datetime_get_type        (void);
 GtkWidget      *egg_datetime_new       (void); 
 GtkWidget      *egg_datetime_new_from_time_t    (time_t t);
 GtkWidget      *egg_datetime_new_from_struct_tm (struct tm *tm);

Modified: trunk/libseahorse/seahorse-context.h
==============================================================================
--- trunk/libseahorse/seahorse-context.h	(original)
+++ trunk/libseahorse/seahorse-context.h	Fri Jun 20 17:07:48 2008
@@ -47,11 +47,11 @@
 #include "seahorse-dns-sd.h"
 
 #define SEAHORSE_TYPE_CONTEXT			(seahorse_context_get_type ())
-#define SEAHORSE_CONTEXT(obj)			(GTK_CHECK_CAST ((obj), SEAHORSE_TYPE_CONTEXT, SeahorseContext))
-#define SEAHORSE_CONTEXT_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_CONTEXT, SeahorseContextClass))
-#define SEAHORSE_IS_CONTEXT(obj)		(GTK_CHECK_TYPE ((obj), SEAHORSE_TYPE_CONTEXT))
-#define SEAHORSE_IS_CONTEXT_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_CONTEXT))
-#define SEAHORSE_CONTEXT_GET_CLASS(obj)		(GTK_CHECK_GET_CLASS ((obj), SEAHORSE_TYPE_CONTEXT, SeahorseContextClass))
+#define SEAHORSE_CONTEXT(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_CONTEXT, SeahorseContext))
+#define SEAHORSE_CONTEXT_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_CONTEXT, SeahorseContextClass))
+#define SEAHORSE_IS_CONTEXT(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_CONTEXT))
+#define SEAHORSE_IS_CONTEXT_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_CONTEXT))
+#define SEAHORSE_CONTEXT_GET_CLASS(obj)		(G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_CONTEXT, SeahorseContextClass))
 
 typedef struct _SeahorseContext SeahorseContext;
 typedef struct _SeahorseContextClass SeahorseContextClass;

Modified: trunk/libseahorse/seahorse-dns-sd.h
==============================================================================
--- trunk/libseahorse/seahorse-dns-sd.h	(original)
+++ trunk/libseahorse/seahorse-dns-sd.h	Fri Jun 20 17:07:48 2008
@@ -34,11 +34,11 @@
 #include <glib.h>
 
 #define SEAHORSE_TYPE_SERVICE_DISCOVERY             (seahorse_service_discovery_get_type ())
-#define SEAHORSE_SERVICE_DISCOVERY(obj)	            (GTK_CHECK_CAST ((obj), SEAHORSE_TYPE_SERVICE_DISCOVERY, SeahorseServiceDiscovery))
-#define SEAHORSE_SERVICE_DISCOVERY_CLASS(klass)	    (GTK_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_SERVICE_DISCOVERY, SeahorseServiceDiscoveryClass))
-#define SEAHORSE_IS_SERVICE_DISCOVERY(obj)		    (GTK_CHECK_TYPE ((obj), SEAHORSE_TYPE_SERVICE_DISCOVERY))
-#define SEAHORSE_IS_SERVICE_DISCOVERY_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_SERVICE_DISCOVERY))
-#define SEAHORSE_SERVICE_DISCOVERY_GET_CLASS(obj)	(GTK_CHECK_GET_CLASS ((obj), SEAHORSE_TYPE_SERVICE_DISCOVERY, SeahorseServiceDiscoveryClass))
+#define SEAHORSE_SERVICE_DISCOVERY(obj)	            (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_SERVICE_DISCOVERY, SeahorseServiceDiscovery))
+#define SEAHORSE_SERVICE_DISCOVERY_CLASS(klass)	    (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_SERVICE_DISCOVERY, SeahorseServiceDiscoveryClass))
+#define SEAHORSE_IS_SERVICE_DISCOVERY(obj)		    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_SERVICE_DISCOVERY))
+#define SEAHORSE_IS_SERVICE_DISCOVERY_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_SERVICE_DISCOVERY))
+#define SEAHORSE_SERVICE_DISCOVERY_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_SERVICE_DISCOVERY, SeahorseServiceDiscoveryClass))
 
 typedef struct _SeahorseServiceDiscovery SeahorseServiceDiscovery;
 typedef struct _SeahorseServiceDiscoveryClass SeahorseServiceDiscoveryClass;

Modified: trunk/libseahorse/seahorse-key-model.h
==============================================================================
--- trunk/libseahorse/seahorse-key-model.h	(original)
+++ trunk/libseahorse/seahorse-key-model.h	Fri Jun 20 17:07:48 2008
@@ -34,11 +34,11 @@
 #include "seahorse-key.h"
 
 #define SEAHORSE_TYPE_KEY_MODEL               (seahorse_key_model_get_type ())
-#define SEAHORSE_KEY_MODEL(obj)               (GTK_CHECK_CAST ((obj), SEAHORSE_TYPE_KEY_MODEL, SeahorseKeyModel))
-#define SEAHORSE_KEY_MODEL_CLASS(klass)       (GTK_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_KEY_MODEL, SeahorseKeyModelClass))
-#define SEAHORSE_IS_KEY_MODEL(obj)            (GTK_CHECK_TYPE ((obj), SEAHORSE_TYPE_KEY_MODEL))
-#define SEAHORSE_IS_KEY_MODEL_CLASS(klass)    (GTK_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_KEY_MODEL))
-#define SEAHORSE_KEY_MODEL_GET_CLASS(obj)     (GTK_CHECK_GET_CLASS ((obj), SEAHORSE_TYPE_KEY_MODEL, SeahorseKeyModelClass))
+#define SEAHORSE_KEY_MODEL(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_KEY_MODEL, SeahorseKeyModel))
+#define SEAHORSE_KEY_MODEL_CLASS(klass)       (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_KEY_MODEL, SeahorseKeyModelClass))
+#define SEAHORSE_IS_KEY_MODEL(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_KEY_MODEL))
+#define SEAHORSE_IS_KEY_MODEL_CLASS(klass)    (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_KEY_MODEL))
+#define SEAHORSE_KEY_MODEL_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_KEY_MODEL, SeahorseKeyModelClass))
 
 typedef struct _SeahorseKeyModel SeahorseKeyModel;
 typedef struct _SeahorseKeyModelClass SeahorseKeyModelClass;

Modified: trunk/libseahorse/seahorse-key.h
==============================================================================
--- trunk/libseahorse/seahorse-key.h	(original)
+++ trunk/libseahorse/seahorse-key.h	Fri Jun 20 17:07:48 2008
@@ -69,11 +69,11 @@
 #define SKEY_UNKNOWN                    0
 
 #define SEAHORSE_TYPE_KEY               (seahorse_key_get_type ())
-#define SEAHORSE_KEY(obj)               (GTK_CHECK_CAST ((obj), SEAHORSE_TYPE_KEY, SeahorseKey))
-#define SEAHORSE_KEY_CLASS(klass)       (GTK_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_KEY, SeahorseKeyClass))
-#define SEAHORSE_IS_KEY(obj)            (GTK_CHECK_TYPE ((obj), SEAHORSE_TYPE_KEY))
-#define SEAHORSE_IS_KEY_CLASS(klass)    (GTK_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_KEY))
-#define SEAHORSE_KEY_GET_CLASS(obj)     (GTK_CHECK_GET_CLASS ((obj), SEAHORSE_TYPE_KEY, SeahorseKeyClass))
+#define SEAHORSE_KEY(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_KEY, SeahorseKey))
+#define SEAHORSE_KEY_CLASS(klass)       (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_KEY, SeahorseKeyClass))
+#define SEAHORSE_IS_KEY(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_KEY))
+#define SEAHORSE_IS_KEY_CLASS(klass)    (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_KEY))
+#define SEAHORSE_KEY_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_KEY, SeahorseKeyClass))
 
 /* 
  * These types should never change. These values are exported via DBUS. In the 

Modified: trunk/libseahorse/seahorse-keyserver-control.h
==============================================================================
--- trunk/libseahorse/seahorse-keyserver-control.h	(original)
+++ trunk/libseahorse/seahorse-keyserver-control.h	Fri Jun 20 17:07:48 2008
@@ -36,11 +36,11 @@
 #include <gtk/gtk.h>
 
 #define SEAHORSE_TYPE_KEYSERVER_CONTROL		(seahorse_keyserver_control_get_type ())
-#define SEAHORSE_KEYSERVER_CONTROL(obj)		(GTK_CHECK_CAST ((obj), SEAHORSE_TYPE_KEYSERVER_CONTROL, SeahorseKeyserverControl))
-#define SEAHORSE_KEYSERVER_CONTROL_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_KEYSERVER_CONTROL, SeahorseKeyserverControlClass))
-#define SEAHORSE_IS_KEYSERVER_CONTROL(obj)		(GTK_CHECK_TYPE ((obj), SEAHORSE_TYPE_KEYSERVER_CONTROL))
-#define SEAHORSE_IS_KEYSERVER_CONTROL_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_KEYSERVER_CONTROL))
-#define SEAHORSE_KEYSERVER_CONTROL_GET_CLASS(obj)	(GTK_CHECK_GET_CLASS ((obj), SEAHORSE_TYPE_KEYSERVER_CONTROL, SeahorseKeyserverControlClass))
+#define SEAHORSE_KEYSERVER_CONTROL(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_KEYSERVER_CONTROL, SeahorseKeyserverControl))
+#define SEAHORSE_KEYSERVER_CONTROL_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_KEYSERVER_CONTROL, SeahorseKeyserverControlClass))
+#define SEAHORSE_IS_KEYSERVER_CONTROL(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_KEYSERVER_CONTROL))
+#define SEAHORSE_IS_KEYSERVER_CONTROL_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_KEYSERVER_CONTROL))
+#define SEAHORSE_KEYSERVER_CONTROL_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_KEYSERVER_CONTROL, SeahorseKeyserverControlClass))
 
 typedef struct _SeahorseKeyserverControl SeahorseKeyserverControl;
 typedef struct _SeahorseKeyserverControlClass SeahorseKeyserverControlClass;

Modified: trunk/libseahorse/seahorse-keyset.h
==============================================================================
--- trunk/libseahorse/seahorse-keyset.h	(original)
+++ trunk/libseahorse/seahorse-keyset.h	Fri Jun 20 17:07:48 2008
@@ -51,11 +51,11 @@
 #include "seahorse-key-source.h"
 
 #define SEAHORSE_TYPE_KEYSET               (seahorse_keyset_get_type ())
-#define SEAHORSE_KEYSET(obj)               (GTK_CHECK_CAST ((obj), SEAHORSE_TYPE_KEYSET, SeahorseKeyset))
-#define SEAHORSE_KEYSET_CLASS(klass)       (GTK_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_KEYSET, SeahorseKeysetClass))
-#define SEAHORSE_IS_KEYSET(obj)            (GTK_CHECK_TYPE ((obj), SEAHORSE_TYPE_KEYSET))
-#define SEAHORSE_IS_KEYSET_CLASS(klass)    (GTK_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_KEYSET))
-#define SEAHORSE_KEYSET_GET_CLASS(obj)     (GTK_CHECK_GET_CLASS ((obj), SEAHORSE_TYPE_KEYSET, SeahorseKeysetClass))
+#define SEAHORSE_KEYSET(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_KEYSET, SeahorseKeyset))
+#define SEAHORSE_KEYSET_CLASS(klass)       (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_KEYSET, SeahorseKeysetClass))
+#define SEAHORSE_IS_KEYSET(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_KEYSET))
+#define SEAHORSE_IS_KEYSET_CLASS(klass)    (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_KEYSET))
+#define SEAHORSE_KEYSET_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_KEYSET, SeahorseKeysetClass))
 
 typedef struct _SeahorseKeyset SeahorseKeyset;
 typedef struct _SeahorseKeysetClass SeahorseKeysetClass;

Modified: trunk/libseahorse/seahorse-widget.h
==============================================================================
--- trunk/libseahorse/seahorse-widget.h	(original)
+++ trunk/libseahorse/seahorse-widget.h	Fri Jun 20 17:07:48 2008
@@ -43,11 +43,11 @@
 #include "seahorse-context.h"
 
 #define SEAHORSE_TYPE_WIDGET            (seahorse_widget_get_type ())
-#define SEAHORSE_WIDGET(obj)            (GTK_CHECK_CAST ((obj), SEAHORSE_TYPE_WIDGET, SeahorseWidget))
-#define SEAHORSE_WIDGET_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_WIDGET, SeahorseWidgetClass))
-#define SEAHORSE_IS_WIDGET(obj)         (GTK_CHECK_TYPE ((obj), SEAHORSE_TYPE_WIDGET))
-#define SEAHORSE_IS_WIDGET_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_WIDGET))
-#define SEAHORSE_WIDGET_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), SEAHORSE_TYPE_WIDGET, SeahorseWidgetClass))
+#define SEAHORSE_WIDGET(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_WIDGET, SeahorseWidget))
+#define SEAHORSE_WIDGET_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_WIDGET, SeahorseWidgetClass))
+#define SEAHORSE_IS_WIDGET(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_WIDGET))
+#define SEAHORSE_IS_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_WIDGET))
+#define SEAHORSE_WIDGET_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_WIDGET, SeahorseWidgetClass))
 
 typedef struct _SeahorseWidget SeahorseWidget;
 typedef struct _SeahorseWidgetClass SeahorseWidgetClass;

Modified: trunk/src/seahorse-key-manager-store.h
==============================================================================
--- trunk/src/seahorse-key-manager-store.h	(original)
+++ trunk/src/seahorse-key-manager-store.h	Fri Jun 20 17:07:48 2008
@@ -30,11 +30,11 @@
 #include "seahorse-key-model.h"
 
 #define SEAHORSE_TYPE_KEY_MANAGER_STORE             (seahorse_key_manager_store_get_type ())
-#define SEAHORSE_KEY_MANAGER_STORE(obj)             (GTK_CHECK_CAST ((obj), SEAHORSE_TYPE_KEY_MANAGER_STORE, SeahorseKeyManagerStore))
-#define SEAHORSE_KEY_MANAGER_STORE_CLASS(klass)     (GTK_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_KEY_MANAGER_STORE, SeahorseKeyManagerStoreClass))
-#define SEAHORSE_IS_KEY_MANAGER_STORE(obj)          (GTK_CHECK_TYPE ((obj), SEAHORSE_TYPE_KEY_MANAGER_STORE))
-#define SEAHORSE_IS_KEY_MANAGER_STORE_CLASS(klass)  (GTK_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_KEY_MANAGER_STORE))
-#define SEAHORSE_KEY_MANAGER_STORE_GET_CLASS(obj)   (GTK_CHECK_GET_CLASS ((obj), SEAHORSE_TYPE_KEY_MANAGER_STORE, SeahorseKeyManagerStoreClass))
+#define SEAHORSE_KEY_MANAGER_STORE(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_KEY_MANAGER_STORE, SeahorseKeyManagerStore))
+#define SEAHORSE_KEY_MANAGER_STORE_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_KEY_MANAGER_STORE, SeahorseKeyManagerStoreClass))
+#define SEAHORSE_IS_KEY_MANAGER_STORE(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_KEY_MANAGER_STORE))
+#define SEAHORSE_IS_KEY_MANAGER_STORE_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_KEY_MANAGER_STORE))
+#define SEAHORSE_KEY_MANAGER_STORE_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_KEY_MANAGER_STORE, SeahorseKeyManagerStoreClass))
 
 typedef struct _SeahorseKeyManagerStore SeahorseKeyManagerStore;
 typedef struct _SeahorseKeyManagerStorePriv SeahorseKeyManagerStorePriv;

Modified: trunk/src/seahorse-key-manager.c
==============================================================================
--- trunk/src/seahorse-key-manager.c	(original)
+++ trunk/src/seahorse-key-manager.c	Fri Jun 20 17:07:48 2008
@@ -1503,7 +1503,7 @@
     gtk_target_list_unref (targets);
 
     gtk_signal_connect (GTK_OBJECT (win), "drag_data_received",
-                GTK_SIGNAL_FUNC (target_drag_data_received), swidget);
+                G_CALLBACK (target_drag_data_received), swidget);
                         
     /* Hook progress bar in */
     seahorse_progress_status_set_operation (swidget, op);

Modified: trunk/src/seahorse-key-widget.h
==============================================================================
--- trunk/src/seahorse-key-widget.h	(original)
+++ trunk/src/seahorse-key-widget.h	Fri Jun 20 17:07:48 2008
@@ -28,11 +28,11 @@
 #include "seahorse-key.h"
 
 #define SEAHORSE_TYPE_KEY_WIDGET		(seahorse_key_widget_get_type ())
-#define SEAHORSE_KEY_WIDGET(obj)		(GTK_CHECK_CAST ((obj), SEAHORSE_TYPE_KEY_WIDGET, SeahorseKeyWidget))
-#define SEAHORSE_KEY_WIDGET_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_KEY_WIDGET, SeahorseKeyWidgetClass))
-#define SEAHORSE_IS_KEY_WIDGET(obj)		(GTK_CHECK_TYPE ((obj), SEAHORSE_TYPE_KEY_WIDGET))
-#define SEAHORSE_IS_KEY_WIDGET_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_KEY_WIDGET))
-#define SEAHORSE_KEY_WIDGET_GET_CLASS(obj)	(GTK_CHECK_GET_CLASS ((obj), SEAHORSE_TYPE_KEY_WIDGET, SeahorseKeyWidgetClass))
+#define SEAHORSE_KEY_WIDGET(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), SEAHORSE_TYPE_KEY_WIDGET, SeahorseKeyWidget))
+#define SEAHORSE_KEY_WIDGET_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), SEAHORSE_TYPE_KEY_WIDGET, SeahorseKeyWidgetClass))
+#define SEAHORSE_IS_KEY_WIDGET(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEAHORSE_TYPE_KEY_WIDGET))
+#define SEAHORSE_IS_KEY_WIDGET_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), SEAHORSE_TYPE_KEY_WIDGET))
+#define SEAHORSE_KEY_WIDGET_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), SEAHORSE_TYPE_KEY_WIDGET, SeahorseKeyWidgetClass))
 
 typedef struct _SeahorseKeyWidget SeahorseKeyWidget;
 typedef struct _SeahorseKeyWidgetClass SeahorseKeyWidgetClass;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]