[evolution-kolab] CamelKolabIMAPXSettings cleanups.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-kolab] CamelKolabIMAPXSettings cleanups.
- Date: Thu, 28 Jun 2012 20:00:42 +0000 (UTC)
commit e793a17c7c73d6cc1b7355743ff24f7030d70a71
Author: Matthew Barnes <mbarnes redhat com>
Date: Tue Jun 26 14:26:00 2012 -0400
CamelKolabIMAPXSettings cleanups.
src/camel/camel-kolab-imapx-settings.c | 33 +-------------------------------
src/camel/camel-kolab-imapx-settings.h | 2 +
2 files changed, 3 insertions(+), 32 deletions(-)
---
diff --git a/src/camel/camel-kolab-imapx-settings.c b/src/camel/camel-kolab-imapx-settings.c
index d1fad2d..e45113d 100644
--- a/src/camel/camel-kolab-imapx-settings.c
+++ b/src/camel/camel-kolab-imapx-settings.c
@@ -33,7 +33,6 @@
/*----------------------------------------------------------------------------*/
-typedef struct _CamelKolabIMAPXSettingsPrivate CamelKolabIMAPXSettingsPrivate;
struct _CamelKolabIMAPXSettingsPrivate {
gint foo; /* FIXME */
};
@@ -48,36 +47,9 @@ G_DEFINE_TYPE (CamelKolabIMAPXSettings, camel_kolab_imapx_settings, CAMEL_TYPE_I
static void
camel_kolab_imapx_settings_init (CamelKolabIMAPXSettings *self)
{
- CamelKolabIMAPXSettingsPrivate *priv = NULL;
-
g_assert (CAMEL_IS_KOLAB_IMAPX_SETTINGS (self));
- priv = CAMEL_KOLAB_IMAPX_SETTINGS_PRIVATE (self);
-
- priv->foo = 0; /* FIXME */
-}
-
-static void
-camel_kolab_imapx_settings_dispose (GObject *object)
-{
- g_assert (CAMEL_IS_KOLAB_IMAPX_SETTINGS (object));
- G_OBJECT_CLASS (camel_kolab_imapx_settings_parent_class)->dispose (object);
-}
-
-static void
-camel_kolab_imapx_settings_finalize (GObject *object)
-{
- CamelKolabIMAPXSettings *self = NULL;
- CamelKolabIMAPXSettingsPrivate *priv = NULL;
-
- g_assert (CAMEL_IS_KOLAB_IMAPX_SETTINGS (object));
-
- self = CAMEL_KOLAB_IMAPX_SETTINGS (object);
- priv = CAMEL_KOLAB_IMAPX_SETTINGS_PRIVATE (self);
-
- priv->foo = 0; /* FIXME */
-
- G_OBJECT_CLASS (camel_kolab_imapx_settings_parent_class)->finalize (object);
+ self->priv = CAMEL_KOLAB_IMAPX_SETTINGS_PRIVATE (self);
}
static void
@@ -86,9 +58,6 @@ camel_kolab_imapx_settings_class_init (CamelKolabIMAPXSettingsClass *klass)
GObjectClass *object_class = G_OBJECT_CLASS (klass);
g_type_class_add_private (klass, sizeof (CamelKolabIMAPXSettingsPrivate));
-
- object_class->dispose = camel_kolab_imapx_settings_dispose;
- object_class->finalize = camel_kolab_imapx_settings_finalize;
}
/*----------------------------------------------------------------------------*/
diff --git a/src/camel/camel-kolab-imapx-settings.h b/src/camel/camel-kolab-imapx-settings.h
index 515f0bd..3f90b4d 100644
--- a/src/camel/camel-kolab-imapx-settings.h
+++ b/src/camel/camel-kolab-imapx-settings.h
@@ -60,9 +60,11 @@ G_BEGIN_DECLS
typedef struct _CamelKolabIMAPXSettings CamelKolabIMAPXSettings;
typedef struct _CamelKolabIMAPXSettingsClass CamelKolabIMAPXSettingsClass;
+typedef struct _CamelKolabIMAPXSettingsPrivate CamelKolabIMAPXSettingsPrivate;
struct _CamelKolabIMAPXSettings {
CamelIMAPXSettings parent;
+ CamelKolabIMAPXSettingsPrivate *priv;
};
struct _CamelKolabIMAPXSettingsClass {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]