[evolution-data-server] CamelCertDB: Derive directly from GObject.



commit 46e7a29681a2e8c9f8986cedc0f8648d3f1d2b8b
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun Sep 22 10:50:30 2013 -0400

    CamelCertDB: Derive directly from GObject.
    
    CamelObject offers nothing of interest here.

 camel/camel-certdb.c |    2 +-
 camel/camel-certdb.h |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/camel/camel-certdb.c b/camel/camel-certdb.c
index f3ad587..dc69448 100644
--- a/camel/camel-certdb.c
+++ b/camel/camel-certdb.c
@@ -64,7 +64,7 @@ static gint certdb_cert_save (CamelCertDB *certdb, CamelCert *cert, FILE *ostrea
 static const gchar *cert_get_string (CamelCertDB *certdb, CamelCert *cert, gint string);
 static void cert_set_string (CamelCertDB *certdb, CamelCert *cert, gint string, const gchar *value);
 
-G_DEFINE_TYPE (CamelCertDB, camel_certdb, CAMEL_TYPE_OBJECT)
+G_DEFINE_TYPE (CamelCertDB, camel_certdb, G_TYPE_OBJECT)
 
 typedef struct {
        gchar *hostname;
diff --git a/camel/camel-certdb.h b/camel/camel-certdb.h
index ee658d8..f17f680 100644
--- a/camel/camel-certdb.h
+++ b/camel/camel-certdb.h
@@ -28,7 +28,7 @@
 #define CAMEL_CERTDB_H
 
 #include <stdio.h>
-#include <camel/camel-object.h>
+#include <glib-object.h>
 
 /* Standard GObject macros */
 #define CAMEL_TYPE_CERTDB \
@@ -84,12 +84,12 @@ typedef struct {
 } CamelCert;
 
 struct _CamelCertDB {
-       CamelObject parent;
+       GObject parent;
        CamelCertDBPrivate *priv;
 };
 
 struct _CamelCertDBClass {
-       CamelObjectClass parent_class;
+       GObjectClass parent_class;
 
        gint (*header_load) (CamelCertDB *certdb, FILE *istream);
        gint (*header_save) (CamelCertDB *certdb, FILE *ostream);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]